subroutine 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eaf64bc5b7da2f85485bd5e3f22c3e69106da013
-  data.tar.gz: 65575447d14913aba3e9d6565d168ff5bb0fb202
+  metadata.gz: 02db9f879b81621b4bf0eb6825644ccb513b7883
+  data.tar.gz: 6e557fb324b506ed9462fed4825228ff664fdcb7
 SHA512:
-  metadata.gz: 0d249ab00c1017ac02427e26b6a2bab807b015ed8ab4f5c0ddcb5125a005aa9335cae759b4ddfb5ba766704ee2b5859723ab779bbabfad6675002cc41956dfce
-  data.tar.gz: 67c4967e9136863e67bfc7d29c0a9358352f54594eff7ec1887d932bf533cc1b1cdeada1d488089fb10b244fa930d4ede7bab75ee95f28a4f162c42f934d95f4
+  metadata.gz: 4c39b6b9e07615d075b497bee62db14fda475cd72e7fe8843d5346e3ce9e99d9c7b251e8fa8984b2b4702d51d4d1f55c5ad51ebd405d32fbc7453bc33fb81460
+  data.tar.gz: 0d17dca16db07d8873a5701be92f820127de198c6e0c3a02d4db578becb69592f678885d3e675081d12f36015bbdfd7a3dae156e8372115cf691dcfe793dcf60

data/lib/subroutine/op.rb

@@ -51,7 +51,12 @@ module Subroutine
       def inputs_from(*ops)
         ops.each do |op|
           op._fields.each_pair do |field_name, options|
-            field(field_name, options)
+            if options[:association]
+              include ::Subroutine::Association unless included_modules.include?(::Subroutine::Association)
+              association(field_name, options)
+            else
+              field(field_name, options)
+            end
           end
         end
       end

data/lib/subroutine/version.rb

@@ -2,7 +2,7 @@ module Subroutine
 
   MAJOR = 0
   MINOR = 3
-  PATCH = 2
+  PATCH = 3
   PRE   = nil
 
   VERSION = [MAJOR, MINOR, PATCH, PRE].compact.join('.')

data/test/subroutine/association_test.rb

@@ -64,5 +64,43 @@ module Subroutine
       assert_equal "AdminUser", op.admin_type
     end
 
+    def test_it_inherits_associations_via_inputs_from
+      all_mock = mock
+
+      ::User.expects(:all).returns(all_mock)
+      all_mock.expects(:find).with(1).returns(doug)
+
+      op = ::InheritedSimpleAssociation.new(user_type: "User", user_id: doug.id)
+      assert_equal doug, op.user
+      assert_equal "User", op.user_type
+      assert_equal doug.id, op.user_id
+    end
+
+    def test_it_inherits_associations_via_inputs_from_and_preserves_options
+      all_mock = mock
+      unscoped_mock = mock
+
+      ::User.expects(:all).returns(all_mock)
+      all_mock.expects(:unscoped).returns(unscoped_mock)
+      unscoped_mock.expects(:find).with(1).returns(doug)
+
+      op = ::InheritedUnscopedAssociation.new(user_type: "User", user_id: doug.id)
+      assert_equal doug, op.user
+      assert_equal "User", op.user_type
+      assert_equal doug.id, op.user_id
+    end
+
+    def test_it_inherits_polymorphic_associations_via_inputs_from
+      all_mock = mock
+      ::User.expects(:all).never
+      ::AdminUser.expects(:all).returns(all_mock)
+      all_mock.expects(:find).with(1).returns(doug)
+
+      op = ::InheritedPolymorphicAssociationOp.new(admin_type: "AdminUser", admin_id: doug.id)
+      assert_equal doug, op.admin
+      assert_equal "AdminUser", op.admin_type
+      assert_equal doug.id, op.admin_id
+    end
+
   end
 end

data/test/support/ops.rb

@@ -189,3 +189,15 @@ end
 class AssociationWithClassOp < ::OpWithAssociation
   association :admin, class_name: "AdminUser"
 end
+
+class InheritedSimpleAssociation < ::Subroutine::Op
+  inputs_from SimpleAssociationOp
+end
+
+class InheritedUnscopedAssociation < ::Subroutine::Op
+  inputs_from UnscopedSimpleAssociationOp
+end
+
+class InheritedPolymorphicAssociationOp < ::Subroutine::Op
+  inputs_from PolymorphicAssociationOp
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: subroutine
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Mike Nelson