trees 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a1dc77a5635f0f3a070cad2a2de939adfd6d9e3550d4b4f3a25c34b567da0dca
-  data.tar.gz: 04abe90dbcabe052c78a56581bf906596f8b6eb2c057985df0c4f364c9c5c8a9
+  metadata.gz: 1ac49d1c7aaa58a8ff86b29db7c2b7915c470094de6b3c1af4fbd4ad45adc597
+  data.tar.gz: 4a02b57c93cec8b8b42c36f39b158d0cca4c6d2a907b2c72bfdbfb38c5b57a74
 SHA512:
-  metadata.gz: 4743bc99029f3fc8f7a3c21c58c2757b3916855d1f02a66db14a70fbfa73a44176406e75569bfb22a69001f6f2ba08b39f843051ba2f21f8578ff72837a6eb74
-  data.tar.gz: 4dc45169e415cb0e705ae3fecdfd4f83b5652cdda893778ab05402f53339e638bda08f7d8fb86b142a1546a4231629d8446d71483701d739a72a5868f1eb3f34
+  metadata.gz: f37c39226cd76bfc232ef4933aa6221b8bf6069c90a0af11e2160dcbe62be6ba2072b63f7562c0b63e44f69eed949e380a59b58302cc52cbb2fa8d39e36429f7
+  data.tar.gz: 0b5c295977cb0b50c80c1c0fcbd271a5923f80943cc08efc0ded1ce333008723c21532c33c8e376adf6de5d718610b26b79f23d7fa3b0ee4b84d349fc0f0cd61

data/lib/trees.rb

@@ -26,8 +26,8 @@ module Trees
     @current_line.execute = block
   end
 
-  def run(args)
-    results = trie.match(path: args.join(' '))
+  def run(tokens)
+    results = trie.match(tokens:)
 
     execute_block(results:)
   end

data/lib/trie.rb

@@ -8,12 +8,13 @@ module Trees
     include LowType
 
     PARAM_DELIMITERS = [' ', ':'].freeze
-    ARG_DELIMITERS = [' '].freeze
 
     attr_reader :root_node
 
     Result = Data.define(:line, :params)
 
+    class DuplicatePathError < StandardError; end
+
     def initialize
       @root_node = TrieNode.new
     end
@@ -33,35 +34,55 @@ module Trees
         current_node = current_node.upsert_child(key:)
       end
 
+      raise DuplicatePathError, "Path already defined: #{line.path}" if current_node.line
+
       current_node.line = line
     end
 
-    def match(path:, current_node: @root_node, current_index: 0, params: {})
-      return [] if (key = path[current_index]).nil?
+    def match(tokens:, current_node: @root_node, index: 0, offset: 0, params: {})
+      return [] if tokens.empty?
 
-      results = []
+      [
+        *match_static(tokens:, current_node:, index:, offset:, params:),
+        *match_dynamic(tokens:, current_node:, index:, offset:, params:)
+      ]
+    end
 
-      # Static path segment.
-      if (child_node = current_node.child(key:))
-        results << Result.new(line: child_node.line, params:) if child_node.line
-        results = [*results, *match(path:, current_node: child_node, current_index: current_index + 1, params:)]
-      end
+    private
+
+    # Match an input character with the trie or mimic the space character between tokens in the trie.
+    def match_static(tokens:, current_node:, index:, offset:, params:)
+      child_node = current_node.child(key: tokens[index][offset] || ' ')
+      return [] unless child_node
+
+      next_index, next_offset = advance(tokens:, index:, offset:)
+      result = end_match(child_node:, tokens:, index: next_index, offset: next_offset, params:)
+
+      [*result, *match(tokens:, current_node: child_node, index: next_index, offset: next_offset, params:)]
+    end
 
-      # Dynamic path segment.
-      current_node.params.each do |param|
+    # Dynamic path segment: capture the remainder of the current token.
+    def match_dynamic(tokens:, current_node:, index:, offset:, params:)
+      current_node.params.flat_map do |param|
         child_node = current_node.child(key: param)
+        arg, next_index, next_offset = capture_arg(tokens:, index:, offset:)
+        next_params = params.merge(param.delete_prefix(':').to_sym => arg)
 
-        arg, next_index = capture_arg(start_index: current_index, path:)
-        params[param.delete_prefix(':').to_sym] = arg
+        result = end_match(child_node:, tokens:, index: next_index, offset: next_offset, params: next_params)
 
-        results << Result.new(line: child_node.line, params:) if child_node.line
-        results = [*results, *match(path:, current_node: child_node, current_index: next_index, params:)]
+        [*result, *match(tokens:, current_node: child_node, index: next_index, offset: next_offset, params: next_params)]
       end
-
-      results
     end
 
-    private
+    # Match an end node.
+    # TODO: Match a mid node.
+    def end_match(child_node:, tokens:, index:, offset:, params:)
+      if child_node.line && tokens[index + 1].nil?
+        return [Result.new(line: child_node.line, params:)]
+      end
+
+      []
+    end
 
     def capture_param(path:)
       param = [':']
@@ -76,17 +97,16 @@ module Trees
       param.join
     end
 
-    def capture_arg(start_index:, path:)
-      next_index = start_index
-      arg = []
+    def advance(tokens:, index:, offset:)
+      token = tokens[index]
 
-      path[start_index...path.length].chars.each do |char|
-        arg << char
-        next_index += 1
-        break if path[next_index].nil? || ARG_DELIMITERS.include?(path[next_index])
-      end
+      offset < token.length ? [index, offset + 1] : [index + 1, 0]
+    end
+
+    def capture_arg(tokens:, index:, offset:)
+      token = tokens[index]
 
-      [arg.join, next_index]
+      [token[offset..], index, token.length]
     end
   end
 end

data/lib/version.rb

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

metadata

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