mobj 1.7.1 → 1.7.3

data/README.md

@@ -20,7 +20,8 @@ Fine.
 This is really the most useful part of the entire library, when you get right down to it.
 String is given a method called "tokenize" that allows it's contents to be split up into
 a structured path of tokens.  This tokenized path can then be used to do some pretty amazing
-things in terms of walking through arbitrarily complex trees of data.
+things in terms of walking through arbitrarily complex trees of data.  There's a convenience method
+on String called "walk" that handles this all for you.
 
 For example, given this object:
 
@@ -28,14 +29,16 @@ For example, given this object:
 obj = {
     name: { first: "Joe", last: "Smith" },
     ids: [ 1, 3, 5, 16, 941, 13, 100, 3, 0, 104 ],
-    auth_tokens: [ { provider: { name: "example.com", id:123 }, token: { auth: "123456", expire: "10-20-2012" } },
-                   { provider: { name: "site.com", id:265 },    token: { authentication_token: "891011", date: "10-20-2013" } }
+    auth_tokens: [ { provider: { name: "example.com", id:123 },
+                     token: { auth: "123456", expire: "10-20-2012" } },
+                   { provider: { name: "site.com", id:265 },
+                     token: { authentication_token: "891011", date: "10-20-2013" } }
     ],
     primary_key: { path: "auth_tokens.provider" }
 }
 ```
 
-...  Easily traverse it's data using rules embedded into a simple string, like so:
+Easily traverse it's data using rules embedded into a simple string, like so:
 
 ```ruby
 # Walk a simple object path:
@@ -47,10 +50,10 @@ obj = {
 #=> ["Joe", "Smith"]
 
 # Or indexes (and ranges) in an array:
-"ids[1, 3, 5 - 7, 9+]".walk(obj)
+"ids[1, 3, 5..7, 9+]".walk(obj)
 #=> [3, 16, 13, 100, 3, 104]
 
-# Use regular expressions or method calls as selection keys:
+# Use regular expressions or even method calls as selection keys:
 "auth_tokens.token./^auth/.*to_i".walk(obj)
 #=> [ 123456, 891011 ]
 
@@ -148,7 +151,7 @@ hash.unknown?
 #=> True
 ```
 
-Matching stuff
+Matching stuff:
 
 ```ruby
 match = "Joe Bob".match(/(?<first_name>\w+) (?<first_name>)/)

data/lib/mobj.rb

@@ -261,15 +261,33 @@ module Mobj
       end
     end
 
-
-
     def find(obj, match)
       if obj.is_a?(Array)
         obj.map do |child|
           find(child, match)
         end
       elsif obj.respond_to?(:keys)
-        obj.keys.map { |key| key if key.match(match) }.compact.map{|key| obj[key] }
+        found = obj.keys.each.with_object({}) { |key, fnd|
+          m = key.to_s.match(match)
+          fnd[key] = m if m
+        }
+
+        flat = found.values.flat_map(&:captures).empty?
+
+        found.each.with_object(flat ? [] : {}) { |(key, m), map|
+          if map.is_a?(Array)
+            map << obj[key]
+          else
+            named = m.to_hash.invert
+            name = if named.empty?
+              m.captures.empty? ? key : m.captures.sequester
+            else
+              named.find { |k, v| !k.nil? }.attempt(key).last
+            end
+            map[name] = obj[key]
+          end
+        }
+
       end
     end
 
@@ -301,7 +319,6 @@ module Mobj
                 @path.map { |token| token.walk(obj, root) }
               when :lookup
                 lookup = @path.walk(obj)
-                puts "lookup '#{lookup}':#{obj}:#{@path}"
                 if lookup.is_a?(Array)
                   lookup.flatten.map { |lu| lu.tokenize.walk(root) }.flatten(1)
                 else
@@ -335,9 +352,7 @@ module Mobj
       matches
     end
 
-    def walk(obj)
-      tokenize.walk(obj)
-    end
+    def walk(obj) tokenize.walk(obj) end
 
     def tokenize
       tokens = []
@@ -361,9 +376,9 @@ module Mobj
         elsif match.up?
           tokens << Token.new(:up)
         elsif match.path?
-          eachs = match.path.split(",")
-          ors = match.path.split("|")
-          ands = match.path.split("&")
+          eachs = match.path.split(/\s*,\s*/)
+          ors = match.path.split(/\s*\|\s*/)
+          ands = match.path.split(/\s*\&\s*/)
           if eachs.size > 1
             tokens << Token.new(:each, eachs.map { |token| token.tokenize() })
           elsif ands.size > 1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mobj
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.7.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-21 00:00:00.000000000 Z
+date: 2012-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec