callable_tree 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7daab378247c364839a830fd43b028fd0933cef6026a1df1a614fb4a59c7a66
-  data.tar.gz: 66ac7c3de2198ef3acd80bddadeccc0f3ccd34e5a3d3de7d959bd43fb0801436
+  metadata.gz: c16eb0b2fd83ffd98d61bca938bd449dac9c004e8240c4f1a3b61242bf841163
+  data.tar.gz: 9919ffcda275a5a5bcf81b0bfae40087cae1f701fc0b7b915fece81c21a79d6b
 SHA512:
-  metadata.gz: 7b15c987aeeab91a5250f48e6d429d4176478f74dc7866a0209b0cf7f82909f58fa8f96dbae30c5d37151e63f8dab6c1e8028b2faf15b3919d9afe9ed43eb4fd
-  data.tar.gz: eb1017e10c4f94635058523979c2aeea5edd7d6899a932f2481ae72bd93b74657cd73dc2c1a12935b069e34910f9dba260ef8b62cb70e8a4f4b6dc73915ba0e5
+  metadata.gz: 98c022cc2b12dccf2333f1a1fc079febe80f597bbbfbd4565384b88987c92c2426d7986ee80c11e1361139b95d495fdff9237e4f986d57dbb7eb355ce8244a0b
+  data.tar.gz: bcee44379ab11292a5c3bba4b0d37f2bdc2a6f587f9a2a757c11c6093d29fdbd1fe20bd9e0ee6561d98785121222ae1959b412ca8b4ecb5ddf579504f5a704c4

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 ## [Unreleased]
 
+## [0.3.1] - 2022-01-10
+
+- Add `CallableTree::Node::Internal#seek?` to check whether the node's strategy is `seek` or not.
+- Add `CallableTree::Node::Internal#broadcast?` to check whether the node's strategy is `broadcast` or not.
+- Add `CallableTree::Node::Internal#compose?` to check whether the node's strategy is `compose` or not.
+
 ## [0.3.0] - 2021-12-27
 
 - Change `CallableTree::Node#match?` to accept inputs to the node as variable length arguments.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    callable_tree (0.3.0)
+    callable_tree (0.3.1)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -1,6 +1,7 @@
 # CallableTree
 
 [![build](https://github.com/jsmmr/ruby_callable_tree/actions/workflows/build.yml/badge.svg)](https://github.com/jsmmr/ruby_callable_tree/actions/workflows/build.yml)
+[![CodeQL](https://github.com/jsmmr/ruby_callable_tree/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/jsmmr/ruby_callable_tree/actions/workflows/codeql-analysis.yml)
 
 ## Installation
 

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

@@ -5,6 +5,8 @@ module CallableTree
     module Internal
       module Strategy
         class Broadcast
+          include Strategy
+
           def call(nodes, *inputs, **options)
             nodes.map do |node|
               node.call(*inputs, **options) if node.match?(*inputs, **options)

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

@@ -5,6 +5,8 @@ module CallableTree
     module Internal
       module Strategy
         class Compose
+          include Strategy
+
           def call(nodes, *inputs, **options)
             head, *tail = inputs
             nodes.reduce(head) do |input, node|

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

@@ -5,6 +5,8 @@ module CallableTree
     module Internal
       module Strategy
         class Seek
+          include Strategy
+
           def call(nodes, *inputs, **options)
             nodes
               .lazy

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

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module CallableTree
+  module Node
+    module Internal
+      module Strategy
+        def call(_nodes, *_inputs, **_options)
+          raise ::CallableTree::Error, 'Not implemented'
+        end
+
+        def name
+          @name ||= self.class.name.split('::').last.downcase.to_sym
+        end
+
+        def ==(other)
+          name == other.name
+        end
+
+        def eql?(other)
+          instance_of?(other.class) && self == other
+        end
+
+        def hash
+          self.class.name.hash
+        end
+      end
+    end
+  end
+end

data/lib/callable_tree/node/internal.rb

@@ -25,7 +25,7 @@ module CallableTree
       def append!(*callables)
         callables
           .map { |callable| nodeify(callable) }
-          .tap { |nodes| child_nodes.push(*nodes) } # Use Array#push for Ruby 2.4
+          .tap { |nodes| child_nodes.push(*nodes) }
 
         self
       end
@@ -63,49 +63,64 @@ module CallableTree
         strategy.call(child_nodes, *inputs, **options)
       end
 
+      def seek?
+        strategy.is_a?(Strategy::Seek)
+      end
+
       def seek
-        if strategy.is_a?(Strategy::Seek)
+        if seek?
           self
         else
           clone.tap do |node|
-            node.send(:strategy=, Strategy::Seek.new)
+            node.strategy = Strategy::Seek.new
           end
         end
       end
 
       def seek!
-        self.strategy = Strategy::Seek.new unless strategy.is_a?(Strategy::Seek)
-        self
+        tap do |node|
+          node.strategy = Strategy::Seek.new unless seek?
+        end
+      end
+
+      def broadcast?
+        strategy.is_a?(Strategy::Broadcast)
       end
 
       def broadcast
-        if strategy.is_a?(Strategy::Broadcast)
+        if broadcast?
           self
         else
           clone.tap do |node|
-            node.send(:strategy=, Strategy::Broadcast.new)
+            node.strategy = Strategy::Broadcast.new
           end
         end
       end
 
       def broadcast!
-        self.strategy = Strategy::Broadcast.new unless strategy.is_a?(Strategy::Broadcast)
-        self
+        tap do |node|
+          node.strategy = Strategy::Broadcast.new unless broadcast?
+        end
+      end
+
+      def compose?
+        strategy.is_a?(Strategy::Compose)
       end
 
       def compose
-        if strategy.is_a?(Strategy::Compose)
+        if compose?
           self
         else
           clone.tap do |node|
-            node.send(:strategy=, Strategy::Compose.new)
+            node.strategy = Strategy::Compose.new
           end
         end
       end
 
       def compose!
-        self.strategy = Strategy::Compose.new unless strategy.is_a?(Strategy::Compose)
-        self
+        tap do |node|
+          node.strategy = Strategy::Compose.new unless compose?
+        end
       end
 
       def outline(&block)
@@ -116,13 +131,15 @@ module CallableTree
 
       protected
 
+      attr_writer :strategy
+
       def child_nodes
         @child_nodes ||= []
       end
 
       private
 
-      attr_writer :child_nodes, :strategy
+      attr_writer :child_nodes
 
       def nodeify(callable)
         if callable.is_a?(Node)
@@ -130,7 +147,7 @@ module CallableTree
         else
           External.proxify(callable)
         end
-          .tap { |node| node.send(:parent=, self) }
+          .tap { |node| node.parent = self }
       end
 
       def strategy
@@ -141,7 +158,7 @@ module CallableTree
         super
         self.parent = nil
         self.child_nodes = child_nodes.map do |node|
-          node.clone.tap { |new_node| new_node.send(:parent=, self) }
+          node.clone.tap { |new_node| new_node.parent = self }
         end
       end
     end

data/lib/callable_tree/node.rb

@@ -46,7 +46,7 @@ module CallableTree
       !output.nil?
     end
 
-    private
+    protected
 
     attr_writer :parent
   end

data/lib/callable_tree/version.rb

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

data/lib/callable_tree.rb

@@ -8,6 +8,7 @@ require 'forwardable'
 require_relative 'callable_tree/version'
 require_relative 'callable_tree/node'
 require_relative 'callable_tree/node/hooks/call'
+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'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: callable_tree
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - jsmmr
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-12-27 00:00:00.000000000 Z
+date: 2022-01-10 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
@@ -50,6 +50,7 @@ files:
 - lib/callable_tree/node/external/verbose.rb
 - lib/callable_tree/node/hooks/call.rb
 - lib/callable_tree/node/internal.rb
+- lib/callable_tree/node/internal/strategy.rb
 - lib/callable_tree/node/internal/strategy/broadcast.rb
 - lib/callable_tree/node/internal/strategy/compose.rb
 - lib/callable_tree/node/internal/strategy/seek.rb
@@ -61,7 +62,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.0/CHANGELOG.md
+  changelog_uri: https://github.com/jsmmr/ruby_callable_tree/blob/v0.3.1/CHANGELOG.md
 post_install_message:
 rdoc_options: []
 require_paths: