Removed ruby deprecated syntax

Rakefile

@@ -2,14 +2,14 @@ require 'rubygems'
 require 'bundler/setup'
 
 desc 'Default: run specs'
-task :default => :spec
+task default: :spec
 
 desc 'Copy sample spec database.yml over if not exists'
 task :copy_db_config do
   cp 'spec/internal/config/database.yml.sample', 'spec/internal/config/database.yml'
 end
 
-task :spec => [:copy_db_config]
+task spec: [:copy_db_config]
 
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new do |t|

db/migrate/1_acts_as_taggable_on_migration.rb

@@ -9,12 +9,12 @@ def self.up
 
       # You should make sure that the column created is
       # long enough to store the required class names.
-      t.references :taggable, :polymorphic => true
-      t.references :tagger, :polymorphic => true
+      t.references :taggable, polymorphic: true
+      t.references :tagger, polymorphic: true
 
       # Limit is created to prevent MySQL error on index
       # length for MyISAM table type: http://bit.ly/vgW2Ql
-      t.string :context, :limit => 128
+      t.string :context, limit: 128
 
       t.datetime :created_at
     end

db/migrate/2_add_missing_unique_indices.rb

@@ -1,14 +1,13 @@
 class AddMissingUniqueIndices < ActiveRecord::Migration
-
   def self.up
     add_index :tags, :name, unique: true
 
     remove_index :taggings, :tag_id
     remove_index :taggings, [:taggable_id, :taggable_type, :context]
     add_index :taggings,
-      [:tag_id, :taggable_id, :taggable_type, :context, :tagger_id, :tagger_type],
-      unique: true, name: 'taggings_idx'
-   end
+              [:tag_id, :taggable_id, :taggable_type, :context, :tagger_id, :tagger_type],
+              unique: true, name: 'taggings_idx'
+  end
 
   def self.down
     remove_index :tags, :name
@@ -17,5 +16,4 @@ def self.down
     add_index :taggings, :tag_id
     add_index :taggings, [:taggable_id, :taggable_type, :context]
   end
-
 end

db/migrate/3_add_taggings_counter_cache_to_tags.rb

@@ -1,6 +1,6 @@
 class AddTaggingsCounterCacheToTags < ActiveRecord::Migration
   def self.up
-    add_column :tags, :taggings_count, :integer, :default => 0
+    add_column :tags, :taggings_count, :integer, default: 0
 
     ActsAsTaggableOn::Tag.reset_column_information
     ActsAsTaggableOn::Tag.find_each do |tag|

lib/acts-as-taggable-on.rb

@@ -26,7 +26,7 @@ def self.respond_to?(method_name, include_private=false)
   def self.glue
     setting = @configuration.delimiter
     delimiter = setting.kind_of?(Array) ? setting[0] : setting
-    delimiter.ends_with?(" ") ? delimiter : "#{delimiter} "
+    delimiter.ends_with?(' ') ? delimiter : "#{delimiter} "
   end
 
   class Configuration
@@ -45,7 +45,6 @@ def initialize
   setup
 end
 
-
 require 'acts_as_taggable_on/utils'
 
 require 'acts_as_taggable_on/taggable'

lib/acts_as_taggable_on/acts_as_taggable_on/cache.rb

@@ -34,9 +34,7 @@ def _add_tags_caching_methods
         def columns
           @acts_as_taggable_on_cache_columns ||= begin
             db_columns = super
-            if _has_tags_cache_columns?(db_columns)
-              _add_tags_caching_methods
-            end
+            _add_tags_caching_methods if _has_tags_cache_columns?(db_columns)
             db_columns
           end
         end
@@ -79,6 +77,5 @@ def save_cached_tag_list
         true
       end
     end
-
   end
 end

lib/acts_as_taggable_on/acts_as_taggable_on/collection.rb

@@ -18,11 +18,11 @@ def #{tag_type.singularize}_counts(options = {})
             end
 
             def top_#{tag_type}(limit = 10)
-              tag_counts_on('#{tag_type}', :order => 'count desc', :limit => limit.to_i)
+              tag_counts_on('#{tag_type}', order: 'count desc', limit: limit.to_i)
             end
 
             def self.top_#{tag_type}(limit = 10)
-              tag_counts_on('#{tag_type}', :order => 'count desc', :limit => limit.to_i)
+              tag_counts_on('#{tag_type}', order: 'count desc', limit: limit.to_i)
             end
           RUBY
         end
@@ -34,11 +34,11 @@ def acts_as_taggable_on(*args)
       end
 
       def tag_counts_on(context, options = {})
-        all_tag_counts(options.merge({:on => context.to_s}))
+        all_tag_counts(options.merge({on: context.to_s}))
       end
 
       def tags_on(context, options = {})
-        all_tags(options.merge({:on => context.to_s}))
+        all_tags(options.merge({on: context.to_s}))
       end
 
       ##
@@ -75,7 +75,6 @@ def all_tags(options = {})
         tag_scope_joins(tag_scope, tagging_scope)
       end
 
-
       ##
       # Calculate the tag counts for all tags.
       #
@@ -98,7 +97,6 @@ def all_tag_counts(options = {})
         taggable_join = "INNER JOIN #{table_name} ON #{table_name}.#{primary_key} = #{ActsAsTaggableOn::Tagging.table_name}.taggable_id"
         taggable_join << " AND #{table_name}.#{inheritance_column} = '#{name}'" unless descends_from_active_record? # Current model is STI descendant, so add type checking to the join condition
 
-
         ## Generate scope:
         tagging_scope = ActsAsTaggableOn::Tagging.select("#{ActsAsTaggableOn::Tagging.table_name}.tag_id, COUNT(#{ActsAsTaggableOn::Tagging.table_name}.tag_id) AS tags_count")
         tag_scope = ActsAsTaggableOn::Tag.select("#{ActsAsTaggableOn::Tag.table_name}.*, #{ActsAsTaggableOn::Tagging.table_name}.tags_count AS count").order(options[:order]).limit(options[:limit])
@@ -154,12 +152,12 @@ def tag_scope_joins(tag_scope, tagging_scope)
     end
 
     def tag_counts_on(context, options={})
-      self.class.tag_counts_on(context, options.merge(:id => id))
+      self.class.tag_counts_on(context, options.merge(id: id))
     end
 
     module CalculationMethods
       def count(column_name = nil)
-        return super(column_name) if ActsAsTaggableOn::Utils.active_record42?
+        return super(column_name) if ActsAsTaggableOn::Utils.active_record4?
         # https://github.com/rails/rails/commit/da9b5d4a8435b744fcf278fffd6d7f1e36d4a4f2
         super(:all)
       end

lib/acts_as_taggable_on/acts_as_taggable_on/compatibility.rb

@@ -1,6 +1,6 @@
 module ActsAsTaggableOn::Compatibility
   def has_many_with_compatibility(name, options = {}, &extention)
-    if ActiveRecord::VERSION::MAJOR >= 4
+    if ActsAsTaggableOn::Utils.active_record4?
       scope, opts = build_scope_and_options(options)
       has_many(name, scope, opts, &extention)
     else
@@ -13,11 +13,12 @@ def build_scope_and_options(opts)
 
     unless scope_opts.empty?
       scope = lambda do
-        scope_opts.inject(self) { |result, hash| result.send *hash }
+        scope_opts.inject(self) { |result, hash| result.send(*hash) }
       end
+      return [scope, opts]
     end
 
-    [defined?(scope) ? scope : nil, opts]
+    [nil,opts]
   end
 
   def parse_options(opts)