jgrep 1.1.0 → 1.1.1

data/bin/jgrep

@@ -19,6 +19,7 @@ end.parse!
 begin
     expression = nil
 
+    #Identify the expression from command line arguments
     ARGV.each do |argument|
         if argument =~ /<|>|=/
             expression = argument
@@ -26,6 +27,8 @@ begin
         end
     end
 
+    #Load json from standard in if tty is false
+    #else find and load file from command lin 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.0"
+    s.version = "1.1.1"
 
     s.authors = ["P Loubser"]
-    s.date = %q{2011-07-19}
+    s.date = %q{2011-07-20}
     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
 
@@ -29,9 +28,9 @@ module JGrep
 
     #Correctly format values so we can do the correct type of comparison
     def self.format(kvalue, value)
-        if kvalue =~ /^\d+$/ && value =~ /^\d+$/
+        if kvalue.to_s =~ /^\d+$/ && value.to_s =~ /^\d+$/
             return Integer(kvalue), Integer(value)
-        elsif kvalue =~ /^\d+.\d+$/ && value =~ /^\d+.\d+$/
+        elsif kvalue.to_s =~ /^\d+.\d+$/ && value.to_s =~ /^\d+.\d+$/
             return Float(kvalue), Float(value)
         else
             return kvalue, value

data/lib/parser/scanner.rb

@@ -93,32 +93,6 @@ module JGrep
                             break
                         end
                     end until (j >= @arguments.size) || (@arguments.split("")[j] =~ /\//)
-
-                #Recondsider this bit. Don't see there being a case for it. (Pieter)
-#                elsif (@arguments.split("")[j] =~ /=|<|>/)
-#                    while !(@arguments.split("")[j] =~ /=|<|>/)
-#                        current_token_value << @arguments.split("")[j]
-#                        j += 1
-#                    end
-#
-#                    current_token_value << @arguments.split("")[j]
-#                    j += 1
-#
-#                    if @arguments.split("")[j] == "/"
-#                        begin
-#                            current_token_value << @arguments.split("")[j]
-#                            j += 1
-#                            if @arguments.split("")[j] == "/"
-#                                current_token_value << "/"
-#                                 break
-#                            end
-#                        end until (j >= @arguments.size) || (@arguments.split("")[j] =~ /\//)
-#                    else
-#                        while (j < @arguments.size) && ((@arguments.split("")[j] != " ") && (@arguments.split("")[j] != ")") && @arguments.split("")[j] != "]" )
-#                            current_token_value << @arguments.split("")[j]
-#                            j += 1
-#                        end
-#                    end
                 else
                     begin
                         current_token_value << @arguments.split("")[j]

metadata

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