active_type 1.2.1 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0146bd11c1d9d0965e2ce93c0265c78dcdbce9e760666ce5713d055e53522f50
-  data.tar.gz: 63eb1676ef250e2374b1da508d9e40674e52ae681743b5f30762402ebed930eb
+  metadata.gz: 70a593b09da1c5389129939864d40d6ee562d2bf4b7a3bee41bbf749ba81efff
+  data.tar.gz: e8aa031eb6aac62a71556a85c23c55ffa2ee5efa52067226306faca924c7d240
 SHA512:
-  metadata.gz: 52a62c1a3ec7a1f7740a651b299ac2c349b571c92eb2ec06c22c54cdb09c51074f13b62102d0b14a5b72c68daac96c3c63b06aae8f644da068835d271391f586
-  data.tar.gz: 448e4c0fe4bdfb4ed11716387d9ec3a8713a2f7cd29caf5019bb76f124c74d00125cf0f99812483ffeb1a2005a860784c36dd5fd12af3df4dfb179573e9da9f1
+  metadata.gz: 3d287c42812f6afa854f608f52202c1ed6c38cd63aa6cbd7813abbad13c881e8ac333c3f5ce99503bb6c38221c19d0f858307174d37fdc84b2f74fc1b8a61fd1
+  data.tar.gz: a966aa55504b560c99782561854487465dc7f46715b5e6deb1eb2a13fa4f016a83147b9306679936147759c2592b83aaae273f809d6f5f3ff3bca6450b49a5dd

data/.travis.yml

@@ -4,8 +4,9 @@ services:
   - postgresql
 rvm:
   - "2.3.8"
-  - "2.4.5"
-  - "2.5.3"
+  - "2.4.6"
+  - "2.5.5"
+  - "2.6.3"
 gemfile:
   - Gemfile.3.2.mysql2
   - Gemfile.3.2.sqlite3
@@ -22,30 +23,50 @@ before_script:
 script: bundle exec rake spec
 sudo: false
 cache: bundler
-notifications:
-  email:
-    - fail@makandra.de
 matrix:
   exclude:
-    - rvm: "2.4.5"
+    - rvm: "2.3.8"
+      gemfile: Gemfile.6.0.pg
+    - rvm: "2.4.6"
       gemfile: Gemfile.3.2.mysql2
-    - rvm: "2.4.5"
+    - rvm: "2.4.6"
       gemfile: Gemfile.3.2.sqlite3
-    - rvm: "2.5.3"
+    - rvm: "2.4.6"
+      gemfile: Gemfile.4.2.mysql2
+    - rvm: "2.4.6"
+      gemfile: Gemfile.4.2.pg
+    - rvm: "2.4.6"
+      gemfile: Gemfile.5.2.mysql2
+    - rvm: "2.4.6"
+      gemfile: Gemfile.5.2.pg
+    - rvm: "2.4.6"
+      gemfile: Gemfile.6.0.pg
+    - rvm: "2.5.5"
       gemfile: Gemfile.3.2.mysql2
-    - rvm: "2.5.3"
+    - rvm: "2.5.5"
       gemfile: Gemfile.3.2.sqlite3
-    - rvm: "2.5.3"
+    - rvm: "2.5.5"
       gemfile: Gemfile.4.2.mysql2
-    - rvm: "2.5.3"
+    - rvm: "2.5.5"
       gemfile: Gemfile.4.2.pg
-    - rvm: "2.5.3"
+    - rvm: "2.5.5"
+      gemfile: Gemfile.4.2.sqlite3
+    - rvm: "2.5.5"
+      gemfile: Gemfile.5.2.mysql2
+    - rvm: "2.5.5"
+      gemfile: Gemfile.5.2.pg
+    - rvm: "2.6.3"
+      gemfile: Gemfile.3.2.mysql2
+    - rvm: "2.6.3"
+      gemfile: Gemfile.3.2.sqlite3
+    - rvm: "2.6.3"
+      gemfile: Gemfile.4.2.mysql2
+    - rvm: "2.6.3"
+      gemfile: Gemfile.4.2.pg
+    - rvm: "2.6.3"
       gemfile: Gemfile.4.2.sqlite3
-    - rvm: "2.3.8"
-      gemfile: Gemfile.6.0.pg
-    - rvm: "2.4.5"
-      gemfile: Gemfile.6.0.pg
 install:
+  - gem install bundler:2.0.2
   - bundle install --no-deployment --jobs=3 --retry=3 --path=${BUNDLE_PATH:-vendor/bundle}
 addons:
   postgresql: 9.3

data/CHANGELOG.md

@@ -2,7 +2,73 @@
 
 All notable changes to this project will be documented in this file.
 
-## Unreleased
+## Unreleased changes
+
+## 1.4.0 (2020-07-27)
+
+* Extended records now use their own I18n namespace when looking up translations for models or attributes.
+  If the extended record's namespace does not contain a translation, the lookup will fall back to the
+  base record's namespace.
+
+  For instance, given the following class hierarchy:
+
+  ```
+  class User < ActiveRecord::Base
+  end
+
+  class User::Form < ActiveType::Record[User]
+  end
+  ```
+
+  The call `ExtendedParent.human_attribute_name(:foo)` would first look up the key in
+  `activerecord.attributes.user/form` first, then falls back to `activerecord.attributes.user`.
+
+  Thank you @fsateler!
+
+
+## 1.3.2 (2020-06-16)
+
+* Fixed: `nests_one` association record building used empty hash instead of passed in attributes. Credit to @chriscz.
+
+
+## 1.3.1 (2020-03-31)
+
+* Fixed: Avoid #change_association breaking for polymorphic associations. Thanks to @lucthev.
+
+
+## 1.3.0 (2019-09-26)
+
+* Fixed: Do not override Rails internal methods when definining an attribute called `:attribute`.
+* Fixed: Fix .find for extended records, when a record had a `#type` column that was not used for
+  single table inheritance. Thanks to @fsateler.
+* Changed: When extending a single table inheritance base class, `.find` no longer crashes, but
+  returns records derived from the extended class.
+
+  This means, that given the following class hierarchy:
+
+  ```ruby
+  class Parent < ActiveRecord::Base
+  end
+
+  class ExtendedParent < ActiveType::Record[Parent]
+  end
+
+  class Child < Parent
+  end
+  ```
+
+  querying
+
+  ```
+  ExtendedParent.all
+  ```
+
+  will no longer crash, but always return records of type `ExtendedParent` (*even if they
+  would normally of type `Child`*). You should probably avoid this weird situation and not
+  extend STI Parent classes.
+
+  Thanks to @fsateler.
+
 
 ## 1.2.1 (2019-07-03)
 * Fixed: Eager loading in Rails 6 no longer crashes trying to load `ActiveType::Object`s.

data/Gemfile.3.2.mysql2.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    active_type (1.2.1)
+    active_type (1.3.2)
       activerecord (>= 3.2)
 
 GEM
@@ -54,4 +54,4 @@ DEPENDENCIES
   rspec (~> 3.4)
 
 BUNDLED WITH
-   1.16.6
+   2.0.2

data/Gemfile.3.2.sqlite3.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    active_type (1.2.1)
+    active_type (1.3.2)
       activerecord (>= 3.2)
 
 GEM
@@ -54,4 +54,4 @@ DEPENDENCIES
   sqlite3
 
 BUNDLED WITH
-   1.16.6
+   2.0.2

data/Gemfile.4.2.mysql2.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    active_type (1.2.1)
+    active_type (1.3.2)
       activerecord (>= 3.2)
 
 GEM
@@ -58,4 +58,4 @@ DEPENDENCIES
   rspec (~> 3.4)
 
 BUNDLED WITH
-   1.16.6
+   2.0.2

data/Gemfile.4.2.pg.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    active_type (1.2.1)
+    active_type (1.3.2)
       activerecord (>= 3.2)
 
 GEM
@@ -58,4 +58,4 @@ DEPENDENCIES
   rspec (~> 3.4)
 
 BUNDLED WITH
-   1.16.6
+   2.0.2

data/Gemfile.4.2.sqlite3.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    active_type (1.2.1)
+    active_type (1.3.2)
       activerecord (>= 3.2)
 
 GEM
@@ -58,4 +58,4 @@ DEPENDENCIES
   sqlite3
 
 BUNDLED WITH
-   1.16.6
+   2.0.2

data/Gemfile.5.2.mysql2.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    active_type (1.2.1)
+    active_type (1.3.2)
       activerecord (>= 3.2)
 
 GEM
@@ -56,4 +56,4 @@ DEPENDENCIES
   rspec (~> 3.4)
 
 BUNDLED WITH
-   1.16.6
+   2.0.2

data/Gemfile.5.2.pg.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    active_type (1.2.1)
+    active_type (1.4.1)
       activerecord (>= 3.2)
 
 GEM
@@ -56,4 +56,4 @@ DEPENDENCIES
   rspec (~> 3.4)
 
 BUNDLED WITH
-   1.16.6
+   2.1.4

data/Gemfile.5.2.sqlite3.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    active_type (1.2.1)
+    active_type (1.3.2)
       activerecord (>= 3.2)
 
 GEM
@@ -56,4 +56,4 @@ DEPENDENCIES
   sqlite3
 
 BUNDLED WITH
-   1.16.6
+   2.0.2

data/Gemfile.6.0.pg

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'activerecord', '~>6.0.0beta'
+gem 'activerecord', '~>6.0.0'
 gem 'rspec', '~>3.4'
 gem 'pg'
 gem 'rake'

data/Gemfile.6.0.pg.lock

@@ -1,23 +1,23 @@
 PATH
   remote: .
   specs:
-    active_type (1.2.1)
+    active_type (1.3.2)
       activerecord (>= 3.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (6.0.0.beta3)
-      activesupport (= 6.0.0.beta3)
-    activerecord (6.0.0.beta3)
-      activemodel (= 6.0.0.beta3)
-      activesupport (= 6.0.0.beta3)
-    activesupport (6.0.0.beta3)
+    activemodel (6.0.0)
+      activesupport (= 6.0.0)
+    activerecord (6.0.0)
+      activemodel (= 6.0.0)
+      activesupport (= 6.0.0)
+    activesupport (6.0.0)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-      zeitwerk (~> 1.3, >= 1.3.1)
+      zeitwerk (~> 2.1, >= 2.1.8)
     concurrent-ruby (1.1.5)
     diff-lcs (1.3)
     gemika (0.3.4)
@@ -42,18 +42,18 @@ GEM
     thread_safe (0.3.6)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    zeitwerk (1.4.3)
+    zeitwerk (2.1.9)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   active_type!
-  activerecord (~> 6.0.0beta)
+  activerecord (~> 6.0.0)
   gemika
   pg
   rake
   rspec (~> 3.4)
 
 BUNDLED WITH
-   1.16.6
+   2.0.2

data/lib/active_type/nested_attributes/nests_one_association.rb

@@ -30,8 +30,11 @@ module ActiveType
             end
           end
         elsif !destroy
-          assigned_child ||= add_child(parent, build_child(parent, {}))
-          assigned_child.attributes = attributes
+          if assigned_child
+            assigned_child.attributes = attributes
+          else
+            add_child(parent, build_child(parent, attributes))
+          end
         end
       end
 

data/lib/active_type/record_extension/inheritance.rb

@@ -15,7 +15,7 @@ module ActiveType
           options = scope
           scope = nil
         end
-        unless options[:foreign_key]
+        unless options[:foreign_key] || options[:as]
           options = options.merge(foreign_key: extended_record_base_class.name.foreign_key)
         end
         if ActiveRecord::VERSION::MAJOR > 3
@@ -28,13 +28,42 @@ module ActiveType
       module ClassMethods
 
         def model_name
-          extended_record_base_class.model_name
+          @_model_name ||= begin
+            if name
+              # Namespace detection copied from ActiveModel::Naming
+              namespace = module_ancestors.detect do |n|
+                n.respond_to?(:use_relative_model_naming?) && n.use_relative_model_naming?
+              end
+              # We create a Name object, with the parent class name, but self as the @klass reference
+              # This way lookup_ancestors is invoked on the right class instead of the extended_record_base_class
+              dup_model_name = ActiveModel::Name.new(self, namespace, extended_record_base_class.name)
+              key = name.underscore
+              # We fake the `i18n_key` to lookup on the derived class key
+              # We keep the others the same to preserve parameter and route names
+              dup_model_name.define_singleton_method(:i18n_key) { key }
+              dup_model_name
+            else # name is nil for the anonymous intermediate class
+              extended_record_base_class.model_name
+            end
+          end
+        end
+
+        def module_ancestors
+          if extended_record_base_class.respond_to?(:module_parents)
+            extended_record_base_class.module_parents
+          else
+            extended_record_base_class.parents
+          end
         end
 
         def sti_name
           extended_record_base_class.sti_name
         end
 
+        def descends_from_active_record?
+          extended_record_base_class.descends_from_active_record?
+        end
+
         def has_many(name, *args, &extension)
           super(name, *Inheritance.add_foreign_key_option(extended_record_base_class, *args), &extension)
         end
@@ -49,7 +78,23 @@ module ActiveType
 
           def find_sti_class(type_name)
             sti_class = super
-            if self <= sti_class
+
+            # Consider this class hierarchy
+            # class Parent < ActiveRecord::Base; end
+            # class Child < Parent; end
+            # class ExtendedParent < ActiveType::Record[Parent]; end
+            # class ExtendedChild < ActiveType::Record[Child]; end
+            if self < sti_class
+              # i.e. ExtendendChild.find(child.id)
+              # => self = ExtendedChild; sti_class = Child
+              # instantiate as ExtendedChild
+              self
+            elsif sti_class < extended_record_base_class
+              # i.e. ExtendedParent.find(child.id)
+              # => sti_class = Child; self = ExtendedParent; extended_record_base_class = Parent
+              # There is no really good solution here, since we cannot instantiate as both ExtendedParent
+              # and Child. We opt to instantiate as ExtendedParent, since the other option can be
+              # achieved by using Parent.find(child.id)
               self
             else
               sti_class
@@ -77,7 +122,22 @@ module ActiveType
                 "or overwrite #{name}.inheritance_column to use another column for that information."
             end
             #### our code starts here
-            if self <= subclass
+            # Consider this class hierarchy
+            # class Parent < ActiveRecord::Base; end
+            # class Child < Parent; end
+            # class ExtendedParent < ActiveType::Record[Parent]; end
+            # class ExtendedChild < ActiveType::Record[Child]; end
+            if self < subclass
+              # i.e. ExtendendChild.find(child.id)
+              # => self = ExtendedChild; subclass = Child
+              # instantiate as ExtendedChild
+              subclass = self
+            elsif subclass < extended_record_base_class
+              # i.e. ExtendedParent.find(child.id)
+              # => subclass = Child; self = ExtendedParent; extended_record_base_class = Parent
+              # There is no really good solution here, since we cannot instantiate as both ExtendedParent
+              # and Child. We opt to instantiate as ExtendedParent, since the other option can be
+              # achieved by using Parent.find(child.id)
               subclass = self
             end
             #### our code ends here

data/lib/active_type/version.rb

@@ -1,3 +1,3 @@
 module ActiveType
-  VERSION = '1.2.1'
+  VERSION = '1.4.1'
 end

data/lib/active_type/virtual_attributes.rb

@@ -73,6 +73,8 @@ module ActiveType
 
       # Methods for compatibility with gems expecting the ActiveModel::Dirty API.
       def build_dirty_tracking_methods(name)
+        return if name.to_s == 'attribute' # clashes with internal methods
+
         @module.module_eval <<-BODY, __FILE__, __LINE__ + 1
           def #{name}_was
             virtual_attributes_were["#{name}"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_type
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.4.1
 platform: ruby
 authors:
 - Tobias Kraze
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-03 00:00:00.000000000 Z
+date: 2020-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -123,8 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.8
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Make any Ruby object quack like ActiveRecord