sorcery 0.8.5 → 0.9.0

metadata

@@ -1,232 +1,163 @@
 --- !ruby/object:Gem::Specification
 name: sorcery
 version: !ruby/object:Gem::Version
-  version: 0.8.5
+  version: 0.9.0
 platform: ruby
 authors:
 - Noam Ben Ari
 - Kir Shatrov
+- Grzegorz Witek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-19 00:00:00.000000000 Z
+date: 2015-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.4
 - !ruby/object:Gem::Dependency
   name: oauth2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.0
-    - - <
-      - !ruby/object:Gem::Version
-        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.0
-    - - <
-      - !ruby/object:Gem::Version
-        version: 1.0.0
 - !ruby/object:Gem::Dependency
-  name: bcrypt-ruby
+  name: bcrypt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: abstract
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 3.2.15
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 3.2.15
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.7.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.7.7
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.5.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.5.0
-- !ruby/object:Gem::Dependency
-  name: rspec-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.5.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.5.0
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.0
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.8
 - !ruby/object:Gem::Dependency
-  name: timecop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: mongo_mapper
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
-  name: mongoid
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.4
+        version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.4
+        version: 3.0.0
 description: Provides common authentication needs such as signing in/out, activating
   by email and resetting password.
 email: nbenari@gmail.com
@@ -234,17 +165,22 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .document
-- .gitignore
-- .rspec
-- .travis.yml
+- ".document"
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
-- Gemfile.rails4
 - LICENSE.txt
 - README.md
 - Rakefile
-- VERSION
+- gemfiles/active_record-rails40.gemfile
+- gemfiles/active_record-rails41.gemfile
+- gemfiles/mongo_mapper-rails40.gemfile
+- gemfiles/mongo_mapper-rails41.gemfile
+- gemfiles/mongoid-rails40.gemfile
+- gemfiles/mongoid-rails41.gemfile
+- gemfiles/mongoid3-rails32.gemfile
 - lib/generators/sorcery/USAGE
 - lib/generators/sorcery/helpers.rb
 - lib/generators/sorcery/install_generator.rb
@@ -257,22 +193,16 @@ files:
 - lib/generators/sorcery/templates/migration/reset_password.rb
 - lib/generators/sorcery/templates/migration/user_activation.rb
 - lib/sorcery.rb
+- lib/sorcery/adapters/active_record_adapter.rb
+- lib/sorcery/adapters/base_adapter.rb
+- lib/sorcery/adapters/data_mapper_adapter.rb
+- lib/sorcery/adapters/mongo_mapper_adapter.rb
+- lib/sorcery/adapters/mongoid_adapter.rb
 - lib/sorcery/controller.rb
+- lib/sorcery/controller/config.rb
 - lib/sorcery/controller/submodules/activity_logging.rb
 - lib/sorcery/controller/submodules/brute_force_protection.rb
 - lib/sorcery/controller/submodules/external.rb
-- lib/sorcery/controller/submodules/external/protocols/certs/ca-bundle.crt
-- lib/sorcery/controller/submodules/external/protocols/oauth1.rb
-- lib/sorcery/controller/submodules/external/protocols/oauth2.rb
-- lib/sorcery/controller/submodules/external/providers/base.rb
-- 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/vk.rb
-- lib/sorcery/controller/submodules/external/providers/xing.rb
 - lib/sorcery/controller/submodules/http_basic_auth.rb
 - lib/sorcery/controller/submodules/remember_me.rb
 - lib/sorcery/controller/submodules/session_timeout.rb
@@ -285,9 +215,7 @@ files:
 - lib/sorcery/crypto_providers/sha512.rb
 - lib/sorcery/engine.rb
 - lib/sorcery/model.rb
-- lib/sorcery/model/adapters/active_record.rb
-- lib/sorcery/model/adapters/mongo_mapper.rb
-- lib/sorcery/model/adapters/mongoid.rb
+- lib/sorcery/model/config.rb
 - lib/sorcery/model/submodules/activity_logging.rb
 - lib/sorcery/model/submodules/brute_force_protection.rb
 - lib/sorcery/model/submodules/external.rb
@@ -295,21 +223,28 @@ files:
 - lib/sorcery/model/submodules/reset_password.rb
 - lib/sorcery/model/submodules/user_activation.rb
 - lib/sorcery/model/temporary_token.rb
+- lib/sorcery/protocols/certs/ca-bundle.crt
+- lib/sorcery/protocols/oauth.rb
+- lib/sorcery/protocols/oauth2.rb
+- lib/sorcery/providers/base.rb
+- lib/sorcery/providers/facebook.rb
+- lib/sorcery/providers/github.rb
+- lib/sorcery/providers/google.rb
+- lib/sorcery/providers/heroku.rb
+- lib/sorcery/providers/jira.rb
+- lib/sorcery/providers/linkedin.rb
+- lib/sorcery/providers/liveid.rb
+- lib/sorcery/providers/salesforce.rb
+- lib/sorcery/providers/twitter.rb
+- lib/sorcery/providers/vk.rb
+- lib/sorcery/providers/xing.rb
 - lib/sorcery/railties/tasks.rake
-- lib/sorcery/test_helpers.rb
 - lib/sorcery/test_helpers/internal.rb
 - lib/sorcery/test_helpers/internal/rails.rb
-- lib/sorcery/test_helpers/rails.rb
+- lib/sorcery/test_helpers/rails/controller.rb
+- lib/sorcery/test_helpers/rails/integration.rb
+- lib/sorcery/version.rb
 - sorcery.gemspec
-- spec/active_record/controller_activity_logging_spec.rb
-- spec/active_record/controller_brute_force_protection_spec.rb
-- spec/active_record/controller_http_basic_auth_spec.rb
-- spec/active_record/controller_oauth2_spec.rb
-- spec/active_record/controller_oauth_spec.rb
-- spec/active_record/controller_remember_me_spec.rb
-- spec/active_record/controller_session_timeout_spec.rb
-- spec/active_record/controller_spec.rb
-- spec/active_record/integration_spec.rb
 - spec/active_record/user_activation_spec.rb
 - spec/active_record/user_activity_logging_spec.rb
 - spec/active_record/user_brute_force_protection_spec.rb
@@ -317,7 +252,21 @@ files:
 - spec/active_record/user_remember_me_spec.rb
 - spec/active_record/user_reset_password_spec.rb
 - spec/active_record/user_spec.rb
-- spec/mongo_mapper/controller_spec.rb
+- spec/controllers/controller_activity_logging_spec.rb
+- spec/controllers/controller_brute_force_protection_spec.rb
+- spec/controllers/controller_http_basic_auth_spec.rb
+- spec/controllers/controller_oauth2_spec.rb
+- spec/controllers/controller_oauth_spec.rb
+- spec/controllers/controller_remember_me_spec.rb
+- spec/controllers/controller_session_timeout_spec.rb
+- spec/controllers/controller_spec.rb
+- spec/data_mapper/user_activation_spec.rb
+- spec/data_mapper/user_activity_logging_spec.rb
+- spec/data_mapper/user_brute_force_protection_spec.rb
+- spec/data_mapper/user_oauth_spec.rb
+- spec/data_mapper/user_remember_me_spec.rb
+- spec/data_mapper/user_reset_password_spec.rb
+- spec/data_mapper/user_spec.rb
 - spec/mongo_mapper/user_activation_spec.rb
 - spec/mongo_mapper/user_activity_logging_spec.rb
 - spec/mongo_mapper/user_brute_force_protection_spec.rb
@@ -325,8 +274,6 @@ files:
 - spec/mongo_mapper/user_remember_me_spec.rb
 - spec/mongo_mapper/user_reset_password_spec.rb
 - spec/mongo_mapper/user_spec.rb
-- spec/mongoid/controller_activity_logging_spec.rb
-- spec/mongoid/controller_spec.rb
 - spec/mongoid/user_activation_spec.rb
 - spec/mongoid/user_activity_logging_spec.rb
 - spec/mongoid/user_brute_force_protection_spec.rb
@@ -335,12 +282,15 @@ files:
 - spec/mongoid/user_reset_password_spec.rb
 - spec/mongoid/user_spec.rb
 - spec/orm/active_record.rb
+- spec/orm/data_mapper.rb
 - spec/orm/mongo_mapper.rb
 - spec/orm/mongoid.rb
 - spec/rails_app/app/active_record/authentication.rb
 - spec/rails_app/app/active_record/user.rb
 - spec/rails_app/app/active_record/user_provider.rb
 - spec/rails_app/app/controllers/sorcery_controller.rb
+- spec/rails_app/app/data_mapper/authentication.rb
+- spec/rails_app/app/data_mapper/user.rb
 - spec/rails_app/app/helpers/application_helper.rb
 - spec/rails_app/app/mailers/sorcery_mailer.rb
 - spec/rails_app/app/mongo_mapper/authentication.rb
@@ -380,21 +330,6 @@ files:
 - spec/rails_app/db/schema.rb
 - spec/rails_app/db/seeds.rb
 - spec/rails_app/log/development.log
-- spec/rails_app/public/404.html
-- spec/rails_app/public/422.html
-- spec/rails_app/public/500.html
-- spec/rails_app/public/favicon.ico
-- spec/rails_app/public/images/rails.png
-- spec/rails_app/public/javascripts/application.js
-- spec/rails_app/public/javascripts/controls.js
-- spec/rails_app/public/javascripts/dragdrop.js
-- spec/rails_app/public/javascripts/effects.js
-- spec/rails_app/public/javascripts/prototype.js
-- spec/rails_app/public/javascripts/rails.js
-- spec/rails_app/public/robots.txt
-- spec/rails_app/public/stylesheets/.gitkeep
-- spec/shared_examples/controller_oauth2_shared_examples.rb
-- spec/shared_examples/controller_oauth_shared_examples.rb
 - spec/shared_examples/user_activation_shared_examples.rb
 - spec/shared_examples/user_activity_logging_shared_examples.rb
 - spec/shared_examples/user_brute_force_protection_shared_examples.rb
@@ -415,19 +350,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: Magical authentication for Rails 3 applications
+summary: Magical authentication for Rails 3 & 4 applications
 test_files: []
-has_rdoc: 

data/Gemfile.rails4

@@ -1,24 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'oauth', "~> 0.4.4"
-gem 'oauth2', "~> 0.8.0"
-gem 'bcrypt-ruby', "~> 3.0.0"
-
-gem "rspec", "~> 2.14.0"
-gem 'rspec-rails', "~> 2.14.0"
-#gem 'ruby-debug19'
-gem 'sqlite3'
-gem "yard", "~> 0.6.0"
-gem "bundler", ">= 1.1.0"
-gem 'timecop'
-
-group :mongomapper do
-  gem 'mongo_mapper', github: 'jnunemaker/mongomapper'
-end
-
-group :mongoid do
-  gem 'mongoid', github: 'mongoid/mongoid', ref: 'f91feef0a0c6b83a1b878e154f1014536aa1c298'
-  gem 'bson_ext'
-end
-
-gem 'rails', '~> 4.0.1'

data/VERSION

@@ -1 +0,0 @@
-0.8.2

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

@@ -1,46 +0,0 @@
-require 'oauth'
-module Sorcery
-  module Controller
-    module Submodules
-      module External
-        module Protocols
-          module Oauth1
-            def oauth_version
-              "1.0"
-            end
-          
-            def get_request_token(token=nil,secret=nil)
-              return ::OAuth::RequestToken.new(get_consumer(), token, secret) if token && secret
-              
-              get_consumer.get_request_token(:oauth_callback => @callback_url)
-            end
-          
-            def authorize_url(args)
-              get_request_token(
-                args[:request_token],
-                args[:request_token_secret]
-              ).authorize_url({
-                :oauth_callback => @callback_url
-              })
-            end
-          
-            def get_access_token(args)
-              get_request_token(
-                args[:request_token],
-                args[:request_token_secret]
-              ).get_access_token({
-                :oauth_verifier => args[:oauth_verifier]
-              })
-            end
-          
-            protected
-          
-            def get_consumer
-              ::OAuth::Consumer.new(@key, @secret, :site => @site)
-            end
-          end
-        end
-      end
-    end
-  end
-end

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

@@ -1,50 +0,0 @@
-require 'oauth2'
-module Sorcery
-  module Controller
-    module Submodules
-      module External
-        module Protocols
-          module Oauth2
-            def oauth_version
-              "2.0"
-            end
-
-            def authorize_url(options = {})
-              client = build_client(options)
-              client.auth_code.authorize_url(
-                :redirect_uri => @callback_url,
-                :scope => @scope,
-                :display => @display,
-                :state => @state
-              )
-            end
-
-            def get_access_token(args, options = {})
-              client = build_client(options)
-              client.auth_code.get_token(
-                args[:code],
-                {
-                  :redirect_uri => @callback_url,
-                  :parse => options.delete(:parse)
-                },
-                options
-              )
-            end
-
-            def build_client(options = {})
-              defaults = {
-                :site => @site,
-                :ssl => { :ca_file => Config.ca_file }
-              }
-              ::OAuth2::Client.new(
-                @key,
-                @secret,
-                defaults.merge!(options)
-              )
-            end
-          end
-        end
-      end
-    end
-  end
-end

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

@@ -1,21 +0,0 @@
-module Sorcery
-  module Controller
-    module Submodules
-      module External
-        module Providers
-          module Base
-            module BaseClient
-              def self.included(base)
-                base.module_eval do
-                  class << self
-                    attr_accessor :original_callback_url
-                  end
-                end
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-end