omniauth-mail_ru 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 58f9f188cf5e716ec6aa9e9c163b872e59289788
-  data.tar.gz: aa5679ada124a63f87af67f624b16d117c372fd9
+SHA256:
+  metadata.gz: 4443bb97ff026aa10df7700596b0177dfd8599ed660e5b7f77b483def1e800bc
+  data.tar.gz: b8dcab96ae5729a6f1ff8389ba5f1752e256e19c7d7ef9fa2ba8186e042134e9
 SHA512:
-  metadata.gz: 13e7b7db5bea48651888ecc39e8ee9152eee9023f19e52d57346181d1a1a0141484891bc4b78b568b3ce0332849cca244fa40ae2cf63a9a86931ada56fae1f93
-  data.tar.gz: 4eb61cb230d59f2d31f791168d1fd8d5a10e2438b9812a1e1788cc3af4f3b031598de4dd4d9ea938150011b126630de851c8ff639fca3c0eccac014242ce73aa
+  metadata.gz: fa7ec35b215d200aa65b095af9191c7339c75f3131526eb3d8f1cb304ea10f63fdd2a61b7fb85ded75dd4a6180401403a7d01795b8f44b04aa17ea99d6e699e3
+  data.tar.gz: 14b7d3666fd9ead84b70da5ed03d40812f17e5658250f4540304a7e2be1febb9164bceccd2b4cc3f2d964c20d7d737854c0e221683eb37830d3017cc0c604807

data/.gitignore

@@ -20,3 +20,4 @@ tmp
 *.o
 *.a
 mkmf.log
+.DS_Store

data/.rubocop.yml

@@ -0,0 +1,22 @@
+ClassLength:
+  Enabled: false
+Layout/IndentHeredoc:
+  Enabled: false
+Metrics/AbcSize:
+  Enabled: false
+Metrics/BlockLength:
+  ExcludedMethods: ['describe', 'context']
+Metrics/CyclomaticComplexity:
+  Enabled: false
+Metrics/LineLength:
+  Enabled: false
+Metrics/MethodLength:
+  Enabled: false
+Metrics/PerceivedComplexity:
+  Enabled: false
+Naming:
+  Enabled: false
+Style/MutableConstant:
+  Enabled: false
+Gemspec/RequiredRubyVersion:
+  Enabled: false

data/Rakefile

@@ -1,2 +1 @@
-require "bundler/gem_tasks"
-
+require 'bundler/gem_tasks'

data/lib/omniauth/mail_ru/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module MailRu
-    VERSION = '1.0.1'
+    VERSION = '1.1.0'.freeze
   end
 end

data/lib/omniauth/strategies/mail_ru.rb

@@ -2,46 +2,53 @@ require 'omniauth-oauth2'
 
 module OmniAuth
   module Strategies
+    # Authentication strategy for connecting with Mail.ru OAuth 2.0
     class MailRu < OmniAuth::Strategies::OAuth2
       option :name, 'mail_ru'
 
-      option :client_options, {
-          site: 'https://connect.mail.ru/',
-          token_url: '/oauth/token',
-          authorize_url: '/oauth/authorize'
-      }
+      option :client_options,
+             site: 'https://connect.mail.ru',
+             token_url: '/oauth/token',
+             authorize_url: '/oauth/authorize'
 
       uid { access_token.params['x_mailru_vid'] }
 
       info do
         {
-            name: [raw_info['first_name'], raw_info['last_name']].join(' ').strip,
-            email: raw_info['email'],
-            nickname: raw_info['nick'],
-            first_name: raw_info['first_name'],
-            last_name: raw_info['last_name'],
-            image: (raw_info['has_pic'].to_i == 1) && raw_info['pic_50'] || raw_info['pic_small'],
-            urls: {
-                'Mailru' => raw_info['link']
-            }
+          name: [raw_info['first_name'], raw_info['last_name']].join(' ').strip,
+          email: raw_info['email'],
+          nickname: raw_info['nick'],
+          first_name: raw_info['first_name'],
+          last_name: raw_info['last_name'],
+          image: raw_info['has_pic'].to_i == 1 ? (raw_info['pic_50'] || raw_info['pic_small']) : nil,
+          urls: {
+            'Mailru' => raw_info['link']
+          }
         }
       end
 
       extra do
         {
-            raw_info: raw_info
+          raw_info: raw_info
         }
       end
 
       def raw_info
-        @raw_info ||= access_token.get('http://www.appsmail.ru/platform/api', params: params).parsed.first
+        @raw_info ||= access_token.get('https://www.appsmail.ru/platform/api', params: info_params).parsed.first
       end
 
-      def params
+      private
+
+      def callback_url
+        full_host + script_name + callback_path
+      end
+
+      def info_params
         params = {
-            app_id: options.client_id,
-            method: 'users.getInfo',
-            session_key: access_token.token
+          app_id: options.client_id,
+          method: 'users.getInfo',
+          secure: 1,
+          session_key: access_token.token
         }
         params[:sig] = signature(params)
 
@@ -49,9 +56,9 @@ module OmniAuth
       end
 
       def signature(params)
-        params = params.sort.reduce('') { |m, (key, value)| m << "#{key}=#{value}"; m }
-        Digest::MD5.hexdigest([uid, params, options.client_secret].join)
+        params = params.sort.reduce([]) { |m, (key, value)| m.push("#{key}=#{value}") }.join
+        Digest::MD5.hexdigest([params, options.client_secret].join)
       end
     end
   end
-end
+end

data/lib/omniauth-mail_ru.rb

@@ -1,2 +1,2 @@
 require 'omniauth/mail_ru/version'
-require 'omniauth/strategies/mail_ru'
+require 'omniauth/strategies/mail_ru'

data/omniauth-mail_ru.gemspec

@@ -1,4 +1,3 @@
-# coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'omniauth/mail_ru/version'
@@ -8,8 +7,8 @@ Gem::Specification.new do |spec|
   spec.version       = OmniAuth::MailRu::VERSION
   spec.authors       = ['Andrey Skuryatin']
   spec.email         = ['andrey.skuryatin@gmai.com']
-  spec.summary       = %q{OmniAuth strategy for Mail.ru}
-  spec.description   = %q{OmniAuth strategy for Mail.ru}
+  spec.summary       = 'OmniAuth strategy for Mail.ru'
+  spec.description   = 'OmniAuth strategy for Mail.ru'
   spec.homepage      = 'https://github.com/andrey-skat/omniauth-mail_ru'
   spec.license       = 'MIT'
 
@@ -19,4 +18,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'omniauth-oauth2', '~> 1.0'
+  spec.add_development_dependency 'rake', '~> 12.0'
+  spec.add_development_dependency 'rspec', '~> 3.6'
+  spec.add_development_dependency 'rubocop', '~> 0.49'
 end

data/spec/omniauth/strategies/mail_ru_spec.rb

@@ -0,0 +1,99 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+require 'omniauth-mail_ru'
+
+describe OmniAuth::Strategies::MailRu do
+  let(:request) { double('Request', params: {}, cookies: {}, env: {}) }
+  let(:app) do
+    lambda do
+      [200, {}, ['Hello.']]
+    end
+  end
+
+  subject do
+    OmniAuth::Strategies::MailRu.new(app, 'appid', 'secret', @options || {}).tap do |strategy|
+      allow(strategy).to receive(:request) do
+        request
+      end
+    end
+  end
+
+  before do
+    OmniAuth.config.test_mode = true
+  end
+
+  after do
+    OmniAuth.config.test_mode = false
+  end
+
+  describe '#client_options' do
+    it 'has correct site' do
+      expect(subject.client.site).to eq('https://connect.mail.ru')
+    end
+
+    it 'has correct authorize_url' do
+      expect(subject.client.options[:authorize_url]).to eq('/oauth/authorize')
+    end
+
+    it 'has correct token_url' do
+      expect(subject.client.options[:token_url]).to eq('/oauth/token')
+    end
+
+    describe 'overrides' do
+      context 'as strings' do
+        it 'should allow overriding the site' do
+          @options = { client_options: { 'site' => 'https://example.com' } }
+          expect(subject.client.site).to eq('https://example.com')
+        end
+
+        it 'should allow overriding the authorize_url' do
+          @options = { client_options: { 'authorize_url' => 'https://example.com' } }
+          expect(subject.client.options[:authorize_url]).to eq('https://example.com')
+        end
+
+        it 'should allow overriding the token_url' do
+          @options = { client_options: { 'token_url' => 'https://example.com' } }
+          expect(subject.client.options[:token_url]).to eq('https://example.com')
+        end
+      end
+
+      context 'as symbols' do
+        it 'should allow overriding the site' do
+          @options = { client_options: { site: 'https://example.com' } }
+          expect(subject.client.site).to eq('https://example.com')
+        end
+
+        it 'should allow overriding the authorize_url' do
+          @options = { client_options: { authorize_url: 'https://example.com' } }
+          expect(subject.client.options[:authorize_url]).to eq('https://example.com')
+        end
+
+        it 'should allow overriding the token_url' do
+          @options = { client_options: { token_url: 'https://example.com' } }
+          expect(subject.client.options[:token_url]).to eq('https://example.com')
+        end
+      end
+    end
+  end
+
+  describe 'raw_info' do
+    it 'should have pic_50 url' do
+      allow(subject).to receive(:raw_info) { { 'has_pic' => '1', 'pic_50' => 'http://avt-17.foto.mail.ru/mail/test/_avatar50?111' } }
+
+      expect(subject.info[:image]).to eq('http://avt-17.foto.mail.ru/mail/test/_avatar50?111')
+    end
+
+    it 'should have pic_small url' do
+      allow(subject).to receive(:raw_info) { { 'has_pic' => '1', 'pic_small' => 'http://avt-17.foto.mail.ru/mail/test/_avatarsmall?111' } }
+
+      expect(subject.info[:image]).to eq('http://avt-17.foto.mail.ru/mail/test/_avatarsmall?111')
+    end
+
+    it 'should not have pic url' do
+      allow(subject).to receive(:raw_info) { { 'has_pic' => '0', 'pic_50' => 'http://avt-17.foto.mail.ru/mail/test/_avatar50?111', 'pic_small' => 'http://avt-17.foto.mail.ru/mail/test/_avatarsmall?111' } }
+
+      expect(subject.info[:image]).to be_nil
+    end
+  end
+end

data/spec/rubocop_spec.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+require_relative 'spec_helper'
+
+describe 'Rubocop' do
+  it 'should pass with no offenses detected' do
+    expect(`rubocop`).to include('no offenses detected')
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+require File.join('bundler', 'setup')
+require 'rspec'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-mail_ru
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Andrey Skuryatin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-18 00:00:00.000000000 Z
+date: 2018-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth-oauth2
@@ -24,6 +24,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '12.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '12.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.6'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.49'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.49'
 description: OmniAuth strategy for Mail.ru
 email:
 - andrey.skuryatin@gmai.com
@@ -32,6 +74,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -40,6 +83,9 @@ files:
 - lib/omniauth/mail_ru/version.rb
 - lib/omniauth/strategies/mail_ru.rb
 - omniauth-mail_ru.gemspec
+- spec/omniauth/strategies/mail_ru_spec.rb
+- spec/rubocop_spec.rb
+- spec/spec_helper.rb
 homepage: https://github.com/andrey-skat/omniauth-mail_ru
 licenses:
 - MIT
@@ -60,9 +106,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: OmniAuth strategy for Mail.ru
-test_files: []
-has_rdoc: 
+test_files:
+- spec/omniauth/strategies/mail_ru_spec.rb
+- spec/rubocop_spec.rb
+- spec/spec_helper.rb