jgrep 1.3.1 → 1.3.3

data/bin/jgrep

@@ -3,68 +3,17 @@
 require 'jgrep'
 require 'optparse'
 
-@options = {:flat => false, :start => nil}
-
-def print_json(result)
-    unless @options[:flat]
-        result = result.first if @options[:stream]
-        puts(JSON.pretty_generate(result))
-    else
-        puts(result.first.to_json)
-    end
-end
-
-def do_grep(json, expression)
-    unless @options[:field]
-        result = JGrep::jgrep((json), expression, nil, @options[:start])
-        unless result == [] or @options[:quiet] == true
-            print_json(result)
-        end
-    else
-        if @options[:field].is_a? Array
-            JGrep::validate_filters(@options[:field])
-            result = JGrep::jgrep((json), expression, @options[:field], @options[:start])
-            unless result == [] or @options[:quiet] == true
-                print_json(result)
-            end
-
-        else
-            JGrep::validate_filters(@options[:field])
-            result = JGrep::jgrep((json), expression, @options[:field], @options[:start])
-            unless result.first.is_a?(Hash) || result.flatten.first.is_a?(Hash)
-                unless @options[:quiet] == true
-                    result.map{|x| puts x unless x.nil?}
-                end
-            else
-                unless @options[:quiet] == true
-                    print_json(result)
-                end
-            end
-        end
-    end
-end
+options = {:flat => false, :start => nil, :field => []}
 
 begin
     OptionParser.new do |opts|
         opts.banner = "Usage: jgrep [options] \"expression\""
         opts.on("-s", "--simple [FIELDS]", "Display only one or more fields from each of the resulting json documents") do |field|
-            unless field.nil?
-                if (field.split(" ")).size > 1
-                    @options[:field] = field.split(" ")
-                else
-                    @options[:field] = field
-                end
-            else
-                raise "-s flag requires a field value"
-            end
+            options[:field].concat(field.split(" "))
         end
 
         opts.on("-c", "--compact", "Display non pretty json") do
-            @options[:flat] = true
-        end
-
-        opts.on("-n", "--stream", "Display continuous output from continuous input") do
-            @options[:stream] = true
+            options[:flat] = true
         end
 
         opts.on("-f", "--flatten", "Makes output as flat as possible") do
@@ -72,11 +21,11 @@ begin
         end
 
         opts.on("-i", "--input [FILENAME]", "Specify input file to parse") do |filename|
-            @options[:file] = filename
+            options[:file] = filename
         end
 
         opts.on("-q", "--quiet", "Quiet; don't write to stdout.  Exit with zero status if match found.") do
-            @options[:quiet] = true
+            options[:quiet] = true
         end
 
         opts.on("-v", "--verbose", "Verbose output") do
@@ -84,16 +33,12 @@ begin
         end
 
         opts.on("--start [FIELD]", "Where in the data to start from") do |field|
-            @options[:start] = field
+            options[:start] = field
         end
     end.parse!
 rescue OptionParser::InvalidOption => e
     puts e.to_s.capitalize
     exit 1
-
-rescue Exception => e
-    puts e
-    exit 1
 end
 
 begin
@@ -109,35 +54,49 @@ begin
 
     expression = "" if expression.nil?
 
-    #Continuously gets if inputstream in constant
     #Load json from standard input if tty is false
     #else find and load file from command line arugments
-
-    if @options[:stream]
-        unless STDIN.tty?
-            while json = gets
-                do_grep(json, expression)
-            end
+    unless STDIN.tty?
+        json = STDIN.read
+    else
+        if options[:file]
+            json = File.read(options[:file])
         else
             raise "No json input specified"
         end
+    end
+
+    if options[:field].empty?
+        result = JGrep::jgrep((json), expression, nil, options[:start])
+        unless options[:quiet] == true
+            (options[:flat] == false) ? puts(JSON.pretty_generate(result)) : puts(result.to_json)
+        end
     else
-        unless STDIN.tty?
-            json = STDIN.read
-            do_grep(json, expression)
+        if options[:field].size > 1
+            JGrep::validate_filters(options[:field])
+            result = JGrep::jgrep((json), expression, options[:field], options[:start])
+            unless result == [] or options[:quiet] == true
+                puts(JSON.pretty_generate(result))
+            end
+
         else
-            if @options[:file]
-                json = File.read(@options[:file])
-                do_grep(json, expression)
+            JGrep::validate_filters(options[:field][0])
+            result = JGrep::jgrep((json), expression, options[:field][0], options[:start])
+            unless result.first.is_a?(Hash) || result.flatten.first.is_a?(Hash)
+                unless options[:quiet] == true
+                    result.map{|x| puts x unless x.nil?}
+                end
             else
-                raise "No json input specified"
+                unless options[:quiet] == true
+                    puts(JSON.pretty_generate(result))
+                end
+            end
+            unless result.length > 0
+                exit 1
             end
         end
     end
 
-rescue Interrupt
-    STDERR.puts "Exiting..."
-    exit 1
 rescue Exception => e
     if e.is_a?(SystemExit)
         exit e.status

data/jgrep.gemspec

@@ -1,9 +1,9 @@
 Gem::Specification.new do |s|
     s.name = "jgrep"
-    s.version = "1.3.1"
+    s.version = "1.3.3"
 
     s.authors = ["P Loubser"]
-    s.date = %q{2011-12-15}
+    s.date = %q{2012-09-26}
     s.default_executable = "jgrep"
     s.add_dependency('json')
     s.description = "Compare a list of json documents to a simple logical language and returns matches as output"

data/lib/jgrep.rb

@@ -4,28 +4,12 @@ require 'parser/parser.rb'
 require 'parser/scanner.rb'
 require 'rubygems'
 require 'json'
+#require 'yajl/json_gem'
 
 module JGrep
     @verbose = false
     @flatten = false
 
-    class JGrep
-        attr_accessor :value, :expression
-
-        def initialize()
-            @value = ""
-            @expression = ""
-        end
-
-        def match_expression(expression)
-            return !::JGrep.jgrep(@value, expression).empty?
-        end
-
-        def match_value(value)
-            return !::JGrep.jgrep(value, @expression).empty?
-        end
-    end
-
     def self.verbose_on
         @verbose = true
     end
@@ -42,11 +26,7 @@ module JGrep
         errors = ""
         begin
             JSON.create_id = nil
-
-            if json.class == String
-                json = JSON.parse(json)
-            end
-
+            json = JSON.parse(json)
             if json.is_a? Hash
                 json = [json]
             end
@@ -68,7 +48,7 @@ module JGrep
                             pp document
                             STDERR.puts "Error - #{e} \n\n"
                         else
-                            errors = "One or more the json documents could not be parsed. Run jgrep -v to display documents"
+                            errors = "One or more the json documents could not be parsed. Run jgrep -v for to display documents"
                         end
                     end
                 end
@@ -88,11 +68,9 @@ module JGrep
 
         rescue JSON::ParserError => e
             STDERR.puts "Error. Invalid JSON given"
-            exit 1
         end
     end
 
-
     #Convert a specific hash inside a JSON document to an array
     #Mark is a string in the format foo.bar.baz that points to
     #the array in the document.
@@ -393,9 +371,14 @@ module JGrep
 
     #Digs to a specific path in the json document and returns the value
     def self.dig_path(json, path)
-
+        index = nil
         path = path.gsub(/^\./, "")
 
+        if path =~ /(.*)\[(.*)\]/
+            path = $1
+            index = $2
+        end
+
         if path == ""
             return json
         end
@@ -440,7 +423,7 @@ module JGrep
                     end
                 end
                 unless tmp.empty?
-                    return tmp
+                    (index) ? (return tmp.flatten[index.to_i]) : (return tmp)
                 end
             end
 

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: jgrep
 version: !ruby/object:Gem::Version 
+  hash: 29
   prerelease: false
   segments: 
   - 1
   - 3
-  - 1
-  version: 1.3.1
+  - 3
+  version: 1.3.3
 platform: ruby
 authors: 
 - P Loubser
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-15 00:00:00 +00:00
+date: 2012-09-26 00:00:00 +01:00
 default_executable: jgrep
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -42,8 +45,8 @@ files:
 - jgrep.gemspec
 - bin/jgrep
 - lib/jgrep.rb
-- lib/parser/parser.rb
 - lib/parser/scanner.rb
+- lib/parser/parser.rb
 has_rdoc: true
 homepage: https://github.com/psy1337/JSON-Grep
 licenses: []
@@ -54,23 +57,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Compare a list of json documents to a simple logical language and returns matches as output