sorcery 0.7.6 → 0.8.0

data/.travis.yml

@@ -0,0 +1,3 @@
+language: ruby
+rvm:
+  - 1.9.2

data/Gemfile

@@ -1,13 +1,15 @@
-source "http://rubygems.org"
+source :rubygems
 # Add dependencies required to use your gem here.
 # Example:
 #   gem "activesupport", ">= 2.3.5"
 gem 'oauth', "~> 0.4.4"
-gem 'oauth2', "~> 0.5.1"
+gem 'oauth2', "~> 0.8.0"
+gem 'bcrypt-ruby', "~> 3.0.0"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
+  gem 'abstract', '>= 1.0.0'
   gem "rails", ">= 3.0.0"
   gem 'json', ">= 1.5.1"
   gem "rspec", "~> 2.5.0"
@@ -15,8 +17,11 @@ group :development do
   gem 'ruby-debug19'
   gem 'sqlite3-ruby', :require => 'sqlite3'
   gem "yard", "~> 0.6.0"
-  gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.5.2"
+  gem "bundler", ">= 1.1.0"
+  gem "jeweler", "~> 1.8.3"
   gem 'simplecov', '>= 0.3.8', :require => false # Will install simplecov-html as a dependency
   gem 'timecop'
+  gem 'capybara'
+  gem 'mongo_mapper'
+  gem 'mongoid', "~> 2.4.4"
 end

data/Gemfile.lock

@@ -1,87 +1,115 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.1.3)
-      actionpack (= 3.1.3)
-      mail (~> 2.3.0)
-    actionpack (3.1.3)
-      activemodel (= 3.1.3)
-      activesupport (= 3.1.3)
+    abstract (1.0.0)
+    actionmailer (3.2.2)
+      actionpack (= 3.2.2)
+      mail (~> 2.4.0)
+    actionpack (3.2.2)
+      activemodel (= 3.2.2)
+      activesupport (= 3.2.2)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
-      i18n (~> 0.6)
-      rack (~> 1.3.5)
+      journey (~> 1.0.1)
+      rack (~> 1.4.0)
       rack-cache (~> 1.1)
-      rack-mount (~> 0.8.2)
       rack-test (~> 0.6.1)
-      sprockets (~> 2.0.3)
-    activemodel (3.1.3)
-      activesupport (= 3.1.3)
+      sprockets (~> 2.1.2)
+    activemodel (3.2.2)
+      activesupport (= 3.2.2)
       builder (~> 3.0.0)
-      i18n (~> 0.6)
-    activerecord (3.1.3)
-      activemodel (= 3.1.3)
-      activesupport (= 3.1.3)
-      arel (~> 2.2.1)
+    activerecord (3.2.2)
+      activemodel (= 3.2.2)
+      activesupport (= 3.2.2)
+      arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.1.3)
-      activemodel (= 3.1.3)
-      activesupport (= 3.1.3)
-    activesupport (3.1.3)
+    activeresource (3.2.2)
+      activemodel (= 3.2.2)
+      activesupport (= 3.2.2)
+    activesupport (3.2.2)
+      i18n (~> 0.6)
       multi_json (~> 1.0)
-    addressable (2.2.6)
     archive-tar-minitar (0.5.2)
-    arel (2.2.1)
+    arel (3.0.2)
+    bcrypt-ruby (3.0.1)
+    bson (1.6.1)
     builder (3.0.0)
+    capybara (1.1.2)
+      mime-types (>= 1.16)
+      nokogiri (>= 1.3.3)
+      rack (>= 1.0.0)
+      rack-test (>= 0.5.4)
+      selenium-webdriver (~> 2.0)
+      xpath (~> 0.1.4)
+    childprocess (0.3.1)
+      ffi (~> 1.0.6)
     columnize (0.3.6)
     diff-lcs (1.1.3)
     erubis (2.7.0)
-    faraday (0.7.5)
-      addressable (~> 2.2.6)
-      multipart-post (~> 1.1.3)
-      rack (>= 1.1.0, < 2)
+    faraday (0.8.4)
+      multipart-post (~> 1.1)
+    ffi (1.0.11)
     git (1.2.5)
     hike (1.2.1)
+    httpauth (0.2.0)
     i18n (0.6.0)
-    jeweler (1.5.2)
-      bundler (~> 1.0.0)
+    jeweler (1.8.3)
+      bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    json (1.6.3)
+      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.3.0)
+    mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.17.2)
-    multi_json (1.0.4)
-    multipart-post (1.1.4)
+    mime-types (1.18)
+    mongo (1.6.1)
+      bson (~> 1.6.1)
+    mongo_mapper (0.11.1)
+      activemodel (~> 3.0)
+      activesupport (~> 3.0)
+      plucky (~> 0.4.0)
+    mongoid (2.4.7)
+      activemodel (~> 3.1)
+      mongo (~> 1.3)
+      tzinfo (~> 0.3.22)
+    multi_json (1.3.2)
+    multipart-post (1.1.5)
+    nokogiri (1.5.2)
     oauth (0.4.5)
-    oauth2 (0.5.1)
-      faraday (~> 0.7.4)
-      multi_json (~> 1.0.3)
+    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)
-    rack (1.3.5)
-    rack-cache (1.1)
+    rack (1.4.1)
+    rack-cache (1.2)
       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.3)
-      actionmailer (= 3.1.3)
-      actionpack (= 3.1.3)
-      activerecord (= 3.1.3)
-      activeresource (= 3.1.3)
-      activesupport (= 3.1.3)
+    rails (3.2.2)
+      actionmailer (= 3.2.2)
+      actionpack (= 3.2.2)
+      activerecord (= 3.2.2)
+      activeresource (= 3.2.2)
+      activesupport (= 3.2.2)
       bundler (~> 1.0)
-      railties (= 3.1.3)
-    railties (3.1.3)
-      actionpack (= 3.1.3)
-      activesupport (= 3.1.3)
+      railties (= 3.2.2)
+    railties (3.2.2)
+      actionpack (= 3.2.2)
+      activesupport (= 3.2.2)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
@@ -112,11 +140,17 @@ GEM
       ruby-debug-base19 (>= 0.11.19)
     ruby_core_source (0.1.5)
       archive-tar-minitar (>= 0.5.2)
-    simplecov (0.5.4)
-      multi_json (~> 1.0.3)
+    rubyzip (0.9.6.1)
+    selenium-webdriver (2.20.0)
+      childprocess (>= 0.2.5)
+      ffi (~> 1.0)
+      multi_json (~> 1.0)
+      rubyzip
+    simplecov (0.6.1)
+      multi_json (~> 1.0)
       simplecov-html (~> 0.5.3)
     simplecov-html (0.5.3)
-    sprockets (2.0.3)
+    sprockets (2.1.2)
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
@@ -129,18 +163,25 @@ GEM
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.31)
+    tzinfo (0.3.32)
+    xpath (0.1.4)
+      nokogiri (~> 1.3)
     yard (0.6.8)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.0.0)
-  jeweler (~> 1.5.2)
+  abstract (>= 1.0.0)
+  bcrypt-ruby (~> 3.0.0)
+  bundler (>= 1.1.0)
+  capybara
+  jeweler (~> 1.8.3)
   json (>= 1.5.1)
+  mongo_mapper
+  mongoid (~> 2.4.4)
   oauth (~> 0.4.4)
-  oauth2 (~> 0.5.1)
+  oauth2 (~> 0.8.0)
   rails (>= 3.0.0)
   rspec (~> 2.5.0)
   rspec-rails (~> 2.5.0)

data/README.rdoc

@@ -1,3 +1,5 @@
+{<img src="https://secure.travis-ci.org/NoamB/sorcery.png" />}[http://travis-ci.org/NoamB/sorcery]
+
 = sorcery
 Magical Authentication for Rails 3.
 Supports ActiveRecord, Mongoid and MongoMapper.
@@ -5,7 +7,6 @@ Supports ActiveRecord, Mongoid and MongoMapper.
 Inspired by restful_authentication, Authlogic and Devise.
 Crypto code taken almost unchanged from Authlogic.
 OAuth code inspired by OmniAuth and Ryan Bates's railscasts about it.
- 
 
 == Philosophy
 
@@ -28,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.6/frames
+Documentation: http://rubydoc.info/gems/sorcery/0.8.0/frames
 
 Check out the tutorials in the github wiki!
 
@@ -82,15 +83,15 @@ Please see the tutorials in the github wiki for detailed usage information.
 
 If using bundler, first add 'sorcery' to your Gemfile:
 
-	gem "sorcery"
+    gem "sorcery"
 
-And run 
-	
-	bundle install
+And run
+
+    bundle install
 
 Otherwise simply
 
-	gem install sorcery
+    gem install sorcery
 
 
 == Rails 3 Configuration:
@@ -113,10 +114,34 @@ This will generate the core migration file, the initializer and change the model
 
 This will generate only the migration files for the specified submodules and will
 add them to the initializer file.
-    
+
 Inside the initializer, the comments will tell you what each setting does.
 
 
+== DelayedJob Integration
+
+By default emails are sent synchronously. You can send them asynchronously by using the 
+[delayed_job gem](https://github.com/collectiveidea/delayed_job).
+
+After implementing the `delayed_job` into your project add the code below at the end of 
+the `config/initializers/sorcery.rb` file. After that all emails will be sent asynchronously.
+
+  module Sorcery
+    module Model
+      module InstanceMethods
+        def generic_send_email(method, mailer)
+          config = sorcery_config
+          mail = config.send(mailer).delay.send(config.send(method), self)
+        end
+      end
+    end
+  end
+
+
+== Single Table Inheritance (STI) Support
+STI is supported via a single setting in config/initializers/sorcery.rb.
+
+
 == Full Features List by module:
 
 

data/Rakefile

@@ -25,9 +25,6 @@ Jeweler::Tasks.new do |gem|
   # and development dependencies are only needed for development (ie running rake tasks, tests, etc)
   #  gem.add_runtime_dependency 'jabber4r', '> 0.1'
   #  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'
 end
 Jeweler::RubygemsDotOrgTasks.new
 
@@ -46,12 +43,14 @@ task :default => :all_sorcery_specs
 
 desc "Run all sorcery specs"
 task :all_sorcery_specs do
+  # we need to be empty, otherwise bundler will use parent bundler.
+  env = {
+    'BUNDLE_GEMFILE' => nil,
+    'GEM_HOME'       => nil
+  }
   Dir['spec/**/Rakefile'].each do |rakefile|
     directory_name = File.dirname(rakefile)
-    sh <<-CMD
-      cd #{directory_name}
-      bundle exec rake
-    CMD
+    system(env, "cd #{directory_name} && bundle && bundle exec rake")
   end
 end
 

data/VERSION

@@ -1 +1 @@
-0.7.6
+0.8.0

data/lib/generators/sorcery/install_generator.rb

@@ -24,16 +24,18 @@ module Sorcery
       def configure_initializer_file
         # Add submodules to the initializer file.
         if submodules
-          str = submodules.collect{ |submodule| ':' + submodule + ', ' }
-          str.last.delete!(", ")
-          
-          gsub_file "config/initializers/sorcery.rb", /submodules = \[\]/, "submodules = [#{str.join()}]"
+          submodule_names = submodules.collect{ |submodule| ':' + submodule }
+
+          gsub_file "config/initializers/sorcery.rb", /submodules = \[.*\]/ do |str|
+            current_submodule_names = (str =~ /\[(.*)\]/ ? $1 : '').delete(' ').split(',')
+            "submodules = [#{(current_submodule_names | submodule_names).join(', ')}]"
+          end
         end
 
         # Generate the model and add 'authenticates_with_sorcery!' unless you passed --migrations
         unless options[:migrations]
           generate "model #{model_class_name} --skip-migration"
-          insert_into_file "app/models/#{model_class_name.downcase}.rb", "  authenticates_with_sorcery!\n", :after => "class #{model_class_name} < ActiveRecord::Base\n"
+          insert_into_file "app/models/#{model_class_name.underscore}.rb", "  authenticates_with_sorcery!\n", :after => "class #{model_class_name} < ActiveRecord::Base\n"
         end
       end
 
@@ -66,9 +68,9 @@ module Sorcery
       
       private
 
-      # Either return the model passed in a capitalized form or return the default "User".
+      # Either return the model passed in a classified form or return the default "User".
       def model_class_name
-        options[:model] ? options[:model].capitalize : "User"
+        options[:model] ? options[:model].classify : "User"
       end
     end
   end