active_type 1.6.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd106690815f11c7582797456d2915ae313899725bfab18aa1ada385c66367cc
-  data.tar.gz: 1aec1dec85d519dfa8d75ae3985e1e182963725369c783eb8b2254f6406bba97
+  metadata.gz: fc1d824f4bc8d16a858ad4264432940368081f7ff9dac1e6ab522e7a8e244385
+  data.tar.gz: 62a451171a9caab0a89901856746262cb0529b7b94df191baa7ee9d01a13a6e9
 SHA512:
-  metadata.gz: 611573072b7632eec3d78e7a80263ff4844100b2c401879fbbfe326d8d68cf2f3780fdaa7c260f8917aaadbe343f263472c12a42a797d6dbead714540df2a5bb
-  data.tar.gz: 6a0e49c446ada6f2a63cad98ab59ab552015e3fe3c573fe4075ba28f0ddb02b084cb5b604f005da6f99bad2221e8dfdc9c3d6f90963bd6142a62525b0c5af39c
+  metadata.gz: 8e9899a9e91e7150fb56a9a3e745c86966122f596b9ebe72ee23136c232fd8e77db9f9b670a13980021e57fd46dc8f8f46d899bf9fb7faa20ef261558eb44929
+  data.tar.gz: 66c4878918cb20e924f0c044e1ae6d862611622067eaca2608ce25caa1a67d081416a69e5e10a83dd4ce256c306cbea624860d3f699d53be5da8d0ecf21b3c15

data/.github/workflows/test.yml

@@ -13,34 +13,35 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby:
-          - "2.3.8"
-          - "2.5.5"
-          - "2.6.3"
-          - "2.7.2"
-        gemfile:
-          - Gemfile.3.2.sqlite3
-          - Gemfile.4.2.sqlite3
-          - Gemfile.5.2.sqlite3
-          - Gemfile.6.0.sqlite3
-          - Gemfile.6.1.sqlite3
-        exclude:
+        include:
           - ruby: "2.3.8"
-            gemfile: Gemfile.6.0.sqlite3
+            gemfile: Gemfile.3.2.sqlite3
           - ruby: "2.3.8"
-            gemfile: Gemfile.6.1.sqlite3
+            gemfile: Gemfile.4.2.sqlite3
+          - ruby: "2.3.8"
+            gemfile: Gemfile.5.2.sqlite3
           - ruby: "2.5.5"
-            gemfile: Gemfile.3.2.sqlite3
+            gemfile: Gemfile.5.2.sqlite3
           - ruby: "2.5.5"
-            gemfile: Gemfile.4.2.sqlite3
+            gemfile: Gemfile.6.0.sqlite3
+          - ruby: "2.5.5"
+            gemfile: Gemfile.6.1.sqlite3
           - ruby: "2.6.3"
-            gemfile: Gemfile.3.2.sqlite3
+            gemfile: Gemfile.5.2.sqlite3
           - ruby: "2.6.3"
-            gemfile: Gemfile.4.2.sqlite3
+            gemfile: Gemfile.6.0.sqlite3
+          - ruby: "2.6.3"
+            gemfile: Gemfile.6.1.sqlite3
           - ruby: "2.7.2"
-            gemfile: Gemfile.3.2.sqlite3
+            gemfile: Gemfile.5.2.sqlite3
           - ruby: "2.7.2"
-            gemfile: Gemfile.4.2.sqlite3
+            gemfile: Gemfile.6.0.sqlite3
+          - ruby: "2.7.2"
+            gemfile: Gemfile.6.1.sqlite3
+          - ruby: "3.0.1"
+            gemfile: Gemfile.6.0.sqlite3
+          - ruby: "3.0.1"
+            gemfile: Gemfile.6.1.sqlite3
 
     env:
       BUNDLE_GEMFILE: ${{ matrix.gemfile }}
@@ -78,30 +79,17 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby:
-          - "2.3.8"
-          - "2.5.5"
-          - "2.6.3"
-          - "2.7.2"
-        gemfile:
-          - Gemfile.3.2.mysql2
-          - Gemfile.4.2.mysql2
-          - Gemfile.5.2.mysql2
-        exclude:
-          - ruby: "2.5.5"
+        include:
+          - ruby: "2.3.8"
             gemfile: Gemfile.3.2.mysql2
-          - ruby: "2.5.5"
+          - ruby: "2.3.8"
             gemfile: Gemfile.4.2.mysql2
-          - ruby: "2.5.5"
+          - ruby: "2.3.8"
             gemfile: Gemfile.5.2.mysql2
           - ruby: "2.6.3"
-            gemfile: Gemfile.3.2.mysql2
-          - ruby: "2.6.3"
-            gemfile: Gemfile.4.2.mysql2
-          - ruby: "2.7.2"
-            gemfile: Gemfile.3.2.mysql2
+            gemfile: Gemfile.5.2.mysql2
           - ruby: "2.7.2"
-            gemfile: Gemfile.4.2.mysql2
+            gemfile: Gemfile.5.2.mysql2
 
     env:
       BUNDLE_GEMFILE: ${{ matrix.gemfile }}
@@ -146,26 +134,23 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby:
-          - "2.3.8"
-          - "2.5.5"
-          - "2.6.3"
-          - "2.7.2"
-        gemfile:
-          - Gemfile.4.2.pg
-          - Gemfile.5.2.pg
-          - Gemfile.6.1.pg
-        exclude:
+        include:
           - ruby: "2.3.8"
-            gemfile: Gemfile.6.1.pg
-          - ruby: "2.5.5"
             gemfile: Gemfile.4.2.pg
+          - ruby: "2.3.8"
+            gemfile: Gemfile.5.2.pg
           - ruby: "2.5.5"
+            gemfile: Gemfile.6.1.pg
+          - ruby: "2.6.3"
             gemfile: Gemfile.5.2.pg
           - ruby: "2.6.3"
-            gemfile: Gemfile.4.2.pg
+            gemfile: Gemfile.6.1.pg
           - ruby: "2.7.2"
-            gemfile: Gemfile.4.2.pg
+            gemfile: Gemfile.5.2.pg
+          - ruby: "2.7.2"
+            gemfile: Gemfile.6.1.pg
+          - ruby: "3.0.1"
+            gemfile: Gemfile.6.1.pg
 
     env:
       BUNDLE_GEMFILE: ${{ matrix.gemfile }}

data/Gemfile.5.2.mysql2.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    active_type (1.6.0)
+    active_type (1.7.0)
       activerecord (>= 3.2)
 
 GEM

data/Gemfile.5.2.pg.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    active_type (1.6.0)
+    active_type (1.7.0)
       activerecord (>= 3.2)
 
 GEM
@@ -21,7 +21,7 @@ GEM
     arel (8.0.0)
     concurrent-ruby (1.1.7)
     diff-lcs (1.4.4)
-    gemika (0.5.0)
+    gemika (0.6.0)
     i18n (1.8.5)
       concurrent-ruby (~> 1.0)
     minitest (5.14.2)
@@ -56,4 +56,4 @@ DEPENDENCIES
   rspec (~> 3.4)
 
 BUNDLED WITH
-   2.1.4
+   2.2.16

data/Gemfile.5.2.sqlite3.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    active_type (1.6.0)
+    active_type (1.7.0)
       activerecord (>= 3.2)
 
 GEM
@@ -56,4 +56,4 @@ DEPENDENCIES
   sqlite3
 
 BUNDLED WITH
-   2.1.4
+   2.2.16

data/Gemfile.6.0.sqlite3.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    active_type (1.6.0)
+    active_type (1.7.0)
       activerecord (>= 3.2)
 
 GEM
@@ -20,7 +20,7 @@ GEM
       zeitwerk (~> 2.2, >= 2.2.2)
     concurrent-ruby (1.1.7)
     diff-lcs (1.4.4)
-    gemika (0.5.0)
+    gemika (0.6.0)
     i18n (1.8.5)
       concurrent-ruby (~> 1.0)
     minitest (5.14.2)
@@ -56,4 +56,4 @@ DEPENDENCIES
   sqlite3
 
 BUNDLED WITH
-   2.1.4
+   2.2.16

data/Gemfile.6.1.pg.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    active_type (1.6.0)
+    active_type (1.7.0)
       activerecord (>= 3.2)
 
 GEM
@@ -20,7 +20,7 @@ GEM
       zeitwerk (~> 2.3)
     concurrent-ruby (1.1.8)
     diff-lcs (1.4.4)
-    gemika (0.5.0)
+    gemika (0.6.0)
     i18n (1.8.9)
       concurrent-ruby (~> 1.0)
     minitest (5.14.4)
@@ -55,4 +55,4 @@ DEPENDENCIES
   rspec (~> 3.4)
 
 BUNDLED WITH
-   2.2.6
+   2.2.16

data/Gemfile.6.1.sqlite3.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    active_type (1.6.0)
+    active_type (1.7.0)
       activerecord (>= 3.2)
 
 GEM
@@ -20,7 +20,7 @@ GEM
       zeitwerk (~> 2.3)
     concurrent-ruby (1.1.8)
     diff-lcs (1.4.4)
-    gemika (0.5.0)
+    gemika (0.6.0)
     i18n (1.8.9)
       concurrent-ruby (~> 1.0)
     minitest (5.14.4)
@@ -55,4 +55,4 @@ DEPENDENCIES
   sqlite3
 
 BUNDLED WITH
-   2.2.6
+   2.2.16

data/README.md

@@ -129,7 +129,7 @@ Virtual attributes will not be persisted.
 
 `ActiveType::Record[BaseClass]` is used to extend a given `BaseClass` (that itself has to be an `ActiveRecord` model) with additional functionality, that is not meant to be shared to the rest of the application.
 
-You class will inherit from `BaseClass`. You can add additional methods, validations, callbacks, as well as use (virtual) attributes like an `ActiveType::Object`:
+Your class will inherit from `BaseClass`. You can add additional methods, validations, callbacks, as well as use (virtual) attributes like an `ActiveType::Object`:
 
 ```ruby
 class SignUp < ActiveType::Record[User]
@@ -137,6 +137,17 @@ class SignUp < ActiveType::Record[User]
 end
 ```
 
+If you need to access the extended `BaseClass` from your presenter model, you may call `extended_record_base_class` on its class:
+
+```ruby
+SignUp.extended_record_base_class # => "User (...)"
+
+# or
+sign_up = SignUp.new
+sign_up.class # => "SignUp (...)"
+sign_up.class.extended_record_base_class # => "User (...)"
+```
+
 ### Inheriting from ActiveType:: objects
 
 If you want to inherit from an ActiveType class, simply do
@@ -394,14 +405,14 @@ Now, if you load `credentials`, you will automatically receive records of type `
 Supported Rails versions
 ------------------------
 
-ActiveType is tested against ActiveRecord 3.2, 4.2, 5.1, and 5.2.
+ActiveType is tested against ActiveRecord 3.2, 4.2, 5.1, 5.2, 6.0 and 6.1.
 
 Later versions might work, earlier will not.
 
 Supported Ruby versions
 ------------------------
 
-ActiveType is tested against 2.3, 2.4, and 2.5.
+ActiveType is tested against 2.3, 2.4, 2.5 and 3.0.
 
 
 Installation
@@ -429,7 +440,7 @@ If you would like to contribute:
 - Push your changes **with passing specs**.
 - Send us a pull request.
 
-I'm very eager to keep this gem leightweight and on topic. If you're unsure whether a change would make it into the gem, [talk to me beforehand](mailto:henning.koch@makandra.de).
+I'm very eager to keep this gem lightweight and on topic. If you're unsure whether a change would make it into the gem, [talk to me beforehand](mailto:henning.koch@makandra.de).
 
 
 Credits

data/lib/active_type/change_association.rb

@@ -15,9 +15,9 @@ module ActiveType
           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))
+            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))
+            public_send(existing_association.macro, association_name, **original_options.merge(new_options))
           end
         else
           raise ArgumentError, "unrecognized association `#{association_name}`"

data/lib/active_type/record_extension/inheritance.rb

@@ -19,7 +19,7 @@ module ActiveType
           options = options.merge(foreign_key: extended_record_base_class.name.foreign_key)
         end
         if ActiveRecord::VERSION::MAJOR > 3
-          [scope, options]
+          [options, scope]
         else
           [options]
         end
@@ -64,12 +64,22 @@ module ActiveType
           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)
+        def has_many(name, scope=nil, *args, &extension)
+          new_args, new_scope = Inheritance.add_foreign_key_option(extended_record_base_class, scope, *args)
+          if ActiveRecord::VERSION::MAJOR <= 3 || new_scope.nil?
+            super(name, **new_args, &extension)
+          else
+            super(name, new_scope, **new_args, &extension)
+          end
         end
 
-        def has_one(name, *args, &extension)
-          super(name, *Inheritance.add_foreign_key_option(extended_record_base_class, *args), &extension)
+        def has_one(name, scope=nil, *args, &extension)
+          new_args, new_scope = Inheritance.add_foreign_key_option(extended_record_base_class, scope, *args)
+          if ActiveRecord::VERSION::MAJOR <= 3 || new_scope.nil?
+            super(name, **new_args, &extension)
+          else
+            super(name, new_scope, **new_args, &extension)
+          end
         end
 
         private

data/lib/active_type/version.rb

@@ -1,3 +1,3 @@
 module ActiveType
-  VERSION = '1.6.0'
+  VERSION = '1.7.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_type
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.0
 platform: ruby
 authors:
 - Tobias Kraze
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-04 00:00:00.000000000 Z
+date: 2021-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler