enju_circulation 0.1.0.pre36 → 0.1.0.pre37
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/controllers/carrier_type_has_checkout_types_controller.rb +11 -11
- data/app/controllers/checked_items_controller.rb +13 -13
- data/app/controllers/checkins_controller.rb +14 -15
- data/app/controllers/checkout_types_controller.rb +10 -10
- data/app/controllers/checkouts_controller.rb +18 -19
- data/app/controllers/item_has_use_restrictions_controller.rb +10 -10
- data/app/controllers/lending_policies_controller.rb +1 -1
- data/app/controllers/manifestation_checkout_stats_controller.rb +15 -13
- data/app/controllers/manifestation_reserve_stats_controller.rb +15 -13
- data/app/controllers/reserves_controller.rb +27 -28
- data/app/controllers/user_checkout_stats_controller.rb +15 -13
- data/app/controllers/user_group_has_checkout_types_controller.rb +11 -11
- data/app/controllers/user_reserve_stats_controller.rb +15 -13
- data/app/models/carrier_type_has_checkout_type.rb +6 -6
- data/app/models/checked_item.rb +20 -18
- data/app/models/checkin.rb +13 -14
- data/app/models/checkout.rb +20 -21
- data/app/models/checkout_stat_has_manifestation.rb +2 -2
- data/app/models/checkout_stat_has_user.rb +2 -2
- data/app/models/checkout_type.rb +9 -9
- data/app/models/circulation_status.rb +13 -3
- data/app/models/enju_circulation/ability.rb +1 -1
- data/app/models/item_has_use_restriction.rb +3 -3
- data/app/models/lending_policy.rb +4 -4
- data/app/models/manifestation_checkout_stat.rb +4 -3
- data/app/models/manifestation_checkout_stat_transition.rb +13 -0
- data/app/models/manifestation_reserve_stat.rb +4 -3
- data/app/models/manifestation_reserve_stat_transition.rb +13 -0
- data/app/models/reserve.rb +123 -157
- data/app/models/reserve_stat_has_manifestation.rb +2 -2
- data/app/models/reserve_stat_has_user.rb +2 -2
- data/app/models/reserve_state_machine.rb +93 -0
- data/app/models/reserve_transition.rb +20 -0
- data/app/models/use_restriction.rb +5 -5
- data/app/models/user_checkout_stat.rb +4 -3
- data/app/models/user_checkout_stat_transition.rb +13 -0
- data/app/models/user_group_has_checkout_type.rb +8 -8
- data/app/models/user_reserve_stat.rb +4 -3
- data/app/models/user_reserve_stat_transition.rb +13 -0
- data/app/views/carrier_type_has_checkout_types/_form.html.erb +3 -3
- data/app/views/carrier_type_has_checkout_types/edit.html.erb +1 -1
- data/app/views/carrier_type_has_checkout_types/index.html.erb +3 -3
- data/app/views/carrier_type_has_checkout_types/new.html.erb +1 -1
- data/app/views/carrier_type_has_checkout_types/show.html.erb +1 -1
- data/app/views/carrier_types/_checkout_form.html.erb +1 -1
- data/app/views/checked_items/_checked_item.html.erb +3 -3
- data/app/views/checked_items/_checkout.html.erb +3 -3
- data/app/views/checked_items/_list.html.erb +3 -3
- data/app/views/checked_items/edit.html.erb +1 -1
- data/app/views/checked_items/index.html.erb +1 -1
- data/app/views/checked_items/new.html.erb +3 -3
- data/app/views/checked_items/show.html.erb +1 -1
- data/app/views/checkins/_checkin.html.erb +3 -3
- data/app/views/checkins/_form.html.erb +1 -1
- data/app/views/checkins/_list.html.erb +2 -2
- data/app/views/checkins/edit.html.erb +1 -1
- data/app/views/checkins/index.html.erb +2 -2
- data/app/views/checkins/new.html.erb +3 -3
- data/app/views/checkins/show.html.erb +1 -1
- data/app/views/checkout_types/_form.html.erb +2 -2
- data/app/views/checkout_types/edit.html.erb +1 -1
- data/app/views/checkout_types/index.html.erb +4 -4
- data/app/views/checkout_types/new.html.erb +1 -1
- data/app/views/checkout_types/show.html.erb +2 -2
- data/app/views/checkouts/_index.html.erb +7 -7
- data/app/views/checkouts/_index_item.html.erb +5 -5
- data/app/views/checkouts/_index_overdue.html.erb +7 -7
- data/app/views/checkouts/_index_user.html.erb +13 -13
- data/app/views/checkouts/_list.html.erb +5 -5
- data/app/views/checkouts/_reserved_facet.html.erb +2 -2
- data/app/views/checkouts/edit.html.erb +8 -8
- data/app/views/checkouts/index.atom.builder +3 -3
- data/app/views/checkouts/index.html.erb +3 -3
- data/app/views/checkouts/index.rss.builder +9 -9
- data/app/views/checkouts/index.txt.erb +4 -0
- data/app/views/checkouts/new.html.erb +2 -2
- data/app/views/checkouts/show.html.erb +7 -7
- data/app/views/circulation_statuses/_form.html.erb +2 -2
- data/app/views/circulation_statuses/edit.html.erb +1 -1
- data/app/views/circulation_statuses/index.html.erb +3 -3
- data/app/views/circulation_statuses/new.html.erb +1 -1
- data/app/views/circulation_statuses/show.html.erb +1 -1
- data/app/views/item_has_use_restrictions/edit.html.erb +1 -1
- data/app/views/item_has_use_restrictions/index.html.erb +4 -4
- data/app/views/item_has_use_restrictions/new.html.erb +2 -2
- data/app/views/item_has_use_restrictions/show.html.erb +1 -1
- data/app/views/lending_policies/_form.html.erb +1 -1
- data/app/views/lending_policies/edit.html.erb +1 -1
- data/app/views/lending_policies/index.html.erb +2 -2
- data/app/views/lending_policies/new.html.erb +1 -1
- data/app/views/lending_policies/show.html.erb +2 -2
- data/app/views/manifestation_checkout_stats/_form.html.erb +1 -1
- data/app/views/manifestation_checkout_stats/edit.html.erb +1 -1
- data/app/views/manifestation_checkout_stats/index.html.erb +3 -4
- data/app/views/manifestation_checkout_stats/new.html.erb +1 -1
- data/app/views/manifestation_checkout_stats/show.html.erb +3 -4
- data/app/views/manifestation_checkout_stats/show.txt.erb +4 -0
- data/app/views/manifestation_reserve_stats/_form.html.erb +1 -1
- data/app/views/manifestation_reserve_stats/edit.html.erb +1 -1
- data/app/views/manifestation_reserve_stats/index.html.erb +3 -4
- data/app/views/manifestation_reserve_stats/new.html.erb +1 -1
- data/app/views/manifestation_reserve_stats/show.html.erb +3 -4
- data/app/views/manifestation_reserve_stats/show.txt.erb +4 -0
- data/app/views/my_accounts/_feed_token.html.erb +3 -3
- data/app/views/reserves/_form.html.erb +1 -1
- data/app/views/reserves/_new.html.erb +9 -9
- data/app/views/reserves/_new_user.html.erb +13 -13
- data/app/views/reserves/_state_facet.html.erb +2 -2
- data/app/views/reserves/_title.html.erb +1 -1
- data/app/views/reserves/edit.html.erb +7 -7
- data/app/views/reserves/index.atom.builder +3 -3
- data/app/views/reserves/index.html.erb +26 -26
- data/app/views/reserves/index.rss.builder +10 -10
- data/app/views/reserves/index.txt.erb +4 -0
- data/app/views/reserves/show.html.erb +9 -9
- data/app/views/use_restrictions/_form.html.erb +2 -2
- data/app/views/use_restrictions/edit.html.erb +1 -1
- data/app/views/use_restrictions/index.html.erb +3 -3
- data/app/views/use_restrictions/new.html.erb +1 -1
- data/app/views/use_restrictions/show.html.erb +1 -1
- data/app/views/user_checkout_stats/_form.html.erb +1 -1
- data/app/views/user_checkout_stats/edit.html.erb +1 -1
- data/app/views/user_checkout_stats/index.html.erb +3 -4
- data/app/views/user_checkout_stats/new.html.erb +1 -1
- data/app/views/user_checkout_stats/show.html.erb +3 -4
- data/app/views/user_checkout_stats/show.txt.erb +4 -0
- data/app/views/user_group_has_checkout_types/edit.html.erb +7 -7
- data/app/views/user_group_has_checkout_types/index.html.erb +3 -3
- data/app/views/user_group_has_checkout_types/new.html.erb +9 -9
- data/app/views/user_group_has_checkout_types/show.html.erb +1 -1
- data/app/views/user_groups/_checkout_form.html.erb +6 -6
- data/app/views/user_reserve_stats/_form.html.erb +1 -1
- data/app/views/user_reserve_stats/edit.html.erb +1 -1
- data/app/views/user_reserve_stats/index.html.erb +3 -4
- data/app/views/user_reserve_stats/new.html.erb +1 -1
- data/app/views/user_reserve_stats/show.html.erb +3 -4
- data/app/views/user_reserve_stats/show.txt.erb +4 -0
- data/app/views/users/_feed_token.html.erb +3 -3
- data/config/initializers/inflections.rb +3 -0
- data/config/locales/translation_en.yml +6 -0
- data/config/locales/translation_ja.yml +6 -0
- data/config/routes.rb +8 -10
- data/db/migrate/035_create_reserves.rb +0 -1
- data/db/migrate/20081212080038_create_manifestation_checkout_stats.rb +0 -1
- data/db/migrate/20081215094302_create_user_checkout_stats.rb +0 -1
- data/db/migrate/20081216190724_create_manifestation_reserve_stats.rb +0 -1
- data/db/migrate/20081220023628_create_user_reserve_stats.rb +0 -1
- data/db/migrate/20090321130448_add_completed_at_to_user_checkout_stat.rb +0 -4
- data/db/migrate/20140518050147_create_reserve_transitions.rb +14 -0
- data/db/migrate/20140810061942_add_user_id_to_user_checkout_stat.rb +12 -0
- data/db/migrate/20140810091231_add_checkout_icalendar_token_to_profile.rb +6 -0
- data/db/migrate/20140810091417_add_save_checkout_history_to_profile.rb +5 -0
- data/lib/enju_circulation/engine.rb +0 -4
- data/lib/enju_circulation/item.rb +4 -4
- data/lib/enju_circulation/manifestation.rb +2 -2
- data/lib/enju_circulation/profile.rb +26 -0
- data/lib/enju_circulation/user.rb +1 -1
- data/lib/enju_circulation/version.rb +1 -1
- data/lib/enju_circulation.rb +2 -0
- data/lib/generators/enju_circulation/setup/setup_generator.rb +2 -0
- data/lib/generators/enju_circulation/setup/templates/db/fixtures/circulation_statuses.yml +48 -25
- data/lib/generators/enju_circulation/setup/templates/db/fixtures/use_restrictions.yml +39 -13
- data/lib/tasks/circulation_status.rb +6 -0
- data/lib/tasks/enju_circulation_tasks.rake +14 -0
- data/lib/tasks/reserve.rb +5 -0
- data/lib/tasks/use_restriction.rb +6 -0
- data/spec/controllers/carrier_type_has_checkout_types_controller_spec.rb +21 -21
- data/spec/controllers/checkins_controller_spec.rb +22 -22
- data/spec/controllers/checkout_types_controller_spec.rb +21 -21
- data/spec/controllers/checkouts_controller_spec.rb +14 -14
- data/spec/controllers/circulation_statuses_controller_spec.rb +21 -21
- data/spec/controllers/item_has_use_restrictions_controller_spec.rb +21 -21
- data/spec/controllers/lending_policies_controller_spec.rb +21 -21
- data/spec/controllers/manifestation_checkout_stats_controller_spec.rb +21 -21
- data/spec/controllers/manifestation_reserve_stats_controller_spec.rb +21 -21
- data/spec/controllers/reserves_controller_spec.rb +32 -32
- data/spec/controllers/use_restrictions_controller_spec.rb +21 -21
- data/spec/controllers/user_checkout_stats_controller_spec.rb +21 -21
- data/spec/controllers/user_group_has_checkout_types_controller_spec.rb +21 -21
- data/spec/controllers/user_reserve_stats_controller_spec.rb +21 -21
- data/spec/dummy/app/models/user.rb +2 -46
- data/spec/dummy/config/environments/test.rb +2 -0
- data/spec/dummy/db/development.sqlite3 +0 -0
- data/spec/dummy/db/migrate/001_create_agents.rb +0 -8
- data/spec/dummy/db/migrate/005_create_manifestations.rb +7 -12
- data/spec/dummy/db/migrate/006_create_items.rb +0 -6
- data/spec/dummy/db/migrate/112_create_frequencies.rb +12 -0
- data/spec/dummy/db/migrate/117_create_form_of_works.rb +12 -0
- data/spec/dummy/db/migrate/154_create_messages.rb +0 -1
- data/spec/dummy/db/migrate/20080819181903_create_message_requests.rb +0 -2
- data/spec/dummy/db/migrate/20081028083142_create_agent_import_files.rb +20 -0
- data/spec/dummy/db/migrate/20081028083208_create_resource_import_files.rb +20 -0
- data/spec/dummy/db/migrate/20090705133942_add_attachments_picture_to_picture_file.rb +15 -0
- data/spec/dummy/db/migrate/20090705212043_add_attachments_attachment_to_manifestation.rb +15 -0
- data/spec/dummy/db/migrate/20090719201843_create_extents.rb +12 -0
- data/spec/dummy/db/migrate/20090720091106_create_medium_of_performances.rb +12 -0
- data/spec/dummy/db/migrate/20090720091429_create_content_types.rb +12 -0
- data/spec/dummy/db/migrate/20091025080447_create_licenses.rb +12 -0
- data/spec/dummy/db/migrate/20100129142347_create_import_requests.rb +14 -0
- data/spec/dummy/db/migrate/20100925043847_create_resource_import_results.rb +15 -0
- data/spec/dummy/db/migrate/20100925074559_create_agent_import_results.rb +12 -0
- data/spec/dummy/db/migrate/20110603184217_add_edit_mode_to_resource_import_file.rb +9 -0
- data/spec/dummy/db/migrate/20110620173525_add_bookstore_id_to_item.rb +11 -0
- data/spec/dummy/db/migrate/20111201155456_devise_create_users.rb +42 -0
- data/spec/dummy/db/migrate/20120125050502_add_depth_to_message.rb +6 -0
- data/spec/dummy/db/migrate/20120129020544_add_budget_type_id_to_item.rb +6 -0
- data/spec/dummy/db/migrate/20120319120638_add_content_type_id_to_manifestation.rb +6 -0
- data/spec/dummy/db/migrate/20120410104851_add_year_of_publication_to_manifestation.rb +5 -0
- data/spec/dummy/db/migrate/20120413072700_add_picture_meta_to_picture_file.rb +5 -0
- data/spec/dummy/db/migrate/20120413100352_add_fingerprint_to_picture_file.rb +5 -0
- data/spec/dummy/db/migrate/20120413161340_add_fingerprint_to_resource_import_file.rb +5 -0
- data/spec/dummy/db/migrate/20120413161403_add_fingerprint_to_agent_import_file.rb +5 -0
- data/spec/dummy/db/migrate/20120413170705_add_error_message_to_resource_import_file.rb +5 -0
- data/spec/dummy/db/migrate/20120413170720_add_error_message_to_agent_import_file.rb +5 -0
- data/spec/dummy/db/migrate/20120415164821_add_attachment_meta_to_manifestation.rb +5 -0
- data/spec/dummy/db/migrate/20120418081407_add_month_of_publication_to_manifestation.rb +5 -0
- data/spec/dummy/db/migrate/20120511072422_add_agent_identifier_to_agent.rb +6 -0
- data/spec/dummy/db/migrate/20120602141129_add_edit_mode_to_agent_import_file.rb +5 -0
- data/spec/dummy/db/migrate/20121116031206_add_fulltext_content_to_manifestation.rb +5 -0
- data/spec/dummy/db/migrate/20130221154434_add_additional_attributes_to_user.rb +16 -0
- data/spec/dummy/db/migrate/20130421155019_add_creator_string_to_series_statement.rb +7 -0
- data/spec/dummy/db/migrate/20130421164124_add_series_master_to_series_statement.rb +5 -0
- data/spec/dummy/db/migrate/20130429020822_add_root_manifestation_id_to_series_statement.rb +6 -0
- data/spec/dummy/db/migrate/20140122054321_create_profiles.rb +20 -0
- data/spec/dummy/db/migrate/20140518111006_create_message_transitions.rb +14 -0
- data/spec/dummy/db/migrate/20140518135713_create_message_request_transitions.rb +14 -0
- data/spec/dummy/db/migrate/20140519170214_create_resource_import_file_transitions.rb +14 -0
- data/spec/dummy/db/migrate/20140519171220_create_import_request_transitions.rb +14 -0
- data/spec/dummy/db/migrate/20140524020735_create_agent_import_file_transitions.rb +14 -0
- data/spec/dummy/db/migrate/20140614065404_create_resource_export_files.rb +11 -0
- data/spec/dummy/db/migrate/20140614141500_create_resource_export_file_transitions.rb +14 -0
- data/spec/dummy/db/migrate/20140628073524_add_user_encoding_to_agent_import_file.rb +5 -0
- data/spec/dummy/db/migrate/20140628073535_add_user_encoding_to_resource_import_file.rb +5 -0
- data/spec/dummy/db/migrate/20140720140916_add_binding_item_identifier_to_item.rb +8 -0
- data/spec/dummy/db/migrate/20140721151416_add_default_shelf_id_to_resource_import_file.rb +5 -0
- data/spec/dummy/db/migrate/20140802082007_add_manifestation_id_to_item.rb +6 -0
- data/spec/dummy/db/migrate/20140811031145_add_expired_at_to_profile.rb +5 -0
- data/spec/dummy/db/schema.rb +315 -56
- data/spec/dummy/db/test.sqlite3 +0 -0
- data/spec/dummy/solr/conf/admin-extra.html +31 -0
- data/spec/dummy/solr/conf/elevate.xml +36 -0
- data/spec/dummy/solr/conf/mapping-ISOLatin1Accent.txt +246 -0
- data/spec/dummy/solr/conf/protwords.txt +21 -0
- data/spec/dummy/solr/conf/schema.xml +255 -0
- data/spec/dummy/solr/conf/scripts.conf +24 -0
- data/spec/dummy/solr/conf/solrconfig.xml +667 -0
- data/spec/dummy/solr/conf/spellings.txt +2 -0
- data/spec/dummy/solr/conf/stopwords.txt +58 -0
- data/spec/dummy/solr/conf/synonyms.txt +31 -0
- data/spec/dummy/solr/default/data/index/_7f0.fdt +0 -0
- data/spec/dummy/solr/default/data/index/_7f0.fdx +0 -0
- data/spec/dummy/solr/default/data/index/_7f0.fnm +0 -0
- data/spec/dummy/solr/default/data/index/_7f0.nvd +0 -0
- data/spec/dummy/solr/default/data/index/_7f0.nvm +0 -0
- data/spec/dummy/solr/default/data/index/_7f0.si +0 -0
- data/spec/dummy/solr/default/data/index/_7f0_Lucene41_0.doc +0 -0
- data/spec/dummy/solr/default/data/index/_7f0_Lucene41_0.pos +0 -0
- data/spec/dummy/solr/default/data/index/_7f0_Lucene41_0.tim +0 -0
- data/spec/dummy/solr/default/data/index/_7f0_Lucene41_0.tip +0 -0
- data/spec/dummy/solr/default/data/index/segments.gen +0 -0
- data/spec/dummy/solr/default/data/index/segments_bvw +0 -0
- data/spec/dummy/solr/default/data/tlog/tlog.0000000000000015394 +0 -0
- data/spec/dummy/solr/default/data/tlog/tlog.0000000000000015395 +0 -0
- data/spec/dummy/solr/default/data/tlog/tlog.0000000000000015396 +0 -0
- data/spec/dummy/solr/default/data/tlog/tlog.0000000000000015397 +0 -0
- data/spec/dummy/solr/default/data/tlog/tlog.0000000000000015398 +0 -0
- data/spec/dummy/solr/default/data/tlog/tlog.0000000000000015399 +0 -0
- data/spec/dummy/solr/default/data/tlog/tlog.0000000000000015400 +0 -0
- data/spec/dummy/solr/default/data/tlog/tlog.0000000000000015401 +0 -0
- data/spec/dummy/solr/default/data/tlog/tlog.0000000000000015402 +0 -0
- data/spec/dummy/solr/development/data/index/segments.gen +0 -0
- data/spec/dummy/solr/development/data/index/segments_1 +0 -0
- data/spec/dummy/solr/solr.xml +8 -0
- data/spec/dummy/solr/test/data/index/segments.gen +0 -0
- data/spec/dummy/solr/test/data/index/segments_1 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/0007f9aec08cc2727b3d00cd62cf1d0f +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/0440b81b0aae840cf287a686585a8cec +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/0e3e358e4fe4601ba5e435f6d0c86f12 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/129cec5384c0f26fcfb0ce65048298c5 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/1572dfd6f1e555f4be1aa60ddc3cb0c0 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/181c975b1296d7ebe81714d5e64bc098 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/1c1fbab93e4552626da626e0dbe70c74 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/1e58a07a3701da9fb9c176d67162af2b +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/2b35ad8fee7e1228e205669278e2adda +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/2f09f58943a88f21e3a0318621391785 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/2ffe508d0533d0afd2a37bb574eda40d +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/3753d928863ee65118b9f2da1c6e504d +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/40e90f0c329b14292a9ff1a2fe907b39 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/45f3c74e1e31b58d9bda6908d5623290 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/49a3464eb6bcffb3d9f5b47b133edabb +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/49d32c13d390c1b80d8b2705aac86579 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/4aa18096a209e515f5f1df487622cdf4 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/50e64f45f0cb4cee52fd3f3908f89a82 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/51f7d34a9e9bebb47b7201cfebfec34d +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/5995180d1cfd7cad71ec6d9e1a538f0e +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/604e0e4b3c01d488d6fb087e9fdaeb94 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/6401fc09d2b894df2ad251b007df145a +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/65a8d4d288e5f082f0166aa7be7a2464 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/6f5d66df18892df6af39c9cfd784f0f5 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/6fcdd2234a7c25f9d4179ca12fd9f7b4 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/6fdb4513af157010ef79b56df44d665e +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/750439d8043ed022910956fbb55faa65 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/811e5198d0dc4efe02d28c0c2215e207 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/83ea20e0b25e77f5dce5bf733b088292 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/9604073a83f822f13caaabd7e157bbbb +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/98d02556564ee10aef4c3397bb94d5b9 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/9cfe4d48f5258863dbfb3623c797fb15 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/a296264dcc89e1f8ab6382e678ffbe38 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/aa2e1ada35daa496bb08e85fcb817536 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/abee2d4cb18d15789dcdc9c680f3e6de +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/c1ab0ecf3cf57db41d9e4cd9306d8829 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/c4a984c6feb506f3e1f9120a8d029bda +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/ccdcb26ebc6ef3b684368b368edf4f99 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/d34b5413caa9407126db68d5d590804a +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/d4ac74c17332ad931b72f42d7997fcc0 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/dd672deb061233e0db1d2f413d27213f +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/e1fcfb0faa3c12467a1c35251e04c8b1 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/e2d21478696ac96ad895f7c3b8d31594 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/e577e9ce00153ad2e59111f761d0fb15 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/e9738177de2083b68d42e053a1529244 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/e9ce2df3f0160329df69b22a911dbd04 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/f2e83d3b5fe984832bfeff09b0e3b8d2 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/f90eee17e0e5eaea50e6064ded54617c +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/fa8e81ce1d45228121b9df5618542190 +0 -0
- data/spec/dummy/tmp/cache/assets/test/sprockets/fbdc1d9347cb228f06807b76c6c2974e +0 -0
- data/spec/dummy/tmp/cache/stdout +1262 -0
- data/spec/dummy/tmp/pids/redis-test.pid +1 -0
- data/spec/factories/profile.rb +9 -0
- data/spec/factories/reserve.rb +7 -1
- data/spec/factories/user.rb +3 -9
- data/spec/fixtures/agents.yml +0 -12
- data/spec/fixtures/checkouts.yml +12 -1
- data/spec/fixtures/items.yml +48 -25
- data/spec/fixtures/manifestation_checkout_stats.yml +3 -4
- data/spec/fixtures/manifestation_reserve_stats.yml +3 -4
- data/spec/fixtures/message_requests.yml +0 -3
- data/spec/fixtures/message_templates.yml +41 -20
- data/spec/fixtures/profiles.yml +83 -0
- data/spec/fixtures/reserve_transitions.yml +88 -0
- data/spec/fixtures/reserves.yml +1 -18
- data/spec/fixtures/user_checkout_stats.yml +3 -4
- data/spec/fixtures/user_groups.yml +3 -3
- data/spec/fixtures/user_reserve_stats.yml +3 -4
- data/spec/fixtures/users.yml +0 -55
- data/spec/models/checked_item_spec.rb +2 -1
- data/spec/models/checkout_spec.rb +0 -1
- data/spec/models/manifestation_checkout_stat_spec.rb +4 -2
- data/spec/models/manifestation_reserve_stat_spec.rb +4 -2
- data/spec/models/reserve_spec.rb +9 -11
- data/spec/models/user_checkout_stat_spec.rb +4 -2
- data/spec/models/user_reserve_stat_spec.rb +4 -2
- data/spec/support/resque.rb +25 -22
- metadata +325 -92
- data/app/controllers/checkout_stat_has_manifestations_controller.rb +0 -81
- data/app/controllers/checkout_stat_has_users_controller.rb +0 -81
- data/app/controllers/reserve_stat_has_manifestations_controller.rb +0 -81
- data/app/controllers/reserve_stat_has_users_controller.rb +0 -81
- data/app/models/circulation_sweeper.rb +0 -24
- data/app/views/checkout_stat_has_manifestations/_form.html.erb +0 -15
- data/app/views/checkout_stat_has_manifestations/edit.html.erb +0 -13
- data/app/views/checkout_stat_has_manifestations/index.html.erb +0 -33
- data/app/views/checkout_stat_has_manifestations/new.html.erb +0 -12
- data/app/views/checkout_stat_has_manifestations/show.html.erb +0 -28
- data/app/views/checkout_stat_has_users/_form.html.erb +0 -15
- data/app/views/checkout_stat_has_users/edit.html.erb +0 -13
- data/app/views/checkout_stat_has_users/index.html.erb +0 -33
- data/app/views/checkout_stat_has_users/new.html.erb +0 -12
- data/app/views/checkout_stat_has_users/show.html.erb +0 -28
- data/app/views/checkouts/index.csv.erb +0 -4
- data/app/views/manifestation_checkout_stats/show.csv.erb +0 -4
- data/app/views/manifestation_reserve_stats/show.csv.erb +0 -4
- data/app/views/reserve_stat_has_manifestations/_form.html.erb +0 -15
- data/app/views/reserve_stat_has_manifestations/edit.html.erb +0 -13
- data/app/views/reserve_stat_has_manifestations/index.html.erb +0 -33
- data/app/views/reserve_stat_has_manifestations/new.html.erb +0 -12
- data/app/views/reserve_stat_has_manifestations/show.html.erb +0 -28
- data/app/views/reserve_stat_has_users/_form.html.erb +0 -15
- data/app/views/reserve_stat_has_users/edit.html.erb +0 -13
- data/app/views/reserve_stat_has_users/index.html.erb +0 -33
- data/app/views/reserve_stat_has_users/new.html.erb +0 -12
- data/app/views/reserve_stat_has_users/show.html.erb +0 -28
- data/app/views/reserves/index.csv.erb +0 -4
- data/app/views/user_checkout_stats/show.csv.erb +0 -4
- data/app/views/user_reserve_stats/show.csv.erb +0 -4
- data/db/fixtures/carrier_type_has_checkout_types.yml +0 -8
- data/db/fixtures/checkout_types.yml +0 -22
- data/db/fixtures/circulation_statuses.yml +0 -92
- data/db/fixtures/use_restrictions.yml +0 -79
- data/db/migrate/20130303104849_add_state_index_to_reserve.rb +0 -5
- data/spec/controllers/checkout_stat_has_manifestations_controller_spec.rb +0 -441
- data/spec/controllers/checkout_stat_has_users_controller_spec.rb +0 -441
- data/spec/controllers/reserve_stat_has_manifestations_controller_spec.rb +0 -441
- data/spec/controllers/reserve_stat_has_users_controller_spec.rb +0 -441
- data/spec/dummy/app/mailers/notifier.rb +0 -29
- data/spec/dummy/db/migrate/20110916053430_rename_manifestation_number_list_to_number_string.rb +0 -13
- data/spec/dummy/db/migrate/20111201155456_create_users.rb +0 -16
- data/spec/dummy/db/migrate/20111201155513_add_devise_to_users.rb +0 -44
@@ -1,10 +1,10 @@
|
|
1
1
|
class CheckoutStatHasManifestation < ActiveRecord::Base
|
2
2
|
attr_accessible :manifestation_checkout_stat_id, :manifestation_id,
|
3
|
-
:
|
3
|
+
as: :admin
|
4
4
|
belongs_to :manifestation_checkout_stat
|
5
5
|
belongs_to :manifestation
|
6
6
|
|
7
|
-
validates_uniqueness_of :manifestation_id, :
|
7
|
+
validates_uniqueness_of :manifestation_id, scope: :manifestation_checkout_stat_id
|
8
8
|
validates_presence_of :manifestation_checkout_stat_id, :manifestation_id
|
9
9
|
|
10
10
|
paginates_per 10
|
@@ -1,10 +1,10 @@
|
|
1
1
|
class CheckoutStatHasUser < ActiveRecord::Base
|
2
2
|
attr_accessible :user_checkout_stat_id, :user_id,
|
3
|
-
:
|
3
|
+
as: :admin
|
4
4
|
belongs_to :user_checkout_stat
|
5
5
|
belongs_to :user
|
6
6
|
|
7
|
-
validates_uniqueness_of :user_id, :
|
7
|
+
validates_uniqueness_of :user_id, scope: :user_checkout_stat_id
|
8
8
|
validates_presence_of :user_checkout_stat_id, :user_id
|
9
9
|
|
10
10
|
paginates_per 10
|
data/app/models/checkout_type.rb
CHANGED
@@ -1,16 +1,16 @@
|
|
1
1
|
class CheckoutType < ActiveRecord::Base
|
2
2
|
attr_accessible :name, :display_name, :note
|
3
3
|
include MasterModel
|
4
|
-
default_scope :
|
5
|
-
scope :available_for_carrier_type, lambda {|carrier_type| {:include => :carrier_types, :
|
6
|
-
scope :available_for_user_group, lambda {|user_group| {:include => :user_groups, :
|
4
|
+
default_scope order: "checkout_types.position"
|
5
|
+
scope :available_for_carrier_type, lambda {|carrier_type| {:include => :carrier_types, conditions: ['carrier_types.name = ?', carrier_type.name], order: 'carrier_types.position'}}
|
6
|
+
scope :available_for_user_group, lambda {|user_group| {:include => :user_groups, conditions: ['user_groups.name = ?', user_group.name], order: 'user_group.position'}}
|
7
7
|
|
8
|
-
has_many :user_group_has_checkout_types, :
|
9
|
-
has_many :user_groups, :
|
10
|
-
has_many :carrier_type_has_checkout_types, :
|
11
|
-
has_many :carrier_types, :
|
12
|
-
#has_many :item_has_checkout_types, :
|
13
|
-
#has_many :items, :
|
8
|
+
has_many :user_group_has_checkout_types, dependent: :destroy
|
9
|
+
has_many :user_groups, through: :user_group_has_checkout_types
|
10
|
+
has_many :carrier_type_has_checkout_types, dependent: :destroy
|
11
|
+
has_many :carrier_types, through: :carrier_type_has_checkout_types
|
12
|
+
#has_many :item_has_checkout_types, dependent: :destroy
|
13
|
+
#has_many :items, through: :item_has_checkout_types
|
14
14
|
has_many :items
|
15
15
|
|
16
16
|
paginates_per 10
|
@@ -1,9 +1,19 @@
|
|
1
1
|
class CirculationStatus < ActiveRecord::Base
|
2
2
|
attr_accessible :name, :display_name, :note
|
3
|
-
include MasterModel
|
4
|
-
|
5
|
-
|
3
|
+
#include MasterModel
|
4
|
+
acts_as_list
|
5
|
+
validates :name, presence: true, format: {with: /\A[0-9A-Za-z][0-9A-Za-z_\-\s,]*[0-9a-z]\Z/}
|
6
|
+
validates :display_name, presence: true
|
7
|
+
before_validation :set_display_name, on: :create
|
8
|
+
normalize_attributes :name
|
9
|
+
|
10
|
+
default_scope order: "circulation_statuses.position"
|
11
|
+
scope :available_for_checkout, where(name: 'Available On Shelf')
|
6
12
|
has_many :items
|
13
|
+
|
14
|
+
def set_display_name
|
15
|
+
self.display_name = "#{I18n.locale}: #{name}" if display_name.blank?
|
16
|
+
end
|
7
17
|
end
|
8
18
|
|
9
19
|
# == Schema Information
|
@@ -1,12 +1,12 @@
|
|
1
1
|
class ItemHasUseRestriction < ActiveRecord::Base
|
2
2
|
attr_accessible :item_id, :use_restriction_id
|
3
|
-
belongs_to :item, :
|
4
|
-
belongs_to :use_restriction, :
|
3
|
+
belongs_to :item, validate: true
|
4
|
+
belongs_to :use_restriction, validate: true
|
5
5
|
accepts_nested_attributes_for :use_restriction
|
6
6
|
|
7
7
|
validates_associated :item, :use_restriction
|
8
8
|
validates_presence_of :use_restriction
|
9
|
-
validates_presence_of :item, :
|
9
|
+
validates_presence_of :item, on: :update
|
10
10
|
|
11
11
|
paginates_per 10
|
12
12
|
end
|
@@ -1,17 +1,17 @@
|
|
1
1
|
class LendingPolicy < ActiveRecord::Base
|
2
2
|
attr_accessible :item_id, :user_group_id, :loan_period, :fixed_due_date,
|
3
3
|
:renewal, :fine, :note, :position
|
4
|
-
default_scope :
|
4
|
+
default_scope order: 'lending_policies.position'
|
5
5
|
belongs_to :item
|
6
6
|
belongs_to :user_group
|
7
7
|
|
8
8
|
validates_presence_of :item, :user_group
|
9
|
-
validates_uniqueness_of :user_group_id, :
|
10
|
-
validates_date :fixed_due_date, :
|
9
|
+
validates_uniqueness_of :user_group_id, scope: :item_id
|
10
|
+
validates_date :fixed_due_date, allow_blank: true
|
11
11
|
|
12
12
|
paginates_per 10
|
13
13
|
|
14
|
-
acts_as_list :
|
14
|
+
acts_as_list scope: :item_id
|
15
15
|
end
|
16
16
|
|
17
17
|
# == Schema Information
|
@@ -5,7 +5,8 @@ class ManifestationCheckoutStat < ActiveRecord::Base
|
|
5
5
|
default_scope {order('manifestation_checkout_stats.id DESC')}
|
6
6
|
scope :not_calculated, -> {in_state(:pending)}
|
7
7
|
has_many :checkout_stat_has_manifestations
|
8
|
-
has_many :manifestations, :
|
8
|
+
has_many :manifestations, through: :checkout_stat_has_manifestations
|
9
|
+
belongs_to :user
|
9
10
|
|
10
11
|
paginates_per 10
|
11
12
|
attr_accessor :mode
|
@@ -34,6 +35,7 @@ class ManifestationCheckoutStat < ActiveRecord::Base
|
|
34
35
|
end
|
35
36
|
self.completed_at = Time.zone.now
|
36
37
|
transition_to!(:completed)
|
38
|
+
send_message
|
37
39
|
end
|
38
40
|
|
39
41
|
private
|
@@ -50,10 +52,9 @@ end
|
|
50
52
|
# start_date :datetime
|
51
53
|
# end_date :datetime
|
52
54
|
# note :text
|
53
|
-
# state :string(255)
|
54
55
|
# created_at :datetime not null
|
55
56
|
# updated_at :datetime not null
|
56
57
|
# started_at :datetime
|
57
58
|
# completed_at :datetime
|
59
|
+
# user_id :integer
|
58
60
|
#
|
59
|
-
|
@@ -5,3 +5,16 @@ class ManifestationCheckoutStatTransition < ActiveRecord::Base
|
|
5
5
|
belongs_to :manifestation_cehckout_stat, inverse_of: :manifestation_checkout_stat_transitions
|
6
6
|
attr_accessible :to_state, :sort_key, :metadata
|
7
7
|
end
|
8
|
+
|
9
|
+
# == Schema Information
|
10
|
+
#
|
11
|
+
# Table name: manifestation_checkout_stat_transitions
|
12
|
+
#
|
13
|
+
# id :integer not null, primary key
|
14
|
+
# to_state :string(255)
|
15
|
+
# metadata :text default("{}")
|
16
|
+
# sort_key :integer
|
17
|
+
# manifestation_checkout_stat_id :integer
|
18
|
+
# created_at :datetime not null
|
19
|
+
# updated_at :datetime not null
|
20
|
+
#
|
@@ -5,7 +5,8 @@ class ManifestationReserveStat < ActiveRecord::Base
|
|
5
5
|
default_scope {order('manifestation_reserve_stats.id DESC')}
|
6
6
|
scope :not_calculated, -> {in_state(:pending)}
|
7
7
|
has_many :reserve_stat_has_manifestations
|
8
|
-
has_many :manifestations, :
|
8
|
+
has_many :manifestations, through: :reserve_stat_has_manifestations
|
9
|
+
belongs_to :user
|
9
10
|
|
10
11
|
paginates_per 10
|
11
12
|
attr_accessor :mode
|
@@ -34,6 +35,7 @@ class ManifestationReserveStat < ActiveRecord::Base
|
|
34
35
|
end
|
35
36
|
self.completed_at = Time.zone.now
|
36
37
|
transition_to!(:completed)
|
38
|
+
send_message
|
37
39
|
end
|
38
40
|
|
39
41
|
private
|
@@ -50,10 +52,9 @@ end
|
|
50
52
|
# start_date :datetime
|
51
53
|
# end_date :datetime
|
52
54
|
# note :text
|
53
|
-
# state :string(255)
|
54
55
|
# created_at :datetime not null
|
55
56
|
# updated_at :datetime not null
|
56
57
|
# started_at :datetime
|
57
58
|
# completed_at :datetime
|
59
|
+
# user_id :integer
|
58
60
|
#
|
59
|
-
|
@@ -5,3 +5,16 @@ class ManifestationReserveStatTransition < ActiveRecord::Base
|
|
5
5
|
belongs_to :manifestation_reserve_stat, inverse_of: :manifestation_reserve_stat_transitions
|
6
6
|
attr_accessible :to_state, :sort_key, :metadata
|
7
7
|
end
|
8
|
+
|
9
|
+
# == Schema Information
|
10
|
+
#
|
11
|
+
# Table name: manifestation_reserve_stat_transitions
|
12
|
+
#
|
13
|
+
# id :integer not null, primary key
|
14
|
+
# to_state :string(255)
|
15
|
+
# metadata :text default("{}")
|
16
|
+
# sort_key :integer
|
17
|
+
# manifestation_reserve_stat_id :integer
|
18
|
+
# created_at :datetime not null
|
19
|
+
# updated_at :datetime not null
|
20
|
+
#
|