hiiro 0.1.57 → 0.1.58

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f55785ca9b54838e9b0e0eefe8e1e829f85ad1b1d9a1ed6b961305b847f1828
-  data.tar.gz: cda5ec5bdc86b4210e4870d88bca437c9cc7dbac3857ae3e264a66ba0b054675
+  metadata.gz: 0f183baf860848362b475e46afc9f6519e244e341cc2c63e07a5917dee51603a
+  data.tar.gz: de0fde039502136565942f159e499f0bb99eb76cb6a4bc25990174131b0b8779
 SHA512:
-  metadata.gz: 8d8e719178da0355245154216264edb4c292fb5ccc62dc561e8529bf7b67f4a94d85a5db3516e1406f5cf7464f61454dc3c07f7dc26530a44a895577b7082c12
-  data.tar.gz: 28a570aba442cb90419feaf3edd4ef4135773fc2f971401df942bb09617f17c7466c3ba32dbfc2edd1849895d973cdada07f80b8edd2932685e8f21bc00f29d4
+  metadata.gz: 8871dc00189d5e8a640ac91b0b7ac28759ead113adf8675e848fffa79282524547140b93f2ad51a9b2b7ecea69a6dd78b290306288440303129bdb8ae03817f9
+  data.tar.gz: 3b2a9793aea6c1d54d52141c98549f7fc01d017d4e11c5fecca424383430f917252b62b8aa62545cd4aced9771c3429d306fdbf6c7a4b1c1e590b829f9285736

data/lib/hiiro/prefix_matcher.rb

@@ -1,5 +1,112 @@
 class Hiiro
   class PrefixMatcher
+    class << self
+      def find(items, prefix, key: nil, &block)
+        new(items, key, &block).find(prefix)
+      end
+
+      def find_all(items, prefix, key: nil, &block)
+        new(items, key, &block).find_all(prefix)
+      end
+
+      def resolve(items, prefix, key: nil, &block)
+        new(items, key, &block).resolve(prefix)
+      end
+
+      def find_path(items, prefix, key: nil, &block)
+        new(items, key, &block).find_path(prefix)
+      end
+
+      def find_all_paths(items, prefix, key: nil, &block)
+        new(items, key, &block).find_all_paths(prefix)
+      end
+
+      def resolve_path(items, prefix, key: nil, &block)
+        new(items, key, &block).resolve_path(prefix)
+      end
+    end
+
+    attr_reader :original_items, :key, :block
+
+    def initialize(items, key = nil, &block)
+      @original_items = items
+      @key = key
+      @block = block
+    end
+
+    def all_items(key = nil, &block)
+      use_key = key.nil? && !block_given? ? @key : key
+      use_block = key.nil? && !block_given? ? @block : block
+
+      @all_items_cache ||= {}
+      cache_key = [use_key, use_block].hash
+
+      @all_items_cache[cache_key] ||= original_items.map { |item|
+        Item.new(
+          item: item,
+          extracted_item: extract(item, use_key, &use_block),
+          key: use_key,
+          block: use_block
+        )
+      }
+    end
+
+    def search(prefix, key = nil, &block)
+      Result.new(
+        matcher: self,
+        all_items: all_items(key, &block),
+        prefix: prefix,
+        key: key || @key,
+        block: block || @block
+      )
+    end
+
+    def find(prefix, key = nil, &block)
+      search(prefix, key, &block)
+    end
+
+    def find_all(prefix, key = nil, &block)
+      search(prefix, key, &block)
+    end
+
+    def resolve(prefix, key = nil, &block)
+      search(prefix, key, &block)
+    end
+
+    def find_path(prefix, key = nil, &block)
+      search_path(prefix, key, &block)
+    end
+
+    def find_all_paths(prefix, key = nil, &block)
+      search_path(prefix, key, &block)
+    end
+
+    def resolve_path(prefix, key = nil, &block)
+      search_path(prefix, key, &block)
+    end
+
+    def search_path(prefix, key = nil, &block)
+      PathResult.new(
+        matcher: self,
+        all_items: all_items(key, &block),
+        prefix: prefix,
+        key: key || @key,
+        block: block || @block
+      )
+    end
+
+    private
+
+    def matches?(item, prefix)
+      item.to_s.start_with?(prefix.to_s)
+    end
+
+    def extract(item, key = nil, &block)
+      return block.call(item) if block
+      return item.send(key) if key
+      item
+    end
+
     class Item
       attr_reader :item, :extracted_item, :key, :block
 
@@ -130,112 +237,5 @@ class Hiiro
         matches.first
       end
     end
-
-    class << self
-      def find(items, prefix, key: nil, &block)
-        new(items, key, &block).find(prefix)
-      end
-
-      def find_all(items, prefix, key: nil, &block)
-        new(items, key, &block).find_all(prefix)
-      end
-
-      def resolve(items, prefix, key: nil, &block)
-        new(items, key, &block).resolve(prefix)
-      end
-
-      def find_path(items, prefix, key: nil, &block)
-        new(items, key, &block).find_path(prefix)
-      end
-
-      def find_all_paths(items, prefix, key: nil, &block)
-        new(items, key, &block).find_all_paths(prefix)
-      end
-
-      def resolve_path(items, prefix, key: nil, &block)
-        new(items, key, &block).resolve_path(prefix)
-      end
-    end
-
-    attr_reader :original_items, :key, :block
-
-    def initialize(items, key = nil, &block)
-      @original_items = items
-      @key = key
-      @block = block
-    end
-
-    def all_items(key = nil, &block)
-      use_key = key.nil? && !block_given? ? @key : key
-      use_block = key.nil? && !block_given? ? @block : block
-
-      @all_items_cache ||= {}
-      cache_key = [use_key, use_block].hash
-
-      @all_items_cache[cache_key] ||= original_items.map { |item|
-        Item.new(
-          item: item,
-          extracted_item: extract(item, use_key, &use_block),
-          key: use_key,
-          block: use_block
-        )
-      }
-    end
-
-    def search(prefix, key = nil, &block)
-      Result.new(
-        matcher: self,
-        all_items: all_items(key, &block),
-        prefix: prefix,
-        key: key || @key,
-        block: block || @block
-      )
-    end
-
-    def find(prefix, key = nil, &block)
-      search(prefix, key, &block)
-    end
-
-    def find_all(prefix, key = nil, &block)
-      search(prefix, key, &block)
-    end
-
-    def resolve(prefix, key = nil, &block)
-      search(prefix, key, &block)
-    end
-
-    def find_path(prefix, key = nil, &block)
-      search_path(prefix, key, &block)
-    end
-
-    def find_all_paths(prefix, key = nil, &block)
-      search_path(prefix, key, &block)
-    end
-
-    def resolve_path(prefix, key = nil, &block)
-      search_path(prefix, key, &block)
-    end
-
-    def search_path(prefix, key = nil, &block)
-      PathResult.new(
-        matcher: self,
-        all_items: all_items(key, &block),
-        prefix: prefix,
-        key: key || @key,
-        block: block || @block
-      )
-    end
-
-    private
-
-    def matches?(item, prefix)
-      item.to_s.start_with?(prefix.to_s)
-    end
-
-    def extract(item, key = nil, &block)
-      return block.call(item) if block
-      return item.send(key) if key
-      item
-    end
   end
 end

data/lib/hiiro/version.rb

@@ -1,3 +1,3 @@
 class Hiiro
-  VERSION = "0.1.57"
+  VERSION = "0.1.58"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hiiro
 version: !ruby/object:Gem::Version
-  version: 0.1.57
+  version: 0.1.58
 platform: ruby
 authors:
 - Joshua Toyota