bearcat 1.3.52 → 1.3.53

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 57aeab92bce2490d628818355f14eda3f2a78015e865daea4f41c3f4ab5b0753
-  data.tar.gz: fbec8269e921270245d25fd59c9f63647cd2e34ce794b16b1c0b62d50cf92cb9
+  metadata.gz: f0cf8e258d39569d2594318b7ab932d6330a6c431457209296ef15a2a0e2ce1c
+  data.tar.gz: 0271b96f8803739253365ab53c65246927a94f81a762f2ab935f1f5ecb47cb6e
 SHA512:
-  metadata.gz: ce9efc0afffbc1e3e7aba6cd027a1f6c282a953bb62585328d28911c46f8b794e34bd896e16926f927533784263608854dabcaaecfbb7b7f10cc351478dea28b
-  data.tar.gz: d8912116b917f0b98e7bab56fcbf8c6c20dd7723d667cb8b0f449d48dd06514c19bb6424733bb99d4f79bf781962f6382a6af7061cebbc4ac2954741001629c7
+  metadata.gz: f786b3e10b6c69e1de4d98221167099ea626abca6769394eff4d72eb53c99eb0fa4594070c08e259302e401dfca44b314c89246aead3e39afd1b038250e27e87
+  data.tar.gz: adb1e066f78c93c80e7ce0f326ddb9bfee40a93493fe5c184dd2f873111db53c44fe9bbd00d72ca2aef658177885e6b6acb959eee9f3fc7e9b5f57e5bd78c115

data/lib/bearcat/api_array.rb

@@ -10,7 +10,17 @@ module Bearcat
       elsif key = array_key(response)
         ApiArray.new(response, api_client, key)
       else
-        response.body
+        make_indifferent(response.body)
+      end
+    end
+
+    def self.make_indifferent(thing)
+      if thing.is_a?(Array)
+        thing.map { |v| make_indifferent(v) }
+      elsif thing.is_a?(Hash)
+        thing.with_indifferent_access
+      else
+        thing
       end
     end
 
@@ -172,11 +182,10 @@ module Bearcat
 
     def process_body(response)
       if response.body.is_a?(Array)
-        response.body
+        ApiArray.make_indifferent(response.body)
       elsif response.body.is_a?(Hash) && @array_key
-        response.body[@array_key]
+        ApiArray.make_indifferent(response.body[@array_key])
       end
     end
-
   end
 end

data/lib/bearcat/spec_helpers.rb

@@ -5,6 +5,7 @@ require 'bearcat'
 # - `require 'bearcat/spec_helpers'`
 # And
 # - `config.include Bearcat::SpecHelpers`
+# This helper requires `gem 'method_source'` in your test group
 module Bearcat::SpecHelpers
   SOURCE_REGEX = /(?<method>get|post|delete|put)\((?<quote>\\?('|"))(?<url>.*)\k<quote>/
 

data/lib/bearcat/version.rb

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

data/spec/bearcat/api_array_spec.rb

@@ -1,9 +1,11 @@
 require 'helper'
 
 describe Bearcat::ApiArray do
+  let(:api_client) { double }
+  let(:response_body) { @response_body || [] }
+  let(:original_response) { double(body: response_body, status: 200, headers: {}, env: {}) }
+
   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 }
@@ -52,4 +54,28 @@ describe Bearcat::ApiArray do
       api_array.send(:get_page, 'https://fake.com?', 'per_page' => 10)
     end
   end
+
+  context 'makes returned values indifferent' do
+    it 'makes a Hash response indifferent' do
+      @response_body = { something: 1 }
+      result = described_class.process_response(original_response, api_client)
+      expect(result[:something]).to eq 1
+      expect(result['something']).to eq 1
+    end
+
+    it 'makes an Array response indifferent' do
+      @response_body = [{ something: 1 }]
+      result = described_class.process_response(original_response, api_client)
+      expect(result[0][:something]).to eq 1
+      expect(result[0]['something']).to eq 1
+    end
+
+    it 'makes a single-key Hash response indifferent' do
+      @response_body = { 'something' => [ { foo: 1 } ] }
+      allow(described_class).to receive(:array_key).and_return('something')
+      result = described_class.process_response(original_response, api_client)
+      expect(result[0][:foo]).to eq 1
+      expect(result[0]['foo']).to eq 1
+    end
+  end
 end

data/spec/bearcat/client/courses_spec.rb

@@ -91,8 +91,9 @@ describe Bearcat::Client::Sections do
   it 'sets extensions on a quiz' do
     stub_post(@client, "/api/v1/courses/1/quiz_extensions").to_return(json_response("quizzes/quiz_extension.json"))
     quiz_extension = @client.course_quiz_extensions('1', {quiz_extensions: [{user_id: 1}, {extra_time: 30}]})
-    quiz_extension.class.should eq(Hash)
+    quiz_extension.should be_a Hash
     quiz_extension['quiz_extensions'].first['extra_time'].should eq(30)
+    quiz_extension[:quiz_extensions].first[:extra_time].should eq(30)
   end
 
   it 'gets learning outcome results' do

data/spec/bearcat/client/discussions_spec.rb

@@ -25,8 +25,9 @@ describe Bearcat::Client::Discussions do
     discussions = @client.course_discussions('1')
     discussions.class.should eq(Bearcat::ApiArray)
     discussions.count.should == 1
-    discussions[0].class.should eq(Hash)
+    discussions[0].should be_a Hash
     discussions[0]['id'].should == 1
+    discussions[0][:id].should == 1
   end
 
   it 'returns group discussion topics' do
@@ -34,8 +35,9 @@ describe Bearcat::Client::Discussions do
     discussions = @client.group_discussions('1')
     discussions.class.should eq(Bearcat::ApiArray)
     discussions.count.should == 1
-    discussions[0].class.should eq(Hash)
+    discussions[0].should be_a Hash
     discussions[0]['id'].should == 1
+    discussions[0][:id].should == 1
   end
 
   it 'returns course discussion entries' do
@@ -43,8 +45,9 @@ describe Bearcat::Client::Discussions do
     discussions = @client.course_discussion_entries('1', '1')
     discussions.class.should eq(Bearcat::ApiArray)
     discussions.count.should == 1
-    discussions[0].class.should eq(Hash)
+    discussions[0].should be_a Hash
     discussions[0]['id'].should == 1
+    discussions[0][:id].should == 1
   end
 
   it 'returns group discussion entries' do
@@ -52,8 +55,9 @@ describe Bearcat::Client::Discussions do
     discussions = @client.group_discussion_entries('1', '1')
     discussions.class.should eq(Bearcat::ApiArray)
     discussions.count.should == 1
-    discussions[0].class.should eq(Hash)
+    discussions[0].should be_a Hash
     discussions[0]['id'].should == 1
+    discussions[0][:id].should == 1
   end
 
   it 'returns course discussion entry replies' do
@@ -61,8 +65,9 @@ describe Bearcat::Client::Discussions do
     discussions = @client.course_discussion_entry_replies('1', '1', '1')
     discussions.class.should eq(Bearcat::ApiArray)
     discussions.count.should == 1
-    discussions[0].class.should eq(Hash)
+    discussions[0].should be_a Hash
     discussions[0]['id'].should == 3
+    discussions[0][:id].should == 3
   end
 
   it 'returns group discussion entry replies' do
@@ -70,8 +75,9 @@ describe Bearcat::Client::Discussions do
     discussions = @client.group_discussion_entry_replies('1', '1', '1')
     discussions.class.should eq(Bearcat::ApiArray)
     discussions.count.should == 1
-    discussions[0].class.should eq(Hash)
+    discussions[0].should be_a Hash
     discussions[0]['id'].should == 3
+    discussions[0][:id].should == 3
   end
 
   it 'returns a single group discussion' do

data/spec/bearcat/client/quizzes_spec.rb

@@ -8,8 +8,9 @@ describe Bearcat::Client::Quizzes do
   it "updates a single quiz" do
     stub_put(@client, "/api/v1/courses/1/quizzes/38").to_return(json_response("quizzes/course_quiz.json"))
     course_quiz = @client.edit_quiz('1', '38')
-    course_quiz.class.should eq(Hash)
+    course_quiz.should be_a Hash
     course_quiz['id'].should == 38
+    course_quiz[:id].should == 38
   end
 
   it "returns a courses quizzes" do
@@ -24,22 +25,25 @@ describe Bearcat::Client::Quizzes do
   it "returns a single quiz" do
     stub_get(@client, "/api/v1/courses/1/quizzes/38").to_return(json_response("quizzes/course_quiz.json"))
     course_quiz = @client.quiz('1', '38')
-    course_quiz.class.should eq(Hash)
+    course_quiz.should be_a Hash
     course_quiz['id'].should == 38
+    course_quiz[:id].should == 38
   end
 
   it 'sets extensions on a quiz' do
     stub_post(@client, "/api/v1/courses/1/quizzes/1/extensions").to_return(json_response("quizzes/quiz_extension.json"))
     quiz_extension = @client.quiz_extensions('1', '1', {quiz_extensions: [{user_id: 1}, {extra_time: 30}]})
-    quiz_extension.class.should eq(Hash)
+    quiz_extension.should be_a Hash
     quiz_extension['quiz_extensions'].first['extra_time'].should eq(30)
+    quiz_extension[:quiz_extensions].first[:extra_time].should eq(30)
   end
 
   it 'returns a quiz assignment override' do
     stub_get(@client, "/api/v1/courses/1/quizzes/assignment_overrides?quiz_assignment_overrides%5B%5D%5Bquiz_ids%5D=13").to_return(json_response("quizzes/quiz_assignment_override.json"))
     quiz_overrides = @client.quiz_assignment_overrides('1',{:quiz_assignment_overrides => [{ :quiz_ids => 13 }] })
-    quiz_overrides.class.should eq(Hash)
+    quiz_overrides.should be_a Hash
     quiz_overrides['quiz_assignment_overrides'].first['quiz_id'].should eq(1014)
+    quiz_overrides[:quiz_assignment_overrides].first[:quiz_id].should eq(1014)
   end
 
 
@@ -56,8 +60,9 @@ describe Bearcat::Client::Quizzes do
     course_quiz_questions = @client.quiz_questions('1', '1')
     course_quiz_questions.class.should eq(Bearcat::ApiArray)
     course_quiz_questions.count.should == 1
-    course_quiz_questions[0].class.should eq(Hash)
+    course_quiz_questions[0].should be_a Hash
     course_quiz_questions[0]['id'].should == 1
+    course_quiz_questions[0][:id].should == 1
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bearcat
 version: !ruby/object:Gem::Version
-  version: 1.3.52
+  version: 1.3.53
 platform: ruby
 authors:
 - Nathan Mills, Jake Sorce
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-14 00:00:00.000000000 Z
+date: 2020-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake