datacatalog 0.4.12 → 0.4.13

data/Rakefile

@@ -5,7 +5,7 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
     gem.name = "datacatalog"
-    gem.version = '0.4.12'
+    gem.version = '0.4.13'
     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.12"
+  s.version = "0.4.13"
 
   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-17}
+  s.date = %q{2010-04-13}
   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

@@ -48,9 +48,9 @@ module DataCatalog
       rescue JSON::ParserError
         nil
       end
-      if !parsed_response_body.empty?
+      if parsed_response_body
         e.parsed_response_body = parsed_response_body
-        if parsed_response_body["errors"]
+        if parsed_response_body.is_a?(Hash) && parsed_response_body["errors"]
           e.errors = parsed_response_body["errors"]
         end
       end
@@ -89,7 +89,9 @@ module DataCatalog
         "#{k}" + if v.is_a?(Regexp)
           %(:"#{v.source}")
         elsif v.is_a?(Integer) || v.is_a?(TrueClass) || v.is_a?(FalseClass)
-          %(=#{v})          
+          %(=#{v})
+        elsif v.is_a?(Array)
+          %(=#{v.join(',')})
         else
           %(="#{v}")
         end

data/lib/main.rb

@@ -39,9 +39,9 @@ module DataCatalog
   def self.with_key(temp_key)
     original_key = DataCatalog.api_key
     DataCatalog.api_key = temp_key
-    result = yield
+    yield
+  ensure
     DataCatalog.api_key = original_key
-    result
   end
 
 end

data/spec/base_spec.rb

@@ -57,31 +57,61 @@ describe Base do
   end
 
   describe ".error" do
-    it "should return an 'Unable to parse:' message when body is blank" do
+    it "should ... when body is blank" do
       response = HTTParty::Response.new(nil, '', 404, 'Not Found', {})
-      Base.error(response).should == %(Unable to parse: "")
+      begin
+        e = Base.error(NotFound, response)
+      rescue NotFound => e
+        e.response_body.should == ''
+        e.parsed_response_body.should == nil
+        e.errors.should == nil
+      end
     end
     
-    it "should return 'Response was empty' when body is an empty JSON object" do
+    it "should be correct when body is an empty hash" do
       response = HTTParty::Response.new(nil, '{}', 404, 'Not Found', {})
-      Base.error(response).should == "Response was empty"
+      begin
+        e = Base.error(NotFound, response).should == "Response was empty"
+      rescue NotFound => e
+        e.response_body.should == '{}'
+        e.parsed_response_body.should == {}
+        e.errors.should == nil
+      end
     end
     
-    it "should return 'Response was empty' when body is an empty array" do
+    it "should be correct when body is an empty array" do
       response = HTTParty::Response.new(nil, '[]', 404, 'Not Found', {})
-      Base.error(response).should == "Response was empty"
+      begin
+        e = Base.error(NotFound, response)
+      rescue NotFound => e
+        e.response_body.should == '[]'
+        e.parsed_response_body.should == []
+        e.errors.should == nil
+      end
     end
     
-    it "should return the contents of the errors hash when it exists" do
+    it "should be correct when body has errors hash" do
       errors = '{"errors":["bad_error"]}'
       response = HTTParty::Response.new(nil, errors, 400, 'Bad Request', {})
-      Base.error(response).should == '["bad_error"]'
+      begin
+        e = Base.error(BadRequest, response)
+      rescue BadRequest => e
+        e.response_body.should == '{"errors":["bad_error"]}'
+        e.parsed_response_body.should == {"errors" => ["bad_error"]}
+        e.errors.should == ["bad_error"]
+      end
     end
     
-    it "should return the contents of the response body when no errors hash exists" do
+    it "should be correct when body has hash" do
       errors = '{"foo":["bar"]}'
       response = HTTParty::Response.new(nil, errors, 400, 'Bad Request', {})
-      Base.error(response).should == '{"foo":["bar"]}'
+      begin
+        e = Base.error(BadRequest, response)
+      rescue BadRequest => e
+        e.response_body.should == '{"foo":["bar"]}'
+        e.parsed_response_body.should == {"foo" => ["bar"]}
+        e.errors.should == nil
+      end
     end
   end
 
@@ -130,6 +160,10 @@ describe Base do
     it "should work with periods" do
       Base.filterize('released.year' => 2008).should == %(released.year=2008)
     end
+
+    it "should support 'or' by converting arrays to commas" do
+      Base.filterize('id' => [800, 801, 802]).should == %(id=800,801,802)
+    end
     
     it "should pass through strings" do
       ["count > 0", "count >= 1"].each do |s|

data/spec/datacatalog_spec.rb

@@ -31,6 +31,18 @@ describe DataCatalog do
         42
       end.should == 42
     end
+    
+    it "should still reset the API key when the block throws an exception" do
+      regular_key = '4159179f32ff8fefd2c6d48b7e675e7736bf1357'
+      DataCatalog.api_key = regular_key
+      temporary_key = '0000123400001234000012340000123400001234'
+      expect {
+        DataCatalog.with_key(temporary_key) do
+          raise Exception
+        end
+      }.to raise_error(Exception)
+      DataCatalog.api_key.should == regular_key 
+    end
   end
 
 end

metadata

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