dm-devise 1.1.2 → 1.1.3
Sign up to get free protection for your applications and to get access to all the features.
- data/Gemfile +7 -7
- data/Gemfile.lock +68 -73
- data/README.rdoc +6 -6
- data/dm-devise.gemspec +2 -2
- data/lib/devise/orm/data_mapper_active_model.rb +0 -1
- data/lib/dm-devise/version.rb +1 -1
- data/lib/generators/data_mapper/devise_generator.rb +1 -1
- data/test/rails_app/app/data_mapper/user.rb +8 -10
- metadata +4 -4
data/Gemfile
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
source :rubygems
|
2
2
|
|
3
|
-
gem "rails",
|
3
|
+
gem "rails", '3.0.0'
|
4
4
|
|
5
5
|
gem "warden", "0.10.7"
|
6
6
|
gem "webrat", "0.7.0"
|
@@ -8,13 +8,13 @@ gem "mocha", :require => false
|
|
8
8
|
gem "bcrypt-ruby", :require => "bcrypt"
|
9
9
|
gem "oauth2"
|
10
10
|
|
11
|
-
gem 'dm-core', '~> 1.0.
|
12
|
-
gem 'dm-migrations', '~> 1.0.
|
13
|
-
gem 'dm-sqlite-adapter', '~> 1.0.
|
14
|
-
gem 'dm-serializer', '~> 1.0.
|
15
|
-
gem 'dm-timestamps', '~> 1.0.
|
11
|
+
gem 'dm-core', '~> 1.0.2'
|
12
|
+
gem 'dm-migrations', '~> 1.0.2'
|
13
|
+
gem 'dm-sqlite-adapter', '~> 1.0.2'
|
14
|
+
gem 'dm-serializer', '~> 1.0.2'
|
15
|
+
gem 'dm-timestamps', '~> 1.0.2'
|
16
16
|
gem 'dm-rails', '~> 1.0.3'
|
17
17
|
|
18
18
|
group :data_mapper do
|
19
|
-
gem 'dm-validations', '~> 1.0.
|
19
|
+
gem 'dm-validations', '~> 1.0.2'
|
20
20
|
end
|
data/Gemfile.lock
CHANGED
@@ -1,86 +1,68 @@
|
|
1
|
-
|
2
|
-
remote:
|
3
|
-
revision: 4952a80
|
1
|
+
GEM
|
2
|
+
remote: http://rubygems.org/
|
4
3
|
specs:
|
5
|
-
|
6
|
-
|
4
|
+
abstract (1.0.0)
|
5
|
+
actionmailer (3.0.0)
|
6
|
+
actionpack (= 3.0.0)
|
7
7
|
mail (~> 2.2.5)
|
8
|
-
actionpack (3.0.0
|
9
|
-
activemodel (= 3.0.0
|
10
|
-
activesupport (= 3.0.0
|
8
|
+
actionpack (3.0.0)
|
9
|
+
activemodel (= 3.0.0)
|
10
|
+
activesupport (= 3.0.0)
|
11
11
|
builder (~> 2.1.2)
|
12
12
|
erubis (~> 2.6.6)
|
13
13
|
i18n (~> 0.4.1)
|
14
14
|
rack (~> 1.2.1)
|
15
|
-
rack-mount (~> 0.6.
|
15
|
+
rack-mount (~> 0.6.12)
|
16
16
|
rack-test (~> 0.5.4)
|
17
|
-
tzinfo (~> 0.3.
|
18
|
-
activemodel (3.0.0
|
19
|
-
activesupport (= 3.0.0
|
17
|
+
tzinfo (~> 0.3.23)
|
18
|
+
activemodel (3.0.0)
|
19
|
+
activesupport (= 3.0.0)
|
20
20
|
builder (~> 2.1.2)
|
21
21
|
i18n (~> 0.4.1)
|
22
|
-
activerecord (3.0.0
|
23
|
-
activemodel (= 3.0.0
|
24
|
-
activesupport (= 3.0.0
|
25
|
-
arel (~> 0.
|
26
|
-
tzinfo (~> 0.3.
|
27
|
-
activeresource (3.0.0
|
28
|
-
activemodel (= 3.0.0
|
29
|
-
activesupport (= 3.0.0
|
30
|
-
activesupport (3.0.0
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
activerecord (= 3.0.0.rc)
|
35
|
-
activeresource (= 3.0.0.rc)
|
36
|
-
activesupport (= 3.0.0.rc)
|
37
|
-
bundler (>= 1.0.0.rc.1)
|
38
|
-
railties (= 3.0.0.rc)
|
39
|
-
railties (3.0.0.rc)
|
40
|
-
actionpack (= 3.0.0.rc)
|
41
|
-
activesupport (= 3.0.0.rc)
|
42
|
-
rake (>= 0.8.3)
|
43
|
-
thor (~> 0.14.0)
|
44
|
-
|
45
|
-
GEM
|
46
|
-
remote: http://rubygems.org/
|
47
|
-
specs:
|
48
|
-
abstract (1.0.0)
|
49
|
-
addressable (2.1.2)
|
50
|
-
arel (0.4.0)
|
51
|
-
activesupport (>= 3.0.0.beta)
|
22
|
+
activerecord (3.0.0)
|
23
|
+
activemodel (= 3.0.0)
|
24
|
+
activesupport (= 3.0.0)
|
25
|
+
arel (~> 1.0.0)
|
26
|
+
tzinfo (~> 0.3.23)
|
27
|
+
activeresource (3.0.0)
|
28
|
+
activemodel (= 3.0.0)
|
29
|
+
activesupport (= 3.0.0)
|
30
|
+
activesupport (3.0.0)
|
31
|
+
addressable (2.2.0)
|
32
|
+
arel (1.0.1)
|
33
|
+
activesupport (~> 3.0.0)
|
52
34
|
bcrypt-ruby (2.1.2)
|
53
35
|
builder (2.1.2)
|
54
36
|
data_objects (0.10.2)
|
55
37
|
addressable (~> 2.1)
|
56
|
-
dm-active_model (1.0.
|
57
|
-
activemodel (~> 3.0.0
|
58
|
-
dm-core (~> 1.0.
|
59
|
-
dm-core (1.0.
|
60
|
-
addressable (~> 2.
|
38
|
+
dm-active_model (1.0.2)
|
39
|
+
activemodel (~> 3.0.0)
|
40
|
+
dm-core (~> 1.0.2)
|
41
|
+
dm-core (1.0.2)
|
42
|
+
addressable (~> 2.2)
|
61
43
|
extlib (~> 0.9.15)
|
62
|
-
dm-do-adapter (1.0.
|
63
|
-
data_objects (~> 0.10.
|
64
|
-
dm-core (~> 1.0.
|
65
|
-
dm-migrations (1.0.
|
66
|
-
dm-core (~> 1.0.
|
44
|
+
dm-do-adapter (1.0.2)
|
45
|
+
data_objects (~> 0.10.2)
|
46
|
+
dm-core (~> 1.0.2)
|
47
|
+
dm-migrations (1.0.2)
|
48
|
+
dm-core (~> 1.0.2)
|
67
49
|
dm-rails (1.0.3)
|
68
50
|
actionpack (~> 3.0.0.rc)
|
69
51
|
activesupport (~> 3.0.0.rc)
|
70
52
|
dm-active_model (~> 1.0.0)
|
71
53
|
dm-core (~> 1.0.0)
|
72
54
|
railties (~> 3.0.0.rc)
|
73
|
-
dm-serializer (1.0.
|
74
|
-
dm-core (~> 1.0.
|
55
|
+
dm-serializer (1.0.2)
|
56
|
+
dm-core (~> 1.0.2)
|
75
57
|
fastercsv (~> 1.5.3)
|
76
|
-
json_pure (~> 1.4
|
77
|
-
dm-sqlite-adapter (1.0.
|
78
|
-
dm-do-adapter (~> 1.0.
|
58
|
+
json_pure (~> 1.4)
|
59
|
+
dm-sqlite-adapter (1.0.2)
|
60
|
+
dm-do-adapter (~> 1.0.2)
|
79
61
|
do_sqlite3 (~> 0.10.2)
|
80
|
-
dm-timestamps (1.0.
|
81
|
-
dm-core (~> 1.0.
|
82
|
-
dm-validations (1.0.
|
83
|
-
dm-core (~> 1.0.
|
62
|
+
dm-timestamps (1.0.2)
|
63
|
+
dm-core (~> 1.0.2)
|
64
|
+
dm-validations (1.0.2)
|
65
|
+
dm-core (~> 1.0.2)
|
84
66
|
do_sqlite3 (0.10.2)
|
85
67
|
data_objects (= 0.10.2)
|
86
68
|
erubis (2.6.6)
|
@@ -91,7 +73,7 @@ GEM
|
|
91
73
|
rack (>= 1.0.1)
|
92
74
|
fastercsv (1.5.3)
|
93
75
|
i18n (0.4.1)
|
94
|
-
json_pure (1.4.
|
76
|
+
json_pure (1.4.6)
|
95
77
|
mail (2.2.5)
|
96
78
|
activesupport (>= 2.3.6)
|
97
79
|
mime-types
|
@@ -100,21 +82,34 @@ GEM
|
|
100
82
|
mocha (0.9.8)
|
101
83
|
rake
|
102
84
|
multi_json (0.0.4)
|
103
|
-
nokogiri (1.4.
|
104
|
-
oauth2 (0.0.
|
85
|
+
nokogiri (1.4.3.1)
|
86
|
+
oauth2 (0.0.13)
|
105
87
|
faraday (~> 0.4.1)
|
106
88
|
multi_json (>= 0.0.4)
|
107
89
|
polyglot (0.3.1)
|
108
90
|
rack (1.2.1)
|
109
|
-
rack-mount (0.6.
|
91
|
+
rack-mount (0.6.13)
|
110
92
|
rack (>= 1.0.0)
|
111
93
|
rack-test (0.5.4)
|
112
94
|
rack (>= 1.0)
|
95
|
+
rails (3.0.0)
|
96
|
+
actionmailer (= 3.0.0)
|
97
|
+
actionpack (= 3.0.0)
|
98
|
+
activerecord (= 3.0.0)
|
99
|
+
activeresource (= 3.0.0)
|
100
|
+
activesupport (= 3.0.0)
|
101
|
+
bundler (~> 1.0.0)
|
102
|
+
railties (= 3.0.0)
|
103
|
+
railties (3.0.0)
|
104
|
+
actionpack (= 3.0.0)
|
105
|
+
activesupport (= 3.0.0)
|
106
|
+
rake (>= 0.8.4)
|
107
|
+
thor (~> 0.14.0)
|
113
108
|
rake (0.8.7)
|
114
109
|
thor (0.14.0)
|
115
110
|
treetop (1.4.8)
|
116
111
|
polyglot (>= 0.3.1)
|
117
|
-
tzinfo (0.3.
|
112
|
+
tzinfo (0.3.23)
|
118
113
|
warden (0.10.7)
|
119
114
|
rack (>= 1.0.0)
|
120
115
|
webrat (0.7.0)
|
@@ -127,15 +122,15 @@ PLATFORMS
|
|
127
122
|
|
128
123
|
DEPENDENCIES
|
129
124
|
bcrypt-ruby
|
130
|
-
dm-core (~> 1.0.
|
131
|
-
dm-migrations (~> 1.0.
|
125
|
+
dm-core (~> 1.0.2)
|
126
|
+
dm-migrations (~> 1.0.2)
|
132
127
|
dm-rails (~> 1.0.3)
|
133
|
-
dm-serializer (~> 1.0.
|
134
|
-
dm-sqlite-adapter (~> 1.0.
|
135
|
-
dm-timestamps (~> 1.0.
|
136
|
-
dm-validations (~> 1.0.
|
128
|
+
dm-serializer (~> 1.0.2)
|
129
|
+
dm-sqlite-adapter (~> 1.0.2)
|
130
|
+
dm-timestamps (~> 1.0.2)
|
131
|
+
dm-validations (~> 1.0.2)
|
137
132
|
mocha
|
138
133
|
oauth2
|
139
|
-
rails
|
134
|
+
rails (= 3.0.0)
|
140
135
|
warden (= 0.10.7)
|
141
136
|
webrat (= 0.7.0)
|
data/README.rdoc
CHANGED
@@ -22,18 +22,18 @@ README http://github.com/plataformatec/devise/blob/master/README.rdoc
|
|
22
22
|
|
23
23
|
Last tested against devise release: v1.1.1
|
24
24
|
|
25
|
-
Last tested against devise master: 2010-08-14, commit
|
25
|
+
Last tested against devise master: 2010-08-14, commit 0f0eb4e8cee4c1f042ffdbc4f77e755c757920a8
|
26
26
|
|
27
27
|
== Installation
|
28
28
|
|
29
29
|
Add dm-devise and dm gems to your Gemfile. The following gems are required:
|
30
30
|
|
31
|
-
gem 'dm-core', '~> 1.0.
|
32
|
-
gem 'dm-sqlite-adapter', '~> 1.0.
|
33
|
-
gem 'dm-serializer', '~> 1.0.
|
34
|
-
gem 'dm-timestamps', '~> 1.0.
|
31
|
+
gem 'dm-core', '~> 1.0.2'
|
32
|
+
gem 'dm-sqlite-adapter', '~> 1.0.2' # or your preferred adapter
|
33
|
+
gem 'dm-serializer', '~> 1.0.2'
|
34
|
+
gem 'dm-timestamps', '~> 1.0.2'
|
35
35
|
gem 'dm-rails', '~> 1.0.3'
|
36
|
-
gem 'dm-validations', '~> 1.0.
|
36
|
+
gem 'dm-validations', '~> 1.0.2' # Do not include if using data_mapper_active_model
|
37
37
|
gem 'dm-devise', '~> 1.1.0'
|
38
38
|
|
39
39
|
If you're using data_mapper_active_model do not include dm-validations in your
|
data/dm-devise.gemspec
CHANGED
@@ -5,11 +5,11 @@
|
|
5
5
|
|
6
6
|
Gem::Specification.new do |s|
|
7
7
|
s.name = %q{dm-devise}
|
8
|
-
s.version = "1.1.
|
8
|
+
s.version = "1.1.3"
|
9
9
|
|
10
10
|
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
|
11
11
|
s.authors = ["Jared Morgan"]
|
12
|
-
s.date = %q{2010-08
|
12
|
+
s.date = %q{2010-09-08}
|
13
13
|
s.description = %q{dm-devise adds DataMapper support to devise (http://github.com/plataformatec/devise) for authentication support for Rails}
|
14
14
|
s.email = %q{jmorgan@morgancreative.net}
|
15
15
|
s.extra_rdoc_files = [
|
@@ -12,7 +12,6 @@ module Devise
|
|
12
12
|
include ActiveModel::Validations
|
13
13
|
include ActiveModelCompatibility
|
14
14
|
include Compatibility
|
15
|
-
class << self; attr_reader :descendants; end;
|
16
15
|
|
17
16
|
def self.validates_uniqueness_of(*fields)
|
18
17
|
validates_with UniquenessValidator, _merge_attributes(fields)
|
data/lib/dm-devise/version.rb
CHANGED
@@ -3,7 +3,7 @@ require 'generators/devise/orm_helpers'
|
|
3
3
|
module DataMapper
|
4
4
|
module Generators
|
5
5
|
class DeviseGenerator < Rails::Generators::NamedBase
|
6
|
-
include Devise::Generators::OrmHelpers
|
6
|
+
include ::Devise::Generators::OrmHelpers
|
7
7
|
|
8
8
|
def generate_model
|
9
9
|
invoke "data_mapper:model", [name] unless model_exists?
|
@@ -11,17 +11,15 @@ class User
|
|
11
11
|
include SharedUser
|
12
12
|
include Shim
|
13
13
|
|
14
|
-
|
15
|
-
before :valid?, :update_password_confirmation
|
14
|
+
before :valid?, :update_password_confirmation
|
16
15
|
|
17
|
-
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
|
24
|
-
end
|
16
|
+
# DM's validates_confirmation_of requires the confirmation field to be present,
|
17
|
+
# while ActiveModel by default skips the confirmation test if the confirmation
|
18
|
+
# value is nil. This test takes advantage of AM's behavior, so just add the
|
19
|
+
# :password_confirmation value.
|
20
|
+
def update_password_confirmation
|
21
|
+
if self.password && self.password_confirmation.nil?
|
22
|
+
self.password_confirmation = self.password
|
25
23
|
end
|
26
24
|
end
|
27
25
|
end
|
metadata
CHANGED
@@ -1,13 +1,13 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: dm-devise
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
hash:
|
4
|
+
hash: 21
|
5
5
|
prerelease: false
|
6
6
|
segments:
|
7
7
|
- 1
|
8
8
|
- 1
|
9
|
-
-
|
10
|
-
version: 1.1.
|
9
|
+
- 3
|
10
|
+
version: 1.1.3
|
11
11
|
platform: ruby
|
12
12
|
authors:
|
13
13
|
- Jared Morgan
|
@@ -15,7 +15,7 @@ autorequire:
|
|
15
15
|
bindir: bin
|
16
16
|
cert_chain: []
|
17
17
|
|
18
|
-
date: 2010-08
|
18
|
+
date: 2010-09-08 00:00:00 -05:00
|
19
19
|
default_executable:
|
20
20
|
dependencies:
|
21
21
|
- !ruby/object:Gem::Dependency
|