pandarus 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d2131ee95759c437062ab4b868801892f318f4b2
-  data.tar.gz: eb49c33139b925885cce2b863e93ab9166e904a3
+  metadata.gz: ea1afaaa6919f9eed893eb274a1fe527421bf5b8
+  data.tar.gz: 77706c514f1af00058f5ac2795a82c0d861c5fc5
 SHA512:
-  metadata.gz: 52d1634ec998f2b71c344637895fd2a61589f73d05977351231d43e348be4431f55f2873cad02a86a0b1db3fbe3a273a6ed23d10029307955d7a252016525051
-  data.tar.gz: 2ec52e7a417f4029b6a19ecefb76e37e89085ce197255227a030d5b2ff12f70ed53a392e4b9a459c98d7e7fa34f2b48d5b73cb7abb3f8876718d4353ef4acfb9
+  metadata.gz: 565b795b90cd23a8e712d3aa967c9bb069bbe986c3cf8b054ec7d17fd9a3ce2c1448f9a4a6a32f5e5698aedd59a578035877279dd5f00de5eab5efd99d898fde
+  data.tar.gz: a69996ea83e880e05766f0f35f6ba185ebaa2bac8dbfb696c108e7904ca0ab34b9caf8209110d4f3542ac4fb30c746bd93145320d9c3a3461230301c5ab4ece1

data/lib/pandarus/remote_collection.rb

@@ -48,19 +48,21 @@ module Pandarus
       handle_response @http_client.get(@pagination_links.last.next)
     end
 
+    private
+
     def was_last_page?
+      return true if @pagination_links == []
       @pagination_links.last.last_page?
     end
 
     def handle_response(response)
-      unless @pagination_links.any? {|links| links == response.env[:pagination_links] }
+      response_links = response.env[:pagination_links]
+      if response_links && !@pagination_links.any? {|existing_links| existing_links == response_links }
         @pagination_links << response.env[:pagination_links]
       end
       response.body.map{|member| @target_class.new(member) }
     end
 
-    private
-
     def base_path
       @http_client.url_prefix.path
     end

data/lib/pandarus/version.rb

@@ -1,3 +1,3 @@
 module Pandarus
-  VERSION = '0.6.3' unless defined?(Pandarus::VERSION)
+  VERSION = '0.6.4' unless defined?(Pandarus::VERSION)
 end

data/spec/fixtures/vcr_cassettes/remote_collection_all_pages.yml

@@ -39,20 +39,20 @@ http_interactions:
       Cache-Control:
       - must-revalidate, private, max-age=0
       Set-Cookie:
-      - _csrf_token=HmhMEGEdhhvRVlnYZLXTwyIGYGjuWeQ68xUPSiAd5vt6GQdXBUXDLL0jOIkGgrqzWEhZKaQTnF3CVFolV0mTzg%3D%3D;
+      - _csrf_token=jsM58YpsUDxPQGzaKcvUwzWfBulRrJgI%2B1fYmLoOqbPou3WV%2BSsBUiILFpZng7v0TNsw3inu0mK%2FGu%2Br7zjO4Q%3D%3D;
         path=/
-      - _normandy_session=cP7mYMVZ0cCgO7RmBD_99w.5oUsKA4C4mkJk-l49huIqeHphIh-b8Gq1yRT8B9cvpBCTSTSGbICDIbmnIKlZX_Y76DZTEfDSLeyzDuyzECfmLPXW86Z22X6rmTroYwMeAt5ym_3khrSJGefEypDw6Hd.fKoO7AdPLd-swV8VPxGDeHz_SBg.VJLvJg;
+      - _normandy_session=zWF8MzAVtYcQl4Ocez9TJA.MdkGjGCWASvMn2GyQEJ647UUwZ5PfS7B216UEU8vilJ2GtqnGI0JSxUhWZLMUldMPFXiOyDU2PCOCp2z1k9e4pbXNa0NRyaywnJYcGazLc5ECUK7aYdUdUTlL5Scj2-j.UrtD2RSC0LuX-gDM8YjMG_WHlvk.VJiTTw;
         path=/; HttpOnly
       X-Session-Id:
-      - ac19512a3ac594145f0b4c21095275e6
+      - 76414941a586ff4bef0337f23df28509
       X-Request-Context-Id:
-      - 6079e1c0-68f6-0132-4d7c-38e85630c82a
+      - 29716e60-6c53-0132-52e9-38e85630c82a
       X-Canvas-Meta:
-      - a=1;g=DtbEcIgsiKSxJvSoQKH05C46ONAcwvepb4BEBYAz;s=2;c=development;b=328036;m=328036;u=0.22;y=0.02;d=0.01;
+      - a=1;g=DtbEcIgsiKSxJvSoQKH05C46ONAcwvepb4BEBYAz;s=2;c=development;b=371464;m=371464;u=0.23;y=0.02;d=0.01;
       X-Runtime:
-      - '0.261794'
+      - '0.269341'
       Date:
-      - Thu, 18 Dec 2014 15:13:42 GMT
+      - Mon, 22 Dec 2014 21:55:27 GMT
       X-Rack-Cache:
       - miss
       Connection:
@@ -71,7 +71,7 @@ http_interactions:
         Holland","sortable_name":"Holland, Jonathan","short_name":"Jonathan Holland","sis_user_id":"student_4459","integration_id":null,"sis_login_id":"westudent215","sis_import_id":4,"login_id":"westudent215"},{"id":91,"name":"Corey
         Kelly","sortable_name":"Kelly, Corey","short_name":"Corey Kelly","sis_user_id":"student_4408","integration_id":null,"sis_login_id":"westudent259","sis_import_id":4,"login_id":"westudent259"}]'
     http_version: 
-  recorded_at: Thu, 18 Dec 2014 15:13:42 GMT
+  recorded_at: Mon, 22 Dec 2014 21:55:27 GMT
 - request:
     method: get
     uri: http://shard1.canvas.dev/api/v1/courses/14/users?enrollment_type=student&page=2&per_page=10
@@ -112,20 +112,20 @@ http_interactions:
       Cache-Control:
       - must-revalidate, private, max-age=0
       Set-Cookie:
-      - _csrf_token=EKCSPyXN2cjUagWmSyxnJaxR8U8sEwoH%2BOK%2BsSftt2ldytoOR4iA464kSZcqS18X32KgFm84PlPPluvGcNWYMw%3D%3D;
+      - _csrf_token=PwTWrdYNGV1TEWZ7FgiuFE%2FvSm3ihJcSadN98OblgM5bT47cnXxgZDl7FjpRSsRBfosOG9TgpiYbugW206zEhQ%3D%3D;
         path=/
-      - _normandy_session=H9dHgxOeRFp2LKwSrTNzIQ.I42HWwvEwVQ5buNUmA5dvXpAQ5ZVRmlJY3nR57DrpIwxt7DhfRP3lqo99GPyQBz_ZAkKHBQm2CSzGpIsUl7-9wpmgWa4rH-c-eZZf7rIp4gZuviyFtISh8ialNkhn7ZU.P4ihNStsDB5-nXi_LTU-7jxG30c.VJLvJw;
+      - _normandy_session=C44slFtEIvJWZfqJXerjLg.qGoXBN9TzBFAYQJLHoL0Ks2u7WJtMDPFD18x8vSdF_FpLwpvOlyBA9nig8aGXbr2wMnom5kV_b45TBP-P1v8WuGPN1JBc0_S_6slI7VYvYOsBidQhoGMU9jk2HdNW7GU.domHfXFXb9VInjtD4HxbfHhaGbs.VJiTTw;
         path=/; HttpOnly
       X-Session-Id:
-      - bdc07fdf3be919cbe7499e043e699c6e
+      - 0a8f103db518fda7bb13dc1fe57f68af
       X-Request-Context-Id:
-      - 60a38680-68f6-0132-4d7c-38e85630c82a
+      - 299d2f70-6c53-0132-52e9-38e85630c82a
       X-Canvas-Meta:
-      - a=1;g=DtbEcIgsiKSxJvSoQKH05C46ONAcwvepb4BEBYAz;s=2;c=development;b=328036;m=329924;u=0.43;y=0.02;d=0.01;
+      - a=1;g=DtbEcIgsiKSxJvSoQKH05C46ONAcwvepb4BEBYAz;s=2;c=development;b=371464;m=371464;u=0.31;y=0.02;d=0.01;
       X-Runtime:
-      - '0.482755'
+      - '0.367507'
       Date:
-      - Thu, 18 Dec 2014 15:13:43 GMT
+      - Mon, 22 Dec 2014 21:55:27 GMT
       X-Rack-Cache:
       - miss
       Connection:
@@ -144,7 +144,7 @@ http_interactions:
         Watts","sortable_name":"Watts, Stephenson","short_name":"Stephenson Watts","sis_user_id":"student_4442","integration_id":null,"sis_login_id":"westudent496","sis_import_id":4,"login_id":"westudent496"},{"id":115,"name":"Britney
         Whittle","sortable_name":"Whittle, Britney","short_name":"Britney Whittle","sis_user_id":"student_4432","integration_id":null,"sis_login_id":"westudent504","sis_import_id":4,"login_id":"westudent504"}]'
     http_version: 
-  recorded_at: Thu, 18 Dec 2014 15:13:43 GMT
+  recorded_at: Mon, 22 Dec 2014 21:55:27 GMT
 - request:
     method: get
     uri: http://shard1.canvas.dev/api/v1/courses/14/users?enrollment_type=student&page=3&per_page=10
@@ -184,20 +184,20 @@ http_interactions:
       Cache-Control:
       - must-revalidate, private, max-age=0
       Set-Cookie:
-      - _csrf_token=euTKz%2FVNURj4NjFMmxl9Cj7GbrsS%2FmZIkaZGH3aHqbUyqJy1hg4oXZluexneaRBLV55ByErLSWPo%2FjNNIvXsgw%3D%3D;
+      - _csrf_token=dSENVLsxmQ4hosrEI2e8TwBIPF2ioOYAQ90gHTFrA35HS38nw2XRYxT1%2F4JmC%2B8CKzhXE8TqhFAwhE8qYS56NQ%3D%3D;
         path=/
-      - _normandy_session=4H57XVZatJMTTHBTSz0XXg.KJo0W_Gnid9O7o93o7D0B0JXYKU_0DYjX3p5F9mu-e4jYDfeb6xGLjDIgeNmOgsH3RfmC93cFnqnoWl_VNS0F_LwZM6rgmtqWmyXSZYD2G-4Zyi1tL7FP95RBddu6MnT.8pSpRuwegl1mhR3wIZjeSFWPIzs.VJLvJw;
+      - _normandy_session=vXrwazjrTOLyY4EZV54PGA.1oBz9DK-UZghtfaMWXSTsnqTGCjlKeJZsX6fmXufW9UsK1BoUUG3sY2jnjkP9a7CFjDUW9K7AVFaHwy1B8G1riFP9C8S_i2fg5VS6tFpEBsOydFriP5w10_7Mltd_o64.ZYeQUSsY-vnIhxhUUO8sWdNoRXs.VJiTTw;
         path=/; HttpOnly
       X-Session-Id:
-      - 62e9e75f213e4a7d5cc91786fea42c90
+      - 1b093ceebeb6ef802d1b834b9019d557
       X-Request-Context-Id:
-      - 60ef8850-68f6-0132-4d7c-38e85630c82a
+      - 29d75230-6c53-0132-52e9-38e85630c82a
       X-Canvas-Meta:
-      - a=1;g=DtbEcIgsiKSxJvSoQKH05C46ONAcwvepb4BEBYAz;s=2;c=development;b=329924;m=329968;u=0.20;y=0.02;d=0.01;
+      - a=1;g=DtbEcIgsiKSxJvSoQKH05C46ONAcwvepb4BEBYAz;s=2;c=development;b=371464;m=371464;u=0.06;y=0.01;d=0.01;
       X-Runtime:
-      - '0.237708'
+      - '0.096645'
       Date:
-      - Thu, 18 Dec 2014 15:13:43 GMT
+      - Mon, 22 Dec 2014 21:55:27 GMT
       X-Rack-Cache:
       - miss
       Connection:
@@ -207,5 +207,5 @@ http_interactions:
       string: '[{"id":108,"name":"Jessy Young","sortable_name":"Young, Jessy","short_name":"Jessy
         Young","sis_user_id":"student_4425","integration_id":null,"sis_login_id":"westudent520","sis_import_id":4,"login_id":"westudent520"}]'
     http_version: 
-  recorded_at: Thu, 18 Dec 2014 15:13:43 GMT
+  recorded_at: Mon, 22 Dec 2014 21:55:27 GMT
 recorded_with: VCR 2.9.3

data/spec/fixtures/vcr_cassettes/remote_collection_empty.yml

@@ -0,0 +1,64 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: http://shard1.canvas.dev/api/v1/courses/183/users?enrollment_type=student
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept:
+      - application/json
+      Authorization:
+      - Bearer Bearer 1~A5dY8IsOyhVOVRJi4V3XWGNsa7pzuIbdM8OCv62YTRFqOsiS9vX0NbtY8PR9q4pX
+      User-Agent:
+      - Footrest
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      X-Canvas-User-Id:
+      - '10000000000001'
+      Link:
+      - <http://shard1.canvas.dev/api/v1/courses/183/users?enrollment_type=student&page=1&per_page=10>;
+        rel="current",<http://shard1.canvas.dev/api/v1/courses/183/users?enrollment_type=student&page=1&per_page=10>;
+        rel="first",<http://shard1.canvas.dev/api/v1/courses/183/users?enrollment_type=student&page=1&per_page=10>;
+        rel="last"
+      X-Frame-Options:
+      - SAMEORIGIN
+      Content-Type:
+      - application/json; charset=utf-8
+      X-Ua-Compatible:
+      - IE=Edge
+      Etag:
+      - '"d751713988987e9331980363e24189ce"'
+      Cache-Control:
+      - must-revalidate, private, max-age=0
+      Set-Cookie:
+      - _csrf_token=70LPEWYX8OUtxNrRWPyLn%2FF5xpDuVASz9YBJQekUgJWBGIBcE2bBqV2erbMBqe713ivx4L8%2FZsKnuBgEv2TDow%3D%3D;
+        path=/
+      - _normandy_session=yClqZDQD-PKanqxq4xbeUA.YKVmGVKaKJ6pC4Lf_jlDeelPxqjDK5ZO1wn57l9_e2q_xaAlLWt_nkEYd4arBr8x1sFipxANo5tXnOmCIxduDZhah0oXGnPxhwcowYPwH4bW3R0-udl6FsJ6WGAFwU2z._u4S-ax72PiWoXX-kD6cSPOo88Y.VK1_SA;
+        path=/; HttpOnly
+      X-Session-Id:
+      - 2698d12b0db9b5da795f2e5df6f53ba6
+      X-Request-Context-Id:
+      - 927c35e0-78cb-0132-bea1-38e85630c82a
+      X-Canvas-Meta:
+      - a=1;g=DtbEcIgsiKSxJvSoQKH05C46ONAcwvepb4BEBYAz;s=2;c=development;b=341124;m=341280;u=0.21;y=0.02;d=0.01;
+      X-Runtime:
+      - '0.260593'
+      Date:
+      - Wed, 07 Jan 2015 18:47:36 GMT
+      X-Rack-Cache:
+      - miss
+      Connection:
+      - close
+    body:
+      encoding: UTF-8
+      string: "[]"
+    http_version: 
+  recorded_at: Wed, 07 Jan 2015 18:47:36 GMT
+recorded_with: VCR 2.9.3

data/spec/fixtures/vcr_cassettes/remote_collection_single_page.yml

@@ -0,0 +1,59 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: http://shard1.canvas.dev/api/v1/courses/14/sections
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept:
+      - application/json
+      Authorization:
+      - Bearer Bearer 1~A5dY8IsOyhVOVRJi4V3XWGNsa7pzuIbdM8OCv62YTRFqOsiS9vX0NbtY8PR9q4pX
+      User-Agent:
+      - Footrest
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      X-Canvas-User-Id:
+      - '10000000000001'
+      X-Frame-Options:
+      - SAMEORIGIN
+      Content-Type:
+      - application/json; charset=utf-8
+      X-Ua-Compatible:
+      - IE=Edge
+      Etag:
+      - '"d57de41ff2edcb1840cba95cd99ceb93"'
+      Cache-Control:
+      - must-revalidate, private, max-age=0
+      Set-Cookie:
+      - _csrf_token=Nn0Xriy%2BzySk5XIE4WX%2FIYmWuMirPk52%2FY8rWDthFp1SS17JfMipYP6%2FS2%2BwNaVx8N%2F9pflOPDfI%2FmpuYVlb%2BA%3D%3D;
+        path=/
+      - _normandy_session=kjUGEKraWqjH8yUDgkjv0g.KV0__PysS8xFX02CiZFVHdyhaQB6RboB7hzYJ4R95FKcBGg7GgtaHLEfZ1wtPz2RAJ-53cGqRKwvcGM-ZJxi4gTz4iBuSHLC990OlekqmtjCyIq1Z4jnpAkGQ2Lc0md7.-Fkgs-L9w-l5bvVJaon6h0U9ths.VJiCAA;
+        path=/; HttpOnly
+      X-Session-Id:
+      - ed3089094605b369c73c4ff0002cc5fe
+      X-Request-Context-Id:
+      - d877b560-6c48-0132-52e9-38e85630c82a
+      X-Canvas-Meta:
+      - a=1;g=DtbEcIgsiKSxJvSoQKH05C46ONAcwvepb4BEBYAz;s=2;c=development;b=328372;m=328372;u=0.19;y=0.01;d=0.00;
+      X-Runtime:
+      - '0.225363'
+      Date:
+      - Mon, 22 Dec 2014 20:41:36 GMT
+      X-Rack-Cache:
+      - miss
+      Connection:
+      - close
+    body:
+      encoding: UTF-8
+      string: '[{"course_id":14,"end_at":null,"id":14,"name":"1st Grade English-EL101-14-15-Barker","nonxlist_course_id":null,"start_at":null,"sis_section_id":"1994","sis_course_id":"1994","integration_id":"1994","sis_import_id":4}]'
+    http_version: 
+  recorded_at: Mon, 22 Dec 2014 20:41:36 GMT
+recorded_with: VCR 2.9.3

data/spec/lib/pandarus/remote_collection_spec.rb

@@ -43,14 +43,27 @@ module Pandarus
     end
 
     describe '#to_a' do
-      let(:array) {
-        VCR.use_cassette('remote_collection_all_pages') do
-          collection.to_a
+      it 'must gracefully handle an empty collection' do
+        VCR.use_cassette('remote_collection_empty') do
+          collection.instance_variable_set(:@path, '/v1/courses/183/users')
+          array = collection.to_a
+          expect(array).to be_empty
         end
-      }
+      end
+
+      it 'must happily fetch a collection with a single page' do
+        VCR.use_cassette('remote_collection_single_page') do
+          collection = RemoteCollection.new(client, Section, '/v1/courses/14/sections', {})
+          array = collection.to_a
+          expect(array.size).to eq 1
+        end
+      end
 
-      it 'must fetch all pages and combine them into a single array' do
-        expect(array.size).to eq 21
+      it 'must fetch all pages of a multi page collection and combine them into a single array' do
+        VCR.use_cassette('remote_collection_all_pages') do
+          array = collection.to_a
+          expect(array.size).to eq 21
+        end
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pandarus
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors:
 - Duane Johnson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-22 00:00:00.000000000 Z
+date: 2015-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -261,7 +261,9 @@ files:
 - spec/api_base_spec.rb
 - spec/client_spec.rb
 - spec/fixtures/vcr_cassettes/remote_collection_all_pages.yml
+- spec/fixtures/vcr_cassettes/remote_collection_empty.yml
 - spec/fixtures/vcr_cassettes/remote_collection_first_page.yml
+- spec/fixtures/vcr_cassettes/remote_collection_single_page.yml
 - spec/lib/pandarus/remote_collection_spec.rb
 - spec/model_base_spec.rb
 - spec/sis_import_spec.rb
@@ -296,7 +298,9 @@ test_files:
 - spec/api_base_spec.rb
 - spec/client_spec.rb
 - spec/fixtures/vcr_cassettes/remote_collection_all_pages.yml
+- spec/fixtures/vcr_cassettes/remote_collection_empty.yml
 - spec/fixtures/vcr_cassettes/remote_collection_first_page.yml
+- spec/fixtures/vcr_cassettes/remote_collection_single_page.yml
 - spec/lib/pandarus/remote_collection_spec.rb
 - spec/model_base_spec.rb
 - spec/sis_import_spec.rb