jgrep 1.0.1 → 1.0.2

data/bin/jgrep

@@ -48,7 +48,7 @@ begin
                 end
             end
             unless r.nil?
-                (!r.is_a?(Array) || !r.is_a?(Hash)) ? puts(r) : puts(JSON.pretty_generate(r))
+                (!r.is_a?(Array) && !r.is_a?(Hash)) ? puts(r) : puts(JSON.pretty_generate(r))
             end
         end
     end

data/jgrep.gemspec

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

data/lib/jgrep.rb

@@ -4,6 +4,7 @@ require 'parser/parser.rb'
 require 'parser/scanner.rb'
 require 'rubygems'
 require 'json'
+require 'pp'
 
 module JGrep
 
@@ -20,11 +21,6 @@ module JGrep
             end
             return result
 
-        rescue NameError => e
-            var = e.to_s
-            STDERR.puts "Error. #{var.match(/`(.*)'/)} was not found in documents"
-            exit 1
-
         rescue JSON::ParserError => e
             STDERR.puts "Error. Invalid JSON given"
             exit 1
@@ -33,6 +29,8 @@ module JGrep
 
     #Correctly format values so we can do the correct type of comparison
     def self.format(kvalue, value)
+        puts kvalue
+        puts value
         if kvalue =~ /^\d+$/ || value =~ /^\d+$/
             return Integer(kvalue), Integer(value)
         elsif kvalue =~ /^\d+.\d+$/ || value =~ /^\d+.\d+$/
@@ -122,7 +120,11 @@ module JGrep
                             when  /not|\!/
                                 result << "!"
                             when "statement"
-                                new_statement = token[1].split(".").last
+                                op = token[1].match(/.*<=|>=|=|<|>/)
+                                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

metadata

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