dm-devise 0.1.0 → 1.1.0
Sign up to get free protection for your applications and to get access to all the features.
- data/Gemfile +0 -1
- data/Gemfile.lock +0 -117
- data/README.rdoc +7 -10
- data/Rakefile +1 -1
- data/dm-devise.gemspec +5 -2
- data/lib/dm-devise/version.rb +1 -1
- data/test/overrides/dm_validations_test.rb +1 -1
- data/test/rails_app/app/data_mapper/admin.rb +1 -1
- data/test/rails_app/app/data_mapper_active_model/admin.rb +1 -1
- metadata +22 -8
data/Gemfile
CHANGED
data/Gemfile.lock
CHANGED
@@ -8,31 +8,11 @@ GIT
|
|
8
8
|
dm-active_model (~> 1.0.0)
|
9
9
|
dm-core (~> 1.0.0)
|
10
10
|
railties (~> 3.0.0.beta3)
|
11
|
-
dm-rails (1.0.0)
|
12
|
-
actionpack (~> 3.0.0.beta3)
|
13
|
-
activesupport (~> 3.0.0.beta3)
|
14
|
-
dm-active_model (~> 1.0.0)
|
15
|
-
dm-core (~> 1.0.0)
|
16
|
-
railties (~> 3.0.0.beta3)
|
17
|
-
|
18
|
-
GIT
|
19
|
-
remote: git://github.com/plataformatec/devise
|
20
|
-
revision: ae6322e
|
21
|
-
specs:
|
22
|
-
devise (1.1.0)
|
23
|
-
bcrypt-ruby (~> 2.1.2)
|
24
|
-
warden (~> 0.10.7)
|
25
|
-
devise (1.1.0)
|
26
|
-
bcrypt-ruby (~> 2.1.2)
|
27
|
-
warden (~> 0.10.7)
|
28
11
|
|
29
12
|
GIT
|
30
13
|
remote: git://github.com/rails/rails.git
|
31
14
|
revision: 8079484
|
32
15
|
specs:
|
33
|
-
actionmailer (3.0.0.beta4)
|
34
|
-
actionpack (= 3.0.0.beta4)
|
35
|
-
mail (~> 2.2.3)
|
36
16
|
actionmailer (3.0.0.beta4)
|
37
17
|
actionpack (= 3.0.0.beta4)
|
38
18
|
mail (~> 2.2.3)
|
@@ -45,28 +25,10 @@ GIT
|
|
45
25
|
rack (~> 1.2.1)
|
46
26
|
rack-test (~> 0.5.4)
|
47
27
|
tzinfo (~> 0.3.16)
|
48
|
-
actionpack (3.0.0.beta4)
|
49
|
-
activemodel (= 3.0.0.beta4)
|
50
|
-
activesupport (= 3.0.0.beta4)
|
51
|
-
builder (~> 2.1.2)
|
52
|
-
erubis (~> 2.6.6)
|
53
|
-
i18n (~> 0.4.1)
|
54
|
-
rack (~> 1.2.1)
|
55
|
-
rack-test (~> 0.5.4)
|
56
|
-
tzinfo (~> 0.3.16)
|
57
28
|
activemodel (3.0.0.beta4)
|
58
29
|
activesupport (= 3.0.0.beta4)
|
59
30
|
builder (~> 2.1.2)
|
60
31
|
i18n (~> 0.4.1)
|
61
|
-
activemodel (3.0.0.beta4)
|
62
|
-
activesupport (= 3.0.0.beta4)
|
63
|
-
builder (~> 2.1.2)
|
64
|
-
i18n (~> 0.4.1)
|
65
|
-
activerecord (3.0.0.beta4)
|
66
|
-
activemodel (= 3.0.0.beta4)
|
67
|
-
activesupport (= 3.0.0.beta4)
|
68
|
-
arel (~> 0.4.0)
|
69
|
-
tzinfo (~> 0.3.16)
|
70
32
|
activerecord (3.0.0.beta4)
|
71
33
|
activemodel (= 3.0.0.beta4)
|
72
34
|
activesupport (= 3.0.0.beta4)
|
@@ -75,19 +37,7 @@ GIT
|
|
75
37
|
activeresource (3.0.0.beta4)
|
76
38
|
activemodel (= 3.0.0.beta4)
|
77
39
|
activesupport (= 3.0.0.beta4)
|
78
|
-
activeresource (3.0.0.beta4)
|
79
|
-
activemodel (= 3.0.0.beta4)
|
80
|
-
activesupport (= 3.0.0.beta4)
|
81
|
-
activesupport (3.0.0.beta4)
|
82
40
|
activesupport (3.0.0.beta4)
|
83
|
-
rails (3.0.0.beta4)
|
84
|
-
actionmailer (= 3.0.0.beta4)
|
85
|
-
actionpack (= 3.0.0.beta4)
|
86
|
-
activerecord (= 3.0.0.beta4)
|
87
|
-
activeresource (= 3.0.0.beta4)
|
88
|
-
activesupport (= 3.0.0.beta4)
|
89
|
-
bundler (>= 1.0.0.beta.2)
|
90
|
-
railties (= 3.0.0.beta4)
|
91
41
|
rails (3.0.0.beta4)
|
92
42
|
actionmailer (= 3.0.0.beta4)
|
93
43
|
actionpack (= 3.0.0.beta4)
|
@@ -101,57 +51,29 @@ GIT
|
|
101
51
|
activesupport (= 3.0.0.beta4)
|
102
52
|
rake (>= 0.8.3)
|
103
53
|
thor (~> 0.13.7)
|
104
|
-
railties (3.0.0.beta4)
|
105
|
-
actionpack (= 3.0.0.beta4)
|
106
|
-
activesupport (= 3.0.0.beta4)
|
107
|
-
rake (>= 0.8.3)
|
108
|
-
thor (~> 0.13.7)
|
109
54
|
|
110
55
|
GEM
|
111
56
|
remote: http://rubygems.org/
|
112
57
|
specs:
|
113
|
-
abstract (1.0.0)
|
114
58
|
abstract (1.0.0)
|
115
59
|
addressable (2.1.2)
|
116
|
-
addressable (2.1.2)
|
117
|
-
arel (0.4.0)
|
118
|
-
activesupport (>= 3.0.0.beta)
|
119
60
|
arel (0.4.0)
|
120
61
|
activesupport (>= 3.0.0.beta)
|
121
62
|
bcrypt-ruby (2.1.2)
|
122
|
-
bcrypt-ruby (2.1.2)
|
123
|
-
builder (2.1.2)
|
124
63
|
builder (2.1.2)
|
125
64
|
data_objects (0.10.2)
|
126
65
|
addressable (~> 2.1)
|
127
|
-
data_objects (0.10.2)
|
128
|
-
addressable (~> 2.1)
|
129
|
-
dm-active_model (1.0.0)
|
130
|
-
activemodel (~> 3.0.0.beta3)
|
131
|
-
dm-core (~> 1.0.0)
|
132
66
|
dm-active_model (1.0.0)
|
133
67
|
activemodel (~> 3.0.0.beta3)
|
134
68
|
dm-core (~> 1.0.0)
|
135
69
|
dm-core (1.0.0)
|
136
70
|
addressable (~> 2.1)
|
137
71
|
extlib (~> 0.9.15)
|
138
|
-
dm-core (1.0.0)
|
139
|
-
addressable (~> 2.1)
|
140
|
-
extlib (~> 0.9.15)
|
141
|
-
dm-do-adapter (1.0.0)
|
142
|
-
data_objects (~> 0.10.1)
|
143
|
-
dm-core (~> 1.0.0)
|
144
72
|
dm-do-adapter (1.0.0)
|
145
73
|
data_objects (~> 0.10.1)
|
146
74
|
dm-core (~> 1.0.0)
|
147
75
|
dm-migrations (1.0.0)
|
148
76
|
dm-core (~> 1.0.0)
|
149
|
-
dm-migrations (1.0.0)
|
150
|
-
dm-core (~> 1.0.0)
|
151
|
-
dm-serializer (1.0.0)
|
152
|
-
dm-core (~> 1.0.0)
|
153
|
-
fastercsv (~> 1.5.3)
|
154
|
-
json_pure (~> 1.4.3)
|
155
77
|
dm-serializer (1.0.0)
|
156
78
|
dm-core (~> 1.0.0)
|
157
79
|
fastercsv (~> 1.5.3)
|
@@ -159,75 +81,37 @@ GEM
|
|
159
81
|
dm-sqlite-adapter (1.0.0)
|
160
82
|
dm-do-adapter (~> 1.0.0)
|
161
83
|
do_sqlite3 (~> 0.10.2)
|
162
|
-
dm-sqlite-adapter (1.0.0)
|
163
|
-
dm-do-adapter (~> 1.0.0)
|
164
|
-
do_sqlite3 (~> 0.10.2)
|
165
|
-
dm-timestamps (1.0.0)
|
166
|
-
dm-core (~> 1.0.0)
|
167
84
|
dm-timestamps (1.0.0)
|
168
85
|
dm-core (~> 1.0.0)
|
169
86
|
dm-validations (1.0.0)
|
170
87
|
dm-core (~> 1.0.0)
|
171
|
-
dm-validations (1.0.0)
|
172
|
-
dm-core (~> 1.0.0)
|
173
|
-
do_sqlite3 (0.10.2)
|
174
|
-
data_objects (= 0.10.2)
|
175
88
|
do_sqlite3 (0.10.2)
|
176
89
|
data_objects (= 0.10.2)
|
177
90
|
erubis (2.6.6)
|
178
91
|
abstract (>= 1.0.0)
|
179
|
-
erubis (2.6.6)
|
180
|
-
abstract (>= 1.0.0)
|
181
92
|
extlib (0.9.15)
|
182
|
-
extlib (0.9.15)
|
183
|
-
fastercsv (1.5.3)
|
184
93
|
fastercsv (1.5.3)
|
185
94
|
i18n (0.4.1)
|
186
|
-
i18n (0.4.1)
|
187
|
-
json_pure (1.4.3)
|
188
95
|
json_pure (1.4.3)
|
189
96
|
mail (2.2.5)
|
190
97
|
activesupport (>= 2.3.6)
|
191
98
|
mime-types
|
192
99
|
treetop (>= 1.4.5)
|
193
|
-
mail (2.2.5)
|
194
|
-
activesupport (>= 2.3.6)
|
195
|
-
mime-types
|
196
|
-
treetop (>= 1.4.5)
|
197
|
-
mime-types (1.16)
|
198
100
|
mime-types (1.16)
|
199
|
-
mocha (0.9.8)
|
200
|
-
rake
|
201
101
|
mocha (0.9.8)
|
202
102
|
rake
|
203
103
|
nokogiri (1.4.2)
|
204
|
-
nokogiri (1.4.2)
|
205
|
-
polyglot (0.3.1)
|
206
104
|
polyglot (0.3.1)
|
207
105
|
rack (1.2.1)
|
208
|
-
rack (1.2.1)
|
209
|
-
rack-test (0.5.4)
|
210
|
-
rack (>= 1.0)
|
211
106
|
rack-test (0.5.4)
|
212
107
|
rack (>= 1.0)
|
213
108
|
rake (0.8.7)
|
214
|
-
rake (0.8.7)
|
215
|
-
thor (0.13.7)
|
216
109
|
thor (0.13.7)
|
217
110
|
treetop (1.4.8)
|
218
111
|
polyglot (>= 0.3.1)
|
219
|
-
treetop (1.4.8)
|
220
|
-
polyglot (>= 0.3.1)
|
221
|
-
tzinfo (0.3.22)
|
222
112
|
tzinfo (0.3.22)
|
223
113
|
warden (0.10.7)
|
224
114
|
rack (>= 1.0.0)
|
225
|
-
warden (0.10.7)
|
226
|
-
rack (>= 1.0.0)
|
227
|
-
webrat (0.7.0)
|
228
|
-
nokogiri (>= 1.2.0)
|
229
|
-
rack (>= 1.0)
|
230
|
-
rack-test (>= 0.5.3)
|
231
115
|
webrat (0.7.0)
|
232
116
|
nokogiri (>= 1.2.0)
|
233
117
|
rack (>= 1.0)
|
@@ -238,7 +122,6 @@ PLATFORMS
|
|
238
122
|
|
239
123
|
DEPENDENCIES
|
240
124
|
bcrypt-ruby
|
241
|
-
devise (~> 1.1.0)!
|
242
125
|
dm-core (~> 1.0.0)
|
243
126
|
dm-migrations (~> 1.0.0)
|
244
127
|
dm-rails (~> 1.0.0)!
|
data/README.rdoc
CHANGED
@@ -20,15 +20,14 @@ earlier versions, but it's not been tested (if you try, please let Jared Morgan
|
|
20
20
|
This README only covers dm-devise specifics. Make sure to read the devise
|
21
21
|
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
|
-
|
26
|
-
devise are in beta/pre-release stage.
|
25
|
+
Last tested against devise master: 2010-07-27, commit 879b64edc945e3531e65abf4a6b7970052927e39
|
27
26
|
|
28
|
-
|
29
|
-
needed for now):
|
27
|
+
== Installation
|
30
28
|
|
31
|
-
|
29
|
+
Add devise, dm-devise and dm gems to your Gemfile. The following gems are
|
30
|
+
required (although devise version may differ)
|
32
31
|
|
33
32
|
gem 'dm-core', '~> 1.0.0'
|
34
33
|
gem 'dm-migrations', '~> 1.0.0'
|
@@ -38,8 +37,8 @@ needed for now):
|
|
38
37
|
gem 'dm-rails', '~> 1.0.0', :git => 'git://github.com/datamapper/dm-rails'
|
39
38
|
gem 'dm-validations', '~> 1.0.0' # Do not include if using data_mapper_active_model
|
40
39
|
|
41
|
-
gem 'devise', '~> 1.1.
|
42
|
-
gem 'dm-devise', '~>
|
40
|
+
gem 'devise', '~> 1.1.1'
|
41
|
+
gem 'dm-devise', '~> 1.1.0'
|
43
42
|
|
44
43
|
If you're using data_mapper_active_model do not include dm-validations in your
|
45
44
|
Gemfile. Note that it's fine to follow master on DM gems other than dm-rails,
|
@@ -63,8 +62,6 @@ Read the README for devise at http://github.com/plataformatec/devise/blob/master
|
|
63
62
|
== TODO
|
64
63
|
|
65
64
|
* Example app
|
66
|
-
* Publish gem
|
67
|
-
* Updates when Rails 3 / Devise 1.1 are released (remove :git sources in Gemfile)
|
68
65
|
* Rails templates
|
69
66
|
|
70
67
|
== Note on Patches/Pull Requests
|
data/Rakefile
CHANGED
@@ -62,7 +62,7 @@ begin
|
|
62
62
|
gem.add_dependency 'dm-serializer', '~> 1.0.0'
|
63
63
|
gem.add_dependency 'dm-timestamps', '~> 1.0.0'
|
64
64
|
gem.add_dependency 'dm-rails', '~> 1.0.0'
|
65
|
-
|
65
|
+
gem.add_dependency 'devise'
|
66
66
|
gem.add_dependency 'warden', '~> 0.10.7'
|
67
67
|
gem.add_dependency 'bcrypt-ruby', '~> 2.1.2'
|
68
68
|
# gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
|
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 = "
|
8
|
+
s.version = "1.1.0"
|
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-07-
|
12
|
+
s.date = %q{2010-07-28}
|
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 = [
|
@@ -79,6 +79,7 @@ Gem::Specification.new do |s|
|
|
79
79
|
s.add_runtime_dependency(%q<dm-serializer>, ["~> 1.0.0"])
|
80
80
|
s.add_runtime_dependency(%q<dm-timestamps>, ["~> 1.0.0"])
|
81
81
|
s.add_runtime_dependency(%q<dm-rails>, ["~> 1.0.0"])
|
82
|
+
s.add_runtime_dependency(%q<devise>, [">= 0"])
|
82
83
|
s.add_runtime_dependency(%q<warden>, ["~> 0.10.7"])
|
83
84
|
s.add_runtime_dependency(%q<bcrypt-ruby>, ["~> 2.1.2"])
|
84
85
|
else
|
@@ -88,6 +89,7 @@ Gem::Specification.new do |s|
|
|
88
89
|
s.add_dependency(%q<dm-serializer>, ["~> 1.0.0"])
|
89
90
|
s.add_dependency(%q<dm-timestamps>, ["~> 1.0.0"])
|
90
91
|
s.add_dependency(%q<dm-rails>, ["~> 1.0.0"])
|
92
|
+
s.add_dependency(%q<devise>, [">= 0"])
|
91
93
|
s.add_dependency(%q<warden>, ["~> 0.10.7"])
|
92
94
|
s.add_dependency(%q<bcrypt-ruby>, ["~> 2.1.2"])
|
93
95
|
end
|
@@ -98,6 +100,7 @@ Gem::Specification.new do |s|
|
|
98
100
|
s.add_dependency(%q<dm-serializer>, ["~> 1.0.0"])
|
99
101
|
s.add_dependency(%q<dm-timestamps>, ["~> 1.0.0"])
|
100
102
|
s.add_dependency(%q<dm-rails>, ["~> 1.0.0"])
|
103
|
+
s.add_dependency(%q<devise>, [">= 0"])
|
101
104
|
s.add_dependency(%q<warden>, ["~> 0.10.7"])
|
102
105
|
s.add_dependency(%q<bcrypt-ruby>, ["~> 2.1.2"])
|
103
106
|
end
|
data/lib/dm-devise/version.rb
CHANGED
@@ -4,7 +4,7 @@ class Admin
|
|
4
4
|
property :id, Serial
|
5
5
|
property :username, String
|
6
6
|
|
7
|
-
devise :database_authenticatable, :registerable, :timeoutable, :recoverable
|
7
|
+
devise :database_authenticatable, :registerable, :timeoutable, :recoverable, :lockable, :unlock_strategy => :time
|
8
8
|
|
9
9
|
def self.create!(*args)
|
10
10
|
create(*args)
|
@@ -4,7 +4,7 @@ class Admin
|
|
4
4
|
property :id, Serial
|
5
5
|
property :username, String
|
6
6
|
|
7
|
-
devise :database_authenticatable, :registerable, :timeoutable, :recoverable
|
7
|
+
devise :database_authenticatable, :registerable, :timeoutable, :recoverable, :lockable, :unlock_strategy => :time
|
8
8
|
|
9
9
|
def self.create!(*args)
|
10
10
|
create(*args)
|
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: 19
|
5
5
|
prerelease: false
|
6
6
|
segments:
|
7
|
-
-
|
7
|
+
- 1
|
8
8
|
- 1
|
9
9
|
- 0
|
10
|
-
version:
|
10
|
+
version: 1.1.0
|
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-07-
|
18
|
+
date: 2010-07-28 00:00:00 -05:00
|
19
19
|
default_executable:
|
20
20
|
dependencies:
|
21
21
|
- !ruby/object:Gem::Dependency
|
@@ -115,9 +115,23 @@ dependencies:
|
|
115
115
|
type: :runtime
|
116
116
|
version_requirements: *id006
|
117
117
|
- !ruby/object:Gem::Dependency
|
118
|
-
name:
|
118
|
+
name: devise
|
119
119
|
prerelease: false
|
120
120
|
requirement: &id007 !ruby/object:Gem::Requirement
|
121
|
+
none: false
|
122
|
+
requirements:
|
123
|
+
- - ">="
|
124
|
+
- !ruby/object:Gem::Version
|
125
|
+
hash: 3
|
126
|
+
segments:
|
127
|
+
- 0
|
128
|
+
version: "0"
|
129
|
+
type: :runtime
|
130
|
+
version_requirements: *id007
|
131
|
+
- !ruby/object:Gem::Dependency
|
132
|
+
name: warden
|
133
|
+
prerelease: false
|
134
|
+
requirement: &id008 !ruby/object:Gem::Requirement
|
121
135
|
none: false
|
122
136
|
requirements:
|
123
137
|
- - ~>
|
@@ -129,11 +143,11 @@ dependencies:
|
|
129
143
|
- 7
|
130
144
|
version: 0.10.7
|
131
145
|
type: :runtime
|
132
|
-
version_requirements: *
|
146
|
+
version_requirements: *id008
|
133
147
|
- !ruby/object:Gem::Dependency
|
134
148
|
name: bcrypt-ruby
|
135
149
|
prerelease: false
|
136
|
-
requirement: &
|
150
|
+
requirement: &id009 !ruby/object:Gem::Requirement
|
137
151
|
none: false
|
138
152
|
requirements:
|
139
153
|
- - ~>
|
@@ -145,7 +159,7 @@ dependencies:
|
|
145
159
|
- 2
|
146
160
|
version: 2.1.2
|
147
161
|
type: :runtime
|
148
|
-
version_requirements: *
|
162
|
+
version_requirements: *id009
|
149
163
|
description: dm-devise adds DataMapper support to devise (http://github.com/plataformatec/devise) for authentication support for Rails
|
150
164
|
email: jmorgan@morgancreative.net
|
151
165
|
executables: []
|