dm-devise 2.2.0 → 2.2.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 1fe8de96a22b5bc6bf782f4c6dcaf77486962a8c
+  data.tar.gz: 4d4f4fed04bc70ccae5f997767ba5ab665476b3b
+SHA512:
+  metadata.gz: 108265a651a2cc04dbc491eba921a093871eda54e54cc5dc3d85ddd02de9d59167f8838870efd550fb7188ab6b7e3ff7282bc180d8171af7d70110ca1c6a99e0
+  data.tar.gz: 950217feb8a47302caeaf31e16679c8a5e9d7a5083265d34bd7dbe7fcf4395d526ebd8d14b7f2a1b4fd3eee58e5fd857d8829e6f9c9433764dc6a97c771c1682

data/Gemfile

@@ -1,4 +1,4 @@
-source :rubygems
+source 'https://rubygems.org'
 
 gemspec
 

data/README.rdoc

@@ -8,8 +8,8 @@ dm-devise is intended for use with Rails >= 3.2 and devise >= 2.1.
 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: 2013-01-11, commit 872ef2b97fdb2efc072559db56daf15943f32eec
-Last tested against devise release 2.2.1
+Last tested against devise master: 2013-03-22, commit 72cbafa3225bab8904d62df9b1f5cbaaa0322931
+Last tested against devise release 2.2.3
 
 == Installation
 

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

@@ -13,7 +13,7 @@ if Devise.data_mapper_validation_lib == 'dm-validations'
         # the message, including translation.
         def add(field_name, message = nil, active_record_options = {})
           if message.kind_of?(Symbol)
-            message = self.class.default_error_message(message, field_name, active_record_options.values)
+            message = get_message(field_name, message, active_record_options)
           end
           original_add(field_name, message) unless errors[field_name].include?(message)
         end
@@ -23,6 +23,19 @@ if Devise.data_mapper_validation_lib == 'dm-validations'
         def to_xml(options = {})
           @errors.to_hash.to_xml(options.merge(:root => 'errors'))
         end
+
+        private
+
+        ##
+        # verify if a message is already define in property and use is if possible
+        #
+        def get_message(field_name, message = nil, active_record_options = {})
+          if resource.class.properties[:email].options[:messages]
+            resource.class.properties[:email].options[:messages][message]
+          else
+            self.class.default_error_message(message, field_name, active_record_options.values)
+          end
+        end
       end
     end
   end

data/lib/dm-devise/version.rb

@@ -1,5 +1,5 @@
 module DataMapper
   module Devise
-    VERSION = '2.2.0'.freeze
+    VERSION = '2.2.1'.freeze
   end
 end

data/test/test_helper.rb

@@ -11,7 +11,7 @@ require "rails/test_help"
 require "orm/#{DEVISE_ORM}"
 
 I18n.load_path << "#{DEVISE_PATH}/test/support/locale/en.yml"
-require 'mocha'
+require 'mocha/setup'
 
 require 'webrat'
 Webrat.configure do |config|

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: dm-devise
 version: !ruby/object:Gem::Version
-  version: 2.2.0
-  prerelease: 
+  version: 2.2.1
 platform: ruby
 authors:
 - Jared Morgan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-11 00:00:00.000000000 Z
+date: 2013-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dm-core
-  requirement: &87065470 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -24,11 +22,17 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *87065470
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.2
+    - - <
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: dm-migrations
-  requirement: &87064870 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,11 +42,17 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *87064870
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.2
+    - - <
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: dm-serializer
-  requirement: &87063760 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -52,11 +62,17 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *87063760
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.2
+    - - <
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: dm-timestamps
-  requirement: &87057410 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -66,11 +82,17 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *87057410
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.2
+    - - <
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: dm-rails
-  requirement: &87056790 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -80,18 +102,28 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *87056790
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.2
+    - - <
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &87056340 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *87056340
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.3'
 description: dm-devise adds DataMapper support to devise (http://github.com/plataformatec/devise)
   for authentication support for Rails
 email: jmorgan@morgancreative.net
@@ -131,27 +163,26 @@ files:
 - test/test_models.rb
 homepage: https://github.com/jm81/dm-devise
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: DataMapper support for devise
 test_files: []
 has_rdoc: