active_data 1.1.4 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8fd00914914806d951a6e19e1927d9256d681c3af5b2125b67e06b3d90ad368f
-  data.tar.gz: ceeb1a7d53206a65d045d7a46017d261a0d872aa384bdebc7f11f4500861226d
+  metadata.gz: 80daeb6d630cc5fc243193c917e0b43f19b2fce35a746200551921f3892e1677
+  data.tar.gz: 4fc2d73f4d3a59ce0804fa652ba782ee33997e9be4870b4ee402d67b920a8c45
 SHA512:
-  metadata.gz: 995f37a727c0815e131189133c31a8bb767f7001fecef437305e81723c11ec25f54884cc50411fb34e53d213fb7482298af8ac2d576e51da68044fb2deb287e5
-  data.tar.gz: e9609fb34fba1628e4bc3d341378c2fea985fa021b2463ed61d5f9b2b9ae997315d07a54de516402459b2dc51dffc66076f1e64a492021895b507c3770330d58
+  metadata.gz: 3d8fe25346c0e72ac3600ed8f89266864cf86081d8a0db463e4b856688e7c5cd7a936b76c872f7470a0f942989ecc51bf5e1a0615ea68f74855119910607b139
+  data.tar.gz: c0f31ed6be42bbe6e3d06f82e4d546c04b72b7a527cb628019516531b430273a89eae8c727a4c4edc2010aa3cdd80fa8195953f793296e4726b2d5f666b973ec

data/.github/workflows/ci.yml

@@ -0,0 +1,35 @@
+name: CI
+on: [push, pull_request]
+jobs:
+  rspec:
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - { ruby: '2.3', rails: '4.2' }
+          - { ruby: '2.4', rails: '5.0' }
+          - { ruby: '2.5', rails: '5.1' }
+          - { ruby: '2.6', rails: '5.2' }
+          - { ruby: '2.7', rails: '6.0' }
+          - { ruby: '3.0', rails: '6.1' }
+          - { ruby: '3.0', rails: '7.0' }
+    runs-on: ubuntu-latest
+    env:
+      BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/rails.${{ matrix.rails }}.gemfile
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+        bundler-cache: true
+    - run: bundle exec rspec
+
+  rubocop:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: 3.0
+        bundler-cache: true
+    - run: bundle exec rubocop

data/.rubocop.yml

@@ -49,6 +49,7 @@ Metrics/BlockLength:
 Metrics/ModuleLength:
   Exclude:
     - '**/*_spec.rb'
+    - 'lib/active_data.rb'
 
 Style/Alias:
   EnforcedStyle: prefer_alias_method

data/Appraisals

@@ -1,7 +1,8 @@
-%w[4.0 4.1 4.2 5.0 5.1 5.2].each do |version|
+%w[4.2 5.0 5.1 5.2 6.0 6.1 7.0].each do |version|
   appraise "rails.#{version}" do
     gem 'activesupport', "~> #{version}.0"
     gem 'activemodel', "~> #{version}.0"
     gem 'activerecord', "~> #{version}.0"
+    gem 'sqlite3', '~> 1.3.6' if version < '6.0'
   end
 end

data/CHANGELOG.md

@@ -1,5 +1,21 @@
 # master
 
+# Version 1.2.0
+
+* Rails 6.1 and 7 support (#80). Thanks to @ojab and @rewritten
+
+# Version 1.1.7
+
+* Add typecasting from `ActionController::Parameters` to `Hash` (#73)
+
+# Version 1.1.6
+
+* Fix Ruby 2.6 deprecations (#72)
+
+# Version 1.1.5
+
+* Rails 6 support (#70, #71)
+
 # Version 1.1.4
 
 ## Changes

data/active_data.gemspec

@@ -14,6 +14,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ['lib']
   gem.version       = ActiveData::VERSION
 
+  gem.add_development_dependency 'actionpack', '>= 4.0'
   gem.add_development_dependency 'activerecord', '>= 4.0'
   gem.add_development_dependency 'appraisal'
   gem.add_development_dependency 'database_cleaner'
@@ -21,7 +22,6 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'rspec', '~> 3.7.0'
   gem.add_development_dependency 'rspec-its'
   gem.add_development_dependency 'rubocop', '0.52.1'
-  gem.add_development_dependency 'rubysl', '~> 2.0' if RUBY_ENGINE == 'rbx'
   gem.add_development_dependency 'sqlite3'
   gem.add_development_dependency 'uuidtools'
 

data/gemfiles/rails.4.2.gemfile

@@ -5,6 +5,7 @@ source "https://rubygems.org"
 gem "activesupport", "~> 4.2.0"
 gem "activemodel", "~> 4.2.0"
 gem "activerecord", "~> 4.2.0"
+gem "sqlite3", "~> 1.3.6"
 
 group :test do
   gem "guard"

data/gemfiles/rails.5.0.gemfile

@@ -5,6 +5,7 @@ source "https://rubygems.org"
 gem "activesupport", "~> 5.0.0"
 gem "activemodel", "~> 5.0.0"
 gem "activerecord", "~> 5.0.0"
+gem "sqlite3", "~> 1.3.6"
 
 group :test do
   gem "guard"

data/gemfiles/rails.5.1.gemfile

@@ -5,6 +5,7 @@ source "https://rubygems.org"
 gem "activesupport", "~> 5.1.0"
 gem "activemodel", "~> 5.1.0"
 gem "activerecord", "~> 5.1.0"
+gem "sqlite3", "~> 1.3.6"
 
 group :test do
   gem "guard"

data/gemfiles/rails.5.2.gemfile

@@ -5,6 +5,7 @@ source "https://rubygems.org"
 gem "activesupport", "~> 5.2.0"
 gem "activemodel", "~> 5.2.0"
 gem "activerecord", "~> 5.2.0"
+gem "sqlite3", "~> 1.3.6"
 
 group :test do
   gem "guard"

data/gemfiles/{rails.4.0.gemfile → rails.6.0.gemfile}

@@ -2,9 +2,9 @@
 
 source "https://rubygems.org"
 
-gem "activesupport", "~> 4.0.0"
-gem "activemodel", "~> 4.0.0"
-gem "activerecord", "~> 4.0.0"
+gem "activesupport", "~> 6.0.0"
+gem "activemodel", "~> 6.0.0"
+gem "activerecord", "~> 6.0.0"
 
 group :test do
   gem "guard"

data/gemfiles/{rails.4.1.gemfile → rails.6.1.gemfile}

@@ -2,9 +2,9 @@
 
 source "https://rubygems.org"
 
-gem "activesupport", "~> 4.1.0"
-gem "activemodel", "~> 4.1.0"
-gem "activerecord", "~> 4.1.0"
+gem "activesupport", "~> 6.1.0"
+gem "activemodel", "~> 6.1.0"
+gem "activerecord", "~> 6.1.0"
 
 group :test do
   gem "guard"

data/gemfiles/rails.7.0.gemfile

@@ -0,0 +1,14 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activesupport", "~> 7.0.0"
+gem "activemodel", "~> 7.0.0"
+gem "activerecord", "~> 7.0.0"
+
+group :test do
+  gem "guard"
+  gem "guard-rspec"
+end
+
+gemspec path: "../"

data/lib/active_data/model/attributes/base.rb

@@ -81,8 +81,13 @@ module ActiveData
           pollute = owner.class.dirty? && !owner.send(:attribute_changed?, name)
 
           if pollute
-            previous_value = read
+            previous_value = owner.__send__(name)
+            owner.send("#{name}_will_change!")
+
             result = yield
+
+            owner.__send__(:clear_attribute_changes, [name]) if owner.__send__(name) == previous_value
+
             if previous_value != read || (
               read.respond_to?(:changed?) &&
               read.changed?

data/lib/active_data/model/representation.rb

@@ -1,3 +1,4 @@
+require 'active_model/version'
 require 'active_data/model/attributes/reflections/represents'
 require 'active_data/model/attributes/represents'
 
@@ -67,14 +68,24 @@ module ActiveData
       #
       def emerge_represented_attributes_errors!
         self.class.represented_attributes.each do |attribute|
-          key = :"#{attribute.reference}.#{attribute.column}"
-          # Rails 5 pollutes messages with an empty array on key data fetch attempt
-          messages = errors.messages[key] if errors.messages.key?(key)
-          if messages.present?
-            errors[attribute.column].concat(messages)
-            errors.delete(key)
+          move_errors(:"#{attribute.reference}.#{attribute.column}", attribute.column)
+        end
+      end
+
+      if ActiveModel.version >= Gem::Version.new('6.1.0')
+        def move_errors(from, to)
+          errors[from].each do |error_message|
+            errors.add(to, error_message)
+            errors.delete(from)
           end
         end
+      else # up to 6.0.x
+        def move_errors(from, to)
+          return unless errors.messages.key?(from) && errors.messages[from].present?
+
+          errors[to].concat(errors.messages[from])
+          errors.delete(from)
+        end
       end
     end
   end

data/lib/active_data/model/scopes.rb

@@ -37,16 +37,44 @@ module ActiveData
           super || self.class._scope_model.respond_to?(method)
         end
 
-        def method_missing(method, *args, &block)
-          with_scope do
-            model = self.class._scope_model
-            if model.respond_to?(method)
-              self.class._scope_model.public_send(method, *args, &block)
-            else
-              super
+        # rubocop:disable Style/MethodMissing
+        # rubocop-0.52.1 doesn't understand that `#respond_to_missing?` is defined above
+        if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.0.0')
+          def method_missing(method, *args, **kwargs, &block)
+            with_scope do
+              model = self.class._scope_model
+              if model.respond_to?(method)
+                result = model.public_send(method, *args, **kwargs, &block)
+                result.is_a?(ActiveData::Model::Scopes) ? result : model.scope_class.new(result)
+              else
+                super
+              end
+            end
+          end
+        elsif Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.7.0')
+          def method_missing(method, *args, **kwargs, &block)
+            with_scope do
+              model = self.class._scope_model
+              if model.respond_to?(method)
+                model.public_send(method, *args, **kwargs, &block)
+              else
+                super
+              end
+            end
+          end
+        else # up to 2.6.x
+          def method_missing(method, *args, &block)
+            with_scope do
+              model = self.class._scope_model
+              if model.respond_to?(method)
+                model.public_send(method, *args, &block)
+              else
+                super
+              end
             end
           end
         end
+        # rubocop:enable Style/MethodMissing
 
         def with_scope
           previous_scope = self.class._scope_model.current_scope

data/lib/active_data/model/validations/associated.rb

@@ -6,7 +6,7 @@ module ActiveData
           invalid_records = Array.wrap(value).reject do |r|
             r.respond_to?(:valid?) && r.valid?(record.validation_context)
           end
-          record.errors.add(attribute, :invalid, options.merge(value: value)) if invalid_records.present?
+          record.errors.add(attribute, :invalid, **options.merge(value: value)) if invalid_records.present?
         end
       end
 

data/lib/active_data/model/validations/nested.rb

@@ -1,3 +1,5 @@
+require 'active_model/version'
+
 module ActiveData
   module Model
     module Validations
@@ -5,19 +7,26 @@ module ActiveData
         def self.validate_nested(record, name, value)
           if value.is_a?(Enumerable)
             value.each.with_index do |object, i|
-              if yield(object)
-                object.errors.each do |key, message|
-                  key = "#{name}.#{i}.#{key}"
-                  record.errors[key] << message
-                  record.errors[key].uniq!
-                end
-              end
+              import_errors(object.errors, record.errors, "#{name}.#{i}") if yield object
+            end
+          elsif value
+            import_errors(value.errors, record.errors, name.to_s) if yield value
+          end
+        end
+
+        if ActiveModel.version >= Gem::Version.new('6.1.0')
+          def self.import_errors(from, to, prefix)
+            from.each do |error|
+              key = "#{prefix}.#{error.attribute}"
+              to.import(error, attribute: key) unless to.added?(key, error.type, error.options)
             end
-          elsif value && yield(value)
-            value.errors.each do |key, message|
-              key = "#{name}.#{key}"
-              record.errors[key] << message
-              record.errors[key].uniq!
+          end
+        else # up to 6.0.x
+          def self.import_errors(from, to, prefix)
+            from.each do |key, message|
+              key = "#{prefix}.#{key}"
+              to[key] << message
+              to[key].uniq!
             end
           end
         end

data/lib/active_data/version.rb

@@ -1,3 +1,3 @@
 module ActiveData
-  VERSION = '1.1.4'.freeze
+  VERSION = '1.2.0'.freeze
 end

data/lib/active_data.rb

@@ -61,6 +61,16 @@ module ActiveData
       value
     end
   end
+  ActiveSupport.on_load :action_controller do
+    ActiveData.typecaster('Hash') do |value|
+      case value
+      when ActionController::Parameters
+        value.to_h if value.permitted?
+      when ::Hash then
+        value
+      end
+    end
+  end
   typecaster('Date') do |value|
     begin
       value.to_date
@@ -100,7 +110,7 @@ module ActiveData
   typecaster('BigDecimal') do |value|
     next unless value
     begin
-      ::BigDecimal.new Float(value).to_s
+      BigDecimal(Float(value).to_s)
     rescue ArgumentError, TypeError
       nil
     end

data/spec/lib/active_data/model/attributes/attribute_spec.rb

@@ -58,9 +58,48 @@ describe ActiveData::Model::Attributes::Attribute do
   end
 
   describe '#typecast' do
-    specify { expect(attribute.typecast(:hello)).to eq(:hello) }
-    specify { expect(attribute(type: Integer).typecast(42)).to eq(42) }
-    specify { expect(attribute(type: Integer).typecast('42')).to eq(42) }
+    context 'when Object' do
+      specify { expect(attribute.typecast(:hello)).to eq(:hello) }
+    end
+
+    context 'when Integer' do
+      specify { expect(attribute(type: Integer).typecast(42)).to eq(42) }
+      specify { expect(attribute(type: Integer).typecast('42')).to eq(42) }
+    end
+
+    context 'when Hash' do
+      let(:to_h) { {'x' => {'foo' => 'bar'}, 'y' => 2} }
+      let(:parameters) { ActionController::Parameters.new(to_h) }
+
+      before(:all) do
+        @default_hash_typecaster = ActiveData.typecaster('Hash')
+        require 'action_controller'
+        Class.new(ActionController::Base)
+        @action_controller_hash_typecaster = ActiveData.typecaster('Hash')
+      end
+
+      context 'when ActionController is loaded' do
+        before { ActiveData.typecaster('Hash', &@action_controller_hash_typecaster) }
+        after { ActiveData.typecaster('Hash', &@default_hash_typecaster) }
+
+        specify { expect(attribute(type: Hash).typecast(nil)).to be_nil }
+        specify { expect(attribute(type: Hash).typecast(to_h)).to eq(to_h) }
+        specify { expect(attribute(type: Hash).typecast(parameters)).to be_nil }
+        specify { expect(attribute(type: Hash).typecast(parameters.permit(:y, x: [:foo]))).to eq(to_h) }
+      end
+
+      context 'when ActionController is not loaded' do
+        before { ActiveData.typecaster('Hash', &@default_hash_typecaster) }
+
+        specify { expect(attribute(type: Hash).typecast(nil)).to be_nil }
+        specify { expect(attribute(type: Hash).typecast(to_h)).to eq(to_h) }
+        if ActiveSupport.version > Gem::Version.new('4.3')
+          specify { expect(attribute(type: Hash).typecast(parameters.permit(:y, x: [:foo]))).to be_nil }
+        else
+          specify { expect(attribute(type: Hash).typecast(parameters.permit(:y, x: [:foo]))).to eq(to_h) }
+        end
+      end
+    end
   end
 
   describe '#enum' do

data/spec/lib/active_data/model/attributes/localized_spec.rb

@@ -93,7 +93,7 @@ describe ActiveData::Model::Attributes::Localized do
         before do
           require 'i18n/backend/fallbacks'
           I18n::Backend::Simple.send(:include, I18n::Backend::Fallbacks)
-          I18n.fallbacks.map(en: :ru)
+          I18n.fallbacks[:en] = [:ru]
         end
         after { I18n.fallbacks = false }
         its(:name) { should == 'Привет' }

data/spec/lib/active_data/model/dirty_spec.rb

@@ -71,8 +71,8 @@ describe ActiveData::Model::Dirty do
   specify { expect(Model.new(numbers: '42').changes).to eq('numbers' => [[], [42]]) }
 
   # Have no idea how should it work right now
-  specify { expect(Model.new(title: 'Hello').changes).to eq('title' => [{}, 'Hello']) }
-  specify { expect(Model.new(title_translations: {en: 'Hello'}).changes).to eq('title' => [{}, 'Hello']) }
+  specify { expect(Model.new(title: 'Hello').changes).to eq('title' => [nil, 'Hello']) }
+  specify { expect(Model.new(title_translations: {en: 'Hello'}).changes).to eq('title' => [nil, 'Hello']) }
 
   specify { expect(Model.new).not_to respond_to :something_changed? }
   specify { expect(Model.new).to respond_to :n_changed? }

data/spec/lib/active_data/model/representation_spec.rb

@@ -39,11 +39,17 @@ describe ActiveData::Model::Representation do
     end
 
     context 'dirty' do
-      before { Post.include ActiveData::Model::Dirty }
+      before do
+        Author.include ActiveData::Model::Dirty
+        Post.include ActiveData::Model::Dirty
+      end
 
       specify do
         expect(Post.new(author: author, rate: '33').changes)
           .to eq('author' => [nil, author], 'rate' => [42, 33])
+
+        expect(Post.new(author: author, rate: '33').changes)
+          .to eq('author' => [nil, author])
       end
     end
 

data/spec/lib/active_data/model/typecasting_spec.rb

@@ -66,11 +66,11 @@ describe ActiveData::Model::Attributes do
 
     specify { expect(model.new(column: 'hello').column).to be_nil }
     specify { expect(model.new(column: '123hello').column).to be_nil }
-    specify { expect(model.new(column: '123').column).to eq(BigDecimal.new('123.0')) }
+    specify { expect(model.new(column: '123').column).to eq(BigDecimal('123.0')) }
     specify { expect(model.new(column: '123.').column).to be_nil }
-    specify { expect(model.new(column: '123.5').column).to eq(BigDecimal.new('123.5')) }
-    specify { expect(model.new(column: 123).column).to eq(BigDecimal.new('123.0')) }
-    specify { expect(model.new(column: 123.5).column).to eq(BigDecimal.new('123.5')) }
+    specify { expect(model.new(column: '123.5').column).to eq(BigDecimal('123.5')) }
+    specify { expect(model.new(column: 123).column).to eq(BigDecimal('123.0')) }
+    specify { expect(model.new(column: 123.5).column).to eq(BigDecimal('123.5')) }
     specify { expect(model.new(column: nil).column).to be_nil }
     specify { expect(model.new(column: [123.5]).column).to be_nil }
   end

data/spec/spec_helper.rb

@@ -4,6 +4,8 @@ Bundler.require
 
 require 'rspec/its'
 require 'active_record'
+require 'rack/test'
+require 'action_controller/metal/strong_parameters'
 require 'database_cleaner'
 
 require 'support/model_helpers'

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: active_data
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.2.0
 platform: ruby
 authors:
 - pyromaniac
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-05-14 00:00:00.000000000 Z
+date: 2021-12-22 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: actionpack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -186,11 +200,11 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".codeclimate.yml"
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
-- ".travis.yml"
 - Appraisals
 - CHANGELOG.md
 - Gemfile
@@ -199,12 +213,13 @@ files:
 - README.md
 - Rakefile
 - active_data.gemspec
-- gemfiles/rails.4.0.gemfile
-- gemfiles/rails.4.1.gemfile
 - gemfiles/rails.4.2.gemfile
 - gemfiles/rails.5.0.gemfile
 - gemfiles/rails.5.1.gemfile
 - gemfiles/rails.5.2.gemfile
+- gemfiles/rails.6.0.gemfile
+- gemfiles/rails.6.1.gemfile
+- gemfiles/rails.7.0.gemfile
 - lib/active_data.rb
 - lib/active_data/active_record/associations.rb
 - lib/active_data/active_record/nested_attributes.rb
@@ -318,7 +333,7 @@ files:
 homepage: ''
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -333,8 +348,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Working with hashes in AR style
 test_files:

data/.travis.yml

@@ -1,33 +0,0 @@
-sudo: false
-
-rvm:
-  - 2.2.10
-  - 2.3.7
-  - 2.4.4
-  - rbx
-
-gemfile:
-  - gemfiles/rails.4.0.gemfile
-  - gemfiles/rails.4.1.gemfile
-  - gemfiles/rails.4.2.gemfile
-  - gemfiles/rails.5.0.gemfile
-  - gemfiles/rails.5.1.gemfile
-  - gemfiles/rails.5.2.gemfile
-
-matrix:
-  allow_failures:
-    - rvm: rbx
-  exclude:
-    - rvm: 2.4.4
-      gemfile: gemfiles/rails.4.0.gemfile
-    - rvm: 2.4.4
-      gemfile: gemfiles/rails.4.1.gemfile
-    - rvm: 2.4.4
-      gemfile: gemfiles/rails.4.2.gemfile
-
-before_install:
-  - gem update --system --no-doc
-
-script:
-  - bundle exec rspec
-  - bundle exec rubocop