glogin 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c119e131499ee21da88734113b234d547954e07
-  data.tar.gz: 1f8d5998346047a3c5d818b4d76510c1d23b5ef5
+  metadata.gz: 3b6d42a8a87bd2c5542bf6e7e3fb5e0e536fe600
+  data.tar.gz: 6fc0c7f81e4fe8775bf74801a4da4c39ecdd0432
 SHA512:
-  metadata.gz: d49f67f6d1469db13a608e22c01bf3dda74065b5e9d95ef0c695fd321e79d81213b574a678d6f13c2894086aea3d2028c3221bd3a0a75017989866b058a85544
-  data.tar.gz: 64ebc43231b37ef27f359384fef145ad4b6aac34f07c3003c183bb4a743fa7c724474583470cec6d8a9791f874579d9afc5fa10f7a0cf67f74d64041442232cb
+  metadata.gz: ffba5fb8d96cfaf2bbf18a761d171a1036a4ad93e8ab30b480b5b6b85aafe16232f8bd333e94c2537d877be52a444a238d0003127f42e6d34f14616edda13fd2
+  data.tar.gz: 8f1ad4b624062362a95de0ebd6bd0debfa129720b6a6a3307ed9638ac9e438656dbead9b344485ec8f7cdc77a0ef37462ae03fd07513fb954ba30670114e2e40

data/README.md

@@ -1,12 +1,11 @@
-[![Managed by Zerocracy](http://www.zerocracy.com/badge.svg)](http://www.zerocracy.com)
+[![Managed by Zerocracy](https://www.0crat.com/badge/C3RFVLU72.svg)](https://www.0crat.com/p/C3RFVLU72)
 [![DevOps By Rultor.com](http://www.rultor.com/b/yegor256/glogin)](http://www.rultor.com/p/yegor256/glogin)
 [![We recommend RubyMine](http://img.teamed.io/rubymine-recommend.svg)](https://www.jetbrains.com/ruby/)
 
 [![Build Status](https://travis-ci.org/yegor256/glogin.svg)](https://travis-ci.org/yegor256/glogin)
 [![PDD status](http://www.0pdd.com/svg?name=yegor256/glogin)](http://www.0pdd.com/p?name=yegor256/glogin)
 [![Gem Version](https://badge.fury.io/rb/glogin.svg)](http://badge.fury.io/rb/glogin)
-[![Dependency Status](https://gemnasium.com/yegor256/glogin.svg)](https://gemnasium.com/yegor256/glogin)
-[![Code Climate](http://img.shields.io/codeclimate/github/yegor256/glogin.svg)](https://codeclimate.com/github/yegor256/glogin)
+[![Maintainability](https://api.codeclimate.com/v1/badges/155f86b639d155259219/maintainability)](https://codeclimate.com/github/yegor256/glogin/maintainability)
 [![Test Coverage](https://img.shields.io/codecov/c/github/yegor256/glogin.svg)](https://codecov.io/github/yegor256/glogin?branch=master)
 
 ## GitHub Login for Ruby web app
@@ -123,6 +122,15 @@ I use this gem in [sixnines](https://github.com/yegor256/sixnines)
 and [0pdd](https://github.com/yegor256/0pdd) web apps (both open source),
 on top of Sinatra.
 
+Also, you can use `GLogin::Codec` just to encrypt/decrypt a piece of text:
+
+```ruby
+require 'glogin/codec'
+codec = GLogin:Codec.new('the secret')
+encrypted = codec.encrypt('Hello, world!')
+decrypted = codec.decrypt(encrypted)
+```
+
 ## How to contribute?
 
 Just submit a pull request. Make sure `rake` passes.

data/glogin.gemspec

@@ -42,7 +42,7 @@ Gem::Specification.new do |s|
   s.homepage = 'http://github.com/yegor256/glogin'
   s.files = `git ls-files`.split($RS)
   s.executables = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  s.test_files = s.files.grep(%r{^(test|features)/})
+  s.test_files = s.files.grep(%r{^(test)/})
   s.rdoc_options = ['--charset=UTF-8']
   s.extra_rdoc_files = ['README.md', 'LICENSE.txt']
   s.add_development_dependency 'codecov', '~>0.1'
@@ -52,4 +52,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rspec-rails', '~>3.1'
   s.add_development_dependency 'rubocop', '~>0.57'
   s.add_development_dependency 'rubocop-rspec', '~>1.5'
+  s.add_development_dependency 'webmock', '~>3.4'
 end

data/lib/glogin/auth.rb

@@ -21,7 +21,6 @@
 
 require 'net/http'
 require 'uri'
-require 'yaml'
 require 'json'
 require 'cgi'
 
@@ -81,7 +80,6 @@ module GLogin
       req['Accept'] = 'application/json'
       res = http.request(req)
       raise "Error (#{res.code}): #{res.body}" unless res.code == '200'
-      puts res.body
       JSON.parse(res.body)['access_token']
     end
   end

data/lib/glogin/codec.rb

@@ -39,6 +39,7 @@ module GLogin
     end
 
     def decrypt(text)
+      raise 'Text can\'t be nil' if text.nil?
       if @secret.empty?
         text
       else
@@ -56,6 +57,7 @@ module GLogin
     end
 
     def encrypt(text)
+      raise 'Text can\'t be nil' if text.nil?
       cpr = cipher
       cpr.encrypt
       cpr.key = digest

data/lib/glogin/cookie.rb

@@ -22,12 +22,16 @@
 require 'openssl'
 require 'digest/sha1'
 require 'base64'
+require_relative 'codec'
 
 # GLogin main module.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
 # Copyright:: Copyright (c) 2017-2018 Yegor Bugayenko
 # License:: MIT
 module GLogin
+  # Split symbol inside the cookie text
+  SPLIT = '|'.freeze
+
   #
   # Secure cookie
   #
@@ -49,14 +53,14 @@ module GLogin
       # to catch in your applicaiton and ignore the login attempt.
       def to_user
         plain = Codec.new(@secret).decrypt(@text)
-        login, avatar, ctx = plain.split('|', 3)
+        login, avatar, bearer, ctx = plain.split(GLogin::SPLIT, 4)
         if !@secret.empty? && ctx.to_s != @context
           raise(
             OpenSSL::Cipher::CipherError,
             "Context '#{@context}' expected, but '#{ctx}' found"
           )
         end
-        { login: login, avatar: avatar }
+        { login: login, avatar: avatar, bearer: bearer }
       end
     end
 
@@ -77,8 +81,9 @@ module GLogin
           [
             @json['login'],
             @json['avatar_url'],
+            @json['bearer'],
             @context
-          ].join('|')
+          ].join(GLogin::SPLIT)
         )
       end
     end

data/lib/glogin/version.rb

@@ -24,5 +24,5 @@
 # Copyright:: Copyright (c) 2017-2018 Yegor Bugayenko
 # License:: MIT
 module GLogin
-  VERSION = '0.4.0'.freeze
+  VERSION = '0.4.1'.freeze
 end

data/test/glogin/test_auth.rb

@@ -20,9 +20,29 @@
 # SOFTWARE.
 
 require 'minitest/autorun'
+require 'webmock/minitest'
 require_relative '../../lib/glogin/cookie'
 
 class TestAuth < Minitest::Test
+  def test_authenticate_via_https
+    auth = GLogin::Auth.new('1234', '4433', 'https://example.org')
+    stub_request(:post, 'https://github.com/login/oauth/access_token').to_return(
+      status: 200,
+      body: {
+        access_token: 'some-token'
+      }.to_json
+    )
+    stub_request(:get, 'https://api.github.com/user').to_return(
+      status: 200,
+      body: {
+        auth_code: '437849732894732',
+        login: 'yegor256'
+      }.to_json
+    )
+    user = auth.user('437849732894732')
+    assert_equal('yegor256', user['login'])
+  end
+
   def test_login_uri
     auth = GLogin::Auth.new(
       'client_id', 'client_secret', 'http://www.example.com/github-oauth'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glogin
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-17 00:00:00.000000000 Z
+date: 2018-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: codecov
@@ -108,6 +108,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
 description: Enables login/logout functionality for a Ruby web app
 email: yegor256@gmail.com
 executables: []