jgrep 1.2.1 → 1.3.0

data/bin/jgrep

@@ -8,7 +8,7 @@ options = {:flat => false, :start => nil}
 begin
     OptionParser.new do |opts|
         opts.banner = "Usage: jgrep [options] \"expression\""
-        opts.on("-s", "--simple FIELD[s]", "Display a single field from each of the resulting json documents") do |field|
+        opts.on("-s", "--simple [FIELDS]", "Display only one or more fields from each of the resulting json documents") do |field|
             if (field.split(" ")).size > 1
                 options[:field] = field.split(" ")
             else
@@ -87,6 +87,7 @@ begin
             end
         end
     end
+
 rescue Exception => e
     STDERR.puts "Error - #{e}"
     exit 1

data/jgrep.gemspec

@@ -1,10 +1,11 @@
 Gem::Specification.new do |s|
     s.name = "jgrep"
-    s.version = "1.2.1"
+    s.version = "1.3.0"
 
     s.authors = ["P Loubser"]
-    s.date = %q{2011-08-01}
+    s.date = %q{2011-08-04}
     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"
     s.email = ["ploubser@gmail.com"]
     s.executables = ["jgrep"]

data/lib/jgrep.rb

@@ -4,6 +4,7 @@ require 'parser/parser.rb'
 require 'parser/scanner.rb'
 require 'rubygems'
 require 'json'
+#require 'yajl/json_gem'
 
 module JGrep
     @verbose = false
@@ -17,7 +18,10 @@ module JGrep
         @flatten = true
     end
 
-    #Method parses json and returns documents that match the logical expression
+    #Parse json and return documents that match the logical expression
+    #Filters define output by limiting it to only returning a the listed keys.
+    #Start allows you to move the pointer indicating where parsing starts.
+    #Default is the first key in the document heirarchy
     def self.jgrep(json, expression, filters = nil, start = nil)
         errors = ""
         begin
@@ -66,6 +70,78 @@ module JGrep
             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.
+    def self.hash_to_array(documents, mark)
+
+        begin
+            documents = JSON.parse(documents)
+        rescue JSON::ParserError => e
+            STDERR.puts "Error. Invalid JSON given"
+            exit 1
+        end
+
+        result = []
+
+        begin
+            for i in 0..(documents.size - 1) do
+                tmp = documents[i]
+                unless mark == ""
+                    mark.split(".").each_with_index do |m,i|
+                        tmp = tmp[m] unless i == mark.split(".").size - 1
+                    end
+                end
+
+                tmp[mark.split.last].each{|d| result << {"value" => d[1], "key" => d[0]}}
+                tmp[mark.split.last] = result
+
+            end
+        rescue Exception => e
+            STDERR.puts "Error. Invalid position specified in JSON document"
+            exit!
+        end
+
+        puts JSON.pretty_generate(documents)
+
+    end
+
+    #Convert a specific array inside a JSON document to a hash
+    #Mark is a string in the format foo.bar.baz that points to
+    #the hash in the document. Each element in the array will
+    #be turned into a hash in the format key => array[x]
+    def self.array_to_hash(documents, mark, key)
+
+        begin
+            documents = JSON.parse(documents)
+        rescue JSON::ParserError => e
+            STDERR.puts "Error. Invalid JSON given"
+            exit 1
+        end
+
+        result = {}
+
+        begin
+            for i in 0..(documents.size - 1) do
+                tmp = documents[i]
+                unless mark == ""
+                    mark.split(".").each_with_index do |m,i|
+                        tmp = tmp[m] unless i == mark.split(".").size - 1
+                    end
+                end
+
+                tmp[mark.split(".").last].each{|d| result[d[key]] = d}
+                tmp[mark.split(".").last] = result
+
+            end
+        rescue Exception => e
+            STDERR.puts "Error. Invalid position specified in JSON document"
+            exit!
+        end
+
+        puts JSON.pretty_generate(documents)
 
     end
 
@@ -128,6 +204,8 @@ module JGrep
         end
     end
 
+
+    #Check if the json key that is defined by statement is defined in the json document
     def self.present?(document, statement)
         statement.split(".").each do |key|
             if document.is_a? Hash
@@ -167,25 +245,25 @@ module JGrep
             op = statement
         end
 
-        tmp = document
+        tmp = dig_path(document, key)
 
-        key.split(".").each_with_index do |item,i|
-            tmp = tmp[item]
-            if tmp.nil?
-                if item == key.split(".").last
-                    tmp = "null"
-                else
-                    return false
-                end
-            end
-            result = false
-            if tmp.is_a? Array
-                return (is_object_in_array?(tmp, "#{key.split(".")[i+1]}#{op}#{value}"))
-            end
+        if tmp.is_a?(Array) and tmp.size == 1
+            tmp = tmp.first
         end
 
         tmp, value = format(tmp, (value.gsub(/"|'/, "") unless value.nil?))
 
+        #Deal with null comparison
+        if tmp.nil? and value == "null"
+            return true
+        end
+
+        #Deal with regex matching
+        if ((value =~ /^\/.*\/$/) && tmp != nil)
+            (tmp.match(Regexp.new(value.gsub("/", "")))) ? (return true) : (return false)
+        end
+
+        #Deal with everything else
         case op
             when "="
                 (tmp == value) ? (return true) : (return false)
@@ -292,24 +370,50 @@ module JGrep
         return eval(result.join(" "))
     end
 
+    #Digs to a specific path in the json document and returns the value
     def self.dig_path(json, path)
 
-        json = json[path.split(".").first] if json.is_a? Hash
+        path = path.gsub(/^\./, "")
+
+        if path == ""
+            return json
+        end
+
+        if json.is_a? Hash
+            json.keys.each do |k|
+                if path.match(/^#{k}/) && k.match(/\./)
+                    return dig_path(json[k], path.gsub(k, ""))
+                end
+            end
+        end
+
+        path_array=path.split(".")
+
+        if path_array.first == "*"
+            tmp = []
+            json.each do |j|
+                tmp << dig_path(j[1], path_array.drop(1).join("."))
+            end
+            return tmp
+
+        end
+
+        json = json[path_array.first] if json.is_a? Hash
 
-        if json.is_a?(Hash)
-            if path == path.split(".").first
+        if json.is_a? Hash
+            if path == path_array.first
                 return json
             else
-                return dig_path(json, (path.match(/\./) ? path.split(".").drop(1).join(".") : path))
+                return dig_path(json, (path.match(/\./) ? path_array.drop(1).join(".") : path))
             end
 
         elsif json.is_a? Array
-            if path == path.split(".").first && (json.first.is_a?(Hash) && !(json.first.keys.include?(path)))
+            if path == path_array.first && (json.first.is_a?(Hash) && !(json.first.keys.include?(path)))
                 return json
             else
                 tmp = []
                 json.each do |j|
-                    tmp_path = dig_path(j, (path.match(/\./) ? path.split(".").drop(1).join(".") : path))
+                    tmp_path = dig_path(j, (path.match(/\./) ? path_array.drop(1).join(".") : path))
                     unless tmp_path.nil?
                         tmp << tmp_path
                     end

data/lib/parser/scanner.rb

@@ -46,6 +46,14 @@ module JGrep
                             gen_statement
                         end
 
+                    when "&"
+                        if(@arguments.split("")[@token_index +1] == "&")
+                            @token_index +=1
+                            return "and", "and"
+                        else
+                            gen_statement
+                        end
+
                     when "o"
                         if (@arguments.split("")[@token_index + 1] == "r") && ((@arguments.split("")[@token_index + 2] == " ") || (@arguments.split("")[@token_index + 2] == "("))
                             @token_index += 1
@@ -54,6 +62,14 @@ module JGrep
                             gen_statement
                         end
 
+                    when "|"
+                        if(@arguments.split("")[@token_index +1] == "|")
+                            @token_index +=1
+                            return "or", "or"
+                        else
+                            gen_statement
+                        end
+
                     when "+"
                         value = ""
                         i = @token_index + 1

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
-  - 2
-  - 1
-  version: 1.2.1
+  - 3
+  - 0
+  version: 1.3.0
 platform: ruby
 authors: 
 - P Loubser
@@ -14,10 +14,21 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-01 00:00:00 +01:00
+date: 2011-08-04 00:00:00 +01:00
 default_executable: jgrep
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: json
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id001
 description: Compare a list of json documents to a simple logical language and returns matches as output
 email: 
 - ploubser@gmail.com