precog 1.0.0.pre2 → 1.0.0.pre3

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
-SHA1: 
-  metadata.gz: 0f07093cd36069946ad7110456b91cc58ba009a8
-  data.tar.gz: e756fc697131e4a30341836595b3bb1a5a2c21fa
 SHA512: 
-  metadata.gz: 206dfe29cdd566d09404b9b9af31f9f346dfb71086f3db615a7b22c9f2e7ce9e97df792b0f442a2839074b3df7bc002199df9b169772eb12c29229d4dee507de
-  data.tar.gz: 9ce1006e3aeb2385fbc5ebbd6e5ec580c9745dc51dedbf2925193c8e17ca1e69bbafb670bb57ee7da9ad3d66cc4833f7a57bd9172040541c570920bc7785c9ae
+  metadata.gz: db0c18eabde299256e7b91e025d4c3f2610b363252811faa036093b4bfd22dc8daff31c2c564d39f61001a94a06ebfd8af2f25c320f73e6dff3c9cd480443a88
+  data.tar.gz: f6e0ea056eef9891ca98a0dee71fc0459b4cfda5a1c4b03afd41b5f23a5f8d7c1bac3acb8a4256d784cfa2ab0654caf2ad1c17565e20020d08e31301d83e0d75
+SHA1: 
+  metadata.gz: 5cdd69c13a65be70bd4a2e702063490eba0e72da
+  data.tar.gz: 2642a661bc90722028ae2d94816e886c2da80dce

data/lib/precog.rb

@@ -25,6 +25,14 @@ module Precog
   # Struct used to return account information from the Client class.
   AccountInfo = Struct.new :api_key, :account_id, :email
   
+  # Represents an error or warning returned from the Precog API.  The position
+  # information is optional, and is reprensented by an instance of +Position+
+  # when present.
+  Info = Struct.new :message, :position
+  
+  # Represents a location within a Quirrel source fragment.
+  Position = Struct.new :line_num, :column_num, :line_text
+  
   # A simple REST client for storing data in Precog and querying it with Quirrel.
   # 
   # This provides methods to upload files to
@@ -253,13 +261,19 @@ module Precog
     # interrupted, there will be no way to retrieve the results of the query.
     #
     # Returns a triple of errors, warnings and an +Array+ of data representing
-    # the query results.
+    # the query results.  The errors and warnings are represented as +Array+(s)
+    # of +Info+ objects.
     def query(path, query)
       path = relativize_path path
       params = { :apiKey => api_key, :q => query, :format => 'detailed' }
       resp = Precog.get(self, "/analytics/v#{VERSION}/fs/#{path}", { 'Content-Type' => 'application/json' }, params)
       output = JSON.parse resp.body
-      [output["errors"], output["warnings"], output["data"]]
+      
+      [
+        output["errors"].select { |i| !i.nil? }.map { |i| Precog.parse_info i },
+        output["warnings"].select { |i| !i.nil? }.map { |i| Precog.parse_info i },
+        output["data"]
+      ]
     end
     
     # Runs an asynchronous query against Precog. An async query is a query
@@ -331,12 +345,23 @@ module Precog
       
       if data
         output = JSON.parse data
-        [output["errors"], output["warnings"], output["data"]]
+        
+        [
+          output["errors"].select { |i| !i.nil? }.map { |i| Precog.parse_info i },
+          output["warnings"].select { |i| !i.nil? }.map { |i| Precog.parse_info i },
+          output["data"]
+        ]
       end
     end
   end
   
   class << self
+    def parse_info(info)   # :nodoc:
+      pos_hash = info['position']
+      pos = Position.new pos_hash['line'].to_i, pos_hash['column'].to_i, pos_hash['text'] unless pos_hash.nil?
+      Info.new info['message'], pos
+    end
+    
     def post(client, path, body, header, params = {})  # :nodoc:
       connect client do |http|
         uri = Addressable::URI.new

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: precog
 version: !ruby/object:Gem::Version 
-  version: 1.0.0.pre2
+  version: 1.0.0.pre3
 platform: ruby
 authors: 
 - Daniel Spiewak