rake_factory 0.9.0.pre.1 → 0.10.0.pre.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a24c704a0a81bdccbfb2806c2432fb0d17f835eff8bfba157d3b36fda9a5d0ba
-  data.tar.gz: baa966d0bb8d51541dc61ec0290a04c794cdada971e830dcd2b84d5233b73189
+  metadata.gz: 0bf8018e6e08f7c867a567d9c1e46bda22a792ac76b7a837456fa63ad93e0761
+  data.tar.gz: 40dea28362c1ad5960598337a34a6316ff6f5a0a4783e33da330d101e0fcdbda
 SHA512:
-  metadata.gz: 628613471c7c029d52bb28ed0dad480b53cb7c8520630693b5d0f966829d97d1de90716f4566d32566be31e0bbc2727ac3d06ba49b219bf408a2a5d269b33445
-  data.tar.gz: abbdd5166e63406ee068d06dca1bc5c4106488233b2f3debefc7340e2ad1bfe70fe45682c1b48860d6a0c50c0b4c62082c50fa747131479466a976b1c0c5a493
+  metadata.gz: f869475844cd030417393da31547810e2d2ca256d3d4226d6cb31e879295a5d59c4d69ad0c5efdf076b1690d254bb46f291dd5fe119843c7ec7e131b7727b602
+  data.tar.gz: fbe41de1ef13ce3d60859d85c01387d39ff59128fad9434644147050a858f5d04ea0c6a9c229d2d66e2aae260fb0b1dfd3f077a11f58502fa0e4ee476cf542ec

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rake_factory (0.9.0.pre.1)
+    rake_factory (0.10.0.pre.1)
       activesupport (~> 5.2)
       rake (~> 13.0)
 

data/lib/rake_factory/configurable.rb

@@ -16,10 +16,9 @@ module RakeFactory
       set_if_value_present(:configuration_block, configuration_block)
     end
 
-    def invoke_configuration_block(args=nil)
+    def invoke_configuration_block_on(target, args)
       if configuration_block
-        view = ParameterView.new(self, args)
-        params = args ? [view, args] : [view]
+        params = args ? [target, args] : [target]
         configuration_block.call(
             *params.slice(0, configuration_block.arity))
       end

data/lib/rake_factory/parameter_set.rb

@@ -51,4 +51,4 @@ module RakeFactory
       end
     end
   end
-end
+end

data/lib/rake_factory/parameter_view.rb

@@ -2,26 +2,34 @@ module RakeFactory
   class ParameterView
     attr_reader(:task)
 
-    def initialize(task, args)
+    def initialize(target, reader_class, writer_class, args)
       self.instance_eval do
-        task.class.parameter_set.each do |parameter|
+        reader_class.parameter_set.each do |parameter|
           define_singleton_method parameter.reader_method do
-            task.send(parameter.reader_method)
+            target.send(parameter.reader_method)
           end
-
+        end
+        writer_class.parameter_set.each do |parameter|
           if parameter.configurable?
             define_singleton_method parameter.writer_method do |value|
-              resolved_value = lambda do |t|
-                params = args ? [t, args] : [t]
-                value.respond_to?(:call) ?
-                    value.call(*params.slice(0, value.arity)) :
-                    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)
               end
-              task.send(parameter.writer_method, resolved_value)
             end
           end
         end
       end
+      self.class.instance_eval do
+        define_singleton_method :parameter_set do
+          reader_class.parameter_set
+        end
+      end
     end
   end
 end

data/lib/rake_factory/task.rb

@@ -27,7 +27,8 @@ module RakeFactory
           argument_names => prerequisites,
           order_only: order_only_prerequisites
       ) do |_, args|
-        invoke_configuration_block(args)
+        view = ParameterView.new(self, self.class, self.class, args)
+        invoke_configuration_block_on(view, args)
         check_parameter_requirements
         invoke_actions(args)
       end

data/lib/rake_factory/task_set.rb

@@ -18,12 +18,11 @@ module RakeFactory
       end
 
       def task(klass, *args, &block)
-        tasks << TaskDefinition.new(klass, args, &block)
+        tasks << TaskSpecification.new(klass, args, &block)
       end
     end
 
     def define_on(application)
-      invoke_configuration_block
       around_define(application) do
         self.class.tasks.each do |task_definition|
           task_definition
@@ -88,22 +87,30 @@ module RakeFactory
       end
     end
 
-    private_constant :TaskArguments
+    class TaskSpecification
+      attr_reader :klass, :args, :block
+
+      def initialize(klass, args, &block)
+        @klass = klass
+        @args = args
+        @block = block
+      end
+
+      def for_task_set(task_set)
+        TaskDefinition.new(klass, args, task_set, &block)
+      end
+    end
 
     class TaskDefinition
       attr_reader :task_set, :klass, :args, :block
 
-      def initialize(klass, args, task_set = nil, &block)
+      def initialize(klass, args, task_set, &block)
         @task_set = task_set
         @klass = klass
         @args = args
         @block = block
       end
 
-      def for_task_set(task_set)
-        self.class.new(klass, args, task_set, &block)
-      end
-
       def define_on(application)
         if should_define?
           klass.new(*resolve_arguments, &resolve_block).define_on(application)
@@ -131,10 +138,16 @@ module RakeFactory
           if block.respond_to?(:call)
             block.call(*[task_set, t, args].slice(0, block.arity))
           end
+          if task_set.configuration_block.respond_to?(:call)
+            view = ParameterView.new(t, t.class, task_set.class, args)
+            task_set.invoke_configuration_block_on(view, args)
+          end
         end
       end
     end
 
+    private_constant :TaskArguments
+    private_constant :TaskSpecification
     private_constant :TaskDefinition
   end
 end

data/lib/rake_factory/version.rb

@@ -1,3 +1,3 @@
 module RakeFactory
-  VERSION = '0.9.0.pre.1'
+  VERSION = '0.10.0.pre.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rake_factory
 version: !ruby/object:Gem::Version
-  version: 0.9.0.pre.1
+  version: 0.10.0.pre.1
 platform: ruby
 authors:
 - Toby Clemson