dm-devise 1.1.0 → 1.1.1

data/Gemfile

@@ -6,6 +6,7 @@ gem "warden", "0.10.7"
 gem "webrat", "0.7.0"
 gem "mocha", :require => false
 gem "bcrypt-ruby", :require => "bcrypt"
+gem "oauth2"
 
 gem 'dm-core',           '~> 1.0.0'
 gem 'dm-migrations',     '~> 1.0.0'

data/Gemfile.lock

@@ -11,46 +11,47 @@ GIT
 
 GIT
   remote: git://github.com/rails/rails.git
-  revision: 8079484
+  revision: 4952a80
   specs:
-    actionmailer (3.0.0.beta4)
-      actionpack (= 3.0.0.beta4)
-      mail (~> 2.2.3)
-    actionpack (3.0.0.beta4)
-      activemodel (= 3.0.0.beta4)
-      activesupport (= 3.0.0.beta4)
+    actionmailer (3.0.0.rc)
+      actionpack (= 3.0.0.rc)
+      mail (~> 2.2.5)
+    actionpack (3.0.0.rc)
+      activemodel (= 3.0.0.rc)
+      activesupport (= 3.0.0.rc)
       builder (~> 2.1.2)
       erubis (~> 2.6.6)
       i18n (~> 0.4.1)
       rack (~> 1.2.1)
+      rack-mount (~> 0.6.9)
       rack-test (~> 0.5.4)
-      tzinfo (~> 0.3.16)
-    activemodel (3.0.0.beta4)
-      activesupport (= 3.0.0.beta4)
+      tzinfo (~> 0.3.22)
+    activemodel (3.0.0.rc)
+      activesupport (= 3.0.0.rc)
       builder (~> 2.1.2)
       i18n (~> 0.4.1)
-    activerecord (3.0.0.beta4)
-      activemodel (= 3.0.0.beta4)
-      activesupport (= 3.0.0.beta4)
+    activerecord (3.0.0.rc)
+      activemodel (= 3.0.0.rc)
+      activesupport (= 3.0.0.rc)
       arel (~> 0.4.0)
-      tzinfo (~> 0.3.16)
-    activeresource (3.0.0.beta4)
-      activemodel (= 3.0.0.beta4)
-      activesupport (= 3.0.0.beta4)
-    activesupport (3.0.0.beta4)
-    rails (3.0.0.beta4)
-      actionmailer (= 3.0.0.beta4)
-      actionpack (= 3.0.0.beta4)
-      activerecord (= 3.0.0.beta4)
-      activeresource (= 3.0.0.beta4)
-      activesupport (= 3.0.0.beta4)
-      bundler (>= 1.0.0.beta.2)
-      railties (= 3.0.0.beta4)
-    railties (3.0.0.beta4)
-      actionpack (= 3.0.0.beta4)
-      activesupport (= 3.0.0.beta4)
+      tzinfo (~> 0.3.22)
+    activeresource (3.0.0.rc)
+      activemodel (= 3.0.0.rc)
+      activesupport (= 3.0.0.rc)
+    activesupport (3.0.0.rc)
+    rails (3.0.0.rc)
+      actionmailer (= 3.0.0.rc)
+      actionpack (= 3.0.0.rc)
+      activerecord (= 3.0.0.rc)
+      activeresource (= 3.0.0.rc)
+      activesupport (= 3.0.0.rc)
+      bundler (>= 1.0.0.rc.1)
+      railties (= 3.0.0.rc)
+    railties (3.0.0.rc)
+      actionpack (= 3.0.0.rc)
+      activesupport (= 3.0.0.rc)
       rake (>= 0.8.3)
-      thor (~> 0.13.7)
+      thor (~> 0.14.0)
 
 GEM
   remote: http://rubygems.org/
@@ -90,6 +91,9 @@ GEM
     erubis (2.6.6)
       abstract (>= 1.0.0)
     extlib (0.9.15)
+    faraday (0.4.6)
+      addressable (>= 2.1.1)
+      rack (>= 1.0.1)
     fastercsv (1.5.3)
     i18n (0.4.1)
     json_pure (1.4.3)
@@ -100,13 +104,19 @@ GEM
     mime-types (1.16)
     mocha (0.9.8)
       rake
+    multi_json (0.0.4)
     nokogiri (1.4.2)
+    oauth2 (0.0.10)
+      faraday (~> 0.4.1)
+      multi_json (>= 0.0.4)
     polyglot (0.3.1)
     rack (1.2.1)
+    rack-mount (0.6.9)
+      rack (>= 1.0.0)
     rack-test (0.5.4)
       rack (>= 1.0)
     rake (0.8.7)
-    thor (0.13.7)
+    thor (0.14.0)
     treetop (1.4.8)
       polyglot (>= 0.3.1)
     tzinfo (0.3.22)
@@ -130,6 +140,7 @@ DEPENDENCIES
   dm-timestamps (~> 1.0.0)
   dm-validations (~> 1.0.0)
   mocha
+  oauth2
   rails!
   warden (= 0.10.7)
   webrat (= 0.7.0)

data/README.rdoc

@@ -22,7 +22,7 @@ README http://github.com/plataformatec/devise/blob/master/README.rdoc
 
 Last tested against devise release: v1.1.1
 
-Last tested against devise master: 2010-07-27, commit 879b64edc945e3531e65abf4a6b7970052927e39
+Last tested against devise master: 2010-08-04, commit c0c7aefce4a2a0ba2b85c1185abf73cb213cd79c
 
 == Installation
 

data/Rakefile

@@ -28,10 +28,7 @@ Rake::TestTask.new(:test) do |test|
   test.libs << 'lib' << 'test'
   test.libs << "#{ENV['DEVISE_PATH']}/lib"
   test.libs << "#{ENV['DEVISE_PATH']}/test"
-  # Need to ensure overrides tests are loaded last
-  overrides =  ['test/overrides/data_mapper_test.rb']
-  overrides += ['test/overrides/dm_validations_test.rb'] if ENV['DEVISE_ORM'] == 'data_mapper'
-  test.test_files = FileList["#{ENV['DEVISE_PATH']}/test/**/*_test.rb"] + overrides
+  test.test_files = FileList["#{ENV['DEVISE_PATH']}/test/**/*_test.rb"] + FileList['test/**/*_test.rb']
   test.verbose = true
 end
 

data/dm-devise.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dm-devise}
-  s.version = "1.1.0"
+  s.version = "1.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jared Morgan"]
-  s.date = %q{2010-07-28}
+  s.date = %q{2010-08-05}
   s.description = %q{dm-devise adds DataMapper support to devise (http://github.com/plataformatec/devise) for authentication support for Rails}
   s.email = %q{jmorgan@morgancreative.net}
   s.extra_rdoc_files = [
@@ -33,6 +33,7 @@ Gem::Specification.new do |s|
      "lib/devise/orm/data_mapper_active_model.rb",
      "lib/dm-devise/version.rb",
      "lib/generators/data_mapper/devise_generator.rb",
+     "test/data_mapper/compatibility_test.rb",
      "test/orm/data_mapper.rb",
      "test/orm/data_mapper_active_model.rb",
      "test/overrides/data_mapper_test.rb",
@@ -41,7 +42,6 @@ Gem::Specification.new do |s|
      "test/rails_app/app/data_mapper/shim.rb",
      "test/rails_app/app/data_mapper/user.rb",
      "test/rails_app/app/data_mapper_active_model/admin.rb",
-     "test/rails_app/app/data_mapper_active_model/shim.rb",
      "test/rails_app/app/data_mapper_active_model/user.rb",
      "test/rails_app/config/application.rb",
      "test/rails_app/config/environment.rb",
@@ -54,13 +54,13 @@ Gem::Specification.new do |s|
   s.summary = %q{Support for using DataMapper ORM with devise}
   s.test_files = [
     "test/test_helper.rb",
+     "test/data_mapper/compatibility_test.rb",
      "test/rails_app/config/environment.rb",
      "test/rails_app/config/application.rb",
      "test/rails_app/app/data_mapper/admin.rb",
      "test/rails_app/app/data_mapper/shim.rb",
      "test/rails_app/app/data_mapper/user.rb",
      "test/rails_app/app/data_mapper_active_model/admin.rb",
-     "test/rails_app/app/data_mapper_active_model/shim.rb",
      "test/rails_app/app/data_mapper_active_model/user.rb",
      "test/overrides/data_mapper_test.rb",
      "test/overrides/dm_validations_test.rb",

data/lib/devise/orm/data_mapper/compatibility.rb

@@ -51,11 +51,14 @@ module Devise
           if options.is_a?(Hash) && options[:validate] == false
             save!
           else
-            # valid? checking isn't added automatically with ActiveModel
-            valid? && super()
+            super()
           end
         end
 
+        def update_attribute(name, value)
+          update(name => value)
+        end
+        
         def update_attributes(*args)
           update(*args)
         end

data/lib/devise/orm/data_mapper_active_model.rb

@@ -8,8 +8,9 @@ module Devise
       module Hook
         def devise_modules_hook!
           extend Schema
-          include Compatibility
           include ActiveModel::Validations
+          include ActiveModelCompatibility
+          include Compatibility
           class << self; attr_reader :descendants; end;
 
           def self.validates_uniqueness_of(*fields)
@@ -33,6 +34,18 @@ module Devise
           end
         end
       end
+
+      module ActiveModelCompatibility
+        # include ActiveModel::Validations does not make save check valid?.
+        # This may not be the best solution, but it seems to work. Note that
+        # Compatibility is included after this module; its #save method handles
+        # the :validate => false option.
+        def save(*args)
+          retval = valid? && super(*args)
+          assert_save_successful(:save, retval)
+          retval
+        end
+      end
     end
   end
 end

data/lib/dm-devise/version.rb

@@ -1,5 +1,5 @@
 module DataMapper
   module Devise
-    VERSION = '1.1.0'.freeze
+    VERSION = '1.1.1'.freeze
   end
 end

data/test/data_mapper/compatibility_test.rb

@@ -0,0 +1,24 @@
+require 'test_helper'
+
+class DataMapperCompatibilityTest < ActiveSupport::TestCase
+  def teardown
+    User.raise_on_save_failure = false
+  end
+  
+  test 'respects raise_on_save_failure' do
+    User.raise_on_save_failure = true
+    user = new_user(:email => nil)
+    assert user.invalid?
+    assert_raise DataMapper::SaveFailureError do
+      user.save
+    end
+
+    user = new_user
+    assert user.valid?
+    assert user.save
+
+    User.raise_on_save_failure = false
+    user = new_user(:email => nil)
+    assert !user.save
+  end
+end

data/test/overrides/dm_validations_test.rb

@@ -1,43 +1,46 @@
 require 'test_helper'
 
 # See data_mapper_test.rb in this folder for what this file is doing.
+if DEVISE_ORM == :data_mapper
+
+  class ValidatableTest < ActiveSupport::TestCase
+    undef test_should_require_a_password_with_minimum_of_6_characters
+
+    # DataMapper uses a :value_between error message when given a minimum and
+    # maximum; ActiveModel shows either the :too_long or :too_short message.
+    test 'should require a password with minimum of 6 characters' do
+      user = new_user(:password => '12345', :password_confirmation => '12345')
+      assert user.invalid?
+      # assert_equal 'is too short (minimum is 6 characters)', user.errors[:password].join
+      assert_equal 'must be between 6 and 20 characters long', user.errors[:password].join
+    end
 
-class ValidatableTest < ActiveSupport::TestCase
-  undef test_should_require_a_password_with_minimum_of_6_characters
-
-  # DataMapper uses a :value_between error message when given a minimum and
-  # maximum; ActiveModel shows either the :too_long or :too_short message.
-  test 'should require a password with minimum of 6 characters' do
-    user = new_user(:password => '12345', :password_confirmation => '12345')
-    assert user.invalid?
-    # assert_equal 'is too short (minimum is 6 characters)', user.errors[:password].join
-    assert_equal 'must be between 6 and 20 characters long', user.errors[:password].join
-  end
+    undef test_should_require_a_password_with_maximum_of_20_characters_long
 
-  undef test_should_require_a_password_with_maximum_of_20_characters_long
+    # Same issue as previous test
+    test 'should require a password with maximum of 20 characters long' do
+      user = new_user(:password => 'x'*21, :password_confirmation => 'x'*21)
+      assert user.invalid?
+      # assert_equal 'is too long (maximum is 20 characters)', user.errors[:password].join
+      assert_equal 'must be between 6 and 20 characters long', user.errors[:password].join
+    end
 
-  # Same issue as previous test
-  test 'should require a password with maximum of 20 characters long' do
-    user = new_user(:password => 'x'*21, :password_confirmation => 'x'*21)
-    assert user.invalid?
-    # assert_equal 'is too long (maximum is 20 characters)', user.errors[:password].join
-    assert_equal 'must be between 6 and 20 characters long', user.errors[:password].join
   end
 
-end
-
-class AuthenticationOthersTest < ActionController::IntegrationTest
+  class AuthenticationOthersTest < ActionController::IntegrationTest
 
-  undef test_registration_in_xml_format
+    undef test_registration_in_xml_format_works_when_recognizing_path
 
-  # DM's validates_confirmation_of requires the confirmation field to be present,
-  # while ActiveModel by default skips the confirmation test if the confirmation
-  # value is nil. This test takes advantage of AM's behavior, so just add the
-  # :password_confirmation value.
-  test 'registration in xml format' do
-    assert_nothing_raised do
-      # post user_registration_path(:format => 'xml', :user => {:email => "test@example.com", :password => "invalid"} )
-      post user_registration_path(:format => 'xml', :user => {:email => "test@example.com", :password => "invalid", :password_confirmation => "invalid"} )
+    # DM's validates_confirmation_of requires the confirmation field to be present,
+    # while ActiveModel by default skips the confirmation test if the confirmation
+    # value is nil. This test takes advantage of AM's behavior, so just add the
+    # :password_confirmation value.
+    test 'registration in xml format works when recognizing path' do
+      assert_nothing_raised do
+        # post user_registration_path(:format => 'xml', :user => {:email => "test@example.com", :password => "invalid"} )
+        post user_registration_path(:format => 'xml', :user => {:email => "test@example.com", :password => "invalid", :password_confirmation => "invalid"} )
+      end
     end
   end
+  
 end

data/test/rails_app/app/data_mapper/admin.rb

@@ -1,12 +1,11 @@
+require 'shared_admin'
+
 class Admin
-  include DataMapper::Resource  
-  
+  include DataMapper::Resource
+
   property :id,   Serial
   property :username, String
-  
-  devise :database_authenticatable, :registerable, :timeoutable, :recoverable, :lockable, :unlock_strategy => :time
-  
-  def self.create!(*args)
-    create(*args)
-  end
+
+  include SharedAdmin
+  include Shim
 end

data/test/rails_app/app/data_mapper/shim.rb

@@ -1,2 +1,25 @@
+# Shim should be included after SharedUser / SharedAdmin
 module Shim
+  def self.included(klass)
+    klass.extend(ModelMethods)
+  end
+
+  module ModelMethods
+    # Override version in SharedUser which uses #find_by_email.
+    def find_for_facebook_oauth(access_token, signed_in_resource=nil)
+      data = ActiveSupport::JSON.decode(access_token.get('/me'))
+      user = signed_in_resource || User.first(:email => data["email"]) || User.new
+      user.update_with_facebook_oauth(access_token, data)
+      user.save
+      user
+    end
+    
+    def create!(*args)
+      create(*args)
+    end
+
+    def destroy_all
+      all.destroy
+    end
+  end
 end

data/test/rails_app/app/data_mapper/user.rb

@@ -1,20 +1,27 @@
+require 'shared_user'
+
 class User
   include DataMapper::Resource
 
   property :id, Serial
   property :username, String
-  
-  devise :database_authenticatable, :confirmable, :lockable, :recoverable,
-         :registerable, :rememberable, :timeoutable, :token_authenticatable,
-         :trackable, :validatable
-
+  property :facebook_token, String
   timestamps :at
-  
-  def self.create!(*args)
-    create(*args)
-  end
-  
-  def self.destroy_all
-    all.destroy
-  end
+
+  include SharedUser
+  include Shim
+
+  unless DEVISE_ORM == :data_mapper_active_model
+    before :valid?, :update_password_confirmation
+
+    # DM's validates_confirmation_of requires the confirmation field to be present,
+    # while ActiveModel by default skips the confirmation test if the confirmation
+    # value is nil. This test takes advantage of AM's behavior, so just add the
+    # :password_confirmation value.
+    def update_password_confirmation
+      if self.password && self.password_confirmation.nil?
+        self.password_confirmation = self.password
+      end
+    end
+  end 
 end

data/test/rails_app/app/data_mapper_active_model/admin.rb

@@ -1,12 +1,12 @@
+require 'shared_admin'
+require File.join(File.dirname(__FILE__), '../data_mapper/shim.rb')
+
 class Admin
-  include DataMapper::Resource  
-  
+  include DataMapper::Resource
+
   property :id,   Serial
   property :username, String
-  
-  devise :database_authenticatable, :registerable, :timeoutable, :recoverable, :lockable, :unlock_strategy => :time
-  
-  def self.create!(*args)
-    create(*args)
-  end
+
+  include SharedAdmin
+  include Shim
 end

data/test/rails_app/app/data_mapper_active_model/user.rb

@@ -1,20 +1,14 @@
+require 'shared_user'
+require File.join(File.dirname(__FILE__), '../data_mapper/shim.rb')
+
 class User
   include DataMapper::Resource
 
   property :id, Serial
   property :username, String
-  
-  devise :database_authenticatable, :confirmable, :lockable, :recoverable,
-         :registerable, :rememberable, :timeoutable, :token_authenticatable,
-         :trackable, :validatable
-
+  property :facebook_token, String
   timestamps :at
-  
-  def self.create!(*args)
-    create(*args)
-  end
-  
-  def self.destroy_all
-    all.destroy
-  end
+
+  include SharedUser
+  include Shim
 end

data/test/test_helper.rb

@@ -16,6 +16,8 @@ Webrat.configure do |config|
   config.open_error_files = false
 end
 
+Devise::Oauth.test_mode!
+
 # Add support to load paths so we can overwrite broken webrat setup
 $:.unshift "#{DEVISE_PATH}/test/support"
 Dir["#{DEVISE_PATH}/test/support/**/*.rb"].each { |f| require f }

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dm-devise
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 1
   - 1
-  - 0
-  version: 1.1.0
+  - 1
+  version: 1.1.1
 platform: ruby
 authors: 
 - Jared Morgan
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-28 00:00:00 -05:00
+date: 2010-08-05 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -186,6 +186,7 @@ files:
 - lib/devise/orm/data_mapper_active_model.rb
 - lib/dm-devise/version.rb
 - lib/generators/data_mapper/devise_generator.rb
+- test/data_mapper/compatibility_test.rb
 - test/orm/data_mapper.rb
 - test/orm/data_mapper_active_model.rb
 - test/overrides/data_mapper_test.rb
@@ -194,7 +195,6 @@ files:
 - test/rails_app/app/data_mapper/shim.rb
 - test/rails_app/app/data_mapper/user.rb
 - test/rails_app/app/data_mapper_active_model/admin.rb
-- test/rails_app/app/data_mapper_active_model/shim.rb
 - test/rails_app/app/data_mapper_active_model/user.rb
 - test/rails_app/config/application.rb
 - test/rails_app/config/environment.rb
@@ -235,13 +235,13 @@ specification_version: 3
 summary: Support for using DataMapper ORM with devise
 test_files: 
 - test/test_helper.rb
+- test/data_mapper/compatibility_test.rb
 - test/rails_app/config/environment.rb
 - test/rails_app/config/application.rb
 - test/rails_app/app/data_mapper/admin.rb
 - test/rails_app/app/data_mapper/shim.rb
 - test/rails_app/app/data_mapper/user.rb
 - test/rails_app/app/data_mapper_active_model/admin.rb
-- test/rails_app/app/data_mapper_active_model/shim.rb
 - test/rails_app/app/data_mapper_active_model/user.rb
 - test/overrides/data_mapper_test.rb
 - test/overrides/dm_validations_test.rb

data/test/rails_app/app/data_mapper_active_model/shim.rb

@@ -1,2 +0,0 @@
-module Shim
-end