rb - update block formatting

Author: titusfortner

rb/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2016-06-08 19:07:43 -0700 using RuboCop version 0.37.2.
+# on 2016-06-08 19:18:26 -0700 using RuboCop version 0.37.2.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -29,15 +29,6 @@ Lint/HandleExceptions:
     - 'lib/selenium/webdriver/remote/w3c_bridge.rb'
     - 'spec/integration/selenium/webdriver/spec_support/test_environment.rb'
 
-# Offense count: 5
-# Cop supports --auto-correct.
-# Configuration parameters: IgnoreEmptyBlocks.
-Lint/UnusedBlockArgument:
-  Exclude:
-    - 'lib/selenium/webdriver/firefox/binary.rb'
-    - 'spec/integration/selenium/webdriver/remote/element_spec.rb'
-    - 'spec/unit/selenium/webdriver/phantomjs/bridge_spec.rb'
-
 # Offense count: 27
 # Cop supports --auto-correct.
 # Configuration parameters: AllowUnusedKeywordArguments, IgnoreEmptyMethods.
@@ -136,16 +127,6 @@ Style/BarePercentLiterals:
   Exclude:
     - 'spec/integration/selenium/webdriver/firefox/profile_spec.rb'
 
-# Offense count: 61
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles, ProceduralMethods, FunctionalMethods, IgnoredMethods.
-# SupportedStyles: line_count_based, semantic, braces_for_chaining
-# ProceduralMethods: benchmark, bm, bmbm, create, each_with_object, measure, new, realtime, tap, with_object
-# FunctionalMethods: let, let!, subject, watch
-# IgnoredMethods: lambda, proc, it
-Style/BlockDelimiters:
-  Enabled: false
-
 # Offense count: 5
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 # SupportedStyles: nested, compact
@@ -326,13 +307,6 @@ Style/IndentationWidth:
     - 'lib/selenium/webdriver/support/color.rb'
     - 'spec/integration/selenium/webdriver/spec_support/guards.rb'
 
-# Offense count: 2
-# Cop supports --auto-correct.
-Style/Lambda:
-  Exclude:
-    - 'spec/integration/selenium/webdriver/remote/element_spec.rb'
-    - 'spec/unit/selenium/webdriver/wait_spec.rb'
-
 # Offense count: 1
 # Cop supports --auto-correct.
 Style/LeadingCommentSpace:
@@ -486,13 +460,6 @@ Style/Semicolon:
     - 'spec/unit/selenium/webdriver/file_reaper_spec.rb'
     - 'spec/unit/selenium/webdriver/support/color_spec.rb'
 
-# Offense count: 2
-# Configuration parameters: Methods.
-# Methods: {"reduce"=>["a", "e"]}, {"inject"=>["a", "e"]}
-Style/SingleLineBlockParams:
-  Exclude:
-    - 'lib/selenium/webdriver/chrome/profile.rb'
-
 # Offense count: 2
 # Cop supports --auto-correct.
 # Configuration parameters: AllowIfMethodIsEmpty.
@@ -530,13 +497,6 @@ Style/SpaceBeforeComma:
     - 'lib/selenium/webdriver/remote/capabilities.rb'
     - 'spec/unit/selenium/webdriver/safari/bridge_spec.rb'
 
-# Offense count: 14
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles, EnforcedStyleForEmptyBraces, SpaceBeforeBlockParameters.
-# SupportedStyles: space, no_space
-Style/SpaceInsideBlockBraces:
-  Enabled: false
-
 # Offense count: 1
 # Cop supports --auto-correct.
 Style/SpaceInsideParens:
@@ -572,24 +532,6 @@ Style/StringLiterals:
 Style/StringLiteralsInInterpolation:
   Enabled: false
 
-# Offense count: 7
-# Cop supports --auto-correct.
-# Configuration parameters: IgnoredMethods.
-# IgnoredMethods: respond_to
-Style/SymbolProc:
-  Exclude:
-    - 'lib/selenium/webdriver/chrome/bridge.rb'
-    - 'lib/selenium/webdriver/remote/bridge.rb'
-    - 'lib/selenium/webdriver/safari/bridge.rb'
-    - 'lib/selenium/webdriver/support/select.rb'
-    - 'spec/unit/selenium/webdriver/file_reaper_spec.rb'
-
-# Offense count: 2
-# Cop supports --auto-correct.
-Style/Tab:
-  Exclude:
-    - 'spec/unit/selenium/webdriver/support/select_spec.rb'
-
 # Offense count: 22
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.

rb/lib/selenium/server.rb

@@ -115,9 +115,9 @@ def download(required_version)
       def latest
         require 'rexml/document'
         net_http.start("selenium-release.storage.googleapis.com") do |http|
-          REXML::Document.new(http.get("/").body).root.get_elements("//Contents/Key").map { |e|
+          REXML::Document.new(http.get("/").body).root.get_elements("//Contents/Key").map do |e|
             e.text[/selenium-server-standalone-(\d+\.\d+\.\d+)\.jar/, 1]
-          }.compact.max
+          end.compact.max
         end
       end
 

rb/lib/selenium/webdriver/chrome/bridge.rb

@@ -94,7 +94,7 @@ def create_capabilities(opts)
               raise ArgumentError, ":args must be an Array of Strings"
             end
 
-            chrome_options['args'] = args.map { |e| e.to_s }
+            chrome_options['args'] = args.map(&:to_s)
           end
 
           if profile

rb/lib/selenium/webdriver/chrome/profile.rb

@@ -54,12 +54,12 @@ def add_encoded_extension(encoded)
 
         def []=(key, value)
           parts = key.split(".")
-          parts[0..-2].inject(prefs) { |pr, k| pr[k] ||= {} }[parts.last] = value
+          parts[0..-2].inject(prefs) { |a, e| a[e] ||= {} }[parts.last] = value
         end
 
         def [](key)
           parts = key.split(".")
-          parts.inject(prefs) { |pr, k| pr.fetch(k) }
+          parts.inject(prefs) { |a, e| a.fetch(e) }
         end
 
         def layout_on_disk

rb/lib/selenium/webdriver/common/action_builder.rb

@@ -359,9 +359,9 @@ def drag_and_drop_by(source, right_by, down_by)
       #
 
       def perform
-        @actions.each { |receiver, method, args|
+        @actions.each do |receiver, method, args|
           @devices.fetch(receiver).__send__(method, *args)
-        }
+        end
 
         nil
       end

rb/lib/selenium/webdriver/firefox/binary.rb

@@ -185,7 +185,7 @@ def windows_registry_path
             lm = Win32::Registry::HKEY_LOCAL_MACHINE
             lm.open("SOFTWARE\\Mozilla\\Mozilla Firefox") do |reg|
               main = lm.open("SOFTWARE\\Mozilla\\Mozilla Firefox\\#{reg.keys[0]}\\Main")
-              if entry = main.find { |key, type, data| key =~ /pathtoexe/i }
+              if entry = main.find { |key, _type, _data| key =~ /pathtoexe/i }
                 return entry.last
               end
             end

rb/lib/selenium/webdriver/firefox/profile.rb

@@ -267,11 +267,11 @@ def read_user_prefs(path)
         end
 
         def write_prefs(prefs, path)
-          File.open(path, "w") { |file|
+          File.open(path, "w") do |file|
             prefs.each do |key, value|
               file.puts %{user_pref("#{key}", #{value.to_json});}
             end
-          }
+          end
         end
 
       end # Profile

rb/lib/selenium/webdriver/remote/bridge.rb

@@ -513,7 +513,7 @@ def getScreenOrientation
 
         def getAvailableLogTypes
           types = execute :getAvailableLogTypes
-          Array(types).map { |e| e.to_sym }
+          Array(types).map(&:to_sym)
         end
 
         def getLog(type)

rb/lib/selenium/webdriver/remote/w3c_bridge.rb

@@ -384,7 +384,7 @@ def getAllCookies
         end
 
         def deleteAllCookies
-          getAllCookies.each { |cookie| deleteCookie(cookie['name'])}
+          getAllCookies.each { |cookie| deleteCookie(cookie['name']) }
         end
 
         #
@@ -635,9 +635,9 @@ def raw_execute(command, opts = {}, command_hash = nil)
           path[':session_id'] = @session_id if path.include?(":session_id")
 
           begin
-            opts.each { |key, value|
+            opts.each do |key, value|
               path[key.inspect] = escaper.escape(value.to_s)
-            }
+            end
           rescue IndexError
             raise ArgumentError, "#{opts.inspect} invalid for #{command.inspect}"
           end

rb/lib/selenium/webdriver/safari/bridge.rb

@@ -97,7 +97,7 @@ def raw_execute(command, opts = {}, command_hash = nil)
 
         def camel_case(str)
           parts = str.split('_')
-          parts[1..-1].map { |e| e.capitalize! }
+          parts[1..-1].map(&:capitalize!)
 
           parts.join
         end