enju_circulation 0.1.0.pre11 → 0.1.0.pre12

Sign up to get free protection for your applications and to get access to all the features.
Files changed (48) hide show
  1. checksums.yaml +7 -0
  2. data/app/controllers/checked_items_controller.rb +0 -5
  3. data/app/controllers/checkins_controller.rb +0 -11
  4. data/app/controllers/reserves_controller.rb +73 -15
  5. data/app/helpers/reserves_helper.rb +2 -0
  6. data/app/models/checked_item.rb +9 -0
  7. data/app/models/checkin.rb +13 -0
  8. data/app/models/reserve.rb +186 -42
  9. data/app/views/baskets/new.html.erb +1 -1
  10. data/app/views/checked_items/_list.html.erb +1 -1
  11. data/app/views/checkins/_checkin.html.erb +1 -1
  12. data/app/views/checkins/_list.html.erb +1 -1
  13. data/app/views/manifestations/_show_detail_librarian.html.erb +141 -0
  14. data/app/views/manifestations/_show_detail_user.html.erb +136 -0
  15. data/app/views/reserves/_new.html.erb +1 -1
  16. data/app/views/reserves/_state_facet.html.erb +15 -0
  17. data/app/views/reserves/_title.html.erb +2 -1
  18. data/app/views/reserves/edit.html.erb +20 -2
  19. data/app/views/reserves/index.csv.erb +2 -2
  20. data/app/views/reserves/index.html.erb +30 -6
  21. data/app/views/reserves/show.html.erb +18 -3
  22. data/config/locales/translation_en.yml +10 -1
  23. data/config/locales/translation_ja.yml +10 -1
  24. data/db/migrate/20130303104849_add_state_index_to_reserve.rb +5 -0
  25. data/db/migrate/20130303124821_add_retained_at_to_reserve.rb +5 -0
  26. data/db/migrate/20130304015019_add_postponed_at_to_reserve.rb +5 -0
  27. data/lib/enju_circulation/item.rb +4 -0
  28. data/lib/enju_circulation/version.rb +1 -1
  29. data/spec/controllers/checkins_controller_spec.rb +2 -2
  30. data/spec/controllers/reserves_controller_spec.rb +29 -5
  31. data/spec/dummy/db/schema.rb +4 -1
  32. data/spec/dummy/db/test.sqlite3 +0 -0
  33. data/spec/dummy/solr/data/test/index/_5d.fdt +0 -0
  34. data/spec/dummy/solr/data/test/index/_5d.fdx +0 -0
  35. data/spec/dummy/solr/data/test/index/_5d.fnm +4 -0
  36. data/spec/dummy/solr/data/test/index/_5d.frq +1 -0
  37. data/spec/dummy/solr/data/test/index/_5d.nrm +1 -0
  38. data/spec/dummy/solr/data/test/index/_5d.prx +0 -0
  39. data/spec/dummy/solr/data/test/index/_5d.tii +0 -0
  40. data/spec/dummy/solr/data/test/index/_5d.tis +0 -0
  41. data/spec/dummy/solr/data/test/index/segments.gen +0 -0
  42. data/spec/dummy/solr/data/test/index/segments_at +0 -0
  43. data/spec/dummy/solr/data/test/spellchecker/segments.gen +0 -0
  44. data/spec/dummy/solr/data/test/spellchecker/segments_1 +0 -0
  45. data/spec/fixtures/message_templates.yml +14 -0
  46. data/spec/fixtures/reserves.yml +39 -38
  47. data/spec/models/reserve_spec.rb +25 -1
  48. metadata +65 -72
metadata CHANGED
@@ -1,100 +1,88 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: enju_circulation
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.0.pre11
5
- prerelease: 6
4
+ version: 0.1.0.pre12
6
5
  platform: ruby
7
6
  authors:
8
7
  - Kosuke Tanabe
9
8
  autorequire:
10
9
  bindir: bin
11
10
  cert_chain: []
12
- date: 2013-02-22 00:00:00.000000000 Z
11
+ date: 2013-03-04 00:00:00.000000000 Z
13
12
  dependencies:
14
13
  - !ruby/object:Gem::Dependency
15
14
  name: rails
16
15
  requirement: !ruby/object:Gem::Requirement
17
- none: false
18
16
  requirements:
19
17
  - - ~>
20
18
  - !ruby/object:Gem::Version
21
- version: '3.2'
19
+ version: 3.2.13.rc1
22
20
  type: :runtime
23
21
  prerelease: false
24
22
  version_requirements: !ruby/object:Gem::Requirement
25
- none: false
26
23
  requirements:
27
24
  - - ~>
28
25
  - !ruby/object:Gem::Version
29
- version: '3.2'
26
+ version: 3.2.13.rc1
30
27
  - !ruby/object:Gem::Dependency
31
28
  name: simple_form
32
29
  requirement: !ruby/object:Gem::Requirement
33
- none: false
34
30
  requirements:
35
- - - ! '>='
31
+ - - '>='
36
32
  - !ruby/object:Gem::Version
37
33
  version: '0'
38
34
  type: :runtime
39
35
  prerelease: false
40
36
  version_requirements: !ruby/object:Gem::Requirement
41
- none: false
42
37
  requirements:
43
- - - ! '>='
38
+ - - '>='
44
39
  - !ruby/object:Gem::Version
45
40
  version: '0'
46
41
  - !ruby/object:Gem::Dependency
47
42
  name: validates_timeliness
48
43
  requirement: !ruby/object:Gem::Requirement
49
- none: false
50
44
  requirements:
51
- - - ! '>='
45
+ - - '>='
52
46
  - !ruby/object:Gem::Version
53
47
  version: '0'
54
48
  type: :runtime
55
49
  prerelease: false
56
50
  version_requirements: !ruby/object:Gem::Requirement
57
- none: false
58
51
  requirements:
59
- - - ! '>='
52
+ - - '>='
60
53
  - !ruby/object:Gem::Version
61
54
  version: '0'
62
55
  - !ruby/object:Gem::Dependency
63
56
  name: inherited_resources
64
57
  requirement: !ruby/object:Gem::Requirement
65
- none: false
66
58
  requirements:
67
- - - ! '>='
59
+ - - '>='
68
60
  - !ruby/object:Gem::Version
69
61
  version: '0'
70
62
  type: :runtime
71
63
  prerelease: false
72
64
  version_requirements: !ruby/object:Gem::Requirement
73
- none: false
74
65
  requirements:
75
- - - ! '>='
66
+ - - '>='
76
67
  - !ruby/object:Gem::Version
77
68
  version: '0'
78
69
  - !ruby/object:Gem::Dependency
79
70
  name: state_machine
80
71
  requirement: !ruby/object:Gem::Requirement
81
- none: false
82
72
  requirements:
83
- - - ! '>='
73
+ - - '>='
84
74
  - !ruby/object:Gem::Version
85
75
  version: '0'
86
76
  type: :runtime
87
77
  prerelease: false
88
78
  version_requirements: !ruby/object:Gem::Requirement
89
- none: false
90
79
  requirements:
91
- - - ! '>='
80
+ - - '>='
92
81
  - !ruby/object:Gem::Version
93
82
  version: '0'
94
83
  - !ruby/object:Gem::Dependency
95
84
  name: enju_message
96
85
  requirement: !ruby/object:Gem::Requirement
97
- none: false
98
86
  requirements:
99
87
  - - ~>
100
88
  - !ruby/object:Gem::Version
@@ -102,7 +90,6 @@ dependencies:
102
90
  type: :runtime
103
91
  prerelease: false
104
92
  version_requirements: !ruby/object:Gem::Requirement
105
- none: false
106
93
  requirements:
107
94
  - - ~>
108
95
  - !ruby/object:Gem::Version
@@ -110,7 +97,6 @@ dependencies:
110
97
  - !ruby/object:Gem::Dependency
111
98
  name: enju_event
112
99
  requirement: !ruby/object:Gem::Requirement
113
- none: false
114
100
  requirements:
115
101
  - - ~>
116
102
  - !ruby/object:Gem::Version
@@ -118,7 +104,6 @@ dependencies:
118
104
  type: :runtime
119
105
  prerelease: false
120
106
  version_requirements: !ruby/object:Gem::Requirement
121
- none: false
122
107
  requirements:
123
108
  - - ~>
124
109
  - !ruby/object:Gem::Version
@@ -126,145 +111,127 @@ dependencies:
126
111
  - !ruby/object:Gem::Dependency
127
112
  name: sqlite3
128
113
  requirement: !ruby/object:Gem::Requirement
129
- none: false
130
114
  requirements:
131
- - - ! '>='
115
+ - - '>='
132
116
  - !ruby/object:Gem::Version
133
117
  version: '0'
134
118
  type: :development
135
119
  prerelease: false
136
120
  version_requirements: !ruby/object:Gem::Requirement
137
- none: false
138
121
  requirements:
139
- - - ! '>='
122
+ - - '>='
140
123
  - !ruby/object:Gem::Version
141
124
  version: '0'
142
125
  - !ruby/object:Gem::Dependency
143
126
  name: rspec-rails
144
127
  requirement: !ruby/object:Gem::Requirement
145
- none: false
146
128
  requirements:
147
- - - ! '>='
129
+ - - '>='
148
130
  - !ruby/object:Gem::Version
149
131
  version: '0'
150
132
  type: :development
151
133
  prerelease: false
152
134
  version_requirements: !ruby/object:Gem::Requirement
153
- none: false
154
135
  requirements:
155
- - - ! '>='
136
+ - - '>='
156
137
  - !ruby/object:Gem::Version
157
138
  version: '0'
158
139
  - !ruby/object:Gem::Dependency
159
140
  name: factory_girl_rails
160
141
  requirement: !ruby/object:Gem::Requirement
161
- none: false
162
142
  requirements:
163
- - - ! '>='
143
+ - - '>='
164
144
  - !ruby/object:Gem::Version
165
145
  version: '0'
166
146
  type: :development
167
147
  prerelease: false
168
148
  version_requirements: !ruby/object:Gem::Requirement
169
- none: false
170
149
  requirements:
171
- - - ! '>='
150
+ - - '>='
172
151
  - !ruby/object:Gem::Version
173
152
  version: '0'
174
153
  - !ruby/object:Gem::Dependency
175
154
  name: sunspot_solr
176
155
  requirement: !ruby/object:Gem::Requirement
177
- none: false
178
156
  requirements:
179
157
  - - ~>
180
158
  - !ruby/object:Gem::Version
181
- version: 2.0.0.pre.130115
159
+ version: 2.0.0
182
160
  type: :development
183
161
  prerelease: false
184
162
  version_requirements: !ruby/object:Gem::Requirement
185
- none: false
186
163
  requirements:
187
164
  - - ~>
188
165
  - !ruby/object:Gem::Version
189
- version: 2.0.0.pre.130115
166
+ version: 2.0.0
190
167
  - !ruby/object:Gem::Dependency
191
168
  name: enju_biblio
192
169
  requirement: !ruby/object:Gem::Requirement
193
- none: false
194
170
  requirements:
195
171
  - - ~>
196
172
  - !ruby/object:Gem::Version
197
- version: 0.1.0.pre17
173
+ version: 0.1.0.pre21
198
174
  type: :development
199
175
  prerelease: false
200
176
  version_requirements: !ruby/object:Gem::Requirement
201
- none: false
202
177
  requirements:
203
178
  - - ~>
204
179
  - !ruby/object:Gem::Version
205
- version: 0.1.0.pre17
180
+ version: 0.1.0.pre21
206
181
  - !ruby/object:Gem::Dependency
207
182
  name: enju_library
208
183
  requirement: !ruby/object:Gem::Requirement
209
- none: false
210
184
  requirements:
211
185
  - - ~>
212
186
  - !ruby/object:Gem::Version
213
- version: 0.1.0.pre8
187
+ version: 0.1.0.pre9
214
188
  type: :development
215
189
  prerelease: false
216
190
  version_requirements: !ruby/object:Gem::Requirement
217
- none: false
218
191
  requirements:
219
192
  - - ~>
220
193
  - !ruby/object:Gem::Version
221
- version: 0.1.0.pre8
194
+ version: 0.1.0.pre9
222
195
  - !ruby/object:Gem::Dependency
223
196
  name: enju_export
224
197
  requirement: !ruby/object:Gem::Requirement
225
- none: false
226
198
  requirements:
227
199
  - - ~>
228
200
  - !ruby/object:Gem::Version
229
- version: 0.1.1.pre
201
+ version: 0.1.1.pre2
230
202
  type: :development
231
203
  prerelease: false
232
204
  version_requirements: !ruby/object:Gem::Requirement
233
- none: false
234
205
  requirements:
235
206
  - - ~>
236
207
  - !ruby/object:Gem::Version
237
- version: 0.1.1.pre
208
+ version: 0.1.1.pre2
238
209
  - !ruby/object:Gem::Dependency
239
210
  name: mobylette
240
211
  requirement: !ruby/object:Gem::Requirement
241
- none: false
242
212
  requirements:
243
- - - ! '>='
213
+ - - '>='
244
214
  - !ruby/object:Gem::Version
245
215
  version: '0'
246
216
  type: :development
247
217
  prerelease: false
248
218
  version_requirements: !ruby/object:Gem::Requirement
249
- none: false
250
219
  requirements:
251
- - - ! '>='
220
+ - - '>='
252
221
  - !ruby/object:Gem::Version
253
222
  version: '0'
254
223
  - !ruby/object:Gem::Dependency
255
224
  name: simplecov
256
225
  requirement: !ruby/object:Gem::Requirement
257
- none: false
258
226
  requirements:
259
- - - ! '>='
227
+ - - '>='
260
228
  - !ruby/object:Gem::Version
261
229
  version: '0'
262
230
  type: :development
263
231
  prerelease: false
264
232
  version_requirements: !ruby/object:Gem::Requirement
265
- none: false
266
233
  requirements:
267
- - - ! '>='
234
+ - - '>='
268
235
  - !ruby/object:Gem::Version
269
236
  version: '0'
270
237
  description: Circulation management for Next-L Enju
@@ -396,6 +363,8 @@ files:
396
363
  - app/views/manifestation_reserve_stats/new.html.erb
397
364
  - app/views/manifestation_reserve_stats/show.csv.erb
398
365
  - app/views/manifestation_reserve_stats/show.html.erb
366
+ - app/views/manifestations/_show_detail_librarian.html.erb
367
+ - app/views/manifestations/_show_detail_user.html.erb
399
368
  - app/views/my_accounts/_feed_token.html.erb
400
369
  - app/views/reserve_stat_has_manifestations/_form.html.erb
401
370
  - app/views/reserve_stat_has_manifestations/edit.html.erb
@@ -410,6 +379,7 @@ files:
410
379
  - app/views/reserves/_form.html.erb
411
380
  - app/views/reserves/_new.html.erb
412
381
  - app/views/reserves/_new_user.html.erb
382
+ - app/views/reserves/_state_facet.html.erb
413
383
  - app/views/reserves/_title.html.erb
414
384
  - app/views/reserves/edit.html.erb
415
385
  - app/views/reserves/index.atom.builder
@@ -476,6 +446,9 @@ files:
476
446
  - db/migrate/20111217234412_add_save_checkout_history_to_user.rb
477
447
  - db/migrate/20111218002349_add_checkout_icalendar_token_to_user.rb
478
448
  - db/migrate/20120424103932_add_librarian_id_to_checked_item.rb
449
+ - db/migrate/20130303104849_add_state_index_to_reserve.rb
450
+ - db/migrate/20130303124821_add_retained_at_to_reserve.rb
451
+ - db/migrate/20130304015019_add_postponed_at_to_reserve.rb
479
452
  - lib/enju_circulation/controller.rb
480
453
  - lib/enju_circulation/engine.rb
481
454
  - lib/enju_circulation/item.rb
@@ -638,6 +611,18 @@ files:
638
611
  - spec/dummy/solr/conf/spellings.txt
639
612
  - spec/dummy/solr/conf/stopwords.txt
640
613
  - spec/dummy/solr/conf/synonyms.txt
614
+ - spec/dummy/solr/data/test/index/_5d.fdt
615
+ - spec/dummy/solr/data/test/index/_5d.fdx
616
+ - spec/dummy/solr/data/test/index/_5d.fnm
617
+ - spec/dummy/solr/data/test/index/_5d.frq
618
+ - spec/dummy/solr/data/test/index/_5d.nrm
619
+ - spec/dummy/solr/data/test/index/_5d.prx
620
+ - spec/dummy/solr/data/test/index/_5d.tii
621
+ - spec/dummy/solr/data/test/index/_5d.tis
622
+ - spec/dummy/solr/data/test/index/segments.gen
623
+ - spec/dummy/solr/data/test/index/segments_at
624
+ - spec/dummy/solr/data/test/spellchecker/segments.gen
625
+ - spec/dummy/solr/data/test/spellchecker/segments_1
641
626
  - spec/factories/basket.rb
642
627
  - spec/factories/carrier_type.rb
643
628
  - spec/factories/carrier_type_has_checkout_type.rb
@@ -728,30 +713,26 @@ files:
728
713
  - spec/support/devise.rb
729
714
  homepage: https://github.com/next-l/enju_circulation
730
715
  licenses: []
716
+ metadata: {}
731
717
  post_install_message:
732
718
  rdoc_options: []
733
719
  require_paths:
734
720
  - lib
735
721
  required_ruby_version: !ruby/object:Gem::Requirement
736
- none: false
737
722
  requirements:
738
- - - ! '>='
723
+ - - '>='
739
724
  - !ruby/object:Gem::Version
740
725
  version: '0'
741
- segments:
742
- - 0
743
- hash: -4520022407013796121
744
726
  required_rubygems_version: !ruby/object:Gem::Requirement
745
- none: false
746
727
  requirements:
747
- - - ! '>'
728
+ - - '>'
748
729
  - !ruby/object:Gem::Version
749
730
  version: 1.3.1
750
731
  requirements: []
751
732
  rubyforge_project:
752
- rubygems_version: 1.8.23
733
+ rubygems_version: 2.0.0
753
734
  signing_key:
754
- specification_version: 3
735
+ specification_version: 4
755
736
  summary: enju_circulation plugin
756
737
  test_files:
757
738
  - spec/controllers/baskets_controller_spec.rb
@@ -904,6 +885,18 @@ test_files:
904
885
  - spec/dummy/solr/conf/spellings.txt
905
886
  - spec/dummy/solr/conf/stopwords.txt
906
887
  - spec/dummy/solr/conf/synonyms.txt
888
+ - spec/dummy/solr/data/test/index/_5d.fdt
889
+ - spec/dummy/solr/data/test/index/_5d.fdx
890
+ - spec/dummy/solr/data/test/index/_5d.fnm
891
+ - spec/dummy/solr/data/test/index/_5d.frq
892
+ - spec/dummy/solr/data/test/index/_5d.nrm
893
+ - spec/dummy/solr/data/test/index/_5d.prx
894
+ - spec/dummy/solr/data/test/index/_5d.tii
895
+ - spec/dummy/solr/data/test/index/_5d.tis
896
+ - spec/dummy/solr/data/test/index/segments.gen
897
+ - spec/dummy/solr/data/test/index/segments_at
898
+ - spec/dummy/solr/data/test/spellchecker/segments.gen
899
+ - spec/dummy/solr/data/test/spellchecker/segments_1
907
900
  - spec/factories/basket.rb
908
901
  - spec/factories/carrier_type.rb
909
902
  - spec/factories/carrier_type_has_checkout_type.rb