dm-devise 1.2.0.beta → 1.2.0.rc
Sign up to get free protection for your applications and to get access to all the features.
- data/Gemfile +19 -8
- data/Gemfile.lock +95 -101
- data/README.rdoc +12 -8
- data/Rakefile +9 -24
- data/dm-devise.gemspec +19 -96
- data/lib/devise/orm/data_mapper/schema.rb +1 -0
- data/lib/dm-devise/version.rb +1 -1
- data/test/data_mapper/schema_test.rb +16 -0
- data/test/generators/data_mapper_generator_test.rb +22 -0
- data/test/overrides/data_mapper_test.rb +1 -1
- data/test/rails_app/app/data_mapper/shim.rb +4 -8
- data/test/test_helper.rb +2 -2
- metadata +58 -33
data/Gemfile
CHANGED
@@ -2,16 +2,27 @@ source :rubygems
|
|
2
2
|
|
3
3
|
gemspec
|
4
4
|
|
5
|
-
gem '
|
5
|
+
gem 'oa-oauth', '~> 0.2.0', :require => 'omniauth/oauth'
|
6
|
+
gem 'oa-openid', '~> 0.2.0', :require => 'omniauth/openid'
|
6
7
|
|
7
|
-
|
8
|
-
gem '
|
9
|
-
gem
|
10
|
-
|
8
|
+
group :test do
|
9
|
+
gem 'webrat', '0.7.2', :require => false
|
10
|
+
gem 'mocha', :require => false
|
11
|
+
end
|
12
|
+
|
13
|
+
DM_VERSION = '~> 1.1.0.rc3'
|
11
14
|
|
12
|
-
|
13
|
-
gem '
|
15
|
+
group :development do
|
16
|
+
gem 'rails', '~> 3.0.4'
|
17
|
+
gem 'dm-sqlite-adapter', DM_VERSION
|
18
|
+
|
19
|
+
gem 'dm-core', DM_VERSION
|
20
|
+
gem 'dm-migrations', DM_VERSION
|
21
|
+
gem 'dm-serializer', DM_VERSION
|
22
|
+
gem 'dm-timestamps', DM_VERSION
|
23
|
+
gem 'dm-rails', DM_VERSION
|
24
|
+
end
|
14
25
|
|
15
26
|
group :data_mapper do
|
16
|
-
gem 'dm-validations',
|
27
|
+
gem 'dm-validations', DM_VERSION
|
17
28
|
end
|
data/Gemfile.lock
CHANGED
@@ -2,122 +2,118 @@ PATH
|
|
2
2
|
remote: .
|
3
3
|
specs:
|
4
4
|
dm-devise (1.2.0.beta)
|
5
|
-
devise (~> 1.2.
|
6
|
-
dm-core (
|
7
|
-
dm-migrations (
|
8
|
-
dm-rails (>= 1.0.3)
|
9
|
-
dm-serializer (
|
10
|
-
dm-timestamps (
|
5
|
+
devise (~> 1.2.rc2)
|
6
|
+
dm-core (>= 1.0.2, < 1.2)
|
7
|
+
dm-migrations (>= 1.0.2, < 1.2)
|
8
|
+
dm-rails (>= 1.0.3, < 1.2)
|
9
|
+
dm-serializer (>= 1.0.2, < 1.2)
|
10
|
+
dm-timestamps (>= 1.0.2, < 1.2)
|
11
11
|
sugar-high (~> 0.2.10)
|
12
12
|
|
13
13
|
GEM
|
14
14
|
remote: http://rubygems.org/
|
15
15
|
specs:
|
16
16
|
abstract (1.0.0)
|
17
|
-
actionmailer (3.0.
|
18
|
-
actionpack (= 3.0.
|
19
|
-
mail (~> 2.2.
|
20
|
-
actionpack (3.0.
|
21
|
-
activemodel (= 3.0.
|
22
|
-
activesupport (= 3.0.
|
17
|
+
actionmailer (3.0.5)
|
18
|
+
actionpack (= 3.0.5)
|
19
|
+
mail (~> 2.2.15)
|
20
|
+
actionpack (3.0.5)
|
21
|
+
activemodel (= 3.0.5)
|
22
|
+
activesupport (= 3.0.5)
|
23
23
|
builder (~> 2.1.2)
|
24
24
|
erubis (~> 2.6.6)
|
25
25
|
i18n (~> 0.4)
|
26
26
|
rack (~> 1.2.1)
|
27
27
|
rack-mount (~> 0.6.13)
|
28
|
-
rack-test (~> 0.5.
|
28
|
+
rack-test (~> 0.5.7)
|
29
29
|
tzinfo (~> 0.3.23)
|
30
|
-
activemodel (3.0.
|
31
|
-
activesupport (= 3.0.
|
30
|
+
activemodel (3.0.5)
|
31
|
+
activesupport (= 3.0.5)
|
32
32
|
builder (~> 2.1.2)
|
33
33
|
i18n (~> 0.4)
|
34
|
-
activerecord (3.0.
|
35
|
-
activemodel (= 3.0.
|
36
|
-
activesupport (= 3.0.
|
34
|
+
activerecord (3.0.5)
|
35
|
+
activemodel (= 3.0.5)
|
36
|
+
activesupport (= 3.0.5)
|
37
37
|
arel (~> 2.0.2)
|
38
38
|
tzinfo (~> 0.3.23)
|
39
|
-
activeresource (3.0.
|
40
|
-
activemodel (= 3.0.
|
41
|
-
activesupport (= 3.0.
|
42
|
-
activesupport (3.0.
|
43
|
-
addressable (2.2.
|
44
|
-
arel (2.0.
|
45
|
-
bcrypt-ruby (2.1.
|
39
|
+
activeresource (3.0.5)
|
40
|
+
activemodel (= 3.0.5)
|
41
|
+
activesupport (= 3.0.5)
|
42
|
+
activesupport (3.0.5)
|
43
|
+
addressable (2.2.4)
|
44
|
+
arel (2.0.9)
|
45
|
+
bcrypt-ruby (2.1.4)
|
46
46
|
builder (2.1.2)
|
47
|
-
data_objects (0.10.
|
47
|
+
data_objects (0.10.3)
|
48
48
|
addressable (~> 2.1)
|
49
|
-
devise (1.2.
|
49
|
+
devise (1.2.rc2)
|
50
50
|
bcrypt-ruby (~> 2.1.2)
|
51
|
-
orm_adapter (~> 0.0.
|
52
|
-
warden (~> 1.0.
|
53
|
-
dm-active_model (1.0.
|
54
|
-
activemodel (~> 3.0.
|
55
|
-
dm-core (~> 1.0.
|
56
|
-
dm-core (1.0.
|
57
|
-
addressable (~> 2.2)
|
58
|
-
|
59
|
-
dm-do-adapter (1.0.2)
|
51
|
+
orm_adapter (~> 0.0.3)
|
52
|
+
warden (~> 1.0.3)
|
53
|
+
dm-active_model (1.1.0.rc3)
|
54
|
+
activemodel (~> 3.0.4)
|
55
|
+
dm-core (~> 1.1.0.rc3)
|
56
|
+
dm-core (1.1.0.rc3)
|
57
|
+
addressable (~> 2.2.4)
|
58
|
+
dm-do-adapter (1.1.0.rc3)
|
60
59
|
data_objects (~> 0.10.2)
|
61
|
-
dm-core (~> 1.0.
|
62
|
-
dm-migrations (1.0.
|
63
|
-
dm-core (~> 1.0.
|
64
|
-
dm-rails (1.0.
|
65
|
-
actionpack (~> 3.0.
|
66
|
-
|
67
|
-
dm-
|
68
|
-
|
69
|
-
|
70
|
-
|
71
|
-
|
72
|
-
|
73
|
-
|
74
|
-
|
75
|
-
dm-do-adapter (~> 1.0.2)
|
60
|
+
dm-core (~> 1.1.0.rc3)
|
61
|
+
dm-migrations (1.1.0.rc3)
|
62
|
+
dm-core (~> 1.1.0.rc3)
|
63
|
+
dm-rails (1.1.0.rc3)
|
64
|
+
actionpack (~> 3.0.4)
|
65
|
+
dm-active_model (~> 1.1.0.rc3)
|
66
|
+
dm-core (~> 1.1.0.rc3)
|
67
|
+
railties (~> 3.0.4)
|
68
|
+
dm-serializer (1.1.0.rc3)
|
69
|
+
dm-core (~> 1.1.0.rc3)
|
70
|
+
fastercsv (~> 1.5.4)
|
71
|
+
json (~> 1.4.6)
|
72
|
+
dm-sqlite-adapter (1.1.0.rc3)
|
73
|
+
dm-do-adapter (~> 1.1.0.rc3)
|
76
74
|
do_sqlite3 (~> 0.10.2)
|
77
|
-
dm-timestamps (1.0.
|
78
|
-
dm-core (~> 1.0.
|
79
|
-
dm-validations (1.0.
|
80
|
-
dm-core (~> 1.0.
|
81
|
-
do_sqlite3 (0.10.
|
82
|
-
data_objects (= 0.10.
|
75
|
+
dm-timestamps (1.1.0.rc3)
|
76
|
+
dm-core (~> 1.1.0.rc3)
|
77
|
+
dm-validations (1.1.0.rc3)
|
78
|
+
dm-core (~> 1.1.0.rc3)
|
79
|
+
do_sqlite3 (0.10.3)
|
80
|
+
data_objects (= 0.10.3)
|
83
81
|
erubis (2.6.6)
|
84
82
|
abstract (>= 1.0.0)
|
85
|
-
|
86
|
-
|
87
|
-
|
88
|
-
multipart-post (~> 1.0.1)
|
83
|
+
faraday (0.5.7)
|
84
|
+
addressable (~> 2.2.4)
|
85
|
+
multipart-post (~> 1.1.0)
|
89
86
|
rack (>= 1.1.0, < 2)
|
90
|
-
fastercsv (1.5.
|
87
|
+
fastercsv (1.5.4)
|
91
88
|
i18n (0.5.0)
|
92
|
-
|
93
|
-
mail (2.2.
|
89
|
+
json (1.4.6)
|
90
|
+
mail (2.2.15)
|
94
91
|
activesupport (>= 2.3.6)
|
95
92
|
i18n (>= 0.4.0)
|
96
93
|
mime-types (~> 1.16)
|
97
94
|
treetop (~> 1.4.8)
|
98
95
|
mime-types (1.16)
|
99
|
-
mocha (0.9.
|
100
|
-
rake
|
96
|
+
mocha (0.9.12)
|
101
97
|
multi_json (0.0.5)
|
102
|
-
multipart-post (1.0
|
98
|
+
multipart-post (1.1.0)
|
103
99
|
nokogiri (1.4.4)
|
104
|
-
oa-core (0.
|
100
|
+
oa-core (0.2.0)
|
105
101
|
rack (~> 1.1)
|
106
|
-
oa-oauth (0.
|
102
|
+
oa-oauth (0.2.0)
|
107
103
|
multi_json (~> 0.0.2)
|
108
104
|
nokogiri (~> 1.4.2)
|
109
|
-
oa-core (= 0.
|
105
|
+
oa-core (= 0.2.0)
|
110
106
|
oauth (~> 0.4.0)
|
111
|
-
oauth2 (~> 0.1.
|
112
|
-
oa-openid (0.
|
113
|
-
oa-core (= 0.
|
107
|
+
oauth2 (~> 0.1.1)
|
108
|
+
oa-openid (0.2.0)
|
109
|
+
oa-core (= 0.2.0)
|
114
110
|
rack-openid (~> 1.2.0)
|
115
111
|
ruby-openid-apps-discovery
|
116
112
|
oauth (0.4.4)
|
117
|
-
oauth2 (0.1.
|
113
|
+
oauth2 (0.1.1)
|
118
114
|
faraday (~> 0.5.0)
|
119
115
|
multi_json (~> 0.0.4)
|
120
|
-
orm_adapter (0.0.
|
116
|
+
orm_adapter (0.0.4)
|
121
117
|
polyglot (0.3.1)
|
122
118
|
rack (1.2.1)
|
123
119
|
rack-mount (0.6.13)
|
@@ -125,19 +121,19 @@ GEM
|
|
125
121
|
rack-openid (1.2.0)
|
126
122
|
rack (>= 1.1.0)
|
127
123
|
ruby-openid (>= 2.1.8)
|
128
|
-
rack-test (0.5.
|
124
|
+
rack-test (0.5.7)
|
129
125
|
rack (>= 1.0)
|
130
|
-
rails (3.0.
|
131
|
-
actionmailer (= 3.0.
|
132
|
-
actionpack (= 3.0.
|
133
|
-
activerecord (= 3.0.
|
134
|
-
activeresource (= 3.0.
|
135
|
-
activesupport (= 3.0.
|
126
|
+
rails (3.0.5)
|
127
|
+
actionmailer (= 3.0.5)
|
128
|
+
actionpack (= 3.0.5)
|
129
|
+
activerecord (= 3.0.5)
|
130
|
+
activeresource (= 3.0.5)
|
131
|
+
activesupport (= 3.0.5)
|
136
132
|
bundler (~> 1.0)
|
137
|
-
railties (= 3.0.
|
138
|
-
railties (3.0.
|
139
|
-
actionpack (= 3.0.
|
140
|
-
activesupport (= 3.0.
|
133
|
+
railties (= 3.0.5)
|
134
|
+
railties (3.0.5)
|
135
|
+
actionpack (= 3.0.5)
|
136
|
+
activesupport (= 3.0.5)
|
141
137
|
rake (>= 0.8.7)
|
142
138
|
thor (~> 0.14.4)
|
143
139
|
rake (0.8.7)
|
@@ -151,10 +147,10 @@ GEM
|
|
151
147
|
thor (0.14.6)
|
152
148
|
treetop (1.4.9)
|
153
149
|
polyglot (>= 0.3.1)
|
154
|
-
tzinfo (0.3.
|
150
|
+
tzinfo (0.3.24)
|
155
151
|
warden (1.0.3)
|
156
152
|
rack (>= 1.0.0)
|
157
|
-
webrat (0.7.
|
153
|
+
webrat (0.7.2)
|
158
154
|
nokogiri (>= 1.2.0)
|
159
155
|
rack (>= 1.0)
|
160
156
|
rack-test (>= 0.5.3)
|
@@ -163,18 +159,16 @@ PLATFORMS
|
|
163
159
|
ruby
|
164
160
|
|
165
161
|
DEPENDENCIES
|
166
|
-
|
167
|
-
dm-core (~> 1.0.2)
|
162
|
+
dm-core (~> 1.1.0.rc3)
|
168
163
|
dm-devise!
|
169
|
-
dm-migrations (~> 1.0.
|
170
|
-
dm-rails (
|
171
|
-
dm-serializer (~> 1.0.
|
172
|
-
dm-sqlite-adapter (~> 1.0.
|
173
|
-
dm-timestamps (~> 1.0.
|
174
|
-
dm-validations (~> 1.0.
|
164
|
+
dm-migrations (~> 1.1.0.rc3)
|
165
|
+
dm-rails (~> 1.1.0.rc3)
|
166
|
+
dm-serializer (~> 1.1.0.rc3)
|
167
|
+
dm-sqlite-adapter (~> 1.1.0.rc3)
|
168
|
+
dm-timestamps (~> 1.1.0.rc3)
|
169
|
+
dm-validations (~> 1.1.0.rc3)
|
175
170
|
mocha
|
176
|
-
oa-oauth
|
177
|
-
oa-openid
|
178
|
-
rails (
|
179
|
-
|
180
|
-
webrat (= 0.7.1)
|
171
|
+
oa-oauth (~> 0.2.0)
|
172
|
+
oa-openid (~> 0.2.0)
|
173
|
+
rails (~> 3.0.4)
|
174
|
+
webrat (= 0.7.2)
|
data/README.rdoc
CHANGED
@@ -20,23 +20,27 @@ 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 master: 2011-
|
23
|
+
Last tested against devise master: 2011-03-12, commit 15d195d2f064508e074cdd3c3733c94fbdd281c4
|
24
|
+
Last tested against devise release 1.2.rc2
|
24
25
|
|
25
26
|
== Installation
|
26
27
|
|
27
28
|
Add dm-devise and dm gems to your Gemfile. The following gems are required:
|
28
29
|
|
29
|
-
gem 'dm-core', '~> 1.0.
|
30
|
-
gem 'dm-sqlite-adapter', '~> 1.0.
|
31
|
-
gem 'dm-serializer', '~> 1.0.
|
32
|
-
gem 'dm-timestamps', '~> 1.0.
|
33
|
-
gem 'dm-rails', '~> 1.0.
|
34
|
-
gem 'dm-validations', '~> 1.0.
|
35
|
-
gem 'dm-devise', '~> 1.
|
30
|
+
gem 'dm-core', '~> 1.1.0.rc3'
|
31
|
+
gem 'dm-sqlite-adapter', '~> 1.1.0.rc3' # or your preferred adapter
|
32
|
+
gem 'dm-serializer', '~> 1.1.0.rc3'
|
33
|
+
gem 'dm-timestamps', '~> 1.1.0.rc3'
|
34
|
+
gem 'dm-rails', '~> 1.1.0.rc3'
|
35
|
+
gem 'dm-validations', '~> 1.1.0.rc3' # Do not include if using data_mapper_active_model
|
36
|
+
gem 'dm-devise', '~> 1.2.0.rc'
|
36
37
|
|
37
38
|
If you're using data_mapper_active_model do not include dm-validations in your
|
38
39
|
Gemfile.
|
39
40
|
|
41
|
+
dm-devise works with versions of DataMapper gems >= 1.0.2 on the 1.0 branch
|
42
|
+
and >= 1.1.0.rc3 on the 1.1 branch.
|
43
|
+
|
40
44
|
Run the generator:
|
41
45
|
|
42
46
|
rails generate devise:install
|
data/Rakefile
CHANGED
@@ -1,5 +1,14 @@
|
|
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
|
3
12
|
require 'rake'
|
4
13
|
require 'rake/testtask'
|
5
14
|
require 'rake/rdoctask'
|
@@ -40,27 +49,3 @@ Rake::RDocTask.new(:rdoc) do |rdoc|
|
|
40
49
|
rdoc.rdoc_files.include('README.rdoc')
|
41
50
|
rdoc.rdoc_files.include('lib/**/*.rb')
|
42
51
|
end
|
43
|
-
|
44
|
-
begin
|
45
|
-
require 'jeweler'
|
46
|
-
Jeweler::Tasks.new do |gem|
|
47
|
-
gem.name = "dm-devise"
|
48
|
-
gem.version = DataMapper::Devise::VERSION.dup
|
49
|
-
gem.summary = %Q{Support for using DataMapper ORM with devise}
|
50
|
-
gem.description = %Q{dm-devise adds DataMapper support to devise (http://github.com/plataformatec/devise) for authentication support for Rails}
|
51
|
-
gem.email = "jmorgan@morgancreative.net"
|
52
|
-
gem.homepage = "http://github.com/jm81/dm-devise"
|
53
|
-
gem.authors = ["Jared Morgan"]
|
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'
|
58
|
-
gem.add_dependency 'dm-rails', '>= 1.0.3'
|
59
|
-
gem.add_dependency 'devise', '~> 1.2.rc'
|
60
|
-
gem.add_dependency 'sugar-high', '~> 0.2.10'
|
61
|
-
# gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
|
62
|
-
end
|
63
|
-
Jeweler::GemcutterTasks.new
|
64
|
-
rescue LoadError
|
65
|
-
puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
|
66
|
-
end
|
data/dm-devise.gemspec
CHANGED
@@ -1,103 +1,26 @@
|
|
1
|
-
# Generated by jeweler
|
2
|
-
# DO NOT EDIT THIS FILE DIRECTLY
|
3
|
-
# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
|
4
1
|
# -*- encoding: utf-8 -*-
|
2
|
+
$:.push File.expand_path("../lib", __FILE__)
|
3
|
+
require "dm-devise/version"
|
5
4
|
|
6
5
|
Gem::Specification.new do |s|
|
7
|
-
s.name
|
8
|
-
s.version
|
6
|
+
s.name = "dm-devise"
|
7
|
+
s.version = DataMapper::Devise::VERSION.dup
|
8
|
+
s.summary = "DataMapper support for devise"
|
9
|
+
s.description = "dm-devise adds DataMapper support to devise (http://github.com/plataformatec/devise) for authentication support for Rails"
|
10
|
+
s.email = "jmorgan@morgancreative.net"
|
11
|
+
s.homepage = "https://github.com/jm81/dm-devise"
|
12
|
+
s.authors = ["Jared Morgan"]
|
9
13
|
|
10
|
-
s.
|
11
|
-
s.
|
12
|
-
s.
|
13
|
-
s.description = %q{dm-devise adds DataMapper support to devise (http://github.com/plataformatec/devise) for authentication support for Rails}
|
14
|
-
s.email = %q{jmorgan@morgancreative.net}
|
15
|
-
s.extra_rdoc_files = [
|
16
|
-
"LICENSE",
|
17
|
-
"README.rdoc"
|
18
|
-
]
|
19
|
-
s.files = [
|
20
|
-
".document",
|
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
|
-
]
|
51
|
-
s.homepage = %q{http://github.com/jm81/dm-devise}
|
52
|
-
s.rdoc_options = ["--charset=UTF-8"]
|
14
|
+
s.files = `git ls-files`.split("\n")
|
15
|
+
s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
|
16
|
+
s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
|
53
17
|
s.require_paths = ["lib"]
|
54
|
-
s.rubygems_version = %q{1.3.7}
|
55
|
-
s.summary = %q{Support for using DataMapper ORM with devise}
|
56
|
-
s.test_files = [
|
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
|
-
]
|
71
18
|
|
72
|
-
|
73
|
-
|
74
|
-
|
75
|
-
|
76
|
-
|
77
|
-
|
78
|
-
|
79
|
-
s.add_runtime_dependency(%q<dm-serializer>, ["~> 1.0.2"])
|
80
|
-
s.add_runtime_dependency(%q<dm-timestamps>, ["~> 1.0.2"])
|
81
|
-
s.add_runtime_dependency(%q<dm-rails>, [">= 1.0.3"])
|
82
|
-
s.add_runtime_dependency(%q<devise>, ["~> 1.2.rc"])
|
83
|
-
s.add_runtime_dependency(%q<sugar-high>, ["~> 0.2.10"])
|
84
|
-
else
|
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"])
|
89
|
-
s.add_dependency(%q<dm-rails>, [">= 1.0.3"])
|
90
|
-
s.add_dependency(%q<devise>, ["~> 1.2.rc"])
|
91
|
-
s.add_dependency(%q<sugar-high>, ["~> 0.2.10"])
|
92
|
-
end
|
93
|
-
else
|
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"])
|
98
|
-
s.add_dependency(%q<dm-rails>, [">= 1.0.3"])
|
99
|
-
s.add_dependency(%q<devise>, ["~> 1.2.rc"])
|
100
|
-
s.add_dependency(%q<sugar-high>, ["~> 0.2.10"])
|
101
|
-
end
|
19
|
+
s.add_dependency('dm-core', '>= 1.0.2', '< 1.2')
|
20
|
+
s.add_dependency('dm-migrations', '>= 1.0.2', '< 1.2')
|
21
|
+
s.add_dependency('dm-serializer', '>= 1.0.2', '< 1.2')
|
22
|
+
s.add_dependency('dm-timestamps', '>= 1.0.2', '< 1.2')
|
23
|
+
s.add_dependency('dm-rails', '>= 1.0.3', '< 1.2')
|
24
|
+
s.add_dependency('devise', '~> 1.2.rc2')
|
25
|
+
s.add_dependency('sugar-high', '~> 0.2.10')
|
102
26
|
end
|
103
|
-
|
@@ -15,6 +15,7 @@ module Devise
|
|
15
15
|
# Tell how to apply schema methods. This automatically maps :limit to
|
16
16
|
# :length and :null to :required.
|
17
17
|
def apply_devise_schema(name, type, options={})
|
18
|
+
return false if properties[name]
|
18
19
|
SCHEMA_OPTIONS.each do |old_key, new_key|
|
19
20
|
next unless options.key?(old_key)
|
20
21
|
if :null == old_key
|
data/lib/dm-devise/version.rb
CHANGED
@@ -0,0 +1,16 @@
|
|
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
|
@@ -0,0 +1,22 @@
|
|
1
|
+
require "test_helper"
|
2
|
+
|
3
|
+
if [:data_mapper, :data_mapper_active_model].include?(DEVISE_ORM)
|
4
|
+
require "generators/data_mapper/devise_generator"
|
5
|
+
|
6
|
+
class DataMapperGeneratorTest < Rails::Generators::TestCase
|
7
|
+
tests DataMapper::Generators::DeviseGenerator
|
8
|
+
destination File.expand_path("../../tmp", __FILE__)
|
9
|
+
setup :prepare_destination
|
10
|
+
|
11
|
+
test "all files are properly created" do
|
12
|
+
run_generator %w(monster)
|
13
|
+
assert_file "app/models/monster.rb", /devise/
|
14
|
+
end
|
15
|
+
|
16
|
+
test "all files are properly deleted" do
|
17
|
+
run_generator %w(monster)
|
18
|
+
run_generator %w(monster), :behavior => :revoke
|
19
|
+
assert_no_file "app/models/monster.rb"
|
20
|
+
end
|
21
|
+
end
|
22
|
+
end
|
@@ -74,6 +74,6 @@ class AuthenticationRedirectTest < ActionController::IntegrationTest
|
|
74
74
|
create_user
|
75
75
|
post user_session_path(:format => 'xml', :user => {:email => "user@test.com", :password => '123456'})
|
76
76
|
assert_response :success
|
77
|
-
assert_match /\A<user
|
77
|
+
assert_match /\A<user>\s*<id/, response.body
|
78
78
|
end
|
79
79
|
end
|
@@ -5,15 +5,11 @@ module Shim
|
|
5
5
|
end
|
6
6
|
|
7
7
|
module ModelMethods
|
8
|
-
#
|
9
|
-
def
|
10
|
-
|
11
|
-
user = signed_in_resource || User.first(:email => data["email"]) || User.new
|
12
|
-
user.update_with_facebook_oauth(access_token, data)
|
13
|
-
user.save
|
14
|
-
user
|
8
|
+
# For benefit of Users::OmniauthCallbacksController
|
9
|
+
def find_by_email(email)
|
10
|
+
first(:email => email)
|
15
11
|
end
|
16
|
-
|
12
|
+
|
17
13
|
def create!(*args)
|
18
14
|
create(*args)
|
19
15
|
end
|
data/test/test_helper.rb
CHANGED
@@ -4,6 +4,7 @@ DEVISE_PATH = ENV['DEVISE_PATH']
|
|
4
4
|
|
5
5
|
puts "\n==> Devise.orm = #{DEVISE_ORM.inspect}"
|
6
6
|
|
7
|
+
require 'dm-migrations'
|
7
8
|
require "rails_app/config/environment"
|
8
9
|
require "rails/test_help"
|
9
10
|
require "orm/#{DEVISE_ORM}"
|
@@ -11,13 +12,12 @@ require "orm/#{DEVISE_ORM}"
|
|
11
12
|
I18n.load_path << "#{DEVISE_PATH}/test/support/locale/en.yml"
|
12
13
|
require 'mocha'
|
13
14
|
|
15
|
+
require 'webrat'
|
14
16
|
Webrat.configure do |config|
|
15
17
|
config.mode = :rails
|
16
18
|
config.open_error_files = false
|
17
19
|
end
|
18
20
|
|
19
|
-
Devise::OmniAuth.test_mode!
|
20
|
-
|
21
21
|
# Add support to load paths so we can overwrite broken webrat setup
|
22
22
|
$:.unshift "#{DEVISE_PATH}/test/support"
|
23
23
|
Dir["#{DEVISE_PATH}/test/support/**/*.rb"].each { |f| require f }
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: dm-devise
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
hash:
|
5
|
-
prerelease:
|
4
|
+
hash: 7712026
|
5
|
+
prerelease: 6
|
6
6
|
segments:
|
7
7
|
- 1
|
8
8
|
- 2
|
9
9
|
- 0
|
10
|
-
-
|
11
|
-
version: 1.2.0.
|
10
|
+
- rc
|
11
|
+
version: 1.2.0.rc
|
12
12
|
platform: ruby
|
13
13
|
authors:
|
14
14
|
- Jared Morgan
|
@@ -16,7 +16,7 @@ autorequire:
|
|
16
16
|
bindir: bin
|
17
17
|
cert_chain: []
|
18
18
|
|
19
|
-
date: 2011-
|
19
|
+
date: 2011-03-12 00:00:00 -06:00
|
20
20
|
default_executable:
|
21
21
|
dependencies:
|
22
22
|
- !ruby/object:Gem::Dependency
|
@@ -25,7 +25,7 @@ dependencies:
|
|
25
25
|
requirement: &id001 !ruby/object:Gem::Requirement
|
26
26
|
none: false
|
27
27
|
requirements:
|
28
|
-
- -
|
28
|
+
- - ">="
|
29
29
|
- !ruby/object:Gem::Version
|
30
30
|
hash: 19
|
31
31
|
segments:
|
@@ -33,6 +33,13 @@ dependencies:
|
|
33
33
|
- 0
|
34
34
|
- 2
|
35
35
|
version: 1.0.2
|
36
|
+
- - <
|
37
|
+
- !ruby/object:Gem::Version
|
38
|
+
hash: 11
|
39
|
+
segments:
|
40
|
+
- 1
|
41
|
+
- 2
|
42
|
+
version: "1.2"
|
36
43
|
type: :runtime
|
37
44
|
version_requirements: *id001
|
38
45
|
- !ruby/object:Gem::Dependency
|
@@ -41,7 +48,7 @@ dependencies:
|
|
41
48
|
requirement: &id002 !ruby/object:Gem::Requirement
|
42
49
|
none: false
|
43
50
|
requirements:
|
44
|
-
- -
|
51
|
+
- - ">="
|
45
52
|
- !ruby/object:Gem::Version
|
46
53
|
hash: 19
|
47
54
|
segments:
|
@@ -49,6 +56,13 @@ dependencies:
|
|
49
56
|
- 0
|
50
57
|
- 2
|
51
58
|
version: 1.0.2
|
59
|
+
- - <
|
60
|
+
- !ruby/object:Gem::Version
|
61
|
+
hash: 11
|
62
|
+
segments:
|
63
|
+
- 1
|
64
|
+
- 2
|
65
|
+
version: "1.2"
|
52
66
|
type: :runtime
|
53
67
|
version_requirements: *id002
|
54
68
|
- !ruby/object:Gem::Dependency
|
@@ -57,7 +71,7 @@ dependencies:
|
|
57
71
|
requirement: &id003 !ruby/object:Gem::Requirement
|
58
72
|
none: false
|
59
73
|
requirements:
|
60
|
-
- -
|
74
|
+
- - ">="
|
61
75
|
- !ruby/object:Gem::Version
|
62
76
|
hash: 19
|
63
77
|
segments:
|
@@ -65,6 +79,13 @@ dependencies:
|
|
65
79
|
- 0
|
66
80
|
- 2
|
67
81
|
version: 1.0.2
|
82
|
+
- - <
|
83
|
+
- !ruby/object:Gem::Version
|
84
|
+
hash: 11
|
85
|
+
segments:
|
86
|
+
- 1
|
87
|
+
- 2
|
88
|
+
version: "1.2"
|
68
89
|
type: :runtime
|
69
90
|
version_requirements: *id003
|
70
91
|
- !ruby/object:Gem::Dependency
|
@@ -73,7 +94,7 @@ dependencies:
|
|
73
94
|
requirement: &id004 !ruby/object:Gem::Requirement
|
74
95
|
none: false
|
75
96
|
requirements:
|
76
|
-
- -
|
97
|
+
- - ">="
|
77
98
|
- !ruby/object:Gem::Version
|
78
99
|
hash: 19
|
79
100
|
segments:
|
@@ -81,6 +102,13 @@ dependencies:
|
|
81
102
|
- 0
|
82
103
|
- 2
|
83
104
|
version: 1.0.2
|
105
|
+
- - <
|
106
|
+
- !ruby/object:Gem::Version
|
107
|
+
hash: 11
|
108
|
+
segments:
|
109
|
+
- 1
|
110
|
+
- 2
|
111
|
+
version: "1.2"
|
84
112
|
type: :runtime
|
85
113
|
version_requirements: *id004
|
86
114
|
- !ruby/object:Gem::Dependency
|
@@ -97,6 +125,13 @@ dependencies:
|
|
97
125
|
- 0
|
98
126
|
- 3
|
99
127
|
version: 1.0.3
|
128
|
+
- - <
|
129
|
+
- !ruby/object:Gem::Version
|
130
|
+
hash: 11
|
131
|
+
segments:
|
132
|
+
- 1
|
133
|
+
- 2
|
134
|
+
version: "1.2"
|
100
135
|
type: :runtime
|
101
136
|
version_requirements: *id005
|
102
137
|
- !ruby/object:Gem::Dependency
|
@@ -107,12 +142,13 @@ dependencies:
|
|
107
142
|
requirements:
|
108
143
|
- - ~>
|
109
144
|
- !ruby/object:Gem::Version
|
110
|
-
hash:
|
145
|
+
hash: 15424225
|
111
146
|
segments:
|
112
147
|
- 1
|
113
148
|
- 2
|
114
149
|
- rc
|
115
|
-
|
150
|
+
- 2
|
151
|
+
version: 1.2.rc2
|
116
152
|
type: :runtime
|
117
153
|
version_requirements: *id006
|
118
154
|
- !ruby/object:Gem::Dependency
|
@@ -137,9 +173,8 @@ executables: []
|
|
137
173
|
|
138
174
|
extensions: []
|
139
175
|
|
140
|
-
extra_rdoc_files:
|
141
|
-
|
142
|
-
- README.rdoc
|
176
|
+
extra_rdoc_files: []
|
177
|
+
|
143
178
|
files:
|
144
179
|
- .document
|
145
180
|
- .gitignore
|
@@ -159,6 +194,8 @@ files:
|
|
159
194
|
- lib/dm-devise/version.rb
|
160
195
|
- lib/generators/data_mapper/devise_generator.rb
|
161
196
|
- test/data_mapper/compatibility_test.rb
|
197
|
+
- test/data_mapper/schema_test.rb
|
198
|
+
- test/generators/data_mapper_generator_test.rb
|
162
199
|
- test/orm/data_mapper.rb
|
163
200
|
- test/orm/data_mapper_active_model.rb
|
164
201
|
- test/overrides/data_mapper_test.rb
|
@@ -172,12 +209,12 @@ files:
|
|
172
209
|
- test/rails_app/config/environment.rb
|
173
210
|
- test/test_helper.rb
|
174
211
|
has_rdoc: true
|
175
|
-
homepage:
|
212
|
+
homepage: https://github.com/jm81/dm-devise
|
176
213
|
licenses: []
|
177
214
|
|
178
215
|
post_install_message:
|
179
|
-
rdoc_options:
|
180
|
-
|
216
|
+
rdoc_options: []
|
217
|
+
|
181
218
|
require_paths:
|
182
219
|
- lib
|
183
220
|
required_ruby_version: !ruby/object:Gem::Requirement
|
@@ -203,21 +240,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
203
240
|
requirements: []
|
204
241
|
|
205
242
|
rubyforge_project:
|
206
|
-
rubygems_version: 1.3
|
243
|
+
rubygems_version: 1.5.3
|
207
244
|
signing_key:
|
208
245
|
specification_version: 3
|
209
|
-
summary:
|
210
|
-
test_files:
|
211
|
-
|
212
|
-
- test/data_mapper/compatibility_test.rb
|
213
|
-
- test/rails_app/config/environment.rb
|
214
|
-
- test/rails_app/config/application.rb
|
215
|
-
- test/rails_app/app/data_mapper/admin.rb
|
216
|
-
- test/rails_app/app/data_mapper/shim.rb
|
217
|
-
- test/rails_app/app/data_mapper/user.rb
|
218
|
-
- test/rails_app/app/data_mapper_active_model/admin.rb
|
219
|
-
- test/rails_app/app/data_mapper_active_model/user.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
|
246
|
+
summary: DataMapper support for devise
|
247
|
+
test_files: []
|
248
|
+
|