desk_api 0.1.3 → 0.5.0

data/spec/cassettes/DeskApi_Resource/_update/throws_an_error_updating_a_user.yml

@@ -10,47 +10,105 @@ http_interactions:
       Accept:
       - application/json
       User-Agent:
-      - desk.com Ruby Gem v0.1.0
+      - desk.com Ruby Gem v0.1.3
   response:
     status:
       code: 200
       message: 
     headers:
-      Accept-Ranges:
+      accept-ranges:
       - bytes
-      Cache-Control:
+      cache-control:
       - no-cache, private
-      Content-Type:
+      content-type:
       - application/json; charset=utf-8
-      Date:
-      - Mon, 19 Aug 2013 23:51:34 GMT
-      ETag:
-      - '"1376931810"'
-      Status:
+      date:
+      - Thu, 12 Dec 2013 19:48:10 GMT
+      etag:
+      - '"1386874620"'
+      status:
       - 200 OK
-      Vary:
+      vary:
+      - X-AppVersion
+      x-appversion:
+      - '15.6'
+      x-frame-options:
+      - SAMEORIGIN
+      x-rate-limit-limit:
+      - '60'
+      x-rate-limit-remaining:
+      - '57'
+      x-rate-limit-reset:
+      - '50'
+      x-request-id:
+      - 01bc92aa110d2b588c8383c7e8e7eee6
+      content-length:
+      - '4293'
+      connection:
+      - Close
+    body:
+      encoding: UTF-8
+      string: '{"total_entries":6,"_links":{"self":{"href":"/api/v2/users?page=1&per_page=50","class":"page"},"first":{"href":"/api/v2/users?page=1&per_page=50","class":"page"},"last":{"href":"/api/v2/users?page=1&per_page=50","class":"page"},"previous":null,"next":null},"_embedded":{"entries":[{"name":"Thomas
+        Stachl","public_name":"Thomas Stachl","email":"tstachl@salesforce.com","level":"siteadmin_billing","avatar":"http://www.gravatar.com/avatar/9d1a9e1a385960d1ba80fb873128cf73?rating=PG&size=50&default=https%3A%2F%2Fd218iqt4mo6adh.cloudfront.net%2Fassets%2Funknown_user_50-521aae04e00222d7dd814e72d7d869d0.png","created_at":"2012-06-06T14:51:21Z","updated_at":"2013-12-11T18:08:41Z","current_login_at":"2013-12-11T18:08:41Z","last_login_at":"2013-12-11T00:50:06Z","_links":{"self":{"href":"/api/v2/users/16096734","class":"user"},"preferences":{"href":"/api/v2/users/16096734/preferences","class":"user_preference"},"searches":{"href":"/api/v2/users/16096734/searches","class":"search"}}},{"name":"Dan
+        Stern","public_name":"Dan","email":"dan@desk.com","level":"siteadmin","avatar":"http://www.gravatar.com/avatar/5f56818e857c5776e02779aa2a4f8ea4?rating=PG&size=50&default=https%3A%2F%2Fd218iqt4mo6adh.cloudfront.net%2Fassets%2Funknown_user_50-521aae04e00222d7dd814e72d7d869d0.png","created_at":"2012-06-06T18:24:08Z","updated_at":"2013-08-05T22:33:48Z","current_login_at":"2013-08-05T22:33:48Z","last_login_at":"2013-08-05T22:32:16Z","_links":{"self":{"href":"/api/v2/users/16107036","class":"user"},"preferences":{"href":"/api/v2/users/16107036/preferences","class":"user_preference"},"searches":{"href":"/api/v2/users/16107036/searches","class":"search"}}},{"name":"Mark","public_name":"Mark","email":"mchasse_old@desk.com","level":"siteadmin_billing","avatar":"http://www.gravatar.com/avatar/f2d79817f28bbe7b89081b59b9a370d0?rating=PG&size=50&default=https%3A%2F%2Fd218iqt4mo6adh.cloudfront.net%2Fassets%2Funknown_user_50-521aae04e00222d7dd814e72d7d869d0.png","created_at":"2012-06-22T21:52:55Z","updated_at":"2013-05-16T01:30:48Z","current_login_at":"2013-05-16T01:30:34Z","last_login_at":"2012-07-17T19:24:54Z","_links":{"self":{"href":"/api/v2/users/17069383","class":"user"},"preferences":{"href":"/api/v2/users/17069383/preferences","class":"user_preference"},"searches":{"href":"/api/v2/users/17069383/searches","class":"search"}}},{"name":"Mich","public_name":"Mich","email":"mich@desk.com","level":"siteadmin_billing","avatar":"http://www.gravatar.com/avatar/73a4ddb25d4f0ce32eddb64add48a730?rating=PG&size=50&default=https%3A%2F%2Fd218iqt4mo6adh.cloudfront.net%2Fassets%2Funknown_user_50-521aae04e00222d7dd814e72d7d869d0.png","created_at":"2012-06-22T21:53:12Z","updated_at":"2012-06-22T21:55:12Z","current_login_at":"2012-06-22T21:55:08Z","last_login_at":null,"_links":{"self":{"href":"/api/v2/users/17069397","class":"user"},"preferences":{"href":"/api/v2/users/17069397/preferences","class":"user_preference"},"searches":{"href":"/api/v2/users/17069397/searches","class":"search"}}},{"name":"Keith","public_name":"Keith","email":"keith@desk.com","level":"agent","avatar":"http://www.gravatar.com/avatar/c492d3f749ce562f187fb738ef6adaa7?rating=PG&size=50&default=https%3A%2F%2Fd218iqt4mo6adh.cloudfront.net%2Fassets%2Funknown_user_50-521aae04e00222d7dd814e72d7d869d0.png","created_at":"2012-06-26T00:11:48Z","updated_at":"2012-06-26T19:02:52Z","current_login_at":"2012-06-26T19:02:51Z","last_login_at":null,"_links":{"self":{"href":"/api/v2/users/17250751","class":"user"},"preferences":{"href":"/api/v2/users/17250751/preferences","class":"user_preference"},"searches":{"href":"/api/v2/users/17250751/searches","class":"search"}}},{"name":"Thomas
+        Stachl","public_name":"Thomas Stachl","email":"thomas@desk.com","level":"flexagent","avatar":"http://www.gravatar.com/avatar/9385d65da0b8577fef3fc472dd8b5e1b?rating=PG&size=50&default=https%3A%2F%2Fd218iqt4mo6adh.cloudfront.net%2Fassets%2Funknown_user_50-521aae04e00222d7dd814e72d7d869d0.png","created_at":"2013-09-11T20:24:06Z","updated_at":"2013-09-11T20:24:23Z","current_login_at":null,"last_login_at":null,"_links":{"self":{"href":"/api/v2/users/21410327","class":"user"},"preferences":{"href":"/api/v2/users/21410327/preferences","class":"user_preference"},"searches":{"href":"/api/v2/users/21410327/searches","class":"search"}}}]}}'
+    http_version: 
+  recorded_at: Thu, 12 Dec 2013 19:48:10 GMT
+- request:
+    method: patch
+    uri: https://devel.desk.com/api/v2/users/16096734
+    body:
+      encoding: UTF-8
+      string: '{"name":"Some User"}'
+    headers:
+      Accept:
+      - application/json
+      User-Agent:
+      - desk.com Ruby Gem v0.1.3
+      Content-Type:
+      - application/json
+  response:
+    status:
+      code: 405
+      message: 
+    headers:
+      cache-control:
+      - no-cache
+      content-type:
+      - application/json; charset=utf-8
+      date:
+      - Thu, 12 Dec 2013 19:48:10 GMT
+      server:
+      - nginx
+      status:
+      - 405 Method Not Allowed
+      vary:
       - X-AppVersion
-      X-AppVersion:
-      - '7.9'
-      X-Frame-Options:
+      x-appversion:
+      - '15.6'
+      x-frame-options:
       - SAMEORIGIN
-      X-Rate-Limit-Limit:
+      x-rack-cache:
+      - invalidate, pass
+      x-rate-limit-limit:
       - '60'
-      X-Rate-Limit-Remaining:
-      - '49'
-      X-Rate-Limit-Reset:
-      - '27'
-      X-Request-Id:
-      - a4c645d1078c272a00bdc14003b10074
-      Content-Length:
-      - '1868'
-      Connection:
-      - keep-alive
+      x-rate-limit-remaining:
+      - '56'
+      x-rate-limit-reset:
+      - '50'
+      x-request-id:
+      - 30d39d0e087f2bcbc04472e00eec6732
+      x-runtime:
+      - '0.057366'
+      x-ua-compatible:
+      - IE=Edge,chrome=1
+      content-length:
+      - '32'
+      connection:
+      - Close
     body:
       encoding: UTF-8
-      string: '{"total_entries":5,"_links":{"self":{"href":"/api/v2/users?page=1&per_page=50","class":"page"},"first":{"href":"/api/v2/users?page=1&per_page=50","class":"page"},"last":{"href":"/api/v2/users?page=1&per_page=50","class":"page"},"previous":null,"next":null},"_embedded":{"entries":[{"name":"Thomas
-        Stachl","public_name":"Thomas Stachl","email":"tstachl@salesforce.com","level":"siteadmin_billing","_links":{"self":{"href":"/api/v2/users/16096734","class":"user"},"preferences":{"href":"/api/v2/users/16096734/preferences","class":"user_preference"},"searches":{"href":"/api/v2/users/16096734/searches","class":"search"}}},{"name":"Dan
-        Stern","public_name":"Dan","email":"dan@desk.com","level":"siteadmin","_links":{"self":{"href":"/api/v2/users/16107036","class":"user"},"preferences":{"href":"/api/v2/users/16107036/preferences","class":"user_preference"},"searches":{"href":"/api/v2/users/16107036/searches","class":"search"}}},{"name":"Mark","public_name":"Mark","email":"mchasse_old@desk.com","level":"siteadmin_billing","_links":{"self":{"href":"/api/v2/users/17069383","class":"user"},"preferences":{"href":"/api/v2/users/17069383/preferences","class":"user_preference"},"searches":{"href":"/api/v2/users/17069383/searches","class":"search"}}},{"name":"Mich","public_name":"Mich","email":"mich@desk.com","level":"siteadmin_billing","_links":{"self":{"href":"/api/v2/users/17069397","class":"user"},"preferences":{"href":"/api/v2/users/17069397/preferences","class":"user_preference"},"searches":{"href":"/api/v2/users/17069397/searches","class":"search"}}},{"name":"Keith","public_name":"Keith","email":"keith@desk.com","level":"agent","_links":{"self":{"href":"/api/v2/users/17250751","class":"user"},"preferences":{"href":"/api/v2/users/17250751/preferences","class":"user_preference"},"searches":{"href":"/api/v2/users/17250751/searches","class":"search"}}}]}}'
+      string: '{"message":"Method Not Allowed"}'
     http_version: 
-  recorded_at: Mon, 19 Aug 2013 23:51:34 GMT
+  recorded_at: Thu, 12 Dec 2013 19:48:10 GMT
 recorded_with: VCR 2.5.0

data/spec/cassettes/DeskApi_Resource/_update/updates_a_topic.yml

@@ -10,50 +10,54 @@ http_interactions:
       Accept:
       - application/json
       User-Agent:
-      - desk.com Ruby Gem v0.1.0
+      - desk.com Ruby Gem v0.1.3
   response:
     status:
       code: 200
       message: 
     headers:
-      Accept-Ranges:
+      accept-ranges:
       - bytes
-      Cache-Control:
+      cache-control:
       - must-revalidate, private, max-age=0
-      Content-Type:
+      content-type:
       - application/json; charset=utf-8
-      Date:
-      - Mon, 19 Aug 2013 23:51:33 GMT
-      ETag:
-      - '"40a205aec2cd1a68c9f59d5bc0043fe1"'
-      Status:
+      date:
+      - Thu, 12 Dec 2013 19:48:09 GMT
+      etag:
+      - '"e3114a0601687cc0b64b8e6c67c5091f"'
+      status:
       - 200 OK
-      Vary:
+      vary:
       - X-AppVersion
-      X-AppVersion:
-      - '7.9'
-      X-Frame-Options:
+      x-appversion:
+      - '15.6'
+      x-frame-options:
       - SAMEORIGIN
-      X-Rate-Limit-Limit:
+      x-rate-limit-limit:
       - '60'
-      X-Rate-Limit-Remaining:
+      x-rate-limit-remaining:
+      - '59'
+      x-rate-limit-reset:
       - '51'
-      X-Rate-Limit-Reset:
-      - '27'
-      X-Request-Id:
-      - 14315fed191397832541c7f472e296f6
-      Content-Length:
-      - '1529'
-      Connection:
-      - keep-alive
+      x-request-id:
+      - 429e13bfddb8999e46597e90f6c05ba8
+      content-length:
+      - '3137'
+      connection:
+      - Close
     body:
       encoding: UTF-8
-      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"}}}]}}'
+      string: '{"total_entries":7,"_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-12-12T03:00:21Z","_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-19T23:53:31Z","_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-19T23:53:31Z","_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"}}},{"name":"My
+        new topic","description":null,"position":4,"allow_questions":true,"in_support_center":null,"created_at":"2013-08-19T23:51:34Z","updated_at":"2013-08-19T23:53:31Z","_links":{"self":{"href":"/api/v2/topics/558244","class":"topic"},"articles":{"href":"/api/v2/topics/558244/articles","class":"article"},"translations":{"href":"/api/v2/topics/558244/translations","class":"topic_translation"}}},{"name":"Test
+        Topic","description":null,"position":5,"allow_questions":true,"in_support_center":null,"created_at":"2013-09-03T02:04:32Z","updated_at":"2013-09-03T02:04:32Z","_links":{"self":{"href":"/api/v2/topics/563658","class":"topic"},"articles":{"href":"/api/v2/topics/563658/articles","class":"article"},"translations":{"href":"/api/v2/topics/563658/translations","class":"topic_translation"}}},{"name":"Test
+        Topic","description":null,"position":6,"allow_questions":true,"in_support_center":null,"created_at":"2013-12-12T02:51:59Z","updated_at":"2013-12-12T02:51:59Z","_links":{"self":{"href":"/api/v2/topics/601116","class":"topic"},"articles":{"href":"/api/v2/topics/601116/articles","class":"article"},"translations":{"href":"/api/v2/topics/601116/translations","class":"topic_translation"}}},{"name":"My
+        new topic","description":null,"position":7,"allow_questions":true,"in_support_center":null,"created_at":"2013-12-12T19:45:06Z","updated_at":"2013-12-12T19:45:06Z","_links":{"self":{"href":"/api/v2/topics/601361","class":"topic"},"articles":{"href":"/api/v2/topics/601361/articles","class":"article"},"translations":{"href":"/api/v2/topics/601361/translations","class":"topic_translation"}}}]}}'
     http_version: 
-  recorded_at: Mon, 19 Aug 2013 23:51:33 GMT
+  recorded_at: Thu, 12 Dec 2013 19:48:09 GMT
 - request:
     method: patch
     uri: https://devel.desk.com/api/v2/topics/498301
@@ -64,7 +68,7 @@ http_interactions:
       Accept:
       - application/json
       User-Agent:
-      - desk.com Ruby Gem v0.1.0
+      - desk.com Ruby Gem v0.1.3
       Content-Type:
       - application/json
   response:
@@ -72,45 +76,45 @@ http_interactions:
       code: 200
       message: 
     headers:
-      Cache-Control:
+      cache-control:
       - max-age=0, private, must-revalidate
-      Content-Type:
+      content-type:
       - application/json; charset=utf-8
-      Date:
-      - Mon, 19 Aug 2013 23:51:33 GMT
-      ETag:
-      - '"710c8f853c9cb55417e8c1524335a636"'
-      Server:
+      date:
+      - Thu, 12 Dec 2013 19:48:10 GMT
+      etag:
+      - '"5c3d0145d8847569b17c6a6c4007de80"'
+      server:
       - nginx
-      Status:
+      status:
       - 200 OK
-      Vary:
+      vary:
       - X-AppVersion
-      X-AppVersion:
-      - '7.9'
-      X-Frame-Options:
+      x-appversion:
+      - '15.6'
+      x-frame-options:
       - SAMEORIGIN
-      X-Rack-Cache:
+      x-rack-cache:
       - invalidate, pass
-      X-Rate-Limit-Limit:
+      x-rate-limit-limit:
       - '60'
-      X-Rate-Limit-Remaining:
-      - '50'
-      X-Rate-Limit-Reset:
-      - '27'
-      X-Request-Id:
-      - cbd8a44730d6855c0cc8a90153370dbe
-      X-Runtime:
-      - '0.090645'
-      X-UA-Compatible:
+      x-rate-limit-remaining:
+      - '58'
+      x-rate-limit-reset:
+      - '51'
+      x-request-id:
+      - 9aa12860c6a7e9adbfc3ce0c4b07faea
+      x-runtime:
+      - '0.113486'
+      x-ua-compatible:
       - IE=Edge,chrome=1
-      Content-Length:
+      content-length:
       - '426'
-      Connection:
-      - keep-alive
+      connection:
+      - Close
     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-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"}}}'
+      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-12-12T19:48:10Z","_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: Mon, 19 Aug 2013 23:51:33 GMT
+  recorded_at: Thu, 12 Dec 2013 19:48:10 GMT
 recorded_with: VCR 2.5.0

data/spec/desk_api/client_spec.rb

@@ -73,39 +73,32 @@ describe DeskApi::Client do
         end
       end
     end
-
-    it 'sets up default resources on client' do
-      subject.methods include(:articles, :cases, :companies, :custom_fields, :customers)
-      subject.methods include(:filters, :groups, :inbound_mailboxes, :integration_urls)
-      subject.methods include(:jobs, :labels, :macros, :rules, :site_settings)
-      subject.methods include(:system_message, :topics, :twitter_accounts, :users)
-    end
   end
 
   context 'using Basic Authentication' do
     describe '#get', :vcr do
       it 'fetches resources' do
         response = subject.get('/api/v2/cases/3014')
-        response.body.subject.should eq('Testing Quick Case')
+        response.body['subject'].should eq('Testing Quick Case')
       end
     end
 
     describe '#post', :vcr do
       it 'creates a resource' do
         response = subject.post('/api/v2/topics', @topic_create_data)
-        response.body.name.should eq(@topic_create_data[:name])
+        response.body['name'].should eq(@topic_create_data[:name])
       end
     end
 
     describe '#patch', :vcr do
       it 'updates a resource' do
-        subject.patch('/api/v2/topics/556402', @topic_update_data).body.name.should eq(@topic_update_data[:name])
+        subject.patch('/api/v2/topics/601117', @topic_update_data).body['name'].should eq(@topic_update_data[:name])
       end
     end
 
     describe '#delete', :vcr do
       it 'deletes a resource' do
-        subject.delete('/api/v2/topics/558245').status.should eq(204)
+        subject.delete('/api/v2/topics/601117').status.should eq(204)
       end
     end
   end
@@ -119,27 +112,27 @@ describe DeskApi::Client do
 
     describe '#get', :vcr do
       it 'fetches resources' do
-        response = @client.get('/api/v2/articles/1213277')
-        response.body.subject.should eq('asdf')
+        response = @client.get('/api/v2/articles/1391017')
+        response.body['subject'].should eq('Testing OAuth')
       end
     end
 
     describe '#post', :vcr do
       it 'creates a resource' do
         response = @client.post('/api/v2/articles', @article_create_data)
-        response.body.subject.should eq(@article_create_data[:subject])
+        response.body['subject'].should eq(@article_create_data[:subject])
       end
     end
 
     describe '#patch', :vcr do
       it 'updates a resource' do
-        @client.patch('/api/v2/articles/1285134', @article_update_data).body.subject.should eq(@article_update_data[:subject])
+        @client.patch('/api/v2/articles/1391017', @article_update_data).body['subject'].should eq(@article_update_data[:subject])
       end
     end
 
     describe '#delete', :vcr do
       it 'deletes a resource' do
-        @client.delete('/api/v2/articles/1285134').status.should eq(204)
+        @client.delete('/api/v2/articles/1391017').status.should eq(204)
       end
     end
   end

data/spec/desk_api/resource_spec.rb

@@ -7,25 +7,25 @@ describe DeskApi::Resource do
 
   context '#initialize' do
     it 'stores the client' do
-      subject.articles.instance_variable_get(:@client).should eq(subject)
+      subject.articles.instance_variable_get(:@_client).should eq(subject)
     end
 
     it 'is not loaded initially' do
-      subject.articles.instance_variable_get(:@loaded).should be_false
+      subject.articles.instance_variable_get(:@_loaded).should be_false
     end
 
     it 'sets up the link to self' do
-      subject.articles.instance_variable_get(:@_links).self.href.should_not be_nil
+      subject.articles.href.should_not be_nil
     end
   end
 
   context '#exec!', :vcr do
     it 'loads the current resource' do
-      subject.articles.send(:exec!).instance_variable_get(:@loaded).should be_true
+      subject.articles.send(:exec!).instance_variable_get(:@_loaded).should be_true
     end
 
     it 'can be forced to reload' do
-      subject.articles.instance_variable_set(:@loaded, true)
+      subject.articles.instance_variable_set(:@_loaded, true)
       subject.should_receive(:get).and_call_original
       subject.articles.send(:exec!, true)
     end
@@ -33,44 +33,53 @@ describe DeskApi::Resource do
 
   context '#method_missing', :vcr do
     it 'loads the resource to find a suitable method' do
-      subject.articles.instance_variable_set(:@loaded, false)
-      subject.articles.should_receive(:exec!).and_call_original
-      subject.articles.first_page
+      articles = subject.articles
+      articles.instance_variable_set(:@_loaded, false)
+      articles.should_receive(:exec!).and_call_original
+      articles.entries
     end
 
     it 'raises an error if method does not exist' do
-      lambda { subject.articles.some_other_method }.should raise_error(DeskApi::Error::MethodNotSupported)
+      lambda { subject.articles.some_other_method }.should raise_error(NoMethodError)
     end
   end
 
   context '#by_url', :vcr do
     it 'finds resources by url' do
-      subject.articles.by_url('/api/v2/articles/1213277').should be_an_instance_of(DeskApi::Resource::Article)
+      subject.articles.by_url('/api/v2/articles/1295677').should be_an_instance_of(DeskApi::Resource)
     end
   end
 
   context '#get_self' do
     it 'returns the hash for self' do
       subject.articles.get_self.should eq({
-        "href" => "/api/v2/articles",
-        "class" => "page"
+        "href" => "/api/v2/articles"
       })
     end
   end
 
-  context '#get_href' do
+  context '#href' do
     it 'returns the href for self' do
-      subject.articles.get_href.should eq('/api/v2/articles')
+      subject.articles.href.should eq('/api/v2/articles')
     end
-  end
 
-  context '#resource', :vcr do
-    it 'requires the specified resource' do
-      subject.send(:resource, 'article').should equal(DeskApi::Resource::Article)
+    it 'sets the href' do
+      res = DeskApi::Resource.new(subject, {
+        '_links'=>{'self'=>{'href'=>'/api/v2/cases'}}
+      }, true)
+
+      res.href.should eq('/api/v2/cases')
+      res.href = '/api/v2/articles'
+      res.href.should eq('/api/v2/articles')
     end
+  end
 
-    it 'returns the generic resource on error' do
-      subject.send(:resource, 'something_crazy').should equal(DeskApi::Resource)
+  context '#type' do
+    it 'returns the resources type' do
+      res = DeskApi::Resource.new(subject, {
+        '_links'=>{'self'=>{'href'=>'/api/v2/cases','class'=>'page'}}
+      }, true)
+      res.type.should eq('page')
     end
   end
 
@@ -78,10 +87,6 @@ describe DeskApi::Resource do
     it 'allows searching on search enabled resources', :vcr do
       subject.articles.search(text: 'Lorem Ipsum').total_entries.should eq(0)
     end
-
-    it 'throws an error if search is not enabled' do
-      lambda { subject.users.search(test: 'something') }.should raise_error(DeskApi::Error::MethodNotSupported)
-    end
   end
 
   context '#create' do
@@ -91,14 +96,14 @@ describe DeskApi::Resource do
       }).name.should eq('My new topic')
     end
 
-    it 'throws an error creating a user' do
-      lambda { subject.users.create(name: 'Some User') }.should raise_error(DeskApi::Error::MethodNotSupported)
+    it 'throws an error creating a user', :vcr do
+      lambda { subject.users.create(name: 'Some User') }.should raise_error(DeskApi::Error::MethodNotAllowed)
     end
   end
 
   context '#update' do
     it 'updates a topic', :vcr do
-      topic = subject.topics.first
+      topic = subject.topics.entries.first
 
       topic.description = 'Some new description'
       topic.update({
@@ -110,15 +115,15 @@ describe DeskApi::Resource do
     end
 
     it 'throws an error updating a user', :vcr do
-      user = subject.users.first
-      lambda { user.update(name: 'Some User') }.should raise_error(DeskApi::Error::MethodNotSupported)
+      user = subject.users.entries.first
+      lambda { user.update(name: 'Some User') }.should raise_error(DeskApi::Error::MethodNotAllowed)
     end
 
     it 'can update without a hash', :vcr do
-      topic = subject.topics.first
+      topic = subject.topics.entries.first
       topic.description = 'Another description update.'
       topic.update
-      subject.topics.first.description.should eq('Another description update.')
+      subject.topics.entries.first.description.should eq('Another description update.')
     end
   end
 
@@ -128,30 +133,24 @@ describe DeskApi::Resource do
         subject: 'My subject',
         body: 'Some text for this new article',
         _links: {
-          topic: subject.topics.first.get_self
+          topic: subject.topics.entries.first.get_self
         }
       }).delete.should be_true
     end
 
     it 'throws an error deleting a non deletalbe resource', :vcr do
-      user = subject.users.first
-      lambda { user.delete }.should raise_error(DeskApi::Error::MethodNotSupported)
+      user = subject.users.entries.first
+      lambda { user.delete }.should raise_error(DeskApi::Error::MethodNotAllowed)
     end
   end
 
   describe 'embeddable' do
-    it 'has resources defined' do
-      DeskApi::Resource::Case.embeddable?(:assigned_user).should be_true
-      DeskApi::Resource::Case.embeddable?(:message).should be_false
-    end
-
     it 'allows to declare embedds' do
       lambda { subject.cases.embed(:assigned_user) }.should_not raise_error
-      lambda { subject.cases.embed(:message) }.should raise_error(DeskApi::Error::NotEmbeddable)
     end
 
     it 'changes the url' do
-      subject.cases.embed(:assigned_user).get_href.should eq('/api/v2/cases?embed=assigned_user')
+      subject.cases.embed(:assigned_user).href.should eq('/api/v2/cases?embed=assigned_user')
     end
 
     context 'if you use embed' do
@@ -184,9 +183,9 @@ describe DeskApi::Resource do
           ]
         end
 
-        first_case = @client.cases.embed(:assigned_user).first
+        first_case = @client.cases.embed(:assigned_user).entries.first
         first_case.assigned_user.name.should eq('Thomas Stachl')
-        first_case.assigned_user.instance_variable_get(:@loaded).should be_true
+        first_case.assigned_user.instance_variable_get(:@_loaded).should be_true
         times_called.should eq(1)
       end
 
@@ -206,4 +205,80 @@ describe DeskApi::Resource do
       end
     end
   end
+
+  context '#query_params' do
+    before do
+      @page = DeskApi::Resource.new(subject, {
+        '_links'=>{'self'=>{'href'=>'/api/v2/cases?page=2&per_page=50'}}
+      }, true)
+    end
+
+    it 'allows to get query params from the current resource' do
+      @page.send(:query_params_include?, 'page').should eq('2')
+      @page.send(:query_params_include?, 'per_page').should eq('50')
+    end
+
+    it 'returns nil if param not found' do
+      @page.send(:query_params_include?, 'blup').should be_nil
+    end
+  end
+
+  context '#query_params=' do
+    before do
+      @page = DeskApi::Resource.new(subject, {
+        '_links'=>{'self'=>{'href'=>'/api/v2/cases'}}
+      }, true)
+    end
+
+    it 'sets query params on the current url' do
+      @page.send(:query_params=, { page: 5, per_page: 50 })
+      @page.instance_variable_get(:@_definition)['_links']['self']['href'].should eq('/api/v2/cases?page=5&per_page=50')
+    end
+  end
+
+  context '#get_linked_resource' do
+    it 'returns linked resources', :vcr do
+      subject.cases.entries.first.customer.should be_an_instance_of(DeskApi::Resource)
+    end
+
+    it 'returns nil if link is nil', :vcr do
+      subject.articles.next.should be_nil
+    end
+
+    it 'saves the linked resource instead of the url', :vcr do
+      first_case = subject.cases.entries.first
+      first_case.customer.should be_an_instance_of(DeskApi::Resource)
+      first_case.instance_variable_get(:@_definition)['_links']['customer'].should be_an_instance_of(DeskApi::Resource)
+    end
+  end
+
+  context '#page' do
+    it 'returns the current page and loads if page not defined', :vcr do
+      subject.articles.page.should eq(1)
+    end
+
+    it 'sets the page' do
+      subject.cases.page(5).page.should eq(5)
+    end
+
+    it 'sets the resource to not loaded', :vcr do
+      cases = subject.cases.send(:exec!)
+      cases.page(5).instance_variable_get(:@_loaded).should be_false
+    end
+
+    it 'keeps the resource as loaded', :vcr do
+      cases = subject.cases.send(:exec!)
+      cases.page(1).instance_variable_get(:@_loaded).should be_true
+    end
+  end
+
+  context '#find' do
+    it 'loads the requested resource', :vcr do
+      subject.cases.find(3065).subject.should eq('Testing the Tank again')
+    end
+
+    it 'has an alias by_id', :vcr do
+      subject.cases.find(3065).subject.should eq('Testing the Tank again')
+    end
+  end
 end