callable_tree 0.3.9 → 0.3.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f81f9d9f97c638d350599e56656dd0430765f8ab79e572b3906963ffc94d32b
-  data.tar.gz: 7fb4ad3eb420568d51cb3c3969969fa5c14bf82d99b6f2fb2035ce081e641d64
+  metadata.gz: dccb97d338f0f2d01a1986b2b0418660467fde837a79bd06b67f0df235bee5f2
+  data.tar.gz: 5002a705a96346ea92704eea7c8282beead6d4ef62c7ff2a9865f4b24e629faa
 SHA512:
-  metadata.gz: cdf78b08f6d7b6ea112b510ac564724b7c15842bc44ccf4e603bc17083f0a0999705656e37277729006f8f955340f21e0191af720b474492d97e74b6cd6c2a51
-  data.tar.gz: c0fd6fed3b3ec188b51375558a202543d72ee70aaffe25489dd1cf99c6f8882377e61868e32dc07eed43947cb85248c419c35ebbc89f2ca326f829a0bdb533cd
+  metadata.gz: 1d16dd16df13a3c5f5b6a4c5292d50acbf571482dbde0496e29d69d745ad887b4274e84edd5ace4707fe2bdf54d324389a2d1b662ffb94d1e430e5819762f40d
+  data.tar.gz: f531ae0eaaf51065f69e61a8eb4e70b83ba32bc280d699c2fce00b4b4a9c1ac3d8fb5fe61bcb3a7c40805edae1a26c4943bd9d09a4d4760a4e0f67a3dd4f62e9

data/.github/workflows/build.yml

@@ -5,13 +5,13 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: ['2.4', '2.5', '2.6', '2.7', '3.0', '3.1', '3.2.0-preview1']
+        ruby: ['2.4', '2.5', '2.6', '2.7', '3.0', '3.1', '3.2']
     steps:
       - uses: actions/checkout@v3
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
-      - run: gem install bundler:2.3.7
+      - run: gem install bundler:2.3.26
       - uses: actions/cache@v3
         with:
           path: vendor/bundle

data/.ruby-version

@@ -1 +1 @@
-3.1.2
+3.2.0

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 ## [Unreleased]
 
+## [0.3.10] - 2022-12-30
+
+- Change `CallableTree::Node::Internal#broadcastable` to take `matchable` keyword parameter as boolean. It defaults to `true`, which is the same behavior as before.
+- Change `CallableTree::Node::Internal#composable` to take `matchable` keyword parameter as boolean. It defaults to `true`, which is the same behavior as before.
+- Change `CallableTree::Node::Internal#seekable` to take `matchable` keyword parameter as boolean. It defaults to `true`, which is the same behavior as before.
+
 ## [0.3.9] - 2022-11-06
 
 - Change `CallableTree::Node::Internal#broadcastable` to take `terminable` keyword parameter as boolean. It defaults to `false`, which is the same behavior as before.

data/Gemfile.lock

@@ -1,29 +1,29 @@
 PATH
   remote: .
   specs:
-    callable_tree (0.3.9)
+    callable_tree (0.3.10)
 
 GEM
   remote: https://rubygems.org/
   specs:
     diff-lcs (1.5.0)
     rake (13.0.6)
-    rspec (3.11.0)
-      rspec-core (~> 3.11.0)
-      rspec-expectations (~> 3.11.0)
-      rspec-mocks (~> 3.11.0)
-    rspec-core (3.11.0)
-      rspec-support (~> 3.11.0)
-    rspec-expectations (3.11.1)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.0)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-mocks (3.11.1)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-support (3.11.1)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.0)
 
 PLATFORMS
-  x86_64-darwin-21
+  x86_64-darwin-22
 
 DEPENDENCIES
   callable_tree!
@@ -31,4 +31,4 @@ DEPENDENCIES
   rspec (~> 3.0)
 
 BUNDLED WITH
-   2.3.7
+   2.3.26

data/README.md

@@ -659,19 +659,19 @@ module Logging
       matched
     end
 
-    if node.external?
-      node
-        .before_caller! do |input, *, _node_:, **|
-          input_prefix = INPUT_LABEL.rjust((_node_.depth * INDENT_SIZE) + INPUT_LABEL.length, BLANK)
-          puts "#{input_prefix} #{input}"
-          input
-        end
-        .after_caller! do |output, _node_:, **|
-          output_prefix = OUTPUT_LABEL.rjust((_node_.depth * INDENT_SIZE) + OUTPUT_LABEL.length, BLANK)
-          puts "#{output_prefix} #{output}"
-          output
-        end
-    end
+    return unless node.external?
+
+    node
+      .before_caller! do |input, *, _node_:, **|
+        input_prefix = INPUT_LABEL.rjust((_node_.depth * INDENT_SIZE) + INPUT_LABEL.length, BLANK)
+        puts "#{input_prefix} #{input}"
+        input
+      end
+      .after_caller! do |output, _node_:, **|
+        output_prefix = OUTPUT_LABEL.rjust((_node_.depth * INDENT_SIZE) + OUTPUT_LABEL.length, BLANK)
+        puts "#{output_prefix} #{output}"
+        output
+      end
   end
 end
 
@@ -778,7 +778,7 @@ end
 ...
 ```
 
-Run `examples/class/identity.rb`:
+Run `examples/builder/identity.rb`:
 ```sh
  % ruby examples/builder/identity.rb
 #<struct CallableTree::Node::External::Output

data/examples/builder/external-verbosify.rb

@@ -12,7 +12,7 @@ JSONParser =
   end
   .caller do |input, **options, &block|
     File.open(input) do |file|
-      json = ::JSON.load(file)
+      json = JSON.load(file)
       # The following block call is equivalent to calling `super` in the class style.
       block.call(json, **options)
     end

data/examples/builder/identity.rb

@@ -12,7 +12,7 @@ JSONParser =
   end
   .caller do |input, **options, &block|
     File.open(input) do |file|
-      json = ::JSON.load(file)
+      json = JSON.load(file)
       # The following block call is equivalent to calling `super` in the class style.
       block.call(json, **options)
     end

data/examples/builder/internal-seekable.rb

@@ -12,7 +12,7 @@ JSONParser =
   end
   .caller do |input, **options, &original|
     File.open(input) do |file|
-      json = ::JSON.load(file)
+      json = JSON.load(file)
       # The following block call is equivalent to calling `super` in the class style.
       original.call(json, **options)
     end

data/examples/builder/logging.rb

@@ -12,7 +12,7 @@ JSONParser =
   end
   .caller do |input, **options, &original|
     File.open(input) do |file|
-      json = ::JSON.load(file)
+      json = JSON.load(file)
       # The following block call is equivalent to calling `super` in the class style.
       original.call(json, **options)
     end
@@ -87,19 +87,19 @@ module Logging
       matched
     end
 
-    if node.external?
-      node
-        .before_caller! do |input, *, _node_:, **|
-          input_prefix = INPUT_LABEL.rjust((_node_.depth * INDENT_SIZE) + INPUT_LABEL.length, BLANK)
-          puts "#{input_prefix} #{input}"
-          input
-        end
-        .after_caller! do |output, _node_:, **|
-          output_prefix = OUTPUT_LABEL.rjust((_node_.depth * INDENT_SIZE) + OUTPUT_LABEL.length, BLANK)
-          puts "#{output_prefix} #{output}"
-          output
-        end
-    end
+    return unless node.external?
+
+    node
+      .before_caller! do |input, *, _node_:, **|
+        input_prefix = INPUT_LABEL.rjust((_node_.depth * INDENT_SIZE) + INPUT_LABEL.length, BLANK)
+        puts "#{input_prefix} #{input}"
+        input
+      end
+      .after_caller! do |output, _node_:, **|
+        output_prefix = OUTPUT_LABEL.rjust((_node_.depth * INDENT_SIZE) + OUTPUT_LABEL.length, BLANK)
+        puts "#{output_prefix} #{output}"
+        output
+      end
   end
 end
 

data/examples/class/logging.rb

@@ -124,19 +124,19 @@ module Logging
       matched
     end
 
-    if node.external?
-      node
-        .before_caller! do |input, *, _node_:, **|
-          input_prefix = INPUT_LABEL.rjust((_node_.depth * INDENT_SIZE) + INPUT_LABEL.length, BLANK)
-          puts "#{input_prefix} #{input}"
-          input
-        end
-        .after_caller! do |output, _node_:, **|
-          output_prefix = OUTPUT_LABEL.rjust((_node_.depth * INDENT_SIZE) + OUTPUT_LABEL.length, BLANK)
-          puts "#{output_prefix} #{output}"
-          output
-        end
-    end
+    return unless node.external?
+
+    node
+      .before_caller! do |input, *, _node_:, **|
+        input_prefix = INPUT_LABEL.rjust((_node_.depth * INDENT_SIZE) + INPUT_LABEL.length, BLANK)
+        puts "#{input_prefix} #{input}"
+        input
+      end
+      .after_caller! do |output, _node_:, **|
+        output_prefix = OUTPUT_LABEL.rjust((_node_.depth * INDENT_SIZE) + OUTPUT_LABEL.length, BLANK)
+        puts "#{output_prefix} #{output}"
+        output
+      end
   end
 end
 

data/lib/callable_tree/node/external.rb

@@ -6,10 +6,10 @@ module CallableTree
       include Node
 
       def self.included(mod)
-        if mod.include?(Internal)
-          raise ::CallableTree::Error,
-                "#{mod} cannot include #{self} together with #{Internal}"
-        end
+        return unless mod.include?(Internal)
+
+        raise ::CallableTree::Error,
+              "#{mod} cannot include #{self} together with #{Internal}"
       end
 
       def self.proxify(callable)

data/lib/callable_tree/node/internal/strategy/broadcast.rb

@@ -7,26 +7,19 @@ module CallableTree
         class Broadcast
           include Strategy
 
-          def initialize(terminable: false)
+          def initialize(matchable: true, terminable: false)
+            self.matchable = matchable
             self.terminable = terminable
-            @terminator =
-              if terminable
-                proc { |node, output, *inputs, **options| node.terminate?(output, *inputs, **options) }
-              else
-                proc { false }
-              end
           end
 
           def call(nodes, *inputs, **options)
-            nodes.reduce([]) do |outputs, node|
-              output = (node.call(*inputs, **options) if node.match?(*inputs, **options))
+            nodes.each_with_object([]) do |node, outputs|
+              output = (node.call(*inputs, **options) if matcher.call(node, *inputs, **options))
               outputs << output
 
-              if @terminator.call(node, output, *inputs, **options)
-                break outputs
-              else
-                outputs
-              end
+              break outputs if terminator.call(node, output, *inputs, **options)
+
+              outputs
             end
           end
         end

data/lib/callable_tree/node/internal/strategy/compose.rb

@@ -7,22 +7,17 @@ module CallableTree
         class Compose
           include Strategy
 
-          def initialize(terminable: false)
+          def initialize(matchable: true, terminable: false)
+            self.matchable = matchable
             self.terminable = terminable
-            @terminator =
-              if terminable
-                proc { |node, output, *inputs, **options| node.terminate?(output, *inputs, **options) }
-              else
-                proc { false }
-              end
           end
 
           def call(nodes, *inputs, **options)
             head, *tail = inputs
             nodes.reduce(head) do |input, node|
-              if node.match?(input, *tail, **options)
+              if matcher.call(node, input, *tail, **options)
                 output = node.call(input, *tail, **options)
-                break output if @terminator.call(node, output, input, *tail, **options)
+                break output if terminator.call(node, output, input, *tail, **options)
 
                 output
               else

data/lib/callable_tree/node/internal/strategy/seek.rb

@@ -7,23 +7,18 @@ module CallableTree
         class Seek
           include Strategy
 
-          def initialize(terminable: true)
+          def initialize(matchable: true, terminable: true)
+            self.matchable = matchable
             self.terminable = terminable
-            @terminator =
-              if terminable
-                proc { |node, output, *inputs, **options| node.terminate?(output, *inputs, **options) }
-              else
-                proc { false }
-              end
           end
 
           def call(nodes, *inputs, **options)
             nodes
               .lazy
-              .select { |node| node.match?(*inputs, **options) }
+              .select { |node| matcher.call(node, *inputs, **options) }
               .map do |node|
                 output = node.call(*inputs, **options)
-                terminated = @terminator.call(node, output, *inputs, **options)
+                terminated = terminator.call(node, output, *inputs, **options)
                 [output, terminated]
               end
               .select { |_output, terminated| terminated }

data/lib/callable_tree/node/internal/strategy.rb

@@ -13,7 +13,7 @@ module CallableTree
         end
 
         def ==(other)
-          name == other.name && terminable? == other.terminable?
+          name == other.name && matchable? == other.matchable? && terminable? == other.terminable?
         end
 
         def eql?(other)
@@ -21,7 +21,11 @@ module CallableTree
         end
 
         def hash
-          [self.class.name, terminable].join('-').hash
+          [self.class.name, matchable, terminable].join('-').hash
+        end
+
+        def matchable?
+          matchable
         end
 
         def terminable?
@@ -30,7 +34,25 @@ module CallableTree
 
         private
 
-        attr_accessor :terminable
+        attr_accessor :matchable, :terminable
+
+        def matcher
+          @matcher ||=
+            if matchable
+              proc { |node, *inputs, **options| node.match?(*inputs, **options) }
+            else
+              proc { false }
+            end
+        end
+
+        def terminator
+          @terminator ||=
+            if terminable
+              proc { |node, output, *inputs, **options| node.terminate?(output, *inputs, **options) }
+            else
+              proc { false }
+            end
+        end
       end
     end
   end

data/lib/callable_tree/node/internal/strategyable.rb

@@ -0,0 +1,117 @@
+# frozen_string_literal: true
+
+module CallableTree
+  module Node
+    module Internal
+      module Strategyable
+        def self.included(mod)
+          mod.extend ClassMethods
+        end
+
+        DEFAUTL_FACTORY = proc do |klass, *_args, matchable:, terminable:, **_kwargs|
+          klass.new(matchable: matchable, terminable: terminable)
+        end
+
+        @@strategy_configs = {
+          seek: {
+            klass: Strategy::Seek,
+            alias: :seekable,
+            matchable: true,
+            terminable: true,
+            factory: DEFAUTL_FACTORY
+          },
+          broadcast: {
+            klass: Strategy::Broadcast,
+            alias: :broadcastable,
+            matchable: true,
+            terminable: false,
+            factory: DEFAUTL_FACTORY
+          },
+          compose: {
+            klass: Strategy::Compose,
+            alias: :composable,
+            matchable: true,
+            terminable: false,
+            factory: DEFAUTL_FACTORY
+          }
+        }
+
+        class << self
+          private
+
+          def strategy_configs
+            @@strategy_configs
+          end
+
+          def define_strategy_methods(key, config)
+            define_method(:"#{config[:alias]}?") { strategy.is_a?(config[:klass]) }
+
+            define_method(config[:alias]) do |*args, matchable: config[:matchable], terminable: config[:terminable], **kwargs|
+              # TODO: Modify to use strategize method
+              if strategy == config[:factory].call(
+                config[:klass], *args, matchable: matchable, terminable: terminable, **kwargs
+              )
+                self
+              else
+                clone.__send__(:"#{config[:alias]}!", *args, matchable: matchable, terminable: terminable, **kwargs)
+              end
+            end
+
+            define_method(:"#{config[:alias]}!") do |*args, matchable: config[:matchable], terminable: config[:terminable], **kwargs|
+              strategize!(key, *args, matchable: matchable, terminable: terminable, **kwargs)
+            end
+          end
+        end
+
+        module ClassMethods
+          def store_strategy(key, config)
+            raise ::CallableTree::Error, 'Strategy class is required. [:klass]' unless config[:klass]
+
+            key = key.to_sym
+            config[:alias] = key unless config[:alias]
+            config[:factory] = DEFAUTL_FACTORY unless config[:factory]
+            Strategyable.__send__(:strategy_configs)[key] = config
+            Strategyable.__send__(:define_strategy_methods, key, config)
+          end
+        end
+
+        @@strategy_configs.each { |key, config| define_strategy_methods(key, config) }
+
+        # Backward compatibility
+        alias seek? seekable?
+        alias seek seekable
+        alias seek! seekable!
+        alias broadcast? broadcastable?
+        alias broadcast broadcastable
+        alias broadcast! broadcastable!
+        alias compose? composable?
+        alias compose composable
+        alias compose! composable!
+
+        protected
+
+        attr_writer :strategy
+
+        private
+
+        def strategize(name, *args, matchable:, terminable:, **kwargs)
+          clone.strategy!(name, *args, matchable: matchable, terminable: terminable, **kwargs)
+        end
+
+        def strategize!(name, *args, matchable:, terminable:, **kwargs)
+          config = @@strategy_configs[name.to_sym]
+          raise ::CallableTree::Error, "Strategy is not found. [#{name}]" unless config
+
+          self.strategy = config[:factory].call(
+            config[:klass], *args, matchable: matchable, terminable: terminable, **kwargs
+          )
+          self
+        end
+
+        def strategy
+          @strategy ||= @@strategy_configs[:seek][:klass].new
+        end
+      end
+    end
+  end
+end

data/lib/callable_tree/node/internal.rb

@@ -5,12 +5,13 @@ module CallableTree
     module Internal
       extend ::Forwardable
       include Node
+      include Strategyable
 
       def self.included(mod)
-        if mod.include?(External)
-          raise ::CallableTree::Error,
-                "#{mod} cannot include #{self} together with #{External}"
-        end
+        return unless mod.include?(External)
+
+        raise ::CallableTree::Error,
+              "#{mod} cannot include #{self} together with #{External}"
       end
 
       def_delegators :child_nodes, :[], :at
@@ -39,14 +40,14 @@ module CallableTree
         node = child_nodes.find(&block)
         return node if node
 
-        if recursive
-          child_nodes
-            .lazy
-            .select(&:internal?)
-            .map { |node| node.find(recursive: true, &block) }
-            .reject(&:nil?)
-            .first
-        end
+        return unless recursive
+
+        child_nodes
+          .lazy
+          .select(&:internal?)
+          .map { |node| node.find(recursive: true, &block) }
+          .reject(&:nil?)
+          .first
       end
 
       def reject(recursive: false, &block)
@@ -85,72 +86,6 @@ module CallableTree
         strategy.call(child_nodes, *inputs, **options)
       end
 
-      def seek?
-        strategy.is_a?(Strategy::Seek)
-      end
-
-      def seek(terminable: true)
-        if strategy == Strategy::Seek.new(terminable: terminable)
-          self
-        else
-          clone.seek!(terminable: terminable)
-        end
-      end
-
-      def seek!(terminable: true)
-        self.strategy = Strategy::Seek.new(terminable: terminable)
-
-        self
-      end
-
-      alias seekable? seek?
-      alias seekable seek
-      alias seekable! seek!
-
-      def broadcast?
-        strategy.is_a?(Strategy::Broadcast)
-      end
-
-      def broadcast(terminable: false)
-        if strategy == Strategy::Broadcast.new(terminable: terminable)
-          self
-        else
-          clone.broadcast!(terminable: terminable)
-        end
-      end
-
-      def broadcast!(terminable: false)
-        self.strategy = Strategy::Broadcast.new(terminable: terminable)
-
-        self
-      end
-
-      alias broadcastable? broadcast?
-      alias broadcastable broadcast
-      alias broadcastable! broadcast!
-
-      def compose?
-        strategy.is_a?(Strategy::Compose)
-      end
-
-      def compose(terminable: false)
-        if strategy == Strategy::Compose.new(terminable: terminable)
-          self
-        else
-          clone.compose!(terminable: terminable)
-        end
-      end
-
-      def compose!(terminable: false)
-        self.strategy = Strategy::Compose.new(terminable: terminable)
-
-        self
-      end
-
-      alias composable? compose?
-      alias composable compose
-      alias composable! compose!
-
       def outline(&block)
         key = block ? block.call(self) : identity
         value = child_nodes.reduce({}) { |memo, node| memo.merge!(node.outline(&block)) }
@@ -165,10 +100,6 @@ module CallableTree
         false
       end
 
-      protected
-
-      attr_writer :strategy
-
       def child_nodes
         @child_nodes ||= []
       end
@@ -186,10 +117,6 @@ module CallableTree
           .tap { |node| node.parent = self }
       end
 
-      def strategy
-        @strategy ||= Strategy::Seek.new
-      end
-
       def initialize_copy(_node)
         super
         self.parent = nil

data/lib/callable_tree/node.rb

@@ -13,7 +13,7 @@ module CallableTree
         node = self
         loop do
           y << node
-          break unless node = node.parent
+          break unless (node = node.parent)
         end
       end
     end

data/lib/callable_tree/version.rb

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

data/lib/callable_tree.rb

@@ -14,6 +14,7 @@ require_relative 'callable_tree/node/internal/strategy'
 require_relative 'callable_tree/node/internal/strategy/broadcast'
 require_relative 'callable_tree/node/internal/strategy/seek'
 require_relative 'callable_tree/node/internal/strategy/compose'
+require_relative 'callable_tree/node/internal/strategyable'
 require_relative 'callable_tree/node/external/verbose'
 require_relative 'callable_tree/node/external'
 require_relative 'callable_tree/node/internal'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: callable_tree
 version: !ruby/object:Gem::Version
-  version: 0.3.9
+  version: 0.3.10
 platform: ruby
 authors:
 - jsmmr
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-11-06 00:00:00.000000000 Z
+date: 2022-12-30 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
@@ -68,6 +68,7 @@ files:
 - lib/callable_tree/node/internal/strategy/broadcast.rb
 - lib/callable_tree/node/internal/strategy/compose.rb
 - lib/callable_tree/node/internal/strategy/seek.rb
+- lib/callable_tree/node/internal/strategyable.rb
 - lib/callable_tree/node/root.rb
 - lib/callable_tree/version.rb
 homepage: https://github.com/jsmmr/ruby_callable_tree
@@ -76,7 +77,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.9/CHANGELOG.md
+  changelog_uri: https://github.com/jsmmr/ruby_callable_tree/blob/v0.3.10/CHANGELOG.md
   rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
@@ -93,7 +94,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.1
 signing_key:
 specification_version: 4
 summary: Builds a tree by linking callable nodes. The nodes that match the conditions