omniauth-vkontakte 1.0.6 → 1.0.8

data/README.md

@@ -1,16 +1,33 @@
 # OmniAuth VKontakte
 
-This is the unofficial OmniAuth strategy for authenticating to VKontakte via OAuth.
+This is the unofficial [OmniAuth](https://github.com/intridea/omniauth) strategy for authenticating to VKontakte via OAuth.
 To use it, you'll need to sign up for an OAuth2 Application ID and Secret
 on the [Vkontakte Developers Page](http://vk.com/developers.php).
 
 ## Basic Usage
 
-    use OmniAuth::Builder do
-      provider :vkontakte, ENV['API_KEY'], ENV['API_SECRET'], :scope => 'friends,audio', :display => 'popup'
-    end
+```ruby
+use OmniAuth::Builder do
+  provider :vkontakte, ENV['API_KEY'], ENV['API_SECRET']
+end
+```
 
-## Ruby
+## Configuring
+You can configure several options, which you pass in to the `provider` method via a `Hash`:
+
+* `scope`: A comma-separated list of permissions you want to request from the user. [Read the Vkontakte docs for more details](http://vk.com/developers.php?oid=-1&p=%D0%9F%D1%80%D0%B0%D0%B2%D0%B0_%D0%B4%D0%BE%D1%81%D1%82%D1%83%D0%BF%D0%B0_%D0%BF%D1%80%D0%B8%D0%BB%D0%BE%D0%B6%D0%B5%D0%BD%D0%B8%D0%B9)
+* `display`: The display context to show the authentication page. Options are: `page`, `popup`, `touch` and `wap`.
+
+For example, to request `friends`, `audio` and `photos` permissions and display the authentication page in a popup window:
+
+```ruby
+use OmniAuth::Builder do
+  provider :vkontakte, ENV['API_KEY'], ENV['API_SECRET'],
+    :scope => 'friends,audio,photos', :display => 'popup'
+end
+```
+
+## Supported Rubies
 
 Tested with the following Ruby versions:
 
@@ -19,7 +36,7 @@ Tested with the following Ruby versions:
 
 ## License
 
-Copyright (c) 2011, 2012 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/lib/omniauth-vkontakte/version.rb

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

data/lib/omniauth/strategies/vkontakte.rb

@@ -11,7 +11,7 @@ module OmniAuth
     # @example Basic Usage
     #     use OmniAuth::Strategies::Vkontakte, 'API Key', 'Secret Key'
     class Vkontakte < OmniAuth::Strategies::OAuth2
-      DEFAULT_SCOPE = 'friends,audio'
+      DEFAULT_SCOPE = ''
 
       option :name, 'vkontakte'
 
@@ -62,8 +62,14 @@ module OmniAuth
       #
       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']
+          # just a copypaste from ominauth-facebook
+          %w[display state scope].each do |v|
+            if request.params[v]
+              params[v.to_sym] = request.params[v]
+              # to support omniauth-oauth2's auto csrf protection
+              session['omniauth.state'] = params[:state] if v == 'state'
+            end
+          end
           params[:scope] ||= DEFAULT_SCOPE
         end
       end

data/omniauth-vkontakte.gemspec

@@ -2,7 +2,7 @@
 require File.expand_path('../lib/omniauth-vkontakte/version', __FILE__)
 
 Gem::Specification.new do |gem|
-  gem.add_dependency 'omniauth', '~> 1.0'
+  gem.add_dependency 'omniauth', '~> 1.1.0'
   gem.add_dependency 'omniauth-oauth2', '~> 1.0'
   gem.add_dependency 'multi_json'
 

metadata

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