jgrep 1.1.2 → 1.1.3

data/bin/jgrep

@@ -31,7 +31,7 @@ begin
     end
 
     #Load json from standard in if tty is false
-    #else find and load file from command lin arugments
+    #else find and load file from command line arugments
     unless STDIN.tty?
         json = STDIN.read
     else

data/jgrep.gemspec

@@ -1,9 +1,9 @@
 Gem::Specification.new do |s|
     s.name = "jgrep"
-    s.version = "1.1.2"
+    s.version = "1.1.3"
 
     s.authors = ["P Loubser"]
-    s.date = %q{2011-07-20}
+    s.date = %q{2011-07-27}
     s.default_executable = "jgrep"
     s.description = "Compare a list of json documents to a simple logical language and returns matches as output"
     s.email = ["ploubser@gmail.com"]

data/lib/jgrep.rb

@@ -4,7 +4,6 @@ require 'parser/parser.rb'
 require 'parser/scanner.rb'
 require 'rubygems'
 require 'json'
-require 'pp'
 
 module JGrep
     @verbose = false
@@ -86,16 +85,16 @@ module JGrep
         tmp, value = format(tmp, value.gsub(/"|'/, ""))
 
         case op
-        when "="
-            (tmp == value) ? (return true) : (return false)
-        when "<="
-            (tmp <= value) ? (return true) : (return false)
-        when ">="
-            (tmp >= value) ? (return true) : (return false)
-        when ">"
-            (tmp > value) ? (return true) : (return false)
-        when "<"
-            (tmp < value) ? (return true) : (return false)
+            when "="
+                (tmp == value) ? (return true) : (return false)
+            when "<="
+                (tmp <= value) ? (return true) : (return false)
+            when ">="
+                (tmp >= value) ? (return true) : (return false)
+            when ">"
+                (tmp > value) ? (return true) : (return false)
+            when "<"
+                (tmp < value) ? (return true) : (return false)
         end
     end
 
@@ -111,7 +110,6 @@ module JGrep
         return false
     end
 
-
     #Check if complex statement (defined as [key=value...]) is
     #present over an array of key value pairs
     def self.has_complex?(document, compound)

data/lib/parser/parser.rb

@@ -67,6 +67,11 @@ module JGrep
                                 parse(c_token_value, 0)
                             end
 
+                            if c_token_value =~ /!=/
+                                c_token_value = c_token_value.gsub("!=", "=")
+                                @execution_stack << {"not", "not"}
+                            end
+
                             unless n_token =~ /and|or|\)/
                                 unless n_token.nil?
                                     raise "Error at column #{scanner.token_index}. \nExpected 'and', 'or', ')'. Found '#{n_token_value}'"

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 1
-  - 2
-  version: 1.1.2
+  - 3
+  version: 1.1.3
 platform: ruby
 authors: 
 - P Loubser
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-20 00:00:00 +01:00
+date: 2011-07-27 00:00:00 +01:00
 default_executable: jgrep
 dependencies: []