callable_tree 0.3.6 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a83d353d4049c06aa0a0d5f18f56c5c6d0d909cd4a54f6bbcba7faf4e835c0f
-  data.tar.gz: ab803f4e8b613a0ceb5e4d3ca21d38e1a5cf2a238db61384c0ec85b437fd7d73
+  metadata.gz: 0ebaae495d65a776fa0eea8c4aa5e23a1dca39245f05531b1d79bb7384c27228
+  data.tar.gz: af843950714bc7302b3fab17fc23a775e5f436f97923aad80783998794d110ab
 SHA512:
-  metadata.gz: 27dd59b36d4ebc99395df901a900d72510928f5f4a9603405b83f54d0566652fda2253bcda7bf6efee1ad0363919c5ec7bb63a1ec1e0efc488e656d6ff1bce3a
-  data.tar.gz: 3029f92901053688715cffce367d0e44f01402743413dfd38dc52c6c63221094fe2d3774cf2b1b98d66b84dd6837c8d6e6430c228ce3f196e60f9222286a3a56
+  metadata.gz: 5311c4a2ad2436815362a8349e278b73c8c568a4bf4721c990d7a5b5c8c74d876267dc5729c67f0e6e9a4c540e99cffa3d9ece8b9046acf057ca2f48e20a97ab
+  data.tar.gz: baa36b79d0ad3ba777fcad27c8b04c7ff1b1da7d665c1f74dbadf49e6d36828ed0fc3d0eaa1cc45c54107e24806a8ec66e4b719095e055260fec8a3ec16669c2

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 ## [Unreleased]
 
+## [0.3.7] - 2022-04-09
+
+- Add `CallableTree::Node#internal?`
+- Add `CallableTree::Node#external?`
+- (Experimental) Change the callables (matcher, caller, terminator) specified in the builder style to receive the current node instance as the `_node_` keyword argument.
+
 ## [0.3.6] - 2022-03-29
 
 - (Experimental) Add `CallableTree::Node::Hooks::Matcher`.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    callable_tree (0.3.6)
+    callable_tree (0.3.7)
 
 GEM
   remote: https://rubygems.org/
@@ -17,7 +17,7 @@ GEM
     rspec-expectations (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
-    rspec-mocks (3.11.0)
+    rspec-mocks (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
     rspec-support (3.11.0)

data/examples/builder/logging.rb

@@ -90,7 +90,7 @@ loggable = proc do |node|
     matched
   end
 
-  if node.is_a?(CallableTree::Node::External)
+  if node.external?
     input_label  = 'Input :'
     output_label = 'Output:'
 

data/lib/callable_tree/node/builder.rb

@@ -51,7 +51,7 @@ module CallableTree
 
             if matcher
               define_method(:match?) do |*inputs, **options|
-                matcher.call(*inputs, **options) do |*inputs, **options|
+                matcher.call(*inputs, **options, _node_: self) do |*inputs, **options|
                   super(*inputs, **options)
                 end
               end
@@ -59,7 +59,7 @@ module CallableTree
 
             if caller
               define_method(:call) do |*inputs, **options|
-                caller.call(*inputs, **options) do |*inputs, **options|
+                caller.call(*inputs, **options, _node_: self) do |*inputs, **options|
                   super(*inputs, **options)
                 end
               end
@@ -67,7 +67,7 @@ module CallableTree
 
             if terminator
               define_method(:terminate?) do |output, *inputs, **options|
-                terminator.call(output, *inputs, **options) do |output, *inputs, **options|
+                terminator.call(output, *inputs, **options, _node_: self) do |output, *inputs, **options|
                   super(output, *inputs, **options)
                 end
               end

data/lib/callable_tree/node/external/verbose.rb

@@ -12,6 +12,7 @@ module CallableTree
 
         def call(*inputs, **options)
           output = super(*inputs, **options)
+          options.delete(:_node_)
           routes = self.routes
 
           Output.new(output, options, routes)

data/lib/callable_tree/node/external.rb

@@ -5,6 +5,13 @@ module CallableTree
     module External
       include Node
 
+      def self.included(mod)
+        if mod.include?(Internal)
+          raise ::CallableTree::Error,
+                "#{mod} cannot include #{self} together with #{Internal}"
+        end
+      end
+
       def self.proxify(callable)
         Proxy.new(callable)
       end
@@ -41,6 +48,14 @@ module CallableTree
         { identity => nil }
       end
 
+      def internal?
+        false
+      end
+
+      def external?
+        true
+      end
+
       private
 
       def initialize_copy(_node)

data/lib/callable_tree/node/internal.rb

@@ -6,6 +6,13 @@ module CallableTree
       extend ::Forwardable
       include Node
 
+      def self.included(mod)
+        if mod.include?(External)
+          raise ::CallableTree::Error,
+                "#{mod} cannot include #{self} together with #{External}"
+        end
+      end
+
       def_delegators :child_nodes, :[], :at
 
       def children
@@ -35,7 +42,7 @@ module CallableTree
         if recursive
           child_nodes
             .lazy
-            .select { |node| node.is_a?(Internal) }
+            .select { |node| node.internal? }
             .map { |node| node.find(recursive: true, &block) }
             .reject(&:nil?)
             .first
@@ -51,7 +58,7 @@ module CallableTree
 
         if recursive
           child_nodes.each do |node|
-            node.reject!(recursive: true, &block) if node.is_a?(Internal)
+            node.reject!(recursive: true, &block) if node.internal?
           end
         end
 
@@ -66,7 +73,7 @@ module CallableTree
         reject!(&block) if block_given?
 
         reject! do |node|
-          node.is_a?(Internal) && node.shake!(&block).child_nodes.empty?
+          node.internal? && node.shake!(&block).child_nodes.empty?
         end
       end
 
@@ -156,6 +163,14 @@ module CallableTree
         { key => value }
       end
 
+      def internal?
+        true
+      end
+
+      def external?
+        false
+      end
+
       protected
 
       attr_writer :strategy

data/lib/callable_tree/node.rb

@@ -46,6 +46,14 @@ module CallableTree
       !output.nil?
     end
 
+    def internal?
+      raise ::CallableTree::Error, 'Not implemented'
+    end
+
+    def external?
+      raise ::CallableTree::Error, 'Not implemented'
+    end
+
     protected
 
     attr_writer :parent

data/lib/callable_tree/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CallableTree
-  VERSION = '0.3.6'
+  VERSION = '0.3.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: callable_tree
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors:
 - jsmmr
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-03-29 00:00:00.000000000 Z
+date: 2022-04-09 00:00:00.000000000 Z
 dependencies: []
 description: Builds a tree by linking callable nodes. The nodes that match the conditions
   are called in a chain from the root node to the leaf node. These are like nested
@@ -71,7 +71,7 @@ licenses:
 metadata:
   homepage_uri: https://github.com/jsmmr/ruby_callable_tree
   source_code_uri: https://github.com/jsmmr/ruby_callable_tree
-  changelog_uri: https://github.com/jsmmr/ruby_callable_tree/blob/v0.3.6/CHANGELOG.md
+  changelog_uri: https://github.com/jsmmr/ruby_callable_tree/blob/v0.3.7/CHANGELOG.md
 post_install_message:
 rdoc_options: []
 require_paths: