datacatalog 0.4.11 → 0.4.12

data/Rakefile

@@ -5,7 +5,7 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
     gem.name = "datacatalog"
-    gem.version = '0.4.11'
+    gem.version = '0.4.12'
     gem.rubyforge_project = "datacatalog"
     gem.summary = %Q{Client for the National Data Catalog API}
     gem.description = %Q{A Ruby client library for the National Data Catalog API}

data/datacatalog.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{datacatalog}
-  s.version = "0.4.11"
+  s.version = "0.4.12"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Luigi Montanez", "David James"]
-  s.date = %q{2010-03-12}
+  s.date = %q{2010-03-17}
   s.description = %q{A Ruby client library for the National Data Catalog API}
   s.email = %q{luigi@sunlightfoundation.com}
   s.extra_rdoc_files = [

data/lib/base.rb

@@ -21,12 +21,12 @@ module DataCatalog
     
     def self.check_status(response)
       case response.code
-      when 400: raise BadRequest,          error(response)
-      when 401: raise Unauthorized,        error(response)
-      when 403: raise Forbidden,           error(response)
-      when 404: raise NotFound,            error(response)
-      when 409: raise Conflict,            error(response)
-      when 500: raise InternalServerError, error(response)
+      when 400 then error(BadRequest,          response)
+      when 401 then error(Unauthorized,        response)
+      when 403 then error(Forbidden,           response)
+      when 404 then error(NotFound,            response)
+      when 409 then error(Conflict,            response)
+      when 500 then error(InternalServerError, response)
       end
       response
     end
@@ -40,17 +40,21 @@ module DataCatalog
       })
     end
     
-    def self.error(response)
-      parsed_body = JSON.parse(response.body)
-      if parsed_body.empty?
-        "Response was empty"
-      elsif parsed_body["errors"]
-        parsed_body["errors"].inspect
-      else
-        response.body
+    def self.error(exception_class, response)
+      e = exception_class.new
+      e.response_body = response.body
+      parsed_response_body = begin
+        JSON.parse(response.body)
+      rescue JSON::ParserError
+        nil
+      end
+      if !parsed_response_body.empty?
+        e.parsed_response_body = parsed_response_body
+        if parsed_response_body["errors"]
+          e.errors = parsed_response_body["errors"]
+        end
       end
-    rescue JSON::ParserError
-      "Unable to parse: #{response.body.inspect}"
+      raise e
     end
     
     def self._first(response)

data/lib/main.rb

@@ -2,7 +2,12 @@ module DataCatalog
   
   # == Exceptions
   
-  class Error                     < RuntimeError; end
+  class Error < RuntimeError
+    attr_accessor :response_body        # String
+    attr_accessor :parsed_response_body # Hash
+    attr_accessor :errors               # Hash
+  end
+
   class BadRequest                < Error; end # 400
   class Unauthorized              < Error; end # 401
   class Forbidden                 < Error; end # 403

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 11
-  version: 0.4.11
+  - 12
+  version: 0.4.12
 platform: ruby
 authors: 
 - Luigi Montanez
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-12 00:00:00 -05:00
+date: 2010-03-17 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency