merb 1.0.14 → 1.0.15

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 +1 -0
  2. data/lib/merb.rb +1 -0
  3. metadata +23 -13
data/Rakefile CHANGED
@@ -27,6 +27,7 @@ gems = [
27
27
  ["merb-action-args", "= #{GEM_VERSION}"],
28
28
  ["merb-assets", "= #{GEM_VERSION}"],
29
29
  ["merb-auth", "= #{GEM_VERSION}"],
30
+ ["merb-cache", "= #{GEM_VERSION}"],
30
31
  ["merb-exceptions", "= #{GEM_VERSION}"],
31
32
  ["merb-gen", "= #{GEM_VERSION}"],
32
33
  ["merb-haml", "= #{GEM_VERSION}"],
data/lib/merb.rb CHANGED
@@ -3,6 +3,7 @@ require 'merb-core'
3
3
  require 'merb-action-args'
4
4
  require 'merb-assets'
5
5
  require 'merb-auth'
6
+ require 'merb-cache'
6
7
  require 'merb-exceptions'
7
8
  require 'merb-gen'
8
9
  require 'merb-haml'
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.14
4
+ version: 1.0.15
5
5
  platform: ruby
6
6
  authors:
7
7
  - Merb Team
@@ -20,7 +20,7 @@ dependencies:
20
20
  requirements:
21
21
  - - "="
22
22
  - !ruby/object:Gem::Version
23
- version: 1.0.14
23
+ version: 1.0.15
24
24
  version:
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: merb-action-args
@@ -30,7 +30,7 @@ dependencies:
30
30
  requirements:
31
31
  - - "="
32
32
  - !ruby/object:Gem::Version
33
- version: 1.0.14
33
+ version: 1.0.15
34
34
  version:
35
35
  - !ruby/object:Gem::Dependency
36
36
  name: merb-assets
@@ -40,7 +40,7 @@ dependencies:
40
40
  requirements:
41
41
  - - "="
42
42
  - !ruby/object:Gem::Version
43
- version: 1.0.14
43
+ version: 1.0.15
44
44
  version:
45
45
  - !ruby/object:Gem::Dependency
46
46
  name: merb-auth
@@ -50,7 +50,17 @@ dependencies:
50
50
  requirements:
51
51
  - - "="
52
52
  - !ruby/object:Gem::Version
53
- version: 1.0.14
53
+ version: 1.0.15
54
+ version:
55
+ - !ruby/object:Gem::Dependency
56
+ name: merb-cache
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.15
54
64
  version:
55
65
  - !ruby/object:Gem::Dependency
56
66
  name: merb-exceptions
@@ -60,7 +70,7 @@ dependencies:
60
70
  requirements:
61
71
  - - "="
62
72
  - !ruby/object:Gem::Version
63
- version: 1.0.14
73
+ version: 1.0.15
64
74
  version:
65
75
  - !ruby/object:Gem::Dependency
66
76
  name: merb-gen
@@ -70,7 +80,7 @@ dependencies:
70
80
  requirements:
71
81
  - - "="
72
82
  - !ruby/object:Gem::Version
73
- version: 1.0.14
83
+ version: 1.0.15
74
84
  version:
75
85
  - !ruby/object:Gem::Dependency
76
86
  name: merb-haml
@@ -80,7 +90,7 @@ dependencies:
80
90
  requirements:
81
91
  - - "="
82
92
  - !ruby/object:Gem::Version
83
- version: 1.0.14
93
+ version: 1.0.15
84
94
  version:
85
95
  - !ruby/object:Gem::Dependency
86
96
  name: merb-helpers
@@ -90,7 +100,7 @@ dependencies:
90
100
  requirements:
91
101
  - - "="
92
102
  - !ruby/object:Gem::Version
93
- version: 1.0.14
103
+ version: 1.0.15
94
104
  version:
95
105
  - !ruby/object:Gem::Dependency
96
106
  name: merb-mailer
@@ -100,7 +110,7 @@ dependencies:
100
110
  requirements:
101
111
  - - "="
102
112
  - !ruby/object:Gem::Version
103
- version: 1.0.14
113
+ version: 1.0.15
104
114
  version:
105
115
  - !ruby/object:Gem::Dependency
106
116
  name: merb-param-protection
@@ -110,7 +120,7 @@ dependencies:
110
120
  requirements:
111
121
  - - "="
112
122
  - !ruby/object:Gem::Version
113
- version: 1.0.14
123
+ version: 1.0.15
114
124
  version:
115
125
  - !ruby/object:Gem::Dependency
116
126
  name: merb-slices
@@ -120,7 +130,7 @@ dependencies:
120
130
  requirements:
121
131
  - - "="
122
132
  - !ruby/object:Gem::Version
123
- version: 1.0.14
133
+ version: 1.0.15
124
134
  version:
125
135
  - !ruby/object:Gem::Dependency
126
136
  name: merb_datamapper
@@ -130,7 +140,7 @@ dependencies:
130
140
  requirements:
131
141
  - - "="
132
142
  - !ruby/object:Gem::Version
133
- version: 1.0.14
143
+ version: 1.0.15
134
144
  version:
135
145
  - !ruby/object:Gem::Dependency
136
146
  name: do_sqlite3