merb 1.0.13 → 1.0.14

Sign up to get free protection for your applications and to get access to all the features.
Files changed (3) hide show
  1. data/Rakefile +19 -11
  2. data/lib/merb.rb +10 -2
  3. metadata +95 -15
data/Rakefile CHANGED
@@ -23,17 +23,25 @@ DM_VERSION = Merb::DM_VERSION
23
23
  RELEASE_NAME = "REL #{GEM_VERSION}"
24
24
 
25
25
  gems = [
26
- ["merb-core", "= #{GEM_VERSION}"],
27
- ["merb_datamapper", "= #{GEM_VERSION}"],
28
- ["dm-core", "~> #{DM_VERSION}"],
29
- ["do_sqlite3", "~> #{DM_VERSION}"],
30
- ["dm-timestamps", "~> #{DM_VERSION}"],
31
- ["dm-types", "~> #{DM_VERSION}"],
32
- ["dm-aggregates", "~> #{DM_VERSION}"],
33
- ["dm-migrations", "~> #{DM_VERSION}"],
34
- ["dm-validations", "~> #{DM_VERSION}"],
35
- ["dm-sweatshop", "~> #{DM_VERSION}"],
36
- ["dm-serializer", "~> #{DM_VERSION}"]
26
+ ["merb-core", "= #{GEM_VERSION}"],
27
+ ["merb-action-args", "= #{GEM_VERSION}"],
28
+ ["merb-assets", "= #{GEM_VERSION}"],
29
+ ["merb-auth", "= #{GEM_VERSION}"],
30
+ ["merb-exceptions", "= #{GEM_VERSION}"],
31
+ ["merb-gen", "= #{GEM_VERSION}"],
32
+ ["merb-haml", "= #{GEM_VERSION}"],
33
+ ["merb-helpers", "= #{GEM_VERSION}"],
34
+ ["merb-mailer", "= #{GEM_VERSION}"],
35
+ ["merb-param-protection", "= #{GEM_VERSION}"],
36
+ ["merb-slices", "= #{GEM_VERSION}"],
37
+ ["merb_datamapper", "= #{GEM_VERSION}"],
38
+ ["do_sqlite3", "~> #{DM_VERSION}"],
39
+ ["dm-timestamps", "~> #{DM_VERSION}"],
40
+ ["dm-types", "~> #{DM_VERSION}"],
41
+ ["dm-aggregates", "~> #{DM_VERSION}"],
42
+ ["dm-validations", "~> #{DM_VERSION}"],
43
+ ["dm-sweatshop", "~> #{DM_VERSION}"],
44
+ ["dm-serializer", "~> #{DM_VERSION}"]
37
45
  ]
38
46
 
39
47
  merb_spec = Gem::Specification.new do |s|
data/lib/merb.rb CHANGED
@@ -1,12 +1,20 @@
1
1
  ### AUTOMATICALLY GENERATED. DO NOT EDIT!
2
2
  require 'merb-core'
3
+ require 'merb-action-args'
4
+ require 'merb-assets'
5
+ require 'merb-auth'
6
+ require 'merb-exceptions'
7
+ require 'merb-gen'
8
+ require 'merb-haml'
9
+ require 'merb-helpers'
10
+ require 'merb-mailer'
11
+ require 'merb-param-protection'
12
+ require 'merb-slices'
3
13
  require 'merb_datamapper'
4
- require 'dm-core'
5
14
  require 'do_sqlite3'
6
15
  require 'dm-timestamps'
7
16
  require 'dm-types'
8
17
  require 'dm-aggregates'
9
- require 'dm-migrations'
10
18
  require 'dm-validations'
11
19
  require 'dm-sweatshop'
12
20
  require 'dm-serializer'
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: merb
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.13
4
+ version: 1.0.14
5
5
  platform: ruby
6
6
  authors:
7
7
  - Merb Team
@@ -9,7 +9,7 @@ autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
11
 
12
- date: 2009-11-03 00:00:00 +00:00
12
+ date: 2009-11-04 00:00:00 +00:00
13
13
  default_executable:
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
@@ -20,40 +20,120 @@ dependencies:
20
20
  requirements:
21
21
  - - "="
22
22
  - !ruby/object:Gem::Version
23
- version: 1.0.13
23
+ version: 1.0.14
24
24
  version:
25
25
  - !ruby/object:Gem::Dependency
26
- name: merb_datamapper
26
+ name: merb-action-args
27
27
  type: :runtime
28
28
  version_requirement:
29
29
  version_requirements: !ruby/object:Gem::Requirement
30
30
  requirements:
31
31
  - - "="
32
32
  - !ruby/object:Gem::Version
33
- version: 1.0.13
33
+ version: 1.0.14
34
34
  version:
35
35
  - !ruby/object:Gem::Dependency
36
- name: dm-core
36
+ name: merb-assets
37
37
  type: :runtime
38
38
  version_requirement:
39
39
  version_requirements: !ruby/object:Gem::Requirement
40
40
  requirements:
41
- - - ~>
41
+ - - "="
42
42
  - !ruby/object:Gem::Version
43
- version: "0.10"
43
+ version: 1.0.14
44
44
  version:
45
45
  - !ruby/object:Gem::Dependency
46
- name: do_sqlite3
46
+ name: merb-auth
47
47
  type: :runtime
48
48
  version_requirement:
49
49
  version_requirements: !ruby/object:Gem::Requirement
50
50
  requirements:
51
- - - ~>
51
+ - - "="
52
52
  - !ruby/object:Gem::Version
53
- version: "0.10"
53
+ version: 1.0.14
54
54
  version:
55
55
  - !ruby/object:Gem::Dependency
56
- name: dm-timestamps
56
+ name: merb-exceptions
57
+ type: :runtime
58
+ version_requirement:
59
+ version_requirements: !ruby/object:Gem::Requirement
60
+ requirements:
61
+ - - "="
62
+ - !ruby/object:Gem::Version
63
+ version: 1.0.14
64
+ version:
65
+ - !ruby/object:Gem::Dependency
66
+ name: merb-gen
67
+ type: :runtime
68
+ version_requirement:
69
+ version_requirements: !ruby/object:Gem::Requirement
70
+ requirements:
71
+ - - "="
72
+ - !ruby/object:Gem::Version
73
+ version: 1.0.14
74
+ version:
75
+ - !ruby/object:Gem::Dependency
76
+ name: merb-haml
77
+ type: :runtime
78
+ version_requirement:
79
+ version_requirements: !ruby/object:Gem::Requirement
80
+ requirements:
81
+ - - "="
82
+ - !ruby/object:Gem::Version
83
+ version: 1.0.14
84
+ version:
85
+ - !ruby/object:Gem::Dependency
86
+ name: merb-helpers
87
+ type: :runtime
88
+ version_requirement:
89
+ version_requirements: !ruby/object:Gem::Requirement
90
+ requirements:
91
+ - - "="
92
+ - !ruby/object:Gem::Version
93
+ version: 1.0.14
94
+ version:
95
+ - !ruby/object:Gem::Dependency
96
+ name: merb-mailer
97
+ type: :runtime
98
+ version_requirement:
99
+ version_requirements: !ruby/object:Gem::Requirement
100
+ requirements:
101
+ - - "="
102
+ - !ruby/object:Gem::Version
103
+ version: 1.0.14
104
+ version:
105
+ - !ruby/object:Gem::Dependency
106
+ name: merb-param-protection
107
+ type: :runtime
108
+ version_requirement:
109
+ version_requirements: !ruby/object:Gem::Requirement
110
+ requirements:
111
+ - - "="
112
+ - !ruby/object:Gem::Version
113
+ version: 1.0.14
114
+ version:
115
+ - !ruby/object:Gem::Dependency
116
+ name: merb-slices
117
+ type: :runtime
118
+ version_requirement:
119
+ version_requirements: !ruby/object:Gem::Requirement
120
+ requirements:
121
+ - - "="
122
+ - !ruby/object:Gem::Version
123
+ version: 1.0.14
124
+ version:
125
+ - !ruby/object:Gem::Dependency
126
+ name: merb_datamapper
127
+ type: :runtime
128
+ version_requirement:
129
+ version_requirements: !ruby/object:Gem::Requirement
130
+ requirements:
131
+ - - "="
132
+ - !ruby/object:Gem::Version
133
+ version: 1.0.14
134
+ version:
135
+ - !ruby/object:Gem::Dependency
136
+ name: do_sqlite3
57
137
  type: :runtime
58
138
  version_requirement:
59
139
  version_requirements: !ruby/object:Gem::Requirement
@@ -63,7 +143,7 @@ dependencies:
63
143
  version: "0.10"
64
144
  version:
65
145
  - !ruby/object:Gem::Dependency
66
- name: dm-types
146
+ name: dm-timestamps
67
147
  type: :runtime
68
148
  version_requirement:
69
149
  version_requirements: !ruby/object:Gem::Requirement
@@ -73,7 +153,7 @@ dependencies:
73
153
  version: "0.10"
74
154
  version:
75
155
  - !ruby/object:Gem::Dependency
76
- name: dm-aggregates
156
+ name: dm-types
77
157
  type: :runtime
78
158
  version_requirement:
79
159
  version_requirements: !ruby/object:Gem::Requirement
@@ -83,7 +163,7 @@ dependencies:
83
163
  version: "0.10"
84
164
  version:
85
165
  - !ruby/object:Gem::Dependency
86
- name: dm-migrations
166
+ name: dm-aggregates
87
167
  type: :runtime
88
168
  version_requirement:
89
169
  version_requirements: !ruby/object:Gem::Requirement