memoir 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 684b447befdf0b8cdaf05389e5e0dc60e6e803d2
-  data.tar.gz: 1a1b49ac8e00ed1a69f848f007dc95bfbf49bd0b
+  metadata.gz: 796a35d84795be6d68fd0fb93f6334d9e3580b99
+  data.tar.gz: 480ad5612349c69a5ccb6f62636d6f7f2084a900
 SHA512:
-  metadata.gz: 0c18b10cea866bc3f156698e1ae97a60d3450f17537c41abe1c7dabe182e7e4448c7a8cace2c8e9c60f9d33c9005aa9df79121d3eb5bbf8c979d0b0c650e002d
-  data.tar.gz: 8e457a5b1625ed73d13bb6794da504c5ffce7f02773ca827fc9fcd2e9b430df40f4205aa20886a66b61933da03eaedab277e5eb9f75bacb416c898fef9eae85c
+  metadata.gz: f1a701e9c6d77d733f4a0ee30076ecfce59e10fad41111edc86c588fe88b3045624c42d7e7aed52ac98a0549d3eaeeb0855a844b9c19359f41869e53ad494fc5
+  data.tar.gz: b738cead5216b952f2fb883a6999a7bac6c2c34eb9a314ddde5410ab61ddaeab8e553bd4a870a17c584fd3e773d7897ad9696bc959f22e5db0404c4595460bfc

data/lib/memoir.rb

@@ -16,6 +16,7 @@ module Memoir
   require File.join(File.dirname(__FILE__), 'memoir', 'query')
   require File.join(File.dirname(__FILE__), 'memoir', 'request')
   require File.join(File.dirname(__FILE__), 'memoir', 'data_set')
+  require File.join(File.dirname(__FILE__), 'memoir', 'error')
   require File.join(File.dirname(__FILE__), 'memoir', 'response')
   require File.join(File.dirname(__FILE__), 'memoir', 'client')
 end

data/lib/memoir/client.rb

@@ -21,7 +21,11 @@ class Memoir::Client
   end
 
   def run(request)
-    Memoir::Response.new(connection.post API_QUERY_URL, request.to_h)
+    response = connection.post API_QUERY_URL, request.to_h do |req|
+      req.params['arrays'] = true if request.arrays
+    end
+
+    Memoir::Response.new response
   end
 
   def dry_run(request)

data/lib/memoir/data_set.rb

@@ -10,10 +10,6 @@ class Memoir::DataSet
     @global_annotations = data_set['globalAnnotations'] || []
     @tsuids = data_set['tsuids'] || []
     @query = query || {}
-    self.dps = data_set['dps'] || {}
-  end
-
-  def dps=(dps_object)
-    @dps = dps_object.instance_of?(Array) ? dps_object.to_h : dps_object
+    @dps = data_set['dps']
   end
 end

data/lib/memoir/error.rb

@@ -0,0 +1,10 @@
+class Memoir::Error
+  attr_accessor :code, :message, :details, :trace
+
+  def initialize(error)
+    @code = error['code']
+    @message = error['message']
+    @details = error['details']
+    @trace = error['trace']
+  end
+end

data/lib/memoir/request.rb

@@ -1,5 +1,5 @@
 class Memoir::Request
-  attr_accessor :start_time, :end_time, :queries, :options
+  attr_accessor :start_time, :end_time, :queries, :options, :arrays
 
   VALID_OPTIONS = {
     no_annotations: 'noAnnotations',
@@ -18,6 +18,7 @@ class Memoir::Request
     @end_time = end_time
     @queries = []
     @options = options
+    @arrays = false
   end
 
   def <<(query)

data/lib/memoir/response.rb

@@ -1,11 +1,18 @@
 class Memoir::Response
-  attr_accessor :data_sets, :stats_summary, :status, :raw
+  attr_accessor :data_sets, :stats_summary, :status, :raw, :error
+
+  STATUS_OK = 200
 
   def initialize(faraday_response)
     @data_sets = []
     @status = faraday_response.status
     @raw = faraday_response.body
-    parse_response(raw)
+
+    if status == STATUS_OK
+      parse_response(raw)
+    else
+      @error = Memoir::Error.new(raw['error'])
+    end
   end
 
   private

data/lib/memoir/version.rb

@@ -1,3 +1,3 @@
 module Memoir
-  VERSION = '0.1.0'.freeze
+  VERSION = '0.1.1'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: memoir
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Michal Kimle
@@ -155,6 +155,7 @@ files:
 - lib/memoir/client.rb
 - lib/memoir/data_set.rb
 - lib/memoir/downsample.rb
+- lib/memoir/error.rb
 - lib/memoir/errors.rb
 - lib/memoir/errors/argument_error.rb
 - lib/memoir/errors/request_error.rb