glogin 0.1 → 0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a61975b7b33a2de14aff6ac64804a0d84331706d
-  data.tar.gz: 55e804665207f6a949990f47f37b87bee1ca5ea7
+  metadata.gz: 5a6930e668b924c169ed5c02ac91b366edfa64cb
+  data.tar.gz: ad7c1628b4e3508c39b5c6c14c36a4deb79d04fd
 SHA512:
-  metadata.gz: 0ed68aaaaee03c326c7a6c17fd8073de6c3c63a66bce37f4b3a61e1b4134b2c4d642416f855a24c406be249b2d220d93f44c7b1c7d1359c24a3e2014558ae5bd
-  data.tar.gz: a88c40580a5e1cc4cb85f5d3f11b6c86fd4ed074dcf8b100323475e974ee93628f65ddb17e54148e1e7a812db9b240e22c2f5bba595e70291dc81799122f6ddd
+  metadata.gz: 2504f72c9222bcd65676148017cd18d4e0ff985f42fc2f3967544eced7e8928b67ec5e3abec0c2b481c20799d8274b82e3d6a9cd1b08de6bf130472a297e3617
+  data.tar.gz: 815f03f93317871b300a72432edb448a77a223a1912ca1ad4f0c9ad7451e18702673d4fde83b6da0f3c573ad76e7e96805f1126e42458d08f5123cf2e852f5ed

data/.simplecov

@@ -35,6 +35,6 @@ else
   SimpleCov.start do
     add_filter "/test/"
     add_filter "/features/"
-    minimum_coverage 40
+    minimum_coverage 20
   end
 end

data/README.md

@@ -12,8 +12,10 @@
 ## GitHub Login for Ruby web app
 
 This simple gem will help you enable login/logout through
-GitHub OAuth for your web application. This is how it works with
-Sinatra, but you can do something similar in any framework.
+[GitHub OAuth](https://developer.github.com/apps/building-integrations/setting-up-and-registering-oauth-apps/)
+for your web application. This is how it works with
+[Sinatra](http://www.sinatrarb.com/),
+but you can do something similar in any framework.
 
 First, somewhere in the global space, before the app starts:
 
@@ -24,8 +26,9 @@ configure do
     // Make sure their values are coming from a secure
     // place and are not visible in the source code:
     client_id, client_secret,
-    // This is what you will register in GitHub as a callback URL:
-    'http://www.example.com/github-oauth'
+    // This is what you will register in GitHub as an
+    // authorization callback URL:
+    'http://www.example.com/github-callback'
   )
 end
 ```
@@ -34,6 +37,7 @@ Next, for all web pages we need to parse a cookie, if it exists,
 and convert it into a user:
 
 ```ruby
+require 'sinatra/cookies'
 before '/*' do
   if cookies[:glogin]
     begin
@@ -60,7 +64,7 @@ a local variable `@user` will be set to something like this:
 Next, we need a URL for GitHub OAuth callback:
 
 ```ruby
-get '/github-oauth' do
+get '/github-callback' do
   cookies[:glogin] = Cookie::Open.new(
     settings.glogin.user(params[:code]),
     // The same encryption secret that we were using above:

data/lib/glogin/auth.rb

@@ -36,7 +36,9 @@ module GLogin
   #
   class Auth
     def initialize(id, secret, redirect)
+      raise "GitHub client ID can't be nil" if id.nil?
       @id = id
+      raise "GitHub client secret can't be nil" if secret.nil?
       @secret = secret
       @redirect = redirect
     end
@@ -57,6 +59,7 @@ module GLogin
       req['Accept-Header'] = 'application/json'
       req['Authorization'] = "token #{access_token(code)}"
       res = http.request(req)
+      raise "Error (#{res.code}): #{res.body}" unless res.code == '200'
       JSON.parse(res.body)
     end
 

data/lib/glogin/cookie.rb

@@ -66,7 +66,7 @@ module GLogin
         cpr = Cookie.cipher
         cpr.encrypt
         cpr.key = Digest::SHA1.hexdigest(@secret)
-        encrypted = cpr.update("#{@json['login']}|#{@json['avatar']}")
+        encrypted = cpr.update("#{@json['login']}|#{@json['avatar_url']}")
         encrypted << cpr.final
         Base64.encode64(encrypted.to_s)
       end

data/lib/glogin/version.rb

@@ -25,5 +25,5 @@
 # Copyright:: Copyright (c) 2017 Yegor Bugayenko
 # License:: MIT
 module GLogin
-  VERSION = '0.1'.freeze
+  VERSION = '0.2'.freeze
 end

data/test/glogin/test_cookie.rb

@@ -30,21 +30,21 @@ class TestCookie < Minitest::Test
       GLogin::Cookie::Open.new(
         JSON.parse(
           "{\"login\":\"yegor256\",\
-          \"avatar\":\"https://avatars1.githubusercontent.com/u/526301\"}"
+          \"avatar_url\":\"https://avatars1.githubusercontent.com/u/526301\"}"
         ),
         secret
       ).to_s,
       secret
     ).to_user
-    assert(user[:login] == 'yegor256')
-    assert(user[:avatar] == 'https://avatars1.githubusercontent.com/u/526301')
+    assert_equal(user[:login], 'yegor256')
+    assert_equal(user[:avatar], 'https://avatars1.githubusercontent.com/u/526301')
   end
 
   def test_fails_on_broken_text
     assert_raises OpenSSL::Cipher::CipherError do
       GLogin::Cookie::Closed.new(
         GLogin::Cookie::Open.new(
-          JSON.parse('{"login":"x","avatar":"x"}'),
+          JSON.parse('{"login":"x","avatar_url":"x"}'),
           'secret-1'
         ).to_s,
         'secret-2'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glogin
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: '0.2'
 platform: ruby
 authors:
 - Yegor Bugayenko