omniauth-kanbox 1.0.0 → 1.0.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MTc5ODQzYmU0MDAyNTJhODM4ZTAyOTk2OTA2Y2JjMTEwMWNiYTljMg==
+    MTMzODg4MWFiZmVlODZjMjRkM2MxMGY4Yzg3MDk1ZGY3ZDVlZTQyMg==
   data.tar.gz: !binary |-
-    MGQ3ZjA4YWQ0MTU5ZTU1YTNhMWE4MmU5ODZkMTZiMjMzYTM2ZTJlNA==
+    OTIwZTk4ZWM0OTIzNWM2NTUyYTcxODkxNTM5N2QwZjY0OTc3ZGE0Zg==
 SHA512:
   metadata.gz: !binary |-
-    MTU5YzQ0ZDFmODUyMDhkYTc1ZmRmZDUxZjM3MmExZGYwZDFhMmE1YjI0YmJh
-    NmY2NGUwNDBlOWZmYjkxYzRjMDdhYzY5N2MxNjU5MjEzNTA5ZjMwYTc4MDI5
-    NDVmNWI1NWE4MDIyMzc5ZjQ2M2RlYmUwYjA3Y2UyOTMwNzlhNjQ=
+    NjU5ZDVmYWUyNjZlNDc0NzEzNjA2ODg5OTYzMThlNmNmMjhmYmYyNzU0MTgy
+    NmI2MzcwNWZhMjRmMDI5NjVkZGU1OGFjZmViNmI5ZDhhMDMyZDE3MTY1Yzc0
+    OGZhZDVjMzEyMjFmOGY2OTA3OWE1ZDBjMTgzZjMxMmFhMTk3Njc=
   data.tar.gz: !binary |-
-    MzBiNWYxYjE0N2JmMzNiMmNiNGY5NDMzOTI2NDE0ZDA1YzEyMDkyNDk3NWNj
-    MDk3MTU0MjNjNTgwNGJmYmJkNzE3MWY1NjQzMTA2ZDY0ZDk3NWQyOGRhMzhh
-    NjJmZDI2ZjcwODQwMDc1M2EwNjBmNzBlNTgwOTY5Y2Y0ZDBhMmU=
+    MzA5OTZkOGQzMDVlNDE5MjFlODA3ZDNhNDdlMzk3ZDY5NWMxMWIxMjJmNzkz
+    MzM3ZDc0NmE4YjcxZGEyMGJkOGFlZjdiMTRmOTU5MTE4ZDU1MDA2YjhjYWUw
+    MzhlZDk5Y2FhNzRkZmZlMTVmZTRkZjc0YWUwNGE2NjRmZmVhNDg=

data/README.md

@@ -1,5 +1,4 @@
-=======
-omniauth-workxp
+omniauth-kanbox
 ===============
 
 Unofficial OmniAuth strategy for Kanbox.
@@ -18,36 +17,53 @@ Or install it yourself as:
 
     $ gem install omniauth-kanbox
 
+
 ## Usage
-Example with devise:
-
-#### routes:
-     devise_for :users, :controllers => { omniauth_callbacks: "omniauth_callbacks"}
-#### user.rb:
-    open omniauthable in devise:
-    devise :omniauthable
-#### controller:
-     rails g controller omniauth_callbacks --skip-helper --skip-assets
-     class OmniauthCallbacksController < ApplicationController
-       def all
-    	 auth = request.env["omniauth.auth"]
-         raise auth.to_yaml
-       end
- 
-       alias_method :kanbox, :all
-     end
-#### devise.rb:
-     config.omniauth :kanbox, 'a9acabbfd9be74d4f77d2227b7621e18c7ba6290d87459801014039f8af63290', '0deb222c9602cedefc7ba17f6820e5c926e20bc9113406ec8fd71fff678189f0'    
-
-#### views:
-     <%= link_to "login by kanbox", http://lvh.me:3000/users/auth/kanbox %>
-
-
-## Contributing
-
-1. Fork it
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
+
+`OmniAuth::Strategies::Kanbox` is simply a Rack middleware. Read the OmniAuth docs for detailed instructions: https://github.com/intridea/omniauth.
+
+Here's a quick example, adding the middleware to a Rails app in `config/initializers/omniauth.rb`:
+
+```ruby
+Rails.application.config.middleware.use OmniAuth::Builder do
+  provider :kanbox, ENV['KANBOX_KEY'], ENV['KANBOX_SECRET']
+end
+```
+
+
+## Auth Hash
+
+Here's an example *Auth Hash* available in `request.env['omniauth.auth']`:
+
+```ruby
+{
+  :provider => 'kanbox',
+  :uid => 'user email',
+  :info => {
+    :email => 'yp.xjgz@gmail.com',
+    :name => 'yp.xjgz@gmail.com',
+    :phone => '18612553650',
+    ::description => 'spaceUsed:200/20000'
+  },
+  :credentials => {
+    :token => 'ABCDEF...', # OAuth 2.0 access_token, which you may wish to store
+    :expires_at => 1321747205, # when the access token expires (it always will)
+    :expires => true # this will always be true
+  },
+  :extra => {
+    :raw_info => {
+      :status => 'ok',
+      :email => 'yp.xjgz@gmail.com',
+      :phone => '18612553650',
+      :spaceQuota => '200',
+      :spaceUsed => '20000',
+      :emailIsActive => 1,
+      :phoneIsActive => 0
+    }
+  }
+}
+```
+
+The precise information available may depend on the permissions which you request.
+
 

data/lib/omniauth-kanbox/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module Kanbox
-    VERSION = "1.0.0"
+    VERSION = "1.0.1"
   end
 end

data/lib/omniauth/strategies/kanbox.rb

@@ -1,13 +1,12 @@
-require 'omniauth-oauth'
-require 'multi_json'
+require 'omniauth-oauth2'
 
 module OmniAuth
   module Strategies
-    class Kanbox < OmniAuth::Strategies::OAuth
+    class Kanbox < OmniAuth::Strategies::OAuth2
       option :name, 'kanbox'
 
       option :client_options, {
-        :authorize_path => '/0/auth',
+        :authorize_url => '/0/auth',
         :site => 'https://auth.kanbox.com',
         :token_url => "/0/token",
       }
@@ -16,8 +15,10 @@ module OmniAuth
 
       info do
         {
-          :name => raw_info['email']
-          :email => raw_info['email']
+          :name => raw_info['email'],
+          :email => raw_info['email'],
+          :phone => raw_info['phone'],
+          :description => "spaceUsed:#{raw_info['spaceUsed']}/#{raw_info['spaceQuota']}"
         }
       end
 
@@ -28,10 +29,9 @@ module OmniAuth
       end
       
       def raw_info
-        @raw_info ||= access_token.get('0/info').parsed
+        @raw_info ||= MultiJson.decode(access_token.get("https://api.kanbox.com/0/info").body)
       end
 
-
     end
   end
 end

data/omniauth-kanbox.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency 'omniauth', '~> 1.2'
-  s.add_dependency 'omniauth-oauth2', '~> 1.1'
+  s.add_dependency 'omniauth-oauth2', '~> 1.2'
   s.add_development_dependency 'rspec', '~> 2.7'
   s.add_development_dependency 'rack-test'
   s.add_development_dependency 'simplecov'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-kanbox
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - YuanPing
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-29 00:00:00.000000000 Z
+date: 2014-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement