quandl_cassinatra 0.1.14 → 0.1.15

data/UPGRADE.md

@@ -1,3 +1,8 @@
+## 0.1.15
+
+* add status, blank?, saved?, exists?
+* fail gracefully when parse_json receives nil body due to api throwing 500 error
+
 ## 0.1.14
 
 * add Dataset#trim_start, Dataset#trim_end

data/lib/quandl/cassinatra/concerns/properties.rb

@@ -11,10 +11,10 @@ module Properties
     use_api Quandl::Cassinatra.her_api
   
     before_save :touch_save_time
-    before_save :halt_unless_valid!
-    
     after_save :log_save_time
     
+    before_save :halt_unless_valid!
+    
     def valid_with_server?
       return false unless valid?
       return false unless errors_params.blank?
@@ -26,6 +26,30 @@ module Properties
       save
     end
     
+    def blank?
+      !present?
+    end
+    
+    def exists?
+      present?
+    end
+    
+    def present?
+      status >= 200 && status < 300
+    end
+    
+    def saved?
+      status >= 200 && status <= 210
+    end
+    
+    def status
+      metadata[:status].to_i
+    end
+    
+    def parse_error
+      error_messages[:response_errors].try( :[], :parse_error )
+    end
+    
     def error_messages
       valid?
       errors_client.deep_merge(errors_server).deep_merge(errors_params)
@@ -36,7 +60,9 @@ module Properties
     end
     
     def errors_server
-      self.attributes[:errors] || {}
+      messages = self.attributes[:errors] || {}
+      messages[:message] = self.error if self.respond_to?(:error) && self.error.present?
+      messages
     end
     
     def errors_params

data/lib/quandl/cassinatra/middleware/parse_json.rb

@@ -14,7 +14,7 @@ class ParseJSON < Faraday::Response::Middleware
   end
 
   def parse(body, env)
-    json = parse_json(body)
+    json = parse_json(body, env)
     errors = json.delete(:errors) || {}
     metadata = json.delete(:metadata) || {}
     # collect some response data
@@ -32,14 +32,22 @@ class ParseJSON < Faraday::Response::Middleware
     object
   end
 
-  def parse_json(body = nil)
+  def parse_json(body = nil, env)
     body ||= '{}'
-    message = "Response from the API must behave like a Hash or an Array (last JSON response was #{body.inspect})"
-
     json = begin
       Yajl.load(body, :symbolize_keys => true)
     rescue Yajl::ParseError
-      { id: 1, errors: { parse_error: message } }
+      nil
+    end
+    # invalid json body?
+    if json.blank?
+      # fallback to error message
+      json = { 
+        id: 1, 
+        errors: { 
+          parse_error:  "Invalid Cassinatra API response. status: #{env[:status]} (last JSON response was #{body.inspect})"
+        }
+      }
     end
     json
   end

data/lib/quandl/cassinatra/version.rb

@@ -1,5 +1,5 @@
 module Quandl
 module Cassinatra
-  VERSION = '0.1.14'
+  VERSION = '0.1.15'
 end
 end

data/spec/quandl/cassinatra/dataset/persistence_spec.rb

@@ -30,7 +30,6 @@ describe Dataset do
         subject.column_ids.count.should eq 3
       end
       it "should each be present" do
-        puts "subject.column_ids #{subject.column_ids}"
         subject.column_ids.each{|cid| cid.present?.should be_true }
       end
     end

data/spec/spec_helper.rb

@@ -15,6 +15,6 @@ end
 # LOAD GEM
 
 require "quandl/cassinatra"
-# Quandl::Cassinatra.use 'http://192.168.33.10:8983/wikiposit_cassandra/'
-Quandl::Cassinatra.use 'http://localhost:9292/'
+Quandl::Cassinatra.use 'http://192.168.33.10:8983/wikiposit_cassandra/'
+# Quandl::Cassinatra.use 'http://localhost:9292/'
 include Quandl::Cassinatra

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: quandl_cassinatra
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.15
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-15 00:00:00.000000000 Z
+date: 2013-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake