hpath 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e1f0a047d687a7f9cb64a837e1d21f828bdd0669
-  data.tar.gz: 28436f6c1f1ac651a86538ac62f18dc26a5a6868
+  metadata.gz: ae758397369c5c2d912cd7a10b7377683709574d
+  data.tar.gz: e55ba308d80557c51374868351b2a74c65abc61c
 SHA512:
-  metadata.gz: d4c027c8649247847b822779fe2e7eea12a10d6261deb1a919ffe40724f3c62271c7dea7c40023558142224ca0db4e1f5808c32e9b3c8f567f9fd6ab6702eb6d
-  data.tar.gz: f8a946b78d622f3a5b509177a8f040acb0043718fd88705552668c65272878ec61c1560cc6359466575d265854d5cb5548ab680f6d834ea7cd345d9c0b214e57
+  metadata.gz: 4fd4f632561c47eb0518b37b28ee9b1d4fcac108ba9f2758378128c7921f1f5ddf957fa9d33651ab2f50afb4c36c996b2df01b21bfa61cbcb074a102b3285ca5
+  data.tar.gz: 6dd7f7123466bebc8dcbdbdb96b6272f6ca29568f565bf4a5a1aeddca53701fb6e84dbab3e073552b5dcbe77487cf799b6e8ea81826fb942f319c543d8505601

data/lib/hpath.rb

@@ -93,15 +93,17 @@ module Hpath
       if identifier.to_s == "*"
         object
       else
-        object.map do |element|
+        mapped_object = object.map do |element|
           if element.is_a?(Hash)
             element[identifier.to_s] || element[identifier.to_sym] 
           elsif element.respond_to?(identifier)
             element.send(identifier)
           else
-            raise "Cannot apply identifier to collection object!"
+            nil
           end
-        end
+        end.compact.flatten(1)
+
+        mapped_object unless mapped_object.empty?
       end
     elsif object.is_a?(Hash)
       if identifier.to_s == "*"

data/lib/hpath/parser.rb

@@ -35,7 +35,7 @@ class Hpath::Parser
       rule(:space?) { space.maybe }
 
       rule(:key_value_filter) {
-        space? >> match['a-zA-Z'].repeat(1).maybe.as(:key) >> (str("<") | str(">") | str("=").repeat(1,3)).as(:operator) >> match['a-zA-Z0-9'].repeat(1).as(:value) >> space?
+        space? >> match['0-9a-zA-Z@_'].repeat(1).maybe.as(:key) >> (str("<") | str(">") | str("=").repeat(1,3)).as(:operator) >> match['a-zA-Z0-9'].repeat(1).as(:value) >> space?
       }
 
       rule(:or_filter) {

data/lib/hpath/version.rb

@@ -1,3 +1,3 @@
 module Hpath
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/spec/hpath_spec.rb

@@ -1,3 +1,5 @@
+require "some_more_complex_hpath_tests"
+
 describe Hpath do
   describe "#get" do
     describe "returns the corresponding value from the given object" do

data/spec/some_more_complex_hpath_tests.rb

@@ -0,0 +1,110 @@
+describe Hpath do
+  describe "#get" do
+    let(:object) do
+      {
+        hello: "world",
+        empty_array: [],
+        empty_hash: [],
+        "string_key" => "foobar",
+        some: {
+          really: [
+            {
+              nested: [
+                {
+                  structure: "hello"
+                },
+                {
+                  structure: "world"
+                }
+              ]
+            }
+          ]
+        },
+        foo: [
+          {
+            bar: 1
+          },
+          {
+            bar: 2
+          }
+        ],
+        arr_of_arrs: [
+          [ [1,2] , [3,4,5] ],
+          [ 6,7 ],
+          8
+        ],
+        fields: [
+         {"@tag"=>"020",
+          "@ind1"=>"a",
+          "@ind2"=>"1",
+          "subfield"=>
+           [{"@code"=>"a", "$"=>"2468492-2"},
+            {"@code"=>"b", "$"=>"DNB"}]},
+         {"@tag"=>"025",
+          "@ind1"=>"a",
+          "@ind2"=>"1",
+          "subfield"=>{"@code"=>"a", "$"=>"991563239"}},
+         {"@tag"=>"025",
+          "@ind1"=>"z",
+          "@ind2"=>"1",
+          "subfield"=>{"@code"=>"a", "$"=>"2468492-2"}},
+         {"@tag"=>"025",
+          "@ind1"=>"o",
+          "@ind2"=>"1",
+          "subfield"=>{"@code"=>"a", "$"=>"645481530"}},
+         {"@tag"=>"026",
+          "@ind1"=>"-",
+          "@ind2"=>"1",
+          "subfield"=>{"@code"=>"a", "$"=>"ZDB2468492-2"}},
+        ]
+      }
+    end
+
+    it "returns elements which match the given path" do
+      expect(described_class.get(object, "/hello")).to eq("world")
+      expect(described_class.get(object, "/empty_array")).to eq([])
+      expect(described_class.get(object, "/empty_hash")).to eq([])
+      expect(described_class.get(object, "/foo")).to eq([{:bar=>1}, {:bar=>2}])
+      expect(described_class.get(object, "/foo[0]")).to eq({:bar=>1})
+      expect(described_class.get(object, "/foo[1]")).to eq({:bar=>2})
+      expect(described_class.get(object, "/foo[]/bar")).to eq([1,2])
+      expect(described_class.get(object, "/arr_of_arrs[0]/[1]/[2]")).to eq(5)
+      expect(described_class.get(object, "/some/really[]/nested[]/structure")).to eq(["hello", "world"])
+      expect(described_class.get(object, "/arr_of_arrs[0]")).to eq([[1, 2], [3, 4, 5]])
+    end
+
+    it "returns nil if the path is invalid" do
+      expect(described_class.get(object, "/hello_world")).to eq(nil)
+      expect(described_class.get(object, "/foo[3]")).to eq(nil)
+      expect(described_class.get(object, "/foo[]/bar/muff")).to eq(nil)
+    end
+
+    it "allows searching for hashes by specifying key=value" do
+      expect(described_class.get(object, "/fields/*[@tag=025|@tag=026]")).to eq(
+        [{"@tag"=>"025",
+          "@ind1"=>"a",
+          "@ind2"=>"1",
+          "subfield"=>{"@code"=>"a", "$"=>"991563239"}},
+         {"@tag"=>"025",
+          "@ind1"=>"z",
+          "@ind2"=>"1",
+          "subfield"=>{"@code"=>"a", "$"=>"2468492-2"}},
+         {"@tag"=>"025",
+          "@ind1"=>"o",
+          "@ind2"=>"1",
+          "subfield"=>{"@code"=>"a", "$"=>"645481530"}},
+         {"@tag"=>"026",
+          "@ind1"=>"-",
+          "@ind2"=>"1",
+          "subfield"=>{"@code"=>"a", "$"=>"ZDB2468492-2"}}]
+      )
+    end
+  end
+
+  describe "#set" do
+    it "sets the objects value according to path and value" do
+      described_class.set(object = {}, "/foo[]/bar", [1,2,3])
+      expect(object).to eq({:foo=>[{:bar=>[1, 2, 3]}]})
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hpath
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Michael Sievers
@@ -92,6 +92,7 @@ files:
 - spec/hpath/filter_spec.rb
 - spec/hpath/parser_spec.rb
 - spec/hpath_spec.rb
+- spec/some_more_complex_hpath_tests.rb
 - spec/spec_helper.rb
 homepage: https://github.com/hpath/hpath-ruby
 licenses:
@@ -121,4 +122,5 @@ test_files:
 - spec/hpath/filter_spec.rb
 - spec/hpath/parser_spec.rb
 - spec/hpath_spec.rb
+- spec/some_more_complex_hpath_tests.rb
 - spec/spec_helper.rb