subroutine-factory 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 81cef754be11e750d13eb7c4c28596cca62fa8b5
-  data.tar.gz: a8b9814705f934709c072173a5e03d5f13ef27cf
+  metadata.gz: ab098b12a5104178762bdab02134bcd76c5e2db0
+  data.tar.gz: 168bf4050f3f21cb425826a6f24165927b85c909
 SHA512:
-  metadata.gz: bd3bc62356f10cf94064ea850bd1fca0fc0b499b4b4d5b61fd4b668bad7fa221a16d0eee6326b387dc10e61297ef6a0ca7f7419ea981ce6ca22c1c1cecab663c
-  data.tar.gz: 540ffe7d99d9f80cec753b61dfae8637e93be7393b449ff0481a1c2dd59d7cb440e153f9ae173528f730dc5d2a8f954be13be63142e608cf07d42bf72461c666
+  metadata.gz: e0964f3b499ad5fac687b02ca037e4045529a5013c971b2b237c156a6fbf9231a5eba8cbff6da8dd3fe00dd6b528e316c54f6bb4b5362648375626ec2eaf213c
+  data.tar.gz: c60ce1162e529152aef0f846b95f14ea41eb2927438b8b01adfd0f40bfd9cb4c539975f40f8ab3a8a2875aa9fad87b918d7879c993c55ce17fd829289dca0251

data/lib/subroutine/factory.rb

@@ -47,9 +47,9 @@ module Subroutine
 
     def self.sequence(&lambda)
       if block_given?
-        Proc.new{
+        Proc.new{|*options|
           @@sequence += 1
-          lambda.call(@@sequence)
+          lambda.call(*[@@sequence, *options].compact)
         }
       else
         @@sequence += 1

data/lib/subroutine/factory/builder.rb

@@ -6,17 +6,28 @@ module Subroutine
 
       def initialize(config, *args)
         @config = config
-        @options = config.options
-        @args = args
+        @options = config.options.dup
+        @args = args.dup
         @overrides = @args.extract_options!
       end
 
       def execute!
-        op = op_class.new(*input_args)
-        Array(@options[:befores]).each{|block| block.call(op) }
+        args = @args.dup
+
+        Array(@options[:setups]).each{|block| block.call(args, @options) }
+
+        args.push(inputs)
+
+        op = op_class.new(*args)
+
+        Array(@options[:befores]).each{|block| block.call(op, @options) }
+
         op.submit!
+
         output = extract_output(op)
-        Array(@options[:afters]).each{|block| block.call(op, output) }
+
+        Array(@options[:afters]).each{|block| block.call(op, output, @options) }
+
         output
       end
 
@@ -27,17 +38,16 @@ module Subroutine
           if @overrides.has_key?(k)
             out[k] = @overrides[k]
           else
-            out[k] = v.respond_to?(:call) ? v.call : v
+            out[k] = invoke_input(v)
           end
         end
 
         out
       end
 
-      def input_args
-        args = @args.dup
-        args.push(inputs)
-        args
+      def invoke_input(input)
+        return input unless input.respond_to?(:call)
+        input.arity.zero? ? input.call : input.call(@options)
       end
 
       def op_class

data/lib/subroutine/factory/config.rb

@@ -35,6 +35,10 @@ module Subroutine
         end
       end
 
+      def setup(&block)
+        @options[:setups].push(block)
+      end
+
       def before(&block)
         @options[:befores].push(block)
       end
@@ -74,8 +78,12 @@ module Subroutine
         outputs(*@options[:outputs]) if @options[:outputs]
         output(@options[:output]) if @options[:output]
 
+        @options[:setups] = @options[:setups].dup if @options[:setups]
+        @options[:setups] ||= []
+
         @options[:befores] = @options[:befores].dup if @options[:befores]
         @options[:befores] ||= []
+
         @options[:afters] = @options[:afters].dup if @options[:afters]
         @options[:afters] ||= []
       end

data/lib/subroutine/factory/version.rb

@@ -1,5 +1,5 @@
 module Subroutine
   module Factory
-    VERSION = "0.1.4"
+    VERSION = "0.1.5"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: subroutine-factory
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Mike Nelson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-09-17 00:00:00.000000000 Z
+date: 2015-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: subroutine