leenookx-json-mangler 0.2.2 → 0.2.3

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

data/json-mangler.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{json-mangler}
-  s.version = "0.2.2"
+  s.version = "0.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["lee nookx"]

data/lib/json-mangler/json_extractor.rb

@@ -15,6 +15,7 @@ class JSONExtractor
         @force_capture = false
         @capture_depth = depth - 1
         @current_depth = 0
+        @num_fragments = 0
 
         @input = StringScanner.new( input )
         @searchval = '"' + search + '"'
@@ -94,7 +95,8 @@ class JSONExtractor
                 end
 
                 if !@force_capture and capture
-                    @output << key << ": " << res.to_s
+                    fragment = key + ": " + res.to_s
+                    add_json_fragment( fragment )
 
                     # We've stopped capturing locally...
                     capture = false
@@ -103,7 +105,8 @@ class JSONExtractor
                 # Handle special case of array match
                 if @force_capture 
                     if @current_depth == -1
-                        @output << key << ": " << res.to_s
+                        fragment = key + ": " + res.to_s
+                        add_json_fragment( fragment )
                         @force_capture = false
                         @current_depth = 0
                     end
@@ -120,16 +123,16 @@ class JSONExtractor
                      # 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
+                         fragment = ""
                          while (cur_pos < last_pos)
-                             @output << @input.getch
+                             fragment << @input.getch
                              cur_pos = cur_pos + 1
                          end
 
+                         add_json_fragment( fragment )
+
                          @force_capture = false
                      else
                          # No, we need to 'descend' further
@@ -178,7 +181,6 @@ 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
@@ -217,5 +219,14 @@ class JSONExtractor
     def trim_space
         @input.scan(/\s+/)
     end
+
+    def add_json_fragment( fragment )
+        @num_fragments = @num_fragments + 1
+        if @num_fragments > 1
+            @output << ", "
+        end
+
+        @output << fragment
+    end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: leenookx-json-mangler
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors: 
 - lee nookx