omniauth-windowslive 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4aa5be27e30909564a4718e268fef4cf049d154
-  data.tar.gz: 50994ff7eab9f2cdbeb96b1fca08be2564cd0e75
+  metadata.gz: 8aa55f94a1f5158edbc374bcfc60afa35a0c4802
+  data.tar.gz: 5079c3f77ebf8cc7461426fa1e00837d8520db6a
 SHA512:
-  metadata.gz: c4afaa195e7dd7c14031be140bf7d95fc8dc5a784e9c9ff5054d9e5619aa6873081e3cdecf4c055a2fa66347c7220b57eb80c02575116b56b17d58a837dc66b7
-  data.tar.gz: eced3af447ef049b6e92e6b86fd7392c68a15700adf9c191c79fd6fb5484c7e03374a2438730acd10ff07c7e2c96ad7d3c53caac7814c5012820238c3ef80ad9
+  metadata.gz: a9640419d2b596afb4a4d402a4a884ead36a4226e9f6ce3836bead398bfbcfcef20d968c26e68b42098a28a024c7712895f77e26c1bf7d7e97b9301a066d47e3
+  data.tar.gz: 6fff8eac231717a2453cf862d933c681b7768747808ad5eee878004934d99191e772b27bdd68e50439b0f7d09919258a06034892fb6182bb994818ef885c6ab6

data/Gemfile

@@ -6,5 +6,6 @@ gemspec
 
 group :test do
   gem 'coveralls', require: false
+  gem 'rb-readline'
   gem 'pry'
 end

data/lib/omniauth/strategies/windowslive.rb

@@ -52,11 +52,14 @@ module OmniAuth
       end
 
       private
-      
+
+      def callback_url
+        URI.parse(super).tap { |uri| uri.query = nil }.to_s
+      end
+
       def build_access_token
-        verifier = request.params["code"]
-        redirect_uri = URI.parse(callback_url).tap { |uri| uri.query = nil }.to_s
-        client.auth_code.get_token(verifier, {:redirect_uri => redirect_uri}.merge(token_params.to_hash(:symbolize_keys => true)), deep_symbolize(options.auth_token_params))
+        verifier = request.params['code']
+        client.auth_code.get_token(verifier, { redirect_uri: callback_url }.merge(token_params.to_hash(symbolize_keys: true)), deep_symbolize(options.auth_token_params))
       end
 
       def emails_parser

data/lib/omniauth/windowslive/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module Windowslive
-    VERSION = "0.0.11"
+    VERSION = '0.0.12'
   end
 end

data/omniauth-windowslive.gemspec

@@ -18,8 +18,9 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency 'omniauth-oauth2', '~> 1.4'
-  s.add_dependency 'multi_json', '>= 1.0.3'
-  s.add_development_dependency 'rspec', '~> 2.7'
+  s.add_dependency 'multi_json', '~> 1.12'
+
+  s.add_development_dependency 'rspec', '~> 3.5'
   s.add_development_dependency 'rack-test'
   s.add_development_dependency 'webmock'
 end

data/spec/omniauth/strategies/windowslive_spec.rb

@@ -2,28 +2,42 @@ require 'spec_helper'
 
 describe OmniAuth::Strategies::Windowslive do
   subject do
-    OmniAuth::Strategies::Windowslive.new(nil, @options || {})
+    OmniAuth::Strategies::Windowslive.new(nil, @options || {}).tap do |strategy|
+      strategy.instance_variable_set(:@env, {})
+    end
   end
 
   it_should_behave_like 'an oauth2 strategy'
 
   describe '#client' do
     it 'should have the correct Windowslive site' do
-      subject.client.site.should eq("https://login.live.com")
+      expect(subject.client.site).to eq('https://login.live.com')
     end
 
     it 'should have the correct authorization url' do
-      subject.client.options[:authorize_url].should eq("/oauth20_authorize.srf")
+      expect(subject.client.options[:authorize_url]).to eq('/oauth20_authorize.srf')
     end
 
     it 'should have the correct token url' do
-      subject.client.options[:token_url].should eq('/oauth20_token.srf')
+      expect(subject.client.options[:token_url]).to eq('/oauth20_token.srf')
     end
   end
 
-  describe '#callback_path' do
-    it 'should have the correct callback path' do
-      subject.callback_path.should eq('/auth/windowslive/callback')
+  describe '#callback' do
+    let(:callback_url) { '/auth/windowslive/callback' }
+
+    describe '#callback_path' do
+      it 'should have the correct callback path' do
+        expect(subject.callback_path).to eq(callback_url)
+      end
+    end
+
+    describe '#callback_url' do
+      before { expect(subject).to receive(:query_string) { '?key=value' } }
+
+      it 'should remove query string from callback url' do
+        expect(subject.send(:callback_url)).to eq(callback_url)
+      end
     end
   end
 end

data/spec/spec_helper.rb

@@ -16,4 +16,6 @@ Dir[File.expand_path('../support/**/*', __FILE__)].each { |f| require f }
 RSpec.configure do |config|
   config.include Rack::Test::Methods
   config.extend  OmniAuth::Test::StrategyMacros, type: :strategy
+
+  OmniAuth.config.test_mode = true
 end

data/spec/support/shared_examples.rb

@@ -1,47 +1,38 @@
 # NOTE it would be useful if this lived in omniauth-oauth2 eventually
 
 shared_examples 'an oauth2 strategy' do
-  before do
-    OmniAuth.config.test_mode = true
-  end
-
-  after do
-    OmniAuth.config.test_mode = false
-  end
-
   describe '#client' do
     it 'should be initialized with symbolized client_options' do
-      @options = { :client_options => { 'authorize_url' => 'https://example.com' } }
-      subject.client.options[:authorize_url].should == 'https://example.com'
+      @options = { client_options: { 'authorize_url' => 'https://example.com' } }
+      expect(subject.client.options[:authorize_url]).to eq('https://example.com')
     end
   end
 
   describe '#authorize_params' do
     it 'should include any authorize params passed in the :authorize_params option' do
-      @options = { :authorize_params => { :foo => 'bar', :baz => 'zip' } }
-      subject.authorize_params['foo'].should eq('bar')
-      subject.authorize_params['baz'].should eq('zip')
+      @options = { authorize_params: { foo: 'bar', baz: 'zip' } }
+      expect(subject.authorize_params['foo']).to eq('bar')
+      expect(subject.authorize_params['baz']).to eq('zip')
     end
 
     it 'should include top-level options that are marked as :authorize_options' do
-      @options = { :authorize_options => [:scope, :foo], :scope => 'bar', :foo => 'baz' }
-      subject.authorize_params['scope'].should eq('bar')
-      subject.authorize_params['foo'].should eq('baz')
+      @options = { authorize_options: [:scope, :foo], scope: 'bar', foo: 'baz' }
+      expect(subject.authorize_params['scope']).to eq('bar')
+      expect(subject.authorize_params['foo']).to eq('baz')
     end
   end
 
   describe '#token_params' do
     it 'should include any token params passed in the :token_params option' do
-      @options = { :token_params => { :foo => 'bar', :baz => 'zip' } }
-      subject.token_params['foo'].should eq('bar')
-      subject.token_params['baz'].should eq('zip')
+      @options = { token_params: { foo: 'bar', baz: 'zip' } }
+      expect(subject.token_params['foo']).to eq('bar')
+      expect(subject.token_params['baz']).to eq('zip')
     end
 
     it 'should include top-level options that are marked as :token_options' do
-      @options = { :token_options => [:scope, :foo], :scope => 'bar', :foo => 'baz' }
-      subject.token_params['scope'].should eq('bar')
-      subject.token_params['foo'].should eq('baz')
+      @options = { token_options: [:scope, :foo], scope: 'bar', foo: 'baz' }
+      expect(subject.token_params['scope']).to eq('bar')
+      expect(subject.token_params['foo']).to eq('baz')
     end
   end
 end
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-windowslive
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - Joel AZEMAR
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-19 00:00:00.000000000 Z
+date: 2017-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth-oauth2
@@ -28,30 +28,30 @@ dependencies:
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: '1.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: '1.12'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '3.5'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement