easy_tags 0.2.0 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 312d2148fbdb21f7a654cc811c25fefe5aad46befa9af7f6334b2cd5be127287
-  data.tar.gz: 72f837865e19dfd7ea73f0db1a11f42c81f5c78e3db7608b5196ca152baf53d4
+  metadata.gz: bff1e7a35c7c1093f9b32c7e92bc5ec1a77fec676d06e463b22827498aa58383
+  data.tar.gz: 1e042bd6a98e526f227aa7e98642e014e8505e7d126a4981c537fdc83240f9b0
 SHA512:
-  metadata.gz: fd12957155fe36706edeb580f3a97d1603fc5729ee9db7062f786cc430d1404d899793476a4f35643987b3e06d54188c4d538db86fd8a11e9603a043a692007d
-  data.tar.gz: 5ccfa9bac407e740fe5b74e4c1c03d1bb2dedcc1d2207fccf14e1ae72714d639fca343805d6029241d81e5b50d539b5176b9b86912ae9825958549e6e44dab51
+  metadata.gz: 67d3dab3a3d9d65f77e3510abce3c7a3467a300726e0d109548d32c7076db64bdf3965b6044e4f7c03faaae1c2d6c0a0a13c6de04717b8ebb10df3e3f5d63c05
+  data.tar.gz: 5869e18439ad14d8f2f0c818e7e719907df1c70bb4db7c307db05a0b4ffd0dc4bea206e72c1d34ee6a5e8eb5ce2018dd49a794b7737b60aa9da1bc8e3b42908f

data/.travis.yml

@@ -14,16 +14,14 @@ script:
 after_script:
   - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT
 rvm:
-  - 2.3.8
-  - 2.4.5
   - 2.5.3
   - 2.6.0
   - ruby-head
 gemfile:
   - Gemfile
-  - gemfiles/activerecord_5.0.gemfile
   - gemfiles/activerecord_5.1.gemfile
   - gemfiles/activerecord_5.2.gemfile
+  - gemfiles/activerecord_6.0.gemfile
 matrix:
   allow_failures:
     - rvm: ruby-head

data/Appraisals

@@ -1,8 +1,3 @@
-appraise 'activerecord-5.0' do
-  gem 'activerecord', '~> 5.0.0'
-  gem 'activesupport', '~> 5.0.0'
-end
-
 appraise 'activerecord-5.1' do
   gem 'activerecord', '~> 5.1.0'
   gem 'activesupport', '~> 5.1.0'
@@ -12,3 +7,8 @@ appraise 'activerecord-5.2' do
   gem 'activerecord', '~> 5.2.0'
   gem 'activesupport', '~> 5.2.0'
 end
+
+appraise 'activerecord-6.0' do
+  gem 'activerecord', '~> 6.0.0'
+  gem 'activesupport', '~> 6.0.0'
+end

data/CHANGELOG.md

@@ -6,6 +6,27 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.2.5] - 2020-06-09
+### Fixed
+- Added association cache invalidation after tag changes are persisted
+(fixes issue with explicit reload required to refresh `context_tags`)
+
+## [0.2.4] - 2020-06-09
+### Fixed
+- Fixed tags eager loading
+
+## [0.2.3] - 2020-01-15
+### Added
+- Rails 6.0 support
+
+## [0.2.2] - 2019-10-24
+### Fixed
+- Fixed inspect and compare for context objects (delegate to tags list) that may have affected debug and testing
+
+## [0.2.1] - 2019-10-24
+### Fixed
+- Fixed `.add` and `.remove` methods not implementing properly dirty behavior
+
 ## [0.2.0] - 2019-09-12
 ### Added
 - `[context]_list_persisted` interface method for accessing persisted/previous tag list string
@@ -13,6 +34,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [0.1.0] - 2019-07-15
 Initial release
 
-[Unreleased]: https://github.com/iiwo/easy_tagscompare/v0.2.0...HEAD
+[Unreleased]: https://github.com/iiwo/easy_tagscompare/v0.2.5...HEAD
+[0.2.5]: https://github.com/iiwo/easy_tags/compare/v0.2.4...v0.2.5
+[0.2.4]: https://github.com/iiwo/easy_tags/compare/v0.2.3...v0.2.4
+[0.2.3]: https://github.com/iiwo/easy_tags/compare/v0.2.2...v0.2.3
+[0.2.2]: https://github.com/iiwo/easy_tags/compare/v0.2.1...v0.2.2
+[0.2.1]: https://github.com/iiwo/easy_tags/compare/v0.2.0...v0.2.1
 [0.2.0]: https://github.com/iiwo/easy_tags/compare/v0.1.0...v0.2.0
 [0.1.0]: https://github.com/iiwo/easy_tags/releases/tag/v0.1.0

data/easy_tags.gemspec

@@ -27,15 +27,16 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'activerecord', '~> 5.0'
-  spec.add_runtime_dependency 'activesupport', '~> 5.0'
+  spec.add_runtime_dependency 'activerecord', '>= 5.0', '< 6.1'
+  spec.add_runtime_dependency 'activesupport', '>= 5.0', '< 6.1'
 
   spec.add_development_dependency 'appraisal'
   spec.add_development_dependency 'database_cleaner'
+  spec.add_development_dependency 'db-query-matchers'
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'rspec-rails'
   spec.add_development_dependency 'simplecov'
   spec.add_development_dependency 'simplecov-console'
-  spec.add_development_dependency 'sqlite3', '~> 1.3.6'
+  spec.add_development_dependency 'sqlite3'
 end
 # rubocop:enable Metrics/BlockLength

data/gemfiles/activerecord_5.1.gemfile

@@ -1,8 +1,8 @@
 # This file was generated by Appraisal
 
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
-gem 'activerecord', '~> 5.1.0'
-gem 'activesupport', '~> 5.1.0'
+gem "activerecord", "~> 5.1.0"
+gem "activesupport", "~> 5.1.0"
 
-gemspec path: '../'
+gemspec path: "../"

data/gemfiles/activerecord_5.2.gemfile

@@ -1,8 +1,8 @@
 # This file was generated by Appraisal
 
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
-gem 'activerecord', '~> 5.2.0'
-gem 'activesupport', '~> 5.2.0'
+gem "activerecord", "~> 5.2.0"
+gem "activesupport", "~> 5.2.0"
 
-gemspec path: '../'
+gemspec path: "../"

data/gemfiles/activerecord_6.0.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 6.0.0"
+gem "activesupport", "~> 6.0.0"
+
+gemspec path: "../"

data/lib/easy_tags.rb

@@ -5,6 +5,7 @@ require 'active_record'
 module EasyTags
   extend ActiveSupport::Autoload
 
+  autoload :DirtyMethods, 'easy_tags/dirty_methods'
   autoload :Tag, 'easy_tags/tag'
   autoload :TaggableMethods, 'easy_tags/taggable_methods'
   autoload :TaggableContextMethods, 'easy_tags/taggable_context_methods'

data/lib/easy_tags/dirty_methods.rb

@@ -0,0 +1,26 @@
+module EasyTags
+  # Handles dirty behaviour
+  module DirtyMethods
+    RAILS_6 = ::ActiveRecord.gem_version >= ::Gem::Version.new('6.0.0')
+
+    def _mark_dirty(context:, taggable_context:)
+      _set_dirty_previous_value(attribute_name: "#{context}_list", value: taggable_context.persisted_tags.to_s)
+      write_attribute("#{context}_list", taggable_context.tags.to_s)
+      attribute_will_change!("#{context}_list")
+    end
+
+    if RAILS_6
+      def _set_dirty_previous_value(attribute_name:, value:)
+        @attributes[attribute_name] = ActiveModel::Attribute.from_user(
+          attribute_name,
+          value,
+          ActiveModel::Type::Value.new
+        )
+      end
+    else
+      def _set_dirty_previous_value(attribute_name:, value:)
+        set_attribute_was(attribute_name, value)
+      end
+    end
+  end
+end

data/lib/easy_tags/taggable_context.rb

@@ -2,11 +2,11 @@ module EasyTags
   # Handles tag context manipulation
   class TaggableContext
     # @param [String, Symbol] context
-    # @param [Proc] refresh_persisted_tags
+    # @param [ActiveRecord::Relation] tags_association
     # @param [Proc] on_change
-    def initialize(context:, refresh_persisted_tags:, on_change:)
+    def initialize(context:, tags_association:, on_change:)
       self.context = context
-      self.refresh_persisted_tags = refresh_persisted_tags
+      self.tags_association = tags_association
       self.on_change = on_change
     end
 
@@ -22,7 +22,7 @@ module EasyTags
 
     # @return [TagList]
     def persisted_tags
-      @persisted_tags ||= TagList.new(refresh_persisted_tags.call)
+      @persisted_tags ||= preloaded_persisted_tags
     end
 
     # @param [String, Symbol] value
@@ -30,7 +30,7 @@ module EasyTags
     def update(value)
       @tags = TagList.new(value)
 
-      on_change.call(self) if changed?
+      notify_change
     end
 
     # @return [TagList]
@@ -47,10 +47,51 @@ module EasyTags
     def refresh
       @tags = nil
       @persisted_tags = nil
+      tags_association.reset
     end
 
+    # Add tags to the tag_list. Duplicate or blank tags will be ignored.
+    #
+    # Example:
+    #   tag_list.add('Fun', 'Happy')
+    def add(*names)
+      tags.add(*names).tap do
+        notify_change
+      end
+    end
+
+    # Remove item from list
+    #
+    # Example:
+    #   tag_list.remove('Issues')
+    def remove(value)
+      tags.remove(value).tap do
+        notify_change
+      end
+    end
+
+    delegate :==, :<=>, :to_s, :inspect, :hash, to: :tags
+
     private
 
-      attr_accessor :context, :refresh_persisted_tags, :on_change
+      attr_accessor :context, :tags_association, :on_change
+
+      def respond_to_missing?(name, _include_private = false)
+        tags.respond_to?(name)
+      end
+
+      def method_missing(name, *args, &block)
+        return super unless respond_to_missing?(name)
+
+        tags.send(name, *args, &block)
+      end
+
+      def notify_change
+        on_change.call(self) if changed?
+      end
+
+      def preloaded_persisted_tags
+        TagList.new(tags_association.map(&:name))
+      end
   end
 end

data/lib/easy_tags/taggable_context_methods.rb

@@ -33,7 +33,7 @@ module EasyTags
           attribute :#{context}_list, ActiveModel::Type::Value.new
 
           def #{context}
-            _taggable_context(:#{context}).tags
+            _taggable_context(:#{context})
           end
 
           def #{context}=(value)

data/lib/easy_tags/taggable_methods.rb

@@ -14,14 +14,6 @@ module EasyTags
             inverse_of: :taggable
           )
 
-          has_many(
-            :base_tags,
-            through: :taggings,
-            source: :tag,
-            class_name: '::EasyTags::Tag',
-            inverse_of: :tag
-          )
-
           after_save :_update_taggings, :_refresh_tagging
           after_find :_refresh_tagging
 
@@ -65,18 +57,12 @@ module EasyTags
               end
             end
 
-            def _mark_dirty(context:, taggable_context:)
-              write_attribute("#{context}_list", taggable_context.tags.to_s)
-              set_attribute_was("#{context}_list", taggable_context.persisted_tags.to_s)
-              attribute_will_change!("#{context}_list")
-            end
+            include DirtyMethods
 
             def _taggable_context(context)
               _taggable_contexts[context] ||= TaggableContext.new(
                 context: context,
-                refresh_persisted_tags: lambda {
-                  taggings.joins(:tag).where(context: context).pluck(:name)
-                },
+                tags_association: public_send("#{context}_tags"),
                 on_change: lambda { |tag_context|
                   _mark_dirty(context: context, taggable_context: tag_context)
                 }

data/lib/easy_tags/version.rb

@@ -1,3 +1,3 @@
 module EasyTags
-  VERSION = '0.2.0'.freeze
+  VERSION = '0.2.5'.freeze
 end

metadata

@@ -1,43 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: easy_tags
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.5
 platform: ruby
 authors:
 - Iwo Dziechciarow
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-13 00:00:00.000000000 Z
+date: 2020-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +78,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: db-query-matchers
+  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: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -126,16 +152,16 @@ dependencies:
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.6
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.6
+        version: '0'
 description: Easy tagging for Rails
 email:
 - iiwo@o2.pl
@@ -159,10 +185,11 @@ files:
 - bin/console
 - bin/setup
 - easy_tags.gemspec
-- gemfiles/activerecord_5.0.gemfile
 - gemfiles/activerecord_5.1.gemfile
 - gemfiles/activerecord_5.2.gemfile
+- gemfiles/activerecord_6.0.gemfile
 - lib/easy_tags.rb
+- lib/easy_tags/dirty_methods.rb
 - lib/easy_tags/generators/default.rb
 - lib/easy_tags/options/callback.rb
 - lib/easy_tags/options/collection.rb
@@ -201,7 +228,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: EasyTags allows you to tag a single model on several contexts

data/gemfiles/activerecord_5.0.gemfile

@@ -1,8 +0,0 @@
-# This file was generated by Appraisal
-
-source 'https://rubygems.org'
-
-gem 'activerecord', '~> 5.0.0'
-gem 'activesupport', '~> 5.0.0'
-
-gemspec path: '../'