merb_datamapper 1.1.0 → 1.1.1
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/Rakefile +1 -1
- data/lib/merb_datamapper.rb +10 -6
- data/lib/merb_datamapper/version.rb +1 -1
- metadata +23 -11
data/Rakefile
CHANGED
|
@@ -27,7 +27,7 @@ begin
|
|
|
27
27
|
gemspec.files = %w(Generators LICENSE Rakefile README TODO) + Dir['{lib,spec}/**/*']
|
|
28
28
|
|
|
29
29
|
# Runtime dependencies
|
|
30
|
-
gemspec.add_dependency 'merb-core', "~>
|
|
30
|
+
gemspec.add_dependency 'merb-core', "~> 1.1"
|
|
31
31
|
gemspec.add_dependency 'dm-core', Merb::DataMapper::DM_VERSION_REQUIREMENT
|
|
32
32
|
gemspec.add_dependency 'dm-migrations', Merb::DataMapper::DM_VERSION_REQUIREMENT
|
|
33
33
|
|
data/lib/merb_datamapper.rb
CHANGED
|
@@ -28,6 +28,9 @@ module DataMapper
|
|
|
28
28
|
end
|
|
29
29
|
end
|
|
30
30
|
|
|
31
|
+
# Sets DataMapper as ORM
|
|
32
|
+
Merb.orm = :datamapper
|
|
33
|
+
|
|
31
34
|
class Merb::Orms::DataMapper::Connect < Merb::BootLoader
|
|
32
35
|
after BeforeAppLoads
|
|
33
36
|
|
|
@@ -73,14 +76,15 @@ class Merb::Orms::DataMapper::Associations < Merb::BootLoader
|
|
|
73
76
|
end
|
|
74
77
|
end
|
|
75
78
|
|
|
76
|
-
if Merb::Plugins.config[:merb_datamapper][:use_repository_block]
|
|
77
79
|
|
|
78
|
-
class Merb::Orms::DataMapper::IdentityMapSupport < Merb::BootLoader
|
|
79
80
|
|
|
80
|
-
|
|
81
|
+
class Merb::Orms::DataMapper::IdentityMapSupport < Merb::BootLoader
|
|
82
|
+
|
|
83
|
+
after RackUpApplication
|
|
81
84
|
|
|
82
|
-
|
|
85
|
+
def self.run
|
|
83
86
|
|
|
87
|
+
if Merb::Plugins.config[:merb_datamapper][:use_repository_block]
|
|
84
88
|
app = Merb::Config[:app]
|
|
85
89
|
def app.call(env)
|
|
86
90
|
DataMapper.repository do |r|
|
|
@@ -88,12 +92,12 @@ if Merb::Plugins.config[:merb_datamapper][:use_repository_block]
|
|
|
88
92
|
super
|
|
89
93
|
end
|
|
90
94
|
end
|
|
91
|
-
|
|
92
95
|
end
|
|
93
|
-
end
|
|
94
96
|
|
|
97
|
+
end
|
|
95
98
|
end
|
|
96
99
|
|
|
100
|
+
|
|
97
101
|
generators = File.join(File.dirname(__FILE__), 'generators')
|
|
98
102
|
Merb.add_generators generators / 'data_mapper_model'
|
|
99
103
|
Merb.add_generators generators / 'data_mapper_resource_controller'
|
metadata
CHANGED
|
@@ -1,12 +1,13 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: merb_datamapper
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
+
hash: 17
|
|
4
5
|
prerelease: false
|
|
5
6
|
segments:
|
|
6
7
|
- 1
|
|
7
8
|
- 1
|
|
8
|
-
-
|
|
9
|
-
version: 1.1.
|
|
9
|
+
- 1
|
|
10
|
+
version: 1.1.1
|
|
10
11
|
platform: ruby
|
|
11
12
|
authors:
|
|
12
13
|
- Jason Toy
|
|
@@ -14,30 +15,33 @@ autorequire:
|
|
|
14
15
|
bindir: bin
|
|
15
16
|
cert_chain: []
|
|
16
17
|
|
|
17
|
-
date: 2010-
|
|
18
|
+
date: 2010-05-21 00:00:00 +01:00
|
|
18
19
|
default_executable:
|
|
19
20
|
dependencies:
|
|
20
21
|
- !ruby/object:Gem::Dependency
|
|
21
22
|
name: merb-core
|
|
22
23
|
prerelease: false
|
|
23
24
|
requirement: &id001 !ruby/object:Gem::Requirement
|
|
25
|
+
none: false
|
|
24
26
|
requirements:
|
|
25
27
|
- - ~>
|
|
26
28
|
- !ruby/object:Gem::Version
|
|
29
|
+
hash: 13
|
|
27
30
|
segments:
|
|
28
31
|
- 1
|
|
29
32
|
- 1
|
|
30
|
-
|
|
31
|
-
version: 1.1.0
|
|
33
|
+
version: "1.1"
|
|
32
34
|
type: :runtime
|
|
33
35
|
version_requirements: *id001
|
|
34
36
|
- !ruby/object:Gem::Dependency
|
|
35
37
|
name: dm-core
|
|
36
38
|
prerelease: false
|
|
37
39
|
requirement: &id002 !ruby/object:Gem::Requirement
|
|
40
|
+
none: false
|
|
38
41
|
requirements:
|
|
39
42
|
- - ~>
|
|
40
43
|
- !ruby/object:Gem::Version
|
|
44
|
+
hash: 31
|
|
41
45
|
segments:
|
|
42
46
|
- 0
|
|
43
47
|
- 10
|
|
@@ -48,9 +52,11 @@ dependencies:
|
|
|
48
52
|
name: dm-migrations
|
|
49
53
|
prerelease: false
|
|
50
54
|
requirement: &id003 !ruby/object:Gem::Requirement
|
|
55
|
+
none: false
|
|
51
56
|
requirements:
|
|
52
57
|
- - ~>
|
|
53
58
|
- !ruby/object:Gem::Version
|
|
59
|
+
hash: 31
|
|
54
60
|
segments:
|
|
55
61
|
- 0
|
|
56
62
|
- 10
|
|
@@ -61,9 +67,11 @@ dependencies:
|
|
|
61
67
|
name: rspec
|
|
62
68
|
prerelease: false
|
|
63
69
|
requirement: &id004 !ruby/object:Gem::Requirement
|
|
70
|
+
none: false
|
|
64
71
|
requirements:
|
|
65
72
|
- - ">="
|
|
66
73
|
- !ruby/object:Gem::Version
|
|
74
|
+
hash: 13
|
|
67
75
|
segments:
|
|
68
76
|
- 1
|
|
69
77
|
- 2
|
|
@@ -123,32 +131,36 @@ rdoc_options:
|
|
|
123
131
|
require_paths:
|
|
124
132
|
- lib
|
|
125
133
|
required_ruby_version: !ruby/object:Gem::Requirement
|
|
134
|
+
none: false
|
|
126
135
|
requirements:
|
|
127
136
|
- - ">="
|
|
128
137
|
- !ruby/object:Gem::Version
|
|
138
|
+
hash: 3
|
|
129
139
|
segments:
|
|
130
140
|
- 0
|
|
131
141
|
version: "0"
|
|
132
142
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
|
143
|
+
none: false
|
|
133
144
|
requirements:
|
|
134
145
|
- - ">="
|
|
135
146
|
- !ruby/object:Gem::Version
|
|
147
|
+
hash: 3
|
|
136
148
|
segments:
|
|
137
149
|
- 0
|
|
138
150
|
version: "0"
|
|
139
151
|
requirements: []
|
|
140
152
|
|
|
141
153
|
rubyforge_project:
|
|
142
|
-
rubygems_version: 1.3.
|
|
154
|
+
rubygems_version: 1.3.7
|
|
143
155
|
signing_key:
|
|
144
156
|
specification_version: 3
|
|
145
157
|
summary: Merb plugin that allows you to use datamapper with your merb app
|
|
146
158
|
test_files:
|
|
159
|
+
- spec/session_store_spec.rb
|
|
147
160
|
- spec/connection_spec.rb
|
|
148
|
-
- spec/datamapper_id_map_controller.rb
|
|
149
|
-
- spec/datamapper_model.rb
|
|
150
|
-
- spec/datamapper_session_controller.rb
|
|
151
161
|
- spec/identity_map_spec.rb
|
|
152
|
-
- spec/session_spec.rb
|
|
153
|
-
- spec/session_store_spec.rb
|
|
154
162
|
- spec/spec_helper.rb
|
|
163
|
+
- spec/datamapper_id_map_controller.rb
|
|
164
|
+
- spec/session_spec.rb
|
|
165
|
+
- spec/datamapper_session_controller.rb
|
|
166
|
+
- spec/datamapper_model.rb
|