zendesk_api 0.2.4 → 0.2.5

data/Gemfile

@@ -4,6 +4,7 @@ gem "simplecov", :platforms => :ruby_19, :group => :development
 gem "jruby-openssl", :platforms => :jruby
 gem "hashie", :git => "git://github.com/intridea/hashie.git"
 gem "multipart-post", :git => "git://github.com/steved555/multipart-post.git"
+gem "multi_json", :group => :test
 
 group :server do
   gem "rack-ssl-enforcer"

data/Gemfile.lock

@@ -13,7 +13,7 @@ GIT
 PATH
   remote: .
   specs:
-    zendesk_api (0.2.4)
+    zendesk_api (0.2.5)
       faraday (>= 0.8.0)
       faraday_middleware (>= 0.8.7)
       hashie
@@ -32,10 +32,12 @@ GEM
       i18n (~> 0.6)
       multi_json (~> 1.0)
     addressable (2.3.2)
-    backports (2.6.5)
+    backports (2.8.2)
     bond (0.4.3)
+    bond (0.4.3-java)
     bootstrap-sass (2.2.2.0)
       sass (~> 3.2)
+    bouncy-castle-java (1.5.0146.1)
     builder (3.0.4)
     bump (0.3.9)
     chunky_png (1.2.7)
@@ -50,25 +52,28 @@ GEM
     database_cleaner (0.9.1)
     diff-lcs (1.1.3)
     eventmachine (1.0.0)
-    faraday (0.8.4)
+    eventmachine (1.0.0-java)
+    faraday (0.8.5)
       multipart-post (~> 1.1)
     faraday_middleware (0.9.0)
       faraday (>= 0.7.4, < 0.9)
-    fssm (0.2.9)
+    fssm (0.2.10)
     haml (3.1.7)
     i18n (0.6.1)
     inflection (1.0.0)
+    jruby-openssl (0.8.2)
+      bouncy-castle-java (>= 1.5.0146.1)
     json (1.7.6)
-    mime-types (1.19)
-    mongoid (3.0.16)
+    mime-types (1.20.1)
+    mongoid (3.0.21)
       activemodel (~> 3.1)
-      moped (~> 1.1)
+      moped (~> 1.2)
       origin (~> 1.0)
       tzinfo (~> 0.3.22)
     moped (1.3.2)
     multi_json (1.5.0)
     origin (1.0.11)
-    rack (1.4.3)
+    rack (1.5.1)
     rack-protection (1.3.2)
       rack
     rack-ssl-enforcer (0.2.5)
@@ -85,15 +90,15 @@ GEM
     rspec-core (2.12.2)
     rspec-expectations (2.12.1)
       diff-lcs (~> 1.1.3)
-    rspec-mocks (2.12.1)
+    rspec-mocks (2.12.2)
     sass (3.2.5)
     simplecov (0.7.1)
       multi_json (~> 1.0)
       simplecov-html (~> 0.7.1)
     simplecov-html (0.7.1)
-    sinatra (1.3.3)
-      rack (~> 1.3, >= 1.3.6)
-      rack-protection (~> 1.2)
+    sinatra (1.3.4)
+      rack (~> 1.4)
+      rack-protection (~> 1.3)
       tilt (~> 1.3, >= 1.3.3)
     sinatra-contrib (1.3.2)
       backports (>= 2.0)
@@ -108,9 +113,10 @@ GEM
     webmock (1.9.0)
       addressable (>= 2.2.7)
       crack (>= 0.1.7)
-    yard (0.8.3)
+    yard (0.8.4.1)
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES
@@ -124,6 +130,7 @@ DEPENDENCIES
   hashie!
   jruby-openssl
   mongoid
+  multi_json
   multipart-post!
   rack-ssl-enforcer
   rake

data/lib/zendesk_api/rescue.rb

@@ -20,14 +20,16 @@ module ZendeskAPI
       def attach_error(e)
         return unless e.response
 
-        if error = e.response[:body]
-          if error.is_a?(Hash)
+        if respond_to?("error_message=")
+          self.error_message = nil
+
+          if (error = e.response[:body]) && error.is_a?(Hash)
             error = Hashie::Mash.new(error)
-            self.error_message = (error.error || error.description) if respond_to?("error_message=")
+            self.error_message = (error.error || error.description)
           end
-
-          self.error = error if respond_to?("error=")
         end
+
+        self.error = e if respond_to?("error=")
       end
 
       def rescue_client_error(*args)

data/lib/zendesk_api/version.rb

@@ -1,3 +1,3 @@
 module ZendeskAPI
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
 end

data/spec/core/rescue_spec.rb

@@ -61,21 +61,55 @@ describe ZendeskAPI::Rescue do
   end
 
   context "when class has error attributes", :silence_logger do
-    let(:response) {{ :body => { :error => { :description => "hello" } } }}
     let(:instance) { Boom.new(client) }
 
-    before do
-      Boom.send(:attr_accessor, :error, :error_message)
-
+    let(:exception) do
       exception = Exception.new("message")
       exception.set_backtrace([])
+      exception
+    end
+
+    let(:error) do
+      Faraday::Error::ClientError.new(exception, response)
+    end
 
-      error = Faraday::Error::ClientError.new(exception, response)
+    before do
+      Boom.send(:attr_accessor, :error, :error_message)
       instance.puff(error)
     end
 
-    it "should attach the error" do
-      instance.error.should_not be_nil
+    context "with no response" do
+      let(:response) {{}}
+
+      it "should attach the error" do
+        instance.error.should_not be_nil
+      end
+
+      it "should not attach the message" do
+        instance.error_message.should be_nil
+      end
+    end
+
+    context "with a response" do
+      let(:response) {{ :body => { :error => { :description => "hello" } } }}
+
+      it "should attach the error" do
+        instance.error.should_not be_nil
+      end
+
+      it "should attach the error message" do
+        instance.error_message.should_not be_nil
+      end
+
+      context "and again with no response" do
+        before do
+          instance.puff(Faraday::Error::ClientError.new(exception, {}))
+        end
+
+        it "should clear the error message" do
+          instance.error_message.should be_nil
+        end
+      end
     end
   end
 

data/spec/live/ticket_spec.rb

@@ -51,8 +51,7 @@ describe ZendeskAPI::Ticket do
 
     it "is able to do next" do
       first = results.to_a.first
-      recent_url = "api/v2/exports/tickets.json\\?start_time=#{Time.now.to_i.to_s[0..5]}"
-      stub_json_request(:get, /#{recent_url}/, json(:results => []))
+      stub_json_request(:get, %r{/api/v2/exports/tickets}, json(:results => []))
 
       results.next
       results.first.should_not == first

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zendesk_api
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-04 00:00:00.000000000 Z
+date: 2013-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bump