easy_tags 0.2.2 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb06e1ee49d89ee14b96399332522ffe2a1992d0617ffc21d0205f03d3420d4a
-  data.tar.gz: 6d80b72229751717a9c6b2103285ba9666cad97147d1bbe6789ef3c0b75d85c2
+  metadata.gz: 28e114c5f8de3ceaf5728fecfe910c88464e1eb0067732a7b24bb9c7c5935c89
+  data.tar.gz: 064c888f328cfa05f9e3de0c6d0b0b8c90957134ef02ed97ce17140760f5de13
 SHA512:
-  metadata.gz: 79e003d812d2f74ffdff9355ad09619cbfc8a5ea21cecccff36fcf0fee825a041897146c791bddf58c9b1b94ccf5d7704c86256c80e4666c4ae525ecf5148c4f
-  data.tar.gz: 3804f90c2bc81ce007f59a8d710c2f2749df7cd3cc9a2316b818bb4178731700bd8830528f9c0622e1c1d948e919f7518c43380076047e8c9cdf010adffb389e
+  metadata.gz: 9b5e9917f9f0e40c441ec4ded539fd6f4179d9dd835d508c28f1ad137c7b968a382013d9a0169f9c6b0abcdbd2f868c000d7e80e61b0176d6dea691092d06aaa
+  data.tar.gz: 3265ee7814dea6f750594558e99fe8ab58c5577c61358851e77e6e2c5e480774e4cf9125b2f59ec9d9fb54b26beab0b32af99f8eee800154ae388391408a9018

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,23 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.2.6] - 2022-01-21
+### Fixed
+- Fixed bug with reload method arguments forwarding. [Issue #36](https://github.com/iiwo/easy_tags/issues/36)
+
+## [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
@@ -21,8 +38,12 @@ 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
-[0.2.1]: https://github.com/iiwo/easy_tags/compare/v0.2.1...v0.2.2
+[Unreleased]: https://github.com/iiwo/easy_tagscompare/v0.2.6...HEAD
+[0.2.6]: https://github.com/iiwo/easy_tags/compare/v0.2.5...v0.2.6
+[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/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
@@ -47,6 +47,7 @@ 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.
@@ -73,7 +74,7 @@ module EasyTags
 
     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)
@@ -88,5 +89,9 @@ module EasyTags
       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_methods.rb

@@ -14,20 +14,12 @@ 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
 
           # override ActiveRecord::Persistence#reload
           # to refresh tags each time the model instance gets reloaded
-          def reload
+          def reload(*args)
             _refresh_tagging
             super
           end
@@ -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.2'.freeze
+  VERSION = '0.2.6'.freeze
 end

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'

metadata

@@ -1,43 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: easy_tags
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.6
 platform: ruby
 authors:
 - Iwo Dziechciarow
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-10-24 00:00:00.000000000 Z
+date: 2022-01-21 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
@@ -186,7 +213,7 @@ metadata:
   changelog_uri: https://github.com/iiwo/easy_tags/blob/master/CHANGELOG.md
   source_code_uri: https://github.com/iiwo/easy_tags
   bug_tracker_uri: https://github.com/iiwo/easy_tags/issues
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -201,8 +228,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
-signing_key: 
+rubygems_version: 3.2.9
+signing_key:
 specification_version: 4
 summary: EasyTags allows you to tag a single model on several contexts
 test_files: []

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: '../'