omniauth-vkontakte 1.3.6 → 1.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 79997d8ef6bc7d287e6e508de3cfcdaf9624f77c
-  data.tar.gz: abf92173017bfcd7f6ca215f430787362566fe2c
+  metadata.gz: 2e06373ee4e154f6e293faa83da80796505da615
+  data.tar.gz: 0797f013d01ae1cd9612ccd50a90b68a9eaea100
 SHA512:
-  metadata.gz: de6e4aeee44d6843c38b4608fa7e1363bd413ab1d99d3e3bc7a107620e4e3b89e288a323529c9e4a44b9fcf21549c7e96fbfbe5b21cf3b374462059301450ad6
-  data.tar.gz: 1ad929240913e3af7e9e9ecd1b5f6beb033d9eb9757c0cba34bae6e1acae5f9731e7ea31142b450c9c8ae062a220ec62933a293374a62bf8885251dfa58c4eab
+  metadata.gz: eec29dc7c8c85f5e3503291e4f3ca4b5eff0a2f1f95642b439ae37e76f8692819b816a332cb8cef33fc9850e29725f42ebab2a440fcb79468668643851999a2d
+  data.tar.gz: 7214c811616d5906607adcfd3b65638d60b7b3ee6c42d34f78a244f67b1b04376d77f0e0d10d7573540a2c908f1b305c1857dbfcadffed06c7dd0c2826356a2a

data/.gitignore

@@ -0,0 +1,5 @@
+.ruby-version
+.DS_Store
+coverage
+Gemfile.lock
+.idea

data/.rspec

@@ -0,0 +1 @@
+--colour

data/.travis.yml

@@ -0,0 +1,9 @@
+language: ruby
+cache: bundler
+rvm:
+  - 1.9.3
+  - 2.0.0
+  - 2.1.8
+  - 2.2.4
+  - 2.3.0
+  - jruby

data/Gemfile

@@ -0,0 +1,12 @@
+source 'https://rubygems.org'
+
+gemspec
+
+gem 'rake'
+
+group :test do
+  gem 'rspec', '~> 3.2'
+  gem 'rack-test'
+  gem 'simplecov'
+  gem 'webmock'
+end

data/README.md

@@ -1,5 +1,9 @@
 # OmniAuth VKontakte
 
+[![Build Status][travis_badge]][travis]
+[![Gem Version][rubygems_badge]][rubygems]
+[![Code Climate][codeclimate_badge]][codeclimate]
+
 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/dev).
@@ -22,6 +26,7 @@ You can configure several options, which you pass in to the `provider` method vi
 * `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.
 * `redirect_url`: URL where code will be passed. This URL shall be a part of the domain specified in application settings http://vk.com/dev/auth_sites.
+* `https`: 1 - allows you to receive https links to photos and other media. 0 - return an http links (the default).
 
 Here's an example of a possible configuration:
 
@@ -32,6 +37,7 @@ use OmniAuth::Builder do
       :scope => 'friends,audio,photos',
       :display => 'popup',
       :lang => 'en',
+      :https => 1,
       :image_size => 'original'
     }
 end
@@ -66,8 +72,8 @@ Here's an example *Auth Hash* available in `request.env['omniauth.auth']`:
      "nickname"=>"",
      "screen_name"=>"durov",
      "bdate"=>"10.10.1984",
-     "city"=>"2",
-     "country"=>"1",
+     "city"=>{"id"=>2, "title"=>"Санкт-Петербург"},
+     "country"=>{"id"=>1, "title"=>"Росiя"},
      "photo"=>"http://cs7001.vk.me/c7003/v7003079/374b/53lwetwOxD8.jpg",
      "photo_big"=>"http://cs7001.vk.me/c7003/v7003736/3a08/mEqSflTauxA.jpg",
      "online"=>1,
@@ -82,8 +88,12 @@ The precise information available may depend on the permissions which you reques
 
 Tested with the following Ruby versions:
 
-- MRI 2.0.0
+- MRI 2.3
+- MRI 2.2
+- MRI 2.1
+- MRI 2.0
 - MRI 1.9.3
+- JRUBY 1.x
 
 ## Contributing to omniauth-vkontakte
 
@@ -91,10 +101,20 @@ Tested with the following Ruby versions:
 
 ## License
 
-Copyright (c) 2011-2013 Anton Maminov
+Copyright (c) 2011-2016 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:
 
 The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+[travis_badge]: http://img.shields.io/travis/mamantoha/omniauth-vkontakte.svg?style=flat
+[travis]: https://travis-ci.org/mamantoha/omniauth-vkontakte
+
+[rubygems_badge]: http://img.shields.io/gem/v/omniauth-vkontakte.svg?style=flat
+[rubygems]: http://rubygems.org/gems/omniauth-vkontakte
+
+[codeclimate_badge]: http://img.shields.io/codeclimate/github/mamantoha/omniauth-vkontakte.svg?style=flat
+[codeclimate]: https://codeclimate.com/github/mamantoha/omniauth-vkontakte
+

data/Rakefile

@@ -1,2 +1,9 @@
 #!/usr/bin/env rake
 require "bundler/gem_tasks"
+require 'rspec/core/rake_task'
+
+desc "Run specs"
+RSpec::Core::RakeTask.new
+
+desc 'Default: run specs.'
+task :default => :spec

data/lib/omniauth-vkontakte/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module Vkontakte
-    VERSION = "1.3.6"
+    VERSION = "1.3.7"
   end
 end

data/lib/omniauth/strategies/vkontakte.rb

@@ -1,6 +1,4 @@
 require 'omniauth/strategies/oauth2'
-require 'multi_json'
-require 'pp'
 
 module OmniAuth
   module Strategies
@@ -36,7 +34,7 @@ module OmniAuth
       # https://github.com/intridea/omniauth/wiki/Auth-Hash-Schema
       info do
         {
-          :name       => [raw_info['first_name'], raw_info['last_name']].map(&:strip).reject(&:empty?).join(' '),
+          :name       => "#{raw_info['first_name']} #{raw_info['last_name']}".strip,
           :nickname   => raw_info['nickname'],
           :email      => access_token.params["email"],
           :first_name => raw_info['first_name'],
@@ -62,6 +60,7 @@ module OmniAuth
           params = {
             :fields   => info_options,
             :lang     => lang_option,
+            :https    => https_option,
             :v        => API_VERSION,
           }
 
@@ -111,6 +110,10 @@ module OmniAuth
         options[:lang] || ''
       end
 
+      def https_option
+        options[:https] || 0
+      end
+
       def image_url
         case options[:image_size]
         when 'mini'

data/omniauth-vkontakte.gemspec

@@ -1,10 +1,6 @@
 require File.expand_path('../lib/omniauth-vkontakte/version', __FILE__)
 
 Gem::Specification.new do |gem|
-  gem.add_dependency 'omniauth', '~> 1.0'
-  gem.add_dependency 'omniauth-oauth2', '~> 1.1'
-  gem.add_dependency 'multi_json'
-
   gem.authors       = ["Anton Maminov"]
   gem.email         = ["anton.linux@gmail.com"]
   gem.description   = %q{Unofficial VKontakte strategy for OmniAuth 1.0}
@@ -17,4 +13,6 @@ Gem::Specification.new do |gem|
   gem.name          = "omniauth-vkontakte"
   gem.require_paths = ["lib"]
   gem.version       = OmniAuth::Vkontakte::VERSION
+
+  gem.add_dependency 'omniauth-oauth2', '~> 1.1'
 end

data/spec/omniauth/strategies/vkontakte_spec.rb

@@ -0,0 +1,169 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+describe OmniAuth::Strategies::Vkontakte do
+  let(:request) { double('Request', :params => {}, :cookies => {}, :env => {}) }
+
+  before do
+    OmniAuth.config.test_mode = true
+  end
+
+  subject do
+    args = ['api_key', 'api_secret', @options || {}].compact
+    obj = OmniAuth::Strategies::Vkontakte.new(*args).tap do |strategy|
+      allow(strategy).to receive(:request) {
+        request
+      }
+    end
+    @access_token = double('OAuth2::AccessToken')
+    allow(obj).to receive(:access_token).and_return(@access_token)
+    allow(@access_token).to receive(:get).and_return(double('OAuth2::Response'))
+    allow(@access_token).to receive(:params).and_return({ 'email' => raw_info_hash['email'] })
+    obj
+  end
+
+  describe 'client options' do
+    it 'should have correct name' do
+      expect(subject.options.name).to eq('vkontakte')
+    end
+
+    it 'should have correct site' do
+      expect(subject.options.client_options.site).to eq('https://api.vk.com/')
+    end
+
+    it 'should have correct authorize url' do
+      expect(subject.options.client_options.authorize_url).to eq('https://oauth.vk.com/authorize')
+    end
+
+    it 'should have correct token url' do
+      expect(subject.options.client_options.token_url).to eq('https://oauth.vk.com/access_token')
+    end
+  end
+
+  describe 'info' do
+    before do
+      allow(subject).to receive(:raw_info).and_return(raw_info_hash)
+    end
+
+    it 'should returns the nickname' do
+      expect(subject.info[:nickname]).to eq(raw_info_hash['nickname'])
+    end
+
+    it 'should returns the name' do
+      expect(subject.info[:name]).to eq('Павел Дуров')
+    end
+
+    it 'should returns the first_name' do
+      expect(subject.info[:first_name]).to eq(raw_info_hash['first_name'])
+    end
+
+    it 'should returns the last_name' do
+      expect(subject.info[:last_name]).to eq(raw_info_hash['last_name'])
+    end
+
+    it 'should returns the email' do
+      expect(subject.info[:email]).to eq(raw_info_hash['email'])
+    end
+
+    it 'should returns the location' do
+      expect(subject.info[:location]).to eq('Российская Федерация, Санкт-Петербург')
+    end
+
+    it 'should returns the urls' do
+      expect(subject.info[:urls]['Vkontakte']).to eq("http://vk.com/#{raw_info_hash['screen_name']}")
+    end
+  end
+
+  describe 'image_size option' do
+    context 'when user has an image' do
+      it 'should return image with size specified' do
+        @options = { :image_size => 'original' }
+        allow(subject).to receive(:raw_info).and_return(
+            raw_info_hash.merge({ 'photo_200_orig' => img_url })
+        )
+        expect(subject.info[:image]).to eq(img_url)
+      end
+
+      it 'should return image with size specified' do
+        @options = { :image_size => 'original_x2' }
+        allow(subject).to receive(:raw_info).and_return(
+            raw_info_hash.merge({ 'photo_400_orig' => img_url })
+        )
+        expect(subject.info[:image]).to eq(img_url)
+      end
+
+      it 'should return bigger image when bigger size specified' do
+        @options = { :image_size => 'bigger' }
+        allow(subject).to receive(:raw_info).and_return(
+            raw_info_hash.merge({ 'photo_100' => img_url })
+        )
+        expect(subject.info[:image]).to eq(img_url)
+      end
+
+      it 'should return mini image when mini size specified' do
+        @options = { :image_size => 'mini' }
+        allow(subject).to receive(:raw_info).and_return(
+            raw_info_hash.merge({ 'photo_50' => img_url })
+        )
+        expect(subject.info[:image]).to eq(img_url)
+      end
+
+      it 'should return normal image by default' do
+        allow(subject).to receive(:raw_info).and_return(
+            raw_info_hash.merge({ 'photo_50' => img_url })
+        )
+        expect(subject.info[:image]).to eq(img_url)
+      end
+    end
+  end
+
+  describe 'skip_info option' do
+    context 'when skip info option is enabled' do
+      it 'should not include raw_info in extras hash' do
+        @options = { :skip_info => true }
+        allow(subject).to receive(:raw_info).and_return({:foo => 'bar'})
+        expect(subject.extra[:raw_info]).to eq(nil)
+      end
+    end
+  end
+
+  describe 'request_phase' do
+    context 'with no request params set and redirect_url specified' do
+      before do
+        @options = { :redirect_url => 'http://www.example.com/auth/vkontakte/callback' }
+        allow(subject).to receive(:env).and_return({})
+        allow(subject).to receive(:request).and_return(
+          double('Request', {:params => {}, :scheme => 'https',
+                             :url => 'https://oauth.vk.com/authorize',
+                             :cookies => {}, :env => {}})
+        )
+        allow(subject).to receive(:request_phase).and_return(:whatever)
+      end
+
+      it 'should not break' do
+        expect { subject.request_phase }.not_to raise_error
+      end
+    end
+  end
+end
+
+private
+
+def img_url
+  'http://cs7001.vk.me/c7003/v7003079/374b/53lwetwOxD8.jpg'
+end
+
+def raw_info_hash
+  {
+    'screen_name' => 'foo_bar',
+    'first_name' => 'Павел',
+    'last_name' => 'Дуров',
+    'nickname' => 'foo_bar',
+    'email' => 'foo@example.com',
+    'country' => { 'title' => 'Российская Федерация' },
+    'city' => { 'title' => 'Санкт-Петербург' },
+    'description' => 'Developer',
+    'url' => 'example.com/foobar'
+  }
+end

data/spec/spec_helper.rb

@@ -0,0 +1,18 @@
+$:.unshift File.expand_path('..', __FILE__)
+$:.unshift File.expand_path('../../lib', __FILE__)
+require 'simplecov'
+SimpleCov.start
+require 'rspec'
+require 'rack/test'
+require 'webmock/rspec'
+require 'omniauth'
+require 'omniauth-vkontakte'
+
+RSpec.configure do |config|
+  config.include WebMock::API
+  config.include Rack::Test::Methods
+  config.extend  OmniAuth::Test::StrategyMacros, :type => :strategy
+  config.expect_with :rspec do |c|
+    c.syntax = :expect
+  end
+end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-vkontakte
 version: !ruby/object:Gem::Version
-  version: 1.3.6
+  version: 1.3.7
 platform: ruby
 authors:
 - Anton Maminov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-05 00:00:00.000000000 Z
+date: 2016-06-04 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: omniauth
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: omniauth-oauth2
   requirement: !ruby/object:Gem::Requirement
@@ -38,20 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
-- !ruby/object:Gem::Dependency
-  name: multi_json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Unofficial VKontakte strategy for OmniAuth 1.0
 email:
 - anton.linux@gmail.com
@@ -59,6 +31,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
+- Gemfile
 - README.md
 - Rakefile
 - examples/Gemfile
@@ -67,6 +43,8 @@ files:
 - lib/omniauth-vkontakte/version.rb
 - lib/omniauth/strategies/vkontakte.rb
 - omniauth-vkontakte.gemspec
+- spec/omniauth/strategies/vkontakte_spec.rb
+- spec/spec_helper.rb
 homepage: https://github.com/mamantoha/omniauth-vkontakte
 licenses: []
 metadata: {}
@@ -86,8 +64,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Unofficial VKontakte strategy for OmniAuth 1.0
-test_files: []
+test_files:
+- spec/omniauth/strategies/vkontakte_spec.rb
+- spec/spec_helper.rb