active_type 1.1.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5dd2986e6945783f4c52776074f66d614ecbbcef28f5eb1471ebf450dd68c8d2
-  data.tar.gz: 763be8835f5184df763527d0b10b8af06edf12168a8d76ebc67951680e097cb7
+  metadata.gz: a986a7b0197d897f5ec654e3a4603de99bf814ccbad1da7541131410bf87b0a9
+  data.tar.gz: 778020b99e23a1ffe944e3e330c0f93b87ac23d45b71df6a4522503a9856e22d
 SHA512:
-  metadata.gz: 301557809bffecdb33705cb01d68a1da237d6d0d30e726239e8c2af57c59eeb81c8c3287796f49c76abe0c4a65ab4196d4d23374224c0796ae207355f58e6019
-  data.tar.gz: bebb85d3edc8733b3816ee82925659a804836eaddc20d100c171a1eeb034134e3159de414d62fadc406d243c13b4ed4116b74127e777bf9da1d9872af7c3ea2b
+  metadata.gz: 5cb4c6c1748fb677fc2957921168dfb8ad2d42ce62e8e74db3760a17baf4141e89f8b7cd1973efca740bcad84a2b37df7cd52798aafbd07f61fc209a9724bc94
+  data.tar.gz: 861a88ad0631e0326af3c484408eac2b674f7ba4bfa1cc8c0e210be964bfa76d8d432cb7f6fd9b1536e2146ef1c6775cfedf457a7eebf020ccf1f381d706f67e

data/.travis.yml

@@ -1,8 +1,12 @@
 language: ruby
+dist: trusty
+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
@@ -19,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,6 +2,62 @@
 
 All notable changes to this project will be documented in this file.
 
+## Unreleased changes
+
+## 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.
+  Thanks to @teamhqapp for the fix.
+
+
+## 1.2.0 (2019-06-18)
+
+* Fixed: Using `has_many` et al in an extended record ignored given scopes.
+* Added: `change_association` on ActiveType::Record to change assocation options.
+
+
 ## 1.1.1 (2019-05-07)
 
 * Improved dirty tracking (`#changes?` etc) for virtual attributes to bring it more in line with

data/Gemfile.3.2.mysql2.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    active_type (1.1.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.1.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.1.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.1.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.1.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.1.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.1.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.sqlite3.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    active_type (1.1.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.1.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/README.md

@@ -363,6 +363,31 @@ sign_up.is_a?(SignUp) # => true
 ```
 
 
+Associations
+------------
+
+Sometimes, you have an association, and a form model for that association. Instead of always casting the associations manually, you can use the `change_association` macro to override an association's options. For example.
+
+
+```
+class Credential < ActiveRecord::Base
+end
+
+class User < ActiveRecord::Base
+  has_many :credentials
+end
+
+class SignUpCredential < ActiveType::Record[Credential]
+end
+
+class SignUp < ActiveType::Record[User]
+  change_association :credentials, class_name: 'SignUpCredential'
+end
+```
+
+Now, if you load `credentials`, you will automatically receive records of type `SignUpCredential`.
+
+
 Supported Rails versions
 ------------------------
 
@@ -389,13 +414,11 @@ Now run `bundle install` and restart your server.
 Development
 -----------
 
-- We run tests against several ActiveRecord versions.
-- You can bundle all versions with `rake all:install`.
-- You can run specs against all versions with `rake all:spec`.
-- You can run specs against a single version with `VERSION=4.2.1.pg rake` or `VERSION="4.2.1.*" rake`.
-
-If you are getting testing failures due to Mysql trying to connect as `root` user, you can put your Mysql credentials into `spec/support/database.yml`.
-See `spec/support/database.sample.yml` for an example.
+- We run tests against several ActiveRecord and Ruby versions using [gemika](https://github.com/makandra/gemika).
+- You can bundle all versions with `rake matrix:install`.
+- You can run specs against all Gemfiles compatible with your current ruby version with `rake matrix:spec`.
+- You can run specs against a single Gemfile with `BUNDLE_GEMFILE=Gemfile<variant> bundle exec rspec spec`.
+- When you make a pull request, tests are automatically run against all variants and Rubies on travis.ci.
 
 If you would like to contribute:
 

data/lib/active_type/change_association.rb

@@ -0,0 +1,31 @@
+module ActiveType
+
+  module ChangeAssociation
+
+    extend ActiveSupport::Concern
+
+    module ClassMethods
+
+      def change_association(association_name, new_scope, new_options = nil)
+        if (existing_association = self.reflect_on_association(association_name))
+          if new_scope.is_a?(Hash)
+            new_options = new_scope
+            new_scope = nil
+          end
+          original_options = existing_association.options
+          if ActiveRecord::VERSION::MAJOR > 3
+            new_scope ||= existing_association.scope
+            public_send(existing_association.macro, association_name, new_scope, original_options.merge(new_options))
+          else
+            public_send(existing_association.macro, association_name, original_options.merge(new_options))
+          end
+        else
+          raise ArgumentError, "unrecognized association `#{association_name}`"
+        end
+      end
+
+    end
+
+  end
+
+end

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/no_table.rb

@@ -101,6 +101,10 @@ module ActiveType
         def columns_hash(table_name)
           {}
         end
+        
+        def columns_hash?(table_name)
+          return false
+        end
 
         def data_source_exists?(table_name)
           false

data/lib/active_type/record.rb

@@ -1,6 +1,7 @@
 require 'active_type/virtual_attributes'
-require 'active_type/extended_record'
+require 'active_type/record_extension'
 require 'active_type/nested_attributes'
+require 'active_type/change_association'
 
 module ActiveType
 
@@ -10,7 +11,8 @@ module ActiveType
 
     include VirtualAttributes
     include NestedAttributes
-    include ExtendedRecord
+    include RecordExtension
+    include ChangeAssociation
 
   end
 

data/lib/active_type/{extended_record.rb → record_extension.rb}

@@ -1,9 +1,8 @@
-require 'active_type/virtual_attributes'
-require 'active_type/extended_record/inheritance'
+require 'active_type/record_extension/inheritance'
 
 module ActiveType
 
-  module ExtendedRecord
+  module RecordExtension
 
     extend ActiveSupport::Concern
 
@@ -15,6 +14,7 @@ module ActiveType
           include VirtualAttributes
           include NestedAttributes
           include Inheritance
+          include ChangeAssociation
 
           self.extended_record_base_class = base
         end

data/lib/active_type/{extended_record → record_extension}/inheritance.rb

@@ -1,6 +1,6 @@
 module ActiveType
 
-  module ExtendedRecord
+  module RecordExtension
 
     module Inheritance
 
@@ -15,10 +15,14 @@ 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
-        options
+        if ActiveRecord::VERSION::MAJOR > 3
+          [scope, options]
+        else
+          [options]
+        end
       end
 
       module ClassMethods
@@ -31,12 +35,16 @@ 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)
+          super(name, *Inheritance.add_foreign_key_option(extended_record_base_class, *args), &extension)
         end
 
         def has_one(name, *args, &extension)
-          super(name, Inheritance.add_foreign_key_option(extended_record_base_class, *args), &extension)
+          super(name, *Inheritance.add_foreign_key_option(extended_record_base_class, *args), &extension)
         end
 
         private
@@ -45,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
@@ -73,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.1.1'
+  VERSION = '1.3.2'
 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.1.1
+  version: 1.3.2
 platform: ruby
 authors:
 - Tobias Kraze
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-07 00:00:00.000000000 Z
+date: 2020-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -89,8 +89,7 @@ files:
 - Rakefile
 - active_type.gemspec
 - lib/active_type.rb
-- lib/active_type/extended_record.rb
-- lib/active_type/extended_record/inheritance.rb
+- lib/active_type/change_association.rb
 - lib/active_type/nested_attributes.rb
 - lib/active_type/nested_attributes/association.rb
 - lib/active_type/nested_attributes/builder.rb
@@ -99,6 +98,8 @@ files:
 - lib/active_type/no_table.rb
 - lib/active_type/object.rb
 - lib/active_type/record.rb
+- lib/active_type/record_extension.rb
+- lib/active_type/record_extension/inheritance.rb
 - lib/active_type/type_caster.rb
 - lib/active_type/util.rb
 - lib/active_type/version.rb
@@ -122,8 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Make any Ruby object quack like ActiveRecord