dm-devise 2.0.0 → 2.0.1

Sign up to get free protection for your applications and to get access to all the features.
@@ -10,8 +10,8 @@ earlier versions, but it's not been tested (if you try, please let Jared Morgan
10
10
  This README only covers dm-devise specifics. Make sure to read the devise
11
11
  README http://github.com/plataformatec/devise/blob/master/README.rdoc
12
12
 
13
- Last tested against devise master: 2011-01-26, commit a71a352822a67f4764a5bd20337c48e8e28ed222
14
- Last tested against devise release 2.0.0, 1.5.3
13
+ Last tested against devise master: 2012-02-13, commit aa36719bd95971d49e27e2091ad08af067355cce
14
+ Last tested against devise release 2.0.1, 1.5.3
15
15
 
16
16
  == Installation
17
17
 
@@ -23,7 +23,7 @@ Add dm-devise and dm gems to your Gemfile. The following gems are required:
23
23
  gem 'dm-timestamps', '~> 1.2.0'
24
24
  gem 'dm-rails', '~> 1.2.0'
25
25
  gem 'dm-validations', '~> 1.2.0' # Do not include if using data_mapper_active_model
26
- gem 'dm-devise', '~> 2.0.0'
26
+ gem 'dm-devise', '~> 2.0.1'
27
27
 
28
28
  If you're using Active Model validations, do not include dm-validations in your
29
29
  Gemfile.
@@ -16,10 +16,10 @@ Gem::Specification.new do |s|
16
16
  s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
17
17
  s.require_paths = ["lib"]
18
18
 
19
- s.add_dependency('dm-core', '>= 1.0.2', '< 1.3')
20
- s.add_dependency('dm-migrations', '>= 1.0.2', '< 1.3')
21
- s.add_dependency('dm-serializer', '>= 1.0.2', '< 1.3')
22
- s.add_dependency('dm-timestamps', '>= 1.0.2', '< 1.3')
23
- s.add_dependency('dm-rails', '>= 1.0.3', '< 1.3')
24
- s.add_dependency('devise', '>= 1.3')
19
+ s.add_dependency('dm-core', '>= 1.0.2', '< 2.0')
20
+ s.add_dependency('dm-migrations', '>= 1.0.2', '< 2.0')
21
+ s.add_dependency('dm-serializer', '>= 1.0.2', '< 2.0')
22
+ s.add_dependency('dm-timestamps', '>= 1.0.2', '< 2.0')
23
+ s.add_dependency('dm-rails', '>= 1.0.2', '< 2.0')
24
+ s.add_dependency('devise', '>= 1.3')
25
25
  end
@@ -11,7 +11,7 @@ if Devise.data_mapper_validation_lib == 'dm-validations'
11
11
 
12
12
  # If the message is a Symbol, allow +default_error_message+ to generate
13
13
  # the message, including translation.
14
- def add(field_name, message)
14
+ def add(field_name, message = nil)
15
15
  if message.kind_of?(Symbol)
16
16
  message = self.class.default_error_message(message, field_name)
17
17
  end
@@ -1,5 +1,5 @@
1
1
  module DataMapper
2
2
  module Devise
3
- VERSION = '2.0.0'.freeze
3
+ VERSION = '2.0.1'.freeze
4
4
  end
5
5
  end
@@ -2,7 +2,7 @@ require 'generators/devise/orm_helpers'
2
2
 
3
3
  module DataMapper
4
4
  module Generators
5
- class DeviseGenerator < Rails::Generators::NamedBase
5
+ class DeviseGenerator < ::Rails::Generators::NamedBase
6
6
  include ::Devise::Generators::OrmHelpers
7
7
 
8
8
  def generate_model
@@ -1,12 +1,12 @@
1
1
  module DataMapper
2
2
  module Generators
3
- class DeviseInstallGenerator < Rails::Generators::Base
3
+ class DeviseInstallGenerator < ::Rails::Generators::Base
4
4
  def generate_devise_install
5
5
  invoke 'devise:install'
6
6
  end
7
7
 
8
8
  def inject_data_mapper_content
9
- devise_init_file = File.join(Rails.root, 'config', 'initializers', 'devise.rb')
9
+ devise_init_file = File.join(::Rails.root, 'config', 'initializers', 'devise.rb')
10
10
  validations = <<VALIDATIONS
11
11
  # ==> Validations Library
12
12
  # dm-devise adds some compatibility methods for either dm-validations or
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: dm-devise
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.0.0
4
+ version: 2.0.1
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,11 +9,11 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-01-26 00:00:00.000000000 Z
12
+ date: 2012-02-14 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: dm-core
16
- requirement: &78432750 !ruby/object:Gem::Requirement
16
+ requirement: &73066270 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ! '>='
@@ -21,13 +21,13 @@ dependencies:
21
21
  version: 1.0.2
22
22
  - - <
23
23
  - !ruby/object:Gem::Version
24
- version: '1.3'
24
+ version: '2.0'
25
25
  type: :runtime
26
26
  prerelease: false
27
- version_requirements: *78432750
27
+ version_requirements: *73066270
28
28
  - !ruby/object:Gem::Dependency
29
29
  name: dm-migrations
30
- requirement: &77881150 !ruby/object:Gem::Requirement
30
+ requirement: &73065590 !ruby/object:Gem::Requirement
31
31
  none: false
32
32
  requirements:
33
33
  - - ! '>='
@@ -35,13 +35,13 @@ dependencies:
35
35
  version: 1.0.2
36
36
  - - <
37
37
  - !ruby/object:Gem::Version
38
- version: '1.3'
38
+ version: '2.0'
39
39
  type: :runtime
40
40
  prerelease: false
41
- version_requirements: *77881150
41
+ version_requirements: *73065590
42
42
  - !ruby/object:Gem::Dependency
43
43
  name: dm-serializer
44
- requirement: &77878200 !ruby/object:Gem::Requirement
44
+ requirement: &73065090 !ruby/object:Gem::Requirement
45
45
  none: false
46
46
  requirements:
47
47
  - - ! '>='
@@ -49,13 +49,13 @@ dependencies:
49
49
  version: 1.0.2
50
50
  - - <
51
51
  - !ruby/object:Gem::Version
52
- version: '1.3'
52
+ version: '2.0'
53
53
  type: :runtime
54
54
  prerelease: false
55
- version_requirements: *77878200
55
+ version_requirements: *73065090
56
56
  - !ruby/object:Gem::Dependency
57
57
  name: dm-timestamps
58
- requirement: &77877060 !ruby/object:Gem::Requirement
58
+ requirement: &73064350 !ruby/object:Gem::Requirement
59
59
  none: false
60
60
  requirements:
61
61
  - - ! '>='
@@ -63,27 +63,27 @@ dependencies:
63
63
  version: 1.0.2
64
64
  - - <
65
65
  - !ruby/object:Gem::Version
66
- version: '1.3'
66
+ version: '2.0'
67
67
  type: :runtime
68
68
  prerelease: false
69
- version_requirements: *77877060
69
+ version_requirements: *73064350
70
70
  - !ruby/object:Gem::Dependency
71
71
  name: dm-rails
72
- requirement: &77876350 !ruby/object:Gem::Requirement
72
+ requirement: &73063600 !ruby/object:Gem::Requirement
73
73
  none: false
74
74
  requirements:
75
75
  - - ! '>='
76
76
  - !ruby/object:Gem::Version
77
- version: 1.0.3
77
+ version: 1.0.2
78
78
  - - <
79
79
  - !ruby/object:Gem::Version
80
- version: '1.3'
80
+ version: '2.0'
81
81
  type: :runtime
82
82
  prerelease: false
83
- version_requirements: *77876350
83
+ version_requirements: *73063600
84
84
  - !ruby/object:Gem::Dependency
85
85
  name: devise
86
- requirement: &77875880 !ruby/object:Gem::Requirement
86
+ requirement: &73062940 !ruby/object:Gem::Requirement
87
87
  none: false
88
88
  requirements:
89
89
  - - ! '>='
@@ -91,7 +91,7 @@ dependencies:
91
91
  version: '1.3'
92
92
  type: :runtime
93
93
  prerelease: false
94
- version_requirements: *77875880
94
+ version_requirements: *73062940
95
95
  description: dm-devise adds DataMapper support to devise (http://github.com/plataformatec/devise)
96
96
  for authentication support for Rails
97
97
  email: jmorgan@morgancreative.net