dm-devise 1.3.0 → 1.3.1

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-04-16, commit 460beae671c654bdb83ebbc4c4ebfa613aee8384
-Last tested against devise release 1.3.0
+Last tested against devise master: 2011-04-21, commit 64cf8a45347137053b6c91bf85a3542c26e94771
+Last tested against devise release 1.3.3
 
 == 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.3.0'
+  gem 'dm-devise',         '~> 1.3.1'
 
 If you're using data_mapper_active_model do not include dm-validations in your
 Gemfile.

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

@@ -51,7 +51,8 @@ DataMapper::Validate::ValidationErrors.default_error_messages = {
   :primitive => '%s must be of type %s',
   :not_found => '%s not found',
   :already_confirmed => '%s was already confirmed, please try signing in',
-  :not_locked => '%s was not locked'
+  :not_locked => '%s was not locked',
+  :expired => '%s has expired, please request a new one'
 }
 
 module DataMapper

data/lib/dm-devise/version.rb

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

data/test/overrides/dm_validations_test.rb

@@ -26,20 +26,4 @@ if DEVISE_ORM == :data_mapper
     end
 
   end
-
-  class AuthenticationOthersTest < ActionController::IntegrationTest
-
-    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 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/shim.rb

@@ -20,6 +20,10 @@ module Shim
   end
 
   def to_xml(*args)
-    "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" + super
+    "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" + super + "\n"
+  end
+
+  def to_json(*args)
+    {self.model.name.downcase => JSON.parse(super)}.to_json
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dm-devise
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 1
   - 3
-  - 0
-  version: 1.3.0
+  - 1
+  version: 1.3.1
 platform: ruby
 authors: 
 - Jared Morgan
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-16 00:00:00 -05:00
+date: 2011-04-21 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency