active_data 1.1.2 → 1.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aec99c84b95cc5a79feaf4230cdbf4eb89780afc910bf03278d5f2377a48b0c5
-  data.tar.gz: 71941c2fd303ccca637d7f58646dc5a3e3417f506e8cee405a57649a3c770d6c
+  metadata.gz: 5de412d5036c1e3192c87b9c7c7cc553cccaa5d53dc48adb32d992c3cf9fca25
+  data.tar.gz: 52c67fb161d13a2f7b4791f048c662962b2f0355b77fb8f10d434e6e5279692f
 SHA512:
-  metadata.gz: 3603d8b5de895f35f5c19db31a1de8fa71853595a0d93cf772c2894ff0a89fec0afb1d3b3c6f56b8d410ea22339f5e9abe96ca1023a1b414b720f1526afcc09e
-  data.tar.gz: 35a90113764e1a5125d8cd205036e804e9dbfe7e2cb1ffdd812d6b99a5b0233c7efebafaab8452ef12d89c1a78f3d8ee212b55dd5ad59bbc8b399e80c256cbc8
+  metadata.gz: a804cb81e49839e78dbd9de0bd7c670bfde5b34c46651009f15bc70b890edae3a2148d0fd48251179fe83068769c6ddb950969cb2f8eb06b116e1c184d2724e2
+  data.tar.gz: 6b8277845088785bb3a4cd95eb2c56882a7ece7c1cb395e04106717a1ec7ace440709b70c7bec9150be2c9b48626cbb458e8c6882ab01ac808067e428f1a55c3

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/.travis.yml

@@ -1,32 +1,15 @@
 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
+  include:
+    - rvm: 2.3.8
       gemfile: gemfiles/rails.4.2.gemfile
-
-before_install:
-  - gem update --system --no-doc
+    - rvm: 2.4.7
+      gemfile: gemfiles/rails.5.1.gemfile
+    - rvm: 2.5.6
+      gemfile: gemfiles/rails.5.2.gemfile
+    - rvm: 2.6.4
+      gemfile: gemfiles/rails.6.0.gemfile
 
 script:
   - bundle exec rspec

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.1 5.2 6.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,29 @@
 # master
 
+# 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
+
+* `came_from_default?` attribute method (#66)
+
+# Version 1.1.3
+
+## Changes
+
+* `came_from_user?` attribute method (#65)
+
 # Version 1.1.2
 
 ## Changes

data/active_data.gemspec

@@ -14,14 +14,14 @@ 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'
   gem.add_development_dependency 'rake'
-  gem.add_development_dependency 'rspec'
+  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.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/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/lib/active_data/model/attributes.rb

@@ -141,6 +141,10 @@ module ActiveData
         attribute(name).read_before_type_cast
       end
 
+      def attribute_came_from_user?(name)
+        attribute(name).came_from_user?
+      end
+
       def attribute_present?(name)
         attribute(name).value_present?
       end

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

@@ -8,14 +8,16 @@ module ActiveData
         def initialize(name, owner)
           @name = name
           @owner = owner
+          @origin = :default
         end
 
         def reflection
           @owner.class._attributes[name]
         end
 
-        def write_value(value)
+        def write_value(value, origin: :user)
           reset
+          @origin = origin
           @value_cache = value
         end
 
@@ -36,6 +38,14 @@ module ActiveData
           @value_cache
         end
 
+        def came_from_user?
+          @origin == :user
+        end
+
+        def came_from_default?
+          @origin == :default
+        end
+
         def value_present?
           !read.nil? && !(read.respond_to?(:empty?) && read.empty?)
         end
@@ -71,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/attributes/reflections/attribute.rb

@@ -27,6 +27,10 @@ module ActiveData
                 attribute('#{name}').read_before_type_cast
               end
 
+              def #{name}_came_from_user?
+                attribute('#{name}').came_from_user?
+              end
+
               def #{name}_default
                 attribute('#{name}').default
               end

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

@@ -26,7 +26,7 @@ module ActiveData
 
           def build_attribute(owner, raw_value = ActiveData::UNDEFINED)
             attribute = self.class.attribute_class.new(name, owner)
-            attribute.write_value(raw_value) unless raw_value == ActiveData::UNDEFINED
+            attribute.write_value(raw_value, origin: :persistence) unless raw_value == ActiveData::UNDEFINED
             attribute
           end
 

data/lib/active_data/version.rb

@@ -1,3 +1,3 @@
 module ActiveData
-  VERSION = '1.1.2'.freeze
+  VERSION = '1.1.7'.freeze
 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/base_spec.rb

@@ -37,6 +37,22 @@ describe ActiveData::Model::Attributes::Base do
     end
   end
 
+  describe '#came_from_user?' do
+    let(:field) { attribute(type: String, default: 'world') }
+    let(:object) { Object.new }
+
+    specify { expect(field.came_from_user?).to eq(false) }
+    specify { expect(field.tap { |r| r.write('value') }.came_from_user?).to eq(true) }
+  end
+
+  describe '#came_from_default?' do
+    let(:field) { attribute(type: String, default: 'world') }
+    let(:object) { Object.new }
+
+    specify { expect(field.came_from_default?).to eq(true) }
+    specify { expect(field.tap { |r| r.write('value') }.came_from_default?).to eq(false) }
+  end
+
   describe '#value_present?' do
     let(:field) { attribute }
 

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

@@ -249,6 +249,7 @@ describe ActiveData::Model::Attributes do
     its(:hello?) { should eq(false) }
     its(:count) { should == 10 }
     its(:count_before_type_cast) { should == '10' }
+    its(:count_came_from_user?) { should eq(false) }
     its(:count?) { should eq(true) }
     its(:calc) { should == 5 }
     its(:enum?) { should eq(false) }
@@ -256,6 +257,7 @@ describe ActiveData::Model::Attributes do
     specify { expect { subject.hello = 'worlds' }.to change { subject.hello }.from(nil).to('worlds') }
     specify { expect { subject.count = 20 }.to change { subject.count }.from(10).to(20) }
     specify { expect { subject.calc = 15 }.to change { subject.calc }.from(5).to(15) }
+    specify { expect { subject.count = '11' }.to change { subject.count_came_from_user? }.from(false).to(true) }
 
     context 'enums' do
       specify do

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/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.2
+  version: 1.1.7
 platform: ruby
 authors:
 - pyromaniac
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-05-11 00:00:00.000000000 Z
+date: 2020-08-20 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
@@ -70,16 +84,16 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.7.0
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
@@ -199,12 +213,10 @@ 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
 - lib/active_data.rb
 - lib/active_data/active_record/associations.rb
 - lib/active_data/active_record/nested_attributes.rb
@@ -318,7 +330,7 @@ files:
 homepage: ''
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -333,9 +345,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Working with hashes in AR style
 test_files:

data/gemfiles/rails.4.1.gemfile

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

data/gemfiles/rails.5.0.gemfile

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