bearcat 1.3.10 → 1.3.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2638ba0d30fa85c6877d987310f9bf59e7661f2c
-  data.tar.gz: d7538f4a870fe635eb6bd68bd8b3b204c8e5da91
+  metadata.gz: 867a8c613b078d0b370d683d195f09f9664771e3
+  data.tar.gz: 6b3dcbf10b3d5af0086080adb1a06659c9e6a7d2
 SHA512:
-  metadata.gz: d9c8ca2a6573b456018a826791c5d8051c05bd74c2a7654ef172c57e018f8c536dccf0542efc9208df1dd165e5c5f9fb1fa4528fce42b637bf635f955eab6a6d
-  data.tar.gz: e1ca459229b2f15d92d3b3e564c2fc5f429a7c9c4e0133d8818a0c132fa3be41559df13d55d17e8f3c7064c622f175ebd8924417207eee91b2759d670de61a24
+  metadata.gz: 9e0c02e8102651d70fdc2f514178e3f93646b37c32487b3e701e8a54178ffb55a5f0feb9d5f1b622377d5d235a95093e0dc9d6db3977ffd090e96044074aaad8
+  data.tar.gz: 0637013e221c6655a499db41df3b31235d604b281acf56b7e4b87e4b97d58aaa6a4b4b60dd3b6ae2a405df9c54cb67233445d0a294472a710c0f97809cbdae4f

data/lib/bearcat/api_array.rb

@@ -114,11 +114,18 @@ module Bearcat
     end
 
     def get_page(url, params = {})
-      params['per_page'] = @page_count unless params.has_key? 'per_page' || !@page_count
+      params['per_page'] = @page_count unless params.key?('per_page') || !@page_count
       query = URI.parse(url).query
-      p = CGI.parse(query).merge(params)
+      p = CGI.parse(query)
       u = url.gsub("?#{query}", '')
-      p.each { |k, v| p[k] = v.first if v.is_a?(Array) }
+
+      # strip value out of array if value is an array and key doesn't have [] (parameter is not an array parameter)
+      p.each { |k, v| p[k] = v.first if v.is_a?(Array) && k !~ /\[\]$/ }
+      # remove [] from key names, this is copied from rails' {}.transform_keys!
+      p.keys.each { |k| p[k.delete('[]')] = p.delete(k) }
+      # merge params
+      p.merge!(params)
+
       @api_client.connection.send(:get) do |r|
         r.url(u, p)
       end

data/lib/bearcat/version.rb

@@ -1,3 +1,3 @@
 module Bearcat
-  VERSION = '1.3.10' unless defined?(Bearcat::VERSION)
+  VERSION = '1.3.11' unless defined?(Bearcat::VERSION)
 end

data/spec/bearcat/api_array_spec.rb

@@ -0,0 +1,55 @@
+require 'helper'
+
+describe Bearcat::ApiArray do
+  describe 'get_page' do
+    let(:api_client) { double }
+    let(:original_response) { double(body: [], status: 200, headers: {}, env: {}) }
+    let(:api_array) { described_class.process_response(original_response, api_client) }
+    let(:connection) { double }
+    let(:request) { double }
+
+    before :each do
+      api_array.instance_variable_set('@page_count', nil)
+      allow(api_client).to receive(:connection).and_return connection
+      allow(connection).to receive(:send) do |&block|
+        block.call(request)
+      end
+    end
+
+    it 'gets a page of results' do
+      expect(request).to receive(:url).with('https://fake.com', 'page' => '2')
+      api_array.send(:get_page, 'https://fake.com?page=2', {})
+    end
+
+    it 'merges additonal params to the url query' do
+      expect(request).to receive(:url).with('https://fake.com', 'test' => 'param', 'page' => 2)
+      api_array.send(:get_page, 'https://fake.com?test=param', 'page' => 2)
+    end
+
+    it 'handles array parameters' do
+      expect(request).to receive(:url).with('https://fake.com', 'test' => ['param'], 'second' => ['param'])
+      api_array.send(:get_page, 'https://fake.com?test%5B%5D=param', 'second' => ['param'])
+    end
+
+    it 'sets the per_page parameter if not already set and @page_count has a value' do
+      api_array.instance_variable_set('@page_count', 50)
+
+      expect(request).to receive(:url).with('https://fake.com', 'per_page' => 50)
+      api_array.send(:get_page, 'https://fake.com?', {})
+    end
+
+    it 'does not set the per_page parameter if @page_count is not available' do
+      api_array.instance_variable_set('@page_count', nil)
+
+      expect(request).to receive(:url).with('https://fake.com', {})
+      api_array.send(:get_page, 'https://fake.com?', {})
+    end
+
+    it 'does not set the per_page parameter if it is already set' do
+      api_array.instance_variable_set('@page_count', 50)
+
+      expect(request).to receive(:url).with('https://fake.com', 'per_page' => 10)
+      api_array.send(:get_page, 'https://fake.com?', 'per_page' => 10)
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bearcat
 version: !ruby/object:Gem::Version
-  version: 1.3.10
+  version: 1.3.11
 platform: ruby
 authors:
 - Nathan Mills, Jake Sorce
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-07 00:00:00.000000000 Z
+date: 2017-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -140,6 +140,7 @@ files:
 - lib/bearcat/client/submissions.rb
 - lib/bearcat/client/users.rb
 - lib/bearcat/version.rb
+- spec/bearcat/api_array_spec.rb
 - spec/bearcat/client/accounts_spec.rb
 - spec/bearcat/client/analytics_spec.rb
 - spec/bearcat/client/assignment_groups_spec.rb
@@ -313,11 +314,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Canvas API
 test_files:
+- spec/bearcat/api_array_spec.rb
 - spec/bearcat/client/accounts_spec.rb
 - spec/bearcat/client/analytics_spec.rb
 - spec/bearcat/client/assignment_groups_spec.rb
@@ -472,3 +474,4 @@ test_files:
 - spec/fixtures/user_page_views.json
 - spec/fixtures/user_profile.json
 - spec/helper.rb
+has_rdoc: