Added rubocop gem and fixed style, no functional changes

removed trailing whitespace and fixed other whitespace issues
convert 1.8 hash syntax
change double to single quotes where possible
style changes such as preferring map over collect

Author: Anna Carey

.rubocop.yml

@@ -0,0 +1,20 @@
+AllCops:
+  Exclude:
+    - doc/**/*
+    - test/**/*
+LineLength:
+  Max: 200
+Documentation:
+  Enabled: false
+MethodLength:
+  Enabled: false
+
+# TODO: enable after the more important stuff is fixed
+LineLength:
+  Enabled: false
+CyclomaticComplexity:
+  Enabled: false
+SignalException:
+  Enabled: false
+MethodName:
+  Enabled: false

Gemfile

@@ -2,7 +2,7 @@
 source 'https://rubygems.org'
 
 if ENV['RAILS_SOURCE']
-  gemspec :path => ENV['RAILS_SOURCE']
+  gemspec path: ENV['RAILS_SOURCE']
 else
   # Need to get rails source beacause the gem doesn't include tests
   version = ENV['RAILS_VERSION'] || begin
@@ -17,19 +17,19 @@ else
       !data['prerelease'] && major == a && (minor.nil? || minor == b)
     end.first['number']
   end
-  gem 'rails', :git => "git://github.com/rails/rails.git", :tag => "v#{version}"
+  gem 'rails', git: "git://github.com/rails/rails.git", tag: "v#{version}"
 end
 
 if ENV['AREL']
-  gem 'arel', :path => ENV['AREL']
+  gem 'arel', path: ENV['AREL']
 end
 
 group :tinytds do
   if ENV['TINYTDS_SOURCE']
-    gem 'tiny_tds', :path => ENV['TINYTDS_SOURCE']
+    gem 'tiny_tds', path: ENV['TINYTDS_SOURCE']
   else
     # TODO: [Rails4] Change back... segfault caused by tiny_tds 0.6.1
-    gem 'tiny_tds', :git =>"https://github.com/rails-sqlserver/tiny_tds.git"
+    gem 'tiny_tds', git:"https://github.com/rails-sqlserver/tiny_tds.git"
   end
 end
 
@@ -44,8 +44,8 @@ group :development do
   gem 'minitest-spec-rails'
   gem 'nokogiri'
   gem 'rake', '~> 0.9.2'
+  gem 'rubocop'
   gem 'ruby-prof'
   gem 'simplecov'
   gem 'ruby-graphviz'
 end
-

README.md

@@ -36,7 +36,7 @@ Every class that sub classes ActiveRecord::Base will now have an execute_procedu
 ```ruby
 Account.execute_procedure :update_totals, 'admin', nil, true
 # Or with named parameters.
-Account.execute_procedure :update_totals, :named => 'params'
+Account.execute_procedure :update_totals, named: 'params'
 ```
 
 #### Native Data Type Support
@@ -53,9 +53,9 @@ Currently the following custom data types have been tested for schema definition
 For example:
 
 ```ruby
-create_table :sql_server_custom_types, :force => true do |t|
-  t.column :ten_code,       :char,      :limit => 10
-  t.column :ten_code_utf8,  :nchar,     :limit => 10
+create_table :sql_server_custom_types, force: true do |t|
+  t.column :ten_code,       :char,      limit: 10
+  t.column :ten_code_utf8,  :nchar,     limit: 10
   t.column :title_utf8,     :nvarchar
   t.column :body,           :varchar_max    # Creates varchar(max)
   t.column :body_utf8,      :ntext
@@ -159,7 +159,7 @@ end
 The 3.2 version of the adapter support ActiveRecord's explain features. In SQL Server, this is called the showplan. By default we use the `SHOWPLAN_ALL` option and format it using a simple table printer. So the following ruby would log the plan table below it.
 
 ```ruby
-Car.where(:id => 1).explain
+Car.where(id: 1).explain
 ```
 
 ```

Rakefile

@@ -6,25 +6,25 @@ AREL_PATH = Gem.loaded_specs['arel'].full_gem_path
 # Notes for cross compile:
 # $ gcla ; bundle install ; rake compile ; rake cross compile ; rake cross native gem
 
-def test_libs(mode='dblib')
+def test_libs
   ['lib',
    'test',
-   "#{File.join(AR_PATH,'test')}",
-   "#{File.join(AREL_PATH,'test')}",
+   "#{File.join(AR_PATH, 'test')}",
+   "#{File.join(AREL_PATH, 'test')}"
  ]
 end
 
 # bundle exec rake test SQLSERVER_ONLY=true
-# 
+#
 # If you have trouble running single tests (errors about requirements):
 # http://veganswithtypewriters.net/blog/2013/06/29/weirdness-with-rake-solved/
 def test_files
-  test_setup = ["test/cases/sqlserver_helper.rb"]
+  test_setup = ['test/cases/sqlserver_helper.rb']
 
   return test_setup + (ENV['TEST_FILES']).split(',') if ENV['TEST_FILES']
-  
-  sqlserver_cases = Dir.glob("test/cases/**/*_test_sqlserver.rb")
-  
+
+  sqlserver_cases = Dir.glob('test/cases/**/*_test_sqlserver.rb')
+
   ar_cases = Dir.glob("#{AR_PATH}/test/cases/**/*_test.rb")
   adapter_cases = Dir.glob("#{AR_PATH}/test/cases/adapters/**/*_test.rb")
 
@@ -39,57 +39,54 @@ def test_files
   else
     test_setup + arel_cases + sqlserver_cases + (ar_cases - adapter_cases)
   end
-  
 end
 
-task :test => ['test:dblib']
-task :default => [:test]
-
+task test: ['test:dblib']
+task default: [:test]
 
 namespace :test do
-  
-  ['dblib','odbc'].each do |mode|
-    
+
+  %w(dblib odbc).each do |mode|
+
     Rake::TestTask.new(mode) do |t|
-      t.libs = test_libs(mode)
+      t.libs = test_libs
       t.test_files = test_files
       t.verbose = true
     end
-    
+
   end
-  
+
   task 'dblib:env' do
     ENV['ARCONN'] = 'dblib'
   end
-  
-  task 'odbc:env' do 
+
+  task 'odbc:env' do
     ENV['ARCONN'] = 'odbc'
   end
-  
+
 end
 
 task 'test:dblib' => 'test:dblib:env'
 task 'test:odbc' => 'test:odbc:env'
 
 
 namespace :profile do
-  
-  ['dblib','odbc'].each do |mode|
+  %w(dblib odbc).each do |mode|
     namespace mode.to_sym do
-      
-      Dir.glob("test/profile/*_profile_case.rb").sort.each do |test_file|
-        
-        profile_case = File.basename(test_file).sub('_profile_case.rb','')
-        
+
+      Dir.glob('test/profile/*_profile_case.rb').sort.each do |test_file|
+
+        profile_case = File.basename(test_file).sub('_profile_case.rb', '')
+
         Rake::TestTask.new(profile_case) do |t|
-          t.libs = test_libs(mode)
+          t.libs = test_libs
           t.test_files = [test_file]
           t.verbose = true
         end
-        
+
       end
-      
+
     end
   end
-  
+
 end

activerecord-sqlserver-adapter.gemspec

@@ -1,21 +1,20 @@
-$:.push File.expand_path("../lib", __FILE__)
+$LOAD_PATH.push File.expand_path('../lib', __FILE__)
 
 Gem::Specification.new do |s|
   s.platform      = Gem::Platform::RUBY
-  s.name          = "activerecord-sqlserver-adapter"
-  s.version       = File.read(File.expand_path("../VERSION",__FILE__)).strip
-  s.summary       = "ActiveRecord SQL Server Adapter. For SQL Server 2005 And Higher."
-  s.description   = "ActiveRecord SQL Server Adapter. For SQL Server 2005 And Higher."
-  
-  s.authors       = ['Ken Collins', 'Murray Steele', 'Shawn Balestracci', 'Joe Rafaniello', 'Tom Ward']
-  s.email         = "ken@metaskills.net"
-  s.homepage      = "http://github.com/rails-sqlserver/activerecord-sqlserver-adapter"
-  
-  s.files         = Dir['CHANGELOG', 'MIT-LICENSE', 'README.rdoc', 'VERSION', 'lib/**/*' ]
+  s.name          = 'activerecord-sqlserver-adapter'
+  s.version       = File.read(File.expand_path('../VERSION', __FILE__)).strip
+  s.summary       = 'ActiveRecord SQL Server Adapter. For SQL Server 2005 And Higher.'
+  s.description   = 'ActiveRecord SQL Server Adapter. For SQL Server 2005 And Higher.'
+
+  s.authors       = ['Ken Collins', 'Anna Carey', 'Murray Steele', 'Shawn Balestracci', 'Joe Rafaniello', 'Tom Ward']
+  s.email         = 'ken@metaskills.net'
+  s.homepage      = 'http://github.com/rails-sqlserver/activerecord-sqlserver-adapter'
+
+  s.files         = Dir['CHANGELOG', 'MIT-LICENSE', 'README.rdoc', 'VERSION', 'lib/**/*']
   s.require_path  = 'lib'
   s.rubyforge_project = 'activerecord-sqlserver-adapter'
-  
+
   s.add_dependency('activerecord', '~> 4.0.0')
   s.add_dependency('arel', '~> 4.0.1')
 end
-

lib/active_record/connection_adapters/sqlserver/core_ext/active_record.rb

@@ -3,20 +3,18 @@ module ConnectionAdapters
     module Sqlserver
       module CoreExt
         module ActiveRecord
-          
           extend ActiveSupport::Concern
-          
+
           included do
             class_attribute :coerced_sqlserver_date_columns, :coerced_sqlserver_time_columns
             self.coerced_sqlserver_date_columns = Set.new
             self.coerced_sqlserver_time_columns = Set.new
           end
 
           module ClassMethods
-            
             def execute_procedure(proc_name, *variables)
               if connection.respond_to?(:execute_procedure)
-                connection.execute_procedure(proc_name,*variables)
+                connection.execute_procedure(proc_name, *variables)
               else
                 []
               end
@@ -29,14 +27,11 @@ def coerce_sqlserver_date(*attributes)
             def coerce_sqlserver_time(*attributes)
               self.coerced_sqlserver_time_columns += attributes.map(&:to_s)
             end
-
           end
-
         end
       end
     end
   end
 end
 
-
 ActiveRecord::Base.send :include, ActiveRecord::ConnectionAdapters::Sqlserver::CoreExt::ActiveRecord

lib/active_record/connection_adapters/sqlserver/core_ext/explain.rb

@@ -3,19 +3,18 @@ module ConnectionAdapters
     module Sqlserver
       module CoreExt
         module Explain
-          
-          SQLSERVER_STATEMENT_PREFIX = "EXEC sp_executesql "
+          SQLSERVER_STATEMENT_PREFIX = 'EXEC sp_executesql '
           SQLSERVER_PARAM_MATCHER = /@\d+ =/
-          
+
           def exec_explain(queries)
             unprepared_queries = queries.map { |sql, bind| [unprepare_sqlserver_statement(sql), bind] }
             super(unprepared_queries)
           end
-          
+
           private
-          
-          # This is somewhat hacky, but it should reliably reformat our prepared sql statment 
-          # which uses sp_executesql to just the first argument, then unquote it. Likewise our 
+
+          # This is somewhat hacky, but it should reliably reformat our prepared sql statment
+          # which uses sp_executesql to just the first argument, then unquote it. Likewise our
           # do_exec_query method should substitude the @n args withe the quoted values.
           def unprepare_sqlserver_statement(sql)
             if sql.starts_with?(SQLSERVER_STATEMENT_PREFIX)
@@ -29,8 +28,6 @@ def unprepare_sqlserver_statement(sql)
               sql
             end
           end
-
-          
         end
       end
     end

lib/active_record/connection_adapters/sqlserver/core_ext/odbc.rb

@@ -3,36 +3,26 @@ module ConnectionAdapters
     module Sqlserver
       module CoreExt
         module ODBC
-
           module Statement
-            
             def finished?
-              begin
-                connected?
-                false
-              rescue ::ODBC::Error
-                true
-              end
+              connected?
+              false
+            rescue ::ODBC::Error
+              true
             end
-            
           end
 
           module Database
-            
             def run_block(*args)
               yield sth = run(*args)
               sth.drop
             end
-            
           end
-
         end
       end
     end
   end
 end
 
-
 ODBC::Statement.send :include, ActiveRecord::ConnectionAdapters::Sqlserver::CoreExt::ODBC::Statement
 ODBC::Database.send :include, ActiveRecord::ConnectionAdapters::Sqlserver::CoreExt::ODBC::Database
-

lib/active_record/connection_adapters/sqlserver/core_ext/relation.rb

@@ -3,13 +3,11 @@ module ConnectionAdapters
     module Sqlserver
       module CoreExt
         module Relation
-          
           private
-          
+
           def tables_in_string(string)
             super - ['__rnt']
           end
-          
         end
       end
     end

lib/active_record/connection_adapters/sqlserver/database_limits.rb

@@ -2,7 +2,6 @@ module ActiveRecord
   module ConnectionAdapters
     module Sqlserver
       module DatabaseLimits
-        
         def table_alias_length
           128
         end
@@ -32,17 +31,16 @@ def columns_per_multicolumn_index
         end
 
         def in_clause_length
-          65536
+          65_536
         end
 
         def sql_query_length
-          65536 * 4096
+          65_536 * 4_096
         end
 
         def joins_per_query
           256
         end
-        
       end
     end
   end