omniauth-vkontakte 1.0.5 → 1.0.6

data/README.md

@@ -7,7 +7,7 @@ on the [Vkontakte Developers Page](http://vk.com/developers.php).
 ## Basic Usage
 
     use OmniAuth::Builder do
-      provider :vkontakte, ENV['API_KEY'], ENV['API_SECRET']
+      provider :vkontakte, ENV['API_KEY'], ENV['API_SECRET'], :scope => 'friends,audio', :display => 'popup'
     end
 
 ## Ruby
@@ -19,7 +19,7 @@ Tested with the following Ruby versions:
 
 ## License
 
-Copyright (c) 2011 Anton Maminov.
+Copyright (c) 2011, 2012 Anton Maminov.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

data/examples/sinatra.rb

@@ -11,7 +11,7 @@ SCOPE = 'friends,audio'
 use Rack::Session::Cookie
 
 use OmniAuth::Builder do
-  provider :vkontakte,  ENV['VKONTAKTE_KEY'], ENV['VKONTAKTE_SECRET'], :scope => SCOPE
+  provider :vkontakte,  ENV['VKONTAKTE_KEY'], ENV['VKONTAKTE_SECRET'], :scope => SCOPE, :display => 'popup'
 end
 
 get '/' do

data/lib/omniauth-vkontakte/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module Vkontakte
-    VERSION = "1.0.5"
+    VERSION = "1.0.6"
   end
 end

data/lib/omniauth/strategies/vkontakte.rb

@@ -11,10 +11,10 @@ module OmniAuth
     # @example Basic Usage
     #     use OmniAuth::Strategies::Vkontakte, 'API Key', 'Secret Key'
     class Vkontakte < OmniAuth::Strategies::OAuth2
-      DEFAULT_SCOPE = ''
-      
+      DEFAULT_SCOPE = 'friends,audio'
+
       option :name, 'vkontakte'
-      
+
       option :client_options, {
         :site          => 'https://api.vk.com/',
         :token_url     => '/oauth/token',
@@ -25,8 +25,10 @@ module OmniAuth
         :param_name => 'access_token',
       }
 
+      option :authorize_options, [:scope, :display]
+
       uid { access_token.params['user_id'] }
-      
+
       # https://github.com/intridea/omniauth/wiki/Auth-Hash-Schema
       info do
         {
@@ -52,8 +54,16 @@ module OmniAuth
         @raw_info ||= access_token.get('/method/getProfiles', :params => { :uid => uid, :fields => fields.join(',') }).parsed["response"].first
       end
 
+      ##
+      # You can pass +display+or +scope+ params to the auth request, if
+      # you need to set them dynamically.
+      #
+      # /auth/vkontakte?display=popup
+      #
       def authorize_params
         super.tap do |params|
+          params.merge!(:display => request.params['display']) if request.params['display']
+          params.merge!(:scope => request.params['scope']) if request.params['scope']
           params[:scope] ||= DEFAULT_SCOPE
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-vkontakte
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-12 00:00:00.000000000Z
+date: 2012-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
-  requirement: &78864210 !ruby/object:Gem::Requirement
+  requirement: &85957200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *78864210
+  version_requirements: *85957200
 - !ruby/object:Gem::Dependency
   name: omniauth-oauth2
-  requirement: &78863950 !ruby/object:Gem::Requirement
+  requirement: &85956390 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *78863950
+  version_requirements: *85956390
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &78863760 !ruby/object:Gem::Requirement
+  requirement: &85956070 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *78863760
+  version_requirements: *85956070
 description: Unofficial VKontakte strategy for OmniAuth 1.0
 email:
 - anton.linux@gmail.com
@@ -79,7 +79,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Unofficial VKontakte strategy for OmniAuth 1.0