subroutine 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3acb651d981b9e158e41c5e36b9fcf2fc644fb51
-  data.tar.gz: ff3571355496f5202702a26ab935a1d7944c73a3
+  metadata.gz: a1bc6198e47ce610c393d061ea8d657d9fbaed30
+  data.tar.gz: d51c78f5328d91119eb2ec1c252383645d8e9485
 SHA512:
-  metadata.gz: e651e0bbbcb6a355d6f07613becee56d67c08b7016b72660cda62608956a0b7db58006ed8ff45b58346ec827b02b8af2d1b2b6ad191d55ccb42c9935f24a4dff
-  data.tar.gz: 9fbb7f7d91c60a1c71ac4a965179efd9f45a665e93bc9c9bfb70da2ef0d07d06cdebeb2ef3526f968477c71c7eaa4515b20c097aa5bf66d8cdbd5141150a11f9
+  metadata.gz: 265862ad55b33f9c16ab8665666d870480d7297c095dcd9a387e86d8c4a7ff81b512cae2a2cfbaea57eda3ffff134c4a943b6bf1835a2508a59be11661fd4e0c
+  data.tar.gz: e4b8325a9f266f14bf1915ca05080e74d3e7361a759433997e4f4d602df8ed5a63707933e0e636b741868bbd9d1443cfea004a1080176faf4f5ca69b4883a40e

data/lib/subroutine/op.rb

@@ -72,13 +72,20 @@ module Subroutine
       alias_method :ignore_errors, :ignore_error
 
       def inputs_from(*ops)
+        options = ops.extract_options!
+        excepts = options.key?(:except) ? Array(options.delete(:except)) : nil
+        onlys = options.key?(:only) ? Array(options.delete(:only)) : nil
+
         ops.each do |op|
-          op._fields.each_pair do |field_name, options|
-            if options[:association]
+          op._fields.each_pair do |field_name, op_options|
+            next if excepts && excepts.include?(field_name)
+            next if onlys && !onlys.include?(field_name)
+
+            if op_options[:association]
               include ::Subroutine::Association unless included_modules.include?(::Subroutine::Association)
-              association(field_name, options)
+              association(field_name, op_options)
             else
-              field(field_name, options)
+              field(field_name, op_options)
             end
           end
         end

data/lib/subroutine/version.rb

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

data/test/subroutine/base_test.rb

@@ -33,6 +33,20 @@ module Subroutine
       end
     end
 
+    def test_inputs_from_ignores_except_fields
+      op = ::ExceptFooBarOp.new
+      refute op._fields.keys.include? :foo
+      refute op._fields.keys.include? :bar
+      assert_equal [:baz], op._fields.keys.sort
+    end
+
+    def test_inputs_from_only_fields
+      op = ::OnlyFooBarOp.new
+      assert op._fields.keys.include? :foo
+      assert op._fields.keys.include? :bar
+      refute_equal [:baz], op._fields.keys.sort
+    end
+
     def test_defaults_declaration_options
       op = ::DefaultsOp.new
       assert_equal 'foo', op.foo

data/test/support/ops.rb

@@ -92,6 +92,14 @@ class DefaultsOp < ::Subroutine::Op
 
 end
 
+class ExceptFooBarOp < ::Subroutine::Op
+  inputs_from ::DefaultsOp, except: %i[foo bar]
+end
+
+class OnlyFooBarOp < ::Subroutine::Op
+  inputs_from ::DefaultsOp, only: %i[foo bar]
+end
+
 class InheritedDefaultsOp < ::DefaultsOp
 
   field :bar, :default => 'barstool'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: subroutine
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Mike Nelson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-02 00:00:00.000000000 Z
+date: 2017-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel