sorcery 0.7.13 → 0.8.0

data/Gemfile

@@ -3,7 +3,7 @@ source :rubygems
 # Example:
 #   gem "activesupport", ">= 2.3.5"
 gem 'oauth', "~> 0.4.4"
-gem 'oauth2', "~> 0.6.0"
+gem 'oauth2', "~> 0.8.0"
 gem 'bcrypt-ruby', "~> 3.0.0"
 
 # Add dependencies to develop your gem here.

data/Gemfile.lock

@@ -46,12 +46,12 @@ GEM
     columnize (0.3.6)
     diff-lcs (1.1.3)
     erubis (2.7.0)
-    faraday (0.8.1)
+    faraday (0.8.4)
       multipart-post (~> 1.1)
     ffi (1.0.11)
     git (1.2.5)
     hike (1.2.1)
-    httpauth (0.1)
+    httpauth (0.2.0)
     i18n (0.6.0)
     jeweler (1.8.3)
       bundler (~> 1.0)
@@ -60,6 +60,8 @@ GEM
       rdoc
     journey (1.0.3)
     json (1.6.6)
+    jwt (0.1.5)
+      multi_json (>= 1.0)
     linecache19 (0.5.12)
       ruby_core_source (>= 0.1.4)
     mail (2.4.4)
@@ -81,10 +83,12 @@ GEM
     multipart-post (1.1.5)
     nokogiri (1.5.2)
     oauth (0.4.5)
-    oauth2 (0.6.1)
-      faraday (~> 0.7)
+    oauth2 (0.8.0)
+      faraday (~> 0.8)
       httpauth (~> 0.1)
-      multi_json (~> 1.3)
+      jwt (~> 0.1.4)
+      multi_json (~> 1.0)
+      rack (~> 1.2)
     plucky (0.4.4)
       mongo (~> 1.5)
     polyglot (0.3.3)
@@ -177,7 +181,7 @@ DEPENDENCIES
   mongo_mapper
   mongoid (~> 2.4.4)
   oauth (~> 0.4.4)
-  oauth2 (~> 0.6.0)
+  oauth2 (~> 0.8.0)
   rails (>= 3.0.0)
   rspec (~> 2.5.0)
   rspec-rails (~> 2.5.0)

data/README.rdoc

@@ -29,7 +29,7 @@ Railscast: http://railscasts.com/episodes/283-authentication-with-sorcery
 
 Example Rails 3 app using sorcery: https://github.com/NoamB/sorcery-example-app
 
-Documentation: http://rubydoc.info/gems/sorcery/0.7.13/frames
+Documentation: http://rubydoc.info/gems/sorcery/0.8.0/frames
 
 Check out the tutorials in the github wiki!
 

data/VERSION

@@ -1 +1 @@
-0.7.13
+0.8.0

data/lib/generators/sorcery/templates/initializer.rb

@@ -26,6 +26,13 @@ Rails.application.config.sorcery.configure do |config|
   #
   # config.cookie_domain =
 
+  
+  # -- remember_me --
+  # allow the remember_me cookie to settable through AJAX
+  # Default: `true`
+  #
+  # user.remember_me_httponly =
+  
 
   # -- session timeout --
   # How long in seconds to keep the session alive.
@@ -80,6 +87,17 @@ Rails.application.config.sorcery.configure do |config|
   # config.ca_file =
 
 
+  # For information about LinkedIn API:
+  # - user info fields go to https://developer.linkedin.com/documents/profile-fields
+  # - access permissions go to https://developer.linkedin.com/documents/authentication#granting
+  #
+  # config.linkedin.key = ""
+  # config.linkedin.secret = ""
+  # config.linkedin.callback_url = "http://0.0.0.0:3000/oauth/callback?provider=linkedin"
+  # config.linkedin.user_info_fields = ['first-name', 'last-name']
+  # config.linkedin.user_info_mapping = {first_name: "firstName", last_name: "lastName"}
+  # config.linkedin.access_permissions = ['r_basicprofile'] 
+  #
   # Twitter wil not accept any requests nor redirect uri containing localhost,
   # make sure you use 0.0.0.0:3000 to access your app in development
   #
@@ -92,6 +110,7 @@ Rails.application.config.sorcery.configure do |config|
   # config.facebook.secret = ""
   # config.facebook.callback_url = "http://0.0.0.0:3000/oauth/callback?provider=facebook"
   # config.facebook.user_info_mapping = {:email => "name"}
+  # config.facebook.access_permissions = ["email", "publish_stream"]
   #
   # config.github.key = ""
   # config.github.secret = ""

data/lib/sorcery.rb

@@ -36,6 +36,8 @@ module Sorcery
           autoload :Github, 'sorcery/controller/submodules/external/providers/github'
           autoload :Google, 'sorcery/controller/submodules/external/providers/google'
           autoload :Liveid, 'sorcery/controller/submodules/external/providers/liveid'
+          autoload :Linkedin, 'sorcery/controller/submodules/external/providers/linkedin'
+          autoload :Vkontakte, 'sorcery/controller/submodules/external/providers/vkontakte'
         end
       end
     end
@@ -78,5 +80,5 @@ module Sorcery
     MongoMapper::Document.send(:plugin, Sorcery::Model::Adapters::MongoMapper)
   end
 
-  require 'sorcery/engine' if defined?(Rails) && Rails::VERSION::MAJOR == 3
+  require 'sorcery/engine' if defined?(Rails) && Rails::VERSION::MAJOR >= 3
 end

data/lib/sorcery/controller.rb

@@ -28,13 +28,15 @@ module Sorcery
 
       # Takes credentials and returns a user on successful authentication.
       # Runs hooks after login or failed login.
-      def login(*credentials)
+       def login(*credentials)
         @current_user = nil
         user = user_class.authenticate(*credentials)
         if user
-          return_to_url = session[:return_to_url]
+          old_session = session.dup
           reset_session # protect from session fixation attacks
-          session[:return_to_url] = return_to_url
+          old_session.to_hash.each_pair do |k,v|
+            session[k.to_sym] = v
+          end
           auto_login(user)
           after_login!(user, credentials)
           current_user
@@ -113,6 +115,7 @@ module Sorcery
         @current_user = (user_class.find(session[:user_id]) if session[:user_id]) || false
       rescue => exception
         return false if defined?(Mongoid) and exception.is_a?(Mongoid::Errors::DocumentNotFound)
+        return false if defined?(ActiveRecord) and exception.is_a?(ActiveRecord::RecordNotFound)
         raise exception
       end
 

data/lib/sorcery/controller/submodules/external.rb

@@ -78,7 +78,7 @@ module Sorcery
             config = user_class.sorcery_config
 
             # first check to see if user has a particular authentication already
-            unless (current_user.send(config.authentications_class.to_s.downcase.pluralize).send("find_by_#{config.provider_attribute_name}_and_#{config.provider_uid_attribute_name}", provider, @user_hash[:uid]))
+            unless (current_user.send(config.authentications_class.to_s.downcase.pluralize).send("find_by_#{config.provider_attribute_name}_and_#{config.provider_uid_attribute_name}", provider, @user_hash[:uid].to_s))
               user = current_user.send(config.authentications_class.to_s.downcase.pluralize).build(config.provider_uid_attribute_name => @user_hash[:uid], config.provider_attribute_name => provider_name.to_s)
               user.save(:validate => false)
             else

data/lib/sorcery/controller/submodules/external/providers/facebook.rb

@@ -35,7 +35,8 @@ module Sorcery
                               :user_info_path,
                               :scope,
                               :user_info_mapping,
-                              :display
+                              :display,
+                              :access_permissions
                 attr_reader   :access_token
 
                 include Protocols::Oauth2
@@ -69,7 +70,13 @@ module Sorcery
                 def login_url(params,session)
                   self.authorize_url
                 end
-                
+
+                # overrides oauth2#authorize_url to allow customized scope.
+                def authorize_url
+                  @scope = self.access_permissions.present? ? self.access_permissions.join(",") : @scope
+                  super
+                end
+
                 # tries to login the user from access token
                 def process_callback(params,session)
                   args = {}

data/lib/sorcery/controller/submodules/external/providers/github.rb

@@ -34,6 +34,7 @@ module Sorcery
                               :auth_path,
                               :token_path,
                               :site,
+                              :scope,
                               :user_info_path,
                               :user_info_mapping
                 attr_reader   :access_token
@@ -43,6 +44,7 @@ module Sorcery
                 def init
                   @site           = "https://github.com/"
                   @user_info_path = "https://api.github.com/user"
+                  @scope          = nil
                   @auth_path      = "/login/oauth/authorize"
                   @token_path     = "/login/oauth/access_token"
                   @user_info_mapping = {}

data/lib/sorcery/controller/submodules/external/providers/linkedin.rb

@@ -0,0 +1,101 @@
+module Sorcery
+  module Controller
+    module Submodules
+      module External
+        module Providers
+          # This module adds support for OAuth with Linkedin.com.
+          # When included in the 'config.providers' option, it adds a new option, 'config.linkedin'.
+          # Via this new option you can configure Linkedin specific settings like your app's key and secret.
+          #
+          #   config.linkedin.key = <key>
+          #   config.linkedin.secret = <secret>
+          #   ...
+          #
+          module Linkedin
+            def self.included(base)
+              base.module_eval do
+                class << self
+                  attr_reader :linkedin                        
+
+                  def merge_linkedin_defaults!
+                    @defaults.merge!(:@linkedin => LinkedinClient)
+                  end
+                end
+                merge_linkedin_defaults!
+                update!
+              end
+            end
+            
+            module LinkedinClient
+              class << self
+                attr_accessor :key,
+                              :secret,
+                              :callback_url,
+                              :site,
+                              :authorize_path,
+                              :request_token_path,
+                              :access_token_path,
+                              :user_info_path,
+                              :user_info_mapping,
+                              :user_info_fields,
+                              :access_permissions
+                attr_reader   :access_token
+
+                include Protocols::Oauth1
+        
+                # Override included get_consumer method to provide authorize_path
+                def get_consumer
+                  # Add access permissions to request token path
+                  @configuration[:request_token_path] += "?scope=" + self.access_permissions.join('+') unless self.access_permissions.blank? or @configuration[:request_token_path].include? "?scope="
+                  ::OAuth::Consumer.new(@key, @secret, @configuration)
+                end
+                
+                def init
+                  @configuration = {
+                    site: "https://api.linkedin.com",
+                    authorize_path: '/uas/oauth/authenticate',
+                    request_token_path: '/uas/oauth/requestToken',
+                    access_token_path: '/uas/oauth/accessToken'
+                  }
+                  @user_info_path = "/v1/people/~"
+                end
+                
+                def get_user_hash
+                  user_hash = {}
+                  fields = self.user_info_fields.join(',')
+                  response = @access_token.get("#{@user_info_path}:(#{fields})", 'x-li-format' => 'json')
+                  user_hash[:user_info] = JSON.parse(response.body)
+                  user_hash[:uid] = user_hash[:user_info]['id'].to_s
+                  user_hash
+                end
+                
+                def has_callback?
+                  true
+                end
+                
+                # calculates and returns the url to which the user should be redirected,
+                # to get authenticated at the external provider's site.
+                def login_url(params,session)
+                  req_token = self.get_request_token
+                  session[:request_token]         = req_token.token
+                  session[:request_token_secret]  = req_token.secret
+                  self.authorize_url({:request_token => req_token.token, :request_token_secret => req_token.secret})
+                end
+                
+                # tries to login the user from access token
+                def process_callback(params,session)
+                  args = {}
+                  args.merge!({:oauth_verifier => params[:oauth_verifier], :request_token => session[:request_token], :request_token_secret => session[:request_token_secret]})
+                  args.merge!({:code => params[:code]}) if params[:code]
+                  @access_token = self.get_access_token(args)
+                end
+
+              end  
+              init
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/sorcery/controller/submodules/external/providers/vkontakte.rb

@@ -0,0 +1,94 @@
+module Sorcery
+  module Controller
+    module Submodules
+      module External
+        module Providers
+          # This module adds support for OAuth with vkontakte.com.
+          # When included in the 'config.providers' option, it adds a new option, 'config.vkontakte'.
+          # Via this new option you can configure Vkontakte specific settings like your app's key and secret.
+          #
+          #   config.vkontakte.key = <key>
+          #   config.vkontakte.secret = <secret>
+          #   ...
+          #
+          module Vkontakte
+            def self.included(base)
+              base.module_eval do
+                class << self
+                  attr_reader :vkontakte                           # access to vkontakte_client.
+
+                  def merge_vkontakte_defaults!
+                    @defaults.merge!(:@vkontakte => VkontakteClient)
+                  end
+                end
+                merge_vkontakte_defaults!
+                update!
+              end
+            end
+
+            module VkontakteClient
+              class << self
+                attr_accessor :key,
+                              :secret,
+                              :callback_url,
+                              :auth_path,
+                              :token_path,
+                              :site,
+                              :scope,
+                              :user_info_path,
+                              :user_info_mapping
+                attr_reader   :access_token
+
+                include Protocols::Oauth2
+
+                def init
+                  @site           = "https://oauth.vk.com/"
+                  @user_info_url = "https://api.vk.com/method/getUserInfo"
+                  @scope          = nil
+                  @auth_path      = "/authorize"
+                  @token_path     = "/access_token"
+                  @user_info_mapping = {}
+                end
+
+                def get_user_hash
+                  user_hash = {}
+                  response = @access_token.get("#{@user_info_url}?access_token=#{@access_token.token}")
+                  user_hash[:user_info] = JSON.parse(response.body)
+                  if user_hash[:user_info]
+                    user_hash[:user_info] = user_hash[:user_info]["response"]
+                  end
+                  user_hash[:uid] = user_hash[:user_info]['user_id']
+                  user_hash
+                end
+
+                def has_callback?
+                  true
+                end
+
+                # calculates and returns the url to which the user should be redirected,
+                # to get authenticated at the external provider's site.
+                def login_url(params,session)
+                  self.authorize_url({:authorize_url => @auth_path})
+                end
+
+                # tries to login the user from access token
+                def process_callback(params,session)
+                  args = {}
+                  args.merge!({:code => params[:code]}) if params[:code]
+                  options = {
+                    :token_url    => @token_path,
+                    :token_method => :post
+                  }
+                  @access_token = self.get_access_token(args, options)
+                end
+
+              end
+              init
+            end
+
+          end
+        end
+      end
+    end
+  end
+end

data/lib/sorcery/controller/submodules/http_basic_auth.rb

@@ -58,7 +58,7 @@ module Sorcery
               while current_controller != ActionController::Base
                 result = Config.controller_to_realm_map[current_controller.controller_name]
                 return result if result
-                current_controller = self.class.superclass
+                current_controller = current_controller.superclass
               end
               nil
             else

data/lib/sorcery/controller/submodules/remember_me.rb

@@ -8,6 +8,15 @@ module Sorcery
       module RememberMe
         def self.included(base)
           base.send(:include, InstanceMethods)
+          Config.module_eval do
+            class << self
+              attr_accessor :remember_me_httponly
+              def merge_remember_me_defaults!
+                @defaults.merge!(:@remember_me_httponly => true)
+              end
+            end
+            merge_remember_me_defaults!
+          end
           Config.login_sources << :login_from_cookie
           Config.after_login << :remember_me_if_asked_to
           Config.after_logout << :forget_me!
@@ -60,7 +69,7 @@ module Sorcery
             cookies.signed[:remember_me_token] = {
               :value => user.send(user.sorcery_config.remember_me_token_attribute_name),
               :expires => user.send(user.sorcery_config.remember_me_token_expires_at_attribute_name),
-              :httponly => true,
+              :httponly => Config.remember_me_httponly,
               :domain => Config.cookie_domain
             }
           end
@@ -69,4 +78,4 @@ module Sorcery
       end
     end
   end
-end
+end

data/lib/sorcery/model.rb

@@ -17,39 +17,39 @@ module Sorcery
               include InstanceMethods
               include TemporaryToken
             end
-            
+
             include_required_submodules!
 
             # This runs the options block set in the initializer on the model class.
             ::Sorcery::Controller::Config.user_config.tap{|blk| blk.call(@sorcery_config) if blk}
-            
+
             init_mongoid_support! if defined?(Mongoid) and self.ancestors.include?(Mongoid::Document)
             init_mongo_mapper_support! if defined?(MongoMapper) and self.ancestors.include?(MongoMapper::Document)
 
             init_orm_hooks!
-            
+
             @sorcery_config.after_config << :add_config_inheritance if @sorcery_config.subclasses_inherit_config
             @sorcery_config.after_config.each { |c| send(c) }
           end
-          
+
           protected
-          
-          # includes required submodules into the model class, 
+
+          # includes required submodules into the model class,
           # which usually is called User.
           def include_required_submodules!
             self.class_eval do
               @sorcery_config.submodules = ::Sorcery::Controller::Config.submodules
               @sorcery_config.submodules.each do |mod|
                 begin
-                  include Submodules.const_get(mod.to_s.split("_").map {|p| p.capitalize}.join("")) 
+                  include Submodules.const_get(mod.to_s.split("_").map {|p| p.capitalize}.join(""))
                 rescue NameError
-                  # don't stop on a missing submodule. Needed because some submodules are only defined 
+                  # don't stop on a missing submodule. Needed because some submodules are only defined
                   # in the controller side.
                 end
               end
             end
           end
-          
+
           # defines mongoid fields on the model class,
           # using 1.8.x hash syntax to perserve compatibility.
           def init_mongoid_support!
@@ -62,7 +62,7 @@ module Sorcery
               field sorcery_config.salt_attribute_name,             :type => String
             end
           end
-          
+
           # defines mongo_mapper fields on the model class,
           def init_mongo_mapper_support!
             self.class_eval do
@@ -91,13 +91,13 @@ module Sorcery
         end
       end
     end
-    
+
     module ClassMethods
       # Returns the class instance variable for configuration, when called by the class itself.
       def sorcery_config
         @sorcery_config
       end
-      
+
       # The default authentication method.
       # Takes a username and password,
       # Finds the user by the username and compares the user's password to the one supplied to the method.
@@ -112,17 +112,17 @@ module Sorcery
         _salt = user.send(@sorcery_config.salt_attribute_name) if user && !@sorcery_config.salt_attribute_name.nil? && !@sorcery_config.encryption_provider.nil?
         user if user && @sorcery_config.before_authenticate.all? {|c| user.send(c)} && credentials_match?(user.send(@sorcery_config.crypted_password_attribute_name),credentials[1],_salt)
       end
-      
+
       # encrypt tokens using current encryption_provider.
       def encrypt(*tokens)
         return tokens.first if @sorcery_config.encryption_provider.nil?
-        
+
         set_encryption_attributes()
 
         CryptoProviders::AES256.key = @sorcery_config.encryption_key
         @sorcery_config.encryption_provider.encrypt(*tokens)
       end
-      
+
       protected
 
       def set_encryption_attributes()
@@ -135,7 +135,7 @@ module Sorcery
         return crypted == tokens.join if @sorcery_config.encryption_provider.nil?
         @sorcery_config.encryption_provider.matches?(crypted, *tokens)
       end
-      
+
       def add_config_inheritance
         self.class_eval do
           def self.inherited(subclass)
@@ -149,23 +149,23 @@ module Sorcery
           end
         end
       end
-      
+
     end
-    
+
     module InstanceMethods
       # Returns the class instance variable for configuration, when called by an instance.
       def sorcery_config
         self.class.sorcery_config
       end
-      
+
       # identifies whether this user is regular, i.e. we hold his credentials in our db,
       # or that he is external, and his credentials are saved elsewhere (twitter/facebook etc.).
       def external?
         send(sorcery_config.crypted_password_attribute_name).nil?
       end
-      
+
       protected
-      
+
       # creates new salt and saves it.
       # encrypts password with salt and saves it.
       def encrypt_password
@@ -178,29 +178,29 @@ module Sorcery
         config = sorcery_config
         self.send(:"#{config.password_attribute_name}=", nil)
       end
-      
+
       # calls the requested email method on the configured mailer
       # supports both the ActionMailer 3 way of calling, and the plain old Ruby object way.
       def generic_send_email(method, mailer)
         config = sorcery_config
         mail = config.send(mailer).send(config.send(method),self)
-        if defined?(ActionMailer) and config.send(mailer).superclass == ActionMailer::Base
+        if defined?(ActionMailer) and config.send(mailer).kind_of?(Class) and config.send(mailer) < ActionMailer::Base
           mail.deliver
         end
       end
     end
 
     # Each class which calls 'activate_sorcery!' receives an instance of this class.
-    # Every submodule which gets loaded may add accessors to this class so that all 
+    # Every submodule which gets loaded may add accessors to this class so that all
     # options will be configured from a single place.
     class Config
 
       attr_accessor :username_attribute_names,           # change default username attribute, for example, to use :email
                                                         # as the login.
-                                                        
+
                     :password_attribute_name,           # change *virtual* password attribute, the one which is used
                                                         # until an encrypted one is generated.
-                                                        
+
                     :email_attribute_name,              # change default email attribute.
 
                     :downcase_username_before_authenticating, # downcase the username before trying to authenticate, default is false
@@ -211,17 +211,17 @@ module Sorcery
                     :stretches,                         # how many times to apply encryption to the password.
                     :encryption_key,                    # encryption key used to encrypt reversible encryptions such as
                                                         # AES256.
-                                                        
+
                     :subclasses_inherit_config,         # make this configuration inheritable for subclasses. Useful for
                                                         # ActiveRecord's STI.
-                    
+
                     :submodules,                        # configured in config/application.rb
                     :before_authenticate,               # an array of method names to call before authentication
                                                         # completes. used internally.
-                                                        
+
                     :after_config                       # an array of method names to call after configuration by user.
                                                         # used internally.
-                    
+
       attr_reader   :encryption_provider,               # change default encryption_provider.
                     :custom_encryption_provider,        # use an external encryption class.
                     :encryption_algorithm               # encryption algorithm name. See 'encryption_algorithm=' below
@@ -247,26 +247,26 @@ module Sorcery
           :@after_config                         => []
         }
         reset!
-      end     
-           
+      end
+
       # Resets all configuration options to their default values.
       def reset!
         @defaults.each do |k,v|
           instance_variable_set(k,v)
-        end       
+        end
       end
-      
+
       def username_attribute_names=(fields)
         @username_attribute_names = fields.kind_of?(Array) ? fields : [fields]
       end
-      
+
       def custom_encryption_provider=(provider)
         @custom_encryption_provider = @encryption_provider = provider
       end
-      
+
       def encryption_algorithm=(algo)
         @encryption_algorithm = algo
-        @encryption_provider = case @encryption_algorithm
+        @encryption_provider = case @encryption_algorithm.to_sym
         when :none   then nil
         when :md5    then CryptoProviders::MD5
         when :sha1   then CryptoProviders::SHA1
@@ -275,10 +275,11 @@ module Sorcery
         when :aes256 then CryptoProviders::AES256
         when :bcrypt then CryptoProviders::BCrypt
         when :custom then @custom_encryption_provider
+        else raise ArgumentError.new("Encryption algorithm supplied, #{algo}, is invalid")
         end
       end
-      
+
     end
-    
+
   end
 end

data/sorcery.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "sorcery"
-  s.version = "0.7.13"
+  s.version = "0.8.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Noam Ben Ari"]
-  s.date = "2012-07-22"
+  s.date = "2013-01-12"
   s.description = "Provides common authentication needs such as signing in/out, activating by email and resetting password."
   s.email = "nbenari@gmail.com"
   s.extra_rdoc_files = [
@@ -47,8 +47,10 @@ Gem::Specification.new do |s|
     "lib/sorcery/controller/submodules/external/providers/facebook.rb",
     "lib/sorcery/controller/submodules/external/providers/github.rb",
     "lib/sorcery/controller/submodules/external/providers/google.rb",
+    "lib/sorcery/controller/submodules/external/providers/linkedin.rb",
     "lib/sorcery/controller/submodules/external/providers/liveid.rb",
     "lib/sorcery/controller/submodules/external/providers/twitter.rb",
+    "lib/sorcery/controller/submodules/external/providers/vkontakte.rb",
     "lib/sorcery/controller/submodules/http_basic_auth.rb",
     "lib/sorcery/controller/submodules/remember_me.rb",
     "lib/sorcery/controller/submodules/session_timeout.rb",
@@ -310,7 +312,7 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<oauth>, ["~> 0.4.4"])
-      s.add_runtime_dependency(%q<oauth2>, ["~> 0.6.0"])
+      s.add_runtime_dependency(%q<oauth2>, ["~> 0.8.0"])
       s.add_runtime_dependency(%q<bcrypt-ruby>, ["~> 3.0.0"])
       s.add_development_dependency(%q<abstract>, [">= 1.0.0"])
       s.add_development_dependency(%q<rails>, [">= 3.0.0"])
@@ -329,7 +331,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<mongoid>, ["~> 2.4.4"])
     else
       s.add_dependency(%q<oauth>, ["~> 0.4.4"])
-      s.add_dependency(%q<oauth2>, ["~> 0.6.0"])
+      s.add_dependency(%q<oauth2>, ["~> 0.8.0"])
       s.add_dependency(%q<bcrypt-ruby>, ["~> 3.0.0"])
       s.add_dependency(%q<abstract>, [">= 1.0.0"])
       s.add_dependency(%q<rails>, [">= 3.0.0"])
@@ -349,7 +351,7 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<oauth>, ["~> 0.4.4"])
-    s.add_dependency(%q<oauth2>, ["~> 0.6.0"])
+    s.add_dependency(%q<oauth2>, ["~> 0.8.0"])
     s.add_dependency(%q<bcrypt-ruby>, ["~> 3.0.0"])
     s.add_dependency(%q<abstract>, [">= 1.0.0"])
     s.add_dependency(%q<rails>, [">= 3.0.0"])

data/spec/Gemfile

@@ -4,7 +4,7 @@ gem "rails", '3.0.3'
 gem 'bcrypt-ruby', :require => 'bcrypt'
 gem "sorcery", '>= 0.1.0', :path => '../'
 gem 'oauth', "~> 0.4.4"
-gem 'oauth2', "~> 0.6.0"
+gem 'oauth2', "~> 0.8.0"
 group :development do
   gem "rspec", "~> 2.5.0"
   gem 'ruby-debug19'

data/spec/Gemfile.lock

@@ -4,7 +4,7 @@ PATH
     sorcery (0.7.13)
       bcrypt-ruby (~> 3.0.0)
       oauth (~> 0.4.4)
-      oauth2 (~> 0.6.0)
+      oauth2 (~> 0.8.0)
 
 GEM
   remote: http://rubygems.org/
@@ -44,10 +44,12 @@ GEM
     diff-lcs (1.1.3)
     erubis (2.6.6)
       abstract (>= 1.0.0)
-    faraday (0.8.1)
+    faraday (0.8.4)
       multipart-post (~> 1.1)
-    httpauth (0.1)
+    httpauth (0.2.0)
     i18n (0.6.0)
+    jwt (0.1.5)
+      multi_json (>= 1.0)
     linecache19 (0.5.12)
       ruby_core_source (>= 0.1.4)
     mail (2.2.19)
@@ -59,10 +61,12 @@ GEM
     multi_json (1.1.0)
     multipart-post (1.1.5)
     oauth (0.4.5)
-    oauth2 (0.6.0)
-      faraday (~> 0.7)
+    oauth2 (0.8.0)
+      faraday (~> 0.8)
       httpauth (~> 0.1)
+      jwt (~> 0.1.4)
       multi_json (~> 1.0)
+      rack (~> 1.2)
     polyglot (0.3.3)
     rack (1.2.5)
     rack-mount (0.6.14)
@@ -117,7 +121,7 @@ PLATFORMS
 DEPENDENCIES
   bcrypt-ruby
   oauth (~> 0.4.4)
-  oauth2 (~> 0.6.0)
+  oauth2 (~> 0.8.0)
   rails (= 3.0.3)
   rspec (~> 2.5.0)
   ruby-debug19

data/spec/rails3/Gemfile.lock

@@ -4,7 +4,7 @@ PATH
     sorcery (0.7.13)
       bcrypt-ruby (~> 3.0.0)
       oauth (~> 0.4.4)
-      oauth2 (~> 0.6.0)
+      oauth2 (~> 0.8.0)
 
 GEM
   remote: http://rubygems.org/
@@ -54,11 +54,13 @@ GEM
     diff-lcs (1.1.3)
     erubis (2.6.6)
       abstract (>= 1.0.0)
-    faraday (0.8.1)
+    faraday (0.8.4)
       multipart-post (~> 1.1)
     ffi (1.0.11)
-    httpauth (0.1)
+    httpauth (0.2.0)
     i18n (0.6.0)
+    jwt (0.1.5)
+      multi_json (>= 1.0)
     launchy (2.0.5)
       addressable (~> 2.2.6)
     linecache19 (0.5.12)
@@ -72,11 +74,13 @@ GEM
     multi_json (1.1.0)
     multipart-post (1.1.5)
     nokogiri (1.5.0)
-    oauth (0.4.6)
-    oauth2 (0.6.0)
-      faraday (~> 0.7)
+    oauth (0.4.7)
+    oauth2 (0.8.0)
+      faraday (~> 0.8)
       httpauth (~> 0.1)
+      jwt (~> 0.1.4)
       multi_json (~> 1.0)
+      rack (~> 1.2)
     polyglot (0.3.3)
     rack (1.2.5)
     rack-mount (0.6.14)

data/spec/rails3_mongo_mapper/Gemfile.lock

@@ -4,7 +4,7 @@ PATH
     sorcery (0.7.13)
       bcrypt-ruby (~> 3.0.0)
       oauth (~> 0.4.4)
-      oauth2 (~> 0.6.0)
+      oauth2 (~> 0.8.0)
 
 GEM
   remote: http://rubygems.org/
@@ -48,10 +48,12 @@ GEM
     diff-lcs (1.1.3)
     erubis (2.6.6)
       abstract (>= 1.0.0)
-    faraday (0.8.1)
+    faraday (0.8.4)
       multipart-post (~> 1.1)
-    httpauth (0.1)
+    httpauth (0.2.0)
     i18n (0.6.0)
+    jwt (0.1.5)
+      multi_json (>= 1.0)
     linecache19 (0.5.12)
       ruby_core_source (>= 0.1.4)
     mail (2.2.19)
@@ -69,11 +71,13 @@ GEM
       plucky (~> 0.4.0)
     multi_json (1.1.0)
     multipart-post (1.1.5)
-    oauth (0.4.6)
-    oauth2 (0.6.0)
-      faraday (~> 0.7)
+    oauth (0.4.7)
+    oauth2 (0.8.0)
+      faraday (~> 0.8)
       httpauth (~> 0.1)
+      jwt (~> 0.1.4)
       multi_json (~> 1.0)
+      rack (~> 1.2)
     plucky (0.4.4)
       mongo (~> 1.5)
     polyglot (0.3.3)

data/spec/rails3_mongoid/Gemfile.lock

@@ -4,7 +4,7 @@ PATH
     sorcery (0.7.13)
       bcrypt-ruby (~> 3.0.0)
       oauth (~> 0.4.4)
-      oauth2 (~> 0.6.0)
+      oauth2 (~> 0.8.0)
 
 GEM
   remote: http://rubygems.org/
@@ -47,10 +47,12 @@ GEM
     diff-lcs (1.1.3)
     erubis (2.6.6)
       abstract (>= 1.0.0)
-    faraday (0.8.1)
+    faraday (0.8.4)
       multipart-post (~> 1.1)
-    httpauth (0.1)
+    httpauth (0.2.0)
     i18n (0.6.0)
+    jwt (0.1.5)
+      multi_json (>= 1.0)
     linecache19 (0.5.12)
       ruby_core_source (>= 0.1.4)
     mail (2.2.19)
@@ -67,11 +69,13 @@ GEM
       tzinfo (~> 0.3.22)
     multi_json (1.1.0)
     multipart-post (1.1.5)
-    oauth (0.4.6)
-    oauth2 (0.6.0)
-      faraday (~> 0.7)
+    oauth (0.4.7)
+    oauth2 (0.8.0)
+      faraday (~> 0.8)
       httpauth (~> 0.1)
+      jwt (~> 0.1.4)
       multi_json (~> 1.0)
+      rack (~> 1.2)
     polyglot (0.3.3)
     rack (1.2.5)
     rack-mount (0.6.14)

metadata

@@ -2,7 +2,7 @@
 name: sorcery
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.7.13
+  version: 0.8.0
 platform: ruby
 authors: 
 - Noam Ben Ari
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-22 00:00:00 Z
+date: 2013-01-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: oauth
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.6.0
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: *id002
@@ -250,8 +250,10 @@ files:
 - lib/sorcery/controller/submodules/external/providers/facebook.rb
 - lib/sorcery/controller/submodules/external/providers/github.rb
 - lib/sorcery/controller/submodules/external/providers/google.rb
+- lib/sorcery/controller/submodules/external/providers/linkedin.rb
 - lib/sorcery/controller/submodules/external/providers/liveid.rb
 - lib/sorcery/controller/submodules/external/providers/twitter.rb
+- lib/sorcery/controller/submodules/external/providers/vkontakte.rb
 - lib/sorcery/controller/submodules/http_basic_auth.rb
 - lib/sorcery/controller/submodules/remember_me.rb
 - lib/sorcery/controller/submodules/session_timeout.rb