subroutine-factory 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab098b12a5104178762bdab02134bcd76c5e2db0
-  data.tar.gz: 168bf4050f3f21cb425826a6f24165927b85c909
+  metadata.gz: 24d648affb53fc86b2f122467fd39622e4cb24ce
+  data.tar.gz: 1b240333481df189a3b021fcde9df9d7bef49394
 SHA512:
-  metadata.gz: e0964f3b499ad5fac687b02ca037e4045529a5013c971b2b237c156a6fbf9231a5eba8cbff6da8dd3fe00dd6b528e316c54f6bb4b5362648375626ec2eaf213c
-  data.tar.gz: c60ce1162e529152aef0f846b95f14ea41eb2927438b8b01adfd0f40bfd9cb4c539975f40f8ab3a8a2875aa9fad87b918d7879c993c55ce17fd829289dca0251
+  metadata.gz: 5d074064071df20e58c74bc13d311a8e00fb0efbd68d6b0e9adc06be52068c127e4244a5d8954c319e0da0e1a969a5022ba97e6916d3dc46b366710e26eab458
+  data.tar.gz: 6545d9a5c54172aa307b5b1fe2d6bad11901800d21d7cd926d1a534f4ab346aa160f0f01c1e0e744183cad906d2b3fbb68116223399d90078e1991e6f8409db5

data/lib/subroutine/factory/builder.rb

@@ -14,44 +14,62 @@ module Subroutine
       def execute!
         args = @args.dup
 
-        Array(@options[:setups]).each{|block| block.call(args, @options) }
+        Array(@options[:setups]).each{|block| block.call(args, extras) }
 
         args.push(inputs)
 
         op = op_class.new(*args)
 
-        Array(@options[:befores]).each{|block| block.call(op, @options) }
+        Array(@options[:befores]).each{|block| block.call(op, extras) }
 
         op.submit!
 
         output = extract_output(op)
 
-        Array(@options[:afters]).each{|block| block.call(op, output, @options) }
+        Array(@options[:afters]).each{|block| block.call(op, output, extras) }
 
         output
       end
 
       def inputs
-        out = {}
-
-        @options[:inputs].each_pair do |k,v|
-          if @overrides.has_key?(k)
-            out[k] = @overrides[k]
-          else
-            out[k] = invoke_input(v)
+        @inputs ||= begin
+          out = {}
+
+          @options[:inputs].each_pair do |k,v|
+            if @overrides.has_key?(k)
+              out[k] = @overrides[k]
+            else
+              out[k] = invoke_input(v)
+            end
           end
+
+          out
         end
+      end
 
-        out
+      def extras
+        @extras ||= begin
+          out = {}
+
+          @options[:extras].each_pair do |k, v|
+            if @overrides.has_key?(k)
+              out[k] = @overrides[k]
+            elsif !v.nil?
+              out[k] = invoke_input(v)
+            end
+          end
+
+          out
+        end
       end
 
       def invoke_input(input)
         return input unless input.respond_to?(:call)
-        input.arity.zero? ? input.call : input.call(@options)
+        input.arity.zero? ? input.call : input.call(extras)
       end
 
       def op_class
-        klass = @options[:op].constantize
+        @options[:op].constantize
       end
 
       def extract_output(op)

data/lib/subroutine/factory/config.rb

@@ -61,6 +61,10 @@ module Subroutine
         @options[:outputs] = names
       end
 
+      def extra(name, value = nil)
+        @options[:extras][name.to_sym] = value
+      end
+
       protected
 
       def inherit_from(parent)
@@ -73,7 +77,7 @@ module Subroutine
         op(@options[:op]) if @options[:op]
 
         @options[:inputs] ||= {}
-        @options[:inputs].each_pair(&method(:input))
+        @options[:inputs].each_pair{|k,v| input(k, v) }
 
         outputs(*@options[:outputs]) if @options[:outputs]
         output(@options[:output]) if @options[:output]
@@ -86,6 +90,9 @@ module Subroutine
 
         @options[:afters] = @options[:afters].dup if @options[:afters]
         @options[:afters] ||= []
+
+        @options[:extras] ||= {}
+        @options[:extras].each_pair{|k,v| extra(k,v) }
       end
 
     end

data/lib/subroutine/factory/version.rb

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

metadata

@@ -1,97 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: subroutine-factory
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Mike Nelson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-22 00:00:00.000000000 Z
+date: 2016-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: subroutine
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.10'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest-reporters
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Test factories for ops using Subroutine Ops
@@ -101,8 +101,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
+- .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -126,17 +126,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: Test factories for ops using Subroutine Ops