enju_circulation 0.1.0.pre38 → 0.1.0.pre39

Sign up to get free protection for your applications and to get access to all the features.
Files changed (135) hide show
  1. checksums.yaml +4 -4
  2. data/app/controllers/manifestation_checkout_stats_controller.rb +3 -0
  3. data/app/models/carrier_type_has_checkout_type.rb +2 -2
  4. data/app/models/checkin.rb +7 -5
  5. data/app/models/checkout.rb +11 -7
  6. data/app/models/checkout_type.rb +3 -3
  7. data/app/models/circulation_status.rb +6 -5
  8. data/app/models/item_has_use_restriction.rb +1 -1
  9. data/app/models/lending_policy.rb +1 -1
  10. data/app/models/manifestation_checkout_stat.rb +1 -1
  11. data/app/models/manifestation_reserve_stat.rb +1 -1
  12. data/app/models/reserve.rb +19 -19
  13. data/app/models/use_restriction.rb +5 -4
  14. data/app/models/user_group_has_checkout_type.rb +1 -1
  15. data/app/views/checked_items/new.html.erb +1 -1
  16. data/app/views/checkouts/_index_user.html.erb +1 -1
  17. data/app/views/manifestation_checkout_stats/show.html.erb +9 -0
  18. data/app/views/manifestation_checkout_stats/show.txt.erb +3 -2
  19. data/app/views/manifestation_reserve_stats/show.txt.erb +3 -2
  20. data/config/locales/translation_en.yml +1 -0
  21. data/config/locales/translation_ja.yml +1 -0
  22. data/lib/enju_circulation/item.rb +3 -3
  23. data/lib/enju_circulation/user_group.rb +2 -2
  24. data/lib/enju_circulation/version.rb +1 -1
  25. data/spec/controllers/checkout_types_controller_spec.rb +2 -2
  26. data/spec/controllers/circulation_statuses_controller_spec.rb +4 -4
  27. data/spec/controllers/item_has_use_restrictions_controller_spec.rb +2 -2
  28. data/spec/controllers/manifestation_checkout_stats_controller_spec.rb +4 -4
  29. data/spec/controllers/manifestation_reserve_stats_controller_spec.rb +4 -4
  30. data/spec/controllers/use_restrictions_controller_spec.rb +2 -2
  31. data/spec/controllers/user_checkout_stats_controller_spec.rb +4 -4
  32. data/spec/controllers/user_reserve_stats_controller_spec.rb +4 -4
  33. data/spec/dummy/config/boot.rb +2 -2
  34. data/spec/dummy/config/initializers/friendly_id.rb +90 -0
  35. data/spec/dummy/db/migrate/005_create_manifestations.rb +0 -1
  36. data/spec/dummy/db/migrate/133_create_agent_merges.rb +15 -0
  37. data/spec/dummy/db/migrate/134_create_agent_merge_lists.rb +13 -0
  38. data/spec/dummy/db/migrate/20100925074559_create_agent_import_results.rb +0 -1
  39. data/spec/dummy/db/migrate/20110627035057_create_series_statement_merges.rb +1 -1
  40. data/spec/dummy/db/migrate/20140813182425_add_publication_place_to_manifestation.rb +5 -0
  41. data/spec/dummy/db/migrate/20140822114527_add_error_message_to_resource_import_result.rb +5 -0
  42. data/spec/dummy/db/migrate/20140823083524_add_extent_to_manifestation.rb +5 -0
  43. data/spec/dummy/db/migrate/20140823094847_add_dimensions_to_manifestation.rb +5 -0
  44. data/spec/dummy/db/migrate/20140823095740_rename_manifestation_periodical_to_serial.rb +9 -0
  45. data/spec/dummy/db/schema.rb +23 -5
  46. data/spec/dummy/db/test.sqlite3 +0 -0
  47. data/spec/dummy/solr/default/data/index/_8df.fdt +0 -0
  48. data/spec/dummy/solr/default/data/index/{_7tr.si → _8df.si} +0 -0
  49. data/spec/dummy/solr/default/data/index/{_7tr_Lucene41_0.tim → _8df_Lucene41_0.tim} +0 -0
  50. data/spec/dummy/solr/default/data/index/{_7tr_Lucene41_0.tip → _8df_Lucene41_0.tip} +0 -0
  51. data/spec/dummy/solr/default/data/index/segments.gen +0 -0
  52. data/spec/dummy/solr/default/data/index/segments_dfb +0 -0
  53. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000017389 +0 -0
  54. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000017390 +0 -0
  55. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000017391 +0 -0
  56. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000017392 +0 -0
  57. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000017393 +0 -0
  58. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000017394 +0 -0
  59. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000017395 +0 -0
  60. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000017396 +0 -0
  61. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000017397 +0 -0
  62. data/spec/dummy/tmp/cache/stdout +27 -1875
  63. data/spec/dummy/tmp/pids/redis-test.pid +1 -1
  64. data/spec/fixtures/users.yml +1 -1
  65. data/spec/models/reserve_spec.rb +2 -2
  66. data/spec/views/reserves/index.html.erb_spec.rb +1 -1
  67. metadata +68 -153
  68. data/lib/generators/enju_circulation/setup/templates/db/fixtures/carrier_types.yml +0 -29
  69. data/spec/dummy/solr/default/data/index/_7tr.fdt +0 -0
  70. data/spec/dummy/solr/default/data/index/segments_cjn +0 -0
  71. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000016249 +0 -0
  72. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000016250 +0 -0
  73. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000016251 +0 -0
  74. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000016252 +0 -0
  75. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000016253 +0 -0
  76. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000016254 +0 -0
  77. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000016255 +0 -0
  78. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000016256 +0 -0
  79. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000016257 +0 -0
  80. data/spec/dummy/tmp/cache/assets/test/sprockets/0007f9aec08cc2727b3d00cd62cf1d0f +0 -0
  81. data/spec/dummy/tmp/cache/assets/test/sprockets/0440b81b0aae840cf287a686585a8cec +0 -0
  82. data/spec/dummy/tmp/cache/assets/test/sprockets/0e3e358e4fe4601ba5e435f6d0c86f12 +0 -0
  83. data/spec/dummy/tmp/cache/assets/test/sprockets/129cec5384c0f26fcfb0ce65048298c5 +0 -0
  84. data/spec/dummy/tmp/cache/assets/test/sprockets/1572dfd6f1e555f4be1aa60ddc3cb0c0 +0 -0
  85. data/spec/dummy/tmp/cache/assets/test/sprockets/181c975b1296d7ebe81714d5e64bc098 +0 -0
  86. data/spec/dummy/tmp/cache/assets/test/sprockets/1c1fbab93e4552626da626e0dbe70c74 +0 -0
  87. data/spec/dummy/tmp/cache/assets/test/sprockets/1e58a07a3701da9fb9c176d67162af2b +0 -0
  88. data/spec/dummy/tmp/cache/assets/test/sprockets/2b35ad8fee7e1228e205669278e2adda +0 -0
  89. data/spec/dummy/tmp/cache/assets/test/sprockets/2f09f58943a88f21e3a0318621391785 +0 -0
  90. data/spec/dummy/tmp/cache/assets/test/sprockets/2ffe508d0533d0afd2a37bb574eda40d +0 -0
  91. data/spec/dummy/tmp/cache/assets/test/sprockets/3753d928863ee65118b9f2da1c6e504d +0 -0
  92. data/spec/dummy/tmp/cache/assets/test/sprockets/40e90f0c329b14292a9ff1a2fe907b39 +0 -0
  93. data/spec/dummy/tmp/cache/assets/test/sprockets/45f3c74e1e31b58d9bda6908d5623290 +0 -0
  94. data/spec/dummy/tmp/cache/assets/test/sprockets/49a3464eb6bcffb3d9f5b47b133edabb +0 -0
  95. data/spec/dummy/tmp/cache/assets/test/sprockets/49d32c13d390c1b80d8b2705aac86579 +0 -0
  96. data/spec/dummy/tmp/cache/assets/test/sprockets/4aa18096a209e515f5f1df487622cdf4 +0 -0
  97. data/spec/dummy/tmp/cache/assets/test/sprockets/50e64f45f0cb4cee52fd3f3908f89a82 +0 -0
  98. data/spec/dummy/tmp/cache/assets/test/sprockets/51f7d34a9e9bebb47b7201cfebfec34d +0 -0
  99. data/spec/dummy/tmp/cache/assets/test/sprockets/5995180d1cfd7cad71ec6d9e1a538f0e +0 -0
  100. data/spec/dummy/tmp/cache/assets/test/sprockets/604e0e4b3c01d488d6fb087e9fdaeb94 +0 -0
  101. data/spec/dummy/tmp/cache/assets/test/sprockets/6401fc09d2b894df2ad251b007df145a +0 -0
  102. data/spec/dummy/tmp/cache/assets/test/sprockets/65a8d4d288e5f082f0166aa7be7a2464 +0 -0
  103. data/spec/dummy/tmp/cache/assets/test/sprockets/6f5d66df18892df6af39c9cfd784f0f5 +0 -0
  104. data/spec/dummy/tmp/cache/assets/test/sprockets/6fcdd2234a7c25f9d4179ca12fd9f7b4 +0 -0
  105. data/spec/dummy/tmp/cache/assets/test/sprockets/6fdb4513af157010ef79b56df44d665e +0 -0
  106. data/spec/dummy/tmp/cache/assets/test/sprockets/750439d8043ed022910956fbb55faa65 +0 -0
  107. data/spec/dummy/tmp/cache/assets/test/sprockets/811e5198d0dc4efe02d28c0c2215e207 +0 -0
  108. data/spec/dummy/tmp/cache/assets/test/sprockets/83ea20e0b25e77f5dce5bf733b088292 +0 -0
  109. data/spec/dummy/tmp/cache/assets/test/sprockets/9604073a83f822f13caaabd7e157bbbb +0 -0
  110. data/spec/dummy/tmp/cache/assets/test/sprockets/98d02556564ee10aef4c3397bb94d5b9 +0 -0
  111. data/spec/dummy/tmp/cache/assets/test/sprockets/9cfe4d48f5258863dbfb3623c797fb15 +0 -0
  112. data/spec/dummy/tmp/cache/assets/test/sprockets/a296264dcc89e1f8ab6382e678ffbe38 +0 -0
  113. data/spec/dummy/tmp/cache/assets/test/sprockets/aa2e1ada35daa496bb08e85fcb817536 +0 -0
  114. data/spec/dummy/tmp/cache/assets/test/sprockets/abee2d4cb18d15789dcdc9c680f3e6de +0 -0
  115. data/spec/dummy/tmp/cache/assets/test/sprockets/c1ab0ecf3cf57db41d9e4cd9306d8829 +0 -0
  116. data/spec/dummy/tmp/cache/assets/test/sprockets/c4a984c6feb506f3e1f9120a8d029bda +0 -0
  117. data/spec/dummy/tmp/cache/assets/test/sprockets/ccdcb26ebc6ef3b684368b368edf4f99 +0 -0
  118. data/spec/dummy/tmp/cache/assets/test/sprockets/d34b5413caa9407126db68d5d590804a +0 -0
  119. data/spec/dummy/tmp/cache/assets/test/sprockets/d4ac74c17332ad931b72f42d7997fcc0 +0 -0
  120. data/spec/dummy/tmp/cache/assets/test/sprockets/dd672deb061233e0db1d2f413d27213f +0 -0
  121. data/spec/dummy/tmp/cache/assets/test/sprockets/e1fcfb0faa3c12467a1c35251e04c8b1 +0 -0
  122. data/spec/dummy/tmp/cache/assets/test/sprockets/e2d21478696ac96ad895f7c3b8d31594 +0 -0
  123. data/spec/dummy/tmp/cache/assets/test/sprockets/e577e9ce00153ad2e59111f761d0fb15 +0 -0
  124. data/spec/dummy/tmp/cache/assets/test/sprockets/e9738177de2083b68d42e053a1529244 +0 -0
  125. data/spec/dummy/tmp/cache/assets/test/sprockets/e9ce2df3f0160329df69b22a911dbd04 +0 -0
  126. data/spec/dummy/tmp/cache/assets/test/sprockets/f2e83d3b5fe984832bfeff09b0e3b8d2 +0 -0
  127. data/spec/dummy/tmp/cache/assets/test/sprockets/f90eee17e0e5eaea50e6064ded54617c +0 -0
  128. data/spec/dummy/tmp/cache/assets/test/sprockets/fa8e81ce1d45228121b9df5618542190 +0 -0
  129. data/spec/dummy/tmp/cache/assets/test/sprockets/fbdc1d9347cb228f06807b76c6c2974e +0 -0
  130. /data/spec/dummy/solr/default/data/index/{_7tr.fdx → _8df.fdx} +0 -0
  131. /data/spec/dummy/solr/default/data/index/{_7tr.fnm → _8df.fnm} +0 -0
  132. /data/spec/dummy/solr/default/data/index/{_7tr.nvd → _8df.nvd} +0 -0
  133. /data/spec/dummy/solr/default/data/index/{_7tr.nvm → _8df.nvm} +0 -0
  134. /data/spec/dummy/solr/default/data/index/{_7tr_Lucene41_0.doc → _8df_Lucene41_0.doc} +0 -0
  135. /data/spec/dummy/solr/default/data/index/{_7tr_Lucene41_0.pos → _8df_Lucene41_0.pos} +0 -0
data/spec/dummy/tmp/pids/redis-test.pid CHANGED
@@ -1 +1 @@
1
- 7034
1
+ 82607
data/spec/fixtures/users.yml CHANGED
@@ -3,7 +3,7 @@ admin:
3
3
  updated_at: 2008-05-31 13:16:30.163731 +09:00
4
4
  encrypted_password: $2a$10$vHohD1WflnTIqAa8zMkF9evwAgIZRw3XuR4d3bi29M.jph/MB/AJi
5
5
  id: 1
6
- username: admin
6
+ username: enjuadmin
7
7
  email: tanabe@kamata.lib.teu.ac.jp
8
8
  created_at: 2007-11-19 16:58:32.111941 +09:00
9
9
  librarian1:
data/spec/models/reserve_spec.rb CHANGED
@@ -34,11 +34,11 @@ describe Reserve do
34
34
  end
35
35
 
36
36
  it "should send accepted message" do
37
- old_admin_count = User.find('admin').received_messages.count
37
+ old_admin_count = User.where(username: 'enjuadmin').first.received_messages.count
38
38
  old_user_count = reserves(:reserve_00002).user.received_messages.count
39
39
  reserves(:reserve_00002).send_message.should be_truthy
40
40
  # 予約者と図書館の両方に送られる
41
- User.find('admin').received_messages.count.should eq old_admin_count + 1
41
+ User.where(username: 'enjuadmin').first.received_messages.count.should eq old_admin_count + 1
42
42
  reserves(:reserve_00002).user.received_messages.count.should eq old_user_count + 1
43
43
  end
44
44
 
data/spec/views/reserves/index.html.erb_spec.rb CHANGED
@@ -7,7 +7,7 @@ describe "reserves/index" do
7
7
  view.extend EnjuLeaf::EnjuLeafHelper
8
8
 
9
9
  assign(:reserves, Reserve.page(1))
10
- view.stub(:current_user).and_return(User.find('admin'))
10
+ view.stub(:current_user).and_return(User.where(username: 'enjuadmin').first)
11
11
  end
12
12
 
13
13
  it "renders a list of reserves" do
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: enju_circulation
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.0.pre38
4
+ version: 0.1.0.pre39
5
5
  platform: ruby
6
6
  authors:
7
7
  - Kosuke Tanabe
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-08-19 00:00:00.000000000 Z
11
+ date: 2014-10-03 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: enju_biblio
@@ -16,56 +16,56 @@ dependencies:
16
16
  requirements:
17
17
  - - "~>"
18
18
  - !ruby/object:Gem::Version
19
- version: 0.1.0.pre56
19
+ version: 0.1.0.pre59
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - "~>"
25
25
  - !ruby/object:Gem::Version
26
- version: 0.1.0.pre56
26
+ version: 0.1.0.pre59
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: enju_library
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
31
  - - "~>"
32
32
  - !ruby/object:Gem::Version
33
- version: 0.1.0.pre35
33
+ version: 0.1.0.pre36
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
38
  - - "~>"
39
39
  - !ruby/object:Gem::Version
40
- version: 0.1.0.pre35
40
+ version: 0.1.0.pre36
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: enju_message
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
45
  - - "~>"
46
46
  - !ruby/object:Gem::Version
47
- version: 0.1.14.pre17
47
+ version: 0.1.14.pre18
48
48
  type: :runtime
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
52
  - - "~>"
53
53
  - !ruby/object:Gem::Version
54
- version: 0.1.14.pre17
54
+ version: 0.1.14.pre18
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: enju_event
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
59
  - - "~>"
60
60
  - !ruby/object:Gem::Version
61
- version: 0.1.17.pre20
61
+ version: 0.1.17.pre22
62
62
  type: :runtime
63
63
  prerelease: false
64
64
  version_requirements: !ruby/object:Gem::Requirement
65
65
  requirements:
66
66
  - - "~>"
67
67
  - !ruby/object:Gem::Version
68
- version: 0.1.17.pre20
68
+ version: 0.1.17.pre22
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: enju_leaf
71
71
  requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,14 @@ dependencies:
100
100
  requirements:
101
101
  - - "~>"
102
102
  - !ruby/object:Gem::Version
103
- version: '3.0'
103
+ version: '3.1'
104
104
  type: :development
105
105
  prerelease: false
106
106
  version_requirements: !ruby/object:Gem::Requirement
107
107
  requirements:
108
108
  - - "~>"
109
109
  - !ruby/object:Gem::Version
110
- version: '3.0'
110
+ version: '3.1'
111
111
  - !ruby/object:Gem::Dependency
112
112
  name: factory_girl_rails
113
113
  requirement: !ruby/object:Gem::Requirement
@@ -430,7 +430,6 @@ files:
430
430
  - lib/generators/enju_circulation/setup/setup_generator.rb
431
431
  - lib/generators/enju_circulation/setup/templates/config/schedule.rb
432
432
  - lib/generators/enju_circulation/setup/templates/db/fixtures/carrier_type_has_checkout_types.yml
433
- - lib/generators/enju_circulation/setup/templates/db/fixtures/carrier_types.yml
434
433
  - lib/generators/enju_circulation/setup/templates/db/fixtures/checkout_types.yml
435
434
  - lib/generators/enju_circulation/setup/templates/db/fixtures/circulation_statuses.yml
436
435
  - lib/generators/enju_circulation/setup/templates/db/fixtures/use_restrictions.yml
@@ -475,6 +474,7 @@ files:
475
474
  - spec/dummy/config/environments/test.rb
476
475
  - spec/dummy/config/initializers/backtrace_silencers.rb
477
476
  - spec/dummy/config/initializers/devise.rb
477
+ - spec/dummy/config/initializers/friendly_id.rb
478
478
  - spec/dummy/config/initializers/inflections.rb
479
479
  - spec/dummy/config/initializers/mime_types.rb
480
480
  - spec/dummy/config/initializers/secret_token.rb
@@ -507,6 +507,8 @@ files:
507
507
  - spec/dummy/db/migrate/125_create_donates.rb
508
508
  - spec/dummy/db/migrate/130_create_request_status_types.rb
509
509
  - spec/dummy/db/migrate/131_create_request_types.rb
510
+ - spec/dummy/db/migrate/133_create_agent_merges.rb
511
+ - spec/dummy/db/migrate/134_create_agent_merge_lists.rb
510
512
  - spec/dummy/db/migrate/149_create_message_templates.rb
511
513
  - spec/dummy/db/migrate/154_create_messages.rb
512
514
  - spec/dummy/db/migrate/20080819181903_create_message_requests.rb
@@ -606,6 +608,11 @@ files:
606
608
  - spec/dummy/db/migrate/20140721151416_add_default_shelf_id_to_resource_import_file.rb
607
609
  - spec/dummy/db/migrate/20140802082007_add_manifestation_id_to_item.rb
608
610
  - spec/dummy/db/migrate/20140811031145_add_expired_at_to_profile.rb
611
+ - spec/dummy/db/migrate/20140813182425_add_publication_place_to_manifestation.rb
612
+ - spec/dummy/db/migrate/20140822114527_add_error_message_to_resource_import_result.rb
613
+ - spec/dummy/db/migrate/20140823083524_add_extent_to_manifestation.rb
614
+ - spec/dummy/db/migrate/20140823094847_add_dimensions_to_manifestation.rb
615
+ - spec/dummy/db/migrate/20140823095740_rename_manifestation_periodical_to_serial.rb
609
616
  - spec/dummy/db/schema.rb
610
617
  - spec/dummy/db/test.sqlite3
611
618
  - spec/dummy/public/404.html
@@ -624,82 +631,32 @@ files:
624
631
  - spec/dummy/solr/conf/spellings.txt
625
632
  - spec/dummy/solr/conf/stopwords.txt
626
633
  - spec/dummy/solr/conf/synonyms.txt
627
- - spec/dummy/solr/default/data/index/_7tr.fdt
628
- - spec/dummy/solr/default/data/index/_7tr.fdx
629
- - spec/dummy/solr/default/data/index/_7tr.fnm
630
- - spec/dummy/solr/default/data/index/_7tr.nvd
631
- - spec/dummy/solr/default/data/index/_7tr.nvm
632
- - spec/dummy/solr/default/data/index/_7tr.si
633
- - spec/dummy/solr/default/data/index/_7tr_Lucene41_0.doc
634
- - spec/dummy/solr/default/data/index/_7tr_Lucene41_0.pos
635
- - spec/dummy/solr/default/data/index/_7tr_Lucene41_0.tim
636
- - spec/dummy/solr/default/data/index/_7tr_Lucene41_0.tip
634
+ - spec/dummy/solr/default/data/index/_8df.fdt
635
+ - spec/dummy/solr/default/data/index/_8df.fdx
636
+ - spec/dummy/solr/default/data/index/_8df.fnm
637
+ - spec/dummy/solr/default/data/index/_8df.nvd
638
+ - spec/dummy/solr/default/data/index/_8df.nvm
639
+ - spec/dummy/solr/default/data/index/_8df.si
640
+ - spec/dummy/solr/default/data/index/_8df_Lucene41_0.doc
641
+ - spec/dummy/solr/default/data/index/_8df_Lucene41_0.pos
642
+ - spec/dummy/solr/default/data/index/_8df_Lucene41_0.tim
643
+ - spec/dummy/solr/default/data/index/_8df_Lucene41_0.tip
637
644
  - spec/dummy/solr/default/data/index/segments.gen
638
- - spec/dummy/solr/default/data/index/segments_cjn
639
- - spec/dummy/solr/default/data/tlog/tlog.0000000000000016249
640
- - spec/dummy/solr/default/data/tlog/tlog.0000000000000016250
641
- - spec/dummy/solr/default/data/tlog/tlog.0000000000000016251
642
- - spec/dummy/solr/default/data/tlog/tlog.0000000000000016252
643
- - spec/dummy/solr/default/data/tlog/tlog.0000000000000016253
644
- - spec/dummy/solr/default/data/tlog/tlog.0000000000000016254
645
- - spec/dummy/solr/default/data/tlog/tlog.0000000000000016255
646
- - spec/dummy/solr/default/data/tlog/tlog.0000000000000016256
647
- - spec/dummy/solr/default/data/tlog/tlog.0000000000000016257
645
+ - spec/dummy/solr/default/data/index/segments_dfb
646
+ - spec/dummy/solr/default/data/tlog/tlog.0000000000000017389
647
+ - spec/dummy/solr/default/data/tlog/tlog.0000000000000017390
648
+ - spec/dummy/solr/default/data/tlog/tlog.0000000000000017391
649
+ - spec/dummy/solr/default/data/tlog/tlog.0000000000000017392
650
+ - spec/dummy/solr/default/data/tlog/tlog.0000000000000017393
651
+ - spec/dummy/solr/default/data/tlog/tlog.0000000000000017394
652
+ - spec/dummy/solr/default/data/tlog/tlog.0000000000000017395
653
+ - spec/dummy/solr/default/data/tlog/tlog.0000000000000017396
654
+ - spec/dummy/solr/default/data/tlog/tlog.0000000000000017397
648
655
  - spec/dummy/solr/development/data/index/segments.gen
649
656
  - spec/dummy/solr/development/data/index/segments_1
650
657
  - spec/dummy/solr/solr.xml
651
658
  - spec/dummy/solr/test/data/index/segments.gen
652
659
  - spec/dummy/solr/test/data/index/segments_1
653
- - spec/dummy/tmp/cache/assets/test/sprockets/0007f9aec08cc2727b3d00cd62cf1d0f
654
- - spec/dummy/tmp/cache/assets/test/sprockets/0440b81b0aae840cf287a686585a8cec
655
- - spec/dummy/tmp/cache/assets/test/sprockets/0e3e358e4fe4601ba5e435f6d0c86f12
656
- - spec/dummy/tmp/cache/assets/test/sprockets/129cec5384c0f26fcfb0ce65048298c5
657
- - spec/dummy/tmp/cache/assets/test/sprockets/1572dfd6f1e555f4be1aa60ddc3cb0c0
658
- - spec/dummy/tmp/cache/assets/test/sprockets/181c975b1296d7ebe81714d5e64bc098
659
- - spec/dummy/tmp/cache/assets/test/sprockets/1c1fbab93e4552626da626e0dbe70c74
660
- - spec/dummy/tmp/cache/assets/test/sprockets/1e58a07a3701da9fb9c176d67162af2b
661
- - spec/dummy/tmp/cache/assets/test/sprockets/2b35ad8fee7e1228e205669278e2adda
662
- - spec/dummy/tmp/cache/assets/test/sprockets/2f09f58943a88f21e3a0318621391785
663
- - spec/dummy/tmp/cache/assets/test/sprockets/2ffe508d0533d0afd2a37bb574eda40d
664
- - spec/dummy/tmp/cache/assets/test/sprockets/3753d928863ee65118b9f2da1c6e504d
665
- - spec/dummy/tmp/cache/assets/test/sprockets/40e90f0c329b14292a9ff1a2fe907b39
666
- - spec/dummy/tmp/cache/assets/test/sprockets/45f3c74e1e31b58d9bda6908d5623290
667
- - spec/dummy/tmp/cache/assets/test/sprockets/49a3464eb6bcffb3d9f5b47b133edabb
668
- - spec/dummy/tmp/cache/assets/test/sprockets/49d32c13d390c1b80d8b2705aac86579
669
- - spec/dummy/tmp/cache/assets/test/sprockets/4aa18096a209e515f5f1df487622cdf4
670
- - spec/dummy/tmp/cache/assets/test/sprockets/50e64f45f0cb4cee52fd3f3908f89a82
671
- - spec/dummy/tmp/cache/assets/test/sprockets/51f7d34a9e9bebb47b7201cfebfec34d
672
- - spec/dummy/tmp/cache/assets/test/sprockets/5995180d1cfd7cad71ec6d9e1a538f0e
673
- - spec/dummy/tmp/cache/assets/test/sprockets/604e0e4b3c01d488d6fb087e9fdaeb94
674
- - spec/dummy/tmp/cache/assets/test/sprockets/6401fc09d2b894df2ad251b007df145a
675
- - spec/dummy/tmp/cache/assets/test/sprockets/65a8d4d288e5f082f0166aa7be7a2464
676
- - spec/dummy/tmp/cache/assets/test/sprockets/6f5d66df18892df6af39c9cfd784f0f5
677
- - spec/dummy/tmp/cache/assets/test/sprockets/6fcdd2234a7c25f9d4179ca12fd9f7b4
678
- - spec/dummy/tmp/cache/assets/test/sprockets/6fdb4513af157010ef79b56df44d665e
679
- - spec/dummy/tmp/cache/assets/test/sprockets/750439d8043ed022910956fbb55faa65
680
- - spec/dummy/tmp/cache/assets/test/sprockets/811e5198d0dc4efe02d28c0c2215e207
681
- - spec/dummy/tmp/cache/assets/test/sprockets/83ea20e0b25e77f5dce5bf733b088292
682
- - spec/dummy/tmp/cache/assets/test/sprockets/9604073a83f822f13caaabd7e157bbbb
683
- - spec/dummy/tmp/cache/assets/test/sprockets/98d02556564ee10aef4c3397bb94d5b9
684
- - spec/dummy/tmp/cache/assets/test/sprockets/9cfe4d48f5258863dbfb3623c797fb15
685
- - spec/dummy/tmp/cache/assets/test/sprockets/a296264dcc89e1f8ab6382e678ffbe38
686
- - spec/dummy/tmp/cache/assets/test/sprockets/aa2e1ada35daa496bb08e85fcb817536
687
- - spec/dummy/tmp/cache/assets/test/sprockets/abee2d4cb18d15789dcdc9c680f3e6de
688
- - spec/dummy/tmp/cache/assets/test/sprockets/c1ab0ecf3cf57db41d9e4cd9306d8829
689
- - spec/dummy/tmp/cache/assets/test/sprockets/c4a984c6feb506f3e1f9120a8d029bda
690
- - spec/dummy/tmp/cache/assets/test/sprockets/ccdcb26ebc6ef3b684368b368edf4f99
691
- - spec/dummy/tmp/cache/assets/test/sprockets/d34b5413caa9407126db68d5d590804a
692
- - spec/dummy/tmp/cache/assets/test/sprockets/d4ac74c17332ad931b72f42d7997fcc0
693
- - spec/dummy/tmp/cache/assets/test/sprockets/dd672deb061233e0db1d2f413d27213f
694
- - spec/dummy/tmp/cache/assets/test/sprockets/e1fcfb0faa3c12467a1c35251e04c8b1
695
- - spec/dummy/tmp/cache/assets/test/sprockets/e2d21478696ac96ad895f7c3b8d31594
696
- - spec/dummy/tmp/cache/assets/test/sprockets/e577e9ce00153ad2e59111f761d0fb15
697
- - spec/dummy/tmp/cache/assets/test/sprockets/e9738177de2083b68d42e053a1529244
698
- - spec/dummy/tmp/cache/assets/test/sprockets/e9ce2df3f0160329df69b22a911dbd04
699
- - spec/dummy/tmp/cache/assets/test/sprockets/f2e83d3b5fe984832bfeff09b0e3b8d2
700
- - spec/dummy/tmp/cache/assets/test/sprockets/f90eee17e0e5eaea50e6064ded54617c
701
- - spec/dummy/tmp/cache/assets/test/sprockets/fa8e81ce1d45228121b9df5618542190
702
- - spec/dummy/tmp/cache/assets/test/sprockets/fbdc1d9347cb228f06807b76c6c2974e
703
660
  - spec/dummy/tmp/cache/stdout
704
661
  - spec/dummy/tmp/pids/redis-test.pid
705
662
  - spec/factories/basket.rb
@@ -860,6 +817,7 @@ test_files:
860
817
  - spec/dummy/config/environments/test.rb
861
818
  - spec/dummy/config/initializers/backtrace_silencers.rb
862
819
  - spec/dummy/config/initializers/devise.rb
820
+ - spec/dummy/config/initializers/friendly_id.rb
863
821
  - spec/dummy/config/initializers/inflections.rb
864
822
  - spec/dummy/config/initializers/mime_types.rb
865
823
  - spec/dummy/config/initializers/secret_token.rb
@@ -893,6 +851,8 @@ test_files:
893
851
  - spec/dummy/db/migrate/125_create_donates.rb
894
852
  - spec/dummy/db/migrate/130_create_request_status_types.rb
895
853
  - spec/dummy/db/migrate/131_create_request_types.rb
854
+ - spec/dummy/db/migrate/133_create_agent_merges.rb
855
+ - spec/dummy/db/migrate/134_create_agent_merge_lists.rb
896
856
  - spec/dummy/db/migrate/149_create_message_templates.rb
897
857
  - spec/dummy/db/migrate/154_create_messages.rb
898
858
  - spec/dummy/db/migrate/20080819181903_create_message_requests.rb
@@ -992,6 +952,11 @@ test_files:
992
952
  - spec/dummy/db/migrate/20140721151416_add_default_shelf_id_to_resource_import_file.rb
993
953
  - spec/dummy/db/migrate/20140802082007_add_manifestation_id_to_item.rb
994
954
  - spec/dummy/db/migrate/20140811031145_add_expired_at_to_profile.rb
955
+ - spec/dummy/db/migrate/20140813182425_add_publication_place_to_manifestation.rb
956
+ - spec/dummy/db/migrate/20140822114527_add_error_message_to_resource_import_result.rb
957
+ - spec/dummy/db/migrate/20140823083524_add_extent_to_manifestation.rb
958
+ - spec/dummy/db/migrate/20140823094847_add_dimensions_to_manifestation.rb
959
+ - spec/dummy/db/migrate/20140823095740_rename_manifestation_periodical_to_serial.rb
995
960
  - spec/dummy/db/schema.rb
996
961
  - spec/dummy/db/test.sqlite3
997
962
  - spec/dummy/public/404.html
@@ -1012,82 +977,32 @@ test_files:
1012
977
  - spec/dummy/solr/conf/spellings.txt
1013
978
  - spec/dummy/solr/conf/stopwords.txt
1014
979
  - spec/dummy/solr/conf/synonyms.txt
1015
- - spec/dummy/solr/default/data/index/_7tr.fdt
1016
- - spec/dummy/solr/default/data/index/_7tr.fdx
1017
- - spec/dummy/solr/default/data/index/_7tr.fnm
1018
- - spec/dummy/solr/default/data/index/_7tr.nvd
1019
- - spec/dummy/solr/default/data/index/_7tr.nvm
1020
- - spec/dummy/solr/default/data/index/_7tr.si
1021
- - spec/dummy/solr/default/data/index/_7tr_Lucene41_0.doc
1022
- - spec/dummy/solr/default/data/index/_7tr_Lucene41_0.pos
1023
- - spec/dummy/solr/default/data/index/_7tr_Lucene41_0.tim
1024
- - spec/dummy/solr/default/data/index/_7tr_Lucene41_0.tip
980
+ - spec/dummy/solr/default/data/index/_8df.fdt
981
+ - spec/dummy/solr/default/data/index/_8df.fdx
982
+ - spec/dummy/solr/default/data/index/_8df.fnm
983
+ - spec/dummy/solr/default/data/index/_8df.nvd
984
+ - spec/dummy/solr/default/data/index/_8df.nvm
985
+ - spec/dummy/solr/default/data/index/_8df.si
986
+ - spec/dummy/solr/default/data/index/_8df_Lucene41_0.doc
987
+ - spec/dummy/solr/default/data/index/_8df_Lucene41_0.pos
988
+ - spec/dummy/solr/default/data/index/_8df_Lucene41_0.tim
989
+ - spec/dummy/solr/default/data/index/_8df_Lucene41_0.tip
1025
990
  - spec/dummy/solr/default/data/index/segments.gen
1026
- - spec/dummy/solr/default/data/index/segments_cjn
1027
- - spec/dummy/solr/default/data/tlog/tlog.0000000000000016249
1028
- - spec/dummy/solr/default/data/tlog/tlog.0000000000000016250
1029
- - spec/dummy/solr/default/data/tlog/tlog.0000000000000016251
1030
- - spec/dummy/solr/default/data/tlog/tlog.0000000000000016252
1031
- - spec/dummy/solr/default/data/tlog/tlog.0000000000000016253
1032
- - spec/dummy/solr/default/data/tlog/tlog.0000000000000016254
1033
- - spec/dummy/solr/default/data/tlog/tlog.0000000000000016255
1034
- - spec/dummy/solr/default/data/tlog/tlog.0000000000000016256
1035
- - spec/dummy/solr/default/data/tlog/tlog.0000000000000016257
991
+ - spec/dummy/solr/default/data/index/segments_dfb
992
+ - spec/dummy/solr/default/data/tlog/tlog.0000000000000017389
993
+ - spec/dummy/solr/default/data/tlog/tlog.0000000000000017390
994
+ - spec/dummy/solr/default/data/tlog/tlog.0000000000000017391
995
+ - spec/dummy/solr/default/data/tlog/tlog.0000000000000017392
996
+ - spec/dummy/solr/default/data/tlog/tlog.0000000000000017393
997
+ - spec/dummy/solr/default/data/tlog/tlog.0000000000000017394
998
+ - spec/dummy/solr/default/data/tlog/tlog.0000000000000017395
999
+ - spec/dummy/solr/default/data/tlog/tlog.0000000000000017396
1000
+ - spec/dummy/solr/default/data/tlog/tlog.0000000000000017397
1036
1001
  - spec/dummy/solr/development/data/index/segments.gen
1037
1002
  - spec/dummy/solr/development/data/index/segments_1
1038
1003
  - spec/dummy/solr/solr.xml
1039
1004
  - spec/dummy/solr/test/data/index/segments.gen
1040
1005
  - spec/dummy/solr/test/data/index/segments_1
1041
- - spec/dummy/tmp/cache/assets/test/sprockets/0007f9aec08cc2727b3d00cd62cf1d0f
1042
- - spec/dummy/tmp/cache/assets/test/sprockets/0440b81b0aae840cf287a686585a8cec
1043
- - spec/dummy/tmp/cache/assets/test/sprockets/0e3e358e4fe4601ba5e435f6d0c86f12
1044
- - spec/dummy/tmp/cache/assets/test/sprockets/129cec5384c0f26fcfb0ce65048298c5
1045
- - spec/dummy/tmp/cache/assets/test/sprockets/1572dfd6f1e555f4be1aa60ddc3cb0c0
1046
- - spec/dummy/tmp/cache/assets/test/sprockets/181c975b1296d7ebe81714d5e64bc098
1047
- - spec/dummy/tmp/cache/assets/test/sprockets/1c1fbab93e4552626da626e0dbe70c74
1048
- - spec/dummy/tmp/cache/assets/test/sprockets/1e58a07a3701da9fb9c176d67162af2b
1049
- - spec/dummy/tmp/cache/assets/test/sprockets/2b35ad8fee7e1228e205669278e2adda
1050
- - spec/dummy/tmp/cache/assets/test/sprockets/2f09f58943a88f21e3a0318621391785
1051
- - spec/dummy/tmp/cache/assets/test/sprockets/2ffe508d0533d0afd2a37bb574eda40d
1052
- - spec/dummy/tmp/cache/assets/test/sprockets/3753d928863ee65118b9f2da1c6e504d
1053
- - spec/dummy/tmp/cache/assets/test/sprockets/40e90f0c329b14292a9ff1a2fe907b39
1054
- - spec/dummy/tmp/cache/assets/test/sprockets/45f3c74e1e31b58d9bda6908d5623290
1055
- - spec/dummy/tmp/cache/assets/test/sprockets/49a3464eb6bcffb3d9f5b47b133edabb
1056
- - spec/dummy/tmp/cache/assets/test/sprockets/49d32c13d390c1b80d8b2705aac86579
1057
- - spec/dummy/tmp/cache/assets/test/sprockets/4aa18096a209e515f5f1df487622cdf4
1058
- - spec/dummy/tmp/cache/assets/test/sprockets/50e64f45f0cb4cee52fd3f3908f89a82
1059
- - spec/dummy/tmp/cache/assets/test/sprockets/51f7d34a9e9bebb47b7201cfebfec34d
1060
- - spec/dummy/tmp/cache/assets/test/sprockets/5995180d1cfd7cad71ec6d9e1a538f0e
1061
- - spec/dummy/tmp/cache/assets/test/sprockets/604e0e4b3c01d488d6fb087e9fdaeb94
1062
- - spec/dummy/tmp/cache/assets/test/sprockets/6401fc09d2b894df2ad251b007df145a
1063
- - spec/dummy/tmp/cache/assets/test/sprockets/65a8d4d288e5f082f0166aa7be7a2464
1064
- - spec/dummy/tmp/cache/assets/test/sprockets/6f5d66df18892df6af39c9cfd784f0f5
1065
- - spec/dummy/tmp/cache/assets/test/sprockets/6fcdd2234a7c25f9d4179ca12fd9f7b4
1066
- - spec/dummy/tmp/cache/assets/test/sprockets/6fdb4513af157010ef79b56df44d665e
1067
- - spec/dummy/tmp/cache/assets/test/sprockets/750439d8043ed022910956fbb55faa65
1068
- - spec/dummy/tmp/cache/assets/test/sprockets/811e5198d0dc4efe02d28c0c2215e207
1069
- - spec/dummy/tmp/cache/assets/test/sprockets/83ea20e0b25e77f5dce5bf733b088292
1070
- - spec/dummy/tmp/cache/assets/test/sprockets/9604073a83f822f13caaabd7e157bbbb
1071
- - spec/dummy/tmp/cache/assets/test/sprockets/98d02556564ee10aef4c3397bb94d5b9
1072
- - spec/dummy/tmp/cache/assets/test/sprockets/9cfe4d48f5258863dbfb3623c797fb15
1073
- - spec/dummy/tmp/cache/assets/test/sprockets/a296264dcc89e1f8ab6382e678ffbe38
1074
- - spec/dummy/tmp/cache/assets/test/sprockets/aa2e1ada35daa496bb08e85fcb817536
1075
- - spec/dummy/tmp/cache/assets/test/sprockets/abee2d4cb18d15789dcdc9c680f3e6de
1076
- - spec/dummy/tmp/cache/assets/test/sprockets/c1ab0ecf3cf57db41d9e4cd9306d8829
1077
- - spec/dummy/tmp/cache/assets/test/sprockets/c4a984c6feb506f3e1f9120a8d029bda
1078
- - spec/dummy/tmp/cache/assets/test/sprockets/ccdcb26ebc6ef3b684368b368edf4f99
1079
- - spec/dummy/tmp/cache/assets/test/sprockets/d34b5413caa9407126db68d5d590804a
1080
- - spec/dummy/tmp/cache/assets/test/sprockets/d4ac74c17332ad931b72f42d7997fcc0
1081
- - spec/dummy/tmp/cache/assets/test/sprockets/dd672deb061233e0db1d2f413d27213f
1082
- - spec/dummy/tmp/cache/assets/test/sprockets/e1fcfb0faa3c12467a1c35251e04c8b1
1083
- - spec/dummy/tmp/cache/assets/test/sprockets/e2d21478696ac96ad895f7c3b8d31594
1084
- - spec/dummy/tmp/cache/assets/test/sprockets/e577e9ce00153ad2e59111f761d0fb15
1085
- - spec/dummy/tmp/cache/assets/test/sprockets/e9738177de2083b68d42e053a1529244
1086
- - spec/dummy/tmp/cache/assets/test/sprockets/e9ce2df3f0160329df69b22a911dbd04
1087
- - spec/dummy/tmp/cache/assets/test/sprockets/f2e83d3b5fe984832bfeff09b0e3b8d2
1088
- - spec/dummy/tmp/cache/assets/test/sprockets/f90eee17e0e5eaea50e6064ded54617c
1089
- - spec/dummy/tmp/cache/assets/test/sprockets/fa8e81ce1d45228121b9df5618542190
1090
- - spec/dummy/tmp/cache/assets/test/sprockets/fbdc1d9347cb228f06807b76c6c2974e
1091
1006
  - spec/dummy/tmp/cache/stdout
1092
1007
  - spec/dummy/tmp/pids/redis-test.pid
1093
1008
  - spec/factories/basket.rb
data/lib/generators/enju_circulation/setup/templates/db/fixtures/carrier_types.yml DELETED
@@ -1,29 +0,0 @@
1
- ---
2
- carrier_type_00004:
3
- name: file
4
- display_name: "en: file\r\n\
5
- ja: コンピュータファイル"
6
- id: 4
7
- note:
8
- position: 4
9
- carrier_type_00001:
10
- name: print
11
- display_name: "en: print\r\n\
12
- ja: 印刷物"
13
- id: 1
14
- note: !binary |
15
- position: 1
16
- carrier_type_00002:
17
- name: CD
18
- display_name: "en: CD\r\n\
19
- ja: CD"
20
- id: 2
21
- note:
22
- position: 2
23
- carrier_type_00003:
24
- name: DVD
25
- display_name: "en: DVD\r\n\
26
- ja: DVD"
27
- id: 3
28
- note:
29
- position: 3