fluidinfo 0.5.1 → 0.6.0

data/VERSION

@@ -1 +1 @@
-0.5.1
+0.6.0

data/fluidinfo.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "fluidinfo"
-  s.version = "0.5.1"
+  s.version = "0.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Eric Seidel"]

data/lib/fluidinfo/client.rb

@@ -59,6 +59,8 @@ module Fluidinfo
       url = build_url path, options
       headers = options[:headers] || {}
       Response.new(@client[url].get headers)
+    rescue RestClient::Exception => e
+      Response.new e.response
     end
 
     ##
@@ -73,6 +75,8 @@ module Fluidinfo
       url = build_url path, options
       headers = options[:headers] || {}
       Response.new(@client[url].head headers)
+    rescue RestClient::Exception => e
+      Response.new e.response
     end
 
     ##
@@ -94,6 +98,8 @@ module Fluidinfo
         headers.merge! :content_type => "application/json"
       end
       Response.new(@client[url].post body, headers)
+    rescue RestClient::Exception => e
+      Response.new e.response
     end
 
     ##
@@ -111,6 +117,8 @@ module Fluidinfo
       body, mime = build_payload options
       headers = (options[:headers] || {}).merge :content_type => mime
       Response.new(@client[url].put body, headers)
+    rescue RestClient::Exception => e
+      Response.new e.response
     end
 
     ##
@@ -128,6 +136,8 @@ module Fluidinfo
       headers = options[:headers] || {}
       # nothing returned in response body for DELETE
       Response.new(@client[url].delete headers)
+    rescue RestClient::Exception => e
+      Response.new e.response
     end
 
     private

data/lib/fluidinfo/response.rb

@@ -15,10 +15,13 @@ module Fluidinfo
     attr_reader :content
     # [Hash, String] The parsed response if the +Content-Type+ was one of {Fluidinfo::JSON_TYPES}, otherwise equivalent to {#content}.
     attr_reader :value
+    # [String] The error, if any, returned by Fluidinfo
+    attr_reader :error
 
     def initialize(response)
       @status   = response.code
       @headers  = response.headers
+      @error    = @headers[:x_fluiddb_error_class]
       @content  = response.body
       @value    = if JSON_TYPES.include? @headers[:content_type]
                     Yajl.load @content

data/spec/fluidinfo_spec.rb

@@ -1,5 +1,5 @@
-require 'fluidinfo'
-require 'uuidtools'
+require "fluidinfo"
+require "uuidtools"
 
 describe Fluidinfo do
   describe "GET" do
@@ -10,7 +10,7 @@ describe Fluidinfo do
     it "should return a Fluidinfo::Response" do
       r = @fluid.get("/about/fluidinfo")
       r.should be_a(Fluidinfo::Response)
-      r.should respond_to(:status, :content, :headers, :value)
+      r.should respond_to(:status, :content, :headers, :value, :error)
     end
 
     describe "/objects" do
@@ -46,10 +46,10 @@ describe Fluidinfo do
         @fluid.get("/objects/#{uid}").value.should eq(expected)
       end
 
-      it "should raise 404 errors on bad request" do
-        uid = "1"
-        tag = "gridaphobe/given-name"
-        expect{@fluid.get "/objects/#{uid}/#{tag}"}.to raise_error(RestClient::ResourceNotFound)
+      it "should contain an error message for failed requests" do
+        r = @fluid.get "/about/1/gridaphobe/given-name"
+        r.status.should eq(404)
+        r.error.should eq("TNoInstanceOnObject")
       end
     end
 
@@ -107,7 +107,7 @@ describe Fluidinfo do
     it "should return a Fluidinfo::Response" do
       r = @fluid.post("/objects")
       r.should be_a(Fluidinfo::Response)
-      r.should respond_to(:status, :content, :headers, :value)
+      r.should respond_to(:status, :content, :headers, :value, :error)
     end
 
     describe "/namespaces" do
@@ -135,7 +135,7 @@ describe Fluidinfo do
     it "should return a Fluidinfo::Response" do
       r = @fluid.put("/about/fluidinfo/test/tag", :body => nil)
       r.should be_a(Fluidinfo::Response)
-      r.should respond_to(:status, :content, :headers, :value)
+      r.should respond_to(:status, :content, :headers, :value, :error)
       @fluid.delete("/about/fluidinfo/test/tag")
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluidinfo
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-09-17 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70240390467800 !ruby/object:Gem::Requirement
+  requirement: &70356298260880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.6.7
   type: :runtime
   prerelease: false
-  version_requirements: *70240390467800
+  version_requirements: *70356298260880
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70240390467260 !ruby/object:Gem::Requirement
+  requirement: &70356298260400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70240390467260
+  version_requirements: *70356298260400
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70240390466660 !ruby/object:Gem::Requirement
+  requirement: &70356298259920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *70240390466660
+  version_requirements: *70356298259920
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70240390466120 !ruby/object:Gem::Requirement
+  requirement: &70356298259380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70240390466120
+  version_requirements: *70356298259380
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70240390465540 !ruby/object:Gem::Requirement
+  requirement: &70356298258840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70240390465540
+  version_requirements: *70356298258840
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70240390464960 !ruby/object:Gem::Requirement
+  requirement: &70356298258320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70240390464960
+  version_requirements: *70356298258320
 - !ruby/object:Gem::Dependency
   name: uuidtools
-  requirement: &70240390464380 !ruby/object:Gem::Requirement
+  requirement: &70356298257820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 2.1.2
   type: :development
   prerelease: false
-  version_requirements: *70240390464380
+  version_requirements: *70356298257820
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70240390463800 !ruby/object:Gem::Requirement
+  requirement: &70356298257340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,7 +98,7 @@ dependencies:
         version: 0.7.2
   type: :development
   prerelease: false
-  version_requirements: *70240390463800
+  version_requirements: *70356298257340
 description: This gem provides a simple interface to fluidinfo, built on top of the
   rest-client gem.
 email: gridaphobe@gmail.com
@@ -137,7 +137,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1150775427864763998
+      hash: 3931394328916850819
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: