Merge pull request #757 from krzysiek1507/drop-rails3

drop support for Rails < 4

.travis.yml

@@ -13,7 +13,6 @@ env:
   - DB=postgresql
 
 gemfile:
-  - gemfiles/activerecord_3.2.gemfile
   - gemfiles/activerecord_4.0.gemfile
   - gemfiles/activerecord_4.1.gemfile
 
@@ -28,9 +27,3 @@ matrix:
   allow_failures:
       - gemfile: gemfiles/activerecord_edge.gemfile
       - rvm: rbx-2
-  exclude:
-      - rvm: 2.2
-        gemfile: gemfiles/activerecord_3.2.gemfile
-      - rvm: rbx-2
-        gemfile: gemfiles/activerecord_3.2.gemfile
-

Appraisals

@@ -1,7 +1,3 @@
-appraise "activerecord-3.2" do
-  gem "activerecord", github: "rails/rails" , branch: '3-2-stable'
-end
-
 appraise "activerecord-4.0" do
   gem "activerecord", github: "rails/rails" , branch: '4-0-stable'
 end

acts-as-taggable-on.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |gem|
     gem.post_install_message = File.read('UPGRADING.md')
   end
 
-  gem.add_runtime_dependency 'activerecord', ['>= 3.2', '< 5']
+  gem.add_runtime_dependency 'activerecord', ['>= 4.0', '< 5']
 
   gem.add_development_dependency 'sqlite3'
   gem.add_development_dependency 'mysql2', '~> 0.3.7'

lib/acts-as-taggable-on.rb

@@ -117,7 +117,6 @@ def self.apply_binary_collation(bincoll)
 end
 
 ActiveSupport.on_load(:active_record) do
-  extend ActsAsTaggableOn::Compatibility
   extend ActsAsTaggableOn::Taggable
   include ActsAsTaggableOn::Tagger
 end

lib/acts_as_taggable_on/taggable/core.rb

@@ -23,18 +23,15 @@ def initialize_acts_as_taggable_on_core
           class_eval do
             # when preserving tag order, include order option so that for a 'tags' context
             # the associations tag_taggings & tags are always returned in created order
-            has_many_with_taggable_compatibility context_taggings, as: :taggable,
-                                                 dependent: :destroy,
-                                                 class_name: 'ActsAsTaggableOn::Tagging',
-                                                 order: taggings_order,
-                                                 conditions: {context: tags_type},
-                                                 include: :tag
-
-            has_many_with_taggable_compatibility context_tags, through: context_taggings,
-                                                 source: :tag,
-                                                 class_name: 'ActsAsTaggableOn::Tag',
-                                                 order: taggings_order
-
+            has_many context_taggings, -> { includes(:tag).order(taggings_order).where(context: tags_type) },
+                     as: :taggable,
+                     class_name: ActsAsTaggableOn::Tagging,
+                     dependent: :destroy
+
+            has_many context_tags, -> { order(taggings_order) },
+                     class_name: ActsAsTaggableOn::Tag,
+                     through: context_taggings,
+                     source: :tag
           end
 
           taggable_mixin.class_eval <<-RUBY, __FILE__, __LINE__ + 1

lib/acts_as_taggable_on/tagger.rb

@@ -15,18 +15,19 @@ module ClassMethods
       #   end
       def acts_as_tagger(opts={})
         class_eval do
-          has_many_with_taggable_compatibility :owned_taggings,
-                                               opts.merge(
-                                                   as: :tagger,
-                                                   dependent: :destroy,
-                                                   class_name: '::ActsAsTaggableOn::Tagging'
-                                               )
+          owned_taggings_scope = opts.delete(:scope)
 
-          has_many_with_taggable_compatibility :owned_tags,
-                                               through: :owned_taggings,
-                                               source: :tag,
-                                               class_name: '::ActsAsTaggableOn::Tag',
-                                               uniq: true
+          has_many :owned_taggings, owned_taggings_scope,
+                   opts.merge(
+                     as: :tagger,
+                     class_name: ::ActsAsTaggableOn::Tagging,
+                     dependent: :destroy
+                   )
+
+          has_many :owned_tags, -> { distinct },
+                   class_name: ::ActsAsTaggableOn::Tag,
+                   source: :tag,
+                   through: :owned_taggings
         end
 
         include ActsAsTaggableOn::Tagger::InstanceMethods

lib/acts_as_taggable_on/tagging.rb

@@ -1,16 +1,5 @@
 module ActsAsTaggableOn
   class Tagging < ::ActiveRecord::Base #:nodoc:
-    #TODO, remove from 4.0.0
-    attr_accessible :tag,
-                    :tag_id,
-                    :context,
-                    :taggable,
-                    :taggable_type,
-                    :taggable_id,
-                    :tagger,
-                    :tagger_type,
-                    :tagger_id if defined?(ActiveModel::MassAssignmentSecurity)
-
     belongs_to :tag, class_name: '::ActsAsTaggableOn::Tag', counter_cache: ActsAsTaggableOn.tags_counter
     belongs_to :taggable, polymorphic: true
     belongs_to :tagger,   polymorphic: true

spec/acts_as_taggable_on/taggable_spec.rb

@@ -745,7 +745,6 @@
 
     context 'Model.limit(x).tag_counts.sum(:tags_count)' do
       it 'should not break on Mysql' do
-        # Activerecord 3.2 return a string
         expect(TaggableModel.limit(2).tag_counts.sum('tags_count').to_i).to eq(5)
       end
     end

spec/support/database.rb

@@ -13,13 +13,7 @@
   config = ActiveRecord::Base.configurations[db_name]
 
   begin
-    #activerecord 4 uses symbol
-    #TODO, remove when activerecord 3 support is dropped
-    if ActsAsTaggableOn::Utils.active_record4? || ActsAsTaggableOn::Utils.active_record5?
-      ActiveRecord::Base.establish_connection(db_name.to_sym)
-    else
-      ActiveRecord::Base.establish_connection(db_name)
-    end
+    ActiveRecord::Base.establish_connection(db_name.to_sym)
     ActiveRecord::Base.connection
   rescue
     case db_name