rake_factory 0.21.0 → 0.22.0.pre.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d02e044e9b6f155c382a8aa0f2a3c11e92646434a61c8bd394e7e8a864ae8be7
-  data.tar.gz: 48eb21f6a42b567080e32526aabf453b4d42b6b538e901b9e39c85c739d3c292
+  metadata.gz: dc9e6dc8e318ce336d74c0a711e52878e50c6fb46590158813571c93a871c7e7
+  data.tar.gz: 96c59975d86c5bb4a2863790576361f4a41a5d087f5e9465d91313fe5750c1c6
 SHA512:
-  metadata.gz: b659a191f909c92c62593dc5159f41b1a273429ea1a19c604dd1fc9567410f268291843575d181765c65de4d475dba9d58cfa46a578a9647fd53d4f1c9cb8c57
-  data.tar.gz: '0592d281c30cfc70f02bd4e39caedbba44268b328358e7d9a85fb547cfad9775a802e34ee477b72d098fa767574e95e26936f1723e88c192869a0bec9ac7f0dd'
+  metadata.gz: 2ceb116d978a610b6a6194a745357dc50687afdd370e47e6d000719609a1bba1ad7d39b8cd606bc0e2f23931393d5dd37e2a7d18b9da71ed3880d6309c269466
+  data.tar.gz: b65d4d012b05c3092b60e7494ce8cecec1b0c0a27ba0019170b042823adbdcf1bcabea2bbf9a15375f74d81bd7cf40666b73051731a526ebb92e4da077863caa

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rake_factory (0.21.0)
+    rake_factory (0.22.0.pre.1)
       activesupport (>= 4)
       rake (~> 13.0)
 

data/TODO.md

@@ -1,2 +1,18 @@
 * Allow parameter reads to be memoized
 * More clearly distinguish between construction and runtime parameters
+  - Parameter types:
+    - definition-time parameter: must be set before definition of the task.
+    - invocation-time parameter: can be set before or after definition of the 
+      task; can be set in configuration block.
+  - Parameter value types:
+    - static value: do not depend on task set / task / runtime arguments.
+    - dynamic value: require task set / task / runtime arguments in order to be
+      resolved.
+  - For tasks:
+    - definition-time parameters can have static values and dynamic values of 
+      arity zero or one, optionally taking the task itself
+    - invocation-time parameters can have static values and dynamic values of 
+      arity zero, one or two, optionally taking the task itself and the runtime
+      arguments
+  - For task sets:
+    - all parameters are definition-time

data/lib/rake_factory/kernel_extensions.rb

@@ -0,0 +1,11 @@
+require_relative 'values'
+
+module Kernel
+  def dynamic(&block)
+    RakeFactory::DynamicValue.new(&block)
+  end
+
+  def static(value)
+    RakeFactory::StaticValue.new(value)
+  end
+end

data/lib/rake_factory/parameter.rb

@@ -1,3 +1,5 @@
+require_relative 'values'
+
 module RakeFactory
   class Parameter
     attr_reader(
@@ -5,7 +7,6 @@ module RakeFactory
         :default,
         :required,
         :configurable,
-        :lazy,
         :transform)
     attr_writer(:default)
 
@@ -14,7 +15,6 @@ module RakeFactory
       @default = options[:default]
       @required = options[:required] || false
       @transform = options[:transform] || lambda { |x| x }
-      @lazy = options[:lazy].nil? ? false : !!options[:lazy]
       @configurable =
           options[:configurable].nil? ? true : !!options[:configurable]
     end
@@ -39,15 +39,10 @@ module RakeFactory
         end
 
         define_method parameter.reader_method do
-          value_resolver = lambda do |t|
-            stored_value = instance_variable_get(parameter.instance_variable)
-            resolved_value = stored_value.respond_to?(:call) ?
-                stored_value.call(*[t].slice(0, stored_value.arity)) :
-                stored_value
-            transformed_value = parameter.transform.call(resolved_value)
-            transformed_value
-          end
-          parameter.lazy ? value_resolver : value_resolver.call(self)
+          stored_value = instance_variable_get(parameter.instance_variable)
+          resolved_value = Values.resolve(stored_value).evaluate([self])
+          transformed_value = parameter.transform.call(resolved_value)
+          transformed_value
         end
       end
     end

data/lib/rake_factory/parameter_view.rb

@@ -1,8 +1,10 @@
+require_relative 'values'
+
 module RakeFactory
   class ParameterView
     attr_reader(:task)
 
-    def initialize(target, reader_class, writer_class, args)
+    def initialize(target, reader_class, writer_class, runtime_arguments)
       self.instance_eval do
         reader_class.parameter_set.each do |parameter|
           define_singleton_method parameter.reader_method do
@@ -13,13 +15,9 @@ module RakeFactory
           if parameter.configurable?
             define_singleton_method parameter.writer_method do |value|
               if target.respond_to?(parameter.writer_method)
-                resolved_value = lambda do |t|
-                  params = args ? [t, args] : [t]
-                  value.respond_to?(:call) ?
-                      value.call(*params.slice(0, value.arity)) :
-                      value
-                end
-                target.send(parameter.writer_method, resolved_value)
+                target.send(
+                    parameter.writer_method,
+                    Values.resolve(value).append_argument(runtime_arguments))
               end
             end
           end

data/lib/rake_factory/task_set.rb

@@ -1,5 +1,6 @@
 require 'rake/tasklib'
 
+require_relative 'values'
 require_relative 'parameters'
 require_relative 'definable'
 require_relative 'defaults'
@@ -77,12 +78,7 @@ module RakeFactory
 
       def process_parameter_hash(parameter_hash)
         parameter_hash.reduce({}) do |acc, (name, value)|
-          resolved_value = lambda do |t|
-            value.respond_to?(:call) ?
-                value.call(*[task_set, t].slice(0, value.arity)) :
-                value
-          end
-          acc.merge({name => resolved_value})
+          acc.merge(name => Values.resolve(value).prepend_argument(task_set))
         end
       end
     end

data/lib/rake_factory/values.rb

@@ -0,0 +1,61 @@
+module RakeFactory
+  module Values
+    def self.resolve(value)
+      case value
+      when RakeFactory::DynamicValue, RakeFactory::StaticValue
+        value
+      else
+        RakeFactory::StaticValue.new(value)
+      end
+    end
+
+    module FactoryMethods
+      def dynamic(&block)
+        DynamicValue.new(&block)
+      end
+
+      def static(value)
+        StaticValue.new(value)
+      end
+    end
+  end
+
+  class DynamicValue
+    def initialize(pre_arguments = [], post_arguments = [], &block)
+      @block = block
+      @pre_arguments = pre_arguments
+      @post_arguments = post_arguments
+    end
+
+    def prepend_argument(argument)
+      self.class.new([argument, *@pre_arguments], @post_arguments, &@block)
+    end
+
+    def append_argument(argument)
+      self.class.new(@pre_arguments, [*@post_arguments, argument], &@block)
+    end
+
+    def evaluate(arguments)
+      resolved_arguments = [*@pre_arguments, *arguments, *@post_arguments]
+      @block.call(*resolved_arguments.slice(0, @block.arity))
+    end
+  end
+
+  class StaticValue
+    def initialize(value)
+      @value = value
+    end
+
+    def prepend_argument(_)
+      self
+    end
+
+    def append_argument(_)
+      self
+    end
+
+    def evaluate(*_)
+      @value
+    end
+  end
+end

data/lib/rake_factory/version.rb

@@ -1,3 +1,3 @@
 module RakeFactory
-  VERSION = '0.21.0'
+  VERSION = '0.22.0.pre.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rake_factory
 version: !ruby/object:Gem::Version
-  version: 0.21.0
+  version: 0.22.0.pre.1
 platform: ruby
 authors:
 - Toby Clemson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-04 00:00:00.000000000 Z
+date: 2020-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -150,6 +150,7 @@ files:
 - lib/rake_factory/defaults.rb
 - lib/rake_factory/definable.rb
 - lib/rake_factory/exceptions.rb
+- lib/rake_factory/kernel_extensions.rb
 - lib/rake_factory/namespaceable.rb
 - lib/rake_factory/parameter.rb
 - lib/rake_factory/parameter_set.rb
@@ -157,6 +158,7 @@ files:
 - lib/rake_factory/parameters.rb
 - lib/rake_factory/task.rb
 - lib/rake_factory/task_set.rb
+- lib/rake_factory/values.rb
 - lib/rake_factory/version.rb
 - rake_factory.gemspec
 - scripts/ci/common/configure-git.sh
@@ -181,9 +183,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.0.1
 signing_key: