glob 0.3.1 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: daa19b4757ede88d7bc2ff99732f6e0a42b33608fbbef748c21c18f73a01538c
-  data.tar.gz: c8ee66c99f7ce11218ff7fc4031ad0a53e8fe7afb9eaa0de8b9220be92c88690
+  metadata.gz: 0a7c2fc46f05a01010dc0b3d6541528e3ec339103adcdda5621265cbd10c0b77
+  data.tar.gz: c335a9778db574f36d1a3c0da2119f42ddec83b91e2d7024b4d265122149e493
 SHA512:
-  metadata.gz: 56d9f2f4ba26236f4ce29c51a806c6a158c5576222ab2ccc7d801423a6be0ae759ef2b8db21f465d03de2f97aac4b2b7de0a21dcc9d35ceaa74397e720783014
-  data.tar.gz: 8ebc481895cc295261e1914b690ccd4b3807419564c833e258a9efccabf8f2ead910e599007e663227821ca7d03ced3dae9dc491608c832f8e0886956dce579a
+  metadata.gz: 756f0564e9e192ce4c975bfdfcd299acffceab70f47b4e34c49d3180cc0887e6933a0b87ee3583ac37fadd3401e420b0e43f7e8776f072b8ae91e154b51b3adc
+  data.tar.gz: ba1fe966b7cfef2f0d8d78e417132ea1b60466b4732002519bd398822115fe8751e7d8525050cee72be3f4375320861240510a2fb75deb4eb3ba7aa7bd605f71

data/.github/workflows/ruby-tests.yml

@@ -19,12 +19,12 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: ["2.7", "3.0", "3.1"]
+        ruby: ["3.0", "3.1", "3.2", "3.3"]
         gemfile:
           - Gemfile
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - uses: actions/cache@v3
         with:

data/CHANGELOG.md

@@ -11,6 +11,15 @@ Prefix your message with one of the following:
 - [Security] in case of vulnerabilities.
 -->
 
+## v0.4.1 - 2024-01-03
+
+- [Fixed] Fix partial matching when not using `*`.
+
+## v0.4.0 - 2022-12-05
+
+- [Changed] `Glob::Query` has been renamed to `Glob::Object`.
+- [Added] Allow adding new keys with `glob.set(path, value)`.
+
 ## v0.3.1 - 2022-09-01
 
 - [Fixed] Handle keys with dots properly by using `\\.` as a escape sequence.

data/README.md

@@ -72,7 +72,7 @@ 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.
+If the key contain dots, then the result will use `\\.` as the escape sequence.
 Similarly, you need to escape keys with dots when filtering results.
 
 ```ruby
@@ -104,6 +104,29 @@ glob.to_h
 #=> {:formats=>{:".rb"=>"Ruby"}}
 ```
 
+You can set new keys by using `.set(path, value)`:
+
+```ruby
+glob = Glob.new
+glob << "*"
+glob.set "a.b.c", "hello"
+
+glob.to_h
+#=> {:a=>{:b=>{:c=>"hello"}}}
+
+glob.paths
+#=> ["a.b.c"]
+
+# The non-hash value will be replaced in case the new path overlaps it
+glob.set "a.b.c.d.e", "hello"
+
+glob.to_h
+#=> {:a=>{:b=>{:c=>{:d=>{:e=>"hello"}}}}}
+
+glob.paths
+#=> ["a.b.c.d.e"]
+```
+
 ## Maintainer
 
 - [Nando Vieira](https://github.com/fnando)

data/glob.gemspec

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative "./lib/glob/version"
+require_relative "lib/glob/version"
 
 Gem::Specification.new do |spec|
   spec.name    = "glob"

data/lib/glob/map.rb

@@ -7,7 +7,6 @@ module Glob
     end
 
     def initialize(target)
-      @keys = []
       @target = target
     end
 

data/lib/glob/matcher.rb

@@ -10,8 +10,9 @@ module Glob
 
       pattern = Regexp.escape(path.gsub(/^!/, ""))
                       .gsub(/(\\{.*?\\})/) {|match| process_group(match) }
-                      .gsub(/\\\*/, "[^.]+")
-      @regex = Regexp.new("^#{pattern}")
+                      .gsub("\\*", "[^.]+")
+      anchor = path.end_with?("*") ? "" : "$"
+      @regex = Regexp.new("^#{pattern}#{anchor}")
     end
 
     def match?(other)

data/lib/glob/{query.rb → object.rb}

@@ -1,7 +1,9 @@
 # frozen_string_literal: true
 
 module Glob
-  class Query
+  class Object
+    PATH_SPLIT_RE = /(?<!\\)\./.freeze
+
     attr_reader :matchers
 
     def initialize(target)
@@ -18,13 +20,20 @@ module Glob
       symbolized_target = SymbolizeKeys.call(@target)
 
       paths.each_with_object({}) do |path, buffer|
-        segments = path.split(/(?<!\\)\./).map {|key| unescape(key).to_sym }
+        segments = path.split(PATH_SPLIT_RE).map {|key| unescape(key).to_sym }
         value = symbolized_target.dig(*segments)
         set_path_value(segments, buffer, value)
       end
     end
     alias to_hash to_h
 
+    def set(path, value)
+      set_path_value(path.split(PATH_SPLIT_RE), @target, value)
+      @map = Map.call(@target)
+
+      nil
+    end
+
     def paths
       matches = map.map do |path|
         results = matchers.select {|matcher| matcher.match?(path) } # rubocop:disable Style/SelectByRegexp
@@ -42,15 +51,18 @@ module Glob
     end
 
     private def unescape(key)
-      key.to_s.gsub(/\\\./, ".")
+      key.to_s.gsub("\\.", ".")
     end
 
     private def set_path_value(segments, target, value)
+      segments = segments.dup.map(&:to_sym)
+
       while (segment = segments.shift)
         if segments.empty?
           target[segment] = value
         else
           target[segment] ||= {}
+          target[segment] = {} unless target[segment].is_a?(Hash)
           target = target[segment]
         end
       end

data/lib/glob/version.rb

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

data/lib/glob.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-require "glob/map"
-require "glob/query"
-require "glob/matcher"
-require "glob/symbolize_keys"
-require "glob/version"
+require_relative "glob/map"
+require_relative "glob/object"
+require_relative "glob/matcher"
+require_relative "glob/symbolize_keys"
+require_relative "glob/version"
 
 module Glob
   def self.filter(target, paths = ["*"])
@@ -13,7 +13,7 @@ module Glob
     glob.to_h
   end
 
-  def self.new(target)
-    Query.new(target)
+  def self.new(target = {})
+    Object.new(target)
   end
 end

data/test/glob_test.rb

@@ -3,6 +3,17 @@
 require "test_helper"
 
 class GlobTest < Minitest::Test
+  test "with partial matching" do
+    glob = Glob.new(
+      en: {editor: "editor", edit: "edit"},
+      pt: {editor: "editor", edit: "edit"}
+    )
+
+    glob << "*.edit"
+
+    assert_equal ["en.edit", "pt.edit"], glob.paths
+  end
+
   test "with rejecting filter" do
     glob = Glob.new(
       en: {
@@ -240,4 +251,40 @@ class GlobTest < Minitest::Test
     assert_equal ({node: {"more.keys.with.dots": "more dots"}}),
                  Glob.filter(data, ["node.more\\.keys\\.with\\.dots"])
   end
+
+  test "sorts set when setting new keys" do
+    data = {d: "d", a: "a", b: "b"}
+
+    glob = Glob.new(data)
+    glob << "*"
+
+    assert_equal({a: "a", b: "b", d: "d"}, glob.to_h)
+
+    glob.set("c", "c")
+    glob.set("e.b1.b2.b3", "e---b")
+    glob.set("e.a1.a2.a3", "e---a")
+
+    expected = {
+      a: "a", b: "b", c: "c", d: "d",
+      e: {a1: {a2: {a3: "e---a"}}, b1: {b2: {b3: "e---b"}}}
+    }
+
+    assert_equal(expected, glob.to_h)
+    assert_equal ["a", "b", "c", "d", "e.a1.a2.a3", "e.b1.b2.b3"], glob.paths
+  end
+
+  test "replaces existing node when setting a new path" do
+    glob = Glob.new(a: 1, b: {b1: {b2: 2}})
+    glob << "*"
+    glob.set("a.a1.a2", 4)
+    glob.set("b.b1.b2.b3", {b4: 5})
+
+    expected = {
+      a: {a1: {a2: 4}},
+      b: {b1: {b2: {b3: {b4: 5}}}}
+    }
+
+    assert_equal expected, glob.to_h
+    assert_equal ["a.a1.a2", "b.b1.b2.b3.b4"], glob.paths
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glob
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.1
 platform: ruby
 authors:
 - Nando Vieira
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-09-01 00:00:00.000000000 Z
+date: 2024-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -138,7 +138,7 @@ files:
 - lib/glob.rb
 - lib/glob/map.rb
 - lib/glob/matcher.rb
-- lib/glob/query.rb
+- lib/glob/object.rb
 - lib/glob/symbolize_keys.rb
 - lib/glob/version.rb
 - test/glob/map_test.rb
@@ -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.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
+  source_code_uri: https://github.com/fnando/glob/tree/v0.4.1
+  changelog_uri: https://github.com/fnando/glob/tree/v0.4.1/CHANGELOG.md
+  documentation_uri: https://github.com/fnando/glob/tree/v0.4.1/README.md
+  license_uri: https://github.com/fnando/glob/tree/v0.4.1/LICENSE.md
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -171,7 +171,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
 summary: Create a list of hash paths that match a given pattern. You can also generate