dm-devise 1.1.8 → 1.2.0.beta

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (22) hide show
  1. data/.gitignore +5 -0
  2. data/Gemfile +7 -8
  3. data/Gemfile.lock +82 -68
  4. data/README.rdoc +15 -2
  5. data/Rakefile +5 -15
  6. data/dm-devise.gemspec +63 -84
  7. data/lib/devise/orm/data_mapper.rb +1 -0
  8. data/lib/devise/orm/data_mapper/compatibility.rb +0 -10
  9. data/lib/devise/orm/data_mapper/dm-validations.rb +1 -1
  10. data/lib/devise/orm/data_mapper_active_model.rb +1 -0
  11. data/lib/dm-devise/version.rb +1 -1
  12. data/lib/generators/data_mapper/devise_generator.rb +10 -2
  13. data/test/overrides/data_mapper_test.rb +29 -0
  14. data/test/overrides/dm_validations_test.rb +2 -2
  15. data/test/rails_app/app/data_mapper/admin.rb +6 -3
  16. data/test/rails_app/app/data_mapper/user.rb +3 -4
  17. data/test/rails_app/app/data_mapper_active_model/admin.rb +3 -1
  18. data/test/rails_app/app/data_mapper_active_model/user.rb +2 -4
  19. data/test/rails_app/config/application.rb +1 -1
  20. data/test/test_helper.rb +7 -0
  21. metadata +49 -155
  22. data/test/data_mapper/schema_test.rb +0 -16
data/.gitignore ADDED
@@ -0,0 +1,5 @@
1
+ coverage/*
2
+ .bundle
3
+ rdoc/*
4
+ pkg
5
+ log
data/Gemfile CHANGED
@@ -2,16 +2,15 @@ source :rubygems
2
2
 
3
3
  gemspec
4
4
 
5
- group :development do
6
- gem "rails", '~> 3.0.3'
5
+ gem 'rails', '3.0.3'
7
6
 
8
- gem "webrat", "0.7.2"
9
- gem "mocha", :require => false
10
- gem "oauth2"
7
+ gem 'webrat', '0.7.1'
8
+ gem 'mocha', :require => false
9
+ gem "oa-oauth", :require => "omniauth/oauth"
10
+ gem "oa-openid", :require => "omniauth/openid"
11
11
 
12
- gem 'dm-sqlite-adapter', '~> 1.0.2'
13
- gem 'jeweler', '~> 1.5.2'
14
- end
12
+ gem 'sugar-high', '~> 0.2.10'
13
+ gem 'dm-sqlite-adapter', '~> 1.0.2'
15
14
 
16
15
  group :data_mapper do
17
16
  gem 'dm-validations', '~> 1.0.0'
data/Gemfile.lock CHANGED
@@ -1,55 +1,55 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- dm-devise (1.1.8)
5
- bcrypt-ruby (~> 2.1.2)
6
- devise (~> 1.1.0)
7
- dm-core (~> 1.0.0)
8
- dm-migrations (~> 1.0.0)
4
+ dm-devise (1.2.0.beta)
5
+ devise (~> 1.2.rc)
6
+ dm-core (~> 1.0.2)
7
+ dm-migrations (~> 1.0.2)
9
8
  dm-rails (>= 1.0.3)
10
- dm-serializer (~> 1.0.0)
11
- dm-timestamps (~> 1.0.0)
9
+ dm-serializer (~> 1.0.2)
10
+ dm-timestamps (~> 1.0.2)
12
11
  sugar-high (~> 0.2.10)
13
12
 
14
13
  GEM
15
14
  remote: http://rubygems.org/
16
15
  specs:
17
16
  abstract (1.0.0)
18
- actionmailer (3.0.4)
19
- actionpack (= 3.0.4)
20
- mail (~> 2.2.15)
21
- actionpack (3.0.4)
22
- activemodel (= 3.0.4)
23
- activesupport (= 3.0.4)
17
+ actionmailer (3.0.3)
18
+ actionpack (= 3.0.3)
19
+ mail (~> 2.2.9)
20
+ actionpack (3.0.3)
21
+ activemodel (= 3.0.3)
22
+ activesupport (= 3.0.3)
24
23
  builder (~> 2.1.2)
25
24
  erubis (~> 2.6.6)
26
25
  i18n (~> 0.4)
27
26
  rack (~> 1.2.1)
28
27
  rack-mount (~> 0.6.13)
29
- rack-test (~> 0.5.7)
28
+ rack-test (~> 0.5.6)
30
29
  tzinfo (~> 0.3.23)
31
- activemodel (3.0.4)
32
- activesupport (= 3.0.4)
30
+ activemodel (3.0.3)
31
+ activesupport (= 3.0.3)
33
32
  builder (~> 2.1.2)
34
33
  i18n (~> 0.4)
35
- activerecord (3.0.4)
36
- activemodel (= 3.0.4)
37
- activesupport (= 3.0.4)
34
+ activerecord (3.0.3)
35
+ activemodel (= 3.0.3)
36
+ activesupport (= 3.0.3)
38
37
  arel (~> 2.0.2)
39
38
  tzinfo (~> 0.3.23)
40
- activeresource (3.0.4)
41
- activemodel (= 3.0.4)
42
- activesupport (= 3.0.4)
43
- activesupport (3.0.4)
44
- addressable (2.2.4)
45
- arel (2.0.8)
46
- bcrypt-ruby (2.1.4)
39
+ activeresource (3.0.3)
40
+ activemodel (= 3.0.3)
41
+ activesupport (= 3.0.3)
42
+ activesupport (3.0.3)
43
+ addressable (2.2.2)
44
+ arel (2.0.6)
45
+ bcrypt-ruby (2.1.3)
47
46
  builder (2.1.2)
48
- data_objects (0.10.3)
47
+ data_objects (0.10.2)
49
48
  addressable (~> 2.1)
50
- devise (1.1.5)
49
+ devise (1.2.rc)
51
50
  bcrypt-ruby (~> 2.1.2)
52
- warden (~> 1.0.2)
51
+ orm_adapter (~> 0.0.2)
52
+ warden (~> 1.0.0)
53
53
  dm-active_model (1.0.3)
54
54
  activemodel (~> 3.0.0)
55
55
  dm-core (~> 1.0.2)
@@ -78,68 +78,83 @@ GEM
78
78
  dm-core (~> 1.0.2)
79
79
  dm-validations (1.0.2)
80
80
  dm-core (~> 1.0.2)
81
- do_sqlite3 (0.10.3)
82
- data_objects (= 0.10.3)
81
+ do_sqlite3 (0.10.2)
82
+ data_objects (= 0.10.2)
83
83
  erubis (2.6.6)
84
84
  abstract (>= 1.0.0)
85
85
  extlib (0.9.15)
86
- faraday (0.5.5)
87
- addressable (~> 2.2.4)
88
- multipart-post (~> 1.1.0)
86
+ faraday (0.5.3)
87
+ addressable (~> 2.2.2)
88
+ multipart-post (~> 1.0.1)
89
89
  rack (>= 1.1.0, < 2)
90
- fastercsv (1.5.4)
91
- git (1.2.5)
90
+ fastercsv (1.5.3)
92
91
  i18n (0.5.0)
93
- jeweler (1.5.2)
94
- bundler (~> 1.0.0)
95
- git (>= 1.2.5)
96
- rake
97
- json_pure (1.5.1)
98
- mail (2.2.15)
92
+ json_pure (1.4.6)
93
+ mail (2.2.12)
99
94
  activesupport (>= 2.3.6)
100
95
  i18n (>= 0.4.0)
101
96
  mime-types (~> 1.16)
102
97
  treetop (~> 1.4.8)
103
98
  mime-types (1.16)
104
- mocha (0.9.11)
99
+ mocha (0.9.10)
105
100
  rake
106
101
  multi_json (0.0.5)
107
- multipart-post (1.1.0)
102
+ multipart-post (1.0.1)
108
103
  nokogiri (1.4.4)
109
- oauth2 (0.1.1)
104
+ oa-core (0.1.6)
105
+ rack (~> 1.1)
106
+ oa-oauth (0.1.6)
107
+ multi_json (~> 0.0.2)
108
+ nokogiri (~> 1.4.2)
109
+ oa-core (= 0.1.6)
110
+ oauth (~> 0.4.0)
111
+ oauth2 (~> 0.1.0)
112
+ oa-openid (0.1.6)
113
+ oa-core (= 0.1.6)
114
+ rack-openid (~> 1.2.0)
115
+ ruby-openid-apps-discovery
116
+ oauth (0.4.4)
117
+ oauth2 (0.1.0)
110
118
  faraday (~> 0.5.0)
111
119
  multi_json (~> 0.0.4)
120
+ orm_adapter (0.0.3)
112
121
  polyglot (0.3.1)
113
122
  rack (1.2.1)
114
123
  rack-mount (0.6.13)
115
124
  rack (>= 1.0.0)
116
- rack-test (0.5.7)
125
+ rack-openid (1.2.0)
126
+ rack (>= 1.1.0)
127
+ ruby-openid (>= 2.1.8)
128
+ rack-test (0.5.6)
117
129
  rack (>= 1.0)
118
- rails (3.0.4)
119
- actionmailer (= 3.0.4)
120
- actionpack (= 3.0.4)
121
- activerecord (= 3.0.4)
122
- activeresource (= 3.0.4)
123
- activesupport (= 3.0.4)
130
+ rails (3.0.3)
131
+ actionmailer (= 3.0.3)
132
+ actionpack (= 3.0.3)
133
+ activerecord (= 3.0.3)
134
+ activeresource (= 3.0.3)
135
+ activesupport (= 3.0.3)
124
136
  bundler (~> 1.0)
125
- railties (= 3.0.4)
126
- railties (3.0.4)
127
- actionpack (= 3.0.4)
128
- activesupport (= 3.0.4)
137
+ railties (= 3.0.3)
138
+ railties (3.0.3)
139
+ actionpack (= 3.0.3)
140
+ activesupport (= 3.0.3)
129
141
  rake (>= 0.8.7)
130
142
  thor (~> 0.14.4)
131
143
  rake (0.8.7)
132
144
  require_all (1.2.0)
145
+ ruby-openid (2.1.8)
146
+ ruby-openid-apps-discovery (1.2.0)
147
+ ruby-openid (>= 2.1.7)
133
148
  sugar-high (0.2.12)
134
149
  mocha (~> 0.9.8)
135
150
  require_all (~> 1.2.0)
136
151
  thor (0.14.6)
137
152
  treetop (1.4.9)
138
153
  polyglot (>= 0.3.1)
139
- tzinfo (0.3.24)
154
+ tzinfo (0.3.23)
140
155
  warden (1.0.3)
141
156
  rack (>= 1.0.0)
142
- webrat (0.7.2)
157
+ webrat (0.7.1)
143
158
  nokogiri (>= 1.2.0)
144
159
  rack (>= 1.0)
145
160
  rack-test (>= 0.5.3)
@@ -148,19 +163,18 @@ PLATFORMS
148
163
  ruby
149
164
 
150
165
  DEPENDENCIES
151
- bcrypt-ruby (~> 2.1.2)
152
- devise (~> 1.1.0)
153
- dm-core (~> 1.0.0)
166
+ devise (~> 1.2.rc)
167
+ dm-core (~> 1.0.2)
154
168
  dm-devise!
155
- dm-migrations (~> 1.0.0)
169
+ dm-migrations (~> 1.0.2)
156
170
  dm-rails (>= 1.0.3)
157
- dm-serializer (~> 1.0.0)
171
+ dm-serializer (~> 1.0.2)
158
172
  dm-sqlite-adapter (~> 1.0.2)
159
- dm-timestamps (~> 1.0.0)
173
+ dm-timestamps (~> 1.0.2)
160
174
  dm-validations (~> 1.0.0)
161
- jeweler (~> 1.5.2)
162
175
  mocha
163
- oauth2
164
- rails (~> 3.0.3)
176
+ oa-oauth
177
+ oa-openid
178
+ rails (= 3.0.3)
165
179
  sugar-high (~> 0.2.10)
166
- webrat (= 0.7.2)
180
+ webrat (= 0.7.1)
data/README.rdoc CHANGED
@@ -20,7 +20,7 @@ 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
- Last tested against devise release: v1.1.5
23
+ Last tested against devise master: 2011-01-31, commit 76a480044688672acdd40469c74c6abfea35f8a4
24
24
 
25
25
  == Installation
26
26
 
@@ -32,7 +32,7 @@ Add dm-devise and dm gems to your Gemfile. The following gems are required:
32
32
  gem 'dm-timestamps', '~> 1.0.2'
33
33
  gem 'dm-rails', '~> 1.0.3'
34
34
  gem 'dm-validations', '~> 1.0.2' # Do not include if using data_mapper_active_model
35
- gem 'dm-devise', '~> 1.1.0'
35
+ gem 'dm-devise', '~> 1.1.4'
36
36
 
37
37
  If you're using data_mapper_active_model do not include dm-validations in your
38
38
  Gemfile.
@@ -57,6 +57,19 @@ Read the README for devise at http://github.com/plataformatec/devise/blob/master
57
57
  * Example app
58
58
  * Rails templates
59
59
 
60
+ == Testing
61
+
62
+ The dm-devise test rake task runs all of devise's tests using the data_mapper
63
+ and data_mapper_active_model ORM setups. In order to run tests, you'll need a
64
+ local copy of devise (a gem is fine as long as you specify the path). By default,
65
+ dm-devise looks for devise in [path-to-dm-devise]/../devise. You can override
66
+ this by setting a DEVISE_PATH env variable. For example:
67
+
68
+ rake test DEVISE_PATH=/path/to/devise
69
+
70
+ Tests of the master branch should be run against devise master. Tests of the
71
+ 1.1 branch should be run against the devise 1.1 branch (or a 1.1.x gem).
72
+
60
73
  == Note on Patches/Pull Requests
61
74
 
62
75
  * Fork the project.
data/Rakefile CHANGED
@@ -1,14 +1,5 @@
1
1
  # encoding: UTF-8
2
2
 
3
- require 'rubygems'
4
- require 'bundler'
5
- begin
6
- Bundler.setup(:default, :development)
7
- rescue Bundler::BundlerError => e
8
- $stderr.puts e.message
9
- $stderr.puts "Run `bundle install` to install missing gems"
10
- exit e.status_code
11
- end
12
3
  require 'rake'
13
4
  require 'rake/testtask'
14
5
  require 'rake/rdoctask'
@@ -60,13 +51,12 @@ begin
60
51
  gem.email = "jmorgan@morgancreative.net"
61
52
  gem.homepage = "http://github.com/jm81/dm-devise"
62
53
  gem.authors = ["Jared Morgan"]
63
- gem.add_dependency 'dm-core', '~> 1.0.0'
64
- gem.add_dependency 'dm-migrations', '~> 1.0.0'
65
- gem.add_dependency 'dm-serializer', '~> 1.0.0'
66
- gem.add_dependency 'dm-timestamps', '~> 1.0.0'
54
+ gem.add_dependency 'dm-core', '~> 1.0.2'
55
+ gem.add_dependency 'dm-migrations', '~> 1.0.2'
56
+ gem.add_dependency 'dm-serializer', '~> 1.0.2'
57
+ gem.add_dependency 'dm-timestamps', '~> 1.0.2'
67
58
  gem.add_dependency 'dm-rails', '>= 1.0.3'
68
- gem.add_dependency 'devise', '~> 1.1.0'
69
- gem.add_dependency 'bcrypt-ruby', '~> 2.1.2'
59
+ gem.add_dependency 'devise', '~> 1.2.rc'
70
60
  gem.add_dependency 'sugar-high', '~> 0.2.10'
71
61
  # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
72
62
  end
data/dm-devise.gemspec CHANGED
@@ -1,72 +1,72 @@
1
1
  # Generated by jeweler
2
2
  # DO NOT EDIT THIS FILE DIRECTLY
3
- # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
3
+ # Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
4
4
  # -*- encoding: utf-8 -*-
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = %q{dm-devise}
8
- s.version = "1.1.8"
8
+ s.version = "1.2.0.beta"
9
9
 
10
- s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
10
+ s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
11
11
  s.authors = ["Jared Morgan"]
12
- s.date = %q{2011-02-09}
12
+ s.date = %q{2011-02-03}
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 = [
16
16
  "LICENSE",
17
- "README.rdoc"
17
+ "README.rdoc"
18
18
  ]
19
19
  s.files = [
20
20
  ".document",
21
- "Gemfile",
22
- "Gemfile.lock",
23
- "LICENSE",
24
- "README.rdoc",
25
- "Rakefile",
26
- "dm-devise.gemspec",
27
- "lib/devise/orm/data_mapper.rb",
28
- "lib/devise/orm/data_mapper/compatibility.rb",
29
- "lib/devise/orm/data_mapper/date_time.rb",
30
- "lib/devise/orm/data_mapper/dm-validations.rb",
31
- "lib/devise/orm/data_mapper/schema.rb",
32
- "lib/devise/orm/data_mapper_active_model.rb",
33
- "lib/dm-devise.rb",
34
- "lib/dm-devise/version.rb",
35
- "lib/generators/data_mapper/devise_generator.rb",
36
- "test/data_mapper/compatibility_test.rb",
37
- "test/data_mapper/schema_test.rb",
38
- "test/orm/data_mapper.rb",
39
- "test/orm/data_mapper_active_model.rb",
40
- "test/overrides/data_mapper_test.rb",
41
- "test/overrides/dm_validations_test.rb",
42
- "test/rails_app/app/data_mapper/admin.rb",
43
- "test/rails_app/app/data_mapper/shim.rb",
44
- "test/rails_app/app/data_mapper/user.rb",
45
- "test/rails_app/app/data_mapper_active_model/admin.rb",
46
- "test/rails_app/app/data_mapper_active_model/user.rb",
47
- "test/rails_app/config/application.rb",
48
- "test/rails_app/config/environment.rb",
49
- "test/test_helper.rb"
21
+ ".gitignore",
22
+ "Gemfile",
23
+ "Gemfile.lock",
24
+ "LICENSE",
25
+ "README.rdoc",
26
+ "Rakefile",
27
+ "dm-devise.gemspec",
28
+ "lib/devise/orm/data_mapper.rb",
29
+ "lib/devise/orm/data_mapper/compatibility.rb",
30
+ "lib/devise/orm/data_mapper/date_time.rb",
31
+ "lib/devise/orm/data_mapper/dm-validations.rb",
32
+ "lib/devise/orm/data_mapper/schema.rb",
33
+ "lib/devise/orm/data_mapper_active_model.rb",
34
+ "lib/dm-devise.rb",
35
+ "lib/dm-devise/version.rb",
36
+ "lib/generators/data_mapper/devise_generator.rb",
37
+ "test/data_mapper/compatibility_test.rb",
38
+ "test/orm/data_mapper.rb",
39
+ "test/orm/data_mapper_active_model.rb",
40
+ "test/overrides/data_mapper_test.rb",
41
+ "test/overrides/dm_validations_test.rb",
42
+ "test/rails_app/app/data_mapper/admin.rb",
43
+ "test/rails_app/app/data_mapper/shim.rb",
44
+ "test/rails_app/app/data_mapper/user.rb",
45
+ "test/rails_app/app/data_mapper_active_model/admin.rb",
46
+ "test/rails_app/app/data_mapper_active_model/user.rb",
47
+ "test/rails_app/config/application.rb",
48
+ "test/rails_app/config/environment.rb",
49
+ "test/test_helper.rb"
50
50
  ]
51
51
  s.homepage = %q{http://github.com/jm81/dm-devise}
52
+ s.rdoc_options = ["--charset=UTF-8"]
52
53
  s.require_paths = ["lib"]
53
54
  s.rubygems_version = %q{1.3.7}
54
55
  s.summary = %q{Support for using DataMapper ORM with devise}
55
56
  s.test_files = [
56
- "test/data_mapper/compatibility_test.rb",
57
- "test/data_mapper/schema_test.rb",
58
- "test/orm/data_mapper.rb",
59
- "test/orm/data_mapper_active_model.rb",
60
- "test/overrides/data_mapper_test.rb",
61
- "test/overrides/dm_validations_test.rb",
62
- "test/rails_app/app/data_mapper/admin.rb",
63
- "test/rails_app/app/data_mapper/shim.rb",
64
- "test/rails_app/app/data_mapper/user.rb",
65
- "test/rails_app/app/data_mapper_active_model/admin.rb",
66
- "test/rails_app/app/data_mapper_active_model/user.rb",
67
- "test/rails_app/config/application.rb",
68
- "test/rails_app/config/environment.rb",
69
- "test/test_helper.rb"
57
+ "test/test_helper.rb",
58
+ "test/data_mapper/compatibility_test.rb",
59
+ "test/rails_app/config/environment.rb",
60
+ "test/rails_app/config/application.rb",
61
+ "test/rails_app/app/data_mapper/admin.rb",
62
+ "test/rails_app/app/data_mapper/shim.rb",
63
+ "test/rails_app/app/data_mapper/user.rb",
64
+ "test/rails_app/app/data_mapper_active_model/admin.rb",
65
+ "test/rails_app/app/data_mapper_active_model/user.rb",
66
+ "test/overrides/data_mapper_test.rb",
67
+ "test/overrides/dm_validations_test.rb",
68
+ "test/orm/data_mapper.rb",
69
+ "test/orm/data_mapper_active_model.rb"
70
70
  ]
71
71
 
72
72
  if s.respond_to? :specification_version then
@@ -74,50 +74,29 @@ Gem::Specification.new do |s|
74
74
  s.specification_version = 3
75
75
 
76
76
  if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
77
- s.add_development_dependency(%q<rails>, ["~> 3.0.3"])
78
- s.add_development_dependency(%q<webrat>, ["= 0.7.2"])
79
- s.add_development_dependency(%q<mocha>, [">= 0"])
80
- s.add_development_dependency(%q<oauth2>, [">= 0"])
81
- s.add_development_dependency(%q<dm-sqlite-adapter>, ["~> 1.0.2"])
82
- s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
83
- s.add_runtime_dependency(%q<dm-core>, ["~> 1.0.0"])
84
- s.add_runtime_dependency(%q<dm-migrations>, ["~> 1.0.0"])
85
- s.add_runtime_dependency(%q<dm-serializer>, ["~> 1.0.0"])
86
- s.add_runtime_dependency(%q<dm-timestamps>, ["~> 1.0.0"])
77
+ s.add_runtime_dependency(%q<dm-core>, ["~> 1.0.2"])
78
+ s.add_runtime_dependency(%q<dm-migrations>, ["~> 1.0.2"])
79
+ s.add_runtime_dependency(%q<dm-serializer>, ["~> 1.0.2"])
80
+ s.add_runtime_dependency(%q<dm-timestamps>, ["~> 1.0.2"])
87
81
  s.add_runtime_dependency(%q<dm-rails>, [">= 1.0.3"])
88
- s.add_runtime_dependency(%q<devise>, ["~> 1.1.0"])
89
- s.add_runtime_dependency(%q<bcrypt-ruby>, ["~> 2.1.2"])
82
+ s.add_runtime_dependency(%q<devise>, ["~> 1.2.rc"])
90
83
  s.add_runtime_dependency(%q<sugar-high>, ["~> 0.2.10"])
91
84
  else
92
- s.add_dependency(%q<rails>, ["~> 3.0.3"])
93
- s.add_dependency(%q<webrat>, ["= 0.7.2"])
94
- s.add_dependency(%q<mocha>, [">= 0"])
95
- s.add_dependency(%q<oauth2>, [">= 0"])
96
- s.add_dependency(%q<dm-sqlite-adapter>, ["~> 1.0.2"])
97
- s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
98
- s.add_dependency(%q<dm-core>, ["~> 1.0.0"])
99
- s.add_dependency(%q<dm-migrations>, ["~> 1.0.0"])
100
- s.add_dependency(%q<dm-serializer>, ["~> 1.0.0"])
101
- s.add_dependency(%q<dm-timestamps>, ["~> 1.0.0"])
85
+ s.add_dependency(%q<dm-core>, ["~> 1.0.2"])
86
+ s.add_dependency(%q<dm-migrations>, ["~> 1.0.2"])
87
+ s.add_dependency(%q<dm-serializer>, ["~> 1.0.2"])
88
+ s.add_dependency(%q<dm-timestamps>, ["~> 1.0.2"])
102
89
  s.add_dependency(%q<dm-rails>, [">= 1.0.3"])
103
- s.add_dependency(%q<devise>, ["~> 1.1.0"])
104
- s.add_dependency(%q<bcrypt-ruby>, ["~> 2.1.2"])
90
+ s.add_dependency(%q<devise>, ["~> 1.2.rc"])
105
91
  s.add_dependency(%q<sugar-high>, ["~> 0.2.10"])
106
92
  end
107
93
  else
108
- s.add_dependency(%q<rails>, ["~> 3.0.3"])
109
- s.add_dependency(%q<webrat>, ["= 0.7.2"])
110
- s.add_dependency(%q<mocha>, [">= 0"])
111
- s.add_dependency(%q<oauth2>, [">= 0"])
112
- s.add_dependency(%q<dm-sqlite-adapter>, ["~> 1.0.2"])
113
- s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
114
- s.add_dependency(%q<dm-core>, ["~> 1.0.0"])
115
- s.add_dependency(%q<dm-migrations>, ["~> 1.0.0"])
116
- s.add_dependency(%q<dm-serializer>, ["~> 1.0.0"])
117
- s.add_dependency(%q<dm-timestamps>, ["~> 1.0.0"])
94
+ s.add_dependency(%q<dm-core>, ["~> 1.0.2"])
95
+ s.add_dependency(%q<dm-migrations>, ["~> 1.0.2"])
96
+ s.add_dependency(%q<dm-serializer>, ["~> 1.0.2"])
97
+ s.add_dependency(%q<dm-timestamps>, ["~> 1.0.2"])
118
98
  s.add_dependency(%q<dm-rails>, [">= 1.0.3"])
119
- s.add_dependency(%q<devise>, ["~> 1.1.0"])
120
- s.add_dependency(%q<bcrypt-ruby>, ["~> 2.1.2"])
99
+ s.add_dependency(%q<devise>, ["~> 1.2.rc"])
121
100
  s.add_dependency(%q<sugar-high>, ["~> 0.2.10"])
122
101
  end
123
102
  end
data/lib/devise/orm/data_mapper.rb CHANGED
@@ -3,6 +3,7 @@ require 'devise/orm/data_mapper/compatibility'
3
3
  require 'devise/orm/data_mapper/schema'
4
4
  require 'devise/orm/data_mapper/date_time'
5
5
  require 'devise/orm/data_mapper/dm-validations'
6
+ require 'orm_adapter/adapters/data_mapper'
6
7
 
7
8
  module Devise
8
9
  module Orm
data/lib/devise/orm/data_mapper/compatibility.rb CHANGED
@@ -31,16 +31,6 @@ module Devise
31
31
  METHOD
32
32
  end
33
33
  end
34
-
35
- # Add ActiveRecord like finder
36
- def find(*args)
37
- case args.first
38
- when :first, :all
39
- send(args.shift, *args)
40
- else
41
- get(*args)
42
- end
43
- end
44
34
  end
45
35
 
46
36
  def changed?
data/lib/devise/orm/data_mapper/dm-validations.rb CHANGED
@@ -50,6 +50,6 @@ DataMapper::Validate::ValidationErrors.default_error_messages = {
50
50
  :even => 'must be even',
51
51
  :primitive => '%s must be of type %s',
52
52
  :not_found => '%s not found',
53
- :already_confirmed => '%s was already confirmed',
53
+ :already_confirmed => '%s was already confirmed, please try signing in',
54
54
  :not_locked => '%s was not locked'
55
55
  }
data/lib/devise/orm/data_mapper_active_model.rb CHANGED
@@ -2,6 +2,7 @@ require 'dm-devise'
2
2
  require 'devise/orm/data_mapper/compatibility'
3
3
  require 'devise/orm/data_mapper/schema'
4
4
  require 'devise/orm/data_mapper/date_time'
5
+ require 'orm_adapter/adapters/data_mapper'
5
6
 
6
7
  module Devise
7
8
  module Orm
data/lib/dm-devise/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module DataMapper
2
2
  module Devise
3
- VERSION = '1.1.8'.freeze
3
+ VERSION = '1.2.0.beta'.freeze
4
4
  end
5
5
  end
data/lib/generators/data_mapper/devise_generator.rb CHANGED
@@ -1,17 +1,25 @@
1
1
  require 'generators/devise/orm_helpers'
2
2
  require 'sugar-high/file'
3
3
 
4
+ # Reload Active Support's String#blank?, overridden by sugar-high. Active Support's
5
+ # version considers any all-space String blank, behavior that devise expects.
6
+ class String #:nodoc:
7
+ def blank?
8
+ self !~ /\S/
9
+ end
10
+ end
11
+
4
12
  module DataMapper
5
13
  module Generators
6
14
  class DeviseGenerator < Rails::Generators::NamedBase
7
15
  include ::Devise::Generators::OrmHelpers
8
16
 
9
17
  def generate_model
10
- invoke "data_mapper:model", [name] unless model_exists?
18
+ invoke "data_mapper:model", [name] unless model_exists? && behavior == :invoke
11
19
  end
12
20
 
13
21
  def inject_devise_content
14
- inject_into_file model_path, model_contents, :after => "include DataMapper::Resource\n"
22
+ inject_into_file model_path, model_contents, :after => "include DataMapper::Resource\n" if model_exists?
15
23
  end
16
24
 
17
25
  def replace_default_devise_orm
data/test/overrides/data_mapper_test.rb CHANGED
@@ -48,3 +48,32 @@ class TrackableHooksTest < ActionController::IntegrationTest
48
48
  end
49
49
  end
50
50
 
51
+ class DatabaseAuthenticatableTest < ActiveSupport::TestCase
52
+ undef test_should_downcase_case_insensitive_keys_when_saving
53
+
54
+ # save! is used in devise version of this test. In AR, save! runs callbacks
55
+ # (and raises an error if any return false, which I assume is why its being
56
+ # used). In DM, save! skips callbacks. Therefore, override and change #save!
57
+ # to #save.
58
+ test 'should downcase case insensitive keys when saving' do
59
+ # case_insensitive_keys is set to :email by default.
60
+ email = 'Foo@Bar.com'
61
+ user = new_user(:email => email)
62
+
63
+ assert_equal email, user.email
64
+ user.save
65
+ assert_equal email.downcase, user.email
66
+ end
67
+ end
68
+
69
+ class AuthenticationRedirectTest < ActionController::IntegrationTest
70
+ undef test_sign_in_with_xml_format_returns_xml_response
71
+
72
+ # It appears DM's to_xml does not add the xml header
73
+ test 'sign in with xml format returns xml response' do
74
+ create_user
75
+ post user_session_path(:format => 'xml', :user => {:email => "user@test.com", :password => '123456'})
76
+ assert_response :success
77
+ assert_match /\A<user><id/, response.body
78
+ end
79
+ end
data/test/overrides/dm_validations_test.rb CHANGED
@@ -29,13 +29,13 @@ if DEVISE_ORM == :data_mapper
29
29
 
30
30
  class AuthenticationOthersTest < ActionController::IntegrationTest
31
31
 
32
- undef test_registration_in_xml_format
32
+ undef test_registration_in_xml_format_works_when_recognizing_path
33
33
 
34
34
  # DM's validates_confirmation_of requires the confirmation field to be present,
35
35
  # while ActiveModel by default skips the confirmation test if the confirmation
36
36
  # value is nil. This test takes advantage of AM's behavior, so just add the
37
37
  # :password_confirmation value.
38
- test 'registration in xml format' do
38
+ test 'registration in xml format works when recognizing path' do
39
39
  assert_nothing_raised do
40
40
  # post user_registration_path(:format => 'xml', :user => {:email => "test@example.com", :password => "invalid"} )
41
41
  post user_registration_path(:format => 'xml', :user => {:email => "test@example.com", :password => "invalid", :password_confirmation => "invalid"} )
data/test/rails_app/app/data_mapper/admin.rb CHANGED
@@ -1,10 +1,13 @@
1
+ require 'shared_admin'
2
+
1
3
  class Admin
2
4
  include DataMapper::Resource
3
5
 
4
6
  property :id, Serial
5
7
  property :username, String
6
-
8
+
9
+ include SharedAdmin
7
10
  include Shim
8
-
9
- devise :database_authenticatable, :timeoutable, :registerable, :recoverable, :lockable, :unlock_strategy => :time
11
+
12
+ property :remember_token, String
10
13
  end
data/test/rails_app/app/data_mapper/user.rb CHANGED
@@ -1,3 +1,5 @@
1
+ require 'shared_user'
2
+
1
3
  class User
2
4
  include DataMapper::Resource
3
5
 
@@ -6,10 +8,7 @@ class User
6
8
  property :facebook_token, String
7
9
  timestamps :at
8
10
 
9
- devise :database_authenticatable, :confirmable, :lockable, :recoverable,
10
- :registerable, :rememberable, :timeoutable, :token_authenticatable,
11
- :trackable, :validatable
12
-
11
+ include SharedUser
13
12
  include Shim
14
13
 
15
14
  before :valid?, :update_password_confirmation
data/test/rails_app/app/data_mapper_active_model/admin.rb CHANGED
@@ -1,3 +1,4 @@
1
+ require 'shared_admin'
1
2
  require File.join(File.dirname(__FILE__), '../data_mapper/shim.rb')
2
3
 
3
4
  class Admin
@@ -6,7 +7,8 @@ class Admin
6
7
  property :id, Serial
7
8
  property :username, String
8
9
 
10
+ include SharedAdmin
9
11
  include Shim
10
12
 
11
- devise :database_authenticatable, :timeoutable, :registerable, :recoverable, :lockable, :unlock_strategy => :time
13
+ property :remember_token, String
12
14
  end
data/test/rails_app/app/data_mapper_active_model/user.rb CHANGED
@@ -1,3 +1,4 @@
1
+ require 'shared_user'
1
2
  require File.join(File.dirname(__FILE__), '../data_mapper/shim.rb')
2
3
 
3
4
  class User
@@ -8,9 +9,6 @@ class User
8
9
  property :facebook_token, String
9
10
  timestamps :at
10
11
 
11
- devise :database_authenticatable, :confirmable, :lockable, :recoverable,
12
- :registerable, :rememberable, :timeoutable, :token_authenticatable,
13
- :trackable, :validatable
14
-
12
+ include SharedUser
15
13
  include Shim
16
14
  end
data/test/rails_app/config/application.rb CHANGED
@@ -6,7 +6,7 @@ require "action_mailer/railtie"
6
6
  require "active_resource/railtie"
7
7
  require "rails/test_unit/railtie"
8
8
 
9
- Bundler.require :default, :development, DEVISE_ORM
9
+ Bundler.require :default, DEVISE_ORM
10
10
 
11
11
  begin
12
12
  require "#{DEVISE_ORM}/railtie"
data/test/test_helper.rb CHANGED
@@ -16,6 +16,13 @@ Webrat.configure do |config|
16
16
  config.open_error_files = false
17
17
  end
18
18
 
19
+ Devise::OmniAuth.test_mode!
20
+
19
21
  # Add support to load paths so we can overwrite broken webrat setup
20
22
  $:.unshift "#{DEVISE_PATH}/test/support"
21
23
  Dir["#{DEVISE_PATH}/test/support/**/*.rb"].each { |f| require f }
24
+
25
+ # For generators
26
+ require "rails/generators/test_case"
27
+ require "generators/devise/install_generator"
28
+ require "generators/devise/views_generator"
metadata CHANGED
@@ -1,13 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: dm-devise
3
3
  version: !ruby/object:Gem::Version
4
- hash: 3
5
- prerelease: false
4
+ hash: 31098177
5
+ prerelease: true
6
6
  segments:
7
7
  - 1
8
- - 1
9
- - 8
10
- version: 1.1.8
8
+ - 2
9
+ - 0
10
+ - beta
11
+ version: 1.2.0.beta
11
12
  platform: ruby
12
13
  authors:
13
14
  - Jared Morgan
@@ -15,73 +16,13 @@ autorequire:
15
16
  bindir: bin
16
17
  cert_chain: []
17
18
 
18
- date: 2011-02-09 00:00:00 -06:00
19
+ date: 2011-02-03 00:00:00 -06:00
19
20
  default_executable:
20
21
  dependencies:
21
22
  - !ruby/object:Gem::Dependency
22
- name: rails
23
+ name: dm-core
23
24
  prerelease: false
24
25
  requirement: &id001 !ruby/object:Gem::Requirement
25
- none: false
26
- requirements:
27
- - - ~>
28
- - !ruby/object:Gem::Version
29
- hash: 1
30
- segments:
31
- - 3
32
- - 0
33
- - 3
34
- version: 3.0.3
35
- type: :development
36
- version_requirements: *id001
37
- - !ruby/object:Gem::Dependency
38
- name: webrat
39
- prerelease: false
40
- requirement: &id002 !ruby/object:Gem::Requirement
41
- none: false
42
- requirements:
43
- - - "="
44
- - !ruby/object:Gem::Version
45
- hash: 7
46
- segments:
47
- - 0
48
- - 7
49
- - 2
50
- version: 0.7.2
51
- type: :development
52
- version_requirements: *id002
53
- - !ruby/object:Gem::Dependency
54
- name: mocha
55
- prerelease: false
56
- requirement: &id003 !ruby/object:Gem::Requirement
57
- none: false
58
- requirements:
59
- - - ">="
60
- - !ruby/object:Gem::Version
61
- hash: 3
62
- segments:
63
- - 0
64
- version: "0"
65
- type: :development
66
- version_requirements: *id003
67
- - !ruby/object:Gem::Dependency
68
- name: oauth2
69
- prerelease: false
70
- requirement: &id004 !ruby/object:Gem::Requirement
71
- none: false
72
- requirements:
73
- - - ">="
74
- - !ruby/object:Gem::Version
75
- hash: 3
76
- segments:
77
- - 0
78
- version: "0"
79
- type: :development
80
- version_requirements: *id004
81
- - !ruby/object:Gem::Dependency
82
- name: dm-sqlite-adapter
83
- prerelease: false
84
- requirement: &id005 !ruby/object:Gem::Requirement
85
26
  none: false
86
27
  requirements:
87
28
  - - ~>
@@ -92,92 +33,60 @@ dependencies:
92
33
  - 0
93
34
  - 2
94
35
  version: 1.0.2
95
- type: :development
96
- version_requirements: *id005
97
- - !ruby/object:Gem::Dependency
98
- name: jeweler
99
- prerelease: false
100
- requirement: &id006 !ruby/object:Gem::Requirement
101
- none: false
102
- requirements:
103
- - - ~>
104
- - !ruby/object:Gem::Version
105
- hash: 7
106
- segments:
107
- - 1
108
- - 5
109
- - 2
110
- version: 1.5.2
111
- type: :development
112
- version_requirements: *id006
113
- - !ruby/object:Gem::Dependency
114
- name: dm-core
115
- prerelease: false
116
- requirement: &id007 !ruby/object:Gem::Requirement
117
- none: false
118
- requirements:
119
- - - ~>
120
- - !ruby/object:Gem::Version
121
- hash: 23
122
- segments:
123
- - 1
124
- - 0
125
- - 0
126
- version: 1.0.0
127
36
  type: :runtime
128
- version_requirements: *id007
37
+ version_requirements: *id001
129
38
  - !ruby/object:Gem::Dependency
130
39
  name: dm-migrations
131
40
  prerelease: false
132
- requirement: &id008 !ruby/object:Gem::Requirement
41
+ requirement: &id002 !ruby/object:Gem::Requirement
133
42
  none: false
134
43
  requirements:
135
44
  - - ~>
136
45
  - !ruby/object:Gem::Version
137
- hash: 23
46
+ hash: 19
138
47
  segments:
139
48
  - 1
140
49
  - 0
141
- - 0
142
- version: 1.0.0
50
+ - 2
51
+ version: 1.0.2
143
52
  type: :runtime
144
- version_requirements: *id008
53
+ version_requirements: *id002
145
54
  - !ruby/object:Gem::Dependency
146
55
  name: dm-serializer
147
56
  prerelease: false
148
- requirement: &id009 !ruby/object:Gem::Requirement
57
+ requirement: &id003 !ruby/object:Gem::Requirement
149
58
  none: false
150
59
  requirements:
151
60
  - - ~>
152
61
  - !ruby/object:Gem::Version
153
- hash: 23
62
+ hash: 19
154
63
  segments:
155
64
  - 1
156
65
  - 0
157
- - 0
158
- version: 1.0.0
66
+ - 2
67
+ version: 1.0.2
159
68
  type: :runtime
160
- version_requirements: *id009
69
+ version_requirements: *id003
161
70
  - !ruby/object:Gem::Dependency
162
71
  name: dm-timestamps
163
72
  prerelease: false
164
- requirement: &id010 !ruby/object:Gem::Requirement
73
+ requirement: &id004 !ruby/object:Gem::Requirement
165
74
  none: false
166
75
  requirements:
167
76
  - - ~>
168
77
  - !ruby/object:Gem::Version
169
- hash: 23
78
+ hash: 19
170
79
  segments:
171
80
  - 1
172
81
  - 0
173
- - 0
174
- version: 1.0.0
82
+ - 2
83
+ version: 1.0.2
175
84
  type: :runtime
176
- version_requirements: *id010
85
+ version_requirements: *id004
177
86
  - !ruby/object:Gem::Dependency
178
87
  name: dm-rails
179
88
  prerelease: false
180
- requirement: &id011 !ruby/object:Gem::Requirement
89
+ requirement: &id005 !ruby/object:Gem::Requirement
181
90
  none: false
182
91
  requirements:
183
92
  - - ">="
@@ -189,43 +98,27 @@ dependencies:
189
98
  - 3
190
99
  version: 1.0.3
191
100
  type: :runtime
192
- version_requirements: *id011
101
+ version_requirements: *id005
193
102
  - !ruby/object:Gem::Dependency
194
103
  name: devise
195
104
  prerelease: false
196
- requirement: &id012 !ruby/object:Gem::Requirement
197
- none: false
198
- requirements:
199
- - - ~>
200
- - !ruby/object:Gem::Version
201
- hash: 19
202
- segments:
203
- - 1
204
- - 1
205
- - 0
206
- version: 1.1.0
207
- type: :runtime
208
- version_requirements: *id012
209
- - !ruby/object:Gem::Dependency
210
- name: bcrypt-ruby
211
- prerelease: false
212
- requirement: &id013 !ruby/object:Gem::Requirement
105
+ requirement: &id006 !ruby/object:Gem::Requirement
213
106
  none: false
214
107
  requirements:
215
108
  - - ~>
216
109
  - !ruby/object:Gem::Version
217
- hash: 15
110
+ hash: 7712074
218
111
  segments:
219
- - 2
220
112
  - 1
221
113
  - 2
222
- version: 2.1.2
114
+ - rc
115
+ version: 1.2.rc
223
116
  type: :runtime
224
- version_requirements: *id013
117
+ version_requirements: *id006
225
118
  - !ruby/object:Gem::Dependency
226
119
  name: sugar-high
227
120
  prerelease: false
228
- requirement: &id014 !ruby/object:Gem::Requirement
121
+ requirement: &id007 !ruby/object:Gem::Requirement
229
122
  none: false
230
123
  requirements:
231
124
  - - ~>
@@ -237,7 +130,7 @@ dependencies:
237
130
  - 10
238
131
  version: 0.2.10
239
132
  type: :runtime
240
- version_requirements: *id014
133
+ version_requirements: *id007
241
134
  description: dm-devise adds DataMapper support to devise (http://github.com/plataformatec/devise) for authentication support for Rails
242
135
  email: jmorgan@morgancreative.net
243
136
  executables: []
@@ -249,6 +142,7 @@ extra_rdoc_files:
249
142
  - README.rdoc
250
143
  files:
251
144
  - .document
145
+ - .gitignore
252
146
  - Gemfile
253
147
  - Gemfile.lock
254
148
  - LICENSE
@@ -265,7 +159,6 @@ files:
265
159
  - lib/dm-devise/version.rb
266
160
  - lib/generators/data_mapper/devise_generator.rb
267
161
  - test/data_mapper/compatibility_test.rb
268
- - test/data_mapper/schema_test.rb
269
162
  - test/orm/data_mapper.rb
270
163
  - test/orm/data_mapper_active_model.rb
271
164
  - test/overrides/data_mapper_test.rb
@@ -283,8 +176,8 @@ homepage: http://github.com/jm81/dm-devise
283
176
  licenses: []
284
177
 
285
178
  post_install_message:
286
- rdoc_options: []
287
-
179
+ rdoc_options:
180
+ - --charset=UTF-8
288
181
  require_paths:
289
182
  - lib
290
183
  required_ruby_version: !ruby/object:Gem::Requirement
@@ -299,12 +192,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
299
192
  required_rubygems_version: !ruby/object:Gem::Requirement
300
193
  none: false
301
194
  requirements:
302
- - - ">="
195
+ - - ">"
303
196
  - !ruby/object:Gem::Version
304
- hash: 3
197
+ hash: 25
305
198
  segments:
306
- - 0
307
- version: "0"
199
+ - 1
200
+ - 3
201
+ - 1
202
+ version: 1.3.1
308
203
  requirements: []
309
204
 
310
205
  rubyforge_project:
@@ -313,17 +208,16 @@ signing_key:
313
208
  specification_version: 3
314
209
  summary: Support for using DataMapper ORM with devise
315
210
  test_files:
211
+ - test/test_helper.rb
316
212
  - test/data_mapper/compatibility_test.rb
317
- - test/data_mapper/schema_test.rb
318
- - test/orm/data_mapper.rb
319
- - test/orm/data_mapper_active_model.rb
320
- - test/overrides/data_mapper_test.rb
321
- - test/overrides/dm_validations_test.rb
213
+ - test/rails_app/config/environment.rb
214
+ - test/rails_app/config/application.rb
322
215
  - test/rails_app/app/data_mapper/admin.rb
323
216
  - test/rails_app/app/data_mapper/shim.rb
324
217
  - test/rails_app/app/data_mapper/user.rb
325
218
  - test/rails_app/app/data_mapper_active_model/admin.rb
326
219
  - test/rails_app/app/data_mapper_active_model/user.rb
327
- - test/rails_app/config/application.rb
328
- - test/rails_app/config/environment.rb
329
- - test/test_helper.rb
220
+ - test/overrides/data_mapper_test.rb
221
+ - test/overrides/dm_validations_test.rb
222
+ - test/orm/data_mapper.rb
223
+ - test/orm/data_mapper_active_model.rb
data/test/data_mapper/schema_test.rb DELETED
@@ -1,16 +0,0 @@
1
- require 'test_helper'
2
-
3
- class DataMapperSchemaTest < ActiveSupport::TestCase
4
- test 'required explicitly set to false' do
5
- begin
6
- DataMapper::Property.required(true)
7
- model = Class.new(User)
8
- model.apply_devise_schema :required_string, String, :required => true
9
- model.apply_devise_schema :not_required_string, String
10
- assert model.properties['required_string'].required?
11
- assert !model.properties['not_required_string'].required?
12
- ensure
13
- DataMapper::Property.required(false)
14
- end
15
- end
16
- end