Permalink
Browse files

all specs pass after downgrading oauth2 to 0.4.1

  • Loading branch information...
1 parent 24c88a9 commit 3094242f9921407bc375e28815d9c2294f71b36f @NoamB committed Oct 20, 2011
View
@@ -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
@@ -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
@@ -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
@@ -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
@@ -2,18 +2,19 @@ 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
def increment(attr)
self.inc(attr,1)
end
- def save!(options={})
- save(options={})
+ def save!(options = {})
+ save(options)
@kbighorse

kbighorse Oct 21, 2011

Collaborator

good call, missed that.

end
end
Oops, something went wrong.

0 comments on commit 3094242

Please sign in to comment.