dm-devise 2.0.0 → 2.0.1

data/README.rdoc

@@ -10,8 +10,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-01-26, commit a71a352822a67f4764a5bd20337c48e8e28ed222
-Last tested against devise release 2.0.0, 1.5.3
+Last tested against devise master: 2012-02-13, commit aa36719bd95971d49e27e2091ad08af067355cce
+Last tested against devise release 2.0.1, 1.5.3
 
 == Installation
 
@@ -23,7 +23,7 @@ Add dm-devise and dm gems to your Gemfile. The following gems are required:
   gem 'dm-timestamps',     '~> 1.2.0'
   gem 'dm-rails',          '~> 1.2.0'
   gem 'dm-validations',    '~> 1.2.0' # Do not include if using data_mapper_active_model
-  gem 'dm-devise',         '~> 2.0.0'
+  gem 'dm-devise',         '~> 2.0.1'
 
 If you're using Active Model validations, do not include dm-validations in your
 Gemfile.

data/dm-devise.gemspec

@@ -16,10 +16,10 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency('dm-core', '>= 1.0.2', '< 1.3')
-  s.add_dependency('dm-migrations', '>= 1.0.2', '< 1.3')
-  s.add_dependency('dm-serializer', '>= 1.0.2', '< 1.3')
-  s.add_dependency('dm-timestamps', '>= 1.0.2', '< 1.3')
-  s.add_dependency('dm-rails', '>= 1.0.3', '< 1.3')
-  s.add_dependency('devise', '>= 1.3')
+  s.add_dependency('dm-core',       '>= 1.0.2', '< 2.0')
+  s.add_dependency('dm-migrations', '>= 1.0.2', '< 2.0')
+  s.add_dependency('dm-serializer', '>= 1.0.2', '< 2.0')
+  s.add_dependency('dm-timestamps', '>= 1.0.2', '< 2.0')
+  s.add_dependency('dm-rails',      '>= 1.0.2', '< 2.0')
+  s.add_dependency('devise',        '>= 1.3')
 end

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

@@ -11,7 +11,7 @@ if Devise.data_mapper_validation_lib == 'dm-validations'
 
         # If the message is a Symbol, allow +default_error_message+ to generate
         # the message, including translation.
-        def add(field_name, message)
+        def add(field_name, message = nil)
           if message.kind_of?(Symbol)
             message = self.class.default_error_message(message, field_name)
           end

data/lib/dm-devise/version.rb

@@ -1,5 +1,5 @@
 module DataMapper
   module Devise
-    VERSION = '2.0.0'.freeze
+    VERSION = '2.0.1'.freeze
   end
 end

data/lib/generators/data_mapper/devise_generator.rb

@@ -2,7 +2,7 @@ require 'generators/devise/orm_helpers'
 
 module DataMapper
   module Generators
-    class DeviseGenerator < Rails::Generators::NamedBase
+    class DeviseGenerator < ::Rails::Generators::NamedBase
       include ::Devise::Generators::OrmHelpers
 
       def generate_model

data/lib/generators/data_mapper/devise_install_generator.rb

@@ -1,12 +1,12 @@
 module DataMapper
   module Generators
-    class DeviseInstallGenerator < Rails::Generators::Base
+    class DeviseInstallGenerator < ::Rails::Generators::Base
       def generate_devise_install
         invoke 'devise:install'
       end
 
       def inject_data_mapper_content
-        devise_init_file = File.join(Rails.root, 'config', 'initializers', 'devise.rb')
+        devise_init_file = File.join(::Rails.root, 'config', 'initializers', 'devise.rb')
         validations = <<VALIDATIONS
   # ==> Validations Library
   # dm-devise adds some compatibility methods for either dm-validations or

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dm-devise
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-26 00:00:00.000000000 Z
+date: 2012-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dm-core
-  requirement: &78432750 !ruby/object:Gem::Requirement
+  requirement: &73066270 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,13 +21,13 @@ dependencies:
         version: 1.0.2
     - - <
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *78432750
+  version_requirements: *73066270
 - !ruby/object:Gem::Dependency
   name: dm-migrations
-  requirement: &77881150 !ruby/object:Gem::Requirement
+  requirement: &73065590 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -35,13 +35,13 @@ dependencies:
         version: 1.0.2
     - - <
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *77881150
+  version_requirements: *73065590
 - !ruby/object:Gem::Dependency
   name: dm-serializer
-  requirement: &77878200 !ruby/object:Gem::Requirement
+  requirement: &73065090 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -49,13 +49,13 @@ dependencies:
         version: 1.0.2
     - - <
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *77878200
+  version_requirements: *73065090
 - !ruby/object:Gem::Dependency
   name: dm-timestamps
-  requirement: &77877060 !ruby/object:Gem::Requirement
+  requirement: &73064350 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -63,27 +63,27 @@ dependencies:
         version: 1.0.2
     - - <
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *77877060
+  version_requirements: *73064350
 - !ruby/object:Gem::Dependency
   name: dm-rails
-  requirement: &77876350 !ruby/object:Gem::Requirement
+  requirement: &73063600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: 1.0.2
     - - <
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *77876350
+  version_requirements: *73063600
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &77875880 !ruby/object:Gem::Requirement
+  requirement: &73062940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -91,7 +91,7 @@ dependencies:
         version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *77875880
+  version_requirements: *73062940
 description: dm-devise adds DataMapper support to devise (http://github.com/plataformatec/devise)
   for authentication support for Rails
 email: jmorgan@morgancreative.net