merb-cache 1.1.0.pre → 1.1.0.rc1

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.
Files changed (4) hide show
  1. data/Rakefile +1 -1
  2. data/lib/merb-cache.rb +8 -11
  3. data/lib/merb-cache/version.rb +2 -2
  4. metadata +33 -14
data/Rakefile CHANGED
@@ -14,7 +14,7 @@ begin
14
14
 
15
15
  Jeweler::Tasks.new do |gemspec|
16
16
 
17
- gemspec.version = Merb::Cache::VERSION
17
+ gemspec.version = Merb::Cache::VERSION.dup
18
18
 
19
19
  gemspec.name = "merb-cache"
20
20
  gemspec.description = "Merb plugin for supporting assets"
data/lib/merb-cache.rb CHANGED
@@ -1,14 +1,11 @@
1
- # make sure we're running inside Merb
2
- if defined?(Merb::Plugins)
1
+ require "merb-core"
3
2
 
4
- require "merb-cache/cache"
5
- require "merb-cache/core_ext/enumerable"
6
- require "merb-cache/core_ext/hash"
7
- require "merb-cache/merb_ext/controller"
8
- require "merb-cache/cache_request"
9
-
10
- class Merb::Controller
11
- include Merb::Cache::CacheMixin
12
- end
3
+ require "merb-cache/cache"
4
+ require "merb-cache/core_ext/enumerable"
5
+ require "merb-cache/core_ext/hash"
6
+ require "merb-cache/merb_ext/controller"
7
+ require "merb-cache/cache_request"
13
8
 
9
+ class Merb::Controller
10
+ include Merb::Cache::CacheMixin
14
11
  end
data/lib/merb-cache/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Merb
2
2
  module Cache
3
- VERSION = '1.1.0.pre'.freeze
3
+ VERSION = '1.1.0.rc1'.freeze
4
4
  end
5
- end
5
+ end
metadata CHANGED
@@ -1,7 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: merb-cache
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.1.0.pre
4
+ prerelease: true
5
+ segments:
6
+ - 1
7
+ - 1
8
+ - 0
9
+ - rc1
10
+ version: 1.1.0.rc1
5
11
  platform: ruby
6
12
  authors:
7
13
  - Ben Burkert
@@ -9,29 +15,38 @@ autorequire:
9
15
  bindir: bin
10
16
  cert_chain: []
11
17
 
12
- date: 2010-02-20 00:00:00 +00:00
18
+ date: 2010-03-14 00:00:00 +00:00
13
19
  default_executable:
14
20
  dependencies:
15
21
  - !ruby/object:Gem::Dependency
16
22
  name: merb-core
17
- type: :runtime
18
- version_requirement:
19
- version_requirements: !ruby/object:Gem::Requirement
23
+ prerelease: false
24
+ requirement: &id001 !ruby/object:Gem::Requirement
20
25
  requirements:
21
26
  - - ~>
22
27
  - !ruby/object:Gem::Version
23
- version: 1.1.0.pre
24
- version:
28
+ segments:
29
+ - 1
30
+ - 1
31
+ - 0
32
+ - rc1
33
+ version: 1.1.0.rc1
34
+ type: :runtime
35
+ version_requirements: *id001
25
36
  - !ruby/object:Gem::Dependency
26
37
  name: rspec
27
- type: :development
28
- version_requirement:
29
- version_requirements: !ruby/object:Gem::Requirement
38
+ prerelease: false
39
+ requirement: &id002 !ruby/object:Gem::Requirement
30
40
  requirements:
31
41
  - - ">="
32
42
  - !ruby/object:Gem::Version
43
+ segments:
44
+ - 1
45
+ - 2
46
+ - 9
33
47
  version: 1.2.9
34
- version:
48
+ type: :development
49
+ version_requirements: *id002
35
50
  description: Merb plugin for supporting assets
36
51
  email: ben@benburkert.com
37
52
  executables: []
@@ -92,18 +107,22 @@ required_ruby_version: !ruby/object:Gem::Requirement
92
107
  requirements:
93
108
  - - ">="
94
109
  - !ruby/object:Gem::Version
110
+ segments:
111
+ - 0
95
112
  version: "0"
96
- version:
97
113
  required_rubygems_version: !ruby/object:Gem::Requirement
98
114
  requirements:
99
115
  - - ">"
100
116
  - !ruby/object:Gem::Version
117
+ segments:
118
+ - 1
119
+ - 3
120
+ - 1
101
121
  version: 1.3.1
102
- version:
103
122
  requirements: []
104
123
 
105
124
  rubyforge_project:
106
- rubygems_version: 1.3.5
125
+ rubygems_version: 1.3.6
107
126
  signing_key:
108
127
  specification_version: 3
109
128
  summary: Merb plugin that provides caching (page, action, fragment, object)