trees 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b21e86099694d3b6b36152f0bfa445d7baa921c4fc1b085c5d2da22fa1d2131e
-  data.tar.gz: c1320e651491ffca5053b1b04a7e797b7633c2253baad83c22fd9b798d38399a
+  metadata.gz: 6ed26c969afc761461ea690075a2c838156cb3309fef5fbac31f219b716c71a8
+  data.tar.gz: 47fed5e9edb8a0b5a930ef505beb53381c121dd84cb4d50c89d1b84f6c2875ce
 SHA512:
-  metadata.gz: a0d86359f6a0497932b3a628544b744aeecd8ef9b5f376480e056330ea2c8c3694bfbd8e7c8a4e55634e25a3759e4ee2aec7738288fd5d68eb7c21ad7d66cfb5
-  data.tar.gz: c75011d6796a2c0a8e60061edd75e10b61aaba8649c7755453ae9cba11a2cd2d9267d8e57b494368b32db4d5ac20bba77fcd376098fe9e664e81869d59b26e7a
+  metadata.gz: 3142f22906faf7f82aed9b56586c4007bbcda629b7d0c98b4099223854e0469317d39f49b44bd55f8fbf378d167a27e5d850a5210bfb0a7177d0547d1e662fa4
+  data.tar.gz: 425cf3ce7982b240e8527a34cb2928c071b588896112f2f02b23b428eb887fd017d26ade1f9502a130e9fcd6ea0ef5f6cca8cdd1493ef9c335ddef7aca98f55d

data/lib/line.rb

@@ -5,7 +5,7 @@ module Trees
     attr_reader :path, :params
     attr_accessor :summary, :example, :execute
 
-    def initialize(path:, params: {})
+    def initialize(path:, params: [])
       @path = path
       @params = params
 

data/lib/trees.rb

@@ -4,20 +4,18 @@ require_relative 'line'
 require_relative 'trie'
 
 module Trees
-  attr_reader :lines, :trie
-
-  TOKEN_SEPARATOR = ' '.freeze
+  TOKEN_SEPARATOR = ' '
 
   def line(path, &block)
     current_path << path
     current_path_joined = current_path.join(TOKEN_SEPARATOR)
 
-    @current_line = Line.new(path: current_path_joined, params: block.parameters.to_h)
+    @current_line = Line.new(path: current_path_joined, params: block.parameters.map(&:last))
 
     lines[current_path_joined] = @current_line
     trie.merge(line: @current_line)
 
-    block.call if block_given?
+    block.call(**stub_required_keywords(block:)) if block_given?
 
     current_path.pop
   end
@@ -48,19 +46,24 @@ module Trees
     while results.count > 0
       result = results.pop
 
-      if result.line.execute
-        result.line.params.values.each do |param|
-          result.line.execute.binding.local_variable_set(param, result.params[param])
-        end
-
-        result.line.execute.call
+      next unless result.line.execute
 
-        return true
+      result.line.params.each do |param|
+        result.line.execute.binding.local_variable_set(param, result.params[param]) if result.params.key?(param)
       end
+
+      result.line.execute.call
+
+      return true
     end
 
     false
-  end  
+  end
+
+  # The "line" block defines the params that the "execute" child block will use later but doesn't itself execute user input.
+  def stub_required_keywords(block:)
+    block.parameters.filter_map { |type, name| [name, nil] if type == :keyreq }.to_h
+  end
 
   def current_path
     @current_path ||= []

data/lib/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Trees
-  VERSION = '0.3.4'
+  VERSION = '0.3.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trees
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - maedi