enju_event 0.1.17.pre23 → 0.1.17.pre24

Sign up to get free protection for your applications and to get access to all the features.
Files changed (153) hide show
  1. checksums.yaml +4 -4
  2. data/README.rdoc +8 -1
  3. data/app/controllers/event_categories_controller.rb +7 -2
  4. data/app/controllers/event_export_files_controller.rb +7 -2
  5. data/app/controllers/event_import_files_controller.rb +12 -4
  6. data/app/controllers/event_import_results_controller.rb +7 -0
  7. data/app/controllers/events_controller.rb +9 -3
  8. data/app/controllers/participates_controller.rb +7 -2
  9. data/app/models/event.rb +0 -3
  10. data/app/models/event_category.rb +0 -1
  11. data/app/models/event_export_file.rb +13 -3
  12. data/app/models/event_export_file_transition.rb +1 -1
  13. data/app/models/event_import_file.rb +8 -6
  14. data/app/models/event_import_file_transition.rb +1 -1
  15. data/app/models/event_import_result.rb +0 -1
  16. data/app/models/participate.rb +0 -1
  17. data/app/views/event_export_files/index.html.erb +2 -2
  18. data/app/views/event_export_files/show.html.erb +1 -1
  19. data/app/views/event_import_files/index.html.erb +1 -1
  20. data/app/views/event_import_files/show.html.erb +1 -1
  21. data/db/migrate/20140523171309_create_event_import_file_transitions.rb +5 -1
  22. data/db/migrate/20140812153137_create_event_export_file_transitions.rb +5 -1
  23. data/lib/enju_event/engine.rb +0 -2
  24. data/lib/enju_event/version.rb +1 -1
  25. data/spec/controllers/event_export_files_controller_spec.rb +5 -5
  26. data/spec/controllers/event_import_files_controller_spec.rb +1 -1
  27. data/spec/dummy/app/models/user.rb +0 -1
  28. data/spec/dummy/bin/bundle +3 -0
  29. data/spec/dummy/bin/rails +4 -0
  30. data/spec/dummy/bin/rake +4 -0
  31. data/spec/dummy/bin/setup +29 -0
  32. data/spec/dummy/config/database.yml +23 -18
  33. data/spec/dummy/config/environments/test.rb +1 -1
  34. data/spec/dummy/db/migrate/035_create_reserves.rb +0 -1
  35. data/spec/dummy/db/migrate/133_create_agent_merges.rb +15 -0
  36. data/spec/dummy/db/migrate/134_create_agent_merge_lists.rb +13 -0
  37. data/spec/dummy/db/migrate/20140518050147_create_reserve_transitions.rb +18 -0
  38. data/spec/dummy/db/migrate/20140518111006_create_message_transitions.rb +5 -1
  39. data/spec/dummy/db/migrate/20140518135713_create_message_request_transitions.rb +5 -1
  40. data/spec/dummy/db/migrate/20140519170214_create_resource_import_file_transitions.rb +5 -1
  41. data/spec/dummy/db/migrate/20140519171220_create_import_request_transitions.rb +5 -1
  42. data/spec/dummy/db/migrate/20140524020735_create_agent_import_file_transitions.rb +5 -1
  43. data/spec/dummy/db/migrate/20140524074813_create_user_import_file_transitions.rb +5 -1
  44. data/spec/dummy/db/migrate/20140528045518_create_user_checkout_stat_transitions.rb +5 -1
  45. data/spec/dummy/db/migrate/20140528045539_create_user_reserve_stat_transitions.rb +5 -1
  46. data/spec/dummy/db/migrate/20140528045600_create_manifestation_checkout_stat_transitions.rb +5 -1
  47. data/spec/dummy/db/migrate/20140528045617_create_manifestation_reserve_stat_transitions.rb +5 -1
  48. data/spec/dummy/db/migrate/20140614141500_create_resource_export_file_transitions.rb +5 -1
  49. data/spec/dummy/db/migrate/20140709113905_create_user_export_file_transitions.rb +5 -1
  50. data/spec/dummy/db/migrate/{20140810061942_add_user_id_to_stat.rb → 20140810061942_add_user_id_to_user_checkout_stat.rb} +1 -1
  51. data/spec/dummy/db/migrate/20141003181336_add_full_name_transcription_to_profile.rb +5 -0
  52. data/spec/dummy/db/migrate/20141003182825_add_date_of_birth_to_profile.rb +5 -0
  53. data/spec/dummy/db/migrate/20141014065831_add_shelf_id_to_checkout.rb +6 -0
  54. data/spec/dummy/db/schema.rb +645 -615
  55. data/spec/fixtures/events.yml +20 -45
  56. data/spec/fixtures/users.yml +1 -1
  57. data/spec/spec_helper.rb +2 -0
  58. metadata +57 -212
  59. data/app/controllers/calendar_controller.rb +0 -35
  60. data/spec/dummy/db/development.sqlite3 +0 -0
  61. data/spec/dummy/db/migrate/20130303104849_add_state_index_to_reserve.rb +0 -5
  62. data/spec/dummy/db/test.sqlite3 +0 -0
  63. data/spec/dummy/private/system/event_import_files/event_imports/000/000/004/original/event_destroy_file.tsv +0 -4
  64. data/spec/dummy/private/system/event_import_files/event_imports/000/000/004/original/event_import51.txt +0 -3
  65. data/spec/dummy/private/system/event_import_files/event_imports/000/000/004/original/event_import_file_sample1.tsv +0 -7
  66. data/spec/dummy/private/system/event_import_files/event_imports/000/000/004/original/event_import_file_sample2.tsv +0 -7
  67. data/spec/dummy/private/system/event_import_files/event_imports/000/000/004/original/event_update_file.tsv +0 -4
  68. data/spec/dummy/private/system/event_import_files/event_imports/000/000/004/original/invalid_file.tsv +0 -3
  69. data/spec/dummy/public/system/event_export_files/event_exports/000/000/004/original/event_export_file_20140818-66894-1um2gwb.txt +0 -9
  70. data/spec/dummy/public/system/event_export_files/event_exports/000/000/004/original/event_export_file_20140818-67059-j0f46.txt +0 -9
  71. data/spec/dummy/public/system/event_export_files/event_exports/000/000/004/original/event_export_file_20140915-67461-178vmkf.txt +0 -9
  72. data/spec/dummy/public/system/event_export_files/event_exports/000/000/004/original/event_export_file_20140916-27270-1dm2llo.txt +0 -9
  73. data/spec/dummy/public/system/event_export_files/event_exports/000/000/004/original/event_export_file_20140921-56213-1l5hypx.txt +0 -9
  74. data/spec/dummy/public/system/event_export_files/event_exports/000/000/004/original/event_export_file_20140921-58265-o3c737.txt +0 -9
  75. data/spec/dummy/public/system/event_export_files/event_exports/000/000/004/original/event_export_file_20140921-58363-1tipiu.txt +0 -9
  76. data/spec/dummy/public/system/event_export_files/event_exports/000/000/004/original/event_export_file_20140921-58460-38jub0.txt +0 -9
  77. data/spec/dummy/public/system/event_export_files/event_exports/000/000/004/original/event_export_file_20140921-58528-ca3k3q.txt +0 -9
  78. data/spec/dummy/public/system/event_export_files/event_exports/000/000/004/original/event_export_file_20140921-58630-1m4isxz.txt +0 -9
  79. data/spec/dummy/public/system/event_export_files/event_exports/000/000/004/original/event_export_file_20140921-58934-19ikk0v.txt +0 -9
  80. data/spec/dummy/public/system/event_export_files/event_exports/000/000/004/original/event_export_file_20140921-59012-10in1j8.txt +0 -9
  81. data/spec/dummy/public/system/event_export_files/event_exports/000/000/004/original/event_export_file_20140921-59315-15pzw3y.txt +0 -9
  82. data/spec/dummy/public/system/event_export_files/event_exports/000/000/004/original/event_export_file_20140922-86319-oo60ty.txt +0 -9
  83. data/spec/dummy/public/system/event_export_files/event_exports/000/000/004/original/event_export_file_20140927-1698-10wfq6m.txt +0 -9
  84. data/spec/dummy/public/system/event_export_files/event_exports/000/000/004/original/event_export_file_20141003-88157-4ti9t5.txt +0 -9
  85. data/spec/dummy/script/rails +0 -6
  86. data/spec/dummy/solr/conf/admin-extra.html +0 -31
  87. data/spec/dummy/solr/conf/elevate.xml +0 -36
  88. data/spec/dummy/solr/conf/mapping-ISOLatin1Accent.txt +0 -246
  89. data/spec/dummy/solr/conf/protwords.txt +0 -21
  90. data/spec/dummy/solr/conf/schema.xml +0 -255
  91. data/spec/dummy/solr/conf/scripts.conf +0 -24
  92. data/spec/dummy/solr/conf/solrconfig.xml +0 -667
  93. data/spec/dummy/solr/conf/spellings.txt +0 -2
  94. data/spec/dummy/solr/conf/stopwords.txt +0 -58
  95. data/spec/dummy/solr/conf/synonyms.txt +0 -31
  96. data/spec/dummy/solr/default/data/index/_1pd.fdt +0 -0
  97. data/spec/dummy/solr/default/data/index/_1pd.fdx +0 -0
  98. data/spec/dummy/solr/default/data/index/_1pd.fnm +0 -0
  99. data/spec/dummy/solr/default/data/index/_1pd.nvd +0 -0
  100. data/spec/dummy/solr/default/data/index/_1pd.nvm +0 -0
  101. data/spec/dummy/solr/default/data/index/_1pd.si +0 -0
  102. data/spec/dummy/solr/default/data/index/_1pd_Lucene41_0.doc +0 -0
  103. data/spec/dummy/solr/default/data/index/_1pd_Lucene41_0.pos +0 -0
  104. data/spec/dummy/solr/default/data/index/_1pd_Lucene41_0.tim +0 -0
  105. data/spec/dummy/solr/default/data/index/_1pd_Lucene41_0.tip +0 -0
  106. data/spec/dummy/solr/default/data/index/_1pe.fdt +0 -0
  107. data/spec/dummy/solr/default/data/index/_1pe.fdx +0 -0
  108. data/spec/dummy/solr/default/data/index/_1pe.fnm +0 -0
  109. data/spec/dummy/solr/default/data/index/_1pe.nvd +0 -0
  110. data/spec/dummy/solr/default/data/index/_1pe.nvm +0 -0
  111. data/spec/dummy/solr/default/data/index/_1pe.si +0 -0
  112. data/spec/dummy/solr/default/data/index/_1pe_Lucene41_0.doc +0 -0
  113. data/spec/dummy/solr/default/data/index/_1pe_Lucene41_0.pos +0 -0
  114. data/spec/dummy/solr/default/data/index/_1pe_Lucene41_0.tim +0 -0
  115. data/spec/dummy/solr/default/data/index/_1pe_Lucene41_0.tip +0 -0
  116. data/spec/dummy/solr/default/data/index/segments.gen +0 -0
  117. data/spec/dummy/solr/default/data/index/segments_2g6 +0 -0
  118. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000003163 +0 -0
  119. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000003164 +0 -0
  120. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000003165 +0 -0
  121. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000003166 +0 -0
  122. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000003167 +0 -0
  123. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000003168 +0 -0
  124. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000003169 +0 -0
  125. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000003170 +0 -0
  126. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000003171 +0 -0
  127. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000003172 +0 -0
  128. data/spec/dummy/solr/development/data/index/segments.gen +0 -0
  129. data/spec/dummy/solr/development/data/index/segments_1 +0 -0
  130. data/spec/dummy/solr/solr.xml +0 -8
  131. data/spec/dummy/solr/test/data/index/_a.fdt +0 -0
  132. data/spec/dummy/solr/test/data/index/_a.fdx +0 -0
  133. data/spec/dummy/solr/test/data/index/_a.fnm +0 -0
  134. data/spec/dummy/solr/test/data/index/_a.nvd +0 -0
  135. data/spec/dummy/solr/test/data/index/_a.nvm +0 -0
  136. data/spec/dummy/solr/test/data/index/_a.si +0 -0
  137. data/spec/dummy/solr/test/data/index/_a_Lucene41_0.doc +0 -0
  138. data/spec/dummy/solr/test/data/index/_a_Lucene41_0.pos +0 -0
  139. data/spec/dummy/solr/test/data/index/_a_Lucene41_0.tim +0 -0
  140. data/spec/dummy/solr/test/data/index/_a_Lucene41_0.tip +0 -0
  141. data/spec/dummy/solr/test/data/index/segments.gen +0 -0
  142. data/spec/dummy/solr/test/data/index/segments_n +0 -0
  143. data/spec/dummy/solr/test/data/tlog/tlog.0000000000000000013 +0 -0
  144. data/spec/dummy/solr/test/data/tlog/tlog.0000000000000000014 +0 -0
  145. data/spec/dummy/solr/test/data/tlog/tlog.0000000000000000015 +0 -0
  146. data/spec/dummy/solr/test/data/tlog/tlog.0000000000000000016 +0 -0
  147. data/spec/dummy/solr/test/data/tlog/tlog.0000000000000000017 +0 -0
  148. data/spec/dummy/solr/test/data/tlog/tlog.0000000000000000018 +0 -0
  149. data/spec/dummy/solr/test/data/tlog/tlog.0000000000000000019 +0 -0
  150. data/spec/dummy/solr/test/data/tlog/tlog.0000000000000000020 +0 -0
  151. data/spec/dummy/solr/test/data/tlog/tlog.0000000000000000021 +0 -0
  152. data/spec/dummy/tmp/cache/stdout +0 -479
  153. data/spec/dummy/tmp/pids/redis-test.pid +0 -1
@@ -3,48 +3,32 @@ event_00001:
3
3
  updated_at: 2008-01-13 02:54:43.764011 +09:00
4
4
  event_category_id: 1
5
5
  end_at: 2008-01-14 02:54:00 +09:00
6
- name: !binary |
7
- 5LuV5LqL5aeL44KB
8
-
9
- display_name: !binary |
10
- 5LuV5LqL5aeL44KB
11
-
6
+ name: 仕事始め
7
+ display_name: 仕事始め
12
8
  deleted_at:
13
9
  start_at: 2008-01-13 02:54:00 +09:00
14
10
  id: 1
15
- note: !binary |
16
- 44Gq44KT44Go44GL44GL44KT44Go44GL
17
-
11
+ note: なんとかかんとか
18
12
  library_id: 2
19
13
  created_at: 2008-01-01 16:20:54.372729 +09:00
20
14
  event_00002:
21
15
  updated_at: 2008-01-13 02:54:21.134175 +09:00
22
16
  event_category_id: 2
23
17
  end_at: 2008-01-14 02:54:00 +09:00
24
- name: !binary |
25
- 44OG44K544OI
26
-
27
- display_name: !binary |
28
- 44OG44K544OI
29
-
18
+ name: テスト
19
+ display_name: テスト
30
20
  deleted_at:
31
21
  start_at: 2008-01-13 02:54:00 +09:00
32
22
  id: 2
33
- note: !binary |
34
- 44OG44K544OI55So44Gu44Kk44OZ44Oz44OI44Gn44GZ44CC
35
-
23
+ note: テスト用のイベントです。
36
24
  library_id: 2
37
25
  created_at: 2008-01-01 20:54:25.803201 +09:00
38
26
  event_00003:
39
27
  updated_at: 2008-02-05 20:00:35.319131 +09:00
40
28
  event_category_id: 1
41
29
  end_at: 2008-02-05 00:00:00 +09:00
42
- name: !binary |
43
- 44Of44O844OG44Kj44Oz44Kw
44
-
45
- display_name: !binary |
46
- 44Of44O844OG44Kj44Oz44Kw
47
-
30
+ name: ミーティング
31
+ display_name: ミーティング
48
32
  deleted_at:
49
33
  start_at: 2008-01-13 00:00:00 +09:00
50
34
  id: 3
@@ -55,18 +39,12 @@ event_00004:
55
39
  updated_at: 2008-02-05 15:43:42.617670 +09:00
56
40
  event_category_id: 4
57
41
  end_at: 2008-02-06 00:00:00 +09:00
58
- name: !binary |
59
- 44OG44K544OI
60
-
61
- display_name: !binary |
62
- 44OG44K544OI
63
-
42
+ name: テスト
43
+ display_name: テスト
64
44
  deleted_at:
65
45
  start_at: 2008-02-05 00:00:00 +09:00
66
46
  id: 4
67
- note: !binary |
68
- 44Gq44KT44Go44GL44GL44KT44Go44GL
69
-
47
+ note: なんとかかんとか
70
48
  library_id: 3
71
49
  created_at: 2008-02-05 15:43:42.617670 +09:00
72
50
  event_00005:
@@ -85,12 +63,8 @@ event_00006:
85
63
  updated_at: 2008-02-05 23:52:06.315285 +09:00
86
64
  event_category_id: 2
87
65
  end_at: 2008-02-08 00:00:00 +09:00
88
- name: !binary |
89
- 44Gq44KT44Go44GL44GL44KT44Go44GL
90
-
91
- display_name: !binary |
92
- 44Gq44KT44Go44GL44GL44KT44Go44GL
93
-
66
+ name: なんとかかんとか
67
+ display_name: なんとかかんとか
94
68
  deleted_at:
95
69
  start_at: 2008-02-05 00:00:00 +09:00
96
70
  id: 6
@@ -126,16 +100,17 @@ event_00008:
126
100
  #
127
101
  # Table name: events
128
102
  #
129
- # id :integer not null, primary key
130
- # library_id :integer not null
131
- # event_category_id :integer not null
103
+ # id :integer not null, primary key
104
+ # library_id :integer default(1), not null
105
+ # event_category_id :integer default(1), not null
132
106
  # name :string(255)
133
107
  # note :text
134
108
  # start_at :datetime
135
109
  # end_at :datetime
136
- # all_day :boolean default(FALSE), not null
110
+ # all_day :boolean default(FALSE), not null
137
111
  # deleted_at :datetime
112
+ # created_at :datetime
113
+ # updated_at :datetime
138
114
  # display_name :text
139
- # created_at :datetime not null
140
- # updated_at :datetime not null
141
115
  #
116
+
@@ -48,4 +48,4 @@ user4:
48
48
  username: user4
49
49
  email: user4@kamata.lib.teu.ac.jp
50
50
  created_at: 2007-11-19 16:58:34.637413 +09:00
51
- locked_at: <%= 1.day.ago %>
51
+ locked_at: <%= 1.day.ago.to_s(:db) %>
data/spec/spec_helper.rb CHANGED
@@ -1,5 +1,7 @@
1
1
  require 'simplecov'
2
+ require 'coveralls'
2
3
  SimpleCov.start 'rails'
4
+ Coveralls.wear!
3
5
 
4
6
  # This file is copied to spec/ when you run 'rails generate rspec:install'
5
7
  ENV["RAILS_ENV"] ||= 'test'
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: enju_event
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.17.pre23
4
+ version: 0.1.17.pre24
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-10-07 00:00:00.000000000 Z
11
+ date: 2015-02-12 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: enju_message
@@ -16,30 +16,30 @@ dependencies:
16
16
  requirements:
17
17
  - - "~>"
18
18
  - !ruby/object:Gem::Version
19
- version: 0.1.14.pre18
19
+ version: 0.1.14.pre22
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.14.pre18
26
+ version: 0.1.14.pre22
27
27
  - !ruby/object:Gem::Dependency
28
- name: enju_seed
28
+ name: simple_form
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
- - - "~>"
31
+ - - ">="
32
32
  - !ruby/object:Gem::Version
33
- version: 0.1.1.pre11
33
+ version: '0'
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.1.pre11
40
+ version: '0'
41
41
  - !ruby/object:Gem::Dependency
42
- name: simple_form
42
+ name: paperclip
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
45
  - - ">="
@@ -53,7 +53,7 @@ dependencies:
53
53
  - !ruby/object:Gem::Version
54
54
  version: '0'
55
55
  - !ruby/object:Gem::Dependency
56
- name: paperclip
56
+ name: statesman
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
59
  - - ">="
@@ -67,7 +67,7 @@ dependencies:
67
67
  - !ruby/object:Gem::Version
68
68
  version: '0'
69
69
  - !ruby/object:Gem::Dependency
70
- name: statesman
70
+ name: ri_cal
71
71
  requirement: !ruby/object:Gem::Requirement
72
72
  requirements:
73
73
  - - ">="
@@ -81,7 +81,7 @@ dependencies:
81
81
  - !ruby/object:Gem::Version
82
82
  version: '0'
83
83
  - !ruby/object:Gem::Dependency
84
- name: ri_cal
84
+ name: rails_autolink
85
85
  requirement: !ruby/object:Gem::Requirement
86
86
  requirements:
87
87
  - - ">="
@@ -95,13 +95,13 @@ dependencies:
95
95
  - !ruby/object:Gem::Version
96
96
  version: '0'
97
97
  - !ruby/object:Gem::Dependency
98
- name: rails_autolink
98
+ name: sqlite3
99
99
  requirement: !ruby/object:Gem::Requirement
100
100
  requirements:
101
101
  - - ">="
102
102
  - !ruby/object:Gem::Version
103
103
  version: '0'
104
- type: :runtime
104
+ type: :development
105
105
  prerelease: false
106
106
  version_requirements: !ruby/object:Gem::Requirement
107
107
  requirements:
@@ -109,7 +109,21 @@ dependencies:
109
109
  - !ruby/object:Gem::Version
110
110
  version: '0'
111
111
  - !ruby/object:Gem::Dependency
112
- name: sqlite3
112
+ name: mysql2
113
+ requirement: !ruby/object:Gem::Requirement
114
+ requirements:
115
+ - - ">="
116
+ - !ruby/object:Gem::Version
117
+ version: '0'
118
+ type: :development
119
+ prerelease: false
120
+ version_requirements: !ruby/object:Gem::Requirement
121
+ requirements:
122
+ - - ">="
123
+ - !ruby/object:Gem::Version
124
+ version: '0'
125
+ - !ruby/object:Gem::Dependency
126
+ name: pg
113
127
  requirement: !ruby/object:Gem::Requirement
114
128
  requirements:
115
129
  - - ">="
@@ -128,14 +142,14 @@ dependencies:
128
142
  requirements:
129
143
  - - "~>"
130
144
  - !ruby/object:Gem::Version
131
- version: '3.1'
145
+ version: '3.2'
132
146
  type: :development
133
147
  prerelease: false
134
148
  version_requirements: !ruby/object:Gem::Requirement
135
149
  requirements:
136
150
  - - "~>"
137
151
  - !ruby/object:Gem::Version
138
- version: '3.1'
152
+ version: '3.2'
139
153
  - !ruby/object:Gem::Dependency
140
154
  name: factory_girl_rails
141
155
  requirement: !ruby/object:Gem::Requirement
@@ -156,14 +170,14 @@ dependencies:
156
170
  requirements:
157
171
  - - "~>"
158
172
  - !ruby/object:Gem::Version
159
- version: 1.1.0.rc15
173
+ version: 1.1.0.rc17
160
174
  type: :development
161
175
  prerelease: false
162
176
  version_requirements: !ruby/object:Gem::Requirement
163
177
  requirements:
164
178
  - - "~>"
165
179
  - !ruby/object:Gem::Version
166
- version: 1.1.0.rc15
180
+ version: 1.1.0.rc17
167
181
  - !ruby/object:Gem::Dependency
168
182
  name: sunspot_solr
169
183
  requirement: !ruby/object:Gem::Requirement
@@ -252,7 +266,6 @@ files:
252
266
  - app/assets/javascripts/enju_event/moment.min.js
253
267
  - app/assets/stylesheets/enju_event/application.css
254
268
  - app/assets/stylesheets/enju_event/fullcalendar.css
255
- - app/controllers/calendar_controller.rb
256
269
  - app/controllers/event_categories_controller.rb
257
270
  - app/controllers/event_export_files_controller.rb
258
271
  - app/controllers/event_import_files_controller.rb
@@ -350,6 +363,10 @@ files:
350
363
  - spec/dummy/app/models/setting.rb
351
364
  - spec/dummy/app/models/user.rb
352
365
  - spec/dummy/app/views/layouts/application.html.erb
366
+ - spec/dummy/bin/bundle
367
+ - spec/dummy/bin/rails
368
+ - spec/dummy/bin/rake
369
+ - spec/dummy/bin/setup
353
370
  - spec/dummy/config.ru
354
371
  - spec/dummy/config/application.rb
355
372
  - spec/dummy/config/application.yml
@@ -369,7 +386,6 @@ files:
369
386
  - spec/dummy/config/initializers/wrap_parameters.rb
370
387
  - spec/dummy/config/locales/en.yml
371
388
  - spec/dummy/config/routes.rb
372
- - spec/dummy/db/development.sqlite3
373
389
  - spec/dummy/db/migrate/001_create_agents.rb
374
390
  - spec/dummy/db/migrate/002_devise_create_users.rb
375
391
  - spec/dummy/db/migrate/005_create_manifestations.rb
@@ -397,6 +413,8 @@ files:
397
413
  - spec/dummy/db/migrate/130_create_request_status_types.rb
398
414
  - spec/dummy/db/migrate/131_create_request_types.rb
399
415
  - spec/dummy/db/migrate/132_create_circulation_statuses.rb
416
+ - spec/dummy/db/migrate/133_create_agent_merges.rb
417
+ - spec/dummy/db/migrate/134_create_agent_merge_lists.rb
400
418
  - spec/dummy/db/migrate/149_create_message_templates.rb
401
419
  - spec/dummy/db/migrate/154_create_messages.rb
402
420
  - spec/dummy/db/migrate/20080819181903_create_message_requests.rb
@@ -492,7 +510,6 @@ files:
492
510
  - spec/dummy/db/migrate/20121116031206_add_fulltext_content_to_manifestation.rb
493
511
  - spec/dummy/db/migrate/20121116033446_add_doi_to_manifestation.rb
494
512
  - spec/dummy/db/migrate/20130221154434_add_additional_attributes_to_user.rb
495
- - spec/dummy/db/migrate/20130303104849_add_state_index_to_reserve.rb
496
513
  - spec/dummy/db/migrate/20130303124821_add_retained_at_to_reserve.rb
497
514
  - spec/dummy/db/migrate/20130304015019_add_postponed_at_to_reserve.rb
498
515
  - spec/dummy/db/migrate/20130412083556_add_latitude_and_longitude_to_library.rb
@@ -509,6 +526,7 @@ files:
509
526
  - spec/dummy/db/migrate/20140110122216_create_user_import_files.rb
510
527
  - spec/dummy/db/migrate/20140110131010_create_user_import_results.rb
511
528
  - spec/dummy/db/migrate/20140122054321_create_profiles.rb
529
+ - spec/dummy/db/migrate/20140518050147_create_reserve_transitions.rb
512
530
  - spec/dummy/db/migrate/20140518111006_create_message_transitions.rb
513
531
  - spec/dummy/db/migrate/20140518135713_create_message_request_transitions.rb
514
532
  - spec/dummy/db/migrate/20140519170214_create_resource_import_file_transitions.rb
@@ -532,7 +550,7 @@ files:
532
550
  - spec/dummy/db/migrate/20140720170735_add_default_user_group_id_to_user_import_file.rb
533
551
  - spec/dummy/db/migrate/20140721151416_add_default_shelf_id_to_resource_import_file.rb
534
552
  - spec/dummy/db/migrate/20140802082007_add_manifestation_id_to_item.rb
535
- - spec/dummy/db/migrate/20140810061942_add_user_id_to_stat.rb
553
+ - spec/dummy/db/migrate/20140810061942_add_user_id_to_user_checkout_stat.rb
536
554
  - spec/dummy/db/migrate/20140810091231_add_checkout_icalendar_token_to_profile.rb
537
555
  - spec/dummy/db/migrate/20140810091417_add_save_checkout_history_to_profile.rb
538
556
  - spec/dummy/db/migrate/20140811031145_add_expired_at_to_profile.rb
@@ -541,103 +559,14 @@ files:
541
559
  - spec/dummy/db/migrate/20140823083524_add_extent_to_manifestation.rb
542
560
  - spec/dummy/db/migrate/20140823094847_add_dimensions_to_manifestation.rb
543
561
  - spec/dummy/db/migrate/20140823095740_rename_manifestation_periodical_to_serial.rb
562
+ - spec/dummy/db/migrate/20141003181336_add_full_name_transcription_to_profile.rb
563
+ - spec/dummy/db/migrate/20141003182825_add_date_of_birth_to_profile.rb
564
+ - spec/dummy/db/migrate/20141014065831_add_shelf_id_to_checkout.rb
544
565
  - spec/dummy/db/schema.rb
545
- - spec/dummy/db/test.sqlite3
546
- - spec/dummy/private/system/event_import_files/event_imports/000/000/004/original/event_destroy_file.tsv
547
- - spec/dummy/private/system/event_import_files/event_imports/000/000/004/original/event_import51.txt
548
- - spec/dummy/private/system/event_import_files/event_imports/000/000/004/original/event_import_file_sample1.tsv
549
- - spec/dummy/private/system/event_import_files/event_imports/000/000/004/original/event_import_file_sample2.tsv
550
- - spec/dummy/private/system/event_import_files/event_imports/000/000/004/original/event_update_file.tsv
551
- - spec/dummy/private/system/event_import_files/event_imports/000/000/004/original/invalid_file.tsv
552
566
  - spec/dummy/public/404.html
553
567
  - spec/dummy/public/422.html
554
568
  - spec/dummy/public/500.html
555
569
  - spec/dummy/public/favicon.ico
556
- - spec/dummy/public/system/event_export_files/event_exports/000/000/004/original/event_export_file_20140818-66894-1um2gwb.txt
557
- - spec/dummy/public/system/event_export_files/event_exports/000/000/004/original/event_export_file_20140818-67059-j0f46.txt
558
- - spec/dummy/public/system/event_export_files/event_exports/000/000/004/original/event_export_file_20140915-67461-178vmkf.txt
559
- - spec/dummy/public/system/event_export_files/event_exports/000/000/004/original/event_export_file_20140916-27270-1dm2llo.txt
560
- - spec/dummy/public/system/event_export_files/event_exports/000/000/004/original/event_export_file_20140921-56213-1l5hypx.txt
561
- - spec/dummy/public/system/event_export_files/event_exports/000/000/004/original/event_export_file_20140921-58265-o3c737.txt
562
- - spec/dummy/public/system/event_export_files/event_exports/000/000/004/original/event_export_file_20140921-58363-1tipiu.txt
563
- - spec/dummy/public/system/event_export_files/event_exports/000/000/004/original/event_export_file_20140921-58460-38jub0.txt
564
- - spec/dummy/public/system/event_export_files/event_exports/000/000/004/original/event_export_file_20140921-58528-ca3k3q.txt
565
- - spec/dummy/public/system/event_export_files/event_exports/000/000/004/original/event_export_file_20140921-58630-1m4isxz.txt
566
- - spec/dummy/public/system/event_export_files/event_exports/000/000/004/original/event_export_file_20140921-58934-19ikk0v.txt
567
- - spec/dummy/public/system/event_export_files/event_exports/000/000/004/original/event_export_file_20140921-59012-10in1j8.txt
568
- - spec/dummy/public/system/event_export_files/event_exports/000/000/004/original/event_export_file_20140921-59315-15pzw3y.txt
569
- - spec/dummy/public/system/event_export_files/event_exports/000/000/004/original/event_export_file_20140922-86319-oo60ty.txt
570
- - spec/dummy/public/system/event_export_files/event_exports/000/000/004/original/event_export_file_20140927-1698-10wfq6m.txt
571
- - spec/dummy/public/system/event_export_files/event_exports/000/000/004/original/event_export_file_20141003-88157-4ti9t5.txt
572
- - spec/dummy/script/rails
573
- - spec/dummy/solr/conf/admin-extra.html
574
- - spec/dummy/solr/conf/elevate.xml
575
- - spec/dummy/solr/conf/mapping-ISOLatin1Accent.txt
576
- - spec/dummy/solr/conf/protwords.txt
577
- - spec/dummy/solr/conf/schema.xml
578
- - spec/dummy/solr/conf/scripts.conf
579
- - spec/dummy/solr/conf/solrconfig.xml
580
- - spec/dummy/solr/conf/spellings.txt
581
- - spec/dummy/solr/conf/stopwords.txt
582
- - spec/dummy/solr/conf/synonyms.txt
583
- - spec/dummy/solr/default/data/index/_1pd.fdt
584
- - spec/dummy/solr/default/data/index/_1pd.fdx
585
- - spec/dummy/solr/default/data/index/_1pd.fnm
586
- - spec/dummy/solr/default/data/index/_1pd.nvd
587
- - spec/dummy/solr/default/data/index/_1pd.nvm
588
- - spec/dummy/solr/default/data/index/_1pd.si
589
- - spec/dummy/solr/default/data/index/_1pd_Lucene41_0.doc
590
- - spec/dummy/solr/default/data/index/_1pd_Lucene41_0.pos
591
- - spec/dummy/solr/default/data/index/_1pd_Lucene41_0.tim
592
- - spec/dummy/solr/default/data/index/_1pd_Lucene41_0.tip
593
- - spec/dummy/solr/default/data/index/_1pe.fdt
594
- - spec/dummy/solr/default/data/index/_1pe.fdx
595
- - spec/dummy/solr/default/data/index/_1pe.fnm
596
- - spec/dummy/solr/default/data/index/_1pe.nvd
597
- - spec/dummy/solr/default/data/index/_1pe.nvm
598
- - spec/dummy/solr/default/data/index/_1pe.si
599
- - spec/dummy/solr/default/data/index/_1pe_Lucene41_0.doc
600
- - spec/dummy/solr/default/data/index/_1pe_Lucene41_0.pos
601
- - spec/dummy/solr/default/data/index/_1pe_Lucene41_0.tim
602
- - spec/dummy/solr/default/data/index/_1pe_Lucene41_0.tip
603
- - spec/dummy/solr/default/data/index/segments.gen
604
- - spec/dummy/solr/default/data/index/segments_2g6
605
- - spec/dummy/solr/default/data/tlog/tlog.0000000000000003163
606
- - spec/dummy/solr/default/data/tlog/tlog.0000000000000003164
607
- - spec/dummy/solr/default/data/tlog/tlog.0000000000000003165
608
- - spec/dummy/solr/default/data/tlog/tlog.0000000000000003166
609
- - spec/dummy/solr/default/data/tlog/tlog.0000000000000003167
610
- - spec/dummy/solr/default/data/tlog/tlog.0000000000000003168
611
- - spec/dummy/solr/default/data/tlog/tlog.0000000000000003169
612
- - spec/dummy/solr/default/data/tlog/tlog.0000000000000003170
613
- - spec/dummy/solr/default/data/tlog/tlog.0000000000000003171
614
- - spec/dummy/solr/default/data/tlog/tlog.0000000000000003172
615
- - spec/dummy/solr/development/data/index/segments.gen
616
- - spec/dummy/solr/development/data/index/segments_1
617
- - spec/dummy/solr/solr.xml
618
- - spec/dummy/solr/test/data/index/_a.fdt
619
- - spec/dummy/solr/test/data/index/_a.fdx
620
- - spec/dummy/solr/test/data/index/_a.fnm
621
- - spec/dummy/solr/test/data/index/_a.nvd
622
- - spec/dummy/solr/test/data/index/_a.nvm
623
- - spec/dummy/solr/test/data/index/_a.si
624
- - spec/dummy/solr/test/data/index/_a_Lucene41_0.doc
625
- - spec/dummy/solr/test/data/index/_a_Lucene41_0.pos
626
- - spec/dummy/solr/test/data/index/_a_Lucene41_0.tim
627
- - spec/dummy/solr/test/data/index/_a_Lucene41_0.tip
628
- - spec/dummy/solr/test/data/index/segments.gen
629
- - spec/dummy/solr/test/data/index/segments_n
630
- - spec/dummy/solr/test/data/tlog/tlog.0000000000000000013
631
- - spec/dummy/solr/test/data/tlog/tlog.0000000000000000014
632
- - spec/dummy/solr/test/data/tlog/tlog.0000000000000000015
633
- - spec/dummy/solr/test/data/tlog/tlog.0000000000000000016
634
- - spec/dummy/solr/test/data/tlog/tlog.0000000000000000017
635
- - spec/dummy/solr/test/data/tlog/tlog.0000000000000000018
636
- - spec/dummy/solr/test/data/tlog/tlog.0000000000000000019
637
- - spec/dummy/solr/test/data/tlog/tlog.0000000000000000020
638
- - spec/dummy/solr/test/data/tlog/tlog.0000000000000000021
639
- - spec/dummy/tmp/cache/stdout
640
- - spec/dummy/tmp/pids/redis-test.pid
641
570
  - spec/factories/agent.rb
642
571
  - spec/factories/country.rb
643
572
  - spec/factories/event.rb
@@ -698,7 +627,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
698
627
  version: 1.3.1
699
628
  requirements: []
700
629
  rubyforge_project:
701
- rubygems_version: 2.2.2
630
+ rubygems_version: 2.4.5
702
631
  signing_key:
703
632
  specification_version: 4
704
633
  summary: enju_event plugin
@@ -717,6 +646,10 @@ test_files:
717
646
  - spec/dummy/app/models/setting.rb
718
647
  - spec/dummy/app/models/user.rb
719
648
  - spec/dummy/app/views/layouts/application.html.erb
649
+ - spec/dummy/bin/bundle
650
+ - spec/dummy/bin/rails
651
+ - spec/dummy/bin/rake
652
+ - spec/dummy/bin/setup
720
653
  - spec/dummy/config/application.rb
721
654
  - spec/dummy/config/application.yml
722
655
  - spec/dummy/config/boot.rb
@@ -736,7 +669,6 @@ test_files:
736
669
  - spec/dummy/config/locales/en.yml
737
670
  - spec/dummy/config/routes.rb
738
671
  - spec/dummy/config.ru
739
- - spec/dummy/db/development.sqlite3
740
672
  - spec/dummy/db/migrate/001_create_agents.rb
741
673
  - spec/dummy/db/migrate/002_devise_create_users.rb
742
674
  - spec/dummy/db/migrate/005_create_manifestations.rb
@@ -764,6 +696,8 @@ test_files:
764
696
  - spec/dummy/db/migrate/130_create_request_status_types.rb
765
697
  - spec/dummy/db/migrate/131_create_request_types.rb
766
698
  - spec/dummy/db/migrate/132_create_circulation_statuses.rb
699
+ - spec/dummy/db/migrate/133_create_agent_merges.rb
700
+ - spec/dummy/db/migrate/134_create_agent_merge_lists.rb
767
701
  - spec/dummy/db/migrate/149_create_message_templates.rb
768
702
  - spec/dummy/db/migrate/154_create_messages.rb
769
703
  - spec/dummy/db/migrate/20080819181903_create_message_requests.rb
@@ -859,7 +793,6 @@ test_files:
859
793
  - spec/dummy/db/migrate/20121116031206_add_fulltext_content_to_manifestation.rb
860
794
  - spec/dummy/db/migrate/20121116033446_add_doi_to_manifestation.rb
861
795
  - spec/dummy/db/migrate/20130221154434_add_additional_attributes_to_user.rb
862
- - spec/dummy/db/migrate/20130303104849_add_state_index_to_reserve.rb
863
796
  - spec/dummy/db/migrate/20130303124821_add_retained_at_to_reserve.rb
864
797
  - spec/dummy/db/migrate/20130304015019_add_postponed_at_to_reserve.rb
865
798
  - spec/dummy/db/migrate/20130412083556_add_latitude_and_longitude_to_library.rb
@@ -876,6 +809,7 @@ test_files:
876
809
  - spec/dummy/db/migrate/20140110122216_create_user_import_files.rb
877
810
  - spec/dummy/db/migrate/20140110131010_create_user_import_results.rb
878
811
  - spec/dummy/db/migrate/20140122054321_create_profiles.rb
812
+ - spec/dummy/db/migrate/20140518050147_create_reserve_transitions.rb
879
813
  - spec/dummy/db/migrate/20140518111006_create_message_transitions.rb
880
814
  - spec/dummy/db/migrate/20140518135713_create_message_request_transitions.rb
881
815
  - spec/dummy/db/migrate/20140519170214_create_resource_import_file_transitions.rb
@@ -899,7 +833,7 @@ test_files:
899
833
  - spec/dummy/db/migrate/20140720170735_add_default_user_group_id_to_user_import_file.rb
900
834
  - spec/dummy/db/migrate/20140721151416_add_default_shelf_id_to_resource_import_file.rb
901
835
  - spec/dummy/db/migrate/20140802082007_add_manifestation_id_to_item.rb
902
- - spec/dummy/db/migrate/20140810061942_add_user_id_to_stat.rb
836
+ - spec/dummy/db/migrate/20140810061942_add_user_id_to_user_checkout_stat.rb
903
837
  - spec/dummy/db/migrate/20140810091231_add_checkout_icalendar_token_to_profile.rb
904
838
  - spec/dummy/db/migrate/20140810091417_add_save_checkout_history_to_profile.rb
905
839
  - spec/dummy/db/migrate/20140811031145_add_expired_at_to_profile.rb
@@ -908,104 +842,15 @@ test_files:
908
842
  - spec/dummy/db/migrate/20140823083524_add_extent_to_manifestation.rb
909
843
  - spec/dummy/db/migrate/20140823094847_add_dimensions_to_manifestation.rb
910
844
  - spec/dummy/db/migrate/20140823095740_rename_manifestation_periodical_to_serial.rb
845
+ - spec/dummy/db/migrate/20141003181336_add_full_name_transcription_to_profile.rb
846
+ - spec/dummy/db/migrate/20141003182825_add_date_of_birth_to_profile.rb
847
+ - spec/dummy/db/migrate/20141014065831_add_shelf_id_to_checkout.rb
911
848
  - spec/dummy/db/schema.rb
912
- - spec/dummy/db/test.sqlite3
913
- - spec/dummy/private/system/event_import_files/event_imports/000/000/004/original/event_destroy_file.tsv
914
- - spec/dummy/private/system/event_import_files/event_imports/000/000/004/original/event_import51.txt
915
- - spec/dummy/private/system/event_import_files/event_imports/000/000/004/original/event_import_file_sample1.tsv
916
- - spec/dummy/private/system/event_import_files/event_imports/000/000/004/original/event_import_file_sample2.tsv
917
- - spec/dummy/private/system/event_import_files/event_imports/000/000/004/original/event_update_file.tsv
918
- - spec/dummy/private/system/event_import_files/event_imports/000/000/004/original/invalid_file.tsv
919
849
  - spec/dummy/public/404.html
920
850
  - spec/dummy/public/422.html
921
851
  - spec/dummy/public/500.html
922
852
  - spec/dummy/public/favicon.ico
923
- - spec/dummy/public/system/event_export_files/event_exports/000/000/004/original/event_export_file_20140818-66894-1um2gwb.txt
924
- - spec/dummy/public/system/event_export_files/event_exports/000/000/004/original/event_export_file_20140818-67059-j0f46.txt
925
- - spec/dummy/public/system/event_export_files/event_exports/000/000/004/original/event_export_file_20140915-67461-178vmkf.txt
926
- - spec/dummy/public/system/event_export_files/event_exports/000/000/004/original/event_export_file_20140916-27270-1dm2llo.txt
927
- - spec/dummy/public/system/event_export_files/event_exports/000/000/004/original/event_export_file_20140921-56213-1l5hypx.txt
928
- - spec/dummy/public/system/event_export_files/event_exports/000/000/004/original/event_export_file_20140921-58265-o3c737.txt
929
- - spec/dummy/public/system/event_export_files/event_exports/000/000/004/original/event_export_file_20140921-58363-1tipiu.txt
930
- - spec/dummy/public/system/event_export_files/event_exports/000/000/004/original/event_export_file_20140921-58460-38jub0.txt
931
- - spec/dummy/public/system/event_export_files/event_exports/000/000/004/original/event_export_file_20140921-58528-ca3k3q.txt
932
- - spec/dummy/public/system/event_export_files/event_exports/000/000/004/original/event_export_file_20140921-58630-1m4isxz.txt
933
- - spec/dummy/public/system/event_export_files/event_exports/000/000/004/original/event_export_file_20140921-58934-19ikk0v.txt
934
- - spec/dummy/public/system/event_export_files/event_exports/000/000/004/original/event_export_file_20140921-59012-10in1j8.txt
935
- - spec/dummy/public/system/event_export_files/event_exports/000/000/004/original/event_export_file_20140921-59315-15pzw3y.txt
936
- - spec/dummy/public/system/event_export_files/event_exports/000/000/004/original/event_export_file_20140922-86319-oo60ty.txt
937
- - spec/dummy/public/system/event_export_files/event_exports/000/000/004/original/event_export_file_20140927-1698-10wfq6m.txt
938
- - spec/dummy/public/system/event_export_files/event_exports/000/000/004/original/event_export_file_20141003-88157-4ti9t5.txt
939
853
  - spec/dummy/Rakefile
940
- - spec/dummy/script/rails
941
- - spec/dummy/solr/conf/admin-extra.html
942
- - spec/dummy/solr/conf/elevate.xml
943
- - spec/dummy/solr/conf/mapping-ISOLatin1Accent.txt
944
- - spec/dummy/solr/conf/protwords.txt
945
- - spec/dummy/solr/conf/schema.xml
946
- - spec/dummy/solr/conf/scripts.conf
947
- - spec/dummy/solr/conf/solrconfig.xml
948
- - spec/dummy/solr/conf/spellings.txt
949
- - spec/dummy/solr/conf/stopwords.txt
950
- - spec/dummy/solr/conf/synonyms.txt
951
- - spec/dummy/solr/default/data/index/_1pd.fdt
952
- - spec/dummy/solr/default/data/index/_1pd.fdx
953
- - spec/dummy/solr/default/data/index/_1pd.fnm
954
- - spec/dummy/solr/default/data/index/_1pd.nvd
955
- - spec/dummy/solr/default/data/index/_1pd.nvm
956
- - spec/dummy/solr/default/data/index/_1pd.si
957
- - spec/dummy/solr/default/data/index/_1pd_Lucene41_0.doc
958
- - spec/dummy/solr/default/data/index/_1pd_Lucene41_0.pos
959
- - spec/dummy/solr/default/data/index/_1pd_Lucene41_0.tim
960
- - spec/dummy/solr/default/data/index/_1pd_Lucene41_0.tip
961
- - spec/dummy/solr/default/data/index/_1pe.fdt
962
- - spec/dummy/solr/default/data/index/_1pe.fdx
963
- - spec/dummy/solr/default/data/index/_1pe.fnm
964
- - spec/dummy/solr/default/data/index/_1pe.nvd
965
- - spec/dummy/solr/default/data/index/_1pe.nvm
966
- - spec/dummy/solr/default/data/index/_1pe.si
967
- - spec/dummy/solr/default/data/index/_1pe_Lucene41_0.doc
968
- - spec/dummy/solr/default/data/index/_1pe_Lucene41_0.pos
969
- - spec/dummy/solr/default/data/index/_1pe_Lucene41_0.tim
970
- - spec/dummy/solr/default/data/index/_1pe_Lucene41_0.tip
971
- - spec/dummy/solr/default/data/index/segments.gen
972
- - spec/dummy/solr/default/data/index/segments_2g6
973
- - spec/dummy/solr/default/data/tlog/tlog.0000000000000003163
974
- - spec/dummy/solr/default/data/tlog/tlog.0000000000000003164
975
- - spec/dummy/solr/default/data/tlog/tlog.0000000000000003165
976
- - spec/dummy/solr/default/data/tlog/tlog.0000000000000003166
977
- - spec/dummy/solr/default/data/tlog/tlog.0000000000000003167
978
- - spec/dummy/solr/default/data/tlog/tlog.0000000000000003168
979
- - spec/dummy/solr/default/data/tlog/tlog.0000000000000003169
980
- - spec/dummy/solr/default/data/tlog/tlog.0000000000000003170
981
- - spec/dummy/solr/default/data/tlog/tlog.0000000000000003171
982
- - spec/dummy/solr/default/data/tlog/tlog.0000000000000003172
983
- - spec/dummy/solr/development/data/index/segments.gen
984
- - spec/dummy/solr/development/data/index/segments_1
985
- - spec/dummy/solr/solr.xml
986
- - spec/dummy/solr/test/data/index/_a.fdt
987
- - spec/dummy/solr/test/data/index/_a.fdx
988
- - spec/dummy/solr/test/data/index/_a.fnm
989
- - spec/dummy/solr/test/data/index/_a.nvd
990
- - spec/dummy/solr/test/data/index/_a.nvm
991
- - spec/dummy/solr/test/data/index/_a.si
992
- - spec/dummy/solr/test/data/index/_a_Lucene41_0.doc
993
- - spec/dummy/solr/test/data/index/_a_Lucene41_0.pos
994
- - spec/dummy/solr/test/data/index/_a_Lucene41_0.tim
995
- - spec/dummy/solr/test/data/index/_a_Lucene41_0.tip
996
- - spec/dummy/solr/test/data/index/segments.gen
997
- - spec/dummy/solr/test/data/index/segments_n
998
- - spec/dummy/solr/test/data/tlog/tlog.0000000000000000013
999
- - spec/dummy/solr/test/data/tlog/tlog.0000000000000000014
1000
- - spec/dummy/solr/test/data/tlog/tlog.0000000000000000015
1001
- - spec/dummy/solr/test/data/tlog/tlog.0000000000000000016
1002
- - spec/dummy/solr/test/data/tlog/tlog.0000000000000000017
1003
- - spec/dummy/solr/test/data/tlog/tlog.0000000000000000018
1004
- - spec/dummy/solr/test/data/tlog/tlog.0000000000000000019
1005
- - spec/dummy/solr/test/data/tlog/tlog.0000000000000000020
1006
- - spec/dummy/solr/test/data/tlog/tlog.0000000000000000021
1007
- - spec/dummy/tmp/cache/stdout
1008
- - spec/dummy/tmp/pids/redis-test.pid
1009
854
  - spec/factories/agent.rb
1010
855
  - spec/factories/country.rb
1011
856
  - spec/factories/event.rb
@@ -1,35 +0,0 @@
1
- class CalendarController < ApplicationController
2
- helper_method :get_library, :get_libraries
3
-
4
- def index
5
- params[:month] ||= Time.zone.now.month
6
- params[:year] ||= Time.zone.now.year
7
- @month = params[:month].to_i || Time.zone.now.month
8
- @year = params[:year].to_i || Time.zone.now.year
9
-
10
- #@shown_month = Date.civil(@year, @month)
11
- @shown_month = Time.zone.local(@year, @month, 1) rescue Time.zone.now
12
-
13
- # TODO: Solrを使って取得
14
- #if get_library
15
- # @event_strips = Event.at(@library).event_strips_for_month(@shown_month)
16
- #else
17
- #@event_strips = Event.event_strips_for_month(@shown_month)
18
- @event_strips = Event.all
19
- #end
20
- get_libraries
21
- end
22
-
23
- def show
24
- date = Time.zone.local(params[:year].to_i, params[:month].to_i, params[:day].to_i) rescue Time.zone.now
25
- date_string = date.strftime('%Y/%m/%d')
26
- if Event.search do
27
- with(:start_at).less_than_or_equal_to date
28
- with(:end_at).greater_than date
29
- end.results.empty?
30
- redirect_to new_event_path(:date => date_string)
31
- else
32
- redirect_to events_path(:date => date_string)
33
- end
34
- end
35
- end
Binary file