Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

all specs pass after downgrading oauth2 to 0.4.1

  • Loading branch information...
commit 3094242f9921407bc375e28815d9c2294f71b36f 1 parent 24c88a9
@NoamB authored
View
2  Gemfile
@@ -3,7 +3,7 @@ source "http://rubygems.org"
# Example:
# gem "activesupport", ">= 2.3.5"
gem 'oauth', "~> 0.4.4"
-gem 'oauth2', "~> 0.5.1"
+gem 'oauth2', "~> 0.4.1"
gem 'mongo_mapper'
# Add dependencies to develop your gem here.
View
30 Gemfile.lock
@@ -32,15 +32,15 @@ GEM
addressable (2.2.6)
archive-tar-minitar (0.5.2)
arel (2.2.1)
- bson (1.4.0)
- bson_ext (1.4.0)
+ bson (1.4.1)
+ bson_ext (1.4.1)
builder (3.0.0)
columnize (0.3.4)
diff-lcs (1.1.3)
erubis (2.7.0)
- faraday (0.7.5)
- addressable (~> 2.2.6)
- multipart-post (~> 1.1.3)
+ faraday (0.6.1)
+ addressable (~> 2.2.4)
+ multipart-post (~> 1.1.0)
rack (>= 1.1.0, < 2)
git (1.2.5)
hike (1.2.1)
@@ -57,26 +57,26 @@ GEM
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.16)
- mongo (1.4.0)
- bson (= 1.4.0)
+ mongo (1.4.1)
+ bson (= 1.4.1)
mongo_mapper (0.9.2)
activemodel (~> 3.0)
activesupport (~> 3.0)
plucky (~> 0.3.8)
- mongoid (2.3.1)
+ mongoid (2.3.2)
activemodel (~> 3.1)
mongo (~> 1.4)
tzinfo (~> 0.3.22)
multi_json (1.0.3)
multipart-post (1.1.3)
oauth (0.4.5)
- oauth2 (0.5.1)
- faraday (~> 0.7.4)
- multi_json (~> 1.0.3)
+ oauth2 (0.4.1)
+ faraday (~> 0.6.1)
+ multi_json (>= 0.0.5)
plucky (0.3.8)
mongo (~> 1.3)
polyglot (0.3.2)
- rack (1.3.4)
+ rack (1.3.5)
rack-cache (1.1)
rack (>= 0.4)
rack-mount (0.8.3)
@@ -101,7 +101,7 @@ GEM
rdoc (~> 3.4)
thor (~> 0.14.6)
rake (0.9.2)
- rdoc (3.10)
+ rdoc (3.11)
json (~> 1.4)
rspec (2.5.0)
rspec-core (~> 2.5.0)
@@ -130,7 +130,7 @@ GEM
multi_json (~> 1.0.3)
simplecov-html (~> 0.5.3)
simplecov-html (0.5.3)
- sprockets (2.0.2)
+ sprockets (2.0.3)
hike (~> 1.2)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
@@ -157,7 +157,7 @@ DEPENDENCIES
mongo_mapper
mongoid (~> 2.0)
oauth (~> 0.4.4)
- oauth2 (~> 0.5.1)
+ oauth2 (~> 0.4.1)
rails (>= 3.0.0)
rspec (~> 2.5.0)
rspec-rails (~> 2.5.0)
View
2  Rakefile
@@ -27,7 +27,7 @@ Jeweler::Tasks.new do |gem|
# gem.add_development_dependency 'rspec', '> 1.2.3'
gem.add_runtime_dependency 'bcrypt-ruby', '~> 3.0.0'
gem.add_runtime_dependency 'oauth', '~> 0.4.4'
- gem.add_runtime_dependency 'oauth2', '~> 0.5.1'
+ gem.add_runtime_dependency 'oauth2', '~> 0.4.1'
end
Jeweler::RubygemsDotOrgTasks.new
View
2  lib/sorcery/model.rb
@@ -69,7 +69,7 @@ def init_mongo_mapper_support!
sorcery_config.username_attribute_names.each do |username|
key username, String
end
- key sorcery_config.email_attribute_name, String unless username_attributes.include?(sorcery_config.email_attribute_name)
+ key sorcery_config.email_attribute_name, String unless sorcery_config.username_attribute_names.include?(sorcery_config.email_attribute_name)
key sorcery_config.crypted_password_attribute_name, String
key sorcery_config.salt_attribute_name, String
end
View
11 lib/sorcery/model/adapters/mongo_mapper.rb
@@ -2,9 +2,10 @@ module Sorcery
module Model
module Adapters
module MongoMapper
- def self.included(klass)
- klass.extend ClassMethods
- klass.send(:include, InstanceMethods)
+ extend ActiveSupport::Concern
+
+ included do
+ include Sorcery::Model
end
module InstanceMethods
@@ -12,8 +13,8 @@ def increment(attr)
self.inc(attr,1)
end
- def save!(options={})
- save(options={})
+ def save!(options = {})
+ save(options)
@kbighorse Collaborator

good call, missed that.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
end
end
View
294 sorcery.gemspec
@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
s.authors = ["Noam Ben Ari"]
- s.date = "2011-09-30"
+ s.date = "2011-10-20"
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 = [
@@ -25,14 +25,16 @@ Gem::Specification.new do |s|
"README.rdoc",
"Rakefile",
"VERSION",
- "lib/generators/sorcery_migration/sorcery_migration_generator.rb",
- "lib/generators/sorcery_migration/templates/activity_logging.rb",
- "lib/generators/sorcery_migration/templates/brute_force_protection.rb",
- "lib/generators/sorcery_migration/templates/core.rb",
- "lib/generators/sorcery_migration/templates/external.rb",
- "lib/generators/sorcery_migration/templates/remember_me.rb",
- "lib/generators/sorcery_migration/templates/reset_password.rb",
- "lib/generators/sorcery_migration/templates/user_activation.rb",
+ "lib/generators/sorcery/USAGE",
+ "lib/generators/sorcery/install_generator.rb",
+ "lib/generators/sorcery/templates/initializer.rb",
+ "lib/generators/sorcery/templates/migration/activity_logging.rb",
+ "lib/generators/sorcery/templates/migration/brute_force_protection.rb",
+ "lib/generators/sorcery/templates/migration/core.rb",
+ "lib/generators/sorcery/templates/migration/external.rb",
+ "lib/generators/sorcery/templates/migration/remember_me.rb",
+ "lib/generators/sorcery/templates/migration/reset_password.rb",
+ "lib/generators/sorcery/templates/migration/user_activation.rb",
"lib/sorcery.rb",
"lib/sorcery/controller.rb",
"lib/sorcery/controller/adapters/sinatra.rb",
@@ -56,9 +58,9 @@ Gem::Specification.new do |s|
"lib/sorcery/crypto_providers/sha256.rb",
"lib/sorcery/crypto_providers/sha512.rb",
"lib/sorcery/engine.rb",
- "lib/sorcery/initializers/initializer.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/submodules/activity_logging.rb",
"lib/sorcery/model/submodules/brute_force_protection.rb",
@@ -68,26 +70,19 @@ Gem::Specification.new do |s|
"lib/sorcery/model/submodules/user_activation.rb",
"lib/sorcery/model/temporary_token.rb",
"lib/sorcery/railties/tasks.rake",
- "lib/sorcery/sinatra.rb",
"lib/sorcery/test_helpers.rb",
"lib/sorcery/test_helpers/internal.rb",
"lib/sorcery/test_helpers/internal/rails.rb",
- "lib/sorcery/test_helpers/internal/sinatra.rb",
- "lib/sorcery/test_helpers/internal/sinatra_modular.rb",
"lib/sorcery/test_helpers/rails.rb",
- "lib/sorcery/test_helpers/sinatra.rb",
"sorcery.gemspec",
"spec/Gemfile",
- "spec/Gemfile.lock",
"spec/README.md",
"spec/Rakefile",
"spec/rails3/.gitignore",
"spec/rails3/.rspec",
"spec/rails3/Gemfile",
- "spec/rails3/Gemfile.lock",
"spec/rails3/README",
"spec/rails3/Rakefile",
- "spec/rails3/Rakefile.unused",
"spec/rails3/app/controllers/application_controller.rb",
"spec/rails3/app/helpers/application_helper.rb",
"spec/rails3/app/mailers/sorcery_mailer.rb",
@@ -161,10 +156,70 @@ Gem::Specification.new do |s|
"spec/rails3/spec/user_reset_password_spec.rb",
"spec/rails3/spec/user_spec.rb",
"spec/rails3/vendor/plugins/.gitkeep",
+ "spec/rails3_mongo_mapper/.gitignore",
+ "spec/rails3_mongo_mapper/.rspec",
+ "spec/rails3_mongo_mapper/Gemfile",
+ "spec/rails3_mongo_mapper/Rakefile",
+ "spec/rails3_mongo_mapper/app/controllers/application_controller.rb",
+ "spec/rails3_mongo_mapper/app/helpers/application_helper.rb",
+ "spec/rails3_mongo_mapper/app/mailers/sorcery_mailer.rb",
+ "spec/rails3_mongo_mapper/app/models/authentication.rb",
+ "spec/rails3_mongo_mapper/app/models/user.rb",
+ "spec/rails3_mongo_mapper/app/views/layouts/application.html.erb",
+ "spec/rails3_mongo_mapper/app/views/sorcery_mailer/activation_email.html.erb",
+ "spec/rails3_mongo_mapper/app/views/sorcery_mailer/activation_email.text.erb",
+ "spec/rails3_mongo_mapper/app/views/sorcery_mailer/activation_success_email.html.erb",
+ "spec/rails3_mongo_mapper/app/views/sorcery_mailer/activation_success_email.text.erb",
+ "spec/rails3_mongo_mapper/app/views/sorcery_mailer/reset_password_email.html.erb",
+ "spec/rails3_mongo_mapper/app/views/sorcery_mailer/reset_password_email.text.erb",
+ "spec/rails3_mongo_mapper/config.ru",
+ "spec/rails3_mongo_mapper/config/application.rb",
+ "spec/rails3_mongo_mapper/config/boot.rb",
+ "spec/rails3_mongo_mapper/config/environment.rb",
+ "spec/rails3_mongo_mapper/config/environments/development.rb",
+ "spec/rails3_mongo_mapper/config/environments/in_memory.rb",
+ "spec/rails3_mongo_mapper/config/environments/production.rb",
+ "spec/rails3_mongo_mapper/config/environments/test.rb",
+ "spec/rails3_mongo_mapper/config/initializers/backtrace_silencers.rb",
+ "spec/rails3_mongo_mapper/config/initializers/inflections.rb",
+ "spec/rails3_mongo_mapper/config/initializers/mime_types.rb",
+ "spec/rails3_mongo_mapper/config/initializers/mongo.rb",
+ "spec/rails3_mongo_mapper/config/initializers/secret_token.rb",
+ "spec/rails3_mongo_mapper/config/initializers/session_store.rb",
+ "spec/rails3_mongo_mapper/config/locales/en.yml",
+ "spec/rails3_mongo_mapper/config/routes.rb",
+ "spec/rails3_mongo_mapper/db/schema.rb",
+ "spec/rails3_mongo_mapper/db/seeds.rb",
+ "spec/rails3_mongo_mapper/lib/tasks/.gitkeep",
+ "spec/rails3_mongo_mapper/public/404.html",
+ "spec/rails3_mongo_mapper/public/422.html",
+ "spec/rails3_mongo_mapper/public/500.html",
+ "spec/rails3_mongo_mapper/public/favicon.ico",
+ "spec/rails3_mongo_mapper/public/images/rails.png",
+ "spec/rails3_mongo_mapper/public/javascripts/application.js",
+ "spec/rails3_mongo_mapper/public/javascripts/controls.js",
+ "spec/rails3_mongo_mapper/public/javascripts/dragdrop.js",
+ "spec/rails3_mongo_mapper/public/javascripts/effects.js",
+ "spec/rails3_mongo_mapper/public/javascripts/prototype.js",
+ "spec/rails3_mongo_mapper/public/javascripts/rails.js",
+ "spec/rails3_mongo_mapper/public/robots.txt",
+ "spec/rails3_mongo_mapper/public/stylesheets/.gitkeep",
+ "spec/rails3_mongo_mapper/script/rails",
+ "spec/rails3_mongo_mapper/spec/controller_spec.rb",
+ "spec/rails3_mongo_mapper/spec/spec.opts",
+ "spec/rails3_mongo_mapper/spec/spec_helper.orig.rb",
+ "spec/rails3_mongo_mapper/spec/spec_helper.rb",
+ "spec/rails3_mongo_mapper/spec/user_activation_spec.rb",
+ "spec/rails3_mongo_mapper/spec/user_activity_logging_spec.rb",
+ "spec/rails3_mongo_mapper/spec/user_brute_force_protection_spec.rb",
+ "spec/rails3_mongo_mapper/spec/user_oauth_spec.rb",
+ "spec/rails3_mongo_mapper/spec/user_remember_me_spec.rb",
+ "spec/rails3_mongo_mapper/spec/user_reset_password_spec.rb",
+ "spec/rails3_mongo_mapper/spec/user_spec.rb",
+ "spec/rails3_mongo_mapper/vendor/plugins/.gitkeep",
"spec/rails3_mongoid/.gitignore",
"spec/rails3_mongoid/.rspec",
"spec/rails3_mongoid/Gemfile",
- "spec/rails3_mongoid/Gemfile.lock",
"spec/rails3_mongoid/Rakefile",
"spec/rails3_mongoid/app/controllers/application_controller.rb",
"spec/rails3_mongoid/app/helpers/application_helper.rb",
@@ -232,60 +287,6 @@ Gem::Specification.new do |s|
"spec/shared_examples/user_remember_me_shared_examples.rb",
"spec/shared_examples/user_reset_password_shared_examples.rb",
"spec/shared_examples/user_shared_examples.rb",
- "spec/sinatra/Gemfile",
- "spec/sinatra/Gemfile.lock",
- "spec/sinatra/Rakefile",
- "spec/sinatra/authentication.rb",
- "spec/sinatra/db/migrate/activation/20101224223622_add_activation_to_users.rb",
- "spec/sinatra/db/migrate/activity_logging/20101224223624_add_activity_logging_to_users.rb",
- "spec/sinatra/db/migrate/brute_force_protection/20101224223626_add_brute_force_protection_to_users.rb",
- "spec/sinatra/db/migrate/core/20101224223620_create_users.rb",
- "spec/sinatra/db/migrate/external/20101224223628_create_authentications.rb",
- "spec/sinatra/db/migrate/remember_me/20101224223623_add_remember_me_token_to_users.rb",
- "spec/sinatra/db/migrate/reset_password/20101224223622_add_reset_password_to_users.rb",
- "spec/sinatra/filters.rb",
- "spec/sinatra/modular.rb",
- "spec/sinatra/myapp.rb",
- "spec/sinatra/sorcery_mailer.rb",
- "spec/sinatra/spec/controller_activity_logging_spec.rb",
- "spec/sinatra/spec/controller_brute_force_protection_spec.rb",
- "spec/sinatra/spec/controller_http_basic_auth_spec.rb",
- "spec/sinatra/spec/controller_oauth2_spec.rb",
- "spec/sinatra/spec/controller_oauth_spec.rb",
- "spec/sinatra/spec/controller_remember_me_spec.rb",
- "spec/sinatra/spec/controller_session_timeout_spec.rb",
- "spec/sinatra/spec/controller_spec.rb",
- "spec/sinatra/spec/spec.opts",
- "spec/sinatra/spec/spec_helper.rb",
- "spec/sinatra/user.rb",
- "spec/sinatra/views/test_login.erb",
- "spec/sinatra_modular/Gemfile",
- "spec/sinatra_modular/Gemfile.lock",
- "spec/sinatra_modular/Rakefile",
- "spec/sinatra_modular/authentication.rb",
- "spec/sinatra_modular/db/migrate/activation/20101224223622_add_activation_to_users.rb",
- "spec/sinatra_modular/db/migrate/activity_logging/20101224223624_add_activity_logging_to_users.rb",
- "spec/sinatra_modular/db/migrate/brute_force_protection/20101224223626_add_brute_force_protection_to_users.rb",
- "spec/sinatra_modular/db/migrate/core/20101224223620_create_users.rb",
- "spec/sinatra_modular/db/migrate/external/20101224223628_create_authentications.rb",
- "spec/sinatra_modular/db/migrate/remember_me/20101224223623_add_remember_me_token_to_users.rb",
- "spec/sinatra_modular/db/migrate/reset_password/20101224223622_add_reset_password_to_users.rb",
- "spec/sinatra_modular/filters.rb",
- "spec/sinatra_modular/modular.rb",
- "spec/sinatra_modular/myapp.rb",
- "spec/sinatra_modular/sorcery_mailer.rb",
- "spec/sinatra_modular/spec_modular/controller_activity_logging_spec.rb",
- "spec/sinatra_modular/spec_modular/controller_brute_force_protection_spec.rb",
- "spec/sinatra_modular/spec_modular/controller_http_basic_auth_spec.rb",
- "spec/sinatra_modular/spec_modular/controller_oauth2_spec.rb",
- "spec/sinatra_modular/spec_modular/controller_oauth_spec.rb",
- "spec/sinatra_modular/spec_modular/controller_remember_me_spec.rb",
- "spec/sinatra_modular/spec_modular/controller_session_timeout_spec.rb",
- "spec/sinatra_modular/spec_modular/controller_spec.rb",
- "spec/sinatra_modular/spec_modular/spec.opts",
- "spec/sinatra_modular/spec_modular/spec_helper.rb",
- "spec/sinatra_modular/user.rb",
- "spec/sinatra_modular/views/test_login.erb",
"spec/sorcery_crypto_providers_spec.rb",
"spec/spec.opts",
"spec/spec_helper.rb"
@@ -293,147 +294,16 @@ Gem::Specification.new do |s|
s.homepage = "http://github.com/NoamB/sorcery"
s.licenses = ["MIT"]
s.require_paths = ["lib"]
- s.rubygems_version = "1.8.10"
+ s.rubygems_version = "1.8.11"
s.summary = "Magical authentication for Rails 3 applications"
- s.test_files = [
- "spec/rails3/app/controllers/application_controller.rb",
- "spec/rails3/app/helpers/application_helper.rb",
- "spec/rails3/app/mailers/sorcery_mailer.rb",
- "spec/rails3/app/models/authentication.rb",
- "spec/rails3/app/models/user.rb",
- "spec/rails3/config/application.rb",
- "spec/rails3/config/boot.rb",
- "spec/rails3/config/environment.rb",
- "spec/rails3/config/environments/development.rb",
- "spec/rails3/config/environments/in_memory.rb",
- "spec/rails3/config/environments/production.rb",
- "spec/rails3/config/environments/test.rb",
- "spec/rails3/config/initializers/backtrace_silencers.rb",
- "spec/rails3/config/initializers/inflections.rb",
- "spec/rails3/config/initializers/mime_types.rb",
- "spec/rails3/config/initializers/secret_token.rb",
- "spec/rails3/config/initializers/session_store.rb",
- "spec/rails3/config/routes.rb",
- "spec/rails3/db/migrate/activation/20101224223622_add_activation_to_users.rb",
- "spec/rails3/db/migrate/activity_logging/20101224223624_add_activity_logging_to_users.rb",
- "spec/rails3/db/migrate/brute_force_protection/20101224223626_add_brute_force_protection_to_users.rb",
- "spec/rails3/db/migrate/core/20101224223620_create_users.rb",
- "spec/rails3/db/migrate/external/20101224223628_create_authentications.rb",
- "spec/rails3/db/migrate/remember_me/20101224223623_add_remember_me_token_to_users.rb",
- "spec/rails3/db/migrate/reset_password/20101224223622_add_reset_password_to_users.rb",
- "spec/rails3/db/schema.rb",
- "spec/rails3/db/seeds.rb",
- "spec/rails3/spec/controller_activity_logging_spec.rb",
- "spec/rails3/spec/controller_brute_force_protection_spec.rb",
- "spec/rails3/spec/controller_http_basic_auth_spec.rb",
- "spec/rails3/spec/controller_oauth2_spec.rb",
- "spec/rails3/spec/controller_oauth_spec.rb",
- "spec/rails3/spec/controller_remember_me_spec.rb",
- "spec/rails3/spec/controller_session_timeout_spec.rb",
- "spec/rails3/spec/controller_spec.rb",
- "spec/rails3/spec/integration_spec.rb",
- "spec/rails3/spec/spec_helper.orig.rb",
- "spec/rails3/spec/spec_helper.rb",
- "spec/rails3/spec/user_activation_spec.rb",
- "spec/rails3/spec/user_activity_logging_spec.rb",
- "spec/rails3/spec/user_brute_force_protection_spec.rb",
- "spec/rails3/spec/user_oauth_spec.rb",
- "spec/rails3/spec/user_remember_me_spec.rb",
- "spec/rails3/spec/user_reset_password_spec.rb",
- "spec/rails3/spec/user_spec.rb",
- "spec/rails3_mongoid/app/controllers/application_controller.rb",
- "spec/rails3_mongoid/app/helpers/application_helper.rb",
- "spec/rails3_mongoid/app/mailers/sorcery_mailer.rb",
- "spec/rails3_mongoid/app/models/authentication.rb",
- "spec/rails3_mongoid/app/models/user.rb",
- "spec/rails3_mongoid/config/application.rb",
- "spec/rails3_mongoid/config/boot.rb",
- "spec/rails3_mongoid/config/environment.rb",
- "spec/rails3_mongoid/config/environments/development.rb",
- "spec/rails3_mongoid/config/environments/in_memory.rb",
- "spec/rails3_mongoid/config/environments/production.rb",
- "spec/rails3_mongoid/config/environments/test.rb",
- "spec/rails3_mongoid/config/initializers/backtrace_silencers.rb",
- "spec/rails3_mongoid/config/initializers/inflections.rb",
- "spec/rails3_mongoid/config/initializers/mime_types.rb",
- "spec/rails3_mongoid/config/initializers/secret_token.rb",
- "spec/rails3_mongoid/config/initializers/session_store.rb",
- "spec/rails3_mongoid/config/routes.rb",
- "spec/rails3_mongoid/db/schema.rb",
- "spec/rails3_mongoid/db/seeds.rb",
- "spec/rails3_mongoid/spec/controller_spec.rb",
- "spec/rails3_mongoid/spec/spec_helper.orig.rb",
- "spec/rails3_mongoid/spec/spec_helper.rb",
- "spec/rails3_mongoid/spec/user_activation_spec.rb",
- "spec/rails3_mongoid/spec/user_activity_logging_spec.rb",
- "spec/rails3_mongoid/spec/user_brute_force_protection_spec.rb",
- "spec/rails3_mongoid/spec/user_oauth_spec.rb",
- "spec/rails3_mongoid/spec/user_remember_me_spec.rb",
- "spec/rails3_mongoid/spec/user_reset_password_spec.rb",
- "spec/rails3_mongoid/spec/user_spec.rb",
- "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",
- "spec/shared_examples/user_oauth_shared_examples.rb",
- "spec/shared_examples/user_remember_me_shared_examples.rb",
- "spec/shared_examples/user_reset_password_shared_examples.rb",
- "spec/shared_examples/user_shared_examples.rb",
- "spec/sinatra/authentication.rb",
- "spec/sinatra/db/migrate/activation/20101224223622_add_activation_to_users.rb",
- "spec/sinatra/db/migrate/activity_logging/20101224223624_add_activity_logging_to_users.rb",
- "spec/sinatra/db/migrate/brute_force_protection/20101224223626_add_brute_force_protection_to_users.rb",
- "spec/sinatra/db/migrate/core/20101224223620_create_users.rb",
- "spec/sinatra/db/migrate/external/20101224223628_create_authentications.rb",
- "spec/sinatra/db/migrate/remember_me/20101224223623_add_remember_me_token_to_users.rb",
- "spec/sinatra/db/migrate/reset_password/20101224223622_add_reset_password_to_users.rb",
- "spec/sinatra/filters.rb",
- "spec/sinatra/modular.rb",
- "spec/sinatra/myapp.rb",
- "spec/sinatra/sorcery_mailer.rb",
- "spec/sinatra/spec/controller_activity_logging_spec.rb",
- "spec/sinatra/spec/controller_brute_force_protection_spec.rb",
- "spec/sinatra/spec/controller_http_basic_auth_spec.rb",
- "spec/sinatra/spec/controller_oauth2_spec.rb",
- "spec/sinatra/spec/controller_oauth_spec.rb",
- "spec/sinatra/spec/controller_remember_me_spec.rb",
- "spec/sinatra/spec/controller_session_timeout_spec.rb",
- "spec/sinatra/spec/controller_spec.rb",
- "spec/sinatra/spec/spec_helper.rb",
- "spec/sinatra/user.rb",
- "spec/sinatra_modular/authentication.rb",
- "spec/sinatra_modular/db/migrate/activation/20101224223622_add_activation_to_users.rb",
- "spec/sinatra_modular/db/migrate/activity_logging/20101224223624_add_activity_logging_to_users.rb",
- "spec/sinatra_modular/db/migrate/brute_force_protection/20101224223626_add_brute_force_protection_to_users.rb",
- "spec/sinatra_modular/db/migrate/core/20101224223620_create_users.rb",
- "spec/sinatra_modular/db/migrate/external/20101224223628_create_authentications.rb",
- "spec/sinatra_modular/db/migrate/remember_me/20101224223623_add_remember_me_token_to_users.rb",
- "spec/sinatra_modular/db/migrate/reset_password/20101224223622_add_reset_password_to_users.rb",
- "spec/sinatra_modular/filters.rb",
- "spec/sinatra_modular/modular.rb",
- "spec/sinatra_modular/myapp.rb",
- "spec/sinatra_modular/sorcery_mailer.rb",
- "spec/sinatra_modular/spec_modular/controller_activity_logging_spec.rb",
- "spec/sinatra_modular/spec_modular/controller_brute_force_protection_spec.rb",
- "spec/sinatra_modular/spec_modular/controller_http_basic_auth_spec.rb",
- "spec/sinatra_modular/spec_modular/controller_oauth2_spec.rb",
- "spec/sinatra_modular/spec_modular/controller_oauth_spec.rb",
- "spec/sinatra_modular/spec_modular/controller_remember_me_spec.rb",
- "spec/sinatra_modular/spec_modular/controller_session_timeout_spec.rb",
- "spec/sinatra_modular/spec_modular/controller_spec.rb",
- "spec/sinatra_modular/spec_modular/spec_helper.rb",
- "spec/sinatra_modular/user.rb",
- "spec/sorcery_crypto_providers_spec.rb",
- "spec/spec_helper.rb"
- ]
if s.respond_to? :specification_version then
s.specification_version = 3
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.5.1"])
+ s.add_runtime_dependency(%q<oauth2>, ["~> 0.4.1"])
+ s.add_runtime_dependency(%q<mongo_mapper>, [">= 0"])
s.add_development_dependency(%q<rails>, [">= 3.0.0"])
s.add_development_dependency(%q<json>, [">= 1.5.1"])
s.add_development_dependency(%q<mongoid>, ["~> 2.0"])
@@ -449,10 +319,11 @@ Gem::Specification.new do |s|
s.add_development_dependency(%q<timecop>, [">= 0"])
s.add_runtime_dependency(%q<bcrypt-ruby>, ["~> 3.0.0"])
s.add_runtime_dependency(%q<oauth>, ["~> 0.4.4"])
- s.add_runtime_dependency(%q<oauth2>, ["~> 0.5.1"])
+ s.add_runtime_dependency(%q<oauth2>, ["~> 0.4.1"])
else
s.add_dependency(%q<oauth>, ["~> 0.4.4"])
- s.add_dependency(%q<oauth2>, ["~> 0.5.1"])
+ s.add_dependency(%q<oauth2>, ["~> 0.4.1"])
+ s.add_dependency(%q<mongo_mapper>, [">= 0"])
s.add_dependency(%q<rails>, [">= 3.0.0"])
s.add_dependency(%q<json>, [">= 1.5.1"])
s.add_dependency(%q<mongoid>, ["~> 2.0"])
@@ -468,11 +339,12 @@ Gem::Specification.new do |s|
s.add_dependency(%q<timecop>, [">= 0"])
s.add_dependency(%q<bcrypt-ruby>, ["~> 3.0.0"])
s.add_dependency(%q<oauth>, ["~> 0.4.4"])
- s.add_dependency(%q<oauth2>, ["~> 0.5.1"])
+ s.add_dependency(%q<oauth2>, ["~> 0.4.1"])
end
else
s.add_dependency(%q<oauth>, ["~> 0.4.4"])
- s.add_dependency(%q<oauth2>, ["~> 0.5.1"])
+ s.add_dependency(%q<oauth2>, ["~> 0.4.1"])
+ s.add_dependency(%q<mongo_mapper>, [">= 0"])
s.add_dependency(%q<rails>, [">= 3.0.0"])
s.add_dependency(%q<json>, [">= 1.5.1"])
s.add_dependency(%q<mongoid>, ["~> 2.0"])
@@ -488,7 +360,7 @@ Gem::Specification.new do |s|
s.add_dependency(%q<timecop>, [">= 0"])
s.add_dependency(%q<bcrypt-ruby>, ["~> 3.0.0"])
s.add_dependency(%q<oauth>, ["~> 0.4.4"])
- s.add_dependency(%q<oauth2>, ["~> 0.5.1"])
+ s.add_dependency(%q<oauth2>, ["~> 0.4.1"])
end
end
View
2  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.5.1"
+gem 'oauth2', "~> 0.4.1"
group :development do
gem "rspec", "~> 2.5.0"
gem 'ruby-debug19'
View
28 spec/Gemfile.lock
@@ -3,10 +3,11 @@ PATH
specs:
sorcery (0.7.0)
bcrypt-ruby (~> 3.0.0)
+ mongo_mapper
oauth (~> 0.4.4)
oauth (~> 0.4.4)
- oauth2 (~> 0.5.1)
- oauth2 (~> 0.5.1)
+ oauth2 (~> 0.4.1)
+ oauth2 (~> 0.4.1)
@avakhov
avakhov added a note

Why do you duplicate outh & outh2 gems in gem spec file?

@NoamB Owner
NoamB added a note

I don't know, I think it's bundler's work.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
GEM
remote: http://rubygems.org/
@@ -42,14 +43,15 @@ GEM
archive-tar-minitar (0.5.2)
arel (2.0.10)
bcrypt-ruby (3.0.1)
+ bson (1.4.1)
builder (2.1.2)
columnize (0.3.4)
diff-lcs (1.1.3)
erubis (2.6.6)
abstract (>= 1.0.0)
- faraday (0.7.5)
- addressable (~> 2.2.6)
- multipart-post (~> 1.1.3)
+ faraday (0.6.1)
+ addressable (~> 2.2.4)
+ multipart-post (~> 1.1.0)
rack (>= 1.1.0, < 2)
i18n (0.6.0)
linecache19 (0.5.12)
@@ -60,12 +62,20 @@ GEM
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.16)
+ mongo (1.4.1)
+ bson (= 1.4.1)
+ mongo_mapper (0.9.2)
+ activemodel (~> 3.0)
+ activesupport (~> 3.0)
+ plucky (~> 0.3.8)
multi_json (1.0.3)
multipart-post (1.1.3)
oauth (0.4.5)
- oauth2 (0.5.1)
- faraday (~> 0.7.4)
- multi_json (~> 1.0.3)
+ oauth2 (0.4.1)
+ faraday (~> 0.6.1)
+ multi_json (>= 0.0.5)
+ plucky (0.3.8)
+ mongo (~> 1.3)
polyglot (0.3.2)
rack (1.2.4)
rack-mount (0.6.14)
@@ -120,7 +130,7 @@ PLATFORMS
DEPENDENCIES
bcrypt-ruby
oauth (~> 0.4.4)
- oauth2 (~> 0.5.1)
+ oauth2 (~> 0.4.1)
rails (= 3.0.3)
rspec (~> 2.5.0)
ruby-debug19
View
2  spec/rails3/Gemfile
@@ -2,7 +2,7 @@ source 'http://rubygems.org'
gem 'rails', '3.0.3'
gem 'sqlite3-ruby', :require => 'sqlite3'
-gem "sorcery", '>= 0.1.0', :path => '../../../'
+gem "sorcery", '>= 0.1.0', :path => '../../'
group :development, :test do
gem "rspec", "~> 2.5.0"
View
30 spec/rails3/Gemfile.lock
@@ -1,12 +1,13 @@
PATH
- remote: ../../../
+ remote: ../../
specs:
sorcery (0.7.0)
bcrypt-ruby (~> 3.0.0)
+ mongo_mapper
oauth (~> 0.4.4)
oauth (~> 0.4.4)
- oauth2 (~> 0.5.1)
- oauth2 (~> 0.5.1)
+ oauth2 (~> 0.4.1)
+ oauth2 (~> 0.4.1)
GEM
remote: http://rubygems.org/
@@ -42,6 +43,7 @@ GEM
archive-tar-minitar (0.5.2)
arel (2.0.10)
bcrypt-ruby (3.0.1)
+ bson (1.4.1)
builder (2.1.2)
capybara (1.1.1)
mime-types (>= 1.16)
@@ -56,11 +58,11 @@ GEM
diff-lcs (1.1.3)
erubis (2.6.6)
abstract (>= 1.0.0)
- faraday (0.7.5)
- addressable (~> 2.2.6)
- multipart-post (~> 1.1.3)
+ faraday (0.6.1)
+ addressable (~> 2.2.4)
+ multipart-post (~> 1.1.0)
rack (>= 1.1.0, < 2)
- ffi (1.0.9)
+ ffi (1.0.10)
i18n (0.6.0)
json_pure (1.6.1)
launchy (2.0.5)
@@ -73,13 +75,21 @@ GEM
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.16)
+ mongo (1.4.1)
+ bson (= 1.4.1)
+ mongo_mapper (0.9.2)
+ activemodel (~> 3.0)
+ activesupport (~> 3.0)
+ plucky (~> 0.3.8)
multi_json (1.0.3)
multipart-post (1.1.3)
nokogiri (1.5.0)
oauth (0.4.5)
- oauth2 (0.5.1)
- faraday (~> 0.7.4)
- multi_json (~> 1.0.3)
+ oauth2 (0.4.1)
+ faraday (~> 0.6.1)
+ multi_json (>= 0.0.5)
+ plucky (0.3.8)
+ mongo (~> 1.3)
polyglot (0.3.2)
rack (1.2.4)
rack-mount (0.6.14)
View
7 spec/rails3/Rakefile.unused
@@ -1,7 +0,0 @@
-# Add your own tasks in files placed in lib/tasks ending in .rake,
-# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
-
-require File.expand_path('../config/application', __FILE__)
-require 'rake'
-
-AppRoot::Application.load_tasks
View
4 spec/rails3/spec/spec_helper.rb
@@ -5,7 +5,7 @@
ENV["RAILS_ENV"] ||= 'in_memory'
require File.expand_path("../../config/environment", __FILE__)
require 'rspec/rails'
-require 'capybara/rspec'
+#require 'capybara/rspec'
require 'timecop'
# require 'simplecov'
# SimpleCov.root File.join(File.dirname(__FILE__), "..", "..", "rails3" )
@@ -24,8 +24,6 @@
# in spec/support/ and its subdirectories.
Dir[Rails.root.join("spec/support/**/*.rb")].each {|f| require f}
-
-
RSpec.configure do |config|
config.include RSpec::Rails::ControllerExampleGroup, :example_group => { :file_path => /controller(.)*_spec.rb$/ }
# == Mock Framework
View
2  spec/rails3_mongo_mapper/Gemfile
@@ -1,7 +1,7 @@
source 'http://rubygems.org'
gem 'rails', '3.0.3'
-gem "sorcery", '>= 0.1.0', :path => '../../../'
+gem "sorcery", '>= 0.1.0', :path => '../../'
gem "mongo_mapper"
gem "bson_ext", "~> 1.3"
View
27 spec/rails3_mongo_mapper/Gemfile.lock
@@ -1,12 +1,13 @@
PATH
- remote: ../../../
+ remote: ../../
specs:
sorcery (0.7.0)
bcrypt-ruby (~> 3.0.0)
+ mongo_mapper
oauth (~> 0.4.4)
oauth (~> 0.4.4)
- oauth2 (~> 0.5.1)
- oauth2 (~> 0.5.1)
+ oauth2 (~> 0.4.1)
+ oauth2 (~> 0.4.1)
GEM
remote: http://rubygems.org/
@@ -42,17 +43,17 @@ GEM
archive-tar-minitar (0.5.2)
arel (2.0.10)
bcrypt-ruby (3.0.1)
- bson (1.4.0)
- bson_ext (1.4.0)
+ bson (1.4.1)
+ bson_ext (1.4.1)
builder (2.1.2)
coderay (0.9.8)
columnize (0.3.4)
diff-lcs (1.1.3)
erubis (2.6.6)
abstract (>= 1.0.0)
- faraday (0.7.5)
- addressable (~> 2.2.6)
- multipart-post (~> 1.1.3)
+ faraday (0.6.1)
+ addressable (~> 2.2.4)
+ multipart-post (~> 1.1.0)
rack (>= 1.1.0, < 2)
i18n (0.6.0)
linecache19 (0.5.12)
@@ -65,8 +66,8 @@ GEM
method_source (0.6.6)
ruby_parser (~> 2.0.5)
mime-types (1.16)
- mongo (1.4.0)
- bson (= 1.4.0)
+ mongo (1.4.1)
+ bson (= 1.4.1)
mongo_mapper (0.9.2)
activemodel (~> 3.0)
activesupport (~> 3.0)
@@ -74,9 +75,9 @@ GEM
multi_json (1.0.3)
multipart-post (1.1.3)
oauth (0.4.5)
- oauth2 (0.5.1)
- faraday (~> 0.7.4)
- multi_json (~> 1.0.3)
+ oauth2 (0.4.1)
+ faraday (~> 0.6.1)
+ multi_json (>= 0.0.5)
plucky (0.3.8)
mongo (~> 1.3)
polyglot (0.3.2)
View
2  spec/rails3_mongoid/Gemfile
@@ -1,7 +1,7 @@
source 'http://rubygems.org'
gem 'rails', '3.0.3'
-gem "sorcery", '>= 0.1.0', :path => '../../../'
+gem "sorcery", '>= 0.1.0', :path => '../../'
gem "mongoid", "~> 2.0"
gem "bson_ext", "~> 1.3"
View
33 spec/rails3_mongoid/Gemfile.lock
@@ -1,12 +1,13 @@
PATH
- remote: ../../../
+ remote: ../../
specs:
sorcery (0.7.0)
bcrypt-ruby (~> 3.0.0)
+ mongo_mapper
oauth (~> 0.4.4)
oauth (~> 0.4.4)
- oauth2 (~> 0.5.1)
- oauth2 (~> 0.5.1)
+ oauth2 (~> 0.4.1)
+ oauth2 (~> 0.4.1)
GEM
remote: http://rubygems.org/
@@ -42,16 +43,16 @@ GEM
archive-tar-minitar (0.5.2)
arel (2.0.10)
bcrypt-ruby (3.0.1)
- bson (1.4.0)
- bson_ext (1.4.0)
+ bson (1.4.1)
+ bson_ext (1.4.1)
builder (2.1.2)
columnize (0.3.4)
diff-lcs (1.1.3)
erubis (2.6.6)
abstract (>= 1.0.0)
- faraday (0.7.5)
- addressable (~> 2.2.6)
- multipart-post (~> 1.1.3)
+ faraday (0.6.1)
+ addressable (~> 2.2.4)
+ multipart-post (~> 1.1.0)
rack (>= 1.1.0, < 2)
i18n (0.6.0)
linecache19 (0.5.12)
@@ -62,8 +63,12 @@ GEM
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.16)
- mongo (1.4.0)
- bson (= 1.4.0)
+ mongo (1.4.1)
+ bson (= 1.4.1)
+ mongo_mapper (0.9.2)
+ activemodel (~> 3.0)
+ activesupport (~> 3.0)
+ plucky (~> 0.3.8)
mongoid (2.2.3)
activemodel (~> 3.0)
mongo (~> 1.3)
@@ -71,9 +76,11 @@ GEM
multi_json (1.0.3)
multipart-post (1.1.3)
oauth (0.4.5)
- oauth2 (0.5.1)
- faraday (~> 0.7.4)
- multi_json (~> 1.0.3)
+ oauth2 (0.4.1)
+ faraday (~> 0.6.1)
+ multi_json (>= 0.0.5)
+ plucky (0.3.8)
+ mongo (~> 1.3)
polyglot (0.3.2)
rack (1.2.4)
rack-mount (0.6.14)
@kbighorse

good call, missed that.

@avakhov

Why do you duplicate outh & outh2 gems in gem spec file?

@NoamB

I don't know, I think it's bundler's work.

Please sign in to comment.
Something went wrong with that request. Please try again.