enju_circulation 0.0.21 → 0.0.22

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 (6) hide show
  1. data/app/models/reserve.rb +3 -1
  2. data/lib/enju_circulation/version.rb +1 -1
  3. data/spec/dummy/db/test.sqlite3 +0 -0
  4. data/spec/dummy/lib/enju_leaf/expire_editable_fragment.rb +14 -46
  5. data/spec/support/controller_macros.rb +3 -3
  6. metadata +44 -44
data/app/models/reserve.rb CHANGED
@@ -42,7 +42,9 @@ class Reserve < ActiveRecord::Base
42
42
  before_transition [:pending, :requested, :retained] => :expired, :do => :expire
43
43
  before_transition :retained => :completed, :do => :checkout
44
44
  after_transition any => any do |reserve, transition|
45
- ExpireFragmentCache.expire_fragment_cache(reserve.manifestation)
45
+ if Rails.env == 'production'
46
+ ExpireFragmentCache.expire_fragment_cache(reserve.manifestation)
47
+ end
46
48
  end
47
49
 
48
50
  event :sm_request do
data/lib/enju_circulation/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module EnjuCirculation
2
- VERSION = "0.0.21"
2
+ VERSION = "0.0.22"
3
3
  end
data/spec/dummy/db/test.sqlite3 CHANGED
Binary file
data/spec/dummy/lib/enju_leaf/expire_editable_fragment.rb CHANGED
@@ -1,61 +1,29 @@
1
1
  module ExpireEditableFragment
2
- def expire_editable_fragment(record, fragments = [], formats = [])
2
+ def expire_editable_fragment(record, fragments = [])
3
3
  fragments.uniq!
4
- fragments = ['detail'] if fragments.empty?
5
- if record
6
- if record.is_a?(Manifestation)
7
- expire_manifestation_cache(record, fragments, formats)
8
- else
9
- I18n.available_locales.each do |locale|
10
- Role.all_cache.each do |role|
11
- fragments.each do |fragment|
12
- expire_fragment(:controller => record.class.to_s.pluralize.downcase, :action => :show, :id => record.id, :page => fragment, :role => role.name, :locale => locale)
13
- end
14
- end
15
- end
16
- end
17
- end
18
- end
19
-
20
- def expire_manifestation_cache(manifestation, fragments = [], formats = [])
21
- fragments = %w[detail pickup title show_list show_index sru] if fragments.size == 1 and fragments.first == 'detail'
22
- expire_fragment(:controller => :manifestations, :action => :index, :page => 'numdocs')
23
- fragments.uniq.each do |fragment|
24
- expire_manifestation_fragment(manifestation, fragment, formats)
25
- end
26
- if defined?(EnjuBookmark)
27
- manifestation.bookmarks.each do |bookmark|
28
- expire_tag_cloud(bookmark)
4
+ if record.is_a?(Manifestation)
5
+ if fragments.empty?
6
+ fragments = %w[manifestation_html show_detail_user_html show_detail_librarian_html pickup_html title_html title_mobile index_sru]
29
7
  end
30
- end
31
- end
32
-
33
- def expire_manifestation_fragment(manifestation, fragment, formats = [])
34
- formats = ['atom', 'csv', 'html', 'mods', 'mobile', 'oai_list_identifiers', 'oai_list_records', 'rdf', 'rss'] if formats.empty?
35
- if manifestation
8
+ expire_manifestation_cache(record, fragments)
9
+ else
36
10
  I18n.available_locales.each do |locale|
37
- if fragment == 'holding'
38
- expire_fragment(:controller => :manifestations, :action => :show, :id => manifestation.id, :page => fragment, :locale => locale, :manifestation_id => nil)
39
- formats.each do |format|
40
- expire_fragment(:controller => :manifestations, :action => :show, :id => manifestation.id, :page => fragment, :locale => locale, :format => format, :manifestation_id => nil)
41
- end
42
- else
43
- Role.all_cache.each do |role|
44
- expire_fragment(:controller => :manifestations, :action => :show, :id => manifestation.id, :page => fragment, :role => role.name, :locale => locale, :manifestation_id => nil)
45
- formats.each do |format|
46
- expire_fragment(:controller => :manifestations, :action => :show, :id => manifestation.id, :page => fragment, :role => role.name, :locale => locale, :format => format, :manifestation_id => nil)
47
- end
11
+ Role.all_cache.each do |role|
12
+ fragments.each do |fragment|
13
+ expire_fragment(":#{record.class.to_s.downcase}" => record.id, :fragment => fragment, :role => role.name, :locale => locale)
48
14
  end
49
15
  end
50
16
  end
51
17
  end
52
18
  end
53
19
 
54
- def expire_tag_cloud(bookmark)
20
+ private
21
+ def expire_manifestation_cache(manifestation, fragments = [])
55
22
  I18n.available_locales.each do |locale|
56
23
  Role.all_cache.each do |role|
57
- expire_fragment(:controller => :tags, :action => :index, :page => 'user_tag_cloud', :user_id => bookmark.user.username, :locale => locale, :role => role.name, :user_id => nil)
58
- expire_fragment(:controller => :tags, :action => :index, :page => 'public_tag_cloud', :locale => locale, :role => role.name, :user_id => nil)
24
+ fragments.uniq.each do |fragment|
25
+ expire_fragment([:manifestation => manifestation.id, :fragment => fragment, :role => role.name, :locale => locale])
26
+ end
59
27
  end
60
28
  end
61
29
  end
data/spec/support/controller_macros.rb CHANGED
@@ -2,14 +2,14 @@ module ControllerMacros
2
2
  def login_admin
3
3
  before(:each) do
4
4
  @request.env["devise.mapping"] = Devise.mappings[:admin]
5
- sign_in Factory.create(:admin)
5
+ sign_in FactoryGirl.create(:admin)
6
6
  end
7
7
  end
8
8
 
9
9
  def login_librarian
10
10
  before(:each) do
11
11
  @request.env["devise.mapping"] = Devise.mappings[:user]
12
- user = Factory.create(:librarian)
12
+ user = FactoryGirl.create(:librarian)
13
13
  sign_in user
14
14
  end
15
15
  end
@@ -17,7 +17,7 @@ module ControllerMacros
17
17
  def login_user
18
18
  before(:each) do
19
19
  @request.env["devise.mapping"] = Devise.mappings[:user]
20
- user = Factory.create(:user)
20
+ user = FactoryGirl.create(:user)
21
21
  sign_in user
22
22
  end
23
23
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: enju_circulation
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.21
4
+ version: 0.0.22
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,22 +9,22 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-03-29 00:00:00.000000000 Z
12
+ date: 2012-04-13 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rails
16
- requirement: &70107244422400 !ruby/object:Gem::Requirement
16
+ requirement: &70224280357180 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ~>
20
20
  - !ruby/object:Gem::Version
21
- version: '3.1'
21
+ version: '3.2'
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *70107244422400
24
+ version_requirements: *70224280357180
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: simple_form
27
- requirement: &70107244421740 !ruby/object:Gem::Requirement
27
+ requirement: &70224280356760 !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: :runtime
34
34
  prerelease: false
35
- version_requirements: *70107244421740
35
+ version_requirements: *70224280356760
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: devise
38
- requirement: &70107244437240 !ruby/object:Gem::Requirement
38
+ requirement: &70224280356300 !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: :runtime
45
45
  prerelease: false
46
- version_requirements: *70107244437240
46
+ version_requirements: *70224280356300
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: cancan
49
- requirement: &70107244436160 !ruby/object:Gem::Requirement
49
+ requirement: &70224280355880 !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: :runtime
56
56
  prerelease: false
57
- version_requirements: *70107244436160
57
+ version_requirements: *70224280355880
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: validates_timeliness
60
- requirement: &70107244435700 !ruby/object:Gem::Requirement
60
+ requirement: &70224280355460 !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: :runtime
67
67
  prerelease: false
68
- version_requirements: *70107244435700
68
+ version_requirements: *70224280355460
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: attribute_normalizer
71
- requirement: &70107244434720 !ruby/object:Gem::Requirement
71
+ requirement: &70224280354960 !ruby/object:Gem::Requirement
72
72
  none: false
73
73
  requirements:
74
74
  - - ~>
@@ -76,10 +76,10 @@ dependencies:
76
76
  version: '1.1'
77
77
  type: :runtime
78
78
  prerelease: false
79
- version_requirements: *70107244434720
79
+ version_requirements: *70224280354960
80
80
  - !ruby/object:Gem::Dependency
81
81
  name: inherited_resources
82
- requirement: &70107244433000 !ruby/object:Gem::Requirement
82
+ requirement: &70224280370920 !ruby/object:Gem::Requirement
83
83
  none: false
84
84
  requirements:
85
85
  - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
87
87
  version: '0'
88
88
  type: :runtime
89
89
  prerelease: false
90
- version_requirements: *70107244433000
90
+ version_requirements: *70224280370920
91
91
  - !ruby/object:Gem::Dependency
92
92
  name: state_machine
93
- requirement: &70107244431540 !ruby/object:Gem::Requirement
93
+ requirement: &70224280370460 !ruby/object:Gem::Requirement
94
94
  none: false
95
95
  requirements:
96
96
  - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
98
98
  version: '0'
99
99
  type: :runtime
100
100
  prerelease: false
101
- version_requirements: *70107244431540
101
+ version_requirements: *70224280370460
102
102
  - !ruby/object:Gem::Dependency
103
103
  name: friendly_id
104
- requirement: &70107244430980 !ruby/object:Gem::Requirement
104
+ requirement: &70224280369960 !ruby/object:Gem::Requirement
105
105
  none: false
106
106
  requirements:
107
107
  - - ~>
@@ -109,10 +109,10 @@ dependencies:
109
109
  version: '4.0'
110
110
  type: :runtime
111
111
  prerelease: false
112
- version_requirements: *70107244430980
112
+ version_requirements: *70224280369960
113
113
  - !ruby/object:Gem::Dependency
114
114
  name: sunspot_rails
115
- requirement: &70107244430480 !ruby/object:Gem::Requirement
115
+ requirement: &70224280369540 !ruby/object:Gem::Requirement
116
116
  none: false
117
117
  requirements:
118
118
  - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
120
120
  version: '0'
121
121
  type: :runtime
122
122
  prerelease: false
123
- version_requirements: *70107244430480
123
+ version_requirements: *70224280369540
124
124
  - !ruby/object:Gem::Dependency
125
125
  name: sunspot_solr
126
- requirement: &70107244429960 !ruby/object:Gem::Requirement
126
+ requirement: &70224280369080 !ruby/object:Gem::Requirement
127
127
  none: false
128
128
  requirements:
129
129
  - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
131
131
  version: '0'
132
132
  type: :runtime
133
133
  prerelease: false
134
- version_requirements: *70107244429960
134
+ version_requirements: *70224280369080
135
135
  - !ruby/object:Gem::Dependency
136
136
  name: will_paginate
137
- requirement: &70107244429460 !ruby/object:Gem::Requirement
137
+ requirement: &70224280368580 !ruby/object:Gem::Requirement
138
138
  none: false
139
139
  requirements:
140
140
  - - ~>
@@ -142,10 +142,10 @@ dependencies:
142
142
  version: '3.0'
143
143
  type: :runtime
144
144
  prerelease: false
145
- version_requirements: *70107244429460
145
+ version_requirements: *70224280368580
146
146
  - !ruby/object:Gem::Dependency
147
147
  name: acts_as_list
148
- requirement: &70107244445320 !ruby/object:Gem::Requirement
148
+ requirement: &70224280368080 !ruby/object:Gem::Requirement
149
149
  none: false
150
150
  requirements:
151
151
  - - ~>
@@ -153,32 +153,32 @@ dependencies:
153
153
  version: 0.1.5
154
154
  type: :runtime
155
155
  prerelease: false
156
- version_requirements: *70107244445320
156
+ version_requirements: *70224280368080
157
157
  - !ruby/object:Gem::Dependency
158
158
  name: enju_message
159
- requirement: &70107244444760 !ruby/object:Gem::Requirement
159
+ requirement: &70224280367620 !ruby/object:Gem::Requirement
160
160
  none: false
161
161
  requirements:
162
162
  - - ~>
163
163
  - !ruby/object:Gem::Version
164
- version: 0.0.10
164
+ version: 0.0.13
165
165
  type: :runtime
166
166
  prerelease: false
167
- version_requirements: *70107244444760
167
+ version_requirements: *70224280367620
168
168
  - !ruby/object:Gem::Dependency
169
169
  name: enju_event
170
- requirement: &70107244444160 !ruby/object:Gem::Requirement
170
+ requirement: &70224280367160 !ruby/object:Gem::Requirement
171
171
  none: false
172
172
  requirements:
173
173
  - - ! '>='
174
174
  - !ruby/object:Gem::Version
175
- version: 0.0.5
175
+ version: 0.0.11
176
176
  type: :runtime
177
177
  prerelease: false
178
- version_requirements: *70107244444160
178
+ version_requirements: *70224280367160
179
179
  - !ruby/object:Gem::Dependency
180
180
  name: sqlite3
181
- requirement: &70107244443660 !ruby/object:Gem::Requirement
181
+ requirement: &70224280366780 !ruby/object:Gem::Requirement
182
182
  none: false
183
183
  requirements:
184
184
  - - ! '>='
@@ -186,10 +186,10 @@ dependencies:
186
186
  version: '0'
187
187
  type: :development
188
188
  prerelease: false
189
- version_requirements: *70107244443660
189
+ version_requirements: *70224280366780
190
190
  - !ruby/object:Gem::Dependency
191
191
  name: rspec-rails
192
- requirement: &70107244442980 !ruby/object:Gem::Requirement
192
+ requirement: &70224280366320 !ruby/object:Gem::Requirement
193
193
  none: false
194
194
  requirements:
195
195
  - - ! '>='
@@ -197,21 +197,21 @@ dependencies:
197
197
  version: '0'
198
198
  type: :development
199
199
  prerelease: false
200
- version_requirements: *70107244442980
200
+ version_requirements: *70224280366320
201
201
  - !ruby/object:Gem::Dependency
202
202
  name: factory_girl_rails
203
- requirement: &70107244442280 !ruby/object:Gem::Requirement
203
+ requirement: &70224280365820 !ruby/object:Gem::Requirement
204
204
  none: false
205
205
  requirements:
206
206
  - - ~>
207
207
  - !ruby/object:Gem::Version
208
- version: '1.7'
208
+ version: '3.0'
209
209
  type: :development
210
210
  prerelease: false
211
- version_requirements: *70107244442280
211
+ version_requirements: *70224280365820
212
212
  - !ruby/object:Gem::Dependency
213
213
  name: sunspot-rails-tester
214
- requirement: &70107244441860 !ruby/object:Gem::Requirement
214
+ requirement: &70224280365400 !ruby/object:Gem::Requirement
215
215
  none: false
216
216
  requirements:
217
217
  - - ! '>='
@@ -219,7 +219,7 @@ dependencies:
219
219
  version: '0'
220
220
  type: :development
221
221
  prerelease: false
222
- version_requirements: *70107244441860
222
+ version_requirements: *70224280365400
223
223
  description: Circulation management for Next-L Enju
224
224
  email:
225
225
  - tanabe@mwr.mediacom.keio.ac.jp