structurematch 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 99e88855ccc4edb6ae03e0f7b6679d1cf40e253b
-  data.tar.gz: d1cb943a7475bc63a326f6d1d7d4402bffbb0185
+  metadata.gz: 2cfd5cfc6816e1ea70a82090af67a80c0b6fbbbf
+  data.tar.gz: 8fd9c2f1918f7a6620b07deb8042b1a51b3fb5cf
 SHA512:
-  metadata.gz: 767925436ade0b040cdf96559a95db0e9b8eea1dda4077d7ebd8f9c8d12c4fc95cf2eeee9fd67a1b2b9408a1680bdb21ab95e5a30c7f106058d87aebd0fa63c2
-  data.tar.gz: 4d67cb27f30897e3997b8ed8658f7f38b3722301b04aaf601d6bea6fe6e910013c144741a88905ee26a7aa441b10829f3be4e78280c1ca934e824f631f5c3f4d
+  metadata.gz: 10374c45fe240c076abcb076a045b1001e8ec45241890106ed9a9f5b49ccf3d805e346195135452f8d2799e8482598e910a8f4b33e553c7282d091eb31e6a2e7
+  data.tar.gz: 5f9ad1ebf6e544c613572c34e14b890bf7f478f401732d69d551d9ec0ab7b351aca7ffa1057bb4a7687c7d5c44b73ebeca8e82218a7e5e7d9954ac44fc5a75ce

data/lib/structurematch.rb

@@ -46,7 +46,7 @@ class StructureMatch
       case @op
       when "and","or"
         raise "#{op.inspect} match key must be an array of submatches" unless @match.kind_of?(Array)
-        @match.map!{|m|Comparator.new(@match)}
+        @match.map!{|m|Comparator.new(m)}
       when "not"
         @match = Comparator.new(@match)
       when "range"
@@ -66,9 +66,9 @@ class StructureMatch
     #       comparisons performed by member (which returns the set intersection of the arrays)
     def test(v=true)
       case @op
-      when "and" then [_t(@match.all?{|m|m.test(v)[0]}),v]
-      when "or" then [_t(@match.any?{|m|m.test(v)[0]}),v]
-      when "not" then [_t(!@match.test(v)[0]),v]
+      when "and" then [_t(@match.all?{|m|m.test(v)[0] > 0}),v]
+      when "or" then [_t(@match.any?{|m|m.test(v)[0] > 0}),v]
+      when "not" then [_t(@match.test(v)[0] < 0),v]
       when "range" then [_t(@match === v),v]
       when "regex"
         r = @match.match(v)
@@ -82,10 +82,10 @@ class StructureMatch
         end
       when "==" then [_t(@match == v),v]
       when "!=" then [_t(@match != v),v]
-      when ">" then [_t(@match > v),v]
-      when "<" then [_t(@match < v),v]
-      when ">=" then [_t(@match >= v),v]
-      when "<=" then [_t(@match <= v),v]
+      when ">" then [_t(v > @match),v]
+      when "<" then [_t(v < @match),v]
+      when ">=" then [_t(v >= @match),v]
+      when "<=" then [_t(v <= @match),v]
       else
         raise "Comparator cannot handle #{@op}"
       end
@@ -165,7 +165,7 @@ class StructureMatch
         binds[k] = res if offset > 0
       when v.kind_of?(StructureMatch)
         res,offset = v.bind(val[k])
-        binds[k] = v
+        binds[k] = res unless res.empty?
       else
         raise "StructureMatch.bind: No idea how to handle #{v.class.name}: #{v.inspect}"
       end
@@ -174,9 +174,29 @@ class StructureMatch
     [binds,score]
   end
 
+  # As bind, but transforms the nested hash into a flat hash with nested keys
+  # joined by sep.
+  def flatbind(val, sep='.')
+    binds,score = bind(val)
+    target = Hash.new
+    prefix = ''
+    _flatbind = lambda do |vals,p|
+      vals.each do |k,v|
+        key = p.empty? ? k : "#{p}#{sep}#{k.to_s}"
+        if v.kind_of?(Hash)
+          _flatbind.call(v,key)
+        else
+          target[key] = v
+        end
+      end
+    end
+    _flatbind.call(binds,"")
+    [target,score]
+  end
+
   # Runs bind on val and returns just the score component.
   def score(val)
     bind(val)[1]
   end
-
+  
 end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: structurematch
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Victor Lowther
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-25 00:00:00.000000000 Z
+date: 2014-08-27 00:00:00.000000000 Z
 dependencies: []
-description: A library for ferforming structural and semantic matching on JSON
+description: A library for performing structural and semantic matching on JSON
 email: victor.lowther@gmail.com
 executables: []
 extensions: []