Whitespace and Rubocop improvements (#35)

* Remove unnecessary whitespace
* Default rubocop -a run

Author: tldev

Rakefile

@@ -29,13 +29,11 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-
 # Load config if present
 
 config_path_ = ::File.expand_path('rakefile_config.rb', ::File.dirname(__FILE__))
-load(config_path_) if ::File.exists?(config_path_)
-RAKEFILE_CONFIG = {} unless defined?(::RAKEFILE_CONFIG)
-
+load(config_path_) if ::File.exist?(config_path_)
+RAKEFILE_CONFIG = {}.freeze unless defined?(::RAKEFILE_CONFIG)
 
 # Gemspec
 
@@ -44,7 +42,6 @@ gemspec_ = eval(::File.read(::Dir.glob('*.gemspec').first))
 release_gemspec_ = eval(::File.read(::Dir.glob('*.gemspec').first))
 release_gemspec_.version = gemspec_.version.to_s.sub(/\.nonrelease$/, '')
 
-
 # Platform info
 
 dlext_ = ::RbConfig::CONFIG['DLEXT']
@@ -74,14 +71,12 @@ platform_suffix_ =
   else 'unknown'
   end
 
-
 # Directories
 
 doc_directory_ = ::RAKEFILE_CONFIG[:doc_directory] || 'doc'
 pkg_directory_ = ::RAKEFILE_CONFIG[:pkg_directory] || 'pkg'
 tmp_directory_ = ::RAKEFILE_CONFIG[:tmp_directory] || 'tmp'
 
-
 # Build tasks
 
 internal_ext_info_ = gemspec_.extensions.map do |extconf_path_|
@@ -95,7 +90,7 @@ internal_ext_info_ = gemspec_.extensions.map do |extconf_path_|
     obj_glob: "#{source_dir_}/*.{o,dSYM}",
     suffix_makefile_path: "#{source_dir_}/Makefile_#{platform_suffix_}",
     built_lib_path: "#{source_dir_}/#{name_}.#{dlext_}",
-    staged_lib_path: "#{source_dir_}/#{name_}_#{platform_suffix_}.#{dlext_}",
+    staged_lib_path: "#{source_dir_}/#{name_}_#{platform_suffix_}.#{dlext_}"
   }
 end
 internal_ext_info_ = [] if platform_ == :jruby
@@ -118,51 +113,60 @@ internal_ext_info_.each do |info_|
   end
 end
 
-task build_ext: internal_ext_info_.map{ |info_| info_[:staged_lib_path] } do
+task build_ext: internal_ext_info_.map { |info_| info_[:staged_lib_path] } do
   internal_ext_info_.each do |info_|
     target_prefix_ = target_name_ = nil
     ::Dir.chdir(info_[:source_dir]) do
       ruby 'extconf.rb'
       ::File.open('Makefile') do |file_|
         file_.each do |line_|
           if line_ =~ /^target_prefix\s*=\s*(\S+)\s/
-            target_prefix_ = $1
+            target_prefix_ = Regexp.last_match(1)
           elsif line_ =~ /^TARGET\s*=\s*(\S+)\s/
-            target_name_ = $1
+            target_name_ = Regexp.last_match(1)
           end
         end
       end
       rm 'Makefile'
     end
-    raise "Could not find target_prefix in makefile for #{info_[:name]}" unless target_prefix_
-    raise "Could not find TARGET in makefile for #{info_[:name]}" unless target_name_
+    unless target_prefix_
+      raise "Could not find target_prefix in makefile for #{info_[:name]}"
+    end
+    unless target_name_
+      raise "Could not find TARGET in makefile for #{info_[:name]}"
+    end
+
     cp info_[:staged_lib_path], "lib#{target_prefix_}/#{target_name_}.#{dlext_}"
   end
 end
 
-
 # Clean task
 
 clean_files_ = [doc_directory_, pkg_directory_, tmp_directory_] +
-  ::Dir.glob('ext/**/Makefile*') +
-  ::Dir.glob('ext/**/*.{o,class,log,dSYM}') +
-  ::Dir.glob("**/*.{bundle,so,dll,rbc,jar}") +
-  ::Dir.glob('**/.rbx') +
-  (::RAKEFILE_CONFIG[:extra_clean_files] || [])
+               ::Dir.glob('ext/**/Makefile*') +
+               ::Dir.glob('ext/**/*.{o,class,log,dSYM}') +
+               ::Dir.glob('**/*.{bundle,so,dll,rbc,jar}') +
+               ::Dir.glob('**/.rbx') +
+               (::RAKEFILE_CONFIG[:extra_clean_files] || [])
 task :clean do
-  clean_files_.each{ |path_| rm_rf path_ }
+  clean_files_.each { |path_| rm_rf path_ }
 end
 
-
 # RDoc tasks
 
 task build_rdoc: "#{doc_directory_}/index.html"
-all_rdoc_files_ = ::Dir.glob("lib/**/*.rb") + gemspec_.extra_rdoc_files
+all_rdoc_files_ = ::Dir.glob('lib/**/*.rb') + gemspec_.extra_rdoc_files
 main_rdoc_file_ = ::RAKEFILE_CONFIG[:main_rdoc_file]
-main_rdoc_file_ = 'README.rdoc' if !main_rdoc_file_ && ::File.readable?('README.rdoc')
-main_rdoc_file_ = ::Dir.glob("*.rdoc").first unless main_rdoc_file_
+if !main_rdoc_file_ && ::File.readable?('README.rdoc')
+  main_rdoc_file_ = 'README.rdoc'
+end
+main_rdoc_file_ ||= ::Dir.glob('*.rdoc').first
 file "#{doc_directory_}/index.html" => all_rdoc_files_ do
-  rm_r doc_directory_ rescue nil
+  begin
+    rm_r doc_directory_
+  rescue StandardError
+    nil
+  end
   args_ = []
   args_ << '-o' << doc_directory_
   args_ << '--main' << main_rdoc_file_ if main_rdoc_file_
@@ -174,7 +178,6 @@ file "#{doc_directory_}/index.html" => all_rdoc_files_ do
   ::RDoc::RDoc.new.document(args_ + all_rdoc_files_)
 end
 
-
 # Gem release tasks
 
 task :build_other
@@ -197,23 +200,21 @@ task release_gem: :build_release do
   end
 end
 
-
 # Unit test task
 
-task test: [:build_ext, :build_other] do
-  $:.unshift(::File.expand_path('lib', ::File.dirname(__FILE__)))
-  if ::ENV['TESTCASE']
-    test_files_ = ::Dir.glob("test/#{::ENV['TESTCASE']}.rb")
-  else
-    test_files_ = ::Dir.glob("test/**/tc_*.rb")
-  end
+task test: %i[build_ext build_other] do
+  $LOAD_PATH.unshift(::File.expand_path('lib', ::File.dirname(__FILE__)))
+  test_files_ = if ::ENV['TESTCASE']
+                  ::Dir.glob("test/#{::ENV['TESTCASE']}.rb")
+                else
+                  ::Dir.glob('test/**/tc_*.rb')
+                end
   test_files_.each do |path_|
     load path_
     puts "Loaded testcase #{path_}"
   end
 end
 
-
 # Default task
 
-task default: [:clean, :test]
+task default: %i[clean test]

activerecord-mysql2spatial-adapter.gemspec

@@ -32,17 +32,17 @@
 ::Gem::Specification.new do |s_|
   s_.name = 'activerecord-mysql2spatial-adapter'
   s_.summary = 'An ActiveRecord adapter for MySQL Spatial Extensions, based on RGeo and the mysql2 gem.'
-  s_.description = "This is an ActiveRecord connection adapter for MySQL Spatial Extensions. It is based on the stock MySQL2 adapter, but provides built-in support for spatial columns. It uses the RGeo library to represent spatial data in Ruby."
-  s_.version = "#{::File.read('Version').strip}"
+  s_.description = 'This is an ActiveRecord connection adapter for MySQL Spatial Extensions. It is based on the stock MySQL2 adapter, but provides built-in support for spatial columns. It uses the RGeo library to represent spatial data in Ruby.'
+  s_.version = ::File.read('Version').strip.to_s
   s_.author = 'Daniel Azuma'
   s_.email = '[email protected]'
   s_.required_ruby_version = '>= 1.9.3'
   s_.files =
-    ::Dir.glob("lib/**/*.rb") +
-    ::Dir.glob("test/**/*.rb") +
-    ::Dir.glob("*.rdoc") +
+    ::Dir.glob('lib/**/*.rb') +
+    ::Dir.glob('test/**/*.rb') +
+    ::Dir.glob('*.rdoc') +
     ['Version']
-  s_.extra_rdoc_files = ::Dir.glob("*.rdoc")
+  s_.extra_rdoc_files = ::Dir.glob('*.rdoc')
   s_.platform = ::Gem::Platform::RUBY
   s_.add_dependency('activerecord', '>= 4.0', '< 4.2')
   s_.add_dependency('rgeo-activerecord', '~> 1.3')

lib/active_record/connection_adapters/mysql2spatial_adapter.rb

@@ -29,20 +29,17 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-
 require 'rgeo/active_record'
 require 'active_record/connection_adapters/mysql2_adapter'
 
 # The activerecord-mysql2spatial-adapter gem installs the *mysql2spatial*
 # connection adapter into ActiveRecord.
 
 module ActiveRecord
-
   # ActiveRecord looks for the mysql2spatial_connection factory method in
   # this class.
 
   class Base
-
     # Create a mysql2spatial connection adapter.
 
     def self.mysql2spatial_connection(config_)
@@ -54,18 +51,14 @@ def self.mysql2spatial_connection(config_)
       options_ = [config_[:host], config_[:username], config_[:password], config_[:database], config_[:port], config_[:socket], 0]
       ::ActiveRecord::ConnectionAdapters::Mysql2SpatialAdapter::MainAdapter.new(client_, logger, options_, config_)
     end
-
   end
 
   # All ActiveRecord adapters go in this namespace.
   module ConnectionAdapters
-
     # The Mysql2Spatial adapter
     module Mysql2SpatialAdapter
-
       # The name returned by the adapter_name method of this adapter.
-      ADAPTER_NAME = 'Mysql2Spatial'.freeze
-
+      ADAPTER_NAME = 'Mysql2Spatial'
     end
   end
 end

lib/active_record/connection_adapters/mysql2spatial_adapter/arel_tosql.rb

@@ -29,39 +29,35 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-
 # :stopdoc:
 
 module Arel
   module Visitors
     class MySQL2Spatial < MySQL
-
       if ::Arel::Visitors.const_defined?(:BindVisitor)
         include ::Arel::Visitors::BindVisitor
       end
 
       FUNC_MAP = {
         'st_wkttosql' => 'GeomFromText',
         'st_wkbtosql' => 'GeomFromWKB',
-        'st_length' => 'GLength',
-      }
+        'st_length' => 'GLength'
+      }.freeze
 
       include ::RGeo::ActiveRecord::SpatialToSql
 
       def st_func(standard_name_)
         if (name_ = FUNC_MAP[standard_name_.downcase])
           name_
         elsif standard_name_ =~ /^st_(\w+)$/i
-          $1
+          Regexp.last_match(1)
         else
           standard_name_
         end
       end
-
     end
 
     VISITORS['mysql2spatial'] = ::Arel::Visitors::MySQL2Spatial
-
   end
 end
 

lib/active_record/connection_adapters/mysql2spatial_adapter/column_methods.rb

@@ -3,7 +3,10 @@ module ConnectionAdapters
     module Mysql2SpatialAdapter
       module ColumnMethods
         def spatial(name, options = {})
-          raise "You must set a type. For example: 't.spatial limit: { type: 'point' }'" unless options[:limit][:type]
+          unless options[:limit][:type]
+            raise "You must set a type. For example: 't.spatial limit: { type: 'point' }'"
+          end
+
           column(name, options[:limit][:type], options)
         end
 
@@ -40,7 +43,7 @@ def point(name, options = {})
         end
       end
 
-      ConnectionAdapters::TableDefinition.send(:include, ColumnMethods)
+      ConnectionAdapters::TableDefinition.include ColumnMethods
     end
   end
 end

lib/active_record/connection_adapters/mysql2spatial_adapter/main_adapter.rb

@@ -29,14 +29,12 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-
 # :stopdoc:
 
 module ActiveRecord
   module ConnectionAdapters
     module Mysql2SpatialAdapter
       class MainAdapter < ConnectionAdapters::Mysql2Adapter
-
         NATIVE_DATABASE_TYPES = Mysql2Adapter::NATIVE_DATABASE_TYPES.merge(spatial: { name: 'geometry' })
 
         def initialize(*args_)
@@ -63,15 +61,15 @@ def native_database_types
           NATIVE_DATABASE_TYPES
         end
 
-        def quote(value_, column_=nil)
+        def quote(value_, column_ = nil)
           if ::RGeo::Feature::Geometry.check_type(value_)
             "GeomFromWKB(0x#{::RGeo::WKRep::WKBGenerator.new(hex_format: true).generate(value_)},#{value_.srid})"
           else
             super
           end
         end
 
-        def type_to_sql(type_, limit_=nil, precision_=nil, scale_=nil)
+        def type_to_sql(type_, limit_ = nil, precision_ = nil, scale_ = nil)
           if (info_ = spatial_column_constructor(type_.to_sym))
             type_ = limit_[:type] || type_ if limit_.is_a?(::Hash)
             type_ = 'geometry' if type_.to_s == 'spatial'
@@ -80,51 +78,52 @@ def type_to_sql(type_, limit_=nil, precision_=nil, scale_=nil)
           super(type_, limit_, precision_, scale_)
         end
 
-        def add_index(table_name_, column_name_, options_={})
+        def add_index(table_name_, column_name_, options_ = {})
           if options_[:spatial]
             index_name_ = index_name(table_name_, column: Array(column_name_))
-            if ::Hash === options_
-              index_name_ = options_[:name] || index_name_
-            end
-            execute "CREATE SPATIAL INDEX #{index_name_} ON #{table_name_} (#{Array(column_name_).join(", ")})"
+            index_name_ = options_[:name] || index_name_ if ::Hash === options_
+            execute "CREATE SPATIAL INDEX #{index_name_} ON #{table_name_} (#{Array(column_name_).join(', ')})"
           else
             super
           end
         end
 
-        def columns(table_name_, name_=nil)
+        def columns(table_name_, _name_ = nil)
           result_ = execute("SHOW FIELDS FROM #{quote_table_name(table_name_)}", :skip_logging)
           columns_ = []
           result_.each(symbolize_keys: true, as: :hash) do |field_|
             columns_ << SpatialColumn.new(@rgeo_factory_settings, table_name_.to_s,
-              field_[:Field], field_[:Default], field_[:Type], field_[:Null] == "YES")
+                                          field_[:Field], field_[:Default], field_[:Type], field_[:Null] == 'YES')
           end
           columns_
         end
 
         # Returns an array of indexes for the given table.
-        def indexes(table_name_, name_=nil)
+        def indexes(table_name_, name_ = nil)
           indexes_ = []
           current_index_ = nil
           result_ = execute("SHOW KEYS FROM #{quote_table_name(table_name_)}", name_)
           result_.each(symbolize_keys: true, as: :hash) do |row_|
             if current_index_ != row_[:Key_name]
               next if row_[:Key_name] == 'PRIMARY' # skip the primary key
+
               current_index_ = row_[:Key_name]
               mysql_index_type = row_[:Index_type].downcase.to_sym
-              index_type  = INDEX_TYPES.include?(mysql_index_type)  ? mysql_index_type : nil
+              index_type = INDEX_TYPES.include?(mysql_index_type) ? mysql_index_type : nil
               index_using = INDEX_USINGS.include?(mysql_index_type) ? mysql_index_type : nil
               options = [row_[:Table], row_[:Key_name], row_[:Non_unique].to_i == 0, [], [], nil, nil, index_type, index_using]
               indexes_ << if mysql_index_type == :spatial
-                options.push(true)
-                ::RGeo::ActiveRecord::SpatialIndexDefinition.new(*options)
-              else
-                IndexDefinition.new(*options)
+                            options.push(true)
+                            ::RGeo::ActiveRecord::SpatialIndexDefinition.new(*options)
+                          else
+                            IndexDefinition.new(*options)
               end
             end
             last_index_ = indexes_.last
             last_index_.columns << row_[:Column_name]
-            last_index_.lengths << row_[:Sub_part] unless mysql_index_type == :spatial
+            unless mysql_index_type == :spatial
+              last_index_.lengths << row_[:Sub_part]
+            end
           end
           indexes_
         end