enju_circulation 0.1.0.pre40 → 0.1.0.pre41

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 (112) hide show
  1. checksums.yaml +4 -4
  2. data/README.rdoc +8 -1
  3. data/app/controllers/checked_items_controller.rb +1 -1
  4. data/app/controllers/checkout_types_controller.rb +0 -7
  5. data/app/controllers/checkouts_controller.rb +1 -1
  6. data/app/controllers/manifestation_checkout_stats_controller.rb +22 -8
  7. data/app/controllers/reserves_controller.rb +17 -5
  8. data/app/models/carrier_type_has_checkout_type.rb +2 -3
  9. data/app/models/checked_item.rb +2 -3
  10. data/app/models/checkin.rb +2 -3
  11. data/app/models/checkout.rb +6 -2
  12. data/app/models/checkout_stat_has_manifestation.rb +2 -3
  13. data/app/models/checkout_stat_has_user.rb +2 -3
  14. data/app/models/checkout_type.rb +2 -3
  15. data/app/models/circulation_status.rb +2 -3
  16. data/app/models/item_has_use_restriction.rb +2 -3
  17. data/app/models/lending_policy.rb +2 -3
  18. data/app/models/manifestation_checkout_stat.rb +3 -3
  19. data/app/models/manifestation_checkout_stat_state_machine.rb +1 -1
  20. data/app/models/manifestation_checkout_stat_transition.rb +2 -2
  21. data/app/models/manifestation_reserve_stat.rb +3 -3
  22. data/app/models/manifestation_reserve_stat_transition.rb +2 -2
  23. data/app/models/reserve.rb +14 -11
  24. data/app/models/reserve_stat_has_manifestation.rb +2 -3
  25. data/app/models/reserve_stat_has_user.rb +2 -3
  26. data/app/models/reserve_transition.rb +2 -2
  27. data/app/models/use_restriction.rb +2 -3
  28. data/app/models/user_checkout_stat.rb +2 -2
  29. data/app/models/user_checkout_stat_transition.rb +2 -2
  30. data/app/models/user_group_has_checkout_type.rb +6 -7
  31. data/app/models/user_reserve_stat.rb +2 -2
  32. data/app/models/user_reserve_stat_transition.rb +2 -2
  33. data/app/views/checkouts/_list.html.erb +5 -0
  34. data/app/views/checkouts/index.rss.builder +3 -3
  35. data/app/views/manifestation_checkout_stats/_group_by_carrier_type.html.erb +53 -0
  36. data/app/views/manifestation_checkout_stats/_group_by_checkout_type.html.erb +54 -0
  37. data/app/views/manifestation_checkout_stats/show.html.erb +6 -38
  38. data/app/views/reserves/_new.html.erb +6 -1
  39. data/app/views/reserves/_new_user.html.erb +6 -1
  40. data/app/views/reserves/edit.html.erb +5 -0
  41. data/app/views/reserves/index.html.erb +2 -0
  42. data/app/views/reserves/index.rss.builder +2 -2
  43. data/app/views/reserves/show.html.erb +5 -0
  44. data/config/locales/translation_en.yml +2 -0
  45. data/config/locales/translation_ja.yml +2 -0
  46. data/db/migrate/20111129044509_add_pickup_location_to_reserve.rb +6 -0
  47. data/db/migrate/20140518050147_create_reserve_transitions.rb +5 -1
  48. data/db/migrate/20140528045518_create_user_checkout_stat_transitions.rb +5 -1
  49. data/db/migrate/20140528045539_create_user_reserve_stat_transitions.rb +5 -1
  50. data/db/migrate/20140528045600_create_manifestation_checkout_stat_transitions.rb +5 -1
  51. data/db/migrate/20140528045617_create_manifestation_reserve_stat_transitions.rb +5 -1
  52. data/db/migrate/20141014065831_add_shelf_id_to_checkout.rb +6 -0
  53. data/db/migrate/20141020120523_add_library_id_to_checkout.rb +6 -0
  54. data/lib/enju_circulation/accept.rb +22 -0
  55. data/lib/enju_circulation/basket.rb +37 -0
  56. data/lib/enju_circulation/item.rb +14 -8
  57. data/lib/enju_circulation/profile.rb +1 -1
  58. data/lib/enju_circulation/version.rb +1 -1
  59. data/lib/enju_circulation.rb +4 -0
  60. data/lib/tasks/checkout.rb +7 -0
  61. data/lib/tasks/enju_circulation_tasks.rake +10 -2
  62. data/spec/controllers/manifestation_checkout_stats_controller_spec.rb +2 -0
  63. data/spec/dummy/config/database.yml +23 -18
  64. data/spec/dummy/db/migrate/20140518111006_create_message_transitions.rb +5 -1
  65. data/spec/dummy/db/migrate/20140518135713_create_message_request_transitions.rb +5 -1
  66. data/spec/dummy/db/migrate/20140519170214_create_resource_import_file_transitions.rb +5 -1
  67. data/spec/dummy/db/migrate/20140519171220_create_import_request_transitions.rb +5 -1
  68. data/spec/dummy/db/migrate/20140524020735_create_agent_import_file_transitions.rb +5 -1
  69. data/spec/dummy/db/migrate/20140614141500_create_resource_export_file_transitions.rb +5 -1
  70. data/spec/dummy/db/schema.rb +561 -555
  71. data/spec/fixtures/carrier_type_has_checkout_types.yml +2 -3
  72. data/spec/fixtures/checked_items.yml +6 -7
  73. data/spec/fixtures/checkins.yml +2 -3
  74. data/spec/fixtures/checkout_stat_has_manifestations.yml +2 -3
  75. data/spec/fixtures/checkout_stat_has_users.yml +2 -3
  76. data/spec/fixtures/checkout_types.yml +2 -3
  77. data/spec/fixtures/checkouts.yml +17 -15
  78. data/spec/fixtures/circulation_statuses.yml +2 -3
  79. data/spec/fixtures/item_has_use_restrictions.yml +2 -3
  80. data/spec/fixtures/lending_policies.yml +2 -3
  81. data/spec/fixtures/manifestation_checkout_stats.yml +2 -2
  82. data/spec/fixtures/manifestation_reserve_stats.yml +2 -2
  83. data/spec/fixtures/manifestations.yml +114 -114
  84. data/spec/fixtures/reserve_stat_has_manifestations.yml +2 -3
  85. data/spec/fixtures/reserve_stat_has_users.yml +2 -3
  86. data/spec/fixtures/reserve_transitions.yml +2 -2
  87. data/spec/fixtures/reserves.yml +20 -19
  88. data/spec/fixtures/use_restrictions.yml +2 -3
  89. data/spec/fixtures/user_checkout_stats.yml +2 -2
  90. data/spec/fixtures/user_group_has_checkout_types.yml +2 -3
  91. data/spec/fixtures/user_reserve_stats.yml +2 -2
  92. data/spec/fixtures/users.yml +1 -1
  93. data/spec/models/basket_spec.rb +15 -2
  94. data/spec/models/carrier_type_has_checkout_type_spec.rb +2 -3
  95. data/spec/models/checked_item_spec.rb +2 -3
  96. data/spec/models/checkin_spec.rb +2 -3
  97. data/spec/models/checkout_spec.rb +4 -2
  98. data/spec/models/checkout_stat_has_manifestation_spec.rb +2 -3
  99. data/spec/models/checkout_stat_has_user_spec.rb +2 -3
  100. data/spec/models/checkout_type_spec.rb +2 -3
  101. data/spec/models/circulation_status_spec.rb +2 -3
  102. data/spec/models/lending_policy_spec.rb +2 -3
  103. data/spec/models/manifestation_checkout_stat_spec.rb +5 -4
  104. data/spec/models/manifestation_reserve_stat_spec.rb +2 -2
  105. data/spec/models/reserve_spec.rb +3 -2
  106. data/spec/models/reserve_stat_has_manifestation_spec.rb +2 -3
  107. data/spec/models/reserve_stat_has_user_spec.rb +2 -3
  108. data/spec/models/user_checkout_stat_spec.rb +2 -2
  109. data/spec/models/user_group_has_checkout_type_spec.rb +2 -3
  110. data/spec/models/user_reserve_stat_spec.rb +2 -2
  111. data/spec/spec_helper.rb +2 -0
  112. metadata +44 -8
data/spec/fixtures/carrier_type_has_checkout_types.yml CHANGED
@@ -25,7 +25,6 @@ carrier_type_has_checkout_type_00003:
25
25
  # checkout_type_id :integer not null
26
26
  # note :text
27
27
  # position :integer
28
- # created_at :datetime not null
29
- # updated_at :datetime not null
28
+ # created_at :datetime
29
+ # updated_at :datetime
30
30
  #
31
-
data/spec/fixtures/checked_items.yml CHANGED
@@ -3,22 +3,22 @@ checked_item_00001:
3
3
  id: 1
4
4
  item_id: 10
5
5
  basket_id: 1
6
- due_date: <%= 1.week.from_now %>
6
+ due_date: <%= 1.week.from_now.to_s(:db) %>
7
7
  checked_item_00002:
8
8
  id: 2
9
9
  item_id: 6
10
10
  basket_id: 2
11
- due_date: <%= 1.week.from_now %>
11
+ due_date: <%= 1.week.from_now.to_s(:db) %>
12
12
  checked_item_00003:
13
13
  id: 3
14
14
  item_id: 6
15
15
  basket_id: 9
16
- due_date: <%= 1.week.from_now %>
16
+ due_date: <%= 1.week.from_now.to_s(:db) %>
17
17
  checked_item_00004:
18
18
  id: 4
19
19
  item_id: 12
20
20
  basket_id: 8
21
- due_date: <%= 1.week.from_now %>
21
+ due_date: <%= 1.week.from_now.to_s(:db) %>
22
22
 
23
23
  # == Schema Information
24
24
  #
@@ -28,8 +28,7 @@ checked_item_00004:
28
28
  # item_id :integer not null
29
29
  # basket_id :integer not null
30
30
  # due_date :datetime not null
31
- # created_at :datetime not null
32
- # updated_at :datetime not null
31
+ # created_at :datetime
32
+ # updated_at :datetime
33
33
  # librarian_id :integer
34
34
  #
35
-
data/spec/fixtures/checkins.yml CHANGED
@@ -48,8 +48,7 @@ checkin_00005:
48
48
  # item_id :integer not null
49
49
  # librarian_id :integer
50
50
  # basket_id :integer
51
- # created_at :datetime not null
52
- # updated_at :datetime not null
51
+ # created_at :datetime
52
+ # updated_at :datetime
53
53
  # lock_version :integer default(0), not null
54
54
  #
55
-
data/spec/fixtures/checkout_stat_has_manifestations.yml CHANGED
@@ -18,7 +18,6 @@ two:
18
18
  # manifestation_checkout_stat_id :integer not null
19
19
  # manifestation_id :integer not null
20
20
  # checkouts_count :integer
21
- # created_at :datetime not null
22
- # updated_at :datetime not null
21
+ # created_at :datetime
22
+ # updated_at :datetime
23
23
  #
24
-
data/spec/fixtures/checkout_stat_has_users.yml CHANGED
@@ -18,7 +18,6 @@ two:
18
18
  # user_checkout_stat_id :integer not null
19
19
  # user_id :integer not null
20
20
  # checkouts_count :integer default(0), not null
21
- # created_at :datetime not null
22
- # updated_at :datetime not null
21
+ # created_at :datetime
22
+ # updated_at :datetime
23
23
  #
24
-
data/spec/fixtures/checkout_types.yml CHANGED
@@ -28,7 +28,6 @@ checkout_type_00003:
28
28
  # display_name :text
29
29
  # note :text
30
30
  # position :integer
31
- # created_at :datetime not null
32
- # updated_at :datetime not null
31
+ # created_at :datetime
32
+ # updated_at :datetime
33
33
  #
34
-
data/spec/fixtures/checkouts.yml CHANGED
@@ -7,7 +7,7 @@ checkout_00001:
7
7
  id: 1
8
8
  librarian_id: 1
9
9
  checkout_renewal_count: 0
10
- due_date: <%= 2.day.from_now.beginning_of_day %>
10
+ due_date: <%= 2.day.from_now.beginning_of_day.to_s(:db) %>
11
11
  created_at: 2007-09-08 01:19:02.285850 +09:00
12
12
  basket_id: 1
13
13
  checkout_00002:
@@ -18,7 +18,7 @@ checkout_00002:
18
18
  id: 2
19
19
  librarian_id: 1
20
20
  checkout_renewal_count: 0
21
- due_date: <%= 2.day.from_now.beginning_of_day %>
21
+ due_date: <%= 2.day.from_now.beginning_of_day.to_s(:db) %>
22
22
  created_at: 2007-09-08 01:34:07.363023 +09:00
23
23
  basket_id: 1
24
24
  checkout_00003:
@@ -29,7 +29,7 @@ checkout_00003:
29
29
  id: 3
30
30
  librarian_id: 1
31
31
  checkout_renewal_count: 0
32
- due_date: <%= 2.day.from_now.beginning_of_day %>
32
+ due_date: <%= 2.day.from_now.beginning_of_day.to_s(:db) %>
33
33
  created_at: 2007-09-08 01:39:03.210081 +09:00
34
34
  basket_id: 2
35
35
  checkout_00004:
@@ -40,7 +40,7 @@ checkout_00004:
40
40
  id: 4
41
41
  librarian_id: 1
42
42
  checkout_renewal_count: 0
43
- due_date: <%= 2.day.from_now.beginning_of_day %>
43
+ due_date: <%= 2.day.from_now.beginning_of_day.to_s(:db) %>
44
44
  created_at: 2007-09-08 01:39:04.210081 +09:00
45
45
  basket_id: 3
46
46
  checkout_00005:
@@ -51,7 +51,7 @@ checkout_00005:
51
51
  id: 5
52
52
  librarian_id: 1
53
53
  checkout_renewal_count: 0
54
- due_date: <%= 2.day.from_now.beginning_of_day %>
54
+ due_date: <%= 2.day.from_now.beginning_of_day.to_s(:db) %>
55
55
  created_at: 2007-09-08 01:39:05.210081 +09:00
56
56
  basket_id: 4
57
57
  checkout_00006:
@@ -72,7 +72,7 @@ checkout_00007:
72
72
  id: 7
73
73
  librarian_id: 1
74
74
  checkout_renewal_count: 0
75
- due_date: <%= 2.day.from_now.beginning_of_day %>
75
+ due_date: <%= 2.day.from_now.beginning_of_day.to_s(:db) %>
76
76
  created_at: 2007-09-08 01:39:07.210081 +09:00
77
77
  basket_id: 5
78
78
  checkout_00008:
@@ -83,7 +83,7 @@ checkout_00008:
83
83
  id: 8
84
84
  librarian_id: 1
85
85
  checkout_renewal_count: 0
86
- due_date: <%= 2.day.from_now.beginning_of_day %>
86
+ due_date: <%= 2.day.from_now.beginning_of_day.to_s(:db) %>
87
87
  created_at: 2007-09-08 01:39:08.210081 +09:00
88
88
  basket_id: 6
89
89
  checkout_00009:
@@ -94,7 +94,7 @@ checkout_00009:
94
94
  id: 9
95
95
  librarian_id: 1
96
96
  checkout_renewal_count: 1
97
- due_date: <%= 2.day.from_now.beginning_of_day %>
97
+ due_date: <%= 2.day.from_now.beginning_of_day.to_s(:db) %>
98
98
  created_at: 2007-09-08 01:39:09.210081 +09:00
99
99
  basket_id: 7
100
100
  checkout_00010:
@@ -105,7 +105,7 @@ checkout_00010:
105
105
  id: 10
106
106
  librarian_id: 1
107
107
  checkout_renewal_count: 1
108
- due_date: <%= 2.day.from_now.beginning_of_day %>
108
+ due_date: <%= 2.day.from_now.beginning_of_day.to_s(:db) %>
109
109
  created_at: 2007-09-08 01:39:10.210081 +09:00
110
110
  basket_id: 7
111
111
  checkout_00011:
@@ -116,7 +116,7 @@ checkout_00011:
116
116
  id: 11
117
117
  librarian_id: 1
118
118
  checkout_renewal_count: 1
119
- due_date: <%= 180.days.ago.beginning_of_day %>
119
+ due_date: <%= 180.days.ago.beginning_of_day.to_s(:db) %>
120
120
  created_at: 2007-09-08 01:39:11.210081 +09:00
121
121
  basket_id: 7
122
122
  checkout_00012:
@@ -127,7 +127,7 @@ checkout_00012:
127
127
  id: 12
128
128
  librarian_id: 1
129
129
  checkout_renewal_count: 1
130
- due_date: <%= 180.days.ago.beginning_of_day %>
130
+ due_date: <%= 180.days.ago.beginning_of_day.to_s(:db) %>
131
131
  created_at: 2007-09-08 01:39:12.210081 +09:00
132
132
  basket_id: 8
133
133
  checkin_id: 5
@@ -139,7 +139,7 @@ checkout_00013:
139
139
  id: 13
140
140
  librarian_id: 1
141
141
  checkout_renewal_count: 1
142
- due_date: <%= 180.days.ago.beginning_of_day %>
142
+ due_date: <%= 180.days.ago.beginning_of_day.to_s(:db) %>
143
143
  created_at: 2007-09-08 01:39:13.210081 +09:00
144
144
  basket_id: 8
145
145
  checkin_id: 4
@@ -151,7 +151,7 @@ checkout_00014:
151
151
  id: 14
152
152
  librarian_id: 1
153
153
  checkout_renewal_count: 1
154
- due_date: <%= 180.days.ago.beginning_of_day %>
154
+ due_date: <%= 180.days.ago.beginning_of_day.to_s(:db) %>
155
155
  created_at: 2007-09-08 01:39:13.210081 +09:00
156
156
  basket_id: 9
157
157
  checkin_id:
@@ -169,6 +169,8 @@ checkout_00014:
169
169
  # due_date :datetime
170
170
  # checkout_renewal_count :integer default(0), not null
171
171
  # lock_version :integer default(0), not null
172
- # created_at :datetime not null
173
- # updated_at :datetime not null
172
+ # created_at :datetime
173
+ # updated_at :datetime
174
+ # shelf_id :integer
175
+ # library_id :integer
174
176
  #
data/spec/fixtures/circulation_statuses.yml CHANGED
@@ -114,7 +114,6 @@ circulation_status_00016:
114
114
  # display_name :text
115
115
  # note :text
116
116
  # position :integer
117
- # created_at :datetime not null
118
- # updated_at :datetime not null
117
+ # created_at :datetime
118
+ # updated_at :datetime
119
119
  #
120
-
data/spec/fixtures/item_has_use_restrictions.yml CHANGED
@@ -55,7 +55,6 @@ item_has_use_restriction_00008:
55
55
  # id :integer not null, primary key
56
56
  # item_id :integer not null
57
57
  # use_restriction_id :integer not null
58
- # created_at :datetime not null
59
- # updated_at :datetime not null
58
+ # created_at :datetime
59
+ # updated_at :datetime
60
60
  #
61
-
data/spec/fixtures/lending_policies.yml CHANGED
@@ -93,7 +93,6 @@ lending_policy_00009:
93
93
  # fine :integer default(0), not null
94
94
  # note :text
95
95
  # position :integer
96
- # created_at :datetime not null
97
- # updated_at :datetime not null
96
+ # created_at :datetime
97
+ # updated_at :datetime
98
98
  #
99
-
data/spec/fixtures/manifestation_checkout_stats.yml CHANGED
@@ -22,8 +22,8 @@ two:
22
22
  # start_date :datetime
23
23
  # end_date :datetime
24
24
  # note :text
25
- # created_at :datetime not null
26
- # updated_at :datetime not null
25
+ # created_at :datetime
26
+ # updated_at :datetime
27
27
  # started_at :datetime
28
28
  # completed_at :datetime
29
29
  # user_id :integer
data/spec/fixtures/manifestation_reserve_stats.yml CHANGED
@@ -22,8 +22,8 @@ two:
22
22
  # start_date :datetime
23
23
  # end_date :datetime
24
24
  # note :text
25
- # created_at :datetime not null
26
- # updated_at :datetime not null
25
+ # created_at :datetime
26
+ # updated_at :datetime
27
27
  # started_at :datetime
28
28
  # completed_at :datetime
29
29
  # user_id :integer