leenookx-json-mangler 0.1.2 → 0.2.1

data/README.rdoc

@@ -10,6 +10,7 @@ format.
 == FEATURES/PROBLEMS:
 
 * compact Compacts all duplicated branches.
+* extract Allows searching through the JSON data.
 * prune Allows removal of branches.
 
 == SYNOPSIS:
@@ -18,11 +19,13 @@ format.
 
 == REQUIREMENTS:
 
+* cucumber (only for the unit tests)
 * json
 
 == INSTALL:
 
-* sudo gem install
+* [sudo] gem sources -a http://gems.github.com
+* [sudo] gem install leenookx-json-mangler
 
 == LICENSE:
 

data/Rakefile

@@ -17,7 +17,6 @@ begin
     gemspec.description = "JSON data format mangling tools."
     gemspec.email = "lnookx@googlemail.com"
     gemspec.homepage = "http://github.com/leenookx/json-mangler"
-    gemspec.description = "TODO"
     gemspec.authors = ["lee nookx"]
   end
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.2.1

data/features/test_comparisons/2level_extraction.json

@@ -1 +1 @@
-{ "results": {"title": "A test document", "author": "My Name", "published": "1999", "keywords": ["rubbish", "nonsense"]} }
+{ "results": {"doc": {"title": "A test document", "author": "My Name", "published": "1999", "keywords": ["rubbish", "nonsense"]}  } }

data/json-mangler.gemspec

@@ -5,12 +5,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{json-mangler}
-  s.version = "0.1.2"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["lee nookx"]
-  s.date = %q{2009-08-30}
-  s.description = %q{TODO}
+  s.date = %q{2009-08-31}
+  s.description = %q{JSON data format mangling tools.}
   s.email = %q{lnookx@googlemail.com}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -51,11 +51,10 @@ Gem::Specification.new do |s|
      "lib/json-mangler/json_mangler.rb",
      "test/test_json_mangler.rb"
   ]
-  s.has_rdoc = true
   s.homepage = %q{http://github.com/leenookx/json-mangler}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.1}
+  s.rubygems_version = %q{1.3.4}
   s.summary = %q{JSON data format mangling tools.}
   s.test_files = [
     "test/test_json_mangler.rb"
@@ -63,7 +62,7 @@ Gem::Specification.new do |s|
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 2
+    s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
     else

data/lib/json-mangler/json_extractor.rb

@@ -59,43 +59,68 @@ class JSONExtractor
     def parse_object
         if @input.scan(/\{\s*/)
             output = ""
+            start_pos = @input.pos
             more_pairs = false
             capture = false
             while key = parse_string
                 @input.scan(/\s*:\s*/) or error("Expecting object separator")
 
+                # If we're in object matching mode and we've found an object
+                # that matches the one we're looking for...
                 if @mode == 1 and key == @searchval
                     capture = true
                 end
 
                 res = parse_value
 
+                # If we're in data matching mode and the data associated
+                # will this object matches what we are looking for...
                 if @mode == 2 and res == @searchval
-                    @current_depth = @capture_depth
-                    @force_capture = true
-                end
+                    if @capture_depth > 0
+                        # Set the 'upward' depth to be captured.
+                        @current_depth = @capture_depth
 
-                if @capture_depth > 0
-                    output << key << ": " << res.to_s
+                        # Force the capturing of this object.
+                        @force_capture = true
+                    else
+                        capture = true
+                    end
                 end
 
-                if @force_capture or (@mode == 1 and key == @searchval and capture)
-                    if @capture_depth == 0
-                        output << key << ": " << res
-                    end
+                if !@force_capture and capture
+                    @output << key << ": " << res.to_s
+
+                    # We've stopped capturing locally...
                     capture = false
-                    if @current_depth == 0
-                      @output << output
-                      @force_capture = false
-                    else
-                        @current_depth = @current_depth - 1
-                    end
                 end
 
-                more_pairs = @input.scan(/\s*,\s*/) or break
+                # Handle special case of array match
+                if @force_capture 
+                    if @current_depth == -1
+                        @output << key << ": " << res.to_s
+                        @force_capture = false
+                        @current_depth = 0
+                    end
+                end
 
-                if @capture_depth > 0
+                more_pairs = @input.scan(/\s*,\s*/)
+                if more_pairs
                     output << ", "
+                else
+                     if @force_capture and @current_depth == 0
+                         last_pos = @input.pos
+                         
+                         cur_pos = start_pos
+                         @input.pos = cur_pos
+                         while (cur_pos < last_pos)
+                             @output << @input.getch
+                             cur_pos = cur_pos + 1
+                         end
+
+                         @force_capture = false
+                     else
+                         @current_depth = @current_depth - 1
+                     end
                 end
             end
             error("Missing object pair") if more_pairs
@@ -111,6 +136,10 @@ class JSONExtractor
             more_values = false
             while contents = parse_value rescue nil
                 array << contents
+                if contents == @searchval
+                    @force_capture = true
+                    @current_depth = -1
+                end
                 more_values = @input.scan(/\s*,\s*/) or break
                 array << ", "
             end
@@ -130,9 +159,13 @@ class JSONExtractor
                 string << contents
             end
             @input.scan(/"/) or error("Unclosed string")
-            string = string + '"'
-            if @mode == 2 and string == @searchval
+            string << '"'
+
+            # If we're in data matching mode and this matches the
+            # value that we are searching for...
+            if @mode == 2 and string == @searchval and @capture_depth > 0
                 @force_capture = true
+                @current_depth = @capture_depth
             end
             string
         else

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: leenookx-json-mangler
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.2.1
 platform: ruby
 authors: 
 - lee nookx
@@ -9,11 +9,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-30 00:00:00 -07:00
+date: 2009-08-31 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
-description: TODO
+description: JSON data format mangling tools.
 email: lnookx@googlemail.com
 executables: []
 
@@ -56,7 +56,7 @@ files:
 - lib/json-mangler/json_extractor.rb
 - lib/json-mangler/json_mangler.rb
 - test/test_json_mangler.rb
-has_rdoc: true
+has_rdoc: false
 homepage: http://github.com/leenookx/json-mangler
 licenses: 
 post_install_message: 
@@ -81,7 +81,7 @@ requirements: []
 rubyforge_project: 
 rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: JSON data format mangling tools.
 test_files: 
 - test/test_json_mangler.rb