enju_biblio 0.1.0.pre62 → 0.1.0.pre63

Sign up to get free protection for your applications and to get access to all the features.
Files changed (197) hide show
  1. checksums.yaml +4 -4
  2. data/README.rdoc +8 -1
  3. data/app/controllers/series_statements_controller.rb +1 -1
  4. data/app/helpers/agents_helper.rb +3 -3
  5. data/app/helpers/series_statements_helper.rb +1 -1
  6. data/app/models/agent.rb +2 -3
  7. data/app/models/agent_import_file.rb +2 -2
  8. data/app/models/agent_import_file_transition.rb +2 -2
  9. data/app/models/agent_import_result.rb +3 -3
  10. data/app/models/agent_merge.rb +2 -3
  11. data/app/models/agent_merge_list.rb +2 -3
  12. data/app/models/agent_relationship.rb +2 -3
  13. data/app/models/agent_relationship_type.rb +2 -3
  14. data/app/models/agent_type.rb +2 -3
  15. data/app/models/carrier_type.rb +2 -3
  16. data/app/models/content_type.rb +2 -3
  17. data/app/models/create.rb +2 -3
  18. data/app/models/create_type.rb +2 -3
  19. data/app/models/donate.rb +2 -3
  20. data/app/models/exemplify.rb +2 -3
  21. data/app/models/form_of_work.rb +2 -3
  22. data/app/models/frequency.rb +2 -3
  23. data/app/models/identifier.rb +2 -3
  24. data/app/models/identifier_type.rb +2 -3
  25. data/app/models/import_request.rb +3 -3
  26. data/app/models/import_request_transition.rb +2 -2
  27. data/app/models/item.rb +2 -2
  28. data/app/models/license.rb +2 -3
  29. data/app/models/manifestation.rb +5 -5
  30. data/app/models/manifestation_relationship.rb +2 -3
  31. data/app/models/manifestation_relationship_type.rb +2 -3
  32. data/app/models/medium_of_performance.rb +2 -3
  33. data/app/models/own.rb +2 -3
  34. data/app/models/picture_file.rb +2 -3
  35. data/app/models/produce.rb +2 -3
  36. data/app/models/produce_type.rb +2 -3
  37. data/app/models/realize.rb +2 -3
  38. data/app/models/realize_type.rb +2 -3
  39. data/app/models/resource_export_file.rb +3 -3
  40. data/app/models/resource_export_file_transition.rb +2 -2
  41. data/app/models/resource_import_file.rb +2 -2
  42. data/app/models/resource_import_file_transition.rb +2 -2
  43. data/app/models/resource_import_result.rb +2 -2
  44. data/app/models/series_statement.rb +2 -3
  45. data/app/models/series_statement_merge.rb +2 -3
  46. data/app/models/series_statement_merge_list.rb +2 -3
  47. data/app/views/agents/_history_list.html.erb +1 -1
  48. data/app/views/agents/index.html.erb +3 -3
  49. data/app/views/agents/index.rss.builder +1 -1
  50. data/app/views/carrier_types/_form.html.erb +1 -1
  51. data/app/views/manifestations/_form.html.erb +1 -1
  52. data/app/views/manifestations/_history_list.html.erb +1 -1
  53. data/app/views/manifestations/index.mobile.erb +1 -1
  54. data/app/views/manifestations/index.rdf.builder +2 -2
  55. data/app/views/manifestations/index.rss.builder +3 -3
  56. data/app/views/manifestations/index.sru.builder +1 -1
  57. data/app/views/manifestations/show.mods.builder +1 -1
  58. data/app/views/manifestations/show.rdf.builder +1 -1
  59. data/app/views/picture_files/index.html.erb +2 -2
  60. data/app/views/picture_files/show.html.erb +1 -1
  61. data/app/views/picture_files/show.mobile.erb +1 -1
  62. data/app/views/series_statements/_index_series_statement_merge_list.html.erb +2 -2
  63. data/app/views/series_statements/show.html.erb +1 -1
  64. data/db/migrate/20140519170214_create_resource_import_file_transitions.rb +5 -1
  65. data/db/migrate/20140519171220_create_import_request_transitions.rb +5 -1
  66. data/db/migrate/20140524020735_create_agent_import_file_transitions.rb +5 -1
  67. data/db/migrate/20140614141500_create_resource_export_file_transitions.rb +5 -1
  68. data/lib/enju_biblio/engine.rb +0 -1
  69. data/lib/enju_biblio/version.rb +1 -1
  70. data/lib/enju_biblio.rb +47 -0
  71. data/lib/generators/enju_biblio/setup/setup_generator.rb +1 -1
  72. data/spec/controllers/manifestations_controller_spec.rb +5 -0
  73. data/spec/dummy/config/database.yml +23 -18
  74. data/spec/dummy/db/migrate/{20111201155456_devise_create_users.rb → 002_devise_create_users.rb} +6 -2
  75. data/spec/dummy/db/migrate/035_create_reserves.rb +1 -2
  76. data/spec/dummy/db/migrate/041_create_roles.rb +13 -0
  77. data/spec/dummy/db/migrate/077_create_user_groups.rb +3 -7
  78. data/spec/dummy/db/migrate/080_create_library_groups.rb +0 -1
  79. data/spec/dummy/db/migrate/113_create_events.rb +2 -2
  80. data/spec/dummy/db/migrate/20081006090811_create_subscriptions.rb +17 -0
  81. data/spec/dummy/db/migrate/20081006093246_create_subscribes.rb +14 -0
  82. data/spec/dummy/db/migrate/20100314190054_add_opening_hour_to_library.rb +9 -0
  83. data/spec/dummy/db/migrate/{20111201163718_create_user_has_roles.rb → 20100606065209_create_user_has_roles.rb} +2 -0
  84. data/spec/dummy/db/migrate/20110318183304_add_valid_period_for_new_user_to_user_group.rb +0 -2
  85. data/spec/dummy/db/migrate/20120319173203_create_accepts.rb +14 -0
  86. data/spec/dummy/db/migrate/20130221154434_add_additional_attributes_to_user.rb +0 -10
  87. data/spec/dummy/db/migrate/20130412083556_add_latitude_and_longitude_to_library.rb +6 -0
  88. data/spec/dummy/db/migrate/20130519065638_add_lock_version_to_reserve.rb +5 -0
  89. data/spec/dummy/db/migrate/20130519065837_add_lock_version_to_checkin.rb +5 -0
  90. data/spec/dummy/db/migrate/20140518050147_create_reserve_transitions.rb +5 -1
  91. data/spec/dummy/db/migrate/20140518111006_create_message_transitions.rb +5 -1
  92. data/spec/dummy/db/migrate/20140518135713_create_message_request_transitions.rb +5 -1
  93. data/spec/dummy/db/migrate/20140523171309_create_event_import_file_transitions.rb +18 -0
  94. data/spec/dummy/db/migrate/20140524074813_create_user_import_file_transitions.rb +5 -1
  95. data/spec/dummy/db/migrate/20140524135607_create_bookmark_stat_transitions.rb +5 -1
  96. data/spec/dummy/db/migrate/20140528045518_create_user_checkout_stat_transitions.rb +5 -1
  97. data/spec/dummy/db/migrate/20140528045539_create_user_reserve_stat_transitions.rb +5 -1
  98. data/spec/dummy/db/migrate/20140528045600_create_manifestation_checkout_stat_transitions.rb +5 -1
  99. data/spec/dummy/db/migrate/20140528045617_create_manifestation_reserve_stat_transitions.rb +5 -1
  100. data/spec/dummy/db/migrate/20140628071719_add_user_encoding_to_event_import_file.rb +5 -0
  101. data/spec/dummy/db/migrate/20140709113905_create_user_export_file_transitions.rb +5 -1
  102. data/spec/dummy/db/migrate/20140720192418_add_default_library_id_to_event_import_file.rb +5 -0
  103. data/spec/dummy/db/migrate/20140812152348_create_event_export_files.rb +11 -0
  104. data/spec/dummy/db/migrate/20140812153137_create_event_export_file_transitions.rb +18 -0
  105. data/spec/dummy/db/migrate/20140814070854_add_default_event_category_id_to_event_import_file.rb +5 -0
  106. data/spec/dummy/db/migrate/20141003181336_add_full_name_transcription_to_profile.rb +5 -0
  107. data/spec/dummy/db/migrate/20141003182825_add_date_of_birth_to_profile.rb +5 -0
  108. data/spec/dummy/db/migrate/20141014065831_add_shelf_id_to_checkout.rb +6 -0
  109. data/spec/dummy/db/schema.rb +97 -44
  110. data/spec/dummy/db/test.sqlite3 +0 -0
  111. data/spec/dummy/tmp/cache/stdout +25 -0
  112. data/spec/dummy/tmp/pids/redis-test.pid +1 -0
  113. data/spec/factories/create_types.rb +2 -2
  114. data/spec/factories/produce_types.rb +2 -2
  115. data/spec/factories/realize_types.rb +2 -2
  116. data/spec/fixtures/agent_import_files.yml +2 -2
  117. data/spec/fixtures/agent_import_results.yml +2 -3
  118. data/spec/fixtures/agent_merge_lists.yml +2 -3
  119. data/spec/fixtures/agent_merges.yml +2 -3
  120. data/spec/fixtures/agent_relationship_types.yml +2 -3
  121. data/spec/fixtures/agent_relationships.yml +2 -3
  122. data/spec/fixtures/agent_types.yml +2 -3
  123. data/spec/fixtures/agents.yml +2 -2
  124. data/spec/fixtures/carrier_types.yml +2 -3
  125. data/spec/fixtures/content_types.yml +2 -2
  126. data/spec/fixtures/create_types.yml +2 -3
  127. data/spec/fixtures/creates.yml +2 -3
  128. data/spec/fixtures/donates.yml +2 -3
  129. data/spec/fixtures/exemplifies.yml +2 -3
  130. data/spec/fixtures/form_of_works.yml +2 -3
  131. data/spec/fixtures/frequencies.yml +2 -2
  132. data/spec/fixtures/identifier_types.yml +2 -3
  133. data/spec/fixtures/identifiers.yml +2 -3
  134. data/spec/fixtures/import_requests.yml +2 -2
  135. data/spec/fixtures/items.yml +2 -2
  136. data/spec/fixtures/library_groups.yml +0 -2
  137. data/spec/fixtures/licenses.yml +2 -3
  138. data/spec/fixtures/manifestation_relationship_types.yml +2 -3
  139. data/spec/fixtures/manifestation_relationships.yml +2 -3
  140. data/spec/fixtures/manifestations.yml +116 -116
  141. data/spec/fixtures/medium_of_performances.yml +2 -3
  142. data/spec/fixtures/owns.yml +2 -3
  143. data/spec/fixtures/picture_files.yml +2 -3
  144. data/spec/fixtures/produce_types.yml +2 -3
  145. data/spec/fixtures/produces.yml +2 -3
  146. data/spec/fixtures/realize_types.yml +2 -3
  147. data/spec/fixtures/realizes.yml +2 -3
  148. data/spec/fixtures/reserves.yml +1 -16
  149. data/spec/fixtures/resource_export_files.yml +2 -2
  150. data/spec/fixtures/resource_import_files.yml +2 -2
  151. data/spec/fixtures/resource_import_results.yml +2 -2
  152. data/spec/fixtures/series_statement_merge_lists.yml +2 -3
  153. data/spec/fixtures/series_statement_merges.yml +2 -3
  154. data/spec/fixtures/series_statements.yml +2 -3
  155. data/spec/fixtures/users.yml +1 -53
  156. data/spec/models/agent_import_file_spec.rb +2 -2
  157. data/spec/models/agent_import_result_spec.rb +2 -2
  158. data/spec/models/agent_merge_list_spec.rb +2 -3
  159. data/spec/models/agent_merge_spec.rb +2 -3
  160. data/spec/models/agent_relationship_spec.rb +2 -3
  161. data/spec/models/agent_relationship_type_spec.rb +2 -3
  162. data/spec/models/agent_spec.rb +2 -2
  163. data/spec/models/agent_type_spec.rb +2 -3
  164. data/spec/models/carrier_type_spec.rb +2 -3
  165. data/spec/models/content_type_spec.rb +2 -3
  166. data/spec/models/create_spec.rb +2 -3
  167. data/spec/models/create_type_spec.rb +2 -3
  168. data/spec/models/donate_spec.rb +2 -3
  169. data/spec/models/exemplify_spec.rb +2 -3
  170. data/spec/models/form_of_work_spec.rb +2 -3
  171. data/spec/models/frequency_spec.rb +2 -3
  172. data/spec/models/identifier_spec.rb +2 -3
  173. data/spec/models/identifier_type_spec.rb +2 -3
  174. data/spec/models/import_request_spec.rb +2 -2
  175. data/spec/models/item_spec.rb +2 -2
  176. data/spec/models/license_spec.rb +2 -3
  177. data/spec/models/manifestation_relationship_spec.rb +2 -3
  178. data/spec/models/manifestation_relationship_type_spec.rb +2 -3
  179. data/spec/models/manifestation_spec.rb +2 -2
  180. data/spec/models/medium_of_performance_spec.rb +2 -3
  181. data/spec/models/own_spec.rb +2 -3
  182. data/spec/models/picture_file_spec.rb +2 -3
  183. data/spec/models/produce_spec.rb +2 -3
  184. data/spec/models/produce_type_spec.rb +2 -3
  185. data/spec/models/realize_spec.rb +2 -3
  186. data/spec/models/realize_type_spec.rb +2 -3
  187. data/spec/models/resource_export_file_spec.rb +2 -2
  188. data/spec/models/resource_import_file_spec.rb +13 -38
  189. data/spec/models/resource_import_result_spec.rb +2 -2
  190. data/spec/models/series_statement_merge_list_spec.rb +2 -3
  191. data/spec/models/series_statement_merge_spec.rb +2 -3
  192. data/spec/models/series_statement_spec.rb +2 -3
  193. data/spec/spec_helper.rb +2 -0
  194. metadata +75 -13
  195. data/spec/dummy/db/migrate/20080606052544_create_work_has_subjects.rb +0 -18
  196. data/spec/dummy/db/migrate/20090208044541_create_subject_heading_type_has_subjects.rb +0 -16
  197. data/spec/dummy/db/migrate/20111201121844_create_roles.rb +0 -12
@@ -147,7 +147,7 @@
147
147
  </div>
148
148
 
149
149
  <% if defined?(EnjuSubject) %>
150
- <%= render 'manifestations/subject_form', :f => f %>
150
+ <%= render 'manifestations/subject_form', f: f %>
151
151
  <% end %>
152
152
 
153
153
  <!--
@@ -2,7 +2,7 @@
2
2
  <ul>
3
3
  <%- manifestation.versions.reverse.each_with_index do |version, i| -%>
4
4
  <li>
5
- <%= link_to l(version.created_at), manifestation_path(manifestation, :version_id => version.id) -%>
5
+ <%= link_to l(version.created_at), manifestation_path(manifestation, version_id: version.id) -%>
6
6
  <%- if i == 0 -%>
7
7
  (<%= t('page.current_version') -%>)
8
8
  <%- end -%>
@@ -18,4 +18,4 @@
18
18
  <% end %>
19
19
  </ul>
20
20
 
21
- <%= paginate(@manifestations, :window => 0, :theme => 'enju_leaf_mobile') %>
21
+ <%= paginate(@manifestations, window: 0, theme: 'enju_leaf_mobile') %>
@@ -1,4 +1,4 @@
1
- xml.instruct! :xml, :version=>"1.0"
1
+ xml.instruct! :xml, version: "1.0"
2
2
  xml.rdf(:RDF,
3
3
  'xmlns' => "http://purl.org/rss/1.0/",
4
4
  'xmlns:rdf' => "http://www.w3.org/1999/02/22-rdf-syntax-ns#",
@@ -8,7 +8,7 @@ xml.rdf(:RDF,
8
8
  'xmlns:foaf' => "http://xmlns.com/foaf/0.1/",
9
9
  'xmlns:prism' => "http://prismstandard.org/namespaces/basic/2.0/",
10
10
  'xmlns:rdfs' =>"http://www.w3.org/2000/01/rdf-schema#"){
11
- xml.channel("rdf:about" => manifestations_url(:params => params.merge(format: 'rdf', only_path: true))){
11
+ xml.channel("rdf:about" => manifestations_url(params: params.merge(format: 'rdf', only_path: true))){
12
12
  xml.title t('manifestation.query_search_result', query: @query, library_group_name: @library_group.display_name.localize)
13
13
  xml.link "#{request.protocol}#{request.host_with_port}#{url_for(params.merge(format: nil, only_path: true))}"
14
14
  xml.description "Next-L Enju, an open source integrated library system developed by Project Next-L"
@@ -1,4 +1,4 @@
1
- xml.instruct! :xml, :version=>"1.0"
1
+ xml.instruct! :xml, version: "1.0"
2
2
  xml.rss('version' => "2.0",
3
3
  'xmlns:opensearch' => "http://a9.com/-/spec/opensearch/1.1/",
4
4
  'xmlns:dc' => "http://purl.org/dc/elements/1.1/",
@@ -16,7 +16,7 @@ xml.rss('version' => "2.0",
16
16
  xml.tag! "opensearch:totalResults", @manifestations.total_count
17
17
  xml.tag! "opensearch:startIndex", @manifestations.offset_value + 1
18
18
  xml.tag! "opensearch:itemsPerPage", @manifestations.limit_value
19
- xml.tag! "opensearch:Query", role: 'request', :searchTerms => h(params[:query]), :startPage => (h(params[:page]) || 1)
19
+ xml.tag! "opensearch:Query", role: 'request', searchTerms: h(params[:query]), startPage: (h(params[:page]) || 1)
20
20
  end
21
21
  if @manifestations
22
22
  @manifestations.each do |manifestation|
@@ -29,7 +29,7 @@ xml.rss('version' => "2.0",
29
29
  end
30
30
  xml.pubDate manifestation.date_of_publication.try(:utc).try(:rfc822)
31
31
  xml.link manifestation_url(manifestation)
32
- xml.guid manifestation_url(manifestation), :isPermaLink => "true"
32
+ xml.guid manifestation_url(manifestation), isPermaLink: "true"
33
33
  manifestation.identifier_contents(:isbn).each do |i|
34
34
  xml.tag! "dc:identifier", i
35
35
  end
@@ -97,5 +97,5 @@ def value_sort(hash)
97
97
  end
98
98
 
99
99
  xml = Builder::XmlMarkup.new :indent => 2
100
- xml.instruct! directive_tag=:xml, :encoding=> 'UTF-8'
100
+ xml.instruct! directive_tag=:xml, :encoding => 'UTF-8'
101
101
  search_retrieve_response!(xml)
@@ -1,4 +1,4 @@
1
- xml.instruct! :xml, :version=>"1.0"
1
+ xml.instruct! :xml, version: "1.0"
2
2
  xml.mods('version' => "3.3",
3
3
  'xmlns:xsi' => "http://www.w3.org/2001/XMLSchema-instance",
4
4
  'xmlns' => "http://www.loc.gov/mods/v3"){
@@ -1,4 +1,4 @@
1
- xml.instruct! :xml, :version=>"1.0"
1
+ xml.instruct! :xml, version: "1.0"
2
2
  xml.rdf(:RDF,
3
3
  'xmlns' => "http://purl.org/rss/1.0/",
4
4
  'xmlns:rdf' => "http://www.w3.org/1999/02/22-rdf-syntax-ns#",
@@ -1,11 +1,11 @@
1
1
  <%- case @attachable.class.to_s when 'Shelf' -%>
2
- <%= render 'index_shelf', :shelf => @attachable -%>
2
+ <%= render 'index_shelf', shelf: @attachable -%>
3
3
  <%- when 'Manifestation' -%>
4
4
  <%= render 'index_manifestation', manifestation: @attachable -%>
5
5
  <%- when 'Agent' -%>
6
6
  <%= render 'index_agent', agent: @attachable -%>
7
7
  <%- when 'Event' -%>
8
- <%= render 'index_event', :event => @attachable -%>
8
+ <%= render 'index_event', event: @attachable -%>
9
9
  <%- else -%>
10
10
  <%= render 'index' -%>
11
11
  <%- end -%>
@@ -21,7 +21,7 @@
21
21
  <p>
22
22
  <strong><%= t('activerecord.attributes.picture_file.picture_file_name') -%>:</strong>
23
23
  <%= link_to @picture_file.picture_file_name, picture_file_path(@picture_file, format: :download, size: 'original') -%><br />
24
- <%= render 'picture_files/link', :picture_file => @picture_file %>
24
+ <%= render 'picture_files/link', picture_file: @picture_file %>
25
25
  </p>
26
26
 
27
27
  <p>
@@ -22,7 +22,7 @@
22
22
  <p>
23
23
  <strong><%= t('activerecord.attributes.picture_file.picture_file_name') -%>:</strong>
24
24
  <%= link_to @picture_file.picture_file_name, picture_file_path(@picture_file, format: :download, size: 'original') -%><br />
25
- <%= render 'picture_files/link', :picture_file => @picture_file %>
25
+ <%= render 'picture_files/link', picture_file: @picture_file %>
26
26
  </p>
27
27
 
28
28
  <p>
@@ -30,9 +30,9 @@
30
30
  <td>
31
31
  <%- if can? :delete, series_statement -%>
32
32
  <%- if params[:mode] == 'add' -%>
33
- <%= link_to t('page.add'), new_series_statement_merge_list_series_statement_merge_path(@series_statement_merge_list, :series_statement_id => series_statement.id) unless @series_statement_merge_list.series_statements.include?(series_statement) -%>
33
+ <%= link_to t('page.add'), new_series_statement_merge_list_series_statement_merge_path(@series_statement_merge_list, series_statement_id: series_statement.id) unless @series_statement_merge_list.series_statements.include?(series_statement) -%>
34
34
  <%- else -%>
35
- <%- series_statement_merge = @series_statement_merge_list.series_statement_merges.where(:series_statement_id => series_statement.id).first -%>
35
+ <%- series_statement_merge = @series_statement_merge_list.series_statement_merges.where(series_statement_id: series_statement.id).first -%>
36
36
  <%= link_to t('page.destroy'), series_statement_merge_list_series_statement_merge_path(@series_statement_merge_list, series_statement_merge), data: {confirm: t('page.are_you_sure')}, method: :delete if series_statement_merge -%>
37
37
  <%- end -%>
38
38
  <%- end -%>
@@ -3,7 +3,7 @@
3
3
  <div id="content_list">
4
4
  <p id="notice"><%= notice %></p>
5
5
  <% if @series_statement.root_manifestation and @manifestation_ids %>
6
- <%= render 'manifestations/paginate_id_link', manifestation: @series_statement.root_manifestation , :manifestation_ids => @manifestation_ids %>
6
+ <%= render 'manifestations/paginate_id_link', manifestation: @series_statement.root_manifestation , manifestation_ids: @manifestation_ids %>
7
7
  <% end %>
8
8
 
9
9
  <h2 class="resource_title">
@@ -2,7 +2,11 @@ class CreateResourceImportFileTransitions < ActiveRecord::Migration
2
2
  def change
3
3
  create_table :resource_import_file_transitions do |t|
4
4
  t.string :to_state
5
- t.text :metadata, default: "{}"
5
+ if ActiveRecord::Base.configurations[Rails.env]["adapter"].try(:match, /mysql/)
6
+ t.text :metadata
7
+ else
8
+ t.text :metadata, default: "{}"
9
+ end
6
10
  t.integer :sort_key
7
11
  t.integer :resource_import_file_id
8
12
  t.timestamps
@@ -2,7 +2,11 @@ class CreateImportRequestTransitions < ActiveRecord::Migration
2
2
  def change
3
3
  create_table :import_request_transitions do |t|
4
4
  t.string :to_state
5
- t.text :metadata, default: "{}"
5
+ if ActiveRecord::Base.configurations[Rails.env]["adapter"].try(:match, /mysql/)
6
+ t.text :metadata
7
+ else
8
+ t.text :metadata, default: "{}"
9
+ end
6
10
  t.integer :sort_key
7
11
  t.integer :import_request_id
8
12
  t.timestamps
@@ -2,7 +2,11 @@ class CreateAgentImportFileTransitions < ActiveRecord::Migration
2
2
  def change
3
3
  create_table :agent_import_file_transitions do |t|
4
4
  t.string :to_state
5
- t.text :metadata, default: "{}"
5
+ if ActiveRecord::Base.configurations[Rails.env]["adapter"].try(:match, /mysql/)
6
+ t.text :metadata
7
+ else
8
+ t.text :metadata, default: "{}"
9
+ end
6
10
  t.integer :sort_key
7
11
  t.integer :agent_import_file_id
8
12
  t.timestamps
@@ -2,7 +2,11 @@ class CreateResourceExportFileTransitions < ActiveRecord::Migration
2
2
  def change
3
3
  create_table :resource_export_file_transitions do |t|
4
4
  t.string :to_state
5
- t.text :metadata, default: "{}"
5
+ if ActiveRecord::Base.configurations[Rails.env]["adapter"].try(:match, /mysql/)
6
+ t.text :metadata
7
+ else
8
+ t.text :metadata, default: "{}"
9
+ end
6
10
  t.integer :sort_key
7
11
  t.integer :resource_export_file_id
8
12
  t.timestamps
@@ -15,7 +15,6 @@ begin
15
15
  require 'charlock_holmes/string'
16
16
  rescue LoadError
17
17
  end
18
- require "protected_attributes" if Rails::VERSION::MAJOR == 4
19
18
 
20
19
  module EnjuBiblio
21
20
  class Engine < ::Rails::Engine
@@ -1,3 +1,3 @@
1
1
  module EnjuBiblio
2
- VERSION = "0.1.0.pre62"
2
+ VERSION = "0.1.0.pre63"
3
3
  end
data/lib/enju_biblio.rb CHANGED
@@ -62,6 +62,53 @@ module EnjuBiblio
62
62
  def get_series_statement_merge_list
63
63
  @series_statement_merge_list = SeriesStatementMergeList.find(params[:series_statement_merge_list_id]) if params[:series_statement_merge_list_id]
64
64
  end
65
+
66
+ def make_internal_query(search)
67
+ # 内部的なクエリ
68
+ set_role_query(current_user, search)
69
+
70
+ unless params[:mode] == "add"
71
+ expression = @expression
72
+ agent = @agent
73
+ manifestation = @manifestation
74
+ reservable = @reservable
75
+ carrier_type = params[:carrier_type]
76
+ library = params[:library]
77
+ language = params[:language]
78
+ if defined?(EnjuSubject)
79
+ subject = params[:subject]
80
+ subject_by_term = Subject.where(term: params[:subject]).first
81
+ @subject_by_term = subject_by_term
82
+ end
83
+
84
+ search.build do
85
+ with(:publisher_ids).equal_to agent.id if agent
86
+ with(:original_manifestation_ids).equal_to manifestation.id if manifestation
87
+ with(:reservable).equal_to reservable unless reservable.nil?
88
+ unless carrier_type.blank?
89
+ with(:carrier_type).equal_to carrier_type
90
+ end
91
+ unless library.blank?
92
+ library_list = library.split.uniq
93
+ library_list.each do |library|
94
+ with(:library).equal_to library
95
+ end
96
+ end
97
+ unless language.blank?
98
+ language_list = language.split.uniq
99
+ language_list.each do |language|
100
+ with(:language).equal_to language
101
+ end
102
+ end
103
+ if defined?(EnjuSubject)
104
+ unless subject.blank?
105
+ with(:subject).equal_to subject_by_term.term
106
+ end
107
+ end
108
+ end
109
+ end
110
+ return search
111
+ end
65
112
  end
66
113
  end
67
114
 
@@ -1,6 +1,6 @@
1
1
  class EnjuBiblio::SetupGenerator < Rails::Generators::Base
2
2
  source_root File.expand_path('../templates', __FILE__)
3
- argument :file, :type => :string, :default => "all"
3
+ argument :file, type: :string, default: "all"
4
4
 
5
5
  def copy_setup_files
6
6
  directory("db/fixtures", "db/fixtures/enju_biblio")
@@ -418,6 +418,11 @@ describe ManifestationsController do
418
418
  post :create, :manifestation => @attrs
419
419
  expect(response).to redirect_to(manifestation_url(assigns(:manifestation)))
420
420
  end
421
+
422
+ it "accepts an attachment file" do
423
+ post :create, :manifestation => @attrs.merge(attachment: fixture_file_upload("/../../examples/resource_import_file_sample1.tsv", 'text/csv'))
424
+ expect(assigns(:manifestation)).to be_valid
425
+ end
421
426
  end
422
427
 
423
428
  describe "with invalid params" do
@@ -1,25 +1,30 @@
1
- # SQLite version 3.x
2
- # gem install sqlite3
3
- #
4
- # Ensure the SQLite 3 gem is defined in your Gemfile
5
- # gem 'sqlite3'
6
- development:
1
+ sqlite: &sqlite
7
2
  adapter: sqlite3
8
- database: db/development.sqlite3
3
+ database: db/<%= Rails.env %>.sqlite3
4
+
5
+ mysql: &mysql
6
+ adapter: mysql2
7
+ username: root
8
+ password:
9
+ database: enju_<%= Rails.env %>
10
+
11
+ postgresql: &postgresql
12
+ adapter: postgresql
13
+ username: postgres
14
+ password:
15
+ database: enju_<%= Rails.env %>
16
+
17
+ defaults: &defaults
9
18
  pool: 5
10
19
  timeout: 5000
20
+ host: localhost
21
+ <<: *<%= ENV['DB'] || "sqlite" %>
22
+
23
+ development:
24
+ <<: *defaults
11
25
 
12
- # Warning: The database defined as "test" will be erased and
13
- # re-generated from your development database when you run "rake".
14
- # Do not set this db to the same as development or production.
15
26
  test:
16
- adapter: sqlite3
17
- database: db/test.sqlite3
18
- pool: 5
19
- timeout: 5000
27
+ <<: *defaults
20
28
 
21
29
  production:
22
- adapter: sqlite3
23
- database: db/production.sqlite3
24
- pool: 5
25
- timeout: 5000
30
+ <<: *defaults
@@ -13,7 +13,7 @@ class DeviseCreateUsers < ActiveRecord::Migration
13
13
  t.datetime :remember_created_at
14
14
 
15
15
  ## Trackable
16
- t.integer :sign_in_count, :default => 0, :null => false
16
+ t.integer :sign_in_count, :default => 0
17
17
  t.datetime :current_sign_in_at
18
18
  t.datetime :last_sign_in_at
19
19
  t.string :current_sign_in_ip
@@ -26,10 +26,13 @@ class DeviseCreateUsers < ActiveRecord::Migration
26
26
  # t.string :unconfirmed_email # Only if using reconfirmable
27
27
 
28
28
  ## Lockable
29
- # t.integer :failed_attempts, :default => 0, :null => false # Only if lock strategy is :failed_attempts
29
+ # t.integer :failed_attempts, :default => 0 # Only if lock strategy is :failed_attempts
30
30
  # t.string :unlock_token # Only if unlock strategy is :email or :both
31
31
  # t.datetime :locked_at
32
32
 
33
+ ## Token authenticatable
34
+ # t.string :authentication_token
35
+
33
36
 
34
37
  t.timestamps
35
38
  end
@@ -38,5 +41,6 @@ class DeviseCreateUsers < ActiveRecord::Migration
38
41
  add_index :users, :reset_password_token, :unique => true
39
42
  # add_index :users, :confirmation_token, :unique => true
40
43
  # add_index :users, :unlock_token, :unique => true
44
+ # add_index :users, :authentication_token, :unique => true
41
45
  end
42
46
  end
@@ -10,8 +10,7 @@ class CreateReserves < ActiveRecord::Migration
10
10
  t.datetime :canceled_at
11
11
  t.datetime :expired_at
12
12
  t.datetime :deleted_at
13
- t.string :state
14
- t.boolean :expiration_notice_to_agent, :default => false
13
+ t.boolean :expiration_notice_to_patron, :default => false
15
14
  t.boolean :expiration_notice_to_library, :default => false
16
15
  end
17
16
 
@@ -0,0 +1,13 @@
1
+ class CreateRoles < ActiveRecord::Migration
2
+ def change
3
+ create_table "roles" do |t|
4
+ t.column :name, :string, :null => false
5
+ t.column :display_name, :string
6
+ t.column :note, :text
7
+ t.column :created_at, :datetime
8
+ t.column :updated_at, :datetime
9
+ t.integer :score, :default => 0, :null => false
10
+ t.integer :position
11
+ end
12
+ end
13
+ end
@@ -1,16 +1,12 @@
1
1
  class CreateUserGroups < ActiveRecord::Migration
2
- def self.up
2
+ def change
3
3
  create_table :user_groups do |t|
4
- t.string :name, :string, :not_null => true
5
- t.text :display_name, :string
4
+ t.string :name, :not_null => true
5
+ t.text :display_name
6
6
  t.text :note
7
7
  t.integer :position
8
8
  t.timestamps
9
9
  t.datetime :deleted_at
10
10
  end
11
11
  end
12
-
13
- def self.down
14
- drop_table :user_groups
15
- end
16
12
  end
@@ -4,7 +4,6 @@ class CreateLibraryGroups < ActiveRecord::Migration
4
4
  t.string :name, :null => false
5
5
  t.text :display_name
6
6
  t.string :short_name, :null => false
7
- t.string :email
8
7
  t.text :my_networks
9
8
  t.text :login_banner
10
9
  t.text :note
@@ -1,8 +1,8 @@
1
1
  class CreateEvents < ActiveRecord::Migration
2
2
  def self.up
3
3
  create_table :events do |t|
4
- t.integer :library_id, :default => 1, :null => false
5
- t.integer :event_category_id, :default => 1, :null => false
4
+ t.integer :library_id, :null => false
5
+ t.integer :event_category_id, :null => false
6
6
  t.string :name
7
7
  t.text :note
8
8
  t.datetime :start_at
@@ -0,0 +1,17 @@
1
+ class CreateSubscriptions < ActiveRecord::Migration
2
+ def change
3
+ create_table :subscriptions do |t|
4
+ t.text :title, :null => false
5
+ t.text :note
6
+ #t.integer :subscription_list_id, :integer
7
+ t.integer :user_id
8
+ t.integer :order_list_id
9
+ t.datetime :deleted_at
10
+ t.integer :subscribes_count, :default => 0, :null => false
11
+
12
+ t.timestamps
13
+ end
14
+ add_index :subscriptions, :user_id
15
+ add_index :subscriptions, :order_list_id
16
+ end
17
+ end
@@ -0,0 +1,14 @@
1
+ class CreateSubscribes < ActiveRecord::Migration
2
+ def change
3
+ create_table :subscribes do |t|
4
+ t.integer :subscription_id, :null => false
5
+ t.integer :work_id, :null => false
6
+ t.datetime :start_at, :null => false
7
+ t.datetime :end_at, :null => false
8
+
9
+ t.timestamps
10
+ end
11
+ add_index :subscribes, :subscription_id
12
+ add_index :subscribes, :work_id
13
+ end
14
+ end
@@ -0,0 +1,9 @@
1
+ class AddOpeningHourToLibrary < ActiveRecord::Migration
2
+ def self.up
3
+ add_column :libraries, :opening_hour, :text
4
+ end
5
+
6
+ def self.down
7
+ remove_column :libraries, :opening_hour
8
+ end
9
+ end
@@ -6,5 +6,7 @@ class CreateUserHasRoles < ActiveRecord::Migration
6
6
 
7
7
  t.timestamps
8
8
  end
9
+ add_index :user_has_roles, :user_id
10
+ add_index :user_has_roles, :role_id
9
11
  end
10
12
  end
@@ -2,12 +2,10 @@ class AddValidPeriodForNewUserToUserGroup < ActiveRecord::Migration
2
2
  def self.up
3
3
  add_column :user_groups, :valid_period_for_new_user, :integer, :default => 0, :null => false
4
4
  add_column :user_groups, :expired_at, :timestamp
5
- remove_column :library_groups, :valid_period_for_new_user
6
5
  end
7
6
 
8
7
  def self.down
9
8
  remove_column :user_groups, :valid_period_for_new_user
10
9
  remove_column :user_groups, :expired_at
11
- add_column :library_groups, :valid_period_for_new_user, :integer, :default => 0, :null => false
12
10
  end
13
11
  end
@@ -0,0 +1,14 @@
1
+ class CreateAccepts < ActiveRecord::Migration
2
+ def change
3
+ create_table :accepts do |t|
4
+ t.integer :basket_id
5
+ t.integer :item_id
6
+ t.integer :librarian_id
7
+
8
+ t.timestamps
9
+ end
10
+
11
+ add_index :accepts, :basket_id
12
+ add_index :accepts, :item_id
13
+ end
14
+ end
@@ -1,16 +1,8 @@
1
1
  class AddAdditionalAttributesToUser < ActiveRecord::Migration
2
2
  def change
3
3
  add_column :users, :username, :string
4
- add_column :users, :user_number, :string
5
- add_column :users, :state, :string
6
- add_column :users, :locale, :string
7
4
  add_column :users, :deleted_at, :datetime
8
5
  add_column :users, :expired_at, :datetime
9
- add_column :users, :library_id, :integer, :default => 1, :null => false
10
- add_column :users, :required_role_id, :integer, :default => 1, :null => false
11
- add_column :users, :user_group_id, :integer, :default => 1, :null => false
12
- add_column :users, :note, :text
13
- add_column :users, :keyword_list, :text
14
6
 
15
7
  add_column :users, :failed_attempts, :integer, :default => 0
16
8
  add_column :users, :unlock_token, :string
@@ -19,8 +11,6 @@ class AddAdditionalAttributesToUser < ActiveRecord::Migration
19
11
  add_column :users, :confirmed_at, :datetime
20
12
 
21
13
  add_index :users, :username, :unique => true
22
- add_index :users, :user_group_id
23
- add_index :users, :user_number, :unique => true
24
14
  add_index :users, :unlock_token, :unique => true
25
15
  end
26
16
  end
@@ -0,0 +1,6 @@
1
+ class AddLatitudeAndLongitudeToLibrary < ActiveRecord::Migration
2
+ def change
3
+ add_column :libraries, :latitude, :float
4
+ add_column :libraries, :longitude, :float
5
+ end
6
+ end
@@ -0,0 +1,5 @@
1
+ class AddLockVersionToReserve < ActiveRecord::Migration
2
+ def change
3
+ add_column :reserves, :lock_version, :integer, :default => 0, :null => false
4
+ end
5
+ end
@@ -0,0 +1,5 @@
1
+ class AddLockVersionToCheckin < ActiveRecord::Migration
2
+ def change
3
+ add_column :checkins, :lock_version, :integer, :default => 0, :null => false
4
+ end
5
+ end
@@ -2,7 +2,11 @@ class CreateReserveTransitions < ActiveRecord::Migration
2
2
  def change
3
3
  create_table :reserve_transitions do |t|
4
4
  t.string :to_state
5
- t.text :metadata, default: "{}"
5
+ if ActiveRecord::Base.configurations[Rails.env]["adapter"].try(:match, /mysql/)
6
+ t.text :metadata
7
+ else
8
+ t.text :metadata, default: "{}"
9
+ end
6
10
  t.integer :sort_key
7
11
  t.integer :reserve_id
8
12
  t.timestamps
@@ -2,7 +2,11 @@ class CreateMessageTransitions < ActiveRecord::Migration
2
2
  def change
3
3
  create_table :message_transitions do |t|
4
4
  t.string :to_state
5
- t.text :metadata, default: "{}"
5
+ if ActiveRecord::Base.configurations[Rails.env]["adapter"].try(:match, /mysql/)
6
+ t.text :metadata
7
+ else
8
+ t.text :metadata, default: "{}"
9
+ end
6
10
  t.integer :sort_key
7
11
  t.integer :message_id
8
12
  t.timestamps
@@ -2,7 +2,11 @@ class CreateMessageRequestTransitions < ActiveRecord::Migration
2
2
  def change
3
3
  create_table :message_request_transitions do |t|
4
4
  t.string :to_state
5
- t.text :metadata, default: "{}"
5
+ if ActiveRecord::Base.configurations[Rails.env]["adapter"].try(:match, /mysql/)
6
+ t.text :metadata
7
+ else
8
+ t.text :metadata, default: "{}"
9
+ end
6
10
  t.integer :sort_key
7
11
  t.integer :message_request_id
8
12
  t.timestamps
@@ -0,0 +1,18 @@
1
+ class CreateEventImportFileTransitions < ActiveRecord::Migration
2
+ def change
3
+ create_table :event_import_file_transitions do |t|
4
+ t.string :to_state
5
+ if ActiveRecord::Base.configurations[Rails.env]["adapter"].try(:match, /mysql/)
6
+ t.text :metadata
7
+ else
8
+ t.text :metadata, default: "{}"
9
+ end
10
+ t.integer :sort_key
11
+ t.integer :event_import_file_id
12
+ t.timestamps
13
+ end
14
+
15
+ add_index :event_import_file_transitions, :event_import_file_id
16
+ add_index :event_import_file_transitions, [:sort_key, :event_import_file_id], unique: true, name: "index_event_import_file_transitions_on_sort_key_and_file_id"
17
+ end
18
+ end