easy_tags 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7dc33730db127f2b295d1965a40d3f1a26398a15298eed3f737c75c78d5b2d89
-  data.tar.gz: 6242af5c9b8e2fbeece7924c8a3296f9a0493237b2474bc53dbdc0b8167e2177
+  metadata.gz: 8287fdecc7f7ef46be4d02d25db0781471ce1bd039a4e6f0ed357d4ff9ba0a46
+  data.tar.gz: 2d3e23375449f4c229948825e6aadf8194a76bd47d00a480050140124db0fa10
 SHA512:
-  metadata.gz: 596d6f43a3afc179d5ad929f96a225de792ac3994091de2c148cd669343b0bdf361a6dcff2333a15d3740d087f85687620b933a2558a2b95629d857374f6589b
-  data.tar.gz: 0e86be8f5ff60cf8cb6d40aa364225ac90aab6147f448e73a27e4fbff74a846199409d2b8a770151abe0ed00f8e8f960fe4dc15e2cd49056e122d23f002e895b
+  metadata.gz: eef88df3c81e4f130f1a59aaad9c6c7ea74752bc8e4bdc6279f8ee716be7fd27d7f576c7c132aca38a3d3e93aa3052dc2b838a3e9f505be08a41225cbe7636da
+  data.tar.gz: 1302a9207d12f0980cca36d93f01595d1293456f4d2a8a28427a63857a236ad78aae83daffd4b8881c28dc2c856eadc999808cb7a2b2e0641521609f3e0651ff

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'

data/CHANGELOG.md

@@ -6,6 +6,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [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 +29,10 @@ 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.4...HEAD
+[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

@@ -32,6 +32,7 @@ Gem::Specification.new do |spec|
 
   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'

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
@@ -73,7 +73,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 +88,12 @@ module EasyTags
       def notify_change
         on_change.call(self) if changed?
       end
+
+      def preloaded_persisted_tags
+        return TagList.new(tags_association.reload.map(&:name)) if @preloaded
+
+        @preloaded = true
+        TagList.new(tags_association.map(&:name))
+      end
   end
 end

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
 
@@ -70,9 +62,7 @@ module EasyTags
             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.3'.freeze
+  VERSION = '0.2.4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: easy_tags
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Iwo Dziechciarow
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-15 00:00:00.000000000 Z
+date: 2020-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -78,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
@@ -214,7 +228,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: EasyTags allows you to tag a single model on several contexts