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/dummy/db/migrate/20140518135713_create_message_request_transitions.rb CHANGED
@@ -2,7 +2,11 @@ class CreateMessageRequestTransitions < ActiveRecord::Migration
2
2
  def change
3
3
  create_table :message_request_transitions do |t|
4
4
  t.string :to_state
5
- t.text :metadata, default: "{}"
5
+ if ActiveRecord::Base.configurations[Rails.env]["adapter"].try(:match, /mysql/)
6
+ t.text :metadata
7
+ else
8
+ t.text :metadata, default: "{}"
9
+ end
6
10
  t.integer :sort_key
7
11
  t.integer :message_request_id
8
12
  t.timestamps
data/spec/dummy/db/migrate/20140519170214_create_resource_import_file_transitions.rb CHANGED
@@ -2,7 +2,11 @@ class CreateResourceImportFileTransitions < ActiveRecord::Migration
2
2
  def change
3
3
  create_table :resource_import_file_transitions do |t|
4
4
  t.string :to_state
5
- t.text :metadata, default: "{}"
5
+ if ActiveRecord::Base.configurations[Rails.env]["adapter"].try(:match, /mysql/)
6
+ t.text :metadata
7
+ else
8
+ t.text :metadata, default: "{}"
9
+ end
6
10
  t.integer :sort_key
7
11
  t.integer :resource_import_file_id
8
12
  t.timestamps
data/spec/dummy/db/migrate/20140519171220_create_import_request_transitions.rb CHANGED
@@ -2,7 +2,11 @@ class CreateImportRequestTransitions < ActiveRecord::Migration
2
2
  def change
3
3
  create_table :import_request_transitions do |t|
4
4
  t.string :to_state
5
- t.text :metadata, default: "{}"
5
+ if ActiveRecord::Base.configurations[Rails.env]["adapter"].try(:match, /mysql/)
6
+ t.text :metadata
7
+ else
8
+ t.text :metadata, default: "{}"
9
+ end
6
10
  t.integer :sort_key
7
11
  t.integer :import_request_id
8
12
  t.timestamps
data/spec/dummy/db/migrate/20140524020735_create_agent_import_file_transitions.rb CHANGED
@@ -2,7 +2,11 @@ class CreateAgentImportFileTransitions < ActiveRecord::Migration
2
2
  def change
3
3
  create_table :agent_import_file_transitions do |t|
4
4
  t.string :to_state
5
- t.text :metadata, default: "{}"
5
+ if ActiveRecord::Base.configurations[Rails.env]["adapter"].try(:match, /mysql/)
6
+ t.text :metadata
7
+ else
8
+ t.text :metadata, default: "{}"
9
+ end
6
10
  t.integer :sort_key
7
11
  t.integer :agent_import_file_id
8
12
  t.timestamps
data/spec/dummy/db/migrate/20140614141500_create_resource_export_file_transitions.rb CHANGED
@@ -2,7 +2,11 @@ class CreateResourceExportFileTransitions < ActiveRecord::Migration
2
2
  def change
3
3
  create_table :resource_export_file_transitions do |t|
4
4
  t.string :to_state
5
- t.text :metadata, default: "{}"
5
+ if ActiveRecord::Base.configurations[Rails.env]["adapter"].try(:match, /mysql/)
6
+ t.text :metadata
7
+ else
8
+ t.text :metadata, default: "{}"
9
+ end
6
10
  t.integer :sort_key
7
11
  t.integer :resource_export_file_id
8
12
  t.timestamps