active_type 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5dd2986e6945783f4c52776074f66d614ecbbcef28f5eb1471ebf450dd68c8d2
-  data.tar.gz: 763be8835f5184df763527d0b10b8af06edf12168a8d76ebc67951680e097cb7
+  metadata.gz: 4cca938174e6902624f069ca895ff0ee565f2db0696ef0460702a125ee84c303
+  data.tar.gz: 3821a7c56f508d8b3f90d8301e3488844f0dc5bf905780358f6925c6137a1211
 SHA512:
-  metadata.gz: 301557809bffecdb33705cb01d68a1da237d6d0d30e726239e8c2af57c59eeb81c8c3287796f49c76abe0c4a65ab4196d4d23374224c0796ae207355f58e6019
-  data.tar.gz: bebb85d3edc8733b3816ee82925659a804836eaddc20d100c171a1eeb034134e3159de414d62fadc406d243c13b4ed4116b74127e777bf9da1d9872af7c3ea2b
+  metadata.gz: 5624b33d08104097164b692a39f4f31262ccfb86f05de711851f179cdc1c4f06d46d41712bd915eac557aee96f473b9f3aa83c42edba7c047e686cfbd5798726
+  data.tar.gz: f17e251805aad979ad202afe86d69ebe997a7fb8e0ad6a4843ce49d2c125ed11c81779791c2ec7d6ba6dcdad31c5fa1cf953ef3163d1600f8e8eef2c30c19fd2

data/.travis.yml

@@ -1,4 +1,7 @@
 language: ruby
+dist: trusty
+services:
+  - postgresql
 rvm:
   - "2.3.8"
   - "2.4.5"

data/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 All notable changes to this project will be documented in this file.
 
+## Unreleased
+
+## 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.2.0)
       activerecord (>= 3.2)
 
 GEM

data/Gemfile.3.2.sqlite3.lock

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

data/Gemfile.4.2.mysql2.lock

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

data/Gemfile.4.2.pg.lock

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

data/Gemfile.4.2.sqlite3.lock

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

data/Gemfile.5.2.mysql2.lock

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

data/Gemfile.5.2.pg.lock

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

data/Gemfile.5.2.sqlite3.lock

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

data/Gemfile.6.0.pg.lock

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

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/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
 
@@ -18,7 +18,11 @@ module ActiveType
         unless options[:foreign_key]
           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
@@ -32,11 +36,11 @@ module ActiveType
         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

data/lib/active_type/version.rb

@@ -1,3 +1,3 @@
 module ActiveType
-  VERSION = '1.1.1'
+  VERSION = '1.2.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_type
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 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: 2019-06-18 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
@@ -123,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: Make any Ruby object quack like ActiveRecord