catche 0.1.1 → 0.1.2
Sign up to get free protection for your applications and to get access to all the features.
- data/lib/catche/model/base.rb +10 -6
- data/lib/catche/tag/object.rb +3 -2
- data/lib/catche/version.rb +1 -1
- metadata +13 -13
data/lib/catche/model/base.rb
CHANGED
@@ -4,24 +4,28 @@ module Catche
|
|
4
4
|
extend ActiveSupport::Concern
|
5
5
|
|
6
6
|
included do
|
7
|
-
after_update :
|
8
|
-
after_destroy :
|
7
|
+
after_update :expire_resource_and_collection!
|
8
|
+
after_destroy :expire_resource_and_collection!
|
9
9
|
|
10
10
|
after_create :expire_collection!
|
11
|
-
|
11
|
+
end
|
12
|
+
|
13
|
+
def expire_resource_and_collection!
|
14
|
+
expire_collection!
|
15
|
+
expire_resource!
|
12
16
|
end
|
13
17
|
|
14
18
|
def expire_collection!
|
15
|
-
expire_cache!
|
19
|
+
expire_cache! false
|
16
20
|
end
|
17
21
|
|
18
22
|
def expire_resource!
|
19
23
|
expire_cache!
|
20
24
|
end
|
21
25
|
|
22
|
-
def expire_cache!
|
26
|
+
def expire_cache!(set_instance=true)
|
23
27
|
tags = Catche::Tag::Object.find_by_model(self.class).collect do |obj|
|
24
|
-
self.instance_variable_set("@#{obj.options[:resource_name]}", self)
|
28
|
+
self.instance_variable_set("@#{obj.options[:resource_name]}", self) if set_instance
|
25
29
|
obj.expiration_tags(self)
|
26
30
|
end.flatten.compact.uniq
|
27
31
|
|
data/lib/catche/tag/object.rb
CHANGED
@@ -85,13 +85,14 @@ module Catche
|
|
85
85
|
|
86
86
|
# The tags that should expire as soon as the resource or collection changes.
|
87
87
|
def expiration_tags(initialized_object)
|
88
|
-
|
88
|
+
resource = Catche::Tag::Resource.resource(initialized_object, options[:resource_name])
|
89
|
+
tags = []
|
89
90
|
|
90
91
|
# Add collection tags when enabled
|
91
92
|
tags << Catche::Tag.join(
|
92
93
|
association_tags(initialized_object),
|
93
94
|
options[:collection_name]
|
94
|
-
) if options[:expire_collection]
|
95
|
+
) if resource.nil? && options[:expire_collection]
|
95
96
|
|
96
97
|
tags << Catche::Tag.join(
|
97
98
|
association_tags(initialized_object),
|
data/lib/catche/version.rb
CHANGED
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: catche
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.1.
|
4
|
+
version: 0.1.2
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -13,7 +13,7 @@ date: 2012-06-20 00:00:00.000000000Z
|
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: rails
|
16
|
-
requirement: &
|
16
|
+
requirement: &2160688340 !ruby/object:Gem::Requirement
|
17
17
|
none: false
|
18
18
|
requirements:
|
19
19
|
- - ~>
|
@@ -21,10 +21,10 @@ dependencies:
|
|
21
21
|
version: 3.2.0
|
22
22
|
type: :runtime
|
23
23
|
prerelease: false
|
24
|
-
version_requirements: *
|
24
|
+
version_requirements: *2160688340
|
25
25
|
- !ruby/object:Gem::Dependency
|
26
26
|
name: sqlite3
|
27
|
-
requirement: &
|
27
|
+
requirement: &2160687900 !ruby/object:Gem::Requirement
|
28
28
|
none: false
|
29
29
|
requirements:
|
30
30
|
- - ! '>='
|
@@ -32,10 +32,10 @@ dependencies:
|
|
32
32
|
version: '0'
|
33
33
|
type: :development
|
34
34
|
prerelease: false
|
35
|
-
version_requirements: *
|
35
|
+
version_requirements: *2160687900
|
36
36
|
- !ruby/object:Gem::Dependency
|
37
37
|
name: rspec-rails
|
38
|
-
requirement: &
|
38
|
+
requirement: &2160687400 !ruby/object:Gem::Requirement
|
39
39
|
none: false
|
40
40
|
requirements:
|
41
41
|
- - ! '>='
|
@@ -43,10 +43,10 @@ dependencies:
|
|
43
43
|
version: '0'
|
44
44
|
type: :development
|
45
45
|
prerelease: false
|
46
|
-
version_requirements: *
|
46
|
+
version_requirements: *2160687400
|
47
47
|
- !ruby/object:Gem::Dependency
|
48
48
|
name: capybara
|
49
|
-
requirement: &
|
49
|
+
requirement: &2160686880 !ruby/object:Gem::Requirement
|
50
50
|
none: false
|
51
51
|
requirements:
|
52
52
|
- - ! '>='
|
@@ -54,10 +54,10 @@ dependencies:
|
|
54
54
|
version: '0'
|
55
55
|
type: :development
|
56
56
|
prerelease: false
|
57
|
-
version_requirements: *
|
57
|
+
version_requirements: *2160686880
|
58
58
|
- !ruby/object:Gem::Dependency
|
59
59
|
name: guard-rspec
|
60
|
-
requirement: &
|
60
|
+
requirement: &2160686040 !ruby/object:Gem::Requirement
|
61
61
|
none: false
|
62
62
|
requirements:
|
63
63
|
- - ! '>='
|
@@ -65,10 +65,10 @@ dependencies:
|
|
65
65
|
version: '0'
|
66
66
|
type: :development
|
67
67
|
prerelease: false
|
68
|
-
version_requirements: *
|
68
|
+
version_requirements: *2160686040
|
69
69
|
- !ruby/object:Gem::Dependency
|
70
70
|
name: guard-spork
|
71
|
-
requirement: &
|
71
|
+
requirement: &2160685320 !ruby/object:Gem::Requirement
|
72
72
|
none: false
|
73
73
|
requirements:
|
74
74
|
- - ! '>='
|
@@ -76,7 +76,7 @@ dependencies:
|
|
76
76
|
version: '0'
|
77
77
|
type: :development
|
78
78
|
prerelease: false
|
79
|
-
version_requirements: *
|
79
|
+
version_requirements: *2160685320
|
80
80
|
description: ''
|
81
81
|
email:
|
82
82
|
- mail@arjen.me
|