dm-devise 1.2.0 → 1.3.0

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    dm-devise (1.2.0)
-      devise (~> 1.2.0)
+    dm-devise (1.3.0)
+      devise (~> 1.3.0)
       dm-core (>= 1.0.2, < 1.2)
       dm-migrations (>= 1.0.2, < 1.2)
       dm-rails (>= 1.0.3, < 1.2)
@@ -46,7 +46,7 @@ GEM
     builder (2.1.2)
     data_objects (0.10.3)
       addressable (~> 2.1)
-    devise (1.2.0)
+    devise (1.3.0)
       bcrypt-ruby (~> 2.1.2)
       orm_adapter (~> 0.0.3)
       warden (~> 1.0.3)

data/README.rdoc

@@ -20,8 +20,8 @@ earlier versions, but it's not been tested (if you try, please let Jared Morgan
 This README only covers dm-devise specifics. Make sure to read the devise
 README http://github.com/plataformatec/devise/blob/master/README.rdoc
 
-Last tested against devise master: 2011-03-25, commit da510508bb919fdcd2b94a461f3c3c56d127ca5b
-Last tested against devise release 1.2.0
+Last tested against devise master: 2011-04-16, commit 460beae671c654bdb83ebbc4c4ebfa613aee8384
+Last tested against devise release 1.3.0
 
 == Installation
 
@@ -33,7 +33,7 @@ Add dm-devise and dm gems to your Gemfile. The following gems are required:
   gem 'dm-timestamps',     '~> 1.1.0'
   gem 'dm-rails',          '~> 1.1.0'
   gem 'dm-validations',    '~> 1.1.0' # Do not include if using data_mapper_active_model
-  gem 'dm-devise',         '~> 1.2.0'
+  gem 'dm-devise',         '~> 1.3.0'
 
 If you're using data_mapper_active_model do not include dm-validations in your
 Gemfile.

data/dm-devise.gemspec

@@ -21,6 +21,6 @@ Gem::Specification.new do |s|
   s.add_dependency('dm-serializer', '>= 1.0.2', '< 1.2')
   s.add_dependency('dm-timestamps', '>= 1.0.2', '< 1.2')
   s.add_dependency('dm-rails', '>= 1.0.3', '< 1.2')
-  s.add_dependency('devise', '~> 1.2.0')
+  s.add_dependency('devise', '~> 1.3.0')
   s.add_dependency('sugar-high', '~> 0.2.10')
 end

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

@@ -18,6 +18,10 @@ module Devise
             wrap_hook(:before, :save, *args)
           end
 
+          def before_validation(*args)
+            wrap_hook(:before, :valid?, *args)
+          end
+
           def wrap_hook(action, method, *args)
             options = args.extract_options!
 

data/lib/devise/orm/data_mapper/dm-validations.rb

@@ -53,3 +53,15 @@ DataMapper::Validate::ValidationErrors.default_error_messages = {
   :already_confirmed => '%s was already confirmed, please try signing in',
   :not_locked => '%s was not locked'
 }
+
+module DataMapper
+  module Validations
+    class ValidationErrors
+      # Some devise controller actions expect resource#errors to respond to
+      # #to_xml. Otherwise, we get a Missing template error
+      def to_xml(options = {})
+        @errors.to_hash.to_xml(options.merge(:root => 'errors'))
+      end
+    end
+  end
+end

data/lib/dm-devise/version.rb

@@ -1,5 +1,5 @@
 module DataMapper
   module Devise
-    VERSION = '1.2.0'.freeze
+    VERSION = '1.3.0'.freeze
   end
 end

data/test/overrides/data_mapper_test.rb

@@ -65,15 +65,3 @@ class DatabaseAuthenticatableTest < ActiveSupport::TestCase
     assert_equal email.downcase, user.email
   end
 end
-
-class AuthenticationRedirectTest < ActionController::IntegrationTest
-  undef test_sign_in_with_xml_format_returns_xml_response
-
-  # It appears DM's to_xml does not add the xml header
-  test 'sign in with xml format returns xml response' do
-    create_user
-    post user_session_path(:format => 'xml', :user => {:email => "user@test.com", :password => '123456'})
-    assert_response :success
-    assert_match /\A<user>\s*<id/, response.body
-  end
-end

data/test/overrides/dm_validations_test.rb

@@ -12,17 +12,17 @@ if DEVISE_ORM == :data_mapper
       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
+      assert_equal 'must be between 6 and 128 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_128_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)
+    test 'should require a password with maximum of 128 characters long' do
+      user = new_user(:password => 'x'*129, :password_confirmation => 'x'*129)
       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
+      assert_equal 'must be between 6 and 128 characters long', user.errors[:password].join
     end
 
   end
@@ -42,5 +42,4 @@ if DEVISE_ORM == :data_mapper
       end
     end
   end
-  
 end

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

@@ -18,4 +18,8 @@ module Shim
       all.destroy
     end
   end
+
+  def to_xml(*args)
+    "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" + super
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dm-devise
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 27
   prerelease: 
   segments: 
   - 1
-  - 2
+  - 3
   - 0
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors: 
 - Jared Morgan
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-28 00:00:00 -05:00
+date: 2011-04-16 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -141,12 +141,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 31
+        hash: 27
         segments: 
         - 1
-        - 2
+        - 3
         - 0
-        version: 1.2.0
+        version: 1.3.0
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
@@ -236,7 +236,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.3
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: DataMapper support for devise