rake_factory 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ec32ca688b8984c5ae191170b977709dd1b1770a18fba47c5af8390d1092302
-  data.tar.gz: 5bd164bcacccd44e9db7997855a540c7d289fdb977233e48ac6456d7c467e4ba
+  metadata.gz: d70ea35bceef77a7c68633a8dd7859301bab82a82dfb233a8a4da549391c992c
+  data.tar.gz: ca2df6b0a8d14418145122051fda1ef15fd4ddf27a3c686bfd0b5ae3ee6099e9
 SHA512:
-  metadata.gz: 3af977187b1542e5c039478f7d583989b2a9dd1f974721c314f69c1aeb329fa23e777d06480a781e8acc278e40458ad13f4a1db64fcd92dd40c2a9bf86e787cb
-  data.tar.gz: 3ed7c35c6ea466c6e7bd5ad8460b9edd21f361501b555aab7766eda009759acb6658ccdc86d98e3d685ae9e96ccbbe295bf5539a561da7f507abba78680f9d75
+  metadata.gz: 14e48671b2498a3349c3c83670fa865cf4b9cce24e996bcdb39397fb99138457901183af164622e6c82012285e413d70d97143c689de8fe3b8054a4b09dd57f1
+  data.tar.gz: a515bf269b42255663b5f0775a494a5f1dd74cabd7751599e3e4549f19c1ebf18dab89738ef3f173f47b2df421238f74bbe70c7000b2e011d785207951ddf595

data/Gemfile.lock

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

data/lib/rake_factory/task_set.rb

@@ -12,66 +12,125 @@ module RakeFactory
     include Configurable
     include Arguments
 
-    class TaskDefinition
-      attr_accessor :klass, :args, :overrides, :block
-
-      def initialize(klass, *args, &block)
-        self.klass = klass
-        self.args = args
-        self.block = block
-        self.overrides = {}
+    class << self
+      def tasks
+        @tasks ||= []
       end
 
-      def with_overrides(overrides)
-        self.overrides = overrides
-        self
+      def task(klass, *args, &block)
+        tasks << TaskDefinition.new(klass, args, &block)
       end
+    end
 
-      def define_on(application)
-        self.klass.new(*resolved_args, &self.block)
+    def define_on(application)
+      invoke_configuration_block
+      self.class.tasks.each do |task_definition|
+        task_definition
+            .for_task_set(self)
             .define_on(application)
       end
+      self
+    end
+
+    private
+
+    class TaskArguments
+      attr_reader :arguments, :task_set
+
+      def initialize(arguments, task_set)
+        @arguments = arguments || []
+        @task_set = task_set
+      end
 
-      private
+      def parameter_overrides
+        task_set&.parameter_values || {}
+      end
+
+      def parameter_hash
+        arguments.first.is_a?(Hash) ?
+          arguments.first :
+          {}
+      end
 
-      def resolved_args
-        initial_args = self.args.empty? && self.overrides ?
-            [self.overrides] : self.args
+      def resolve
+        if arguments.empty?
+          resolved_parameter_hash = parameter_overrides
+          resolved_parameter_hash =
+              process_parameter_hash(resolved_parameter_hash)
+          return [resolved_parameter_hash]
+        end
 
-        unless initial_args.first && initial_args.first.is_a?(Hash)
-          return initial_args
+        if arguments.first.is_a?(Hash)
+          resolved_parameter_hash = arguments.first.merge(parameter_overrides)
+          resolved_parameter_hash =
+              process_parameter_hash(resolved_parameter_hash)
+          return [resolved_parameter_hash, *arguments.drop(1)]
         end
 
-        other_args = initial_args.drop(1)
-        merged_parameters = initial_args.first.merge(self.overrides)
-        merged_parameters = merged_parameters.include?(:name_parameter) ?
-            {name: self.overrides[merged_parameters[:name_parameter]]}
-                .merge(merged_parameters) :
-            merged_parameters
+        arguments
+      end
 
-        [merged_parameters, *other_args]
+      private
+
+      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})
+        end
       end
     end
 
-    class << self
-      def tasks
-        @tasks ||= []
+    private_constant :TaskArguments
+
+    class TaskDefinition
+      attr_reader :task_set, :klass, :args, :block
+
+      def initialize(klass, args, task_set = nil, &block)
+        @task_set = task_set
+        @klass = klass
+        @args = args
+        @block = block
       end
 
-      def task(klass, *args, &block)
-        tasks << TaskDefinition.new(klass, *args, &block)
+      def for_task_set(task_set)
+        self.class.new(klass, args, task_set, &block)
       end
-    end
 
-    def define_on(application)
-      invoke_configuration_block
-      parameter_values = self.parameter_values
-      self.class.tasks.each do |task_definition|
-        task_definition
-            .with_overrides(parameter_values)
-            .define_on(application)
+      def define_on(application)
+        if should_define?
+          klass.new(*resolve_arguments, &resolve_block).define_on(application)
+        end
+      end
+
+      private
+
+      def task_arguments
+        TaskArguments.new(args, task_set)
+      end
+
+      def should_define?
+        task_arguments.parameter_hash.include?(:define_if) ?
+            task_arguments.parameter_hash[:define_if].call(task_set) :
+            true
+      end
+
+      def resolve_arguments
+        task_arguments.resolve
+      end
+
+      def resolve_block
+        lambda do |t, args|
+          if block.respond_to?(:call)
+            block.call(*[task_set, t, args].slice(0, block.arity))
+          end
+        end
       end
-      self
     end
+
+    private_constant :TaskDefinition
   end
 end

data/lib/rake_factory/version.rb

@@ -1,3 +1,3 @@
 module RakeFactory
-  VERSION = '0.5.0'
+  VERSION = '0.6.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rake_factory
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Toby Clemson