acts-as-taggable-on 5.0.0 → 6.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f768ffeb2be31c4e8e131a9b89f796a325aba09f
-  data.tar.gz: d4528a4f594547d31f508300b8188b17fe507295
+SHA256:
+  metadata.gz: fe5fa5ea1924bedec74d51412d0c11dbde1ef9338cd62990105c9e67ad46366b
+  data.tar.gz: 3a969a26de5b8c9d96e776db6d7597558385c98a0c174062f98c6df1ee86868d
 SHA512:
-  metadata.gz: 4246008aa86bb98b30fcb23787e5ddc94af40d8b677701a202ea6db8be2fe30cbab2117bc8b4eb2e2803f02605e392d5bd271ce77155a45d631f9ae6a3f83451
-  data.tar.gz: 6df3714193f6004ff5d69e4bd54f54b866804dcfcb6b6d08721302c22f7da442005b19200a43628b0e5e734dcbf3a5e892435fcda2652c24ea62635c3bff5d4b
+  metadata.gz: f6c71ae58961f24310da59aaba97995f17170e454c66f22f34f86b7aedb85a9d5a8ddc1adb05f439c05b9adde51695a42e86a1a7552de862b80c2367caecac21
+  data.tar.gz: a4b6c33320bfb0d35177bc8997292ce033ea3fd1f87ccc04dd3c579d3ab7023087e189b488a2fcbcce6ba1848fbca8e4b8e47bc7f8e9d0ae5ad4fcff53a48a90

data/.gitignore

@@ -9,5 +9,5 @@ tmp*.sw?
 tmp
 *.gem
 *.lock
-
+*.iml
 /.idea

data/.travis.yml

@@ -2,8 +2,10 @@ language: ruby
 cache: bundler
 
 rvm:
-  - 2.4.1
-  - 2.3.3
+  - ruby-head
+  - 2.5.1
+  - 2.4.4
+  - 2.3.7
   - 2.2.7
 
 env:
@@ -12,9 +14,9 @@ env:
   - DB=postgresql
 
 gemfile:
+  - gemfiles/activerecord_5.2.gemfile
   - gemfiles/activerecord_5.1.gemfile
   - gemfiles/activerecord_5.0.gemfile
-  - gemfiles/activerecord_4.2.gemfile
 
 sudo: false
 
@@ -26,4 +28,6 @@ before_install:
 script: bundle exec rake
 
 matrix:
+  allow_failures:
+    - rvm: ruby-head
   fast_finish: true

data/Appraisals

@@ -1,3 +1,7 @@
+appraise 'activerecord-5.2' do
+  gem 'activerecord', '~> 5.2.0'
+end
+
 appraise 'activerecord-5.1' do
   gem 'activerecord', "~> 5.1.1"
 end
@@ -5,7 +9,3 @@ end
 appraise 'activerecord-5.0' do
   gem 'activerecord', "~> 5.0.3"
 end
-
-appraise "activerecord-4.2" do
-  gem "activerecord", "~> 4.2.8"
-end

data/CHANGELOG.md

@@ -4,6 +4,15 @@ Each change should fall into categories that would affect whether the release is
 
 As such, a _Feature_ would map to either major or minor. A _bug fix_ to a patch.  And _misc_ is either minor or patch, the difference being kind of fuzzy for the purposes of history.  Adding tests would be patch level.
 
+### [6.0.0 / 2017-06-19](https://github.com/mbleigh/acts-as-taggable-on/compare/v5.0.0...v6.0.0)
+  * Breaking Changes
+   * [@Fodoj Drop support for Rails 4.2](https://github.com/mbleigh/acts-as-taggable-on/pull/887)
+  * Added
+   * [@CalvertYang Add support for uuid primary keys](https://github.com/mbleigh/acts-as-taggable-on/pull/898)
+   * [@Fodoj Support Rails 5.2](https://github.com/mbleigh/acts-as-taggable-on/pull/887)
+  * Fixes
+   * [@tekniklr matches_attribute was not being used in tag_match_type](https://github.com/mbleigh/acts-as-taggable-on/pull/869)  
+
 ### [5.0.0 / 2017-05-18](https://github.com/mbleigh/acts-as-taggable-on/compare/v4.0.0...v5.0.0)
   * Breaking Changes
     * [@seuros  Drop support for old version of ActiveRecord and Ruby and prepare rel](https://github.com/mbleigh/acts-as-taggable-on/pull/828)
@@ -47,36 +56,26 @@ As such, a _Feature_ would map to either major or minor. A _bug fix_ to a patch.
   * [@jh125486 Fixed wildcard test (postgres returning rows with unexpected order)] (https://github.com/mbleigh/acts-as-taggable-on/pull/660 )
   * [@FlowerWrong Add rails 5.0.0 alpha support, not hack rails <5](https://github.com/mbleigh/acts-as-taggable-on/pull/673 )
   * [@ryanfox1985 Added missed indexes. ](https://github.com/mbleigh/acts-as-taggable-on/pull/682 )
-   * [@ zapnap scope tags to specific tagging ](https://github.com/mbleigh/acts-as-taggable-on/pull/697 )
-   * [@ amatsuda method redefined](https://github.com/mbleigh/acts-as-taggable-on/pull/715 )
-   * [@ klacointe Rails 5: Tagger is optional in Tagging relation](https://github.com/mbleigh/acts-as-taggable-on/pull/720 )
-   * [@ mark-jacobs Update clean! method to use case insensitive uniq! when strict_case_match false] (https://github.com/mbleigh/acts-as-taggable-on/commit/90c86994b70a399b8b1cbc0ae88835e14d6aadfc )
-   * [@ lukeasrodgers BugFix flackey time test ] (https://github.com/mbleigh/acts-as-taggable-on/pull/727)
-   * [@ pcupueran Add rspec tests for context scopes for tagging_spec ]( https://github.com/mbleigh/acts-as-taggable-on/pull/740)
-   * [@ Emerson Huitt Remove existing selects from relation ]( https://github.com/mbleigh/acts-as-taggable-on/pull/743)
-   * [@keerthisiv fix issue with custom delimiter]( https://github.com/mbleigh/acts-as-taggable-on/pull/748)
-   * [@priyank-gupta  specify tag table name for mysql collation query ](https://github.com/mbleigh/acts-as-taggable-on/pull/760)
-   * [@seuros Remove warning messages](https://github.com/mbleigh/acts-as-taggable-on/commit/cda08c764b07a18b8582b948d1c5b3910a3769  65)
-   * [@rbritom  Fix migration, #references already adds index ]
-  (https://github.com/mbleigh/acts-as-taggable-on/commit/95f743010954b6b738a6e8c17315112c878f7a81  )
-   * [@rbritom  Fix deprecation warning]
-  (https://github.com/mbleigh/acts-as-taggable-on/commit/62e4a6fa74ae3faed615683cd3ad5b5cdacf5c96 )
-   * [@rbritom  fix scope array arguments ]
-  (https://github.com/mbleigh/acts-as-taggable-on/commit/a415a8d6367b2e91bd7e363589135f953929b8cc )
-   * [@seuros Remove more deprecations  ]
-  (https://github.com/mbleigh/acts-as-taggable-on/commit/05794170f64f8bf250b34d2d594e368721009278)
-     * [@lukeasrodgers   Bugfix `TagList#concat` with non-duplicates. ]
-  (https://github.com/mbleigh/acts-as-taggable-on/commit/2c6214f0ddf8c6440ab81eec04d1fbf9d97c8826)
-   * [@seuros  clean! should return self. ]
-  (https://github.com/mbleigh/acts-as-taggable-on/commit/c739422f56f8ff37e3f321235e74997422a1c980)
-  * [@rbritom  renable appraisals ]
-  (https://github.com/mbleigh/acts-as-taggable-on/commit/0ca1f1c5b059699c683a28b522e86a3d5cd7639e)
-  * [@rbritom  remove index conditionally on up method. ]
-  (https://github.com/mbleigh/acts-as-taggable-on/commit/9cc580e7f88164634eb10c8826e5b30ea0e00544)
-   *[@rbritom add index on down method . ]
-  (https://github.com/mbleigh/acts-as-taggable-on/pull/767)
-  q* [@rbritom remove index conditionally on up method]
-  (https://github.com/mbleigh/acts-as-taggable-on/commit/9cc580e7f88164634eb10c8826e5b30ea0e00544)
+  * [@ zapnap scope tags to specific tagging ](https://github.com/mbleigh/acts-as-taggable-on/pull/697 )
+  * [@ amatsuda method redefined](https://github.com/mbleigh/acts-as-taggable-on/pull/715 )
+  * [@ klacointe Rails 5: Tagger is optional in Tagging relation](https://github.com/mbleigh/acts-as-taggable-on/pull/720 )
+  * [@ mark-jacobs Update clean! method to use case insensitive uniq! when strict_case_match false](https://github.com/mbleigh/acts-as-taggable-on/commit/90c86994b70a399b8b1cbc0ae88835e14d6aadfc )
+  * [@ lukeasrodgers BugFix flackey time test ](https://github.com/mbleigh/acts-as-taggable-on/pull/727)
+  * [@ pcupueran Add rspec tests for context scopes for tagging_spec ]( https://github.com/mbleigh/acts-as-taggable-on/pull/740)
+  * [@ Emerson Huitt Remove existing selects from relation ]( https://github.com/mbleigh/acts-as-taggable-on/pull/743)
+  * [@keerthisiv fix issue with custom delimiter]( https://github.com/mbleigh/acts-as-taggable-on/pull/748)
+  * [@priyank-gupta  specify tag table name for mysql collation query ](https://github.com/mbleigh/acts-as-taggable-on/pull/760)
+  * [@seuros Remove warning messages](https://github.com/mbleigh/acts-as-taggable-on/commit/cda08c764b07a18b8582b948d1c5b3910a376965)
+  * [@rbritom  Fix migration, #references already adds index ](https://github.com/mbleigh/acts-as-taggable-on/commit/95f743010954b6b738a6e8c17315112c878f7a81)
+  * [@rbritom  Fix deprecation warning](https://github.com/mbleigh/acts-as-taggable-on/commit/62e4a6fa74ae3faed615683cd3ad5b5cdacf5c96 )
+  * [@rbritom  fix scope array arguments ](https://github.com/mbleigh/acts-as-taggable-on/commit/a415a8d6367b2e91bd7e363589135f953929b8cc )
+  * [@seuros Remove more deprecations  ](https://github.com/mbleigh/acts-as-taggable-on/commit/05794170f64f8bf250b34d2d594e368721009278)
+  * [@lukeasrodgers   Bugfix `TagList#concat` with non-duplicates. ](https://github.com/mbleigh/acts-as-taggable-on/commit/2c6214f0ddf8c6440ab81eec04d1fbf9d97c8826)
+  * [@seuros  clean! should return self. ](https://github.com/mbleigh/acts-as-taggable-on/commit/c739422f56f8ff37e3f321235e74997422a1c980)
+  * [@rbritom  renable appraisals ](https://github.com/mbleigh/acts-as-taggable-on/commit/0ca1f1c5b059699c683a28b522e86a3d5cd7639e)
+  * [@rbritom  remove index conditionally on up method. ](https://github.com/mbleigh/acts-as-taggable-on/commit/9cc580e7f88164634eb10c8826e5b30ea0e00544)
+  *[@rbritom add index on down method . ](https://github.com/mbleigh/acts-as-taggable-on/pull/767)
+  * [@rbritom remove index conditionally on up method](https://github.com/mbleigh/acts-as-taggable-on/commit/9cc580e7f88164634eb10c8826e5b30ea0e00544)
 
  * Documentation
   * [@logicminds Adds table of contents using doctoc utility](https://github.com/mbleigh/acts-as-taggable-on/pull/803)

data/Gemfile

@@ -1,11 +1,11 @@
 source 'https://rubygems.org'
 
-# gemspec
+gemspec
 
 group :local_development do
   gem 'guard'
   gem 'guard-rspec'
   gem 'appraisal'
   gem 'rake'
-  gem 'byebug' , platforms: [:mri_21, :mri_22, :mri_23]
+  gem 'byebug', platforms: [:mri]
 end

data/README.md

@@ -57,7 +57,7 @@ was used.
 To use it, add it to your Gemfile:
 
 ```ruby
-gem 'acts-as-taggable-on', '~> 4.0'
+gem 'acts-as-taggable-on', '~> 5.0'
 ```
 
 and bundle:

data/acts-as-taggable-on.gemspec

@@ -22,11 +22,7 @@ Gem::Specification.new do |gem|
     gem.post_install_message = File.read('UPGRADING.md')
   end
 
-  gem.add_runtime_dependency 'activerecord', ['>= 4.2.8']
-
-  gem.add_development_dependency 'sqlite3'
-  gem.add_development_dependency 'mysql2', '~> 0.3'
-  gem.add_development_dependency 'pg'
+  gem.add_runtime_dependency 'activerecord', ['~> 5.0']
 
   gem.add_development_dependency 'rspec-rails'
   gem.add_development_dependency 'rspec-its'

data/gemfiles/activerecord_5.0.gemfile

@@ -3,6 +3,14 @@
 source "https://rubygems.org"
 
 gem "activerecord", "~> 5.0.3"
+case ENV["DB"]
+when "postgresql"
+  gem 'pg'
+when "mysql"
+  gem 'mysql2', '~> 0.3'
+else
+  gem 'sqlite3'
+end
 
 group :local_development do
   gem "guard"

data/gemfiles/activerecord_5.1.gemfile

@@ -3,6 +3,14 @@
 source "https://rubygems.org"
 
 gem "activerecord", "~> 5.1.1"
+case ENV["DB"]
+when "postgresql"
+  gem 'pg'
+when "mysql"
+  gem 'mysql2', '~> 0.3'
+else
+  gem 'sqlite3'
+end
 
 group :local_development do
   gem "guard"

data/gemfiles/{activerecord_4.2.gemfile → activerecord_5.2.gemfile}

@@ -2,7 +2,15 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", "~> 4.2.8"
+gem "activerecord", "~> 5.2.0"
+case ENV["DB"]
+when "postgresql"
+  gem 'pg'
+when "mysql"
+  gem 'mysql2', '~> 0.3'
+else
+  gem 'sqlite3'
+end
 
 group :local_development do
   gem "guard"

data/lib/acts_as_taggable_on/taggable.rb

@@ -96,7 +96,6 @@ module ActsAsTaggableOn
       include Cache
       include Ownership
       include Related
-      include Dirty
     end
   end
 end

data/lib/acts_as_taggable_on/taggable/collection.rb

@@ -174,7 +174,7 @@ module ActsAsTaggableOn::Taggable
       # See https://github.com/rails/rails/blob/master/activerecord/lib/active_record/relation/calculations.rb#L38
       def count(column_name = :all, options = {})
         # https://github.com/rails/rails/commit/da9b5d4a8435b744fcf278fffd6d7f1e36d4a4f2
-        ActsAsTaggableOn::Utils.active_record5? ? super(column_name) : super(column_name, options)
+        super(column_name)
       end
     end
   end

data/lib/acts_as_taggable_on/taggable/core.rb

@@ -2,6 +2,7 @@ require_relative 'tagged_with_query'
 
 module ActsAsTaggableOn::Taggable
   module Core
+
     def self.included(base)
       base.extend ActsAsTaggableOn::Taggable::Core::ClassMethods
 
@@ -28,12 +29,16 @@ module ActsAsTaggableOn::Taggable
             has_many context_taggings, -> { includes(:tag).order(taggings_order).where(context: tags_type) },
                      as: :taggable,
                      class_name: 'ActsAsTaggableOn::Tagging',
-                     dependent: :destroy
+                     dependent: :destroy,
+                     after_add: :dirtify_tag_list,
+                     after_remove: :dirtify_tag_list
 
             has_many context_tags, -> { order(taggings_order) },
                      class_name: 'ActsAsTaggableOn::Tag',
                      through: context_taggings,
                      source: :tag
+
+            attribute "#{tags_type.singularize}_list".to_sym, ActiveModel::Type::Value.new
           end
 
           taggable_mixin.class_eval <<-RUBY, __FILE__, __LINE__ + 1
@@ -42,12 +47,24 @@ module ActsAsTaggableOn::Taggable
             end
 
             def #{tag_type}_list=(new_tags)
+              parsed_new_list = ActsAsTaggableOn.default_parser.new(new_tags).parse
+
+              if self.class.preserve_tag_order? || parsed_new_list.sort != #{tag_type}_list.sort
+                set_attribute_was('#{tag_type}_list', #{tag_type}_list)
+                write_attribute("#{tag_type}_list", parsed_new_list)
+              end
+
               set_tag_list_on('#{tags_type}', new_tags)
             end
 
             def all_#{tags_type}_list
               all_tags_list_on('#{tags_type}')
             end
+
+            private
+            def dirtify_tag_list(tagging)
+              attribute_will_change! tagging.context.singularize+"_list"
+            end
           RUBY
         end
       end
@@ -161,7 +178,7 @@ module ActsAsTaggableOn::Taggable
 
       if ActsAsTaggableOn::Utils.using_postgresql?
         group_columns = grouped_column_names_for(ActsAsTaggableOn::Tag)
-        scope.order("max(#{tagging_table_name}.created_at)").group(group_columns)
+        scope.order(Arel.sql("max(#{tagging_table_name}.created_at)")).group(group_columns)
       else
         scope.group("#{ActsAsTaggableOn::Tag.table_name}.#{ActsAsTaggableOn::Tag.primary_key}")
       end.to_a
@@ -181,33 +198,16 @@ module ActsAsTaggableOn::Taggable
       add_custom_context(context)
 
       variable_name = "@#{context.to_s.singularize}_list"
-      process_dirty_object(context, new_list) unless custom_contexts.include?(context.to_s)
 
-      instance_variable_set(variable_name, ActsAsTaggableOn.default_parser.new(new_list).parse)
+      parsed_new_list = ActsAsTaggableOn.default_parser.new(new_list).parse
+
+      instance_variable_set(variable_name, parsed_new_list)
     end
 
     def tagging_contexts
       self.class.tag_types.map(&:to_s) + custom_contexts
     end
 
-    def process_dirty_object(context, new_list)
-      value = new_list.is_a?(Array) ? ActsAsTaggableOn::TagList.new(new_list) : new_list
-      attrib = "#{context.to_s.singularize}_list"
-
-      if changed_attributes.include?(attrib)
-        # The attribute already has an unsaved change.
-        old = changed_attributes[attrib]
-        @changed_attributes.delete(attrib) if old.to_s == value.to_s
-      else
-        old = tag_list_on(context)
-        if self.class.preserve_tag_order
-          @changed_attributes[attrib] = old if old.to_s != value.to_s
-        else
-          @changed_attributes[attrib] = old.to_s if old.sort != ActsAsTaggableOn.default_parser.new(value).parse.sort
-        end
-      end
-    end
-
     def reload(*args)
       self.class.tag_types.each do |context|
         instance_variable_set("@#{context.to_s.singularize}_list", nil)
@@ -315,3 +315,4 @@ module ActsAsTaggableOn::Taggable
     end
   end
 end
+

data/lib/acts_as_taggable_on/taggable/ownership.rb

@@ -49,7 +49,7 @@ module ActsAsTaggableOn::Taggable
     end
 
     def owner_tags_on(owner, context)
-      scope = owner_tags(owner).where(
+      owner_tags(owner).where(
         "#{ActsAsTaggableOn::Tagging.table_name}" => {
           context: context
         }

data/lib/acts_as_taggable_on/taggable/related.rb

@@ -49,7 +49,7 @@ module ActsAsTaggableOn::Taggable
     private
 
     def exclude_self(klass, id)
-      "#{klass.table_name}.#{klass.primary_key} != #{id} AND" if [self.class.base_class, self.class].include? klass
+      "#{klass.arel_table[klass.primary_key].not_eq(id).to_sql} AND" if [self.class.base_class, self.class].include? klass
     end
 
     def group_columns(klass)

data/lib/acts_as_taggable_on/taggable/tagged_with_query/all_tags_query.rb

@@ -49,12 +49,10 @@ module ActsAsTaggableOn::Taggable::TaggedWithQuery
       end
 
       if options[:on].present?
-        on_condition = on_condition.and(tagging_alias[:context].lteq(options[:on]))
+        on_condition = on_condition.and(tagging_alias[:context].eq(options[:on]))
       end
 
       if (owner = options[:owned_by]).present?
-        owner_table = owner.class.base_class.arel_table
-
         on_condition = on_condition.and(tagging_alias[:tagger_id].eq(owner.id))
                                    .and(tagging_alias[:tagger_type].eq(owner.class.base_class.to_s))
       end
@@ -75,7 +73,7 @@ module ActsAsTaggableOn::Taggable::TaggedWithQuery
       end
 
       if options[:on].present?
-        on_condition = on_condition.and(tagging_arel_table[:context].lteq(options[:on]))
+        on_condition = on_condition.and(tagging_arel_table[:context].eq(options[:on]))
       end
 
       on_condition

data/lib/acts_as_taggable_on/taggable/tagged_with_query/any_tags_query.rb

@@ -3,7 +3,7 @@ module ActsAsTaggableOn::Taggable::TaggedWithQuery
     def build
       taggable_model.select(all_fields)
                     .where(model_has_at_least_one_tag)
-                    .order(order_conditions)
+                    .order(Arel.sql(order_conditions))
                     .readonly(false)
     end
 
@@ -14,9 +14,6 @@ module ActsAsTaggableOn::Taggable::TaggedWithQuery
     end
 
     def model_has_at_least_one_tag
-      tagging_alias = tagging_arel_table.alias(alias_name(tag_list))
-
-
       tagging_arel_table.project(Arel.star).where(at_least_one_tag).exists
     end
 
@@ -38,12 +35,10 @@ module ActsAsTaggableOn::Taggable::TaggedWithQuery
       end
 
       if options[:on].present?
-        exists_contition = exists_contition.and(tagging_arel_table[:context].lteq(options[:on]))
+        exists_contition = exists_contition.and(tagging_arel_table[:context].eq(options[:on]))
       end
 
       if (owner = options[:owned_by]).present?
-        owner_table = owner.class.base_class.arel_table
-
         exists_contition = exists_contition.and(tagging_arel_table[:tagger_id].eq(owner.id))
                                    .and(tagging_arel_table[:tagger_type].eq(owner.class.base_class.to_s))
       end

data/lib/acts_as_taggable_on/taggable/tagged_with_query/exclude_tags_query.rb

@@ -63,7 +63,7 @@ module ActsAsTaggableOn::Taggable::TaggedWithQuery
       end
 
       if options[:on].present?
-        on_condition = on_condition.and(tagging_arel_table[:context].lteq(options[:on]))
+        on_condition = on_condition.and(tagging_arel_table[:context].eq(options[:on]))
       end
 
       on_condition

data/lib/acts_as_taggable_on/taggable/tagged_with_query/query_base.rb

@@ -29,9 +29,9 @@ module ActsAsTaggableOn::Taggable::TaggedWithQuery
       matches_attribute = matches_attribute.lower unless ActsAsTaggableOn.strict_case_match
 
       if options[:wild].present?
-        tag_arel_table[:name].matches("%#{escaped_tag(tag)}%", "!")
+        matches_attribute.matches("%#{escaped_tag(tag)}%", "!")
       else
-        tag_arel_table[:name].matches(escaped_tag(tag), "!")
+        matches_attribute.matches(escaped_tag(tag), "!")
       end
     end
 
@@ -48,7 +48,7 @@ module ActsAsTaggableOn::Taggable::TaggedWithQuery
 
     def escaped_tag(tag)
       tag = tag.downcase unless ActsAsTaggableOn.strict_case_match
-      tag.gsub(/[!%_]/) { |x| '!' + x }
+      ActsAsTaggableOn::Utils.escape_like(tag)
     end
 
     def adjust_taggings_alias(taggings_alias)

data/lib/acts_as_taggable_on/tagging.rb

@@ -4,7 +4,7 @@ module ActsAsTaggableOn
     belongs_to :tag, class_name: '::ActsAsTaggableOn::Tag', counter_cache: ActsAsTaggableOn.tags_counter
     belongs_to :taggable, polymorphic: true
 
-    belongs_to :tagger, {polymorphic: true}.tap {|o| o.merge!(optional: true) if ActsAsTaggableOn::Utils.active_record5? }
+    belongs_to :tagger, {polymorphic: true}.tap {|o| o.merge!(optional: true) }
 
     scope :owned_by, ->(owner) { where(tagger: owner) }
     scope :not_owned, -> { where(tagger_id: nil, tagger_type: nil) }

data/lib/acts_as_taggable_on/utils.rb

@@ -20,10 +20,6 @@ module ActsAsTaggableOn
         Digest::SHA1.hexdigest(string)[0..6]
       end
 
-      def active_record5?
-        ::ActiveRecord::VERSION::MAJOR == 5
-      end
-
       def like_operator
         using_postgresql? ? 'ILIKE' : 'LIKE'
       end

data/lib/acts_as_taggable_on/version.rb

@@ -1,4 +1,4 @@
 module ActsAsTaggableOn
-  VERSION = '5.0.0'
+  VERSION = '6.0.0'
 end
 

data/spec/acts_as_taggable_on/{taggable/dirty_spec.rb → dirty_spec.rb}

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 require 'spec_helper'
 
-describe ActsAsTaggableOn::Taggable::Dirty do
+describe 'Dirty behavior of taggable objects' do
   context 'with un-contexted tags' do
     before(:each) do
       @taggable = TaggableModel.create(tag_list: 'awesome, epic')
@@ -14,19 +14,27 @@ describe ActsAsTaggableOn::Taggable::Dirty do
       end
 
       it 'should show changes of dirty object' do
-        expect(@taggable.changes).to eq({'tag_list' => ['awesome, epic', ['one']]})
+        expect(@taggable.changes).to eq({'tag_list' => [['awesome', 'epic'], ['one']]})
       end
 
-      it 'flags tag_list as changed' do
-        expect(@taggable.tag_list_changed?).to be_truthy
+      it 'should show changes of freshly initialized dirty object' do
+        taggable = TaggableModel.find(@taggable.id)
+        taggable.tag_list = 'one'
+        expect(taggable.changes).to eq({'tag_list' => [['awesome', 'epic'], ['one']]})
+      end
+
+      if Rails.version >= "5.1"
+        it 'flags tag_list as changed' do
+          expect(@taggable.will_save_change_to_tag_list?).to be_truthy
+        end
       end
 
       it 'preserves original value' do
-        expect(@taggable.tag_list_was).to eq('awesome, epic')
+        expect(@taggable.tag_list_was).to eq(['awesome', 'epic'])
       end
 
       it 'shows what the change was' do
-        expect(@taggable.tag_list_change).to eq(['awesome, epic', ['one']])
+        expect(@taggable.tag_list_change).to eq([['awesome', 'epic'], ['one']])
       end
 
       context 'without order' do
@@ -90,7 +98,7 @@ describe ActsAsTaggableOn::Taggable::Dirty do
       end
 
       it 'should show changes of dirty object' do
-        expect(@taggable.changes).to eq({'language_list' => ['awesome, epic', ['one']]})
+        expect(@taggable.changes).to eq({'language_list' => [['awesome', 'epic'], ['one']]})
       end
 
       it 'flags language_list as changed' do
@@ -98,15 +106,11 @@ describe ActsAsTaggableOn::Taggable::Dirty do
       end
 
       it 'preserves original value' do
-        expect(@taggable.language_list_was).to eq('awesome, epic')
+        expect(@taggable.language_list_was).to eq(['awesome', 'epic'])
       end
 
       it 'shows what the change was' do
-        expect(@taggable.language_list_change).to eq(['awesome, epic', ['one']])
-      end
-
-      it 'shows what the changes were' do
-        expect(@taggable.language_list_changes).to eq(['awesome, epic', ['one']])
+        expect(@taggable.language_list_change).to eq([['awesome', 'epic'], ['one']])
       end
     end
 
@@ -123,5 +127,16 @@ describe ActsAsTaggableOn::Taggable::Dirty do
         expect(@taggable.changes).to be_empty
       end
     end
+
+    context 'when language_list changed by association' do
+      let(:tag) { ActsAsTaggableOn::Tag.new(name: 'one') }
+
+      it 'flags language_list as changed' do
+        expect(@taggable.changes).to be_empty
+        @taggable.languages << tag
+        expect(@taggable.language_list_changed?).to be_truthy
+      end
+    end
+
   end
 end

data/spec/acts_as_taggable_on/taggable_spec.rb

@@ -255,14 +255,17 @@ describe 'Taggable' do
   end
 
   it 'should be able to find by tag with context' do
-    @taggable.skill_list = 'ruby, rails, css'
-    @taggable.tag_list = 'bob, charlie'
+    @taggable.skill_list = 'ruby, rails, css, julia'
+    @taggable.tag_list = 'bob, charlie, julia'
     @taggable.save
 
     expect(TaggableModel.tagged_with('ruby').first).to eq(@taggable)
     expect(TaggableModel.tagged_with('ruby, css').first).to eq(@taggable)
     expect(TaggableModel.tagged_with('bob', on: :skills).first).to_not eq(@taggable)
     expect(TaggableModel.tagged_with('bob', on: :tags).first).to eq(@taggable)
+    expect(TaggableModel.tagged_with('julia', on: :skills).size).to eq(1)
+    expect(TaggableModel.tagged_with('julia', on: :tags).size).to eq(1)
+    expect(TaggableModel.tagged_with('julia', on: nil).size).to eq(2)
   end
 
   it 'should not care about case' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts-as-taggable-on
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 6.0.0
 platform: ruby
 authors:
 - Michael Bleigh
@@ -9,64 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-21 00:00:00.000000000 Z
+date: 2018-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.2.8
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.2.8
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
-  type: :development
+        version: '5.0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
-- !ruby/object:Gem::Dependency
-  name: pg
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -165,9 +123,9 @@ files:
 - db/migrate/4_add_missing_taggable_index.rb
 - db/migrate/5_change_collation_for_tag_names.rb
 - db/migrate/6_add_missing_indexes_on_taggings.rb
-- gemfiles/activerecord_4.2.gemfile
 - gemfiles/activerecord_5.0.gemfile
 - gemfiles/activerecord_5.1.gemfile
+- gemfiles/activerecord_5.2.gemfile
 - lib/acts-as-taggable-on.rb
 - lib/acts_as_taggable_on.rb
 - lib/acts_as_taggable_on/default_parser.rb
@@ -179,7 +137,6 @@ files:
 - lib/acts_as_taggable_on/taggable/cache.rb
 - lib/acts_as_taggable_on/taggable/collection.rb
 - lib/acts_as_taggable_on/taggable/core.rb
-- lib/acts_as_taggable_on/taggable/dirty.rb
 - lib/acts_as_taggable_on/taggable/ownership.rb
 - lib/acts_as_taggable_on/taggable/related.rb
 - lib/acts_as_taggable_on/taggable/tagged_with_query.rb
@@ -197,12 +154,12 @@ files:
 - spec/acts_as_taggable_on/acts_as_tagger_spec.rb
 - spec/acts_as_taggable_on/caching_spec.rb
 - spec/acts_as_taggable_on/default_parser_spec.rb
+- spec/acts_as_taggable_on/dirty_spec.rb
 - spec/acts_as_taggable_on/generic_parser_spec.rb
 - spec/acts_as_taggable_on/related_spec.rb
 - spec/acts_as_taggable_on/single_table_inheritance_spec.rb
 - spec/acts_as_taggable_on/tag_list_spec.rb
 - spec/acts_as_taggable_on/tag_spec.rb
-- spec/acts_as_taggable_on/taggable/dirty_spec.rb
 - spec/acts_as_taggable_on/taggable_spec.rb
 - spec/acts_as_taggable_on/tagger_spec.rb
 - spec/acts_as_taggable_on/tagging_spec.rb
@@ -258,7 +215,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Advanced tagging for Rails.
@@ -267,12 +224,12 @@ test_files:
 - spec/acts_as_taggable_on/acts_as_tagger_spec.rb
 - spec/acts_as_taggable_on/caching_spec.rb
 - spec/acts_as_taggable_on/default_parser_spec.rb
+- spec/acts_as_taggable_on/dirty_spec.rb
 - spec/acts_as_taggable_on/generic_parser_spec.rb
 - spec/acts_as_taggable_on/related_spec.rb
 - spec/acts_as_taggable_on/single_table_inheritance_spec.rb
 - spec/acts_as_taggable_on/tag_list_spec.rb
 - spec/acts_as_taggable_on/tag_spec.rb
-- spec/acts_as_taggable_on/taggable/dirty_spec.rb
 - spec/acts_as_taggable_on/taggable_spec.rb
 - spec/acts_as_taggable_on/tagger_spec.rb
 - spec/acts_as_taggable_on/tagging_spec.rb

data/lib/acts_as_taggable_on/taggable/dirty.rb

@@ -1,36 +0,0 @@
-module ActsAsTaggableOn::Taggable
-  module Dirty
-    def self.included(base)
-      base.extend ActsAsTaggableOn::Taggable::Dirty::ClassMethods
-
-      base.initialize_acts_as_taggable_on_dirty
-    end
-
-    module ClassMethods
-      def initialize_acts_as_taggable_on_dirty
-        tag_types.map(&:to_s).each do |tags_type|
-          tag_type         = tags_type.to_s.singularize
-
-          class_eval <<-RUBY, __FILE__, __LINE__ + 1
-            def #{tag_type}_list_changed?
-              changed_attributes.include?("#{tag_type}_list")
-            end
-
-            def #{tag_type}_list_was
-              changed_attributes.include?("#{tag_type}_list") ? changed_attributes["#{tag_type}_list"] : __send__("#{tag_type}_list")
-            end
-
-            def #{tag_type}_list_change
-              [changed_attributes['#{tag_type}_list'], __send__('#{tag_type}_list')] if changed_attributes.include?("#{tag_type}_list")
-            end
-
-            def #{tag_type}_list_changes
-              [changed_attributes['#{tag_type}_list'], __send__('#{tag_type}_list')] if changed_attributes.include?("#{tag_type}_list")
-            end
-          RUBY
-
-        end
-      end
-    end
-  end
-end