jgrep 1.1.1 → 1.1.2

data/bin/jgrep

@@ -13,6 +13,9 @@ OptionParser.new do |opts|
     opts.on("-f", "--flat", "Display non pretty json") do
         options[:flat] = true
     end
+    opts.on("-v", "--verbose", "Verbose output") do
+        JGrep::verbose_on
+    end
 
 end.parse!
 
@@ -41,7 +44,7 @@ begin
 
     unless options[:field]
         result = JGrep::jgrep((json), expression)
-        unless result == "[]"
+        unless result == []
             (options[:flat] == false) ? puts(JSON.pretty_generate(result)) : puts(result.to_json)
         end
     else

data/jgrep.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
     s.name = "jgrep"
-    s.version = "1.1.1"
+    s.version = "1.1.2"
 
     s.authors = ["P Loubser"]
     s.date = %q{2011-07-20}

data/lib/jgrep.rb

@@ -4,26 +4,48 @@ require 'parser/parser.rb'
 require 'parser/scanner.rb'
 require 'rubygems'
 require 'json'
+require 'pp'
 
 module JGrep
+    @verbose = false
+
+    def self.verbose_on
+        @verbose = true
+    end
 
     #Method parses json and returns documents that match the logical expression
     def self.jgrep(json, expression)
+        errors = ""
         begin
             call_stack = Parser.new(expression).execution_stack
             result = []
             json = JSON.parse(json)
             json.each do |document|
-                if eval_statement(document, call_stack)
-                    result << document
+                begin
+                    if eval_statement(document, call_stack)
+                        result << document
+                    end
+                rescue Exception => e
+                    if @verbose
+                        pp document
+                        STDERR.puts "Error - #{e} \n\n"
+                    else
+                        errors = "One or more the json documents could not be parsed. Run jgrep -v for to display documents"
+                    end
                 end
             end
+
+            unless errors == ""
+                puts errors
+            end
+
             return result
 
         rescue JSON::ParserError => e
             STDERR.puts "Error. Invalid JSON given"
             exit 1
         end
+
     end
 
     #Correctly format values so we can do the correct type of comparison
@@ -52,6 +74,9 @@ module JGrep
 
         key.split(".").each_with_index do |item,i|
             tmp = tmp[item]
+            if tmp.nil?
+                return false
+            end
             result = false
             if tmp.is_a? Array
                 return (is_object_in_array?(tmp, "#{key.split(".")[i+1]}#{op}#{value}"))
@@ -105,6 +130,9 @@ module JGrep
 
         field.split(".").each_with_index do |item, i|
             tmp = tmp[item]
+            if tmp.nil?
+                return false
+            end
             if tmp.is_a? Array
                 tmp.each do |doc|
                     result = []
@@ -121,7 +149,6 @@ module JGrep
                                 left = token[1].split(op[0]).first.split(".").last
                                 right = token[1].split(op[0]).last
                                 new_statement = left + op[0] + right
-#                                new_statement = token[1].split(/<=|>=|=|<|>/).first.split(".").last + token[1].split(/<=|>=|=|<|>/).last
                                 result << has_object?(doc, new_statement)
                         end
                     end

data/lib/parser/scanner.rb

@@ -62,8 +62,7 @@ module JGrep
                 end
             end
         rescue NoMethodError => e
-            pp e
-            raise "Cannot end statement with 'and', 'or', 'not'"
+            raise "Error. Expression cannot be parsed."
         end
 
         private

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 1
-  - 1
-  version: 1.1.1
+  - 2
+  version: 1.1.2
 platform: ruby
 authors: 
 - P Loubser