core-pipeline 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 951f6c7809d29d8048837b0b24d497af8b1566c7990c9e0b296e556ff7b839ff
-  data.tar.gz: 8151a7bff9a6cc159c604e6a15c9182e454a65f6aad577ea94ccf30e3d0c46d4
+  metadata.gz: 8a6b3ef16c4e8c95532c84fbcfeffa10e3d8b17b710f8a829ea0ea3735039195
+  data.tar.gz: e29f64c2b55dda1e75d022c4cca2f6a2c80fe00e13760ea678335abf74b57da4
 SHA512:
-  metadata.gz: 56dd23992f750ff65a2585df138c93ae44e8d9cf2e5f511cc96ff0d1143d577f6b7035b45968f43f255bb5990ef0960de9106433e784f0481ae94b207d092acf
-  data.tar.gz: 815e79983f3a73e589f1e0be6c170de6bc853ff541fdcdecfc1761cc572d5b1b626976af83b9278a234c755411d9ca02d11c8a238eba0f61b9d698077658fe06
+  metadata.gz: ccb44ec883364a2a633407dc257f44958386b817210278545e9b0291067437e553c6470616e53bab83876d04db2cebe0100ad727971a68aa955ebff7c3a87f9b
+  data.tar.gz: 6c1bb9fb0905caf54a3aef8b33bb224bc23779a66d66353b48345f61fe8a8e27c54653c65cf0d563f8073e387263675e9afe4ba0245bcfc9cf03fd8465a6b22b

data/CHANGELOG.md

@@ -1,7 +1,15 @@
+## [v0.2.0](https://github.com/metabahn/corerb/releases/tag/2021-10-24)
+
+*released on 2021-10-24*
+
+  * `chg` [#77](https://github.com/metabahn/corerb/pull/77) Add recompile support to pipelines ([bryanp](https://github.com/bryanp))
+
 ## [v0.1.0](https://github.com/metabahn/corerb/releases/tag/2021-07-15)
 
 *released on 2021-07-15*
 
+  * `fix` [#81](https://github.com/metabahn/corerb/pull/81) Tie up loose ends around curried pipeline actions ([bryanp](https://github.com/bryanp))
+  * `add` [#80](https://github.com/metabahn/corerb/pull/80) Define curried pipeline actions ([bryanp](https://github.com/bryanp))
   * `fix` [#69](https://github.com/metabahn/corerb/pull/69) Allow pipelines to be called at the class level ([bryanp](https://github.com/bryanp))
   * `add` [#64](https://github.com/metabahn/corerb/pull/64) Add a method for checking if a callable pipeline will call any actions ([bryanp](https://github.com/bryanp))
   * `chg` [#63](https://github.com/metabahn/corerb/pull/63) Improve inspect output for callable pipelines ([bryanp](https://github.com/bryanp))

data/lib/core/pipeline/action.rb

@@ -15,21 +15,21 @@ module Core
       class << self
         # [public] Builds an action for a given target.
         #
-        def build(target = nil, *args, before: nil, after: nil, context: nil, &block)
+        def build(target = nil, *args, before: nil, after: nil, context: nil, curry: false, &block)
           if block
-            Actions::Block.new(target, before: before, after: after, context: context, &block)
+            Actions::Block.new(target, before: before, after: after, context: context, curry: curry, &block)
           else
-            build_target(target, *args, before: before, after: after, context: context)
+            build_target(target, *args, before: before, after: after, context: context, curry: curry)
           end
         end
 
-        private def build_target(first, *args, before:, after:, context:)
+        private def build_target(first, *args, before:, after:, context:, curry:)
           case first
           when String, Symbol
-            if (target = build_target(args[0], *args[1..], before: before, after: after, context: context))
+            if (target = build_target(args[0], *args[1..], before: before, after: after, context: context, curry: curry))
               target
             else
-              Actions::Method.new(first, before: before, after: after, context: context)
+              Actions::Method.new(first, before: before, after: after, context: context, curry: curry)
             end
           when NilClass
             nil
@@ -55,11 +55,12 @@ module Core
 
       include Is::Inspectable
 
-      def initialize(name, before: nil, after: nil, context: nil)
+      def initialize(name, before: nil, after: nil, context: nil, curry: false)
         @name = (name || self.class.build_name).to_sym
         @before = before
         @after = after
         @context = context
+        @curry = curry
       end
 
       # [public] The action name.
@@ -74,6 +75,16 @@ module Core
       #
       attr_reader :after
 
+      # [public] The context this action should be called in.
+      #
+      attr_reader :context
+
+      # [public] Returns `true` if the action should be curried.
+      #
+      def curried?
+        @curry == true
+      end
+
       # [public] Finalizes the action for the given context.
       #
       def finalize(context)

data/lib/core/pipeline/actions/block.rb

@@ -10,10 +10,10 @@ module Core
       class Block < Action
         include Is::Inspectable
 
-        def initialize(name = nil, before: nil, after: nil, context: nil, &block)
+        def initialize(name = nil, before: nil, after: nil, context: nil, curry: false, &block)
           @block = block
 
-          super(name, before: before, after: after, context: context)
+          super(name, before: before, after: after, context: context, curry: curry)
         end
 
         # [public]
@@ -21,13 +21,19 @@ module Core
         def finalize(context)
           case @context
           when NilClass
-            context.define_method(@name, &@block)
+            unless context.method_defined?(@name)
+              context.define_method(@name, &@block)
+            end
+
             @name
           else
             if @block.binding.receiver.equal?(@context)
               @block
             else
-              @context.define_singleton_method(@name, &@block)
+              unless context.singleton_class.method_defined?(@name)
+                @context.define_singleton_method(@name, &@block)
+              end
+
               @context.method(@name).to_proc
             end
           end

data/lib/core/pipeline/actions/method.rb

@@ -10,10 +10,10 @@ module Core
       class Method < Action
         include Is::Inspectable
 
-        def initialize(name = nil, before: nil, after: nil, context: nil)
+        def initialize(name = nil, before: nil, after: nil, context: nil, curry: false)
           @method = nil
 
-          super(name, before: before, after: after, context: context)
+          super(name, before: before, after: after, context: context, curry: curry)
         end
 
         # [public]

data/lib/core/pipeline/callable.rb

@@ -18,11 +18,24 @@ module Core
         @mutex = Mutex.new
         @actions = []
         @skipped = []
+        @compiled = false
+      end
+
+      def initialize_copy(...)
+        @actions = @actions.clone
+        @skipped = @skipped.clone
+        super
       end
 
       attr_reader :actions
       attr_reader :skipped
 
+      # [public] Relocates to another object context.
+      #
+      def relocate(object)
+        @object = object
+      end
+
       # [public] Returns true if the pipeline will call any actions.
       #
       def any?
@@ -31,14 +44,16 @@ module Core
 
       # [public] Defines a pipeline action.
       #
-      def action(*args, before: nil, after: nil, context: nil, &block)
-        @actions << Action.build(*args, before: before, after: after, context: context, &block)
+      def action(*args, before: nil, after: nil, context: nil, curry: false, &block)
+        @actions << Action.build(*args, before: before, after: after, context: context, curry: curry, &block)
+        recompile if compiled?
       end
 
       # [public] Skips the given action.
       #
       def skip(name)
         @skipped << name.to_sym
+        recompile if compiled?
       end
 
       # [public] Replaces existing actions with actions from the given pipeline.
@@ -48,6 +63,7 @@ module Core
           @mutex.synchronize do
             @actions.clear
             @actions.concat(pipeline.pipeline.actions)
+            recompile if compiled?
           end
         else
           raise ArgumentError, "expected a pipeline"
@@ -59,6 +75,7 @@ module Core
       def include(pipeline)
         if (pipeline.is_a?(Class) || pipeline.is_a?(Module)) && pipeline.ancestors.include?(Is::Pipeline)
           @actions.concat(pipeline.pipeline.actions)
+          recompile if compiled?
         else
           raise ArgumentError, "expected a pipeline"
         end
@@ -70,6 +87,7 @@ module Core
         if (pipeline.is_a?(Class) || pipeline.is_a?(Module)) && pipeline.ancestors.include?(Is::Pipeline)
           pipeline.pipeline.actions.each do |action|
             @actions.delete(action)
+            recompile if compiled?
           end
         else
           raise ArgumentError, "expected a pipeline"
@@ -84,9 +102,18 @@ module Core
 
       private def compile
         instance_eval(Compiler.compile(self, @object), __FILE__, __LINE__ - 1)
-
+        @compiled = true
         self
       end
+
+      private def recompile
+        singleton_class.remove_method(:call)
+        compile
+      end
+
+      private def compiled?
+        @compiled == true
+      end
     end
   end
 end

data/lib/core/pipeline/compiler.rb

@@ -28,7 +28,11 @@ module Core
 
             compiled << case action
             when Symbol
-              "object.#{action}(...); "
+              if object.private_method_defined?(action)
+                "object.send(#{action.inspect}, ...); "
+              else
+                "object.#{action}(...); "
+              end
             else
               "@__finalized_actions[#{object_id}].call(...); "
             end
@@ -57,7 +61,13 @@ module Core
           ordered_actions(callable).reject { |action|
             callable.skipped.include?(action.name)
           }.map { |action|
-            action.finalize(object)
+            finalized = action.finalize(object)
+
+            if action.curried?
+              wrap_finalized_action_for_context(finalized, action.context || object)
+            else
+              finalized
+            end
           }.each_with_object({}) { |action, lookup|
             lookup[action.object_id] = action
           }
@@ -113,6 +123,205 @@ module Core
 
           ordered
         end
+
+        private def wrap_finalized_action_for_context(finalized, context)
+          case finalized
+          when Symbol
+            wrapped_name = :"curried_#{finalized}"
+            method = context.instance_method(finalized)
+            signature = [
+              build_method_arguments_signature(method),
+              build_method_keywords_signature(method),
+              "&block"
+            ].compact.join(", ")
+
+            code = <<~CODE
+              def #{wrapped_name}(*args, **kwargs, &block)
+                #{finalized}(#{signature})
+              end
+            CODE
+
+            context.class_eval(code, __FILE__, __LINE__ - 1)
+
+            wrapped_name
+          else
+            if callable_accepts_keyword_arguments?(finalized)
+              finalized_keywords = callable_keywords(finalized)
+
+              if callable_accepts_arguments?(finalized)
+                argument_count = callable_arguments(finalized).count
+
+                if callable_accepts_keyword_arguments_splat?(finalized)
+                  if callable_accepts_arguments_splat?(finalized)
+                    if RbConfig::CONFIG["RUBY_PROGRAM_VERSION"] < "3"
+                      proc { |*args, **kwargs, &block|
+                        finalized.call(*args.take(argument_count), *args[argument_count..], **kwargs.slice(*finalized_keywords), **kwargs.reject { |kwarg, _| finalized_keywords.include?(kwarg) }, &block)
+                      }
+                    else
+                      proc { |*args, **kwargs, &block|
+                        finalized.call(*args.take(argument_count), *args[argument_count..], **kwargs.slice(*finalized_keywords), **kwargs.except(*finalized_keywords), &block)
+                      }
+                    end
+                  elsif RbConfig::CONFIG["RUBY_PROGRAM_VERSION"] < "3"
+                    proc { |*args, **kwargs, &block|
+                      finalized.call(*args.take(argument_count), **kwargs.slice(*finalized_keywords), **kwargs.reject { |kwarg, _| finalized_keywords.include?(kwarg) }, &block)
+                    }
+                  else
+                    proc { |*args, **kwargs, &block|
+                      finalized.call(*args.take(argument_count), **kwargs.slice(*finalized_keywords), **kwargs.except(*finalized_keywords), &block)
+                    }
+                  end
+                elsif callable_accepts_arguments_splat?(finalized)
+                  proc { |*args, **kwargs, &block|
+                    finalized.call(*args.take(argument_count), *args[argument_count..], **kwargs.slice(*finalized_keywords), &block)
+                  }
+                else
+                  proc { |*args, **kwargs, &block|
+                    finalized.call(*args.take(argument_count), **kwargs.slice(*finalized_keywords), &block)
+                  }
+                end
+              elsif callable_accepts_keyword_arguments_splat?(finalized)
+                if callable_accepts_arguments_splat?(finalized)
+                  if RbConfig::CONFIG["RUBY_PROGRAM_VERSION"] < "3"
+                    proc { |*args, **kwargs, &block|
+                      finalized.call(*args, **kwargs.slice(*finalized_keywords), **kwargs.reject { |kwarg, _| finalized_keywords.include?(kwarg) }, &block)
+                    }
+                  else
+                    proc { |*args, **kwargs, &block|
+                      finalized.call(*args, **kwargs.slice(*finalized_keywords), **kwargs.except(*finalized_keywords), &block)
+                    }
+                  end
+                elsif RbConfig::CONFIG["RUBY_PROGRAM_VERSION"] < "3"
+                  proc { |*, **kwargs, &block|
+                    finalized.call(**kwargs.slice(*finalized_keywords), **kwargs.reject { |kwarg, _| finalized_keywords.include?(kwarg) }, &block)
+                  }
+                else
+                  proc { |*, **kwargs, &block|
+                    finalized.call(**kwargs.slice(*finalized_keywords), **kwargs.except(*finalized_keywords), &block)
+                  }
+                end
+              elsif callable_accepts_arguments_splat?(finalized)
+                proc { |*args, **kwargs, &block|
+                  finalized.call(*args, **kwargs.slice(*finalized_keywords), &block)
+                }
+              else
+                proc { |*, **kwargs, &block|
+                  finalized.call(**kwargs.slice(*finalized_keywords), &block)
+                }
+              end
+            elsif callable_accepts_arguments?(finalized)
+              argument_count = callable_arguments(finalized).count
+
+              if callable_accepts_keyword_arguments_splat?(finalized)
+                if callable_accepts_arguments_splat?(finalized)
+                  proc { |*args, **kwargs, &block|
+                    finalized.call(*args.take(argument_count), *args[argument_count..], **kwargs, &block)
+                  }
+                else
+                  proc { |*args, **kwargs, &block|
+                    finalized.call(*args.take(argument_count), **kwargs, &block)
+                  }
+                end
+              elsif callable_accepts_arguments_splat?(finalized)
+                proc { |*args, **, &block|
+                  finalized.call(*args.take(argument_count), *args[argument_count..], &block)
+                }
+              else
+                proc { |*args, **, &block|
+                  finalized.call(*args.take(argument_count), &block)
+                }
+              end
+            elsif callable_accepts_keyword_arguments_splat?(finalized)
+              if callable_accepts_arguments_splat?(finalized)
+                proc { |*args, **kwargs, &block|
+                  finalized.call(*args, **kwargs, &block)
+                }
+              else
+                proc { |*, **kwargs, &block|
+                  finalized.call(**kwargs, &block)
+                }
+              end
+            elsif callable_accepts_arguments_splat?(finalized)
+              proc { |*args, **, &block|
+                finalized.call(*args, &block)
+              }
+            else
+              proc { |*, **, &block|
+                finalized.call(&block)
+              }
+            end
+          end
+        end
+
+        private def build_method_arguments_signature(method)
+          return if method.arity == 0
+
+          arguments = callable_arguments(method)
+
+          if arguments.any?
+            if callable_accepts_arguments_splat?(method)
+              "*args.take(#{arguments.count}), *args[#{arguments.count}..]"
+            else
+              "*args.take(#{arguments.count})"
+            end
+          elsif callable_accepts_arguments_splat?(method)
+            "*args"
+          end
+        end
+
+        private def build_method_keywords_signature(method)
+          return if method.arity == 0
+
+          keywords = callable_keywords(method)
+
+          if keywords.any?
+            keywords_string = keywords.map { |keyword| ":#{keyword}" }.join(", ")
+
+            if callable_accepts_keyword_arguments_splat?(method)
+              if RbConfig::CONFIG["RUBY_PROGRAM_VERSION"] < "3"
+                "**kwargs.slice(#{keywords_string}), **kwargs.reject { |kwarg, _| [#{keywords_string}].include?(kwarg) }"
+              else
+                "**kwargs.slice(#{keywords_string}), **kwargs.except(*#{keywords_string})"
+              end
+            else
+              "**kwargs.slice(#{keywords_string})"
+            end
+          elsif callable_accepts_keyword_arguments_splat?(method)
+            "**kwargs"
+          end
+        end
+
+        private def callable_accepts_arguments_splat?(callable)
+          callable.parameters.any? { |type, _| type == :rest }
+        end
+
+        private def callable_accepts_keyword_arguments_splat?(callable)
+          callable.parameters.any? { |type, _| type == :keyrest }
+        end
+
+        private def callable_accepts_arguments?(callable)
+          callable.parameters.any? { |type, _| type == :req || type == :opt }
+        end
+
+        private def callable_accepts_keyword_arguments?(callable)
+          callable.parameters.any? { |type, _| type == :keyreq || type == :key }
+        end
+
+        private def callable_arguments(callable)
+          callable.parameters.select { |type, _|
+            type == :req || type == :opt
+          }.map { |_, name|
+            name
+          }
+        end
+
+        private def callable_keywords(callable)
+          callable.parameters.select { |type, _|
+            type == :keyreq || type == :key
+          }.map { |_, name|
+            name
+          }
+        end
       end
     end
   end

data/lib/core/pipeline/version.rb

@@ -2,7 +2,7 @@
 
 module Core
   module Pipeline
-    VERSION = "0.1.1"
+    VERSION = "0.2.0"
 
     def self.version
       VERSION

data/lib/is/pipeline.rb

@@ -27,8 +27,8 @@ module Is
     extends :definition do
       # [public] Defines a pipeline action.
       #
-      def action(*args, before: nil, after: nil, context: nil, &block)
-        pipeline.action(*args, before: before, after: after, context: context, &block)
+      def action(*args, before: nil, after: nil, context: nil, curry: false, &block)
+        pipeline.action(*args, before: before, after: after, context: context, curry: curry, &block)
       end
 
       # [public] Skips the given action.
@@ -62,6 +62,41 @@ module Is
       def call(...)
         @pipeline.call(self, ...)
       end
+
+      # [public] Defines a pipeline action, isolated to the instance.
+      #
+      def action(*args, before: nil, after: nil, context: nil, curry: false, &block)
+        pipeline.relocate(singleton_class)
+        pipeline.action(*args, before: before, after: after, context: context, curry: curry, &block)
+      end
+
+      # [public] Skips the given action, isolated to the instance.
+      #
+      def skip_action(name)
+        pipeline.relocate(singleton_class)
+        pipeline.skip(name)
+      end
+
+      # [public] Replaces existing actions with actions from the given pipeline, isolated to the instance.
+      #
+      def use_pipeline(other_pipeline)
+        pipeline.relocate(singleton_class)
+        pipeline.use(other_pipeline)
+      end
+
+      # [public] Includes actions from the given pipeline, isolated to the instance.
+      #
+      def include_pipeline(other_pipeline)
+        pipeline.relocate(singleton_class)
+        pipeline.include(other_pipeline)
+      end
+
+      # [public] Excludes actions from the given pipeline, isolated to the instance.
+      #
+      def exclude_pipeline(other_pipeline)
+        pipeline.relocate(singleton_class)
+        pipeline.exclude(other_pipeline)
+      end
     end
 
     extends :implementation, prepend: true do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: core-pipeline
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Bryan Powell
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-16 00:00:00.000000000 Z
+date: 2021-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: core-extension
@@ -89,7 +89,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: Turns Ruby objects into pipelines.