omniauth-vkontakte 1.3.3 → 1.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4600f52193d082fd35375e34e6b822fc721b90a7
-  data.tar.gz: e41076cf4280c38734d72f1d190a8cd32ad95c05
+  metadata.gz: 1c6686250c9a81bc7bc6f7545e9d6d9fe702ca17
+  data.tar.gz: 953f4cf5c904b0857cd0f25ba766eb7920ee548e
 SHA512:
-  metadata.gz: 3a783498b480bf99966df984f77e3cda737476fa65957f2d4b15b0bf9280d555fe5b46e158afbf2166536be30c04afc9096c8e4423fce1b38e81eb2cbe0d3313
-  data.tar.gz: bd9b323713bfd7d2d00b46d1d14918f6aa415ad66d85fdaff741bffb3564b58c7e05260584dd33e52d30b6bb557edcd68a62873d1249faa689d392c2a4f2cbdf
+  metadata.gz: 8721c3341d33bd33ea8af12ed8f2cc0ea9cb4b8f25a5192f87314ce5b1c19e97155021c27fc91fbb19dda6bda9d3239942257443c48f3fc35ff62a0ccef554b1
+  data.tar.gz: 20849621b7bd8cd91b0264bbb5e290af9fdd592a4ff16a192ab6bdfd1d48463bc850961ba5e8da2486d0de4316ef68850037334542b5cea1ccab13b64275adde

data/README.md

@@ -18,7 +18,7 @@ You can configure several options, which you pass in to the `provider` method vi
 * `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. 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`.
+* `image_size`: defines the size of the user's image. Valid options include `mini`(50x50), `bigger`(100x100), `bigger_x2`(200x200), `original`(200x*) and `original_x2`(400x*). Default is `mini`.
 * `info_fields`: specify which fields should be added to AuthHash when
   getting the user's info. Value should be a comma-separated string as per http://vk.com/dev/fields.
 

data/lib/omniauth-vkontakte/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module Vkontakte
-    VERSION = "1.3.3"
+    VERSION = "1.3.4"
   end
 end

data/lib/omniauth/strategies/vkontakte.rb

@@ -15,7 +15,7 @@ module OmniAuth
     class Vkontakte < OmniAuth::Strategies::OAuth2
       class NoRawData < StandardError; end
 
-      API_VERSION = '5.2'
+      API_VERSION = '5.8'
 
       DEFAULT_SCOPE = ''
 
@@ -96,8 +96,8 @@ module OmniAuth
 
       def info_options
         # http://vk.com/dev/fields
-        fields = ['nickname', 'screen_name', 'sex', 'city', 'country', 'online', 'bdate', 'photo_50', 'photo_100', 'photo_200_orig']
-        fields.concat(options[:info_fields].split(',')) if options[:info_fields] 
+        fields = %w[nickname screen_name sex city country online bdate photo_50 photo_100 photo_200 photo_200_orig photo_400_orig]
+        fields.concat(options[:info_fields].split(',')) if options[:info_fields]
         return fields.join(',')
       end
 
@@ -111,45 +111,21 @@ module OmniAuth
           raw_info['photo_50']
         when 'bigger'
           raw_info['photo_100']
+        when 'bigger_x2'
+          raw_info['photo_200']
         when 'original'
           raw_info['photo_200_orig']
+        when 'original_x2'
+          raw_info['photo_400_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"
-          params = {
-            :country_ids => raw_info['country'],
-            :lang        => lang_option,
-            :v           => API_VERSION,
-          }
-          country = access_token.get('/method/database.getCountriesById', :params => params).parsed['response']
-          country && country.first ? country.first['title'] : ''
-        else
-          ''
-        end
-      end
-
-      # http://vk.com/dev/database.getCitiesById
-      def get_city
-        if raw_info['city'] && raw_info['city'] != "0"
-          params = {
-            :city_ids => raw_info['city'],
-            :lang     => lang_option,
-            :v        => API_VERSION,
-          }
-          city = access_token.get('/method/database.getCitiesById', :params => params).parsed['response']
-          city && city.first ? city.first['title'] : ''
-        else
-          ''
-        end
-      end
-
       def location
-        @location ||= [get_country, get_city].map(&:strip).reject(&:empty?).join(', ')
+        country = raw_info.fetch('country', {})['title']
+        city = raw_info.fetch('city', {})['title']
+        @location ||= [country, city].compact.join(', ')
       end
 
       def callback_phase

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-vkontakte
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.3.4
 platform: ruby
 authors:
 - Anton Maminov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-01 00:00:00.000000000 Z
+date: 2015-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
@@ -86,7 +86,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Unofficial VKontakte strategy for OmniAuth 1.0