zendesk_api 1.3.7 → 1.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8b73e0b2eea3b49827b9c51e491844b3b1c8aaa
-  data.tar.gz: 2fc0ef98f91e5e7b72233f60cd486975b099f830
+  metadata.gz: e9b5cc8be9234d6da4cd1b90cbdf4462bf7d1fa7
+  data.tar.gz: ae424a078cd9a89561d9acc2be8e31b979611139
 SHA512:
-  metadata.gz: 7914bfee9601f839db64cd49a025f27f693ba0ffee305db7e259494da1664f8837c56e1434738b2be972283ebdf381b9dc11bd227d334faaa32d4d8cff18c89a
-  data.tar.gz: 6a847c4d6996077966632fd9d07cf2568c93180246d2561707b61b617dca9161e0833d8baf402eaa82b8c62bedcd8359f4cd2b6c0bbc57f7b6019c69442c9d4f
+  metadata.gz: 9fc5f11d463221cb917757de68241566ea3ea972ccacb68a10d8e2ecd4f7a17101493af05de639f18cc04263fe02d292083bff7acbdfb60f21fb2c9712730083
+  data.tar.gz: 40bbdf4e474b4662f395deaf59c04ccd854c74d609da8af4187be052c30d79ebc54c3a0671efb15d22a02eb1e0a6d656b866c71d1e8072fecff6d8fc2ea18881

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    zendesk_api (1.3.7)
+    zendesk_api (1.3.8)
       faraday (~> 0.9)
       hashie (>= 1.2)
       inflection
@@ -38,7 +38,7 @@ GEM
     erubis (2.7.0)
     faraday (0.9.0)
       multipart-post (>= 1.2, < 3)
-    hashie (2.1.1)
+    hashie (3.0.0)
     hike (1.2.3)
     i18n (0.6.9)
     inflection (1.0.0)

data/lib/zendesk_api/actions.rb

@@ -25,7 +25,7 @@ module ZendeskAPI
         yield req if block_given?
       end
 
-      handle_response
+      handle_response(@response)
 
       @attributes.clear_changes
       clear_associations
@@ -70,12 +70,6 @@ module ZendeskAPI
         end
       end
     end
-
-    def handle_response
-      if @response.body && @response.body[self.class.singular_resource_name]
-        @attributes.replace @attributes.deep_merge(@response.body[self.class.singular_resource_name] || {})
-      end
-    end
   end
 
   module Read
@@ -102,7 +96,8 @@ module ZendeskAPI
         yield req if block_given?
       end
 
-      new(client, response.body[singular_resource_name]).tap do |resource|
+      new(client).tap do |resource|
+        resource.handle_response(response)
         resource.set_includes(resource, includes, response.body)
         resource.attributes.clear_changes
       end

data/lib/zendesk_api/resource.rb

@@ -143,6 +143,12 @@ module ZendeskAPI
   class DataResource < Data
     attr_accessor :error, :error_message
     extend Verbs
+
+    def handle_response(response)
+      if response.body && response.body[self.class.singular_resource_name]
+        @attributes.replace(@attributes.deep_merge(response.body[self.class.singular_resource_name]))
+      end
+    end
   end
 
   # Represents a resource that can only GET

data/lib/zendesk_api/resources.rb

@@ -117,6 +117,9 @@ module ZendeskAPI
     has_many Tag, :extend => Tag::Update, :inline => :create
   end
 
+  class Brand < Resource
+  end
+
   class ForumSubscription < Resource
     has Forum
     has User
@@ -347,6 +350,7 @@ module ZendeskAPI
     has Group
     has :forum_topic, :class => Topic
     has Organization
+    has Brand
     has :related, :class => TicketRelated
 
     has Comment, :inline => true
@@ -628,8 +632,8 @@ module ZendeskAPI
       attributes.changes
     end
 
-    def handle_response
-      @attributes.replace(@response.body) if @response.body
+    def handle_response(response)
+      @attributes.replace(response.body) if response.body
     end
   end
 
@@ -645,16 +649,12 @@ module ZendeskAPI
       attributes.changes
     end
 
-    def handle_response
-      @attributes.replace(@response.body) if @response.body
+    def handle_response(response)
+      @attributes.replace(response.body) if response.body
     end
   end
 
-  class App < DataResource
-    include Create
-    include Update
-    include Destroy
-
+  class App < Resource
     def initialize(client, attributes = {})
       attributes[:upload_id] ||= nil
 
@@ -717,8 +717,8 @@ module ZendeskAPI
       attributes.changes
     end
 
-    def handle_response
-      @attributes.replace(@response.body) if @response.body
+    def handle_response(response)
+      @attributes.replace(response.body) if response.body
     end
   end
 end

data/lib/zendesk_api/version.rb

@@ -1,3 +1,3 @@
 module ZendeskAPI
-  VERSION = "1.3.7"
+  VERSION = "1.3.8"
 end

data/spec/core/client_spec.rb

@@ -34,7 +34,7 @@ describe ZendeskAPI::Client do
     it "should handle valid url" do
       expect do
         ZendeskAPI::Client.new do |config|
-          config.url = "https://example.zendesk.com/"
+          config.url = "https://example.zendesk.com/api/v2"
         end.to_not raise_error
       end
     end
@@ -42,7 +42,7 @@ describe ZendeskAPI::Client do
     context "basic_auth" do
       subject do
         ZendeskAPI::Client.new do |config|
-          config.url = "https://example.zendesk.com"
+          config.url = "https://example.zendesk.com/api/v2"
           config.username = "hello"
           config.password = "token"
         end
@@ -60,7 +60,7 @@ describe ZendeskAPI::Client do
     context "access token" do
       subject do
         ZendeskAPI::Client.new do |config|
-          config.url = "https://example.zendesk.com"
+          config.url = "https://example.zendesk.com/api/v2"
           config.access_token = "hello"
         end
       end
@@ -77,7 +77,7 @@ describe ZendeskAPI::Client do
     context "#token" do
       let(:client) do
         ZendeskAPI::Client.new do |config|
-          config.url = "https://example.zendesk.com"
+          config.url = "https://example.zendesk.com/api/v2"
           config.username = username
           config.token = "token"
         end
@@ -116,7 +116,7 @@ describe ZendeskAPI::Client do
     context "#logger" do
       before(:each) do
         @client = ZendeskAPI::Client.new do |config|
-          config.url = "https://example.zendesk.com/"
+          config.url = "https://example.zendesk.com/api/v2"
           config.logger = subject
         end
 

data/spec/core/collection_spec.rb

@@ -391,7 +391,7 @@ describe ZendeskAPI::Collection do
     end
 
     context "with a hash" do
-      let(:object) { mock('ZendeskAPI::TestResource', :changes => [:xxx], :changed? => true, :destroyed? => false) }
+      let(:object) { double('ZendeskAPI::TestResource', :changes => [:xxx], :changed? => true, :destroyed? => false) }
 
       it "should call create with those options" do
         ZendeskAPI::TestResource.should_receive(:new).
@@ -425,7 +425,7 @@ describe ZendeskAPI::Collection do
 
     context "with everything else" do
       it "should pass to new, since this is how attachment handles it" do
-        attachment = mock(:changes => [:xxx], :changed? => true, :destroyed? => false)
+        attachment = double(:changes => [:xxx], :changed? => true, :destroyed? => false)
         ZendeskAPI::TestResource.should_receive(:new).
           with(client, :id => "img.jpg", :association => instance_of(ZendeskAPI::Association)).
           and_return attachment

data/spec/core/read_resource_spec.rb

@@ -21,6 +21,30 @@ describe ZendeskAPI::ReadResource do
       }.to raise_error("No :id given")
     end
 
+    context "with overriden handle_response" do
+      subject do
+        Class.new(ZendeskAPI::TestResource) do
+          def self.singular_resource_name
+            'hello'
+          end
+
+          def handle_response(response)
+            @attributes.replace(response.body)
+          end
+        end
+      end
+
+      before(:each) do
+        stub_json_request(:get, %r{hellos/#{id}}, json(:testing => 1))
+      end
+
+      it "should return instance of resource" do
+        object = subject.find(client, :id => id)
+        object.should be_instance_of(subject)
+        object.testing.should == 1
+      end
+    end
+
     context "with side loads" do
       before(:each) do
         stub_json_request(:get, %r{test_resources/#{id}\?include=nil_resource}, json(

data/spec/core/resource_spec.rb

@@ -496,10 +496,14 @@ describe ZendeskAPI::Resource do
 
   context "SingularTestResource" do
     context "#find" do
+      before do
+        stub_json_request(:get, %r{/singular_test_resource})
+      end
+
       it "should not require an id" do
         expect do
           ZendeskAPI::SingularTestResource.find(client)
-        end.to_not raise_error(ArgumentError)
+        end.to_not raise_error
       end
     end
 

data/spec/core/spec_helper.rb

@@ -23,6 +23,8 @@ require File.join(File.dirname(__FILE__), '..', 'macros', 'resource_macros')
 require File.join(File.dirname(__FILE__), '..', 'fixtures', 'zendesk')
 require File.join(File.dirname(__FILE__), '..', 'fixtures', 'test_resources')
 
+$credentials_warning = false
+
 # tests fail when this is included in a Module (someone else also defines client)
 def client
   credentials = File.join(File.dirname(__FILE__), '..', 'fixtures', 'credentials.yml')
@@ -60,8 +62,12 @@ def client
           config.allow_http = true
         end
       else
-        puts "using default credentials: live specs will fail."
-        puts "add your credentials to spec/fixtures/credentials.yml (see: spec/fixtures/credentials.yml.example)"
+        unless $credentials_warning
+          STDERR.puts "using default credentials: live specs will fail."
+          STDERR.puts "add your credentials to spec/fixtures/credentials.yml (see: spec/fixtures/credentials.yml.example)"
+          $credentials_warning = true
+        end
+
         config.username = "please.change"
         config.password = "me"
         config.url = "https://my.zendesk.com/api/v2"

data/spec/fixtures/zendesk.rb

@@ -82,5 +82,11 @@ module ZendeskAPI
         @organization ||= current_user.organization
       end
     end
+
+    def brand
+      VCR.use_cassette('valid_brand') do
+        @brand ||= current_user.brand
+      end
+    end
   end
 end

data/spec/live/app_installation_spec.rb

@@ -42,6 +42,7 @@ describe ZendeskAPI::AppInstallation do
 
     installations = client.app.installations
     VCR.use_cassette("app_install_fetch") { installations.fetch! }
+    VCR.use_cassette("app_install_find") { client.app.installations.find!(:id => install.id) }
 
     installations.should include(install)
 

data/spec/live/app_spec.rb

@@ -22,6 +22,7 @@ describe ZendeskAPI::App do
 
     app.author_name.should == "Mr. Sprinkles"
 
+    VCR.use_cassette("app_find") { client.apps.find!(:id => app.id) }
     VCR.use_cassette("app_destroy") { app.destroy! }
   end
 

data/spec/live/brand_spec.rb

@@ -0,0 +1,12 @@
+require 'core/spec_helper'
+
+describe ZendeskAPI::Brand, :delete_after do
+  def valid_attributes
+    { :name => "Awesome-O" }
+  end
+
+  it_should_be_creatable
+  it_should_be_updatable :name
+  it_should_be_deletable
+  it_should_be_readable :brands, :create => true
+end

data/spec/live/ticket_spec.rb

@@ -21,6 +21,7 @@ describe ZendeskAPI::Ticket do
   it_should_be_readable user, :requested_tickets
   it_should_be_readable agent, :ccd_tickets
   it_should_be_readable organization, :tickets
+  it_should_be_readable brand, :tickets
 
   context "recent tickets" do
     before(:all) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zendesk_api
 version: !ruby/object:Gem::Version
-  version: 1.3.7
+  version: 1.3.8
 platform: ruby
 authors:
 - Steven Davidovitz
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-20 00:00:00.000000000 Z
+date: 2014-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bump
@@ -274,6 +274,7 @@ files:
 - spec/live/audit_spec.rb
 - spec/live/automation_spec.rb
 - spec/live/bookmark_spec.rb
+- spec/live/brand_spec.rb
 - spec/live/category_spec.rb
 - spec/live/collection_spec.rb
 - spec/live/custom_role_spec.rb
@@ -384,6 +385,7 @@ test_files:
 - spec/live/audit_spec.rb
 - spec/live/automation_spec.rb
 - spec/live/bookmark_spec.rb
+- spec/live/brand_spec.rb
 - spec/live/category_spec.rb
 - spec/live/collection_spec.rb
 - spec/live/custom_role_spec.rb