warden-oauthed 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 64c088c6e02a7eab994121ca4286c1c8781de98e
-  data.tar.gz: d003d2b5b10efdf72085430bf4ceb2d34344b02f
+  metadata.gz: c733f127822efd64b509c325d9038b576f158fed
+  data.tar.gz: 6a7c59cfc1e3d736443a3c7e20e2270a1ba87699
 SHA512:
-  metadata.gz: 53e16a72196c8d91f039a4f46ee3c3a0b73dcf8a1d4b1d3c83e02d47b4a0e3c161e0779afaee6cd254b3b413aa700f7869178c77750d918556b208500954a86a
-  data.tar.gz: c3419bc56224d7b5375bef5ca25c9ead6408d033e5aad2c52d861b6ffa0f4b59a31add90f8dbba833e468dbccde695400085b9ed5e2598a09cfe7dc4b0d9e630
+  metadata.gz: 192f2d7789ea37d404e86fa5379841998f58bc6a59ce57bdfdd8aaf89dfa14008ee25a77eba5a513ec0acbf4efe07dc7693e7281c640101bc40bdd163f4d4127
+  data.tar.gz: eb3ca5bea7e5c15c58e5070bfc979e68f4ddcab297d61e66582fd86a2ae3ffc69996f8a8f7211f88e6db449ea3096e98ddab29755d852599bf4f2ce1989d890b

data/Gemfile

@@ -1,6 +1,7 @@
 source 'https://rubygems.org'
 ruby '2.2.2'
 
+gem 'multi_json',   '~>1.11.2'
 gem 'json',   '~>1.5'
 gem 'warden', '~>1.0'
 gem 'oauth2', '~>0.5.2'

data/Guardfile

@@ -1,10 +1,10 @@
 group :red_green_refactor, halt_on_fail: true do
   guard :rspec, cmd: "bundle exec rspec", failed_mode: 'focus' do
     watch(%r{^spec/.+_spec\.rb$})
-    watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
-  end
-  guard :rubocop, all_on_start: false do
-    watch(/.+\.rb$/)
-    watch(%r{(?:.+/)?\.rubocop\.yml$}) { |m| File.dirname(m[0]) }
+    watch(%r{^lib/(.+)\.rb$})     { |m| "spec/#{m[1]}_spec.rb" }
   end
+  # guard :rubocop, all_on_start: false do
+  #   watch(/.+\.rb$/)
+  #   watch(%r{(?:.+/)?\.rubocop\.yml$}) { |m| File.dirname(m[0]) }
+  # end
 end

data/lib/warden-oauthed.rb

@@ -1,6 +1,6 @@
 require 'warden'
 require 'oauth2'
-require 'json'
+require 'multi_json'
 
 module Warden
   module Oauthed

data/lib/warden-oauthed/proxy.rb

@@ -8,19 +8,14 @@ module Warden
         end
 
         def ssl_options
-          ca_file = "/usr/lib/ssl/certs/ca-certificates.crt"
-          if File.exists?(ca_file)
-            { :ca_file => ca_file }
-          else
-            { :ca_file => ''}
-          end
+          { version: :TLSv1 }
         end
 
         def client
           @client ||= OAuth2::Client.new(@client_id, @secret,
-                                         :ssl           => ssl_options,
-                                         :site          => oauth_domain,
-                                         :authorize_url => '/oauth/authorize')
+            ssl: ssl_options,
+            site: oauth_domain,
+            authorize_url: '/oauth/authorize')
         end
 
         def api_for(code)

data/lib/warden-oauthed/strategy.rb

@@ -5,16 +5,20 @@ Warden::Strategies.add(:oauthed) do
     @params ||= Rack::Utils.parse_query(request.query_string)
   end
 
+  def api_url
+    ENV['API_BASE_URL'] || '/api/v1'
+  end
+
   def authenticate!
     if params['code']
       begin
         api = api_for(params['code'])
 
-        resp = api.get '/api/v1/me' do |request|
+        resp = api.get "#{api_url}/me" do |request|
           request.params['access_token'] = api.token
         end.body
 
-        user = JSON.parse(resp)
+        user = MultiJson.load(resp)
         success!(Warden::Oauthed::Oauth::User.new(user['user'], api.token))
       rescue OAuth2::Error
         %(<p>Outdated ?code=#{params['code']}:</p><p>#{$!}</p><p><a href="/auth/oauthed">Retry</a></p>)

data/lib/warden-oauthed/user.rb

@@ -2,8 +2,7 @@ module Warden
   module Oauthed
     module Oauth
       class User < Struct.new(:attribs, :token)
-        ATTRIBUTES = %w[id full_name email].freeze
-
+        ATTRIBUTES = (ENV['USER_ATTRIBUTES'] || 'id email').split(/\s/).freeze
         
         ATTRIBUTES.each do |name|
           define_method(name) { attribs[name] }

data/lib/warden-oauthed/version.rb

@@ -1,5 +1,5 @@
 module Warden
   module Oauthed
-    VERSION = '0.0.1'
+    VERSION = '0.0.2'
   end
 end

data/spec/oauth_spec.rb

@@ -2,6 +2,10 @@ require File.dirname(__FILE__) + '/spec_helper'
 
 describe 'Warden::Oauthed' do
   it 'requesting an url that requires authentication redirects to github' do
+    ENV['OAUTH_BASE_URL'] = 'http://localhost:3000'
+    ENV['APPLICATION_SCOPES_REQUESTED'] = 'public'
+    ENV['APPLICATION_CLIENT_ID'] = 'fd6df6f74658a9202d401aaba38223a7f79e7572926ce845e5268f5171e5b2d5'
+    ENV['APPLICATION_CLIENT_SECRET'] = 'afee0e20322e5d73dff82f29baf5989afd3422557056129aad29d974e56df677'
     response = get '/'
 
     uri = Addressable::URI.parse(response.headers['Location'])

data/warden-oauthed.gemspec

@@ -12,7 +12,8 @@ Gem::Specification.new do |s|
   s.license     = 'MIT'
   s.description = s.summary
 
-  s.add_dependency 'json',   '~>1.5'
+  s.add_dependency 'json', '~>1.5'
+  s.add_dependency 'multi_json', '~>1.11.2'
   s.add_dependency 'warden', '~>1.0'
   s.add_dependency 'oauth2', '~>0.5.2'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: warden-oauthed
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - David Jaress
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-10 00:00:00.000000000 Z
+date: 2015-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -25,6 +25,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
+- !ruby/object:Gem::Dependency
+  name: multi_json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.11.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.11.2
 - !ruby/object:Gem::Dependency
   name: warden
   requirement: !ruby/object:Gem::Requirement