subroutine-factory 0.1.3 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 11fe1b1eb2083aae444968de381654c254282479
-  data.tar.gz: b7f47712b4f46bf5b08d4e1f34086adf1927efcc
+SHA256:
+  metadata.gz: dc88dc64c89f0f831b0ebbe437649c866edb2ca87a58f953b355a27b453abbb0
+  data.tar.gz: e6671efa5cdc98c54098dc5518db9e304ce2554062b980fc60203df635e9cc15
 SHA512:
-  metadata.gz: 114d75567ba4148cef1d798b46d39eeb619fc6e98a329cb27f19f3c6bdb7df7208d80b0e313cee61e878dd6f5388c1f6baaf41c4b41c4cda03273870f65eeed8
-  data.tar.gz: 01a4e8da80b5b6d4490f6ad0ec3e492cd79981f42fbf1736e1af59267db5a378376694ac885ab0871a23ae259cceefbaf758602f8629c068b2a908b0b6b100b4
+  metadata.gz: 8fb7d4c79e01fc7fbd5459d7d145511d6cb32140da3268eef9d8b16f402bf7ff912b2b96675966426b0eafc3aaec6f4f15c4279c4cc706c7bb7d3b171e4576b5
+  data.tar.gz: 8fe2680a14be76556bfe8c81ffe95b3312f9c52a7d2965c1fe665edf2baed874332ceb100e16a6f6ba8700893965bc8e3a06c4807e90fb10a41bff573c10f43f

data/.ruby-version

@@ -0,0 +1 @@
+2.5.1

data/.travis.yml

@@ -1,4 +1,4 @@
 language: ruby
 
 rvm:
-  - 2.1.1
+  - 2.5.1

data/lib/subroutine/factory.rb

@@ -1,4 +1,7 @@
-require 'subroutine'
+# frozen_string_literal: true
+
+require "securerandom"
+require "subroutine"
 require "subroutine/factory/version"
 require "subroutine/factory/config"
 require "subroutine/factory/builder"
@@ -29,7 +32,8 @@ module Subroutine
     def self.get_config!(name)
       config = get_config(name)
       raise "Unknown Subroutine::Factory `#{name}`" unless config
-      return config
+
+      config
     end
 
     def self.create(name, *args)
@@ -47,15 +51,48 @@ module Subroutine
 
     def self.sequence(&lambda)
       if block_given?
-        Proc.new{
+        proc do |*options|
           @@sequence += 1
-          lambda.call(@@sequence)
-        }
+          lambda.call(*[@@sequence, *options].compact)
+        end
       else
         @@sequence += 1
       end
     end
 
+    def self.random(random_options = {}, &lambda)
+      if block_given?
+        proc do |*options|
+          x = build_random(random_options)
+          lambda.call(*[x, *options].compact)
+        end
+      else
+        build_random(random_options)
+      end
+    end
+
+    RANDOM_FUNCTION_TYPES = %i[alphanumeric numeric alpha]
+    ALPHAS = ("a".."z").to_a
+    NUMERICS = (0..9).to_a
+    ALPHANUMERICS = NUMERICS + ALPHAS
+    def self.build_random(length: 8, type: :alphanumeric)
+      raise ArgumentError, ":type must be one of #{RANDOM_FUNCTION_TYPES.inspect}" unless RANDOM_FUNCTION_TYPES.include?(type.to_sym)
+
+      source = (
+        case type.to_sym
+        when :alphanumeric then ALPHANUMERICS
+        when :numeric then NUMERICS
+        when :alpha then ALPHAS
+        end
+      )
+
+      length.times.inject(+"") do |memo, _i|
+        x = source.sample.to_s
+        x = x.upcase if rand(2) == 1
+        memo << x
+      end
+    end
+
     def self.set_sequence(n)
       @@sequence = n
     end

data/lib/subroutine/factory/builder.rb

@@ -6,42 +6,70 @@ 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, extras) }
+
+        args.push(inputs)
+
+        op = op_class.new(*args)
+
+        Array(@options[:befores]).each{|block| block.call(op, extras) }
+
         op.submit!
+
         output = extract_output(op)
-        Array(@options[:afters]).each{|block| block.call(op, output) }
+
+        Array(@options[:afters]).each{|block| block.call(op, output, extras) }
+
         output
       end
 
       def inputs
-        out = {}
+        @inputs ||= begin
+          out = {}
 
-        @options[:inputs].each_pair do |k,v|
-          if @overrides.has_key?(k)
-            out[k] = @overrides[k]
-          else
-            out[k] = v.respond_to?(:call) ? v.call : v
+          @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 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(extras)
       end
 
       def op_class
-        klass = @options[:op].constantize
+        @options[:op].constantize
       end
 
       def extract_output(op)

data/lib/subroutine/factory/config.rb

@@ -5,6 +5,7 @@ module Subroutine
     class Config
 
       delegate :sequence, to: "::Subroutine::Factory"
+      delegate :random, to: "::Subroutine::Factory"
 
       attr_reader :options
 
@@ -35,6 +36,10 @@ module Subroutine
         end
       end
 
+      def setup(&block)
+        @options[:setups].push(block)
+      end
+
       def before(&block)
         @options[:befores].push(block)
       end
@@ -57,6 +62,10 @@ module Subroutine
         @options[:outputs] = names
       end
 
+      def extra(name, value = nil)
+        @options[:extras][name.to_sym] = value
+      end
+
       protected
 
       def inherit_from(parent)
@@ -69,15 +78,22 @@ 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]
 
+        @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] ||= []
+
+        @options[:extras] ||= {}
+        @options[:extras].each_pair{|k,v| extra(k,v) }
       end
 
     end

data/lib/subroutine/factory/spec_helper.rb

@@ -1,6 +1,7 @@
 module Subroutine
   module Factory
     module SpecHelper
+
       def factory(*args)
         ::Subroutine::Factory.create(*args)
       end
@@ -8,6 +9,11 @@ module Subroutine
       def factory!(*args)
         factory(*args)
       end
+
+      def factory_inputs(*args)
+        ::Subroutine::Factory.inputs(*args)
+      end
+
     end
   end
 end

data/lib/subroutine/factory/version.rb

@@ -1,5 +1,9 @@
+# frozen_string_literal: true
+
 module Subroutine
   module Factory
-    VERSION = "0.1.3"
+
+    VERSION = "0.1.8"
+
   end
 end

data/subroutine-factory.gemspec

@@ -30,8 +30,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency "subroutine"
   spec.add_dependency "activesupport", ">= 3.0"
 
-  spec.add_development_dependency "bundler", "~> 1.10"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake"
   spec.add_development_dependency "minitest"
   spec.add_development_dependency "minitest-reporters"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: subroutine-factory
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.8
 platform: ruby
 authors:
 - Mike Nelson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-09-17 00:00:00.000000000 Z
+date: 2020-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: subroutine
@@ -42,30 +42,30 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -102,6 +102,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".ruby-version"
 - ".travis.yml"
 - Gemfile
 - LICENSE.txt
@@ -135,8 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Test factories for ops using Subroutine Ops