bearcat 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 36f05c75e3373b99b27a612fa4bcf05fb70067e1
-  data.tar.gz: e055f0865ccf206ce4773a05520bb9cc9a90cae5
+  metadata.gz: 1c58958ef73904e5bf4b010ad4e2795c1d374617
+  data.tar.gz: 61d57f4dbebba2ed51188f2081ba3b56a95a889c
 SHA512:
-  metadata.gz: ce381ef225ddae442e4843b136117328bb46c43a18d114aeda260284cd5a1dee9d229a3266b0cb5a7aae0a9d459c6fd93a3e62a64db02fe2f4ca3ff9e523ab0b
-  data.tar.gz: f20897541aad8e4802992fa39b2a90edaf022ac7eff509ccf46c0a7505ded4696dde3b76de79aaa247e20d0764e033869050ad4aeae98ab7e7e8b37e6a25aefb
+  metadata.gz: 19335d692cbd5e2237d9294aca981a03d8fbee2704e9a70bf4d5051bf2b358bd7e0f91ccdd3a7e5824cd51d19fd0a486b97a57b7fe13e021cb49137f2bb43875
+  data.tar.gz: 5bc253db48d718804dc83d5f1a8359042250d5911d3853f73be0b1caab152808f785167d483e513d882c8b80334f7f8e37cf237d6870ecfa2e8aebf6099e1b8e

data/lib/bearcat/client/o_auth2.rb

@@ -15,18 +15,24 @@ module Bearcat
         uri.to_s
       end
 
-      def retrieve_token(client_id, redirect_url, client_secret, code)
-        body = post('/login/oauth2/token', {
+      def retrieve_token(client_id, redirect_url, client_secret, code, grant_type = 'authorization_code')
+        token_params = {
           client_id: client_id,
           redirect_url: redirect_url,
           client_secret: client_secret,
-          code: code
-        })
+          grant_type: grant_type
+        }
+        if grant_type == 'authorization_code'
+          token_params[:code] = code
+        elsif grant_type == 'refresh_token'
+          token_params[:refresh_token] = code
+        end
+        body = post('/login/oauth2/token', token_params)
         config[:token] = body['access_token']
         set_connection(config)
-        config[:token]
+        body
       end
 
     end
   end
-end
+end

data/lib/bearcat/version.rb

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

data/spec/bearcat/client/o_auth2_spec.rb

@@ -10,11 +10,11 @@ describe Bearcat::Client::Enrollments do
 
   it "sets the auth_token" do
     stub_post(client, "/login/oauth2/token").
-      with(:body => {"client_id"=>"10000000000002", "client_secret"=>"secret", "code"=>"code", "redirect_url"=>"http://localhost:9393"}).
+      with(:body => {"client_id"=>"10000000000002", "client_secret"=>"secret", "code"=>"code", "redirect_url"=>"http://localhost:9393", 'grant_type' => 'authorization_code'}).
       to_return(json_response('access_token.json'))
     client.retrieve_token(10000000000002, 'http://localhost:9393', 'secret', 'code')
     client.config.token.should == "foo_bar_token"
     client.instance_variable_get(:@connection).headers[:authorization].should == 'Bearer foo_bar_token'
   end
 
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bearcat
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Nathan Mills, Jake Sorce
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-11 00:00:00.000000000 Z
+date: 2015-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -274,7 +274,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Canvas API
@@ -397,3 +397,4 @@ test_files:
 - spec/fixtures/user_page_views.json
 - spec/fixtures/user_profile.json
 - spec/helper.rb
+has_rdoc: