Merge commit 'scrum8/master'

Conflicts:
	devise_invitable.gemspec

Rakefile

@@ -12,7 +12,7 @@ begin
     gem.authors = ["Sergio Cambra"]
     gem.add_development_dependency 'mocha'
     gem.add_development_dependency 'webrat'
-    gem.add_dependency 'devise', '~> 1.0.6'
+    gem.add_dependency 'devise', '>= 1.0.6'
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

VERSION

@@ -1 +1 @@
-0.2.3
+0.2.5

devise_invitable.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{devise_invitable}
-  s.version = "0.2.3"
+  s.version = "0.2.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sergio Cambra"]
-  s.date = %q{2010-05-17}
+  s.date = %q{2010-05-04}
   s.description = %q{It adds support for send invitations by email (it requires to be authenticated) and accept the invitation setting the password}
   s.email = %q{sergio@entrecables.com}
   s.extra_rdoc_files = [
@@ -29,16 +29,15 @@ Gem::Specification.new do |s|
      "app/views/invitations/new.html.erb",
      "devise_invitable.gemspec",
      "init.rb",
-     "lib/devise/controllers/helpers.rb",
-     "lib/devise/controllers/url_helpers.rb",
      "lib/devise_invitable.rb",
+     "lib/devise_invitable/controllers/helpers.rb",
+     "lib/devise_invitable/controllers/url_helpers.rb",
      "lib/devise_invitable/locales/en.yml",
      "lib/devise_invitable/mailer.rb",
      "lib/devise_invitable/model.rb",
      "lib/devise_invitable/rails.rb",
      "lib/devise_invitable/routes.rb",
      "lib/devise_invitable/schema.rb",
-     "rails/init.rb",
      "test/integration/invitable_test.rb",
      "test/integration_tests_helper.rb",
      "test/mailers/invitation_test.rb",
@@ -92,10 +91,10 @@ Gem::Specification.new do |s|
      "test/rails_app/config/environments/production.rb",
      "test/rails_app/config/environments/test.rb",
      "test/rails_app/config/initializers/backtrace_silencers.rb",
+     "test/rails_app/config/initializers/devise.rb",
      "test/rails_app/config/initializers/inflections.rb",
      "test/rails_app/config/initializers/new_rails_defaults.rb",
      "test/rails_app/config/initializers/session_store.rb",
-     "test/rails_app/config/initializers/devise.rb",
      "test/rails_app/config/routes.rb",
      "test/rails_app/vendor/plugins/devise_invitable/init.rb",
      "test/routes_test.rb",
@@ -109,16 +108,16 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<mocha>, [">= 0"])
       s.add_development_dependency(%q<webrat>, [">= 0"])
-      s.add_runtime_dependency(%q<devise>, ["~> 1.0.6"])
+      s.add_runtime_dependency(%q<devise>, ["~> 1.1.0"])
     else
       s.add_dependency(%q<mocha>, [">= 0"])
       s.add_dependency(%q<webrat>, [">= 0"])
-      s.add_dependency(%q<devise>, ["~> 1.0.6"])
+      s.add_runtime_dependency(%q<devise>, [">= 1.1.0"])
     end
   else
     s.add_dependency(%q<mocha>, [">= 0"])
     s.add_dependency(%q<webrat>, [">= 0"])
-    s.add_dependency(%q<devise>, ["~> 1.0.6"])
+    s.add_dependency(%q<devise>, ["~> 1.1.0"])
   end
 end
 

init.rb

@@ -1 +1 @@
-require 'rails/init'
+require 'devise_invitable'

lib/devise_invitable.rb

@@ -1,3 +1,7 @@
+unless defined?(Devise)
+  require 'devise'
+end
+
 Devise.module_eval do
   # Time interval where the invitation token is valid.
   mattr_accessor :invite_for

lib/devise/controllers/helpers.rb → lib/devise_invitable/controllers/helpers.rb

@@ -1,4 +1,4 @@
-Devise::Controllers::Helpers.module_eval do
+DeviseInvitable::Controllers::Helpers.module_eval do
   protected
   def authenticate_resource!
     authenticate!(resource_name)

lib/devise/controllers/url_helpers.rb → lib/devise_invitable/controllers/url_helpers.rb

@@ -17,4 +17,4 @@ def #{action}invitation_#{path_or_url}(resource, *args)
       URL_HELPERS
     end
   end
-end
+end

lib/devise_invitable/mailer.rb

@@ -6,4 +6,4 @@ def invitation(record)
     end
   end
 end
-DeviseMailer.send :include, DeviseInvitable::Mailer
+Devise::Mailer.send :include, DeviseInvitable::Mailer

lib/devise_invitable/model.rb

@@ -39,15 +39,15 @@ def invited?
 
       # Send invitation by email
       def send_invitation
-        ::DeviseMailer.deliver_invitation(self)
+        ::Devise::Mailer.invitation(self).deliver
       end
 
       # Reset invitation token and send invitation again
       def resend_invitation!
         if new_record? || invited?
           self.skip_confirmation! if self.new_record? and self.respond_to? :skip_confirmation!
           generate_invitation_token
-          save(false)
+          save(:validate=>false)
           send_invitation
         end
       end
@@ -101,7 +101,7 @@ def send_invitation(attributes={})
 
           if invitable.new_record?
             invitable.errors.add(:email, :blank) if invitable.email.blank?
-            invitable.errors.add(:email, :invalid) unless invitable.email.match Devise::EMAIL_REGEX
+            invitable.errors.add(:email, :invalid) unless invitable.email.match Devise.email_regexp
           else
             invitable.errors.add(:email, :taken) unless invitable.invited?
           end

lib/devise_invitable/routes.rb

@@ -26,4 +26,4 @@ def invitable(routes, mapping)
   end
 end
 
-ActionController::Routing::RouteSet::Mapper.send :include, DeviseInvitable::Routes
+ActionDispatch::Routing::Mapper.send :include, DeviseInvitable::Routes

test/rails_app/config/environment.rb

@@ -19,7 +19,7 @@
   # config.gem "hpricot", :version => '0.6', :source => "http://code.whytheluckystiff.net"
   # config.gem "sqlite3-ruby", :lib => "sqlite3"
   # config.gem "aws-s3", :lib => "aws/s3"
-  config.gem 'devise'
+#  config.gem 'devise'
 
   # Only load the plugins named here, in the order given (default is alphabetical).
   # :all can be used as a placeholder for all plugins not explicitly named

test/test_helper.rb

@@ -10,7 +10,7 @@
 
 path = File.join(File.dirname(__FILE__), '..', 'app', 'views')
 ActionController::Base.view_paths << path
-DeviseMailer.view_paths << path
+Devise::Mailer.view_paths << path
 
 ActionMailer::Base.delivery_method = :test
 ActionMailer::Base.perform_deliveries = true