Fix typos and some minor syntax things found by RubyMine inspections

tjgrathwell · tjgrathwell · commit a61f249f1735 · 2014-06-17T23:31:29.000-07:00
diff --git a/Rakefile b/Rakefile
@@ -12,7 +12,7 @@ begin
     t.pattern = "spec/**/*_spec.rb"
     t.rspec_opts =
         "--format d"
-    t.rspec_opts += " --color" if !windows?
+    t.rspec_opts += " --color" unless windows?
     # t.ruby_opts="-w"
   end
 rescue LoadError # swallow Heroku deploy error
diff --git a/app.rb b/app.rb
@@ -25,7 +25,7 @@ class InstallFest < Sinatra::Application   # todo: use Sinatra::Base instead, wi
   include Erector::Mixin
 
   # Set available locales in Array of Strings; this is also used when
-  # checking availability in dynamic locale assigment, so must be as Strings.
+  # checking availability in dynamic locale assignment, they must be strings.
   AVAILABLE_LOCALES = %w(en es)
 
   configure do
@@ -102,7 +102,7 @@ def src
   end
 
   def ext
-    ext = $1 if doc_path.match(/\.(.*)/)
+    $1 if doc_path.match(/\.(.*)/)
   end
 
   def doc_path
diff --git a/lib/contents.rb b/lib/contents.rb
@@ -32,7 +32,7 @@ def site_page_files
   end
 
   def content_for filename
-    open("#{site_dir}/#{filename}").read()
+    open("#{site_dir}/#{filename}").read
   end
 
   def subpages_for filename
@@ -45,20 +45,20 @@ def subpages_for filename
     content.scan /[^!]\[.*?\]\((.*?)\)/ do |link, _|
       next if (link =~ /^http/)
       next if (link =~ %r(^//)) # protocol-less absolute links e.g. //google.com
-      links.push(link) if !links.include? link
+      links.push(link)
     end
 
     # (stepfiles) links of the form: link "next page"
     content.scan /link\s*["'](.*?)["']/ do |link, _|
-      links.push(link) if !links.include? link
+      links.push(link)
     end
 
     # (stepfiles) links of the form: site_desc "some site"
     content.scan /site_desc\s*["'](.*?)["']/ do |link, _|
-      links.push('/' + link) if !links.include? link
+      links.push('/' + link)
     end
 
-    links
+    links.uniq
   end
 
   def next_step_for filename
diff --git a/lib/media_wiki.rb b/lib/media_wiki.rb
@@ -7,9 +7,9 @@ def mw2md md
     gsub(/^\*\*\* /, "  * ").
 
     # square-bullet lists (turn into regular bullets)
-    gsub(/^\# /, "\n* ").
-    gsub(/^\#\# /, " * ").
-    gsub(/^\#\#\# /, "  * ").
+    gsub(/^# /, "\n* ").
+    gsub(/^## /, " * ").
+    gsub(/^### /, "  * ").
 
     # headings
     gsub(/^==== ?(.*)( *====)\s*$/, "### \\1").
@@ -50,7 +50,7 @@ def mw2md md
     gsub(/^\{\|(.*)$/) {"<table #{$1}>\n<tr>\n"}.
     gsub(/^\|-/, "<tr>").
     gsub(/^\|\+(.*)/, "<tr><th>\\1<tr>").
-    gsub(/^\! /, "<th>").
+    gsub(/^! /, "<th>").
     gsub(/^\| /, "<td>").
     gsub(/^\|\}/, "</table>")
   end
diff --git a/lib/step.rb b/lib/step.rb
@@ -305,7 +305,7 @@ def fuzzy_result fuzzed_text
       span I18n.t("captions.fuzzy_result")
       remaining_text = fuzzed_text
       pre do
-        while match = remaining_text.match(/(.*?){FUZZY}(.*?){\/FUZZY}(.*)/m)
+        while match = remaining_text.match(/(.*?)\{FUZZY}(.*?)\{\/FUZZY}(.*)/m)
           text match[1]
           span match[2], :class => 'fuzzy-lightened'
           remaining_text = match[3]
diff --git a/public/css/header.scss b/public/css/header.scss
@@ -30,7 +30,7 @@ nav *, nav *:before, nav *:after {
   list-style: none;
   background-color: #fff;
   border: 1px solid #ccc;
-  border: 1px solid rgba(0, 0, 0, 0.15);
+  border-color: rgba(0, 0, 0, 0.15);
   -webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175);
   box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175);
   background-clip: padding-box;
@@ -39,14 +39,13 @@ nav *, nav *:before, nav *:after {
 
   &:before {
     content: "";
-    border-color: transparent transparent white transparent;
     position: absolute;
     height: 0;
     width: 0;
     top: -19px;
     left: 148px;
-    border-width: 10px;
-    border-style: solid;
+    border: 10px solid transparent;
+    border-bottom-color: white;
   }
 
   li {
@@ -62,7 +61,6 @@ nav *, nav *:before, nav *:after {
       padding: 3px 20px;
       font-weight: normal;
       line-height: 1.428571429;
-      color: #333;
       white-space: nowrap;
     }
   }
@@ -111,9 +109,7 @@ nav *, nav *:before, nav *:after {
     > a {
       position: relative;
       display: block;
-      padding: 10px 15px;
-      padding-top: 15px;
-      padding-bottom: 15px;
+      padding: 15px;
       line-height: 20px;
     }
 
diff --git a/public/css/step.css b/public/css/step.css
@@ -163,9 +163,7 @@ div.back:before {
 
 table.bordered td,
 table.bordered tr {
-  border-style: solid;
-  border-width: 1px;
-  border-color: black;
+  border: 1px solid black;
   padding-left: 5px;
   padding-right: 5px;
 }
diff --git a/sites/en/frontend/frontend.step b/sites/en/frontend/frontend.step
@@ -2,7 +2,7 @@ message <<-MARKDOWN
 
 ### Goal
 
-Our aim is to get you aquainted with HTML, CSS, and JavaScript, the most essential building blocks
+Our aim is to get you acquainted with HTML, CSS, and JavaScript, the most essential building blocks
 of web experiences. You'll create a basic static web page about yourself and possibly deploy
 it to the web. You'll:
 
diff --git a/sites/en/intermediate-rails/add_other_features_of_your_choosing.step b/sites/en/intermediate-rails/add_other_features_of_your_choosing.step
@@ -8,7 +8,7 @@ Suggestions:
 * Easy user profile pictures with [Gravatar](https://gravatar.com/).
 * Add login options with [Omniauth](https://github.com/intridea/omniauth), including Twitter, Facebook, Github, Google, and more.
   * Check out the Devise [documentation for integrating with Omniauth](https://github.com/plataformatec/devise/wiki/OmniAuth:-Overview).
-* Fiddle with the layout of the show page so it doesn’t look bad. If it looks bad. It probably looks great.
+* Fiddle with the layout of the show page so it doesn't look bad. If it looks bad. It probably looks great.
 * Perhaps fancier post markup with Markdown or something similar.
 * Deploy to Heroku and send your message board to all your friends!
 
diff --git a/sites/en/intermediate-rails/add_pages_to_create_and_look_at_individual_posts.step b/sites/en/intermediate-rails/add_pages_to_create_and_look_at_individual_posts.step
@@ -2,7 +2,7 @@ requirements do
 message <<-MARKDOWN
 * The user should be able to create a post with a title, author, date published, and content. The author should be the current user. 
 * The complete post should appear on its own page (aka its show page).
-* If the user doesn’t submit all required fields, they should see some error messaging, but shouldn’t lose any of their work.
+* If the user doesn't submit all required fields, they should see some error messaging, but shouldn't lose any of their work.
 MARKDOWN
   table do
     tr do
@@ -50,7 +50,7 @@ message <<-MARKDOWN
 * Rails has some built in ways to associate one model with another. See the RailsGuides link above for hints on how to make a user the owner of a post!
 * Don't hand code the form! You don't have to! Rails will help. See RailsGuide link above! 
 * Rails has a built-in way to note when something was stored in the database. Probably handy for showing the date / time a post was created.
-* For now, we're going to use the user's email address when displaying a posts's author. You can add names or other identifiers later! (Also, even though you're going to get the current user's email address from the User model, you'll still need a user parameter for your Post resource.)
+* For now, we're going to use the user's email address when displaying a post's author. You can add names or other identifiers later! (Also, even though you're going to get the current user's email address from the User model, you'll still need a user parameter for your Post resource.)
 * You need a `create` method to store your post data - scroll down a little bit in this section of the Getting Started guide for very helpful information and to see an example of a create method: <http://guides.rubyonrails.org/getting_started.html#creating-new-posts>.
 MARKDOWN
 end
diff --git a/sites/en/intermediate-rails/add_replying.step b/sites/en/intermediate-rails/add_replying.step
@@ -3,7 +3,7 @@ message <<-MARKDOWN
 * The user should see a 'New Reply' link or button on a post's show page which takes them to a form. The form should include the title of the post being replied to.
 * The user should be able to create a new reply to a post using the 'New Reply' form.
 * The user should see all the replies to a post on the post’s show page.
-* If the user doesn’t submit all required fields, they should see some error messaging, but they shouldn’t lose any of their work.
+* If the user doesn't submit all required fields, they should see some error messaging, but they shouldn't lose any of their work.
 MARKDOWN
   table do
     tr do
diff --git a/sites/en/intermediate-rails/install_devise.step b/sites/en/intermediate-rails/install_devise.step
@@ -1,7 +1,7 @@
 requirements do
 message <<-MARKDOWN
 * The user should be able to create an account and log in.
-* The user should see a prompt to log in if they aren’t logged in.
+* The user should see a prompt to log in if they aren't logged in.
 * Once logged in, the user should see a static page with some kind of greeting.
 * The page should display the logged-in user's email address and a link to log out.
 * You, the developer, should explain to a teacher, TA, or fellow student how Rails knows to render the home view.
diff --git a/sites/en/intermediate-rails/intermediate-rails.step b/sites/en/intermediate-rails/intermediate-rails.step
@@ -26,7 +26,7 @@ message <<-MARKDOWN
 
 * Each time you get your app into a functional state, before adding any more features, COMMIT TO GIT! The new features will probably break things, which is neat, but you’ll want to be able to roll back to a prior version if necessary.
 
-MAJORLY IMPORTANT NOTE: We called the sections challenges because they are challenging! This curriculum will be most fun as a collaboration — talk things through with your teacher, TAs, and other students. This is a very different style of curriculum than Suggestotron, so don’t be discouraged if you aren’t quite sure what to do next.
+MAJORLY IMPORTANT NOTE: We called the sections challenges because they are challenging! This curriculum will be most fun as a collaboration — talk things through with your teacher, TAs, and other students. This is a very different style of curriculum than Suggestotron, so don’t be discouraged if you aren't quite sure what to do next.
 
 ## How to use this curriculum
 * Challenges are the big chunks of stuff to work on at a given time. These are gated by requirements — once you (or your group) has completed a set of requirements, go on to the next set.
diff --git a/sites/en/workshop/ruby_for_beginners.deck.md b/sites/en/workshop/ruby_for_beginners.deck.md
@@ -227,7 +227,7 @@ Create a variable whose name has:
   
 * a number anywhere (like `y2k`)
 
-* a number at the start (like '101dalmations')
+* a number at the start (like '101dalmatians')
 
 * a number at the end  (like 'starwars2')
 
diff --git a/spec/app_deck_spec.rb b/spec/app_deck_spec.rb
@@ -34,7 +34,7 @@ def app
 
       sites_dir = dir "sites"  do
           dir "meals" do
-            f = file "breakfast.deck.md", breakfast
+            file "breakfast.deck.md", breakfast
           end
       end
       Site.stub(:sites_dir) { sites_dir }
diff --git a/spec/sites/meals/_find_utensils.step b/spec/sites/meals/_find_utensils.step
@@ -1 +1 @@
-Maybe they are in the drawer?
+message "Maybe they are in the drawer?"
diff --git a/spec/sites/meals/eat_a_meal.step b/spec/sites/meals/eat_a_meal.step
@@ -1,3 +1,3 @@
-Put the food in your mouth!
+message "Put the food in your mouth!"
 
 next_step "clean_up"
diff --git a/spec/sites/meals/prepare_a_meal.step b/spec/sites/meals/prepare_a_meal.step
@@ -1,4 +1,4 @@
-Are you
+message "Are you"
 link "vegetarian"
-or
+message "or"
 link "omnivorous"
diff --git a/spec/sites/meals/vegetarian.step b/spec/sites/meals/vegetarian.step
@@ -1,4 +1,4 @@
-Make sure not to use any meat!
+message "Make sure not to use any meat!"
 
 insert 'find_utensils'
 
diff --git a/spec/step_spec.rb b/spec/step_spec.rb
@@ -57,7 +57,7 @@ def step_obj_for(path)
 
     anchors = html_doc.css("a")
     names = anchors.map{|a| a["name"]}
-    assert { names == ["step1", "happy_step"] }
+    assert { names == %w(step1 happy_step) }
   end
 
   it "nests anchor numbers" do
@@ -73,11 +73,11 @@ def step_obj_for(path)
     RUBY
 
     titles = html_doc.css('.step').map{|div| div["title"]}
-    assert { titles == ["breakfast", "cereal", "eggs", "lunch", "salad", "sandwich"] }
+    assert { titles == %w(breakfast cereal eggs lunch salad sandwich) }
 
     anchors = html_doc.css("a")
     names = anchors.map{|a| a["name"]}
-    assert { names == ["step1", "step1-1", "step1-2", "step2", "step2-1", "step2-2"] }
+    assert { names == %w(step1 step1-1 step1-2 step2 step2-1 step2-2) }
   end
 
   describe 'link' do
