dm-devise 1.1.3 → 1.1.4
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.
- data/Gemfile +4 -8
- data/Gemfile.lock +34 -12
- data/README.rdoc +1 -1
- data/Rakefile +1 -2
- data/dm-devise.gemspec +5 -8
- data/lib/devise/orm/data_mapper/schema.rb +4 -0
- data/lib/dm-devise/version.rb +1 -1
- data/lib/generators/data_mapper/devise_generator.rb +6 -0
- metadata +25 -41
data/Gemfile
CHANGED
@@ -1,20 +1,16 @@
|
|
1
1
|
source :rubygems
|
2
2
|
|
3
|
+
gemspec
|
4
|
+
|
3
5
|
gem "rails", '3.0.0'
|
4
6
|
|
5
|
-
gem "warden", "0.10.7"
|
6
7
|
gem "webrat", "0.7.0"
|
7
8
|
gem "mocha", :require => false
|
8
|
-
gem "bcrypt-ruby", :require => "bcrypt"
|
9
9
|
gem "oauth2"
|
10
10
|
|
11
|
-
gem '
|
12
|
-
gem 'dm-migrations', '~> 1.0.2'
|
11
|
+
gem 'sugar-high', '~> 0.2.10'
|
13
12
|
gem 'dm-sqlite-adapter', '~> 1.0.2'
|
14
|
-
gem 'dm-serializer', '~> 1.0.2'
|
15
|
-
gem 'dm-timestamps', '~> 1.0.2'
|
16
|
-
gem 'dm-rails', '~> 1.0.3'
|
17
13
|
|
18
14
|
group :data_mapper do
|
19
|
-
gem 'dm-validations', '~> 1.0.
|
15
|
+
gem 'dm-validations', '~> 1.0.0'
|
20
16
|
end
|
data/Gemfile.lock
CHANGED
@@ -1,3 +1,16 @@
|
|
1
|
+
PATH
|
2
|
+
remote: .
|
3
|
+
specs:
|
4
|
+
dm-devise (1.1.3)
|
5
|
+
bcrypt-ruby (~> 2.1.2)
|
6
|
+
devise (~> 1.1.0)
|
7
|
+
dm-core (~> 1.0.0)
|
8
|
+
dm-migrations (~> 1.0.0)
|
9
|
+
dm-rails (>= 1.0.3)
|
10
|
+
dm-serializer (~> 1.0.0)
|
11
|
+
dm-timestamps (~> 1.0.0)
|
12
|
+
sugar-high (~> 0.2.10)
|
13
|
+
|
1
14
|
GEM
|
2
15
|
remote: http://rubygems.org/
|
3
16
|
specs:
|
@@ -28,13 +41,16 @@ GEM
|
|
28
41
|
activemodel (= 3.0.0)
|
29
42
|
activesupport (= 3.0.0)
|
30
43
|
activesupport (3.0.0)
|
31
|
-
addressable (2.2.
|
44
|
+
addressable (2.2.2)
|
32
45
|
arel (1.0.1)
|
33
46
|
activesupport (~> 3.0.0)
|
34
47
|
bcrypt-ruby (2.1.2)
|
35
48
|
builder (2.1.2)
|
36
49
|
data_objects (0.10.2)
|
37
50
|
addressable (~> 2.1)
|
51
|
+
devise (1.1.3)
|
52
|
+
bcrypt-ruby (~> 2.1.2)
|
53
|
+
warden (~> 0.10.7)
|
38
54
|
dm-active_model (1.0.2)
|
39
55
|
activemodel (~> 3.0.0)
|
40
56
|
dm-core (~> 1.0.2)
|
@@ -74,7 +90,7 @@ GEM
|
|
74
90
|
fastercsv (1.5.3)
|
75
91
|
i18n (0.4.1)
|
76
92
|
json_pure (1.4.6)
|
77
|
-
mail (2.2.
|
93
|
+
mail (2.2.7)
|
78
94
|
activesupport (>= 2.3.6)
|
79
95
|
mime-types
|
80
96
|
treetop (>= 1.4.5)
|
@@ -90,7 +106,7 @@ GEM
|
|
90
106
|
rack (1.2.1)
|
91
107
|
rack-mount (0.6.13)
|
92
108
|
rack (>= 1.0.0)
|
93
|
-
rack-test (0.5.
|
109
|
+
rack-test (0.5.6)
|
94
110
|
rack (>= 1.0)
|
95
111
|
rails (3.0.0)
|
96
112
|
actionmailer (= 3.0.0)
|
@@ -106,7 +122,11 @@ GEM
|
|
106
122
|
rake (>= 0.8.4)
|
107
123
|
thor (~> 0.14.0)
|
108
124
|
rake (0.8.7)
|
109
|
-
|
125
|
+
require_all (1.2.0)
|
126
|
+
sugar-high (0.2.12)
|
127
|
+
mocha (~> 0.9.8)
|
128
|
+
require_all (~> 1.2.0)
|
129
|
+
thor (0.14.3)
|
110
130
|
treetop (1.4.8)
|
111
131
|
polyglot (>= 0.3.1)
|
112
132
|
tzinfo (0.3.23)
|
@@ -121,16 +141,18 @@ PLATFORMS
|
|
121
141
|
ruby
|
122
142
|
|
123
143
|
DEPENDENCIES
|
124
|
-
bcrypt-ruby
|
125
|
-
|
126
|
-
dm-
|
127
|
-
dm-
|
128
|
-
dm-
|
144
|
+
bcrypt-ruby (~> 2.1.2)
|
145
|
+
devise (~> 1.1.0)
|
146
|
+
dm-core (~> 1.0.0)
|
147
|
+
dm-devise!
|
148
|
+
dm-migrations (~> 1.0.0)
|
149
|
+
dm-rails (>= 1.0.3)
|
150
|
+
dm-serializer (~> 1.0.0)
|
129
151
|
dm-sqlite-adapter (~> 1.0.2)
|
130
|
-
dm-timestamps (~> 1.0.
|
131
|
-
dm-validations (~> 1.0.
|
152
|
+
dm-timestamps (~> 1.0.0)
|
153
|
+
dm-validations (~> 1.0.0)
|
132
154
|
mocha
|
133
155
|
oauth2
|
134
156
|
rails (= 3.0.0)
|
135
|
-
|
157
|
+
sugar-high (~> 0.2.10)
|
136
158
|
webrat (= 0.7.0)
|
data/README.rdoc
CHANGED
@@ -22,7 +22,7 @@ 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-
|
25
|
+
Last tested against devise master: 2010-09-25, commit 2aa1d2f3b76ce87c087a010c02d78a1156ac8669
|
26
26
|
|
27
27
|
== Installation
|
28
28
|
|
data/Rakefile
CHANGED
@@ -55,13 +55,12 @@ begin
|
|
55
55
|
gem.authors = ["Jared Morgan"]
|
56
56
|
gem.add_dependency 'dm-core', '~> 1.0.0'
|
57
57
|
gem.add_dependency 'dm-migrations', '~> 1.0.0'
|
58
|
-
gem.add_dependency 'dm-validations', '~> 1.0.0'
|
59
58
|
gem.add_dependency 'dm-serializer', '~> 1.0.0'
|
60
59
|
gem.add_dependency 'dm-timestamps', '~> 1.0.0'
|
61
60
|
gem.add_dependency 'dm-rails', '>= 1.0.3'
|
62
61
|
gem.add_dependency 'devise', '~> 1.1.0'
|
63
|
-
gem.add_dependency 'warden', '~> 0.10.7'
|
64
62
|
gem.add_dependency 'bcrypt-ruby', '~> 2.1.2'
|
63
|
+
gem.add_dependency 'sugar-high', '~> 0.2.10'
|
65
64
|
# gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
|
66
65
|
end
|
67
66
|
Jeweler::GemcutterTasks.new
|
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.4"
|
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-
|
12
|
+
s.date = %q{2010-10-16}
|
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 = [
|
@@ -76,34 +76,31 @@ Gem::Specification.new do |s|
|
|
76
76
|
if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
|
77
77
|
s.add_runtime_dependency(%q<dm-core>, ["~> 1.0.0"])
|
78
78
|
s.add_runtime_dependency(%q<dm-migrations>, ["~> 1.0.0"])
|
79
|
-
s.add_runtime_dependency(%q<dm-validations>, ["~> 1.0.0"])
|
80
79
|
s.add_runtime_dependency(%q<dm-serializer>, ["~> 1.0.0"])
|
81
80
|
s.add_runtime_dependency(%q<dm-timestamps>, ["~> 1.0.0"])
|
82
81
|
s.add_runtime_dependency(%q<dm-rails>, [">= 1.0.3"])
|
83
82
|
s.add_runtime_dependency(%q<devise>, ["~> 1.1.0"])
|
84
|
-
s.add_runtime_dependency(%q<warden>, ["~> 0.10.7"])
|
85
83
|
s.add_runtime_dependency(%q<bcrypt-ruby>, ["~> 2.1.2"])
|
84
|
+
s.add_runtime_dependency(%q<sugar-high>, ["~> 0.2.10"])
|
86
85
|
else
|
87
86
|
s.add_dependency(%q<dm-core>, ["~> 1.0.0"])
|
88
87
|
s.add_dependency(%q<dm-migrations>, ["~> 1.0.0"])
|
89
|
-
s.add_dependency(%q<dm-validations>, ["~> 1.0.0"])
|
90
88
|
s.add_dependency(%q<dm-serializer>, ["~> 1.0.0"])
|
91
89
|
s.add_dependency(%q<dm-timestamps>, ["~> 1.0.0"])
|
92
90
|
s.add_dependency(%q<dm-rails>, [">= 1.0.3"])
|
93
91
|
s.add_dependency(%q<devise>, ["~> 1.1.0"])
|
94
|
-
s.add_dependency(%q<warden>, ["~> 0.10.7"])
|
95
92
|
s.add_dependency(%q<bcrypt-ruby>, ["~> 2.1.2"])
|
93
|
+
s.add_dependency(%q<sugar-high>, ["~> 0.2.10"])
|
96
94
|
end
|
97
95
|
else
|
98
96
|
s.add_dependency(%q<dm-core>, ["~> 1.0.0"])
|
99
97
|
s.add_dependency(%q<dm-migrations>, ["~> 1.0.0"])
|
100
|
-
s.add_dependency(%q<dm-validations>, ["~> 1.0.0"])
|
101
98
|
s.add_dependency(%q<dm-serializer>, ["~> 1.0.0"])
|
102
99
|
s.add_dependency(%q<dm-timestamps>, ["~> 1.0.0"])
|
103
100
|
s.add_dependency(%q<dm-rails>, [">= 1.0.3"])
|
104
101
|
s.add_dependency(%q<devise>, ["~> 1.1.0"])
|
105
|
-
s.add_dependency(%q<warden>, ["~> 0.10.7"])
|
106
102
|
s.add_dependency(%q<bcrypt-ruby>, ["~> 2.1.2"])
|
103
|
+
s.add_dependency(%q<sugar-high>, ["~> 0.2.10"])
|
107
104
|
end
|
108
105
|
end
|
109
106
|
|
data/lib/dm-devise/version.rb
CHANGED
@@ -1,4 +1,5 @@
|
|
1
1
|
require 'generators/devise/orm_helpers'
|
2
|
+
require 'sugar-high/file'
|
2
3
|
|
3
4
|
module DataMapper
|
4
5
|
module Generators
|
@@ -12,6 +13,11 @@ module DataMapper
|
|
12
13
|
def inject_devise_content
|
13
14
|
inject_into_file model_path, model_contents, :after => "include DataMapper::Resource\n"
|
14
15
|
end
|
16
|
+
|
17
|
+
def replace_default_devise_orm
|
18
|
+
devise_init_file = File.join(Rails.root, 'config', 'initializers', 'devise.rb')
|
19
|
+
File.replace_content_from devise_init_file, :where => 'orm/active_record', :with => 'orm/data_mapper'
|
20
|
+
end
|
15
21
|
end
|
16
22
|
end
|
17
23
|
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: 27
|
5
5
|
prerelease: false
|
6
6
|
segments:
|
7
7
|
- 1
|
8
8
|
- 1
|
9
|
-
-
|
10
|
-
version: 1.1.
|
9
|
+
- 4
|
10
|
+
version: 1.1.4
|
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-
|
18
|
+
date: 2010-10-16 00:00:00 -05:00
|
19
19
|
default_executable:
|
20
20
|
dependencies:
|
21
21
|
- !ruby/object:Gem::Dependency
|
@@ -51,7 +51,7 @@ dependencies:
|
|
51
51
|
type: :runtime
|
52
52
|
version_requirements: *id002
|
53
53
|
- !ruby/object:Gem::Dependency
|
54
|
-
name: dm-
|
54
|
+
name: dm-serializer
|
55
55
|
prerelease: false
|
56
56
|
requirement: &id003 !ruby/object:Gem::Requirement
|
57
57
|
none: false
|
@@ -67,7 +67,7 @@ dependencies:
|
|
67
67
|
type: :runtime
|
68
68
|
version_requirements: *id003
|
69
69
|
- !ruby/object:Gem::Dependency
|
70
|
-
name: dm-
|
70
|
+
name: dm-timestamps
|
71
71
|
prerelease: false
|
72
72
|
requirement: &id004 !ruby/object:Gem::Requirement
|
73
73
|
none: false
|
@@ -82,26 +82,10 @@ dependencies:
|
|
82
82
|
version: 1.0.0
|
83
83
|
type: :runtime
|
84
84
|
version_requirements: *id004
|
85
|
-
- !ruby/object:Gem::Dependency
|
86
|
-
name: dm-timestamps
|
87
|
-
prerelease: false
|
88
|
-
requirement: &id005 !ruby/object:Gem::Requirement
|
89
|
-
none: false
|
90
|
-
requirements:
|
91
|
-
- - ~>
|
92
|
-
- !ruby/object:Gem::Version
|
93
|
-
hash: 23
|
94
|
-
segments:
|
95
|
-
- 1
|
96
|
-
- 0
|
97
|
-
- 0
|
98
|
-
version: 1.0.0
|
99
|
-
type: :runtime
|
100
|
-
version_requirements: *id005
|
101
85
|
- !ruby/object:Gem::Dependency
|
102
86
|
name: dm-rails
|
103
87
|
prerelease: false
|
104
|
-
requirement: &
|
88
|
+
requirement: &id005 !ruby/object:Gem::Requirement
|
105
89
|
none: false
|
106
90
|
requirements:
|
107
91
|
- - ">="
|
@@ -113,11 +97,11 @@ dependencies:
|
|
113
97
|
- 3
|
114
98
|
version: 1.0.3
|
115
99
|
type: :runtime
|
116
|
-
version_requirements: *
|
100
|
+
version_requirements: *id005
|
117
101
|
- !ruby/object:Gem::Dependency
|
118
102
|
name: devise
|
119
103
|
prerelease: false
|
120
|
-
requirement: &
|
104
|
+
requirement: &id006 !ruby/object:Gem::Requirement
|
121
105
|
none: false
|
122
106
|
requirements:
|
123
107
|
- - ~>
|
@@ -129,39 +113,39 @@ dependencies:
|
|
129
113
|
- 0
|
130
114
|
version: 1.1.0
|
131
115
|
type: :runtime
|
132
|
-
version_requirements: *
|
116
|
+
version_requirements: *id006
|
133
117
|
- !ruby/object:Gem::Dependency
|
134
|
-
name:
|
118
|
+
name: bcrypt-ruby
|
135
119
|
prerelease: false
|
136
|
-
requirement: &
|
120
|
+
requirement: &id007 !ruby/object:Gem::Requirement
|
137
121
|
none: false
|
138
122
|
requirements:
|
139
123
|
- - ~>
|
140
124
|
- !ruby/object:Gem::Version
|
141
|
-
hash:
|
125
|
+
hash: 15
|
142
126
|
segments:
|
143
|
-
-
|
144
|
-
-
|
145
|
-
-
|
146
|
-
version:
|
127
|
+
- 2
|
128
|
+
- 1
|
129
|
+
- 2
|
130
|
+
version: 2.1.2
|
147
131
|
type: :runtime
|
148
|
-
version_requirements: *
|
132
|
+
version_requirements: *id007
|
149
133
|
- !ruby/object:Gem::Dependency
|
150
|
-
name:
|
134
|
+
name: sugar-high
|
151
135
|
prerelease: false
|
152
|
-
requirement: &
|
136
|
+
requirement: &id008 !ruby/object:Gem::Requirement
|
153
137
|
none: false
|
154
138
|
requirements:
|
155
139
|
- - ~>
|
156
140
|
- !ruby/object:Gem::Version
|
157
|
-
hash:
|
141
|
+
hash: 3
|
158
142
|
segments:
|
143
|
+
- 0
|
159
144
|
- 2
|
160
|
-
-
|
161
|
-
|
162
|
-
version: 2.1.2
|
145
|
+
- 10
|
146
|
+
version: 0.2.10
|
163
147
|
type: :runtime
|
164
|
-
version_requirements: *
|
148
|
+
version_requirements: *id008
|
165
149
|
description: dm-devise adds DataMapper support to devise (http://github.com/plataformatec/devise) for authentication support for Rails
|
166
150
|
email: jmorgan@morgancreative.net
|
167
151
|
executables: []
|