omniauth-vkontakte 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82e2d058974ed802c866153a8248be53642069cc
-  data.tar.gz: 9f4b0fdc8a55fe501046821b0b91072028b14cbf
+  metadata.gz: ef1874496560d9ff3b43fb2c80a78790d204b41d
+  data.tar.gz: df6dc4e266969c9c14b559206b35b11fb161f8b0
 SHA512:
-  metadata.gz: d513abcb0d1ddcff85a9ca4fbcf6108fddc560d414c5c85fe4a8f7cc192bd852850ce43c1852ee25038e9e0abbc889753cdf0cbffba6c5800971cced60cb9d01
-  data.tar.gz: 58492ea8f0a56bf9b1d324b5be67942b8d9e973c34a50075ca974c67517a67ab38a0af2c4de23bb7fdd406875ef2cbe576ed59b6b986398518f0e55a74d5d17b
+  metadata.gz: 09ccbe1b867711010f1aecb57ede46f07945c0ee619cc3355972be37f489c7f2caf53ce52e72e9aebb1fc6af5cd25d531bcf070165558430027b8ca63461b5c4
+  data.tar.gz: 19278f224eeabe70370e7fc90d249e029b54eb58913d407266ad5dbe1e1e3b447d04fa21aeb5fa17f14df5231f7924e88989daa57c01775a521b37cb7f34c101

data/README.md

@@ -16,19 +16,25 @@ end
 You can configure several options, which you pass in to the `provider` method via a `Hash`:
 
 * `scope`: a comma-separated list of access permissions you want to request from the user. [Read the Vkontakte docs for more details](http://vk.com/dev/permissions)
-* `display`: the display context to show the authentication page. Options are: `page`, `popup` and `mobile`.
-* `lang`: specifies the language. Optional options are: `ru`, `ua`, `be`, `en`, `es`, `fi`, `de`, `it`.
+* `display`: the display context to show the authentication page. Valid options include `page`, `popup` and `mobile`.
+* `lang`: specifies the language. Optional options include `ru`, `ua`, `be`, `en`, `es`, `fi`, `de`, `it`.
+* `image_size`: defines the size of the user's image. Valid options include `mini`(50x50), `bigger`(100x100) and `original`(200x200). Default is `mini`.
 
-For example, to request `friends`, `audio` and `photos` permissions and display the authentication page in a popup window:
+Here's an example of a possible configuration:
 
 ```ruby
 use OmniAuth::Builder do
   provider :vkontakte, ENV['API_KEY'], ENV['API_SECRET'],
-    :scope => 'friends,audio,photos', :display => 'popup', :lang => 'en'
+    {
+      :scope => 'friends,audio,photos',
+      :display => 'popup',
+      :lang => 'en',
+      :image_size => 'original'
+    }
 end
 ```
 
-## Auth Hash
+## Authentication Hash
 
 Here's an example *Auth Hash* available in `request.env['omniauth.auth']`:
 

data/examples/sinatra.rb

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

data/lib/omniauth-vkontakte/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module Vkontakte
-    VERSION = "1.3.0"
+    VERSION = "1.3.1"
   end
 end

data/lib/omniauth/strategies/vkontakte.rb

@@ -35,7 +35,7 @@ module OmniAuth
           :nickname   => raw_info['nickname'],
           :first_name => raw_info['first_name'],
           :last_name  => raw_info['last_name'],
-          :image      => raw_info['photo'],
+          :image      => image_url,
           :location   => location,
           :urls       => {
             'Vkontakte' => "http://vk.com/#{raw_info['screen_name']}"
@@ -64,15 +64,6 @@ module OmniAuth
         end
       end
 
-      def info_options
-        # http://vk.com/dev/fields
-        fields = ['nickname', 'screen_name', 'sex', 'city', 'country', 'online', 'bdate', 'photo', 'photo_big']
-        return fields.join(',')
-      end
-
-      def lang_option
-        options[:lang] || ''
-      end
 
       # You can pass +display+ or +scope+ params to the auth request, if
       # you need to set them dynamically.
@@ -97,6 +88,29 @@ module OmniAuth
 
       private
 
+      def info_options
+        # http://vk.com/dev/fields
+        fields = ['nickname', 'screen_name', 'sex', 'city', 'country', 'online', 'bdate', 'photo_50', 'photo_100', 'photo_200_orig']
+        return fields.join(',')
+      end
+
+      def lang_option
+        options[:lang] || ''
+      end
+
+      def image_url
+        case options[:image_size]
+        when 'mini'
+          raw_info['photo_50']
+        when 'bigger'
+          raw_info['photo_100']
+        when 'original'
+          raw_info['photo_200_orig']
+        else
+          raw_info['photo_50']
+        end
+      end
+
       # http://vk.com/dev/database.getCountriesById
       def get_country
         if raw_info['country'] && raw_info['country'] != "0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-vkontakte
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Anton Maminov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-14 00:00:00.000000000 Z
+date: 2013-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth