omniauth-digitalocean 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14748fd5f32fe8328b7ad8cf15e17a3c0d0726b0
-  data.tar.gz: d28f1f2dbd3093a26820962a15293ac7942a007c
+  metadata.gz: 1392de35285d7885830f50bf169e2982cba5acc2
+  data.tar.gz: cd023a08a1dbf6257f0815a93e874431b21e8a18
 SHA512:
-  metadata.gz: 38758990c7d3443ab1266e868ffef1eacf609474975fccb46a8cec884d0c591d6ba9f1013ede0b9e5cdefd154a190b1245d238f43ccbfa265b687db3b0b58061
-  data.tar.gz: 901f4f71dd1d202918ca37ae73559e83a77e84272c34c5450e0fcc4b4c0b579ed9dbb4e2a46ce9cf4eee0298f6c1c671b633c94c99556cada5b2e9c7d91ac01a
+  metadata.gz: c8c54ed63b31841d3e4f13cf2735def74c7a6dc9db84844d0fba1c6287efa5ae68a8ace336bebef0eaec53595c2926aa03747af8e1651f5daa6fa8bccb712c36
+  data.tar.gz: d30fe46823e69769910bf1d3459ae3342bef2efc9baede78c671ffd22e9732b23d9ac023cb3adffa61af7035b1ae6a010bbac363dcc99ef8c4231d68edead485

data/.travis.yml

@@ -1,6 +1,10 @@
 language: ruby
 cache: bundler
 
+install:
+  - "gem install bundler"
+  - "bundle install --jobs=3 --retry=3"
+
 rvm:
   - "2.0.0"
   - "2.1.5"

data/README.md

@@ -38,7 +38,7 @@ For additional information, refer to the [OmniAuth wiki](https://github.com/intr
 
 See the [example](https://github.com/digitaloceancloud/omniauth-digitalocean/blob/master/examples/sinatra/config.ru) Sinatra app for full examples
 
-Note: before running example app, please add your applicaation id and secret to ` example/config.ru ` file.
+Note: before running example app, please add your application id and secret to ` example/config.ru ` file.
 
 ## License
 

data/examples/sinatra/config.ru

@@ -3,22 +3,26 @@ require 'bundler/setup'
 require 'sinatra'
 require 'omniauth-digitalocean'
 
-get '/' do
-  redirect '/auth/digitalocean'
-end
+class DigitalOceanExample < Sinatra::Base
+  use Rack::Session::Cookie
 
-get '/auth/:provider/callback' do
-  content_type 'text/plain'
-  request.env['omniauth.auth'].to_hash.inspect rescue "No Data"
-end
+  get '/' do
+    redirect '/auth/digitalocean'
+  end
 
-get '/auth/failure' do
-  content_type 'text/plain'
-  request.env['omniauth.auth'].to_hash.inspect rescue "No Data"
-end
+  get '/auth/:provider/callback' do
+    content_type 'text/plain'
+    request.env['omniauth.auth'].to_hash.inspect rescue "No Data"
+  end
 
-use Rack::Session::Cookie
+  get '/auth/failure' do
+    content_type 'text/plain'
+    request.env['omniauth.auth'].to_hash.inspect rescue "No Data"
+  end
 
-use OmniAuth::Builder do
-  provider :digitalocean, ENV["DIGITALOCEAN_APP_ID"], ENV["DIGITALOCEAN_SECRET"], scope: "read write"
+  use OmniAuth::Builder do
+    provider OmniAuth::Strategies::Digitalocean, ENV["DIGITALOCEAN_APP_ID"], ENV["DIGITALOCEAN_SECRET"], scope: "read write"
+  end
 end
+
+run DigitalOceanExample.run!

data/lib/omniauth-digitalocean/version.rb

@@ -1,5 +1,5 @@
 module Omniauth
   module Digitalocean
-    VERSION = "0.2.0"
+    VERSION = "0.2.1"
   end
 end

data/lib/omniauth/strategies/digitalocean.rb

@@ -9,10 +9,10 @@ module OmniAuth
     #    use OmniAuth::Strategies::Digitalocean, 'consumerkey', 'consumersecret', :scope => 'read write', :display => 'plain'
     #
     class Digitalocean < OmniAuth::Strategies::OAuth2
-      AUTHENTICATION_PARAMETERS = %w(display state scope)
+      AUTHENTICATION_PARAMETERS = %w(display account state scope)
       BASE_URL = "https://cloud.digitalocean.com"
 
-      option :name, :digitalocean
+      option :name, "digitalocean"
 
       unless OmniAuth.config.test_mode
         option :client_options, {
@@ -38,6 +38,14 @@ module OmniAuth
         access_token.params['info']
       end
 
+      # Over-ride callback_url definition to maintain
+      # compatability with omniauth-oauth2 >= 1.4.0
+      #
+      # See: https://github.com/intridea/omniauth-oauth2/issues/81
+      def callback_url
+        full_host + script_name + callback_path
+      end
+
       # Hook useful for appending parameters into the auth url before sending
       # to provider.
       def request_phase

data/spec/omniauth/strategies/digitalocean_spec.rb

@@ -6,7 +6,7 @@ describe OmniAuth::Strategies::Digitalocean do
   end
 
   describe "production client options" do
-    it { expect(subject.options.name).to eq(:digitalocean) }
+    it { expect(subject.options.name).to eq("digitalocean") }
 
     it { expect(subject.options.client_options.site).to eq("https://cloud.digitalocean.com") }
     it { expect(subject.options.client_options.authorize_url).to eq("https://cloud.digitalocean.com/v1/oauth/authorize") }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-digitalocean
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Phillip Baker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-03 00:00:00.000000000 Z
+date: 2016-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
@@ -164,7 +164,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Official OmniAuth strategy for Digitalocean