zendesk_api 1.0.0 → 1.0.1

data/Gemfile.lock

@@ -7,7 +7,7 @@ GIT
 PATH
   remote: .
   specs:
-    zendesk_api (1.0.0)
+    zendesk_api (1.0.1)
       faraday (>= 0.8.0)
       faraday_middleware (>= 0.8.7)
       hashie (>= 1.2)

data/lib/zendesk_api/collection.rb

@@ -126,7 +126,7 @@ module ZendeskAPI
           raise "this collection is for #{@resource_class}"
         end
       else
-        @resources << wrap_resource(item)
+        @resources << wrap_resource(item, true)
       end
     end
 
@@ -363,14 +363,17 @@ module ZendeskAPI
     end
 
     # Simplified Associations#wrap_resource
-    def wrap_resource(res)
+    def wrap_resource(res, with_association = @resource_class == Tag)
       case res
       when Array
         wrap_resource(Hash[*res])
       when Hash
-        @resource_class.new(@client, res.merge(:association => association))
+        res = res.merge(:association => @association) if with_association
+        @resource_class.new(@client, res)
       else
-        @resource_class.new(@client, :id => res, :association => association)
+        res = { :id => res }
+        res.merge!(:association => @association) if with_association
+        @resource_class.new(@client, res)
       end
     end
 

data/lib/zendesk_api/middleware/response/raise_error.rb

@@ -4,6 +4,13 @@ module ZendeskAPI
   module Middleware
     module Response
       class RaiseError < Faraday::Response::RaiseError
+
+        def call(env)
+          super
+        rescue Faraday::Error::TimeoutError, Faraday::Error::ConnectionFailed => e
+          raise Error::NetworkError.new(e)
+        end
+
         def on_complete(env)
           case env[:status]
           when 404

data/lib/zendesk_api/resource.rb

@@ -92,8 +92,8 @@ module ZendeskAPI
     end
 
     # Returns the path to the resource
-    def path(*args)
-      @association.generate_path(self, *args)
+    def path(options = {})
+      @association.generate_path(self, options)
     end
 
     # Passes #to_json to the underlying attributes hash

data/lib/zendesk_api/version.rb

@@ -1,3 +1,3 @@
 module ZendeskAPI
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/spec/core/collection_spec.rb

@@ -703,5 +703,21 @@ describe ZendeskAPI::Collection do
         subject.create
       end
     end
+
+    context "resources" do
+      before(:each) do
+        stub_json_request(:get, %r{test_resources/active},
+          json(:test_resources => [{ :id => 1 }]))
+
+        subject.fetch
+
+        stub_json_request(:put, %r{test_resources/1})
+      end
+
+      it "should not save using the collection path" do
+        resource = subject.first
+        resource.save
+      end
+    end
   end
 end

data/spec/core/middleware/response/raise_error_spec.rb

@@ -1,40 +1,63 @@
 require 'core/spec_helper'
 
 describe ZendeskAPI::Middleware::Response::RaiseError do
-  before(:each) do
-    stub_request(:any, /.*/).to_return(:status => status)
-  end
+  context "with a failed connection" do
+    context "connection failed" do
+      before(:each) do
+        stub_request(:any, /.*/).to_raise(Faraday::Error::ConnectionFailed)
+      end
+
+      it "should raise NetworkError" do
+        expect { client.connection.get "/non_existent" }.to raise_error(ZendeskAPI::Error::NetworkError)
+      end
+    end
 
-  context "with status = 404" do
-    let(:status) { 404 }
+    context "connection timeout" do
+      before(:each) do
+        stub_request(:any, /.*/).to_timeout
+      end
 
-    it "should raise RecordNotFound when status is 404" do
-      expect { client.connection.get "/non_existent" }.to raise_error(ZendeskAPI::Error::RecordNotFound)
+      it "should raise NetworkError" do
+        expect { client.connection.get "/non_existent" }.to raise_error(ZendeskAPI::Error::NetworkError)
+      end
     end
   end
 
-  context "with status in 400...600" do
-    let(:status) { 500 }
+  context "status errors" do
+    before(:each) do
+      stub_request(:any, /.*/).to_return(:status => status)
+    end
 
-    it "should raise NetworkError" do
-      expect { client.connection.get "/non_existent" }.to raise_error(ZendeskAPI::Error::NetworkError)
+    context "with status = 404" do
+      let(:status) { 404 }
+
+      it "should raise RecordNotFound when status is 404" do
+        expect { client.connection.get "/non_existent" }.to raise_error(ZendeskAPI::Error::RecordNotFound)
+      end
     end
-  end
 
-  context "with status = 422" do
-    let(:status) { 422 }
+    context "with status in 400...600" do
+      let(:status) { 500 }
 
-    it "should raise RecordInvalid" do
-      expect { client.connection.get "/non_existent" }.to raise_error(ZendeskAPI::Error::RecordInvalid)
+      it "should raise NetworkError" do
+        expect { client.connection.get "/non_existent" }.to raise_error(ZendeskAPI::Error::NetworkError)
+      end
     end
-  end
 
-  context "with status = 200" do
-    let(:status) { 200 }
+    context "with status = 422" do
+      let(:status) { 422 }
 
-    it "should not raise" do
-      client.connection.get "/abcdef"
+      it "should raise RecordInvalid" do
+        expect { client.connection.get "/non_existent" }.to raise_error(ZendeskAPI::Error::RecordInvalid)
+      end
+    end
+
+    context "with status = 200" do
+      let(:status) { 200 }
+
+      it "should not raise" do
+        client.connection.get "/abcdef"
+      end
     end
   end
 end
-

metadata

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