easy_tags 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb06e1ee49d89ee14b96399332522ffe2a1992d0617ffc21d0205f03d3420d4a
-  data.tar.gz: 6d80b72229751717a9c6b2103285ba9666cad97147d1bbe6789ef3c0b75d85c2
+  metadata.gz: 7dc33730db127f2b295d1965a40d3f1a26398a15298eed3f737c75c78d5b2d89
+  data.tar.gz: 6242af5c9b8e2fbeece7924c8a3296f9a0493237b2474bc53dbdc0b8167e2177
 SHA512:
-  metadata.gz: 79e003d812d2f74ffdff9355ad09619cbfc8a5ea21cecccff36fcf0fee825a041897146c791bddf58c9b1b94ccf5d7704c86256c80e4666c4ae525ecf5148c4f
-  data.tar.gz: 3804f90c2bc81ce007f59a8d710c2f2749df7cd3cc9a2316b818bb4178731700bd8830528f9c0622e1c1d948e919f7518c43380076047e8c9cdf010adffb389e
+  metadata.gz: 596d6f43a3afc179d5ad929f96a225de792ac3994091de2c148cd669343b0bdf361a6dcff2333a15d3740d087f85687620b933a2558a2b95629d857374f6589b
+  data.tar.gz: 0e86be8f5ff60cf8cb6d40aa364225ac90aab6147f448e73a27e4fbff74a846199409d2b8a770151abe0ed00f8e8f960fe4dc15e2cd49056e122d23f002e895b

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

@@ -12,3 +12,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/easy_tags.gemspec

@@ -27,8 +27,8 @@ 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'
@@ -36,6 +36,6 @@ Gem::Specification.new do |spec|
   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_methods.rb

@@ -65,11 +65,7 @@ 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(

data/lib/easy_tags/version.rb

@@ -1,3 +1,3 @@
 module EasyTags
-  VERSION = '0.2.2'.freeze
+  VERSION = '0.2.3'.freeze
 end

metadata

@@ -1,43 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: easy_tags
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Iwo Dziechciarow
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-24 00:00:00.000000000 Z
+date: 2020-01-15 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
@@ -126,16 +138,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 +171,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 +214,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.1.2
 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: '../'