omniauth-vkontakte 1.0.1 → 1.0.2

data/README.md

@@ -1,7 +1,7 @@
 # OmniAuth VKontakte
 
-This is the unofficial VKontakte strategy for authenticating to VKontakte. To
-use it, you'll need to sign up for an OAuth2 Application ID and Secret
+This is the unofficial 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
@@ -10,6 +10,13 @@ on the [Vkontakte Developers Page](http://vk.com/developers.php).
       provider :vkontakte, ENV['API_KEY'], ENV['API_SECRET']
     end
 
+## Ruby
+
+Tested with the following Ruby versions:
+
+- MRI 1.9.3
+- MRI 1.8.7
+
 ## License
 
 Copyright (c) 2011 Anton Maminov.

data/lib/omniauth-vkontakte/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module Vkontakte
-    VERSION = "1.0.1"
+    VERSION = "1.0.2"
   end
 end

data/lib/omniauth/strategies/vkontakte.rb

@@ -31,7 +31,8 @@ module OmniAuth
           :nickname   => raw_info['nickname'],
           :first_name => raw_info['first_name'],
           :last_name  => raw_info['last_name'],
-          :image      => raw_info['image'],
+          :image      => raw_info['photo'],
+          :location   => location,
           :urls       => {
             'Vkontakte' => "http://vk.com/#{raw_info['domain']}"
           }
@@ -44,9 +45,36 @@ module OmniAuth
 
       def raw_info
         # http://vkontakte.ru/developers.php?o=-17680044&p=Description+of+Fields+of+the+fields+Parameter
-        fields = ['uid', 'first_name', 'last_name', 'nickname', 'domain', 'sex', 'bdate', 'city', 'country', 'timezone', 'photo', 'photo_big']
-        access_token.get('/method/getProfiles', :params => { :uid => uid, :fields => fields.join(',') }).parsed["response"].first
+        fields = ['uid', 'first_name', 'last_name', 'nickname', 'sex', 'city', 'country', 'online', 'bdate', 'photo', 'photo_big', 'domain']
+        @raw_info ||= access_token.get('/method/getProfiles', :params => { :uid => uid, :fields => fields.join(',') }).parsed["response"].first
       end
+
+      private
+
+      # http://vkontakte.ru/developers.php?o=-17680044&p=getCountries
+      def get_country
+        if raw_info['country'] && raw_info['country'] != "0"
+          country = access_token.get('/method/getCountries', :params => { :cids => raw_info['country'] }).parsed['response']
+          return country.first ? country.first['name'] : ''
+        else
+          return ''
+        end
+      end
+
+      # http://vkontakte.ru/developers.php?o=-17680044&p=getCities
+      def get_city
+        if raw_info['city'] && raw_info['city'] != "0"
+          city = access_token.get('/method/getCities', :params => { :cids => raw_info['city'] }).parsed['response']
+          return city.first ? city.first['name'] : ''
+        else
+          return ''
+        end
+      end
+
+      def location
+        @location ||= "#{get_country}, #{get_city}"
+      end
+
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-vkontakte
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-05 00:00:00.000000000 Z
+date: 2011-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
-  requirement: &84808660 !ruby/object:Gem::Requirement
+  requirement: &84707940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *84808660
+  version_requirements: *84707940
 - !ruby/object:Gem::Dependency
   name: omniauth-oauth2
-  requirement: &84808410 !ruby/object:Gem::Requirement
+  requirement: &84707690 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *84808410
+  version_requirements: *84707690
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &84808150 !ruby/object:Gem::Requirement
+  requirement: &84707430 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *84808150
+  version_requirements: *84707430
 description: Unofficial VKontakte strategy for OmniAuth 1.0
 email:
 - anton.linux@gmail.com