glob 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1364c317c2dde1a64f6f201956383cd023185d64349b101e8d167326701cc4fa
-  data.tar.gz: 76c07526698da02bb9792d29f3bafaa170fe03750f5bd335f7f80efb06114167
+  metadata.gz: daa19b4757ede88d7bc2ff99732f6e0a42b33608fbbef748c21c18f73a01538c
+  data.tar.gz: c8ee66c99f7ce11218ff7fc4031ad0a53e8fe7afb9eaa0de8b9220be92c88690
 SHA512:
-  metadata.gz: 4fcc6b11d949bb8e941794c39b6e83efc39c7fd94be7d51a2314d3b50cd7afe680448759cd28c6abe17f4f8566ba5ff31332c0806a014b1c1f4fa8a490117332
-  data.tar.gz: 5a15abeb7a6a9845fb00563f4b7ef5a53e0d432ca92f6fc239315ba38bd76fa84e1f68f9128c3aeec94834df1a2a94b50d32b3e929021af004fe1fbaab32d256
+  metadata.gz: 56d9f2f4ba26236f4ce29c51a806c6a158c5576222ab2ccc7d801423a6be0ae759ef2b8db21f465d03de2f97aac4b2b7de0a21dcc9d35ceaa74397e720783014
+  data.tar.gz: 8ebc481895cc295261e1914b690ccd4b3807419564c833e258a9efccabf8f2ead910e599007e663227821ca7d03ced3dae9dc491608c832f8e0886956dce579a

data/CHANGELOG.md

@@ -11,6 +11,14 @@ Prefix your message with one of the following:
 - [Security] in case of vulnerabilities.
 -->
 
+## v0.3.1 - 2022-09-01
+
+- [Fixed] Handle keys with dots properly by using `\\.` as a escape sequence.
+
+## v0.3.0 - 2022-08-01
+
+- [Added] Patterns can have groups like in `{a,b}.*`.
+
 ## v0.2.2 - 2022-02-01
 
 - [Fixed] Properly handle numeric keys.

data/README.md

@@ -72,6 +72,38 @@ glob.to_h
 
 Notice that the return result will have symbolized keys.
 
+If the contains dots, then the result will use `\\.` as the escape sequence.
+Similarly, you need to escape keys with dots when filtering results.
+
+```ruby
+glob = Glob.new(
+  formats: {
+    ".txt" => "Text",
+    ".json" => "JSON",
+    ".rb" => "Ruby"
+  }
+)
+
+glob << "*"
+
+glob.paths
+#=> ["formats.\\.json", "formats.\\.rb", "formats.\\.txt"]
+
+glob.to_h
+#=> {:formats=>{:".json"=>"JSON", :".rb"=>"Ruby", :".txt"=>"Text"}}
+
+# Remove all existing matchers
+glob.matchers.clear
+
+glob << "formats.\\.rb"
+
+glob.paths
+#=> ["formats.\\.rb"]
+
+glob.to_h
+#=> {:formats=>{:".rb"=>"Ruby"}}
+```
+
 ## Maintainer
 
 - [Nando Vieira](https://github.com/fnando)

data/lib/glob/map.rb

@@ -13,15 +13,19 @@ module Glob
 
     def call
       @target
-        .map {|(key, value)| compute(value, key) }
+        .map {|(key, value)| compute(value, escape(key)) }
         .flatten
         .sort
     end
 
+    private def escape(key)
+      key.to_s.gsub(".", "\\.")
+    end
+
     private def compute(value, path)
       if value.is_a?(Hash)
         value.map do |key, other_value|
-          compute(other_value, "#{path}.#{key}")
+          compute(other_value, "#{path}.#{escape(key)}")
         end
       else
         path.to_s

data/lib/glob/query.rb

@@ -18,7 +18,7 @@ module Glob
       symbolized_target = SymbolizeKeys.call(@target)
 
       paths.each_with_object({}) do |path, buffer|
-        segments = path.split(".").map(&:to_sym)
+        segments = path.split(/(?<!\\)\./).map {|key| unescape(key).to_sym }
         value = symbolized_target.dig(*segments)
         set_path_value(segments, buffer, value)
       end
@@ -41,6 +41,10 @@ module Glob
       @map ||= Map.call(@target)
     end
 
+    private def unescape(key)
+      key.to_s.gsub(/\\\./, ".")
+    end
+
     private def set_path_value(segments, target, value)
       while (segment = segments.shift)
         if segments.empty?

data/lib/glob/version.rb

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

data/test/glob_test.rb

@@ -220,4 +220,24 @@ class GlobTest < Minitest::Test
 
     assert_equal expected, glob.paths
   end
+
+  test "with keys that contain dots" do
+    data = {
+      "keys.with.dots" => "dots",
+      node: {
+        "more.keys.with.dots" => "more dots"
+      }
+    }
+
+    glob = Glob.new(data)
+
+    glob << "*"
+
+    assert_equal %w[keys\\.with\\.dots node.more\\.keys\\.with\\.dots],
+                 glob.paths
+    assert_equal Glob::SymbolizeKeys.call(data), glob.to_h
+
+    assert_equal ({node: {"more.keys.with.dots": "more dots"}}),
+                 Glob.filter(data, ["node.more\\.keys\\.with\\.dots"])
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glob
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Nando Vieira
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-08-01 00:00:00.000000000 Z
+date: 2022-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -152,10 +152,10 @@ metadata:
   rubygems_mfa_required: 'true'
   homepage_uri: https://github.com/fnando/glob
   bug_tracker_uri: https://github.com/fnando/glob/issues
-  source_code_uri: https://github.com/fnando/glob/tree/v0.3.0
-  changelog_uri: https://github.com/fnando/glob/tree/v0.3.0/CHANGELOG.md
-  documentation_uri: https://github.com/fnando/glob/tree/v0.3.0/README.md
-  license_uri: https://github.com/fnando/glob/tree/v0.3.0/LICENSE.md
+  source_code_uri: https://github.com/fnando/glob/tree/v0.3.1
+  changelog_uri: https://github.com/fnando/glob/tree/v0.3.1/CHANGELOG.md
+  documentation_uri: https://github.com/fnando/glob/tree/v0.3.1/README.md
+  license_uri: https://github.com/fnando/glob/tree/v0.3.1/LICENSE.md
 post_install_message:
 rdoc_options: []
 require_paths: