callable_tree 0.2.1 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 23417eaf997718c6d0e9b5fc52dea3fe4923ca9b426d9d41e57b5e27015d239a
-  data.tar.gz: 34be74baf1014e41efbe0073fedfdf76dc02444c927bea2b089d9457842c04b8
+  metadata.gz: c16eb0b2fd83ffd98d61bca938bd449dac9c004e8240c4f1a3b61242bf841163
+  data.tar.gz: 9919ffcda275a5a5bcf81b0bfae40087cae1f701fc0b7b915fece81c21a79d6b
 SHA512:
-  metadata.gz: 686e18552c5decad326d7bd0775a2be0b3726245edea1ccf2dbdf0ca3e264ec88883bf79cea5af873b074feff1b63e49b59522b5f3b7fc00e06122d494277cea
-  data.tar.gz: 7db8a88a1bc19677f453237dd15137da05f3fdb2ddb25aeedd11df82e6afd7c769d3da3c61e9905c40285d35ea54059c6749b4f32a354fc542d7bd26fdd8992f
+  metadata.gz: 98c022cc2b12dccf2333f1a1fc079febe80f597bbbfbd4565384b88987c92c2426d7986ee80c11e1361139b95d495fdff9237e4f986d57dbb7eb355ce8244a0b
+  data.tar.gz: bcee44379ab11292a5c3bba4b0d37f2bdc2a6f587f9a2a757c11c6093d29fdbd1fe20bd9e0ee6561d98785121222ae1959b412ca8b4ecb5ddf579504f5a704c4

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']
+        ruby: ['2.4', '2.5', '2.6', '2.7', '3.0', '3.1']
     steps:
       - uses: actions/checkout@v2
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
-      - run: gem install bundler:2.2.4
+      - run: gem install bundler:2.3.3
       - uses: actions/cache@v2
         with:
           path: vendor/bundle

data/.github/workflows/codeql-analysis.yml

@@ -0,0 +1,70 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ main, develop ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ main, develop ]
+  schedule:
+    - cron: '35 15 * * 0'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'ruby' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
+        # Learn more about CodeQL language support at https://git.io/codeql-language-support
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v1
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1

data/.ruby-version

@@ -1 +1 @@
-3.0.0
+3.1.0

data/CHANGELOG.md

@@ -1,12 +1,40 @@
 ## [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.
+- Change `CallableTree::Node#call` to accept inputs to the node as variable length arguments.
+- Change `CallableTree::Node#terminate?` to accept inputs to the node as variable length arguments, after the `output` argument.
+- Add `CallableTree::Node::Internal#[]` to return the child node using `index`.
+- Change `CallableTree::Node::Internal#children` to return a new array including child nodes of the node.
+- Add `CallableTree::Node::Internal#children!` to return destructively changeable array including child nodes of the node.
+
+## [0.2.3] - 2021-11-07
+
+- Add `CallableTree::Node::Internal#shake` to recursively execute `CallableTree::Node::Internal#reject`, including child nodes. The child nodes that are empty because their children have been rejected will also be rejected.
+- Add `CallableTree::Node::Internal#shake!` that make destructive change.
+- Add `CallableTree::Node#outline` that may be useful for writing the specs.
+
+## [0.2.2] - 2021-10-24
+
+- Add `CallableTree::Node::Internal#reject` to return a new node instance without rejected child nodes.
+- Add `CallableTree::Node::Internal#reject!` to destructively reject child nodes.
+
 ## [0.2.1] - 2021-07-24
-- Add `CallableTree::Node::root?`.
+
+- Add `CallableTree::Node#root?`.
 - Add `CallableTree::Node::Internal#seek!` that make destructive change.
 - Add `CallableTree::Node::Internal#broadcast!` that make destructive change.
 - Add `CallableTree::Node::Internal#compose!` that make destructive change.
 
 ## [0.2.0] - 2021-06-15
+
 - Change `CallableTree::Node::Internal#append` to return a new instance.
   To keep the same behavior as the older version, use `CallableTree::Node::External#append!` that make destructive change.
 - Remove `CallableTree::Node::Internal#<<`. Use `CallableTree::Node::External#append!` instead.
@@ -14,6 +42,7 @@
   To keep the same behavior as the older version, use `CallableTree::Node::External#verbosify!` that make destructive change.
 
 ## [0.1.3] - 2021-06-12
+
 - Minor improvements
 
 ## [0.1.2] - 2021-05-29

data/Gemfile.lock

@@ -1,12 +1,12 @@
 PATH
   remote: .
   specs:
-    callable_tree (0.2.1)
+    callable_tree (0.3.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    diff-lcs (1.4.4)
+    diff-lcs (1.5.0)
     rake (13.0.6)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
@@ -20,7 +20,7 @@ GEM
     rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-support (3.10.2)
+    rspec-support (3.10.3)
 
 PLATFORMS
   x86_64-darwin-19
@@ -32,4 +32,4 @@ DEPENDENCIES
   rspec (~> 3.0)
 
 BUNDLED WITH
-   2.2.17
+   2.3.3

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2021 　
+Copyright (c) 2021 jsmmr
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -1,5 +1,8 @@
 # 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
 
 Add this line to your application's Gemfile:
@@ -40,11 +43,11 @@ module Node
     class Parser
       include CallableTree::Node::Internal
 
-      def match?(input, **options)
+      def match?(input, **_options)
         File.extname(input) == '.json'
       end
 
-      # If there is need to convert the input value for
+      # If there is need to convert the input values for
       # child nodes, override the `call` method.
       def call(input, **options)
         File.open(input) do |file|
@@ -56,7 +59,7 @@ module Node
       # If a returned value of the `call` method is `nil`,
       # but there is no need to call the sibling nodes,
       # override the `terminate?` method to return `true`.
-      def terminate?(output, **options)
+      def terminate?(_output, *_inputs, **_options)
         true
       end
     end
@@ -68,11 +71,11 @@ module Node
         @type = type
       end
 
-      def match?(input, **options)
+      def match?(input, **_options)
         !!input[@type.to_s]
       end
 
-      def call(input, **options)
+      def call(input, **_options)
         input[@type.to_s]
           .map { |element| [element['name'], element['emoji']] }
           .to_h
@@ -84,11 +87,11 @@ module Node
     class Parser
       include CallableTree::Node::Internal
 
-      def match?(input, **options)
+      def match?(input, **_options)
         File.extname(input) == '.xml'
       end
 
-      # If there is need to convert the input value for
+      # If there is need to convert the input values for
       # child nodes, override the `call` method.
       def call(input, **options)
         File.open(input) do |file|
@@ -99,7 +102,7 @@ module Node
       # If a returned value of the `call` method is `nil`,
       # but there is no need to call the sibling nodes,
       # override the `terminate?` method to return `true`.
-      def terminate?(output, **options)
+      def terminate?(_output, *_inputs, **_options)
         true
       end
     end
@@ -111,11 +114,11 @@ module Node
         @type = type
       end
 
-      def match?(input, **options)
+      def match?(input, **_options)
         !input.get_elements("//#{@type}").empty?
       end
 
-      def call(input, **options)
+      def call(input, **_options)
         input
           .get_elements("//#{@type}")
           .first
@@ -138,7 +141,7 @@ tree = CallableTree::Node::Root.new.append(
   )#.seek
 )#.seek
 
-Dir.glob(__dir__ + '/docs/*') do |file|
+Dir.glob("#{__dir__}/docs/*") do |file|
   options = { foo: :bar }
   pp tree.call(file, **options)
   puts '---'
@@ -180,12 +183,12 @@ end
 
 tree = CallableTree::Node::Root.new.append(
   Node::LessThan.new(5).append(
-    lambda { |input, **| input * 2 }, # anonymous external node
-    lambda { |input, **| input + 1 }  # anonymous external node
+    ->(input) { input * 2 }, # anonymous external node
+    ->(input) { input + 1 }  # anonymous external node
   ).broadcast,
   Node::LessThan.new(10).append(
-    lambda { |input, **| input * 3 }, # anonymous external node
-    lambda { |input, **| input - 1 }  # anonymous external node
+    ->(input) { input * 3 }, # anonymous external node
+    ->(input) { input - 1 }  # anonymous external node
   ).broadcast
 ).broadcast
 
@@ -432,28 +435,28 @@ This is an example of logging.
 module Node
   module Logging
     INDENT_SIZE = 2
-    BLANK = ' '.freeze
+    BLANK = ' '
 
     module Match
-      LIST_STYLE = '*'.freeze
+      LIST_STYLE = '*'
 
-      def match?(_input, **)
+      def match?(_input, **_options)
         super.tap do |matched|
-          prefix = LIST_STYLE.rjust(self.depth * INDENT_SIZE - INDENT_SIZE + LIST_STYLE.length, BLANK)
-          puts "#{prefix} #{self.identity}: [matched: #{matched}]"
+          prefix = LIST_STYLE.rjust(depth * INDENT_SIZE - INDENT_SIZE + LIST_STYLE.length, BLANK)
+          puts "#{prefix} #{identity}: [matched: #{matched}]"
         end
       end
     end
 
     module Call
-      INPUT_LABEL  = 'Input :'.freeze
-      OUTPUT_LABEL = 'Output:'.freeze
+      INPUT_LABEL  = 'Input :'
+      OUTPUT_LABEL = 'Output:'
 
-      def call(input, **)
+      def call(input, **_options)
         super.tap do |output|
-          input_prefix = INPUT_LABEL.rjust(self.depth * INDENT_SIZE + INPUT_LABEL.length, BLANK)
+          input_prefix = INPUT_LABEL.rjust(depth * INDENT_SIZE + INPUT_LABEL.length, BLANK)
           puts "#{input_prefix} #{input}"
-          output_prefix = OUTPUT_LABEL.rjust(self.depth * INDENT_SIZE + OUTPUT_LABEL.length, BLANK)
+          output_prefix = OUTPUT_LABEL.rjust(depth * INDENT_SIZE + OUTPUT_LABEL.length, BLANK)
           puts "#{output_prefix} #{output}"
         end
       end
@@ -577,24 +580,24 @@ module Node
 end
 
 Node::HooksSample.new
-  .before_call do |input, **options|
+  .before_call do |input, **_options|
     puts "before_call input: #{input}";
     input + 1
   end
   .append(
     # anonymous external node
-    lambda do |input, **options|
+    lambda do |input, **_options|
       puts "external input: #{input}"
       input * 2
     end
   )
-  .around_call do |input, **options, &block|
+  .around_call do |input, **_options, &block|
     puts "around_call input: #{input}"
     output = block.call
     puts "around_call output: #{output}"
     output * input
   end
-  .after_call do |output, **options|
+  .after_call do |output, **_options|
     puts "after_call output: #{output}"
     output * 2
   end

data/examples/external-verbosify.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'callable_tree'
 require 'json'
 require 'rexml/document'
@@ -7,7 +9,7 @@ module Node
     class Parser
       include CallableTree::Node::Internal
 
-      def match?(input, **options)
+      def match?(input, **_options)
         File.extname(input) == '.json'
       end
 
@@ -18,7 +20,7 @@ module Node
         end
       end
 
-      def terminate?(_output, **)
+      def terminate?(_output, *_inputs, **_options)
         true
       end
     end
@@ -30,11 +32,11 @@ module Node
         @type = type
       end
 
-      def match?(input, **options)
+      def match?(input, **_options)
         !!input[@type.to_s]
       end
 
-      def call(input, **options)
+      def call(input, **_options)
         input[@type.to_s]
           .map { |element| [element['name'], element['emoji']] }
           .to_h
@@ -46,7 +48,7 @@ module Node
     class Parser
       include CallableTree::Node::Internal
 
-      def match?(input, **options)
+      def match?(input, **_options)
         File.extname(input) == '.xml'
       end
 
@@ -56,7 +58,7 @@ module Node
         end
       end
 
-      def terminate?(_output, **)
+      def terminate?(_output, *_inputs, **_options)
         true
       end
     end
@@ -68,11 +70,11 @@ module Node
         @type = type
       end
 
-      def match?(input, **options)
+      def match?(input, **_options)
         !input.get_elements("//#{@type}").empty?
       end
 
-      def call(input, **options)
+      def call(input, **_options)
         input
           .get_elements("//#{@type}")
           .first
@@ -94,7 +96,7 @@ tree = CallableTree::Node::Root.new.append(
   )
 )
 
-Dir.glob(__dir__ + '/docs/*') do |file|
+Dir.glob("#{__dir__}/docs/*") do |file|
   options = { foo: :bar }
   pp tree.call(file, **options)
   puts '---'

data/examples/hooks-call.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'callable_tree'
 
 module Node
@@ -8,24 +10,24 @@ module Node
 end
 
 Node::HooksSample.new
-  .before_call do |input, **options|
+  .before_call do |input, **_options|
     puts "before_call input: #{input}";
     input + 1
   end
   .append(
     # anonymous external node
-    lambda do |input, **options|
+    lambda do |input, **_options|
       puts "external input: #{input}"
       input * 2
     end
   )
-  .around_call do |input, **options, &block|
+  .around_call do |input, **_options, &block|
     puts "around_call input: #{input}"
     output = block.call
     puts "around_call output: #{output}"
     output * input
   end
-  .after_call do |output, **options|
+  .after_call do |output, **_options|
     puts "after_call output: #{output}"
     output * 2
   end

data/examples/identity.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'callable_tree'
 require 'json'
 require 'rexml/document'
@@ -20,7 +22,7 @@ module Node
     class Parser
       include CallableTree::Node::Internal
 
-      def match?(input, **options)
+      def match?(input, **_options)
         File.extname(input) == '.json'
       end
 
@@ -31,7 +33,7 @@ module Node
         end
       end
 
-      def terminate?(_output, **)
+      def terminate?(_output, *_inputs, **_options)
         true
       end
     end
@@ -47,11 +49,11 @@ module Node
         Identity.new(klass: super, type: @type)
       end
 
-      def match?(input, **options)
+      def match?(input, **_options)
         !!input[@type.to_s]
       end
 
-      def call(input, **options)
+      def call(input, **_options)
         input[@type.to_s]
           .map { |element| [element['name'], element['emoji']] }
           .to_h
@@ -63,7 +65,7 @@ module Node
     class Parser
       include CallableTree::Node::Internal
 
-      def match?(input, **options)
+      def match?(input, **_options)
         File.extname(input) == '.xml'
       end
 
@@ -73,7 +75,7 @@ module Node
         end
       end
 
-      def terminate?(_output, **)
+      def terminate?(_output, *_inputs, **_options)
         true
       end
     end
@@ -89,11 +91,11 @@ module Node
         Identity.new(klass: super, type: @type)
       end
 
-      def match?(input, **options)
+      def match?(input, **_options)
         !input.get_elements("//#{@type}").empty?
       end
 
-      def call(input, **options)
+      def call(input, **_options)
         input
           .get_elements("//#{@type}")
           .first
@@ -115,7 +117,7 @@ tree = CallableTree::Node::Root.new.append(
   )
 )
 
-Dir.glob(__dir__ + '/docs/*') do |file|
+Dir.glob("#{__dir__}/docs/*") do |file|
   options = { foo: :bar }
   pp tree.call(file, **options)
   puts '---'

data/examples/internal-broadcast.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'callable_tree'
 
 module Node
@@ -16,12 +18,12 @@ end
 
 tree = CallableTree::Node::Root.new.append(
   Node::LessThan.new(5).append(
-    lambda { |input, **| input * 2 }, # anonymous external node
-    lambda { |input, **| input + 1 }  # anonymous external node
+    ->(input) { input * 2 }, # anonymous external node
+    ->(input) { input + 1 }  # anonymous external node
   ).broadcast,
   Node::LessThan.new(10).append(
-    lambda { |input, **| input * 3 }, # anonymous external node
-    lambda { |input, **| input - 1 }  # anonymous external node
+    ->(input) { input * 3 }, # anonymous external node
+    ->(input) { input - 1 }  # anonymous external node
   ).broadcast
 ).broadcast
 

data/examples/internal-compose.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'callable_tree'
 
 module Node

data/examples/internal-seek.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'callable_tree'
 require 'json'
 require 'rexml/document'
@@ -7,7 +9,7 @@ module Node
     class Parser
       include CallableTree::Node::Internal
 
-      def match?(input, **options)
+      def match?(input, **_options)
         File.extname(input) == '.json'
       end
 
@@ -18,7 +20,7 @@ module Node
         end
       end
 
-      def terminate?(_output, **)
+      def terminate?(_output, *_inputs, **_options)
         true
       end
     end
@@ -30,11 +32,11 @@ module Node
         @type = type
       end
 
-      def match?(input, **options)
+      def match?(input, **_options)
         !!input[@type.to_s]
       end
 
-      def call(input, **options)
+      def call(input, **_options)
         input[@type.to_s]
           .map { |element| [element['name'], element['emoji']] }
           .to_h
@@ -46,7 +48,7 @@ module Node
     class Parser
       include CallableTree::Node::Internal
 
-      def match?(input, **options)
+      def match?(input, **_options)
         File.extname(input) == '.xml'
       end
 
@@ -56,7 +58,7 @@ module Node
         end
       end
 
-      def terminate?(_output, **)
+      def terminate?(_output, *_inputs, **_options)
         true
       end
     end
@@ -68,11 +70,11 @@ module Node
         @type = type
       end
 
-      def match?(input, **options)
+      def match?(input, **_options)
         !input.get_elements("//#{@type}").empty?
       end
 
-      def call(input, **options)
+      def call(input, **_options)
         input
           .get_elements("//#{@type}")
           .first
@@ -94,7 +96,7 @@ tree = CallableTree::Node::Root.new.append(
   )
 )
 
-Dir.glob(__dir__ + '/docs/*') do |file|
+Dir.glob("#{__dir__}/docs/*") do |file|
   options = { foo: :bar }
   pp tree.call(file, **options)
   puts '---'

data/examples/logging.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'callable_tree'
 require 'json'
 require 'rexml/document'
@@ -5,28 +7,28 @@ require 'rexml/document'
 module Node
   module Logging
     INDENT_SIZE = 2
-    BLANK = ' '.freeze
+    BLANK = ' '
 
     module Match
-      LIST_STYLE = '*'.freeze
+      LIST_STYLE = '*'
 
-      def match?(_input, **)
+      def match?(_input, **_options)
         super.tap do |matched|
-          prefix = LIST_STYLE.rjust(self.depth * INDENT_SIZE - INDENT_SIZE + LIST_STYLE.length, BLANK)
-          puts "#{prefix} #{self.identity}: [matched: #{matched}]"
+          prefix = LIST_STYLE.rjust(depth * INDENT_SIZE - INDENT_SIZE + LIST_STYLE.length, BLANK)
+          puts "#{prefix} #{identity}: [matched: #{matched}]"
         end
       end
     end
 
     module Call
-      INPUT_LABEL  = 'Input :'.freeze
-      OUTPUT_LABEL = 'Output:'.freeze
+      INPUT_LABEL  = 'Input :'
+      OUTPUT_LABEL = 'Output:'
 
-      def call(input, **)
+      def call(input, **_options)
         super.tap do |output|
-          input_prefix = INPUT_LABEL.rjust(self.depth * INDENT_SIZE + INPUT_LABEL.length, BLANK)
+          input_prefix = INPUT_LABEL.rjust(depth * INDENT_SIZE + INPUT_LABEL.length, BLANK)
           puts "#{input_prefix} #{input}"
-          output_prefix = OUTPUT_LABEL.rjust(self.depth * INDENT_SIZE + OUTPUT_LABEL.length, BLANK)
+          output_prefix = OUTPUT_LABEL.rjust(depth * INDENT_SIZE + OUTPUT_LABEL.length, BLANK)
           puts "#{output_prefix} #{output}"
         end
       end
@@ -51,7 +53,7 @@ module Node
       include CallableTree::Node::Internal
       prepend Logging::Match
 
-      def match?(input, **options)
+      def match?(input, **_options)
         File.extname(input) == '.json'
       end
 
@@ -62,7 +64,7 @@ module Node
         end
       end
 
-      def terminate?(_output, **)
+      def terminate?(_output, *_inputs, **_options)
         true
       end
     end
@@ -80,11 +82,11 @@ module Node
         Identity.new(klass: super, type: @type)
       end
 
-      def match?(input, **options)
+      def match?(input, **_options)
         !!input[@type.to_s]
       end
 
-      def call(input, **options)
+      def call(input, **_options)
         input[@type.to_s]
           .map { |element| [element['name'], element['emoji']] }
           .to_h
@@ -97,7 +99,7 @@ module Node
       include CallableTree::Node::Internal
       prepend Logging::Match
 
-      def match?(input, **options)
+      def match?(input, **_options)
         File.extname(input) == '.xml'
       end
 
@@ -107,7 +109,7 @@ module Node
         end
       end
 
-      def terminate?(_output, **)
+      def terminate?(_output, *_inputs, **_options)
         true
       end
     end
@@ -125,11 +127,11 @@ module Node
         Identity.new(klass: super, type: @type)
       end
 
-      def match?(input, **options)
+      def match?(input, **_options)
         !input.get_elements("//#{@type}").empty?
       end
 
-      def call(input, **options)
+      def call(input, **_options)
         input
           .get_elements("//#{@type}")
           .first
@@ -151,7 +153,7 @@ tree = CallableTree::Node::Root.new.append(
   )
 )
 
-Dir.glob(__dir__ + '/docs/*') do |file|
+Dir.glob("#{__dir__}/docs/*") do |file|
   options = { foo: :bar }
   pp tree.call(file, **options)
   puts '---'

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

@@ -3,6 +3,7 @@
 module CallableTree
   module Node
     module External
+      # TODO: Add :inputs
       Output = Struct.new(:value, :options, :routes)
 
       module Verbose
@@ -10,8 +11,8 @@ module CallableTree
           true
         end
 
-        def call(input = nil, **options)
-          output = super(input, **options)
+        def call(*inputs, **options)
+          output = super(*inputs, **options)
           routes = self.routes
 
           Output.new(output, options, routes)

data/lib/callable_tree/node/external.rb

@@ -37,6 +37,10 @@ module CallableTree
           .class
       end
 
+      def outline
+        { identity => nil }
+      end
+
       private
 
       def initialize_copy(_node)

data/lib/callable_tree/node/hooks/call.rb

@@ -23,15 +23,17 @@ module CallableTree
           self
         end
 
-        def call(input = nil, **options)
-          input = before_callbacks.reduce(input) do |input, callable|
-            callable.call(input, self, **options)
+        def call(*inputs, **options)
+          input_head, *input_tail = inputs
+
+          input_head = before_callbacks.reduce(input_head) do |input_head, callable|
+            callable.call(input_head, *input_tail, self, **options)
           end
 
-          output = super(input, **options)
+          output = super(input_head, *input_tail, **options)
 
           output = around_callbacks.reduce(output) do |output, callable|
-            callable.call(input, self, **options) { output }
+            callable.call(input_head, *input_tail, self, **options) { output }
           end
 
           after_callbacks.reduce(output) do |output, callable|

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

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

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

@@ -5,10 +5,14 @@ module CallableTree
     module Internal
       module Strategy
         class Compose
-          def call(nodes, input:, options:)
-            nodes.reduce(input) do |input, node|
-              if node.match?(input, **options)
-                node.call(input, **options)
+          include Strategy
+
+          def call(nodes, *inputs, **options)
+            head, *tail = inputs
+            nodes.reduce(head) do |input, node|
+              inputs = [input, *tail]
+              if node.match?(*inputs, **options)
+                node.call(*inputs, **options)
               else
                 input
               end

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

@@ -5,13 +5,15 @@ module CallableTree
     module Internal
       module Strategy
         class Seek
-          def call(nodes, input:, options:)
+          include Strategy
+
+          def call(nodes, *inputs, **options)
             nodes
               .lazy
-              .select { |node| node.match?(input, **options) }
+              .select { |node| node.match?(*inputs, **options) }
               .map do |node|
-                output = node.call(input, **options)
-                terminated = node.terminate?(output, **options)
+                output = node.call(*inputs, **options)
+                terminated = node.terminate?(output, *inputs, **options)
                 [output, terminated]
               end
               .select { |_output, terminated| terminated }

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

@@ -3,10 +3,17 @@
 module CallableTree
   module Node
     module Internal
+      extend ::Forwardable
       include Node
 
+      def_delegators :child_nodes, :[], :at
+
       def children
-        @children ||= []
+        [*child_nodes]
+      end
+
+      def children!
+        child_nodes
       end
 
       def append(*callables)
@@ -18,67 +25,121 @@ module CallableTree
       def append!(*callables)
         callables
           .map { |callable| nodeify(callable) }
-          .tap { |nodes| children.push(*nodes) } # Use Array#push for Ruby 2.4
+          .tap { |nodes| child_nodes.push(*nodes) }
+
+        self
+      end
+
+      def reject(&block)
+        clone.tap do |node|
+          node.reject!(&block)
+        end
+      end
 
+      def reject!(&block)
+        child_nodes.reject!(&block)
         self
       end
 
-      def match?(_input = nil, **_options)
-        !children.empty?
+      def shake(&block)
+        clone.tap do |node|
+          node.shake!(&block)
+        end
+      end
+
+      def shake!(&block)
+        reject!(&block) if block_given?
+
+        reject! do |node|
+          node.is_a?(Internal) && node.shake!(&block).child_nodes.empty?
+        end
+      end
+
+      def match?(*, **)
+        !child_nodes.empty?
       end
 
-      def call(input = nil, **options)
-        strategy.call(children, input: input, options: options)
+      def call(*inputs, **options)
+        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)
+        key = block ? block.call(self) : identity
+        value = child_nodes.reduce({}) { |memo, node| memo.merge!(node.outline(&block)) }
+        { key => value }
+      end
+
+      protected
+
+      attr_writer :strategy
+
+      def child_nodes
+        @child_nodes ||= []
       end
 
       private
 
-      attr_writer :children, :strategy
+      attr_writer :child_nodes
 
       def nodeify(callable)
         if callable.is_a?(Node)
@@ -86,7 +147,7 @@ module CallableTree
         else
           External.proxify(callable)
         end
-        .tap { |node| node.send(:parent=, self) }
+          .tap { |node| node.parent = self }
       end
 
       def strategy
@@ -96,8 +157,8 @@ module CallableTree
       def initialize_copy(_node)
         super
         self.parent = nil
-        self.children = children.map do |node|
-          node.clone.tap { |new_node| new_node.send(:parent=, self) }
+        self.child_nodes = child_nodes.map do |node|
+          node.clone.tap { |new_node| new_node.parent = self }
         end
       end
     end

data/lib/callable_tree/node.rb

@@ -30,19 +30,23 @@ module CallableTree
       root? ? 0 : parent.depth + 1
     end
 
-    def match?(_input = nil, **_options)
+    def outline
+      raise ::CallableTree::Error, 'Not implemented'
+    end
+
+    def match?(*_inputs, **_options)
       true
     end
 
-    def call(_input = nil, **_options)
+    def call(*_inputs, **_options)
       raise ::CallableTree::Error, 'Not implemented'
     end
 
-    def terminate?(output = nil, **_options)
+    def terminate?(output, *_inputs, **_options)
       !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.2.1'
+  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.2.1
+  version: 0.3.1
 platform: ruby
 authors:
 - jsmmr
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-07-24 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
@@ -20,6 +20,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".github/workflows/build.yml"
+- ".github/workflows/codeql-analysis.yml"
 - ".gitignore"
 - ".rspec"
 - ".ruby-version"
@@ -49,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
@@ -60,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.2.1/CHANGELOG.md
+  changelog_uri: https://github.com/jsmmr/ruby_callable_tree/blob/v0.3.1/CHANGELOG.md
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -76,7 +78,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.16
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
 summary: Builds a tree by linking callable nodes. The nodes that match the conditions