active_data 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df62766321d027161f359a1101e7e8a94842386b72188a02d7a3686f679f466e
-  data.tar.gz: 0331643a7e25c573a79269df28096971189efc52730c41b58e3922a1ab0c50af
+  metadata.gz: a7a72a84858d1c5737ed98029682614052de1281e89d617d934a5ab7e16cd93c
+  data.tar.gz: ca64b3895dd8bbdd4503e8a8425aef4c210e0fb33f15f456bfe69d25fe741776
 SHA512:
-  metadata.gz: de160dbcd218f15a9203e29bf6e1fdde66b028fb97cee58b8f2816e6191202909c173da2d8db6ea8fd2db02e91314510b501c358852d3e2fe9b13876d093794c
-  data.tar.gz: 20b7783fc647ce010928847da8e5d8c4bd9cfeb0fcb0618114b72186cbcd76e6efa723f79f0f2856f41cd7cb766a5cfa3e6eddd3c34d02b5ce949754a5e83b0b
+  metadata.gz: 18452047bf27f1a2ea4b2428ebc0e887bce1fb03bbed3dc44a0e2867ad761dca984a828796cd4691b9c6a5240f432cfe4f6c79ff20197be044cd30971db84a41
+  data.tar.gz: 9f11d63a14102cee31677b9a97bdda8ff90f734ca3d18d3473ee0fee9da2ae8a61c08e240e4697d4eb86d55f5b56b79412438eeb92fd7f8197098510f2969882

data/.gitignore

@@ -15,3 +15,7 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+.rvmrc
+.version-conf
+.ruby-version
+.ruby-gemset

data/.rubocop.yml

@@ -1,5 +1,9 @@
 inherit_from: .rubocop_todo.yml
 
+AllCops:
+  DisplayCopNames: true
+  TargetRubyVersion: 2.2.10
+
 Lint/AmbiguousBlockAssociation:
   Enabled: false
 
@@ -54,3 +58,6 @@ Style/AndOr:
 
 Style/DoubleNegation:
   Enabled: false
+
+Style/FrozenStringLiteralComment:
+  Enabled: false

data/.rubocop_todo.yml

@@ -10,11 +10,6 @@
 Metrics/AbcSize:
   Max: 54
 
-# Offense count: 1
-# Configuration parameters: CountComments.
-Metrics/BlockLength:
-  Max: 26
-
 # Offense count: 2
 # Configuration parameters: CountComments.
 Metrics/ClassLength:

data/.travis.yml

@@ -1,8 +1,9 @@
 sudo: false
 
 rvm:
-  - 2.2.8
-  - 2.3.5
+  - 2.2.10
+  - 2.3.7
+  - 2.4.4
   - rbx
 
 gemfile:
@@ -11,15 +12,18 @@ 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
-  include:
-    - rvm: 2.4.2
-      gemfile: gemfiles/rails.5.0.gemfile
-    - rvm: 2.4.2
-      gemfile: gemfiles/rails.5.1.gemfile
+  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

data/Appraisals

@@ -1,4 +1,4 @@
-%w[4.0 4.1 4.2 5.0 5.1].each do |version|
+%w[4.0 4.1 4.2 5.0 5.1 5.2].each do |version|
   appraise "rails.#{version}" do
     gem 'activesupport', "~> #{version}.0"
     gem 'activemodel', "~> #{version}.0"

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # master
 
+# Version 1.1.1
+
+## Changes
+
+* `ActiveData.base_class` config option (#63)
+
+* ActiveModel 5.2 compatibility (#62)
+
 # Version 1.1.0
 
 ## Incompatible changes

data/active_data.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rspec'
   gem.add_development_dependency 'rspec-its'
-  gem.add_development_dependency 'rubocop'
+  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.5.2.gemfile

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

data/lib/active_data/config.rb

@@ -2,7 +2,7 @@ module ActiveData
   class Config
     include Singleton
 
-    attr_accessor :include_root_in_json, :i18n_scope, :logger, :primary_attribute,
+    attr_accessor :include_root_in_json, :i18n_scope, :logger, :primary_attribute, :base_class,
       :_normalizers, :_typecasters
 
     def self.delegated

data/lib/active_data/model/associations/reflections/embeds_any.rb

@@ -7,7 +7,7 @@ module ActiveData
             if block
               options[:class] = proc do |reflection|
                 superclass = reflection.options[:class_name].to_s.presence.try(:constantize)
-                klass = Class.new(superclass || ActiveData::Base) do
+                klass = Class.new(superclass || ActiveData.base_class) do
                   include ActiveData::Model
                   include ActiveData::Model::Associations
                   include ActiveData::Model::Lifecycle

data/lib/active_data/model/dirty.rb

@@ -16,34 +16,39 @@ module ActiveData
         def self.included(_base); end
       end
 
+      include DIRTY_CLONE
+
       included do
-        include DIRTY_CLONE
+        attribute_names(false).each do |name|
+          define_dirty name, generated_attributes_methods
+        end
+        _attribute_aliases.each_key do |name|
+          define_dirty name, generated_attributes_methods
+        end
+      end
 
-        unless method_defined?(:set_attribute_was)
-          def set_attribute_was(attr, old_value)
-            changed_attributes[attr] = old_value
-          end
-          private :set_attribute_was
+      if !method_defined?(:set_attribute_was) && !private_method_defined?(:set_attribute_was)
+        private def set_attribute_was(attr, old_value)
+          changed_attributes[attr] = old_value
         end
+      end
 
-        unless method_defined?(:clear_changes_information)
-          if method_defined?(:reset_changes)
-            def clear_changes_information
-              reset_changes
-            end
-          else
-            def clear_changes_information
-              @previously_changed = nil
-              @changed_attributes = nil
-            end
+      unless method_defined?(:clear_changes_information)
+        if method_defined?(:reset_changes)
+          def clear_changes_information
+            reset_changes
+          end
+        else
+          def clear_changes_information
+            @previously_changed = nil
+            @changed_attributes = nil
           end
         end
+      end
 
-        attribute_names(false).each do |name|
-          define_dirty name, generated_attributes_methods
-        end
-        _attribute_aliases.each_key do |name|
-          define_dirty name, generated_attributes_methods
+      unless method_defined?(:_read_attribute)
+        def _read_attribute(attr)
+          __send__(attr)
         end
       end
 

data/lib/active_data/version.rb

@@ -1,3 +1,3 @@
 module ActiveData
-  VERSION = '1.1.0'.freeze
+  VERSION = '1.1.1'.freeze
 end

data/lib/active_data.rb

@@ -136,6 +136,8 @@ end
 
 require 'active_data/base'
 
+ActiveData.base_class = ActiveData::Base
+
 ActiveSupport.on_load :active_record do
   require 'active_data/active_record/associations'
   require 'active_data/active_record/nested_attributes'

data/spec/lib/active_data/model/associations/validations_spec.rb

@@ -53,7 +53,7 @@ describe ActiveData::Model::Associations::Validations do
       specify { expect(user.validate).to eq(false) }
       specify do
         expect { user.validate }.to change { user.errors.messages }
-          .to(:'projects.0.author.name' => ["can't be blank"])
+          .to('projects.0.author.name': ["can't be blank"])
       end
     end
 
@@ -70,7 +70,7 @@ describe ActiveData::Model::Associations::Validations do
       specify { expect(user.validate).to eq(false) }
       specify do
         expect { user.validate }.to change { user.errors.messages }
-          .to(:'projects.1.title' => ["can't be blank"])
+          .to('projects.1.title': ["can't be blank"])
       end
     end
   end
@@ -98,7 +98,7 @@ describe ActiveData::Model::Associations::Validations do
       specify { expect(user.invalid_ancestry?).to eq(true) }
       specify do
         expect { user.validate_ancestry }.to change { user.errors.messages }
-          .to(:'projects.0.author.name' => ["can't be blank"])
+          .to('projects.0.author.name': ["can't be blank"])
       end
     end
 
@@ -110,7 +110,7 @@ describe ActiveData::Model::Associations::Validations do
       specify { expect(user.invalid_ancestry?).to eq(true) }
       specify do
         expect { user.validate_ancestry }.to change { user.errors.messages }
-          .to(:'profile.first_name' => ["can't be blank"])
+          .to('profile.first_name': ["can't be blank"])
       end
     end
 
@@ -122,14 +122,14 @@ describe ActiveData::Model::Associations::Validations do
       specify { expect(user.invalid_ancestry?).to eq(true) }
       specify do
         expect { user.validate_ancestry }.to change { user.errors.messages }
-          .to(:'projects.1.title' => ["can't be blank"])
+          .to('projects.1.title': ["can't be blank"])
       end
 
       context do
         before { user.update(login: '') }
         specify do
           expect { user.validate_ancestry }.to change { user.errors.messages }
-            .to(:'projects.1.title' => ["can't be blank"], login: ["can't be blank"])
+            .to('projects.1.title': ["can't be blank"], login: ["can't be blank"])
         end
       end
     end

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

@@ -120,7 +120,7 @@ describe ActiveData::Model::Representation do
 
     specify do
       expect { post.validate }.to change { post.errors.messages }
-        .to(hash_including(:'author.user.email' => ['is invalid'], name: ["can't be blank"]))
+        .to(hash_including('author.user.email': ['is invalid'], name: ["can't be blank"]))
     end
   end
 end

data/spec/lib/active_data/model/validations/associated_spec.rb

@@ -68,7 +68,7 @@ describe ActiveData::Model::Validations::AssociatedValidator do
     it { is_expected.not_to be_valid }
     specify do
       expect { instance.validate }.to change { instance.errors.messages }
-        .to(:'validated_many.0.name' => ["can't be blank"], validated_many: ['is invalid'])
+        .to('validated_many.0.name': ["can't be blank"], validated_many: ['is invalid'])
     end
   end
 
@@ -96,7 +96,7 @@ describe ActiveData::Model::Validations::AssociatedValidator do
     it { is_expected.not_to be_valid }
     specify do
       expect { instance.validate }.to change { instance.errors.messages }
-        .to(:'validated_many.0.name' => ["can't be blank"], validated_many: ['is invalid'])
+        .to('validated_many.0.name': ["can't be blank"], validated_many: ['is invalid'])
     end
   end
 end

data/spec/lib/active_data/model/validations/nested_spec.rb

@@ -45,7 +45,7 @@ describe ActiveData::Model::Validations::NestedValidator do
     it { is_expected.not_to be_valid }
     specify do
       expect { instance.validate }.to change { instance.errors.messages }
-        .to(:'validated_one.name' => ["can't be blank"])
+        .to('validated_one.name': ["can't be blank"])
     end
   end
 
@@ -69,7 +69,7 @@ describe ActiveData::Model::Validations::NestedValidator do
     it { is_expected.not_to be_valid }
     specify do
       expect { instance.validate }.to change { instance.errors.messages }
-        .to(:'validated_many.0.name' => ["can't be blank"])
+        .to('validated_many.0.name': ["can't be blank"])
     end
   end
 
@@ -88,7 +88,7 @@ describe ActiveData::Model::Validations::NestedValidator do
     it { is_expected.not_to be_valid }
     specify do
       expect { instance.validate }.to change { instance.errors.messages }
-        .to(:'validated_one.name' => ["can't be blank"])
+        .to('validated_one.name': ["can't be blank"])
     end
   end
 
@@ -152,7 +152,7 @@ describe ActiveData::Model::Validations::NestedValidator do
     it { is_expected.not_to be_valid }
     specify do
       expect { instance.validate }.to change { instance.errors.messages }
-        .to(:'validated_many.0.name' => ["can't be blank"])
+        .to('validated_many.0.name': ["can't be blank"])
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_data
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - pyromaniac
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-23 00:00:00.000000000 Z
+date: 2018-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -98,16 +98,16 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.52.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.52.1
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -190,7 +190,6 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
-- ".rvmrc"
 - ".travis.yml"
 - Appraisals
 - CHANGELOG.md
@@ -205,6 +204,7 @@ files:
 - gemfiles/rails.4.2.gemfile
 - gemfiles/rails.5.0.gemfile
 - gemfiles/rails.5.1.gemfile
+- gemfiles/rails.5.2.gemfile
 - lib/active_data.rb
 - lib/active_data/active_record/associations.rb
 - lib/active_data/active_record/nested_attributes.rb
@@ -333,7 +333,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.4
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Working with hashes in AR style

data/.rvmrc

@@ -1 +0,0 @@
-rvm use --create 2.4@active_data