Permalink
Browse files

some fixes, sinatra specs are broken

  • Loading branch information...
NoamB committed Oct 15, 2011
1 parent cfb5807 commit 9281f791b92a3846f4e9946802e84a39c1abc3e8
View
@@ -1,73 +1,71 @@
GEM
remote: http://rubygems.org/
specs:
- actionmailer (3.1.0)
- actionpack (= 3.1.0)
+ actionmailer (3.1.1)
+ actionpack (= 3.1.1)
mail (~> 2.3.0)
- actionpack (3.1.0)
- activemodel (= 3.1.0)
- activesupport (= 3.1.0)
+ actionpack (3.1.1)
+ activemodel (= 3.1.1)
+ activesupport (= 3.1.1)
builder (~> 3.0.0)
erubis (~> 2.7.0)
i18n (~> 0.6)
rack (~> 1.3.2)
- rack-cache (~> 1.0.3)
+ rack-cache (~> 1.1)
rack-mount (~> 0.8.2)
rack-test (~> 0.6.1)
- sprockets (~> 2.0.0)
- activemodel (3.1.0)
- activesupport (= 3.1.0)
- bcrypt-ruby (~> 3.0.0)
+ sprockets (~> 2.0.2)
+ activemodel (3.1.1)
+ activesupport (= 3.1.1)
builder (~> 3.0.0)
i18n (~> 0.6)
- activerecord (3.1.0)
- activemodel (= 3.1.0)
- activesupport (= 3.1.0)
+ activerecord (3.1.1)
+ activemodel (= 3.1.1)
+ activesupport (= 3.1.1)
arel (~> 2.2.1)
tzinfo (~> 0.3.29)
- activeresource (3.1.0)
- activemodel (= 3.1.0)
- activesupport (= 3.1.0)
- activesupport (3.1.0)
+ activeresource (3.1.1)
+ activemodel (= 3.1.1)
+ activesupport (= 3.1.1)
+ activesupport (3.1.1)
multi_json (~> 1.0)
addressable (2.2.6)
archive-tar-minitar (0.5.2)
arel (2.2.1)
- bcrypt-ruby (3.0.0)
- bson (1.3.1)
- bson_ext (1.3.1)
+ bson (1.4.0)
+ bson_ext (1.4.0)
builder (3.0.0)
columnize (0.3.4)
diff-lcs (1.1.3)
erubis (2.7.0)
- faraday (0.7.4)
+ faraday (0.7.5)
addressable (~> 2.2.6)
- multipart-post (~> 1.1.0)
- rack (>= 1.1.0, < 2)
+ multipart-post (~> 1.1.3)
+ rack (< 2, >= 1.1.0)
git (1.2.5)
hike (1.2.1)
i18n (0.6.0)
jeweler (1.5.2)
bundler (~> 1.0.0)
git (>= 1.2.5)
rake
- json (1.5.4)
+ json (1.6.1)
linecache19 (0.5.12)
ruby_core_source (>= 0.1.4)
mail (2.3.0)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.16)
- mongo (1.3.1)
- bson (>= 1.3.1)
+ mongo (1.4.0)
+ bson (= 1.4.0)
mongo_mapper (0.9.2)
activemodel (~> 3.0)
activesupport (~> 3.0)
plucky (~> 0.3.8)
- mongoid (2.2.0)
- activemodel (~> 3.0)
- mongo (~> 1.3)
+ mongoid (2.3.1)
+ activemodel (~> 3.1)
+ mongo (~> 1.4)
tzinfo (~> 0.3.22)
multi_json (1.0.3)
multipart-post (1.1.3)
@@ -78,32 +76,33 @@ GEM
plucky (0.3.8)
mongo (~> 1.3)
polyglot (0.3.2)
- rack (1.3.3)
- rack-cache (1.0.3)
+ rack (1.3.4)
+ rack-cache (1.1)
rack (>= 0.4)
rack-mount (0.8.3)
rack (>= 1.0.0)
rack-ssl (1.3.2)
rack
rack-test (0.6.1)
rack (>= 1.0)
- rails (3.1.0)
- actionmailer (= 3.1.0)
- actionpack (= 3.1.0)
- activerecord (= 3.1.0)
- activeresource (= 3.1.0)
- activesupport (= 3.1.0)
+ rails (3.1.1)
+ actionmailer (= 3.1.1)
+ actionpack (= 3.1.1)
+ activerecord (= 3.1.1)
+ activeresource (= 3.1.1)
+ activesupport (= 3.1.1)
bundler (~> 1.0)
- railties (= 3.1.0)
- railties (3.1.0)
- actionpack (= 3.1.0)
- activesupport (= 3.1.0)
+ railties (= 3.1.1)
+ railties (3.1.1)
+ actionpack (= 3.1.1)
+ activesupport (= 3.1.1)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (~> 0.14.6)
rake (0.9.2)
- rdoc (3.9.4)
+ rdoc (3.10)
+ json (~> 1.4)
rspec (2.5.0)
rspec-core (~> 2.5.0)
rspec-expectations (~> 2.5.0)
@@ -127,13 +126,14 @@ GEM
ruby-debug-base19 (>= 0.11.19)
ruby_core_source (0.1.5)
archive-tar-minitar (>= 0.5.2)
- simplecov (0.4.2)
- simplecov-html (~> 0.4.4)
- simplecov-html (0.4.5)
- sprockets (2.0.0)
+ simplecov (0.5.4)
+ multi_json (~> 1.0.3)
+ simplecov-html (~> 0.5.3)
+ simplecov-html (0.5.3)
+ sprockets (2.0.2)
hike (~> 1.2)
rack (~> 1.0)
- tilt (~> 1.1, != 1.3.0)
+ tilt (!= 1.3.0, ~> 1.1)
sqlite3 (1.3.4)
sqlite3-ruby (1.3.3)
sqlite3 (>= 1.3.3)
@@ -143,7 +143,7 @@ GEM
treetop (1.4.10)
polyglot
polyglot (>= 0.3.1)
- tzinfo (0.3.29)
+ tzinfo (0.3.30)
yard (0.6.8)
PLATFORMS
View
@@ -58,7 +58,7 @@ end
desc "Bundle all folders"
task :bundle do
sh "bundle"
- Dir['spec/**'].each do |dir|
+ Dir['spec', 'spec/**'].each do |dir|
if Dir.exists?(dir) && File.exists?(dir + "/Gemfile")
sh <<-CMD
cd #{dir}
@@ -67,3 +67,16 @@ task :bundle do
end
end
end
+
+desc "Bundle update all folders"
+task :bundle_update do
+ sh "bundle update"
+ Dir['spec', 'spec/**'].each do |dir|
+ if Dir.exists?(dir) && File.exists?(dir + "/Gemfile")
+ sh <<-CMD
+ cd #{dir}
+ bundle update
+ CMD
+ end
+ end
+end
View
@@ -24,9 +24,7 @@ def authenticates_with_sorcery!
::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)
- if defined?(MongoMapper) and self.ancestors.include?(MongoMapper::Document)
- init_mongo_mapper_support!
- end
+ init_mongo_mapper_support! if defined?(MongoMapper) and self.ancestors.include?(MongoMapper::Document)
init_orm_hooks!
@@ -71,9 +69,7 @@ def init_mongo_mapper_support!
sorcery_config.username_attribute_names.each do |username|
key username, String
end
- email_attribute = sorcery_config.email_attribute_name
- username_attributes = sorcery_config.username_attribute_names
- key sorcery_config.email_attribute_name, String unless username_attributes.include?(email_attribute)
+ key sorcery_config.email_attribute_name, String unless username_attributes.include?(sorcery_config.email_attribute_name)
key sorcery_config.crypted_password_attribute_name, String
key sorcery_config.salt_attribute_name, String
end
@@ -2,10 +2,9 @@ module Sorcery
module Model
module Adapters
module MongoMapper
- extend ActiveSupport::Concern
-
- included do
- include Sorcery::Model
+ def self.included(klass)
+ klass.extend ClassMethods
+ klass.send(:include, InstanceMethods)
end
module InstanceMethods
View
@@ -1,10 +1,12 @@
PATH
remote: ../
specs:
- sorcery (0.6.1)
+ sorcery (0.7.0)
bcrypt-ruby (~> 3.0.0)
oauth (~> 0.4.4)
- oauth2 (~> 0.5.0)
+ oauth (~> 0.4.4)
+ oauth2 (~> 0.5.1)
+ oauth2 (~> 0.5.1)
GEM
remote: http://rubygems.org/
View
@@ -40,7 +40,7 @@ GEM
activesupport (3.0.3)
addressable (2.2.6)
archive-tar-minitar (0.5.2)
- arel (2.0.6)
+ arel (2.0.10)
bcrypt-ruby (3.0.1)
builder (2.1.2)
capybara (1.1.1)
@@ -52,39 +52,39 @@ GEM
xpath (~> 0.1.4)
childprocess (0.2.2)
ffi (~> 1.0.6)
- columnize (0.3.2)
- diff-lcs (1.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)
- rack (>= 1.1.0, < 2)
+ rack (< 2, >= 1.1.0)
ffi (1.0.9)
- i18n (0.5.0)
- json_pure (1.5.1)
+ i18n (0.6.0)
+ json_pure (1.6.1)
launchy (2.0.5)
addressable (~> 2.2.6)
- linecache19 (0.5.11)
+ linecache19 (0.5.12)
ruby_core_source (>= 0.1.4)
- mail (2.2.13)
+ mail (2.2.19)
activesupport (>= 2.3.6)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.16)
multi_json (1.0.3)
multipart-post (1.1.3)
- nokogiri (1.4.4)
+ nokogiri (1.5.0)
oauth (0.4.5)
oauth2 (0.5.1)
faraday (~> 0.7.4)
multi_json (~> 1.0.3)
- polyglot (0.3.1)
- rack (1.2.1)
- rack-mount (0.6.13)
+ polyglot (0.3.2)
+ rack (1.2.4)
+ rack-mount (0.6.14)
rack (>= 1.0.0)
- rack-test (0.5.6)
+ rack-test (0.5.7)
rack (>= 1.0)
rails (3.0.3)
actionmailer (= 3.0.3)
@@ -99,12 +99,12 @@ GEM
activesupport (= 3.0.3)
rake (>= 0.8.7)
thor (~> 0.14.4)
- rake (0.8.7)
+ rake (0.9.2)
rspec (2.5.0)
rspec-core (~> 2.5.0)
rspec-expectations (~> 2.5.0)
rspec-mocks (~> 2.5.0)
- rspec-core (2.5.1)
+ rspec-core (2.5.2)
rspec-expectations (2.5.0)
diff-lcs (~> 1.1.2)
rspec-mocks (2.5.0)
@@ -113,31 +113,35 @@ GEM
activesupport (~> 3.0)
railties (~> 3.0)
rspec (~> 2.5.0)
- ruby-debug-base19 (0.11.24)
+ ruby-debug-base19 (0.11.25)
columnize (>= 0.3.1)
linecache19 (>= 0.5.11)
ruby_core_source (>= 0.1.4)
ruby-debug19 (0.11.6)
columnize (>= 0.3.1)
linecache19 (>= 0.5.11)
ruby-debug-base19 (>= 0.11.19)
- ruby_core_source (0.1.4)
+ ruby_core_source (0.1.5)
archive-tar-minitar (>= 0.5.2)
rubyzip (0.9.4)
- selenium-webdriver (2.6.0)
+ selenium-webdriver (2.8.0)
childprocess (>= 0.2.1)
ffi (>= 1.0.7)
json_pure
rubyzip
- simplecov (0.3.9)
- simplecov-html (>= 0.3.7)
- simplecov-html (0.3.9)
- sqlite3-ruby (1.3.2)
+ simplecov (0.5.4)
+ multi_json (~> 1.0.3)
+ simplecov-html (~> 0.5.3)
+ simplecov-html (0.5.3)
+ sqlite3 (1.3.4)
+ sqlite3-ruby (1.3.3)
+ sqlite3 (>= 1.3.3)
thor (0.14.6)
timecop (0.3.5)
- treetop (1.4.9)
+ treetop (1.4.10)
+ polyglot
polyglot (>= 0.3.1)
- tzinfo (0.3.23)
+ tzinfo (0.3.30)
xpath (0.1.4)
nokogiri (~> 1.3)
@@ -53,7 +53,7 @@ GEM
faraday (0.7.5)
addressable (~> 2.2.6)
multipart-post (~> 1.1.3)
- rack (>= 1.1.0, < 2)
+ rack (< 2, >= 1.1.0)
i18n (0.6.0)
linecache19 (0.5.12)
ruby_core_source (>= 0.1.4)
@@ -130,7 +130,7 @@ GEM
ruby_parser (2.0.6)
sexp_processor (~> 3.0)
sexp_processor (3.0.7)
- simplecov (0.5.3)
+ simplecov (0.5.4)
multi_json (~> 1.0.3)
simplecov-html (~> 0.5.3)
simplecov-html (0.5.3)
Oops, something went wrong.

0 comments on commit 9281f79

Please sign in to comment.