patrun 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a552276944c28770e97035adabe76cb38332489
-  data.tar.gz: 651c5a0732b33481159413c8e74c91985092708b
+  metadata.gz: 843bee096a13b8e5b761157a25924626508843b8
+  data.tar.gz: cc3f27186fdd5bd4b86e033e2078ac9b38ce4181
 SHA512:
-  metadata.gz: 4afd8163e39836f303d037928e2c891dbe9528223ee2bdad1ec31bd0f9f22a708790e393aba63fe3eb1895e5176dc0e674c7e24e7dacfe704498e2b03d149290
-  data.tar.gz: 4b3dcae0a76b89bcbb2efa3db29352e0243a35547fa16489d967ceb918fcde4347e910e0a91c974f01c616c9037644c4cb3551d103c1148037d2a4ed97a1fa60
+  metadata.gz: bf36e705222405c09f899dcc7b7a955f9e5284649b8e3aa126b18dcaca8eacfc12152a66c6fda968c5842357a6072f246d3e162403295fbff15b2c5a01ddfe46
+  data.tar.gz: 52947b305350bda7dd30b04574d62c7b4449d0e67330d46cef51303ad8200587b6b05d2680305598262e38afcb2e8cf52845f83f823544f6b96afbed0d818c2c

data/README.md

@@ -29,7 +29,7 @@ It's basically _query-by-example_ for property sets.
 If you're using this library, feel free to contact me on twitter if you have any questions! :) [@colmharte](http://twitter.com/colmharte)
 
 
-Current Version: 0.1.1
+Current Version: 0.1.2
 
 Tested on: Ruby 2.0.0p481
 
@@ -280,13 +280,18 @@ pm = Patrun.new()
   .add({:a => 1, :b => 1},'B1')
   .add({:a => 1, :b => 2},'B2')
 
-# finds nothing: []
+# finds:
+# [ { match: { :a => '1', :b => '1' }, :data => 'B1' },
+#   { match: { :a => '1', :b => '2' }, :data => 'B2' } ]
 puts pm.list({:a => 1})
 
 # finds:
 # [ { match: { :a => '1', :b => '1' }, :data => 'B1' },
 #   { match: { :a => '1', :b => '2' }, :data => 'B2' } ]
 puts pm.list({:a => 1, :b => '*'})
+
+# finds nothing: []
+puts pm.list({:c => 1})
 ```
 
 If you provide no pattern argument at all, _list_ will list all patterns that have been added.

data/lib/patrun.rb

@@ -12,7 +12,7 @@ class Patrun
       customizer = @custom.call(self, pat, data)
     end
 
-    pat = pat.inject({}){|memo,(k,v)| memo[k.to_sym] = v; memo}
+    pat = pat.inject({}){|memo,(k,v)| memo[k.to_sym] = v.to_s; memo}
 
     keys = pat.keys.sort()
 
@@ -78,12 +78,12 @@ class Patrun
 
   def find(pat, exact = false)
 
-    pat = pat.inject({}){|memo,(k,v)| memo[k.to_sym] = v; memo}
-
     if nil == pat
       return nil
     end
 
+    pat = pat.inject({}){|memo,(k,v)| memo[k.to_sym] = v.to_s; memo}
+
     keymap    = @top
     data      = @top[:d] || nil
     finalfind = @top[:f]
@@ -125,7 +125,7 @@ class Patrun
     end
 
     # special case for default with no properties
-    if nil == data && 0 == patlen && nil != top[:d]
+    if nil == data && 0 == patlen && nil != @top[:d]
       data      = top[:d]
       finalfind = top[:f]
     end
@@ -142,11 +142,14 @@ class Patrun
   end
 
   def remove(pat)
+
     keymap = @top
     data = nil
     key = nil
     path = []
 
+    pat = pat.inject({}){|memo,(k,v)| memo[k.to_sym] = v.to_s; memo}
+
     loop do
       key = keymap[:k]
 
@@ -188,15 +191,16 @@ class Patrun
     acc = []
 
     if @top[:d]
-
-      acc.push({:match => {},
-                :data => @top[:d],
-                :find => top[:f]
-      })
+      item = {:match => {},
+                :data => @top[:d]}
+      if @top[:f] != nil
+        item[:find] = @top[:f]
+      end
+      acc.push(item)
     end
 
     if pat != nil
-      pat = pat.inject({}){|memo,(k,v)| memo[k.to_sym] = v; memo}
+      pat = pat.inject({}){|memo,(k,v)| memo[k.to_sym] = v.to_s; memo}
     end
     descend(pat, exact, @top, {}, merge({}, pat), acc)
 
@@ -225,11 +229,11 @@ class Patrun
 
 
   def inspect
-    this.toString()
+    self.toString()
   end
 
 
-  def toJSON(indent)
+  def toJSON()
 
     @top.to_json()
 
@@ -240,7 +244,7 @@ class Patrun
 
 
   def indent(o,d)
-    for i in 0..d
+    d.times do
       o.push(' ')
     end
   end
@@ -273,11 +277,14 @@ class Patrun
             nextkeymap &&
             nextkeymap[:d]
 
-            acc.push({
-              :match => valitermatch,
-              :data => nextkeymap[:d],
-              :find => nextkeymap[:f]
-            })
+            item = {:match => valitermatch,
+              :data => nextkeymap[:d]}
+
+            if nextkeymap[:f] != nil
+              item[:find] = nextkeymap[:f]
+            end
+
+            acc.push(item)
           end
 
           if nextkeymap && nextkeymap[:v]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: patrun
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Colm Harte