desk_api 0.1.0 → 0.1.1

data/spec/cassettes/{Desk_Resource → DeskApi_Resource}/_update/updates_a_topic.yml

@@ -23,9 +23,9 @@ http_interactions:
       Content-Type:
       - application/json; charset=utf-8
       Date:
-      - Thu, 15 Aug 2013 21:20:33 GMT
+      - Mon, 19 Aug 2013 23:51:33 GMT
       ETag:
-      - '"6922ce66ea15c1c84d14c5f99cbabbeb"'
+      - '"40a205aec2cd1a68c9f59d5bc0043fe1"'
       Status:
       - 200 OK
       Vary:
@@ -37,31 +37,29 @@ http_interactions:
       X-Rate-Limit-Limit:
       - '60'
       X-Rate-Limit-Remaining:
-      - '44'
+      - '51'
       X-Rate-Limit-Reset:
       - '27'
       X-Request-Id:
-      - c360419287f3889dc0d45ac2287676cf
+      - 14315fed191397832541c7f472e296f6
       Content-Length:
-      - '2320'
+      - '1529'
       Connection:
       - keep-alive
     body:
       encoding: UTF-8
-      string: '{"total_entries":5,"_links":{"self":{"href":"/api/v2/topics?page=1&per_page=50","class":"page"},"first":{"href":"/api/v2/topics?page=1&per_page=50","class":"page"},"last":{"href":"/api/v2/topics?page=1&per_page=50","class":"page"},"previous":null,"next":null},"_embedded":{"entries":[{"name":"Testing
-        English","description":"Some new description","position":1,"allow_questions":true,"in_support_center":true,"created_at":"2013-04-22T23:46:42Z","updated_at":"2013-08-15T21:20:32Z","_links":{"self":{"href":"/api/v2/topics/498301","class":"topic"},"articles":{"href":"/api/v2/topics/498301/articles","class":"article"},"translations":{"href":"/api/v2/topics/498301/translations","class":"topic_translation"}}},{"name":"My
-        new topic","description":null,"position":2,"allow_questions":true,"in_support_center":null,"created_at":"2013-08-14T19:34:34Z","updated_at":"2013-08-14T19:34:34Z","_links":{"self":{"href":"/api/v2/topics/556401","class":"topic"},"articles":{"href":"/api/v2/topics/556401/articles","class":"article"},"translations":{"href":"/api/v2/topics/556401/translations","class":"topic_translation"}}},{"name":"My
-        new topic","description":null,"position":3,"allow_questions":true,"in_support_center":null,"created_at":"2013-08-14T19:37:08Z","updated_at":"2013-08-14T19:37:08Z","_links":{"self":{"href":"/api/v2/topics/556402","class":"topic"},"articles":{"href":"/api/v2/topics/556402/articles","class":"article"},"translations":{"href":"/api/v2/topics/556402/translations","class":"topic_translation"}}},{"name":"Test
-        Topic","description":null,"position":4,"allow_questions":true,"in_support_center":null,"created_at":"2013-08-15T21:20:31Z","updated_at":"2013-08-15T21:20:31Z","_links":{"self":{"href":"/api/v2/topics/556907","class":"topic"},"articles":{"href":"/api/v2/topics/556907/articles","class":"article"},"translations":{"href":"/api/v2/topics/556907/translations","class":"topic_translation"}}},{"name":"My
-        new topic","description":null,"position":5,"allow_questions":true,"in_support_center":null,"created_at":"2013-08-15T21:20:32Z","updated_at":"2013-08-15T21:20:32Z","_links":{"self":{"href":"/api/v2/topics/556908","class":"topic"},"articles":{"href":"/api/v2/topics/556908/articles","class":"article"},"translations":{"href":"/api/v2/topics/556908/translations","class":"topic_translation"}}}]}}'
+      string: '{"total_entries":3,"_links":{"self":{"href":"/api/v2/topics?page=1&per_page=50","class":"page"},"first":{"href":"/api/v2/topics?page=1&per_page=50","class":"page"},"last":{"href":"/api/v2/topics?page=1&per_page=50","class":"page"},"previous":null,"next":null},"_embedded":{"entries":[{"name":"Testing
+        English","description":"Another description update.","position":1,"allow_questions":true,"in_support_center":true,"created_at":"2013-04-22T23:46:42Z","updated_at":"2013-08-19T23:51:33Z","_links":{"self":{"href":"/api/v2/topics/498301","class":"topic"},"articles":{"href":"/api/v2/topics/498301/articles","class":"article"},"translations":{"href":"/api/v2/topics/498301/translations","class":"topic_translation"}}},{"name":"Test
+        Updated Topic","description":null,"position":2,"allow_questions":true,"in_support_center":null,"created_at":"2013-08-14T19:37:08Z","updated_at":"2013-08-15T21:26:17Z","_links":{"self":{"href":"/api/v2/topics/556402","class":"topic"},"articles":{"href":"/api/v2/topics/556402/articles","class":"article"},"translations":{"href":"/api/v2/topics/556402/translations","class":"topic_translation"}}},{"name":"My
+        new topic","description":null,"position":3,"allow_questions":true,"in_support_center":null,"created_at":"2013-08-15T21:20:32Z","updated_at":"2013-08-15T21:25:38Z","_links":{"self":{"href":"/api/v2/topics/556908","class":"topic"},"articles":{"href":"/api/v2/topics/556908/articles","class":"article"},"translations":{"href":"/api/v2/topics/556908/translations","class":"topic_translation"}}}]}}'
     http_version: 
-  recorded_at: Thu, 15 Aug 2013 21:20:33 GMT
+  recorded_at: Mon, 19 Aug 2013 23:51:33 GMT
 - request:
     method: patch
     uri: https://devel.desk.com/api/v2/topics/498301
     body:
       encoding: UTF-8
-      string: '{"name":"Updated topic name"}'
+      string: '{"description":"Some new description","name":"Updated topic name"}'
     headers:
       Accept:
       - application/json
@@ -79,9 +77,9 @@ http_interactions:
       Content-Type:
       - application/json; charset=utf-8
       Date:
-      - Thu, 15 Aug 2013 21:20:33 GMT
+      - Mon, 19 Aug 2013 23:51:33 GMT
       ETag:
-      - '"412b99f3cb6900be38fc168929cb5edb"'
+      - '"710c8f853c9cb55417e8c1524335a636"'
       Server:
       - nginx
       Status:
@@ -97,13 +95,13 @@ http_interactions:
       X-Rate-Limit-Limit:
       - '60'
       X-Rate-Limit-Remaining:
-      - '43'
+      - '50'
       X-Rate-Limit-Reset:
       - '27'
       X-Request-Id:
-      - bfe9319239f06f1225c6db3ca6e78453
+      - cbd8a44730d6855c0cc8a90153370dbe
       X-Runtime:
-      - '0.078318'
+      - '0.090645'
       X-UA-Compatible:
       - IE=Edge,chrome=1
       Content-Length:
@@ -112,7 +110,7 @@ http_interactions:
       - keep-alive
     body:
       encoding: UTF-8
-      string: '{"name":"Updated topic name","description":"Some new description","position":1,"allow_questions":true,"in_support_center":true,"created_at":"2013-04-22T23:46:42Z","updated_at":"2013-08-15T21:20:32Z","_links":{"self":{"href":"/api/v2/topics/498301","class":"topic"},"articles":{"href":"/api/v2/topics/498301/articles","class":"article"},"translations":{"href":"/api/v2/topics/498301/translations","class":"topic_translation"}}}'
+      string: '{"name":"Updated topic name","description":"Some new description","position":1,"allow_questions":true,"in_support_center":true,"created_at":"2013-04-22T23:46:42Z","updated_at":"2013-08-19T23:51:33Z","_links":{"self":{"href":"/api/v2/topics/498301","class":"topic"},"articles":{"href":"/api/v2/topics/498301/articles","class":"article"},"translations":{"href":"/api/v2/topics/498301/translations","class":"topic_translation"}}}'
     http_version: 
-  recorded_at: Thu, 15 Aug 2013 21:20:33 GMT
+  recorded_at: Mon, 19 Aug 2013 23:51:33 GMT
 recorded_with: VCR 2.5.0

data/spec/cassettes/{Desk_Resource_Page → DeskApi_Resource_Page}/_by_id/loads_the_requested_resource.yml

@@ -23,7 +23,7 @@ http_interactions:
       Content-Type:
       - application/json; charset=utf-8
       Date:
-      - Thu, 15 Aug 2013 21:20:35 GMT
+      - Mon, 19 Aug 2013 23:51:31 GMT
       ETag:
       - '"cbba64bc7fe9b35611cc745f75671fb6"'
       Status:
@@ -37,11 +37,11 @@ http_interactions:
       X-Rate-Limit-Limit:
       - '60'
       X-Rate-Limit-Remaining:
-      - '36'
+      - '59'
       X-Rate-Limit-Reset:
-      - '25'
+      - '29'
       X-Request-Id:
-      - c5ed3aaf3d64441ba14a1c51ad44af03
+      - e391f97e79ee25cc928aadb97086f3ef
       Content-Length:
       - '897'
       Connection:
@@ -50,5 +50,5 @@ http_interactions:
       encoding: UTF-8
       string: '{"external_id":null,"subject":"Testing the Tank again","priority":5,"locked_until":null,"description":null,"status":"open","type":"email","labels":[],"language":"de","active_at":"2013-05-13T19:20:59Z","created_at":"2013-05-13T18:13:39Z","updated_at":"2013-05-13T18:13:39Z","received_at":null,"custom_fields":{"my_new_custom_field":null,"my_new_number_field":null,"my_new_date_field":null,"my_new_boolean_field":null,"my_new_list_field":null},"_links":{"self":{"href":"/api/v2/cases/3065","class":"case"},"message":{"href":"/api/v2/cases/3065/message","class":"email"},"customer":{"href":"/api/v2/customers/86101780","class":"customer"},"assigned_user":null,"assigned_group":null,"locked_by":null,"replies":{"href":"/api/v2/cases/3065/replies","class":"reply"},"notes":{"href":"/api/v2/cases/3065/notes","class":"note"},"attachments":{"href":"/api/v2/cases/3065/attachments","class":"attachment"}}}'
     http_version: 
-  recorded_at: Thu, 15 Aug 2013 21:20:35 GMT
+  recorded_at: Mon, 19 Aug 2013 23:51:31 GMT
 recorded_with: VCR 2.5.0

data/spec/cassettes/{Desk_Resource_Page → DeskApi_Resource_Page}/_page/keeps_the_resource_as_loaded.yml

@@ -23,7 +23,7 @@ http_interactions:
       Content-Type:
       - application/json; charset=utf-8
       Date:
-      - Thu, 15 Aug 2013 21:20:35 GMT
+      - Mon, 19 Aug 2013 23:51:32 GMT
       ETag:
       - '"9be8043641e7da379826d5480c34a491"'
       Status:
@@ -37,11 +37,11 @@ http_interactions:
       X-Rate-Limit-Limit:
       - '60'
       X-Rate-Limit-Remaining:
-      - '37'
+      - '57'
       X-Rate-Limit-Reset:
-      - '26'
+      - '29'
       X-Request-Id:
-      - c2addd2e1c28244528a5aca0ca1e2998
+      - 8d4c5327c6ad669e96d250837638af84
       Content-Length:
       - '48478'
       Connection:
@@ -109,5 +109,5 @@ http_interactions:
         customer create","priority":5,"locked_until":null,"description":null,"status":"open","type":"email","labels":[],"language":"de","active_at":"2013-05-13T19:20:43Z","created_at":"2013-05-13T18:12:07Z","updated_at":"2013-05-13T18:12:07Z","received_at":null,"custom_fields":{"my_new_custom_field":null,"my_new_number_field":null,"my_new_date_field":null,"my_new_boolean_field":null,"my_new_list_field":null},"_links":{"self":{"href":"/api/v2/cases/3064","class":"case"},"message":{"href":"/api/v2/cases/3064/message","class":"email"},"customer":{"href":"/api/v2/customers/86101780","class":"customer"},"assigned_user":null,"assigned_group":null,"locked_by":null,"replies":{"href":"/api/v2/cases/3064/replies","class":"reply"},"notes":{"href":"/api/v2/cases/3064/notes","class":"note"},"attachments":{"href":"/api/v2/cases/3064/attachments","class":"attachment"}}},{"external_id":null,"subject":"Testing
         the Tank again","priority":5,"locked_until":null,"description":null,"status":"open","type":"email","labels":[],"language":"de","active_at":"2013-05-13T19:20:59Z","created_at":"2013-05-13T18:13:39Z","updated_at":"2013-05-13T18:13:39Z","received_at":null,"custom_fields":{"my_new_custom_field":null,"my_new_number_field":null,"my_new_date_field":null,"my_new_boolean_field":null,"my_new_list_field":null},"_links":{"self":{"href":"/api/v2/cases/3065","class":"case"},"message":{"href":"/api/v2/cases/3065/message","class":"email"},"customer":{"href":"/api/v2/customers/86101780","class":"customer"},"assigned_user":null,"assigned_group":null,"locked_by":null,"replies":{"href":"/api/v2/cases/3065/replies","class":"reply"},"notes":{"href":"/api/v2/cases/3065/notes","class":"note"},"attachments":{"href":"/api/v2/cases/3065/attachments","class":"attachment"}}}]}}'
     http_version: 
-  recorded_at: Thu, 15 Aug 2013 21:20:35 GMT
+  recorded_at: Mon, 19 Aug 2013 23:51:32 GMT
 recorded_with: VCR 2.5.0

data/spec/cassettes/{Desk_Resource/_method_missing/raises_an_error_if_method_does_not_exist.yml → DeskApi_Resource_Page/_page/returns_the_current_page_and_loads_if_page_not_defined.yml}

@@ -23,9 +23,9 @@ http_interactions:
       Content-Type:
       - application/json; charset=utf-8
       Date:
-      - Thu, 15 Aug 2013 21:20:31 GMT
+      - Mon, 19 Aug 2013 23:51:31 GMT
       ETag:
-      - '"93e82cb9c9be28d0224501f82f2957cd"'
+      - '"1962df5310e7d2a59db97d5b68e3c95d"'
       Status:
       - 200 OK
       Vary:
@@ -37,11 +37,11 @@ http_interactions:
       X-Rate-Limit-Limit:
       - '60'
       X-Rate-Limit-Remaining:
-      - '54'
+      - '58'
       X-Rate-Limit-Reset:
       - '29'
       X-Request-Id:
-      - 7fffc856983d1a9ee456d20827f3ec37
+      - 09ecfebbe83d9e29e5c81bf77150925f
       Content-Length:
       - '21118'
       Connection:
@@ -307,7 +307,7 @@ http_interactions:
         Latin words, combined with a handful of model sentence structures, to generate
         Lorem Ipsum which looks reasonable. The generated Lorem Ipsum is therefore
         always free from repetition, injected humour, or non-characteristic words
-        etc.","body_facebook_auto":true,"keywords":"","position":1,"quickcode":null,"in_support_center":true,"internal_notes":"","publish_at":"2013-08-05T01:13:36Z","created_at":"2013-07-05T15:45:25Z","updated_at":"2013-08-14T19:47:37Z","_links":{"self":{"href":"/api/v2/articles/1213277","class":"article"},"topic":{"href":"/api/v2/topics/498301","class":"topic"},"translations":{"href":"/api/v2/articles/1213277/translations","class":"article_translation"}}}]}}'
+        etc.","body_facebook_auto":true,"keywords":"","position":1,"quickcode":null,"in_support_center":true,"internal_notes":"","publish_at":"2013-08-05T01:13:36Z","created_at":"2013-07-05T15:45:25Z","updated_at":"2013-08-15T21:24:28Z","_links":{"self":{"href":"/api/v2/articles/1213277","class":"article"},"topic":{"href":"/api/v2/topics/498301","class":"topic"},"translations":{"href":"/api/v2/articles/1213277/translations","class":"article_translation"}}}]}}'
     http_version: 
-  recorded_at: Thu, 15 Aug 2013 21:20:31 GMT
+  recorded_at: Mon, 19 Aug 2013 23:51:31 GMT
 recorded_with: VCR 2.5.0

data/spec/cassettes/{Desk_Resource_Page → DeskApi_Resource_Page}/_page/sets_the_resource_to_not_loaded.yml

@@ -23,7 +23,7 @@ http_interactions:
       Content-Type:
       - application/json; charset=utf-8
       Date:
-      - Thu, 15 Aug 2013 21:20:34 GMT
+      - Mon, 19 Aug 2013 23:51:32 GMT
       ETag:
       - '"9be8043641e7da379826d5480c34a491"'
       Status:
@@ -37,11 +37,11 @@ http_interactions:
       X-Rate-Limit-Limit:
       - '60'
       X-Rate-Limit-Remaining:
-      - '39'
+      - '56'
       X-Rate-Limit-Reset:
-      - '26'
+      - '28'
       X-Request-Id:
-      - 7e6c83d2f868c774e6c4dca43c1ff132
+      - 61aef69178ba110ee1014589af9cbae4
       Content-Length:
       - '48478'
       Connection:
@@ -109,5 +109,5 @@ http_interactions:
         customer create","priority":5,"locked_until":null,"description":null,"status":"open","type":"email","labels":[],"language":"de","active_at":"2013-05-13T19:20:43Z","created_at":"2013-05-13T18:12:07Z","updated_at":"2013-05-13T18:12:07Z","received_at":null,"custom_fields":{"my_new_custom_field":null,"my_new_number_field":null,"my_new_date_field":null,"my_new_boolean_field":null,"my_new_list_field":null},"_links":{"self":{"href":"/api/v2/cases/3064","class":"case"},"message":{"href":"/api/v2/cases/3064/message","class":"email"},"customer":{"href":"/api/v2/customers/86101780","class":"customer"},"assigned_user":null,"assigned_group":null,"locked_by":null,"replies":{"href":"/api/v2/cases/3064/replies","class":"reply"},"notes":{"href":"/api/v2/cases/3064/notes","class":"note"},"attachments":{"href":"/api/v2/cases/3064/attachments","class":"attachment"}}},{"external_id":null,"subject":"Testing
         the Tank again","priority":5,"locked_until":null,"description":null,"status":"open","type":"email","labels":[],"language":"de","active_at":"2013-05-13T19:20:59Z","created_at":"2013-05-13T18:13:39Z","updated_at":"2013-05-13T18:13:39Z","received_at":null,"custom_fields":{"my_new_custom_field":null,"my_new_number_field":null,"my_new_date_field":null,"my_new_boolean_field":null,"my_new_list_field":null},"_links":{"self":{"href":"/api/v2/cases/3065","class":"case"},"message":{"href":"/api/v2/cases/3065/message","class":"email"},"customer":{"href":"/api/v2/customers/86101780","class":"customer"},"assigned_user":null,"assigned_group":null,"locked_by":null,"replies":{"href":"/api/v2/cases/3065/replies","class":"reply"},"notes":{"href":"/api/v2/cases/3065/notes","class":"note"},"attachments":{"href":"/api/v2/cases/3065/attachments","class":"attachment"}}}]}}'
     http_version: 
-  recorded_at: Thu, 15 Aug 2013 21:20:34 GMT
+  recorded_at: Mon, 19 Aug 2013 23:51:33 GMT
 recorded_with: VCR 2.5.0

data/spec/{desk → desk_api}/client_spec.rb

@@ -1,8 +1,8 @@
 require 'spec_helper'
 
-describe Desk::Client do
+describe DeskApi::Client do
   subject do
-    @client ||= Desk::Client.new Desk::CONFIG
+    @client ||= DeskApi::Client.new DeskApi::CONFIG
   end
 
   before do
@@ -28,21 +28,21 @@ describe Desk::Client do
     end
 
     after do
-      Desk.reset!
+      DeskApi.reset!
     end
 
     context 'with module configuration' do
       before do
-        Desk.configure do |config|
-          Desk::Configuration.keys.each do |key|
+        DeskApi.configure do |config|
+          DeskApi::Configuration.keys.each do |key|
             config.send("#{key}=", @configuration[key])
           end
         end
       end
 
       it 'inherits the module configuration' do
-        client = Desk::Client.new
-        Desk::Configuration.keys.each do |key|
+        client = DeskApi::Client.new
+        DeskApi::Configuration.keys.each do |key|
           client.instance_variable_get(:"@#{key}").should eq(@configuration[key])
         end
       end
@@ -51,8 +51,8 @@ describe Desk::Client do
     context 'with class configuration' do
       context "during initialization" do
         it "overrides the module configuration" do
-          client = Desk::Client.new(@configuration)
-          Desk::Configuration.keys.each do |key|
+          client = DeskApi::Client.new(@configuration)
+          DeskApi::Configuration.keys.each do |key|
             client.instance_variable_get(:"@#{key}").should eq(@configuration[key])
           end
         end
@@ -60,14 +60,14 @@ describe Desk::Client do
 
       context "after initialization" do
         it "overrides the module configuration after initialization" do
-          client = Desk::Client.new
+          client = DeskApi::Client.new
           client.configure do |config|
             @configuration.each do |key, value|
               config.send("#{key}=", value)
             end
           end
           
-          Desk::Configuration.keys.each do |key|
+          DeskApi::Configuration.keys.each do |key|
             client.instance_variable_get(:"@#{key}").should eq(@configuration[key])
           end
         end
@@ -104,7 +104,7 @@ describe Desk::Client do
 
   describe '#delete', :vcr do
     it 'deletes a resource' do
-      subject.delete('/api/v2/topics/556401').status.should eq(204)
+      subject.delete('/api/v2/topics/558245').status.should eq(204)
     end
   end
 
@@ -122,12 +122,12 @@ describe Desk::Client do
   describe '#request' do
     it 'catches Faraday errors' do
       allow(subject).to receive(:connection).and_raise(Faraday::Error::ClientError.new('Oops'))
-      lambda { subject.send(:request, :get, '/path') }.should raise_error(Desk::Error::ClientError)
+      lambda { subject.send(:request, :get, '/path') }.should raise_error(DeskApi::Error::ClientError)
     end
 
     it 'catches JSON::ParserError errors' do
       allow(subject).to receive(:connection).and_raise(JSON::ParserError.new('unexpected token'))
-      lambda { subject.send(:request, :get, '/path') }.should raise_error(Desk::Error::ParserError)
+      lambda { subject.send(:request, :get, '/path') }.should raise_error(DeskApi::Error::ParserError)
     end
   end
 end

data/spec/{desk → desk_api}/configuration_spec.rb

@@ -1,9 +1,9 @@
 require 'spec_helper'
 
-describe Desk::Configuration do
+describe DeskApi::Configuration do
   context '#keys' do
     it 'returns an array of configuration keys' do
-      Desk::Configuration.keys.should eq([
+      DeskApi::Configuration.keys.should eq([
         :consumer_key,
         :consumer_secret,
         :token,
@@ -19,23 +19,23 @@ describe Desk::Configuration do
 
   context '#endpoint' do
     after(:each) do
-      Desk.reset!
+      DeskApi.reset!
     end
 
     it 'returns the endpoint if set' do
-      Desk.endpoint = 'https://devel.desk.com'
-      Desk.endpoint.should eq('https://devel.desk.com')
+      DeskApi.endpoint = 'https://devel.desk.com'
+      DeskApi.endpoint.should eq('https://devel.desk.com')
     end
 
     it 'returns the subdomain endpoint if subdomain is set' do
-      Desk.subdomain = 'devel'
-      Desk.endpoint.should eq('https://devel.desk.com')
+      DeskApi.subdomain = 'devel'
+      DeskApi.endpoint.should eq('https://devel.desk.com')
     end
 
     it 'gives presidence to the endpoint' do
-      Desk.subdomain = 'subdomain'
-      Desk.endpoint = 'https://endpoint.desk.com'
-      Desk.endpoint.should eq('https://endpoint.desk.com')
+      DeskApi.subdomain = 'subdomain'
+      DeskApi.endpoint = 'https://endpoint.desk.com'
+      DeskApi.endpoint.should eq('https://endpoint.desk.com')
     end
   end
 
@@ -57,20 +57,20 @@ describe Desk::Configuration do
     end
 
     it 'overrides the module configuration' do
-      client = Desk::Client.new
+      client = DeskApi::Client.new
       client.configure do |config|
         @configuration.each do |key, value|
           config.send("#{key}=", value)
         end
       end
 
-      Desk::Configuration.keys.each do |key|
+      DeskApi::Configuration.keys.each do |key|
         client.instance_variable_get(:"@#{key}").should eq(@configuration[key])
       end
     end
 
     it 'throws an exception if credentials are not set' do
-      client = Desk::Client.new
+      client = DeskApi::Client.new
       lambda {
         client.configure do |config|
           @configuration.each do |key, value|
@@ -79,11 +79,11 @@ describe Desk::Configuration do
           config.username = nil
           config.consumer_key = nil
         end
-      }.should raise_error(Desk::Error::ConfigurationError)
+      }.should raise_error(DeskApi::Error::ConfigurationError)
     end
 
     it 'throws an exception if basic auth credentials are invalid' do
-      client = Desk::Client.new
+      client = DeskApi::Client.new
       lambda {
         client.configure do |config|
           @configuration.each do |key, value|
@@ -92,11 +92,11 @@ describe Desk::Configuration do
           config.username = 1
           config.consumer_key = nil
         end
-      }.should raise_error(Desk::Error::ConfigurationError)
+      }.should raise_error(DeskApi::Error::ConfigurationError)
     end
 
     it 'throws an exception if oauth credentials are invalid' do
-      client = Desk::Client.new
+      client = DeskApi::Client.new
       lambda {
         client.configure do |config|
           @configuration.each do |key, value|
@@ -105,11 +105,11 @@ describe Desk::Configuration do
           config.username = nil
           config.consumer_key = 1
         end
-      }.should raise_error(Desk::Error::ConfigurationError)
+      }.should raise_error(DeskApi::Error::ConfigurationError)
     end
 
     it 'throws an exception if endpoint is not a valid url' do
-      client = Desk::Client.new
+      client = DeskApi::Client.new
       lambda {
         client.configure do |config|
           @configuration.each do |key, value|
@@ -117,7 +117,7 @@ describe Desk::Configuration do
           end
           config.endpoint = 'some_funky_endpoint'
         end
-      }.should raise_error(Desk::Error::ConfigurationError)
+      }.should raise_error(DeskApi::Error::ConfigurationError)
     end
   end
 
@@ -139,7 +139,7 @@ describe Desk::Configuration do
     end
 
     it 'resets the configuration to module defaults' do
-      client = Desk::Client.new
+      client = DeskApi::Client.new
       client.configure do |config|
         @configuration.each do |key, value|
           config.send("#{key}=", value)
@@ -147,7 +147,7 @@ describe Desk::Configuration do
       end
       client.reset!
 
-      Desk::Configuration.keys.each do |key|
+      DeskApi::Configuration.keys.each do |key|
         client.instance_variable_get(:"@#{key}").should_not eq(@configuration[key])
       end
     end
@@ -155,7 +155,7 @@ describe Desk::Configuration do
 
   context '#credentials?' do
     before do
-      @client = Desk::Client.new
+      @client = DeskApi::Client.new
     end
 
     after do