active_type 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0146bd11c1d9d0965e2ce93c0265c78dcdbce9e760666ce5713d055e53522f50
-  data.tar.gz: 63eb1676ef250e2374b1da508d9e40674e52ae681743b5f30762402ebed930eb
+  metadata.gz: b5e4919b7989f9d2ce9468d47196b1142270e6b3c2cce7e01945c20c36f4d2b8
+  data.tar.gz: 258bdcde75ea6cbe3c5ef9fb55cd6b0a140a0a8e251745b6d00a0ec7af1834d5
 SHA512:
-  metadata.gz: 52a62c1a3ec7a1f7740a651b299ac2c349b571c92eb2ec06c22c54cdb09c51074f13b62102d0b14a5b72c68daac96c3c63b06aae8f644da068835d271391f586
-  data.tar.gz: 448e4c0fe4bdfb4ed11716387d9ec3a8713a2f7cd29caf5019bb76f124c74d00125cf0f99812483ffeb1a2005a860784c36dd5fd12af3df4dfb179573e9da9f1
+  metadata.gz: ccdd4e34bfbee28b18560bc03a615f52ea4b13ee8a0ba5a33fd19552a2324142108746898159f9ff81ec30cdb420c4380d72c0b695067a7c83a58450be246645
+  data.tar.gz: 8a91a6d3e6587f22c1dc18129f1fb35821431057d44b0732a7ab25e6f02132edcdc134b7d26735d1efbb5ae8015b33d6d055c2a6336914107b17b0f52209b0b2

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,42 @@
 
 All notable changes to this project will be documented in this file.
 
-## Unreleased
+## Unreleased changes
+
+
+## 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
+  ```
+
+  queriying
+
+  ```
+  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.0)
       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.0)
       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.0)
       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.0)
       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.0)
       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.0)
       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.3.0)
       activerecord (>= 3.2)
 
 GEM
@@ -56,4 +56,4 @@ DEPENDENCIES
   rspec (~> 3.4)
 
 BUNDLED WITH
-   1.16.6
+   2.0.2

data/Gemfile.5.2.sqlite3.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    active_type (1.2.1)
+    active_type (1.3.0)
       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.0)
       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/record_extension/inheritance.rb

@@ -35,6 +35,10 @@ module ActiveType
           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 +53,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 +97,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.3.0'
 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.3.0
 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: 2019-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler