omniauth-mailru 0.3.2 → 1.0.0

data/lib/omniauth-mailru/version.rb

@@ -1,5 +1,5 @@
 module Omniauth
   module Mailru
-    VERSION = "0.3.2"
+    VERSION = "1.0.0"
   end
 end

data/lib/omniauth/strategies/mailru.rb

@@ -15,6 +15,8 @@ module OmniAuth
         :authorize_url => '/oauth/authorize'
       }
 
+      option :callback_url
+
       uid do
         access_token.params['x_mailru_vid']
       end
@@ -39,11 +41,7 @@ module OmniAuth
       end
 
       def callback_url
-        if options.authorize_options.respond_to? :callback_url
-          options.authorize_options.callback_url
-        else
-          super
-        end
+        options.callback_url || super
       end
 
       private

data/spec/omniauth/strategies/mailru_spec.rb

@@ -1,11 +1,36 @@
 require 'spec_helper'
 
 describe OmniAuth::Strategies::Mailru do
-  def app; lambda{|env| [200, {}, ["Hello."]]} end
-  let(:fresh_strategy){ Class.new(OmniAuth::Strategies::Mailru) }
+  before :each do
+    @request = double('Request')
+    @request.stub(:params) { {} }
+    @request.stub(:cookies) { {} }
 
-  it 'should do some testing' do
-    pending
+    @client_id = '123'
+    @client_secret = '53cr3tz'
   end
 
+  subject do
+    args = [@client_id, @client_secret, @options].compact
+    OmniAuth::Strategies::Mailru.new(nil, *args).tap do |strategy|
+      strategy.stub(:request) { @request }
+    end
+  end
+
+  it_should_behave_like 'an oauth2 strategy'
+
+  describe '#callback_url' do
+    it "returns value from #authorize_options" do
+      url = 'http://auth.myapp.com/auth/mailru/callback'
+      @options = { :callback_url => url }
+      subject.callback_url.should eq(url)
+    end
+
+    it "callback_url from request" do
+      url_base = 'http://auth.request.com'
+      @request.stub(:url) { "#{url_base}/page/path" }
+      subject.stub(:script_name) { "" } # to not depend from Rack env
+      subject.callback_url.should eq("#{url_base}/auth/mailru/callback")
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -1,14 +1,11 @@
 $:.unshift File.expand_path('..', __FILE__)
 $:.unshift File.expand_path('../../lib', __FILE__)
 require 'rspec'
-require 'rack/test'
-require 'webmock/rspec'
 require 'omniauth'
 require 'omniauth-mailru'
 
+Dir[File.expand_path('../support/**/*', __FILE__)].each { |f| require f }
+
 RSpec.configure do |config|
-  config.include WebMock::API
-  config.include Rack::Test::Methods
-  config.extend  OmniAuth::Test::StrategyMacros, :type => :strategy
 end
 

data/spec/support/shared_examples.rb

@@ -0,0 +1,37 @@
+# NOTE it would be useful if this lived in omniauth-oauth2 eventually
+shared_examples 'an oauth2 strategy' do
+  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'
+    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')
+    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')
+    end
+  end
+
+  describe '#token_params' do
+    it 'should include any authorize params passed in the :authorize_params option' do
+      @options = { :token_params => { :foo => 'bar', :baz => 'zip' } }
+      subject.token_params['foo'].should eq('bar')
+      subject.token_params['baz'].should eq('zip')
+    end
+
+    it 'should include top-level options that are marked as :authorize_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')
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-mailru
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-21 00:00:00.000000000Z
+date: 2011-12-11 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
-  requirement: &70298969978760 !ruby/object:Gem::Requirement
+  requirement: &70121730162580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70298969978760
+  version_requirements: *70121730162580
 - !ruby/object:Gem::Dependency
   name: omniauth-oauth2
-  requirement: &70298969977380 !ruby/object:Gem::Requirement
+  requirement: &70121730161380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +32,7 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70298969977380
+  version_requirements: *70121730161380
 description: OmniAuth strategy for Mail.ru
 email:
 - gumayunov@gmail.com
@@ -54,6 +54,7 @@ files:
 - omniauth-mailru.gemspec
 - spec/omniauth/strategies/mailru_spec.rb
 - spec/spec_helper.rb
+- spec/support/shared_examples.rb
 homepage: https://github.com/gumayuniv/omniauth-mailru
 licenses: []
 post_install_message: 
@@ -68,7 +69,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2801225881253579125
+      hash: -4176488684419129791
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -77,7 +78,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2801225881253579125
+      hash: -4176488684419129791
 requirements: []
 rubyforge_project: omniauth-mailru
 rubygems_version: 1.8.10
@@ -87,3 +88,4 @@ summary: OmniAuth strategy for Mail.ru
 test_files:
 - spec/omniauth/strategies/mailru_spec.rb
 - spec/spec_helper.rb
+- spec/support/shared_examples.rb