leenookx-json-mangler 0.2.1 → 0.2.2

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/features/test_comparisons/2level_extraction.json

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

data/json-mangler.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{json-mangler}
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["lee nookx"]
@@ -51,10 +51,11 @@ 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.4}
+  s.rubygems_version = %q{1.3.1}
   s.summary = %q{JSON data format mangling tools.}
   s.test_files = [
     "test/test_json_mangler.rb"
@@ -62,7 +63,7 @@ Gem::Specification.new do |s|
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+    s.specification_version = 2
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
     else

data/lib/json-mangler/json_extractor.rb

@@ -74,16 +74,22 @@ class JSONExtractor
                 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
-                    if @capture_depth > 0
-                        # Set the 'upward' depth to be captured.
-                        @current_depth = @capture_depth
-
-                        # Force the capturing of this object.
-                        @force_capture = true
+                # will this object matches what we are looking for, but
+                # make sure that we don't re-force the capture if one is
+                # already in progress.
+                if @mode == 2 and res == @searchval 
+                    if !@force_capture
+                        if @capture_depth > 0
+                            # Set the 'upward' depth to be captured.
+                            @current_depth = @capture_depth
+
+                            # Force the capturing of this object.
+                            @force_capture = true
+                        else
+                            capture = true
+                        end
                     else
-                        capture = true
+                        @current_depth = @current_depth - 1
                     end
                 end
 
@@ -103,12 +109,19 @@ class JSONExtractor
                     end
                 end
 
+                # Are there more pairs associated with this
+                # object?
                 more_pairs = @input.scan(/\s*,\s*/)
                 if more_pairs
+                    # yes, so write out a comma.
                     output << ", "
                 else
+                     # Do we need to force capturing of the entire
+                     # object?
                      if @force_capture and @current_depth == 0
                          last_pos = @input.pos
+
+                         puts "Full object capture: " + start_pos.to_s + " -> " + last_pos.to_s
                          
                          cur_pos = start_pos
                          @input.pos = cur_pos
@@ -119,6 +132,7 @@ class JSONExtractor
 
                          @force_capture = false
                      else
+                         # No, we need to 'descend' further
                          @current_depth = @current_depth - 1
                      end
                 end
@@ -164,6 +178,7 @@ class JSONExtractor
             # 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
+     puts "marked"
                 @force_capture = true
                 @current_depth = @capture_depth
             end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: leenookx-json-mangler
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - lee nookx
@@ -56,9 +56,8 @@ files:
 - lib/json-mangler/json_extractor.rb
 - lib/json-mangler/json_mangler.rb
 - test/test_json_mangler.rb
-has_rdoc: false
+has_rdoc: true
 homepage: http://github.com/leenookx/json-mangler
-licenses: 
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -79,9 +78,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.2.0
 signing_key: 
-specification_version: 3
+specification_version: 2
 summary: JSON data format mangling tools.
 test_files: 
 - test/test_json_mangler.rb