slapshot 0.0.13 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b25d113ae7b0db720fc5052ad3b4e99df9bce14
-  data.tar.gz: 42df251af565c0a802326819b336474b0aba6286
+  metadata.gz: ba0c5d40c89ffc0726e73b406a41fc79f100ad7a
+  data.tar.gz: 369e6ed48d31278fcaf49fd11bc40cce2f96027e
 SHA512:
-  metadata.gz: eec0f68106e4805c6d7d3b1d80a853f55d33d2a58919e08439126e9feb91f9eccf087b516febae39007acec255b33b435f0cdf3c67b70f0a1e3220b923ac540a
-  data.tar.gz: 8ba924b8fb78047dc31c5a387b6105dba538e111798ee9a44c57827ca747a7b515640d5bd0aa0dddb4b37363e0a4de2b6e0f034583774b88943c2d62c4fd90c3
+  metadata.gz: 1b8557cee568b35d237e4d4bd82827bba086dbec03ef4dabf08d4eb78146d4b8597fd152be053d26423e3c7d3598f6292f4c6a2f67f3cc0f7cfaba33b4ebd901
+  data.tar.gz: 1270146806a5201a20aaa6aa472be94df97216bccef69e4757d474940db2bb778a3b5d830e879979a93ff2590cde55c511a66b2ed16ec538fa53bf5f6364092b

data/bin/slapshot

@@ -83,15 +83,19 @@ command :try do |c|
   c.default_value 20
   c.flag [:c, :count]
 
+  c.desc 'Pretty print the JSON result (if html was not chosen)'
+  c.default_value false
+  c.switch [:p, :pretty]
+
   c.action do |global_options,options,args|
 
      if args.length != 2
-       raise 'The search command takes exactly 2 arguments: a solr query and a parser file'
+       raise 'The try command takes exactly 2 arguments: a solr query and a parser file'
      end
      
      file = File.new(args[1], 'r');
      
-     r = @sc.try args[0], file, options[:c], options[:h]
+     r = @sc.try args[0], file, options[:c], options[:h], options[:p]
      
      puts
      puts "#{r}"

data/lib/slapshot/main.rb

@@ -74,33 +74,35 @@ class Appshot
     
   end
   
-  def try(solrQuery, parserFile, count, html)
+  def try(solrQuery, parserFile, count, html, pretty)
 
-=begin
     response = RestClient.post "#{@url}/service/customParser/test", {:solrQuery => solrQuery, :parserFile => parserFile, :c => count, :h => html }, @headers
 
-    JSON.parse(response.body)
+    json_response = JSON.parse(response.body)
 
-    if (Integer(json_response['count']) < Integer(count))
-      count = json_response['count']
-    end
+    if (json_response['count'].nil? || 0 == json_response['count'])
+      # there was an error
+      puts "Parse job failed!"
+      return json_response
+    else
+      if (Integer(json_response['count']) < Integer(count))
+        count = json_response['count']
+      end
 
-    puts "Found #{json_response['count']} total results, retrieving #{count} results in #{json_response['search_time']} ms."
+      puts "Found #{json_response['count']} total results, retrieving #{count} results in #{json_response['searchTime']} ms."
 
-    if html
-      json_response['html']
-    else
-      json_response['docs']
-    end
-=end
+      if html
+        json_response['html']
+      else
+        if pretty
+          JSON.pretty_generate(json_response['docs'])
+        else
+          json_response['docs']
+        end
+      end
 
-    if html
-      response = RestClient.post "#{@url}/service/customParser/testHtml", {:solrQuery => solrQuery, :parserFile => parserFile}, @headers
-    else
-      response = RestClient.post "#{@url}/service/customParser/test", {:solrQuery => solrQuery, :parserFile => parserFile}, @headers
-      JSON.parse(response.body)
     end
-    
+
   end
 
   def to_table(result)
@@ -147,4 +149,4 @@ class Appshot
     book.write(out)  
       
   end
-end
+end

data/lib/slapshot/version.rb

@@ -1,3 +1,3 @@
 module Slapshot
-  VERSION = '0.0.13'
+  VERSION = '0.0.16'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slapshot
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.16
 platform: ruby
 authors:
 - Mik Lernout
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-10 00:00:00.000000000 Z
+date: 2013-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake