enju_biblio 0.4.0.beta.2 → 0.4.0.rc.1

data/app/models/resource_export_file.rb

@@ -33,13 +33,9 @@ class ResourceExportFile < ApplicationRecord
   def export!
     transition_to!(:started)
     role_name = user.try(:role).try(:name)
-    tempfile = Tempfile.new(['resource_export_file_', '.txt'])
-    tempfile.puts(Manifestation.csv_header(role_name, col_sep: "\t"))
-    Manifestation.find_each do |manifestation|
-      tempfile.puts(manifestation.to_csv(format: :txt, role: role_name))
-    end
-    tempfile.close
-    self.resource_export = File.new(tempfile.path, "r")
+    tsv = Manifestation.export(role: role_name)
+    self.resource_export = StringIO.new(tsv)
+    self.resource_export.instance_write(:filename, "resource_export.txt")
     save!
     transition_to!(:completed)
     mailer = ResourceExportMailer.completed(self)
@@ -50,15 +46,6 @@ class ResourceExportFile < ApplicationRecord
     send_message(mailer)
     raise e
   end
-
-  private
-  def self.transition_class
-    ResourceExportFileTransition
-  end
-
-  def self.initial_state
-    :pending
-  end
 end
 
 # == Schema Information

data/app/models/resource_export_file_state_machine.rb

@@ -6,7 +6,7 @@ class ResourceExportFileStateMachine
   state :completed
   state :failed
 
-  transition from: :pending, to: :started
+  transition from: :pending, to: [:started, :failed]
   transition from: :started, to: [:completed, :failed]
 
   after_transition(from: :pending, to: :started) do |resource_export_file|

data/app/models/resource_import_file.rb

@@ -769,18 +769,10 @@ class ResourceImportFile < ApplicationRecord
     manifestation
   end
 
-  def self.transition_class
-    ResourceImportFileTransition
-  end
-
-  def self.initial_state
-    :pending
-  end
-
   def set_identifier(row)
     identifiers = []
     %w(isbn issn doi jpno ncid).each do |id_type|
-      if row["#{id_type}"].present?
+      if row[id_type.to_s].present?
         row[id_type].split(/\/\//).each do |identifier_s|
           import_id = Identifier.new(body: identifier_s)
           identifier_type = IdentifierType.find_by(name: id_type)

data/app/views/items/_custom_property_fields.html.erb

@@ -0,0 +1,7 @@
+<div class="nested-fields">
+  <%= f.label :label %>
+  <%= f.text_field :label, class: 'resource_custom_property_body' -%>
+  <%= f.label :value %>
+  <%= f.text_field :value, class: 'resource_custom_property_body' -%>
+  <%= link_to_remove_association t('page.remove'), f, data: {confirm: t('page.are_you_sure')} %><br />
+</div>

data/app/views/items/_form.html.erb

@@ -1,10 +1,12 @@
 <%= render 'manifestations/title', manifestation: @item.manifestation -%>
-<p>
-  <%= t('activerecord.models.classification') -%>:
-  <%- @item.manifestation.classifications.each do |classification| -%>
-    <%= link_to "#{classification.classification_type.display_name}: #{classification.category}", manifestations_path(query: "classification_sm:#{classification.classification_type.name}_#{classification.category}") -%>
-  <%- end -%>
-</p>
+<% if defined?(EnjuSubject) %>
+  <p>
+    <%= t('activerecord.models.classification') -%>:
+    <%- @item.manifestation.classifications.each do |classification| -%>
+      <%= link_to "#{classification.classification_type.display_name}: #{classification.category}", manifestations_path(query: "classification_sm:#{classification.classification_type.name}_#{classification.category}") -%>
+    <%- end -%>
+  </p>
+<% end %>
 <%= render 'page/required_field' %>
 <%= simple_form_for(@item) do |f| -%>
   <%= f.error_messages -%>
@@ -87,6 +89,16 @@
     <%= f.text_field :binding_item_identifier, class: 'resource_identifier' -%>
   </div>
 
+  <div class="field">
+    <%= f.label :custom_property -%><br />
+    <%= f.fields_for :custom_properties do |custom_property_form| %>
+      <%= render 'custom_property_fields', f: custom_property_form %>
+    <% end %>
+    <div class="links">
+      <p><%= link_to_add_association t('page.add'), f, :custom_properties %></p>
+    </div>
+  </div>
+
   <div class="field">
     <%= f.label :note -%><br />
     <%= f.text_area :note, class: 'resource_textarea' -%>

data/app/views/items/show.html.erb

@@ -72,7 +72,7 @@
 
   <p>
     <strong><%= t('activerecord.models.budget_type') -%>:</strong>
-    <%= @item.budget_type.try(:display_name).try(:localize) -%>
+    <%= @item.budget_type.try(:display_name) -%>
   </p>
 
   <p>
@@ -112,6 +112,13 @@
 </p>
 
 <% if current_user.try(:has_role?, 'Librarian') %>
+  <% @item.custom_properties.each do |custom_property| %>
+    <p>
+      <strong><%= custom_property.label -%>:</strong>
+      <%= custom_property.value -%>
+    </p>
+  <% end %>
+
   <p>
     <strong><%= t('activerecord.attributes.item.memo') -%>:</strong>
     <%= simple_format(@item.memo) %>

data/app/views/layouts/items.html.erb

@@ -4,7 +4,7 @@
   <meta charset="UTF-8" />
   <%= render 'page/include' %>
   <title><%= title(controller.controller_name) %></title>
-  <% if %w(index show new edit).include?(controller.action_name) %>
+  <% if %w(show edit index).include?(controller.action_name) && defined?(EnjuManifestationViewer) %>
     <%= book_jacket_header(@library_group.book_jacket_source) %>
   <% end %>
 </head>

data/app/views/layouts/manifestations.html.erb

@@ -8,7 +8,7 @@
     <%= auto_discovery_link_tag(:rss, url_for(filtered_params.merge(format: :rss, page: nil, commit: nil, only_path: true)), title: (t('manifestation.library_group_manifestation', library_group_name: @library_group.display_name) + " (RSS)")) %>
     <%= auto_discovery_link_tag(:atom, url_for(filtered_params.merge(format: :atom, page: nil, commit: nil, only_path: true)), title: (t('manifestation.library_group_manifestation', library_group_name: @library_group.display_name) + " (Atom)")) %>
   <%- end -%>
-  <% if %w(show edit index).include?(controller.action_name) %>
+  <% if %w(show edit index).include?(controller.action_name) && defined?(EnjuManifestationViewer) %>
     <%= book_jacket_header(@library_group.book_jacket_source) %>
   <% end %>
   <link rel="search" type="application/opensearchdescription+xml" title="<%= LibraryGroup.site_config.display_name %>" href="<%= page_opensearch_url(format: :xml) %>" />

data/app/views/manifestations/_custom_property_fields.html.erb

@@ -0,0 +1,7 @@
+<div class="nested-fields">
+  <%= f.label :label %>
+  <%= f.text_field :label, class: 'resource_custom_property_body' -%>
+  <%= f.label :value %>
+  <%= f.text_field :value, class: 'resource_custom_property_body' -%>
+  <%= link_to_remove_association t('page.remove'), f, data: {confirm: t('page.are_you_sure')} %><br />
+</div>

data/app/views/manifestations/_form.html.erb

@@ -192,6 +192,16 @@
     <%= f.text_area :description, class: 'resource_textarea' -%>
   </div>
 
+  <div class="field">
+    <%= f.label :custom_property -%><br />
+    <%= f.fields_for :custom_properties do |custom_property_form| %>
+      <%= render 'custom_property_fields', f: custom_property_form %>
+    <% end %>
+    <div class="links">
+      <p><%= link_to_add_association t('page.add'), f, :custom_properties %></p>
+    </div>
+  </div>
+
   <div class="field">
     <%= f.label :note -%><br />
     <%= f.text_area :note, class: 'resource_textarea' -%>

data/app/views/manifestations/_manifestation.txt.erb

@@ -1 +1 @@
-<%= manifestation.to_csv(format: :txt, role: current_user_role_name) -%>
+<%= manifestation.to_hash(role: current_user_role_name).values.to_csv(col_sep: "\t") -%>

data/app/views/manifestations/_paginate_id_link.html.erb

@@ -5,8 +5,8 @@
 <% end %>
 <%= form_for :manifestations, url: manifestations_path, html: {method: 'get'} do -%>
   <div>
-    <span id="next_link"><%= t('page.next') %></span>
     <span id="prev_link"><%= t('page.previous') %></span>
+    <span id="next_link"><%= t('page.next') %></span>
     <span id="back_link"><%= t('page.back_to_index') %></span>
     <%= label_tag :search_form_top, t('page.search_term') -%>:
     <%= search_field_tag 'query', @query, {id: 'search_form_top', class: 'search_form_short', placeholder: t('page.search_term')} -%>

data/app/views/manifestations/_show_detail_librarian.html.erb

@@ -3,7 +3,7 @@
     <div id="detail">
     <% cache([manifestation, fragment: 'show_detail_librarian_html', role: current_user_role_name, locale: @locale]) do %>
       <table class="table table-striped" id="resource_detail">
-        <%= embed_content(manifestation) -%>
+        <%= embed_content(manifestation) if defined?(EnjuManifestationViewer) -%>
         <% if manifestation.title_transcription? %>
           <tr>
             <td style="width: 200px"><%= t('activerecord.attributes.manifestation.title_transcription') -%>:</td>
@@ -101,6 +101,14 @@
             <%= raw simple_format(h(manifestation.description)) -%>
           </td>
         </tr>
+        <% @manifestation.custom_properties.each do |custom_property| %>
+          <tr>
+            <td><%= custom_property.label -%>:</td>
+            <td>
+              <%= custom_property.value -%>
+            </td>
+          </tr>
+        <% end %>
         <tr>
           <td><%= t('activerecord.attributes.manifestation.note') -%>:</td>
           <td>

data/app/views/manifestations/_show_detail_user.html.erb

@@ -3,7 +3,7 @@
     <div id="detail">
     <% cache([manifestation, fragment: 'show_detail_user_html', role: current_user_role_name, locale: @locale]) do %>
       <table class="table table-striped" id="resource_detail">
-        <%= embed_content(manifestation) -%>
+        <%= embed_content(manifestation) if defined?(EnjuManifestationViewer) -%>
         <% if manifestation.title_transcription? %>
           <tr>
             <td style="width: 200px"><%= t('activerecord.attributes.manifestation.title_transcription') -%>:</td>

data/app/views/manifestations/index.txt.ruby

@@ -0,0 +1,7 @@
+Manifestation.csv_header(
+  role: current_user_role_name
+).to_csv(col_sep: "\t") + @manifestations.map{|manifestation|
+  manifestation.to_hash(
+    role: current_user_role_name
+  ).values.to_csv(col_sep: "\t")
+}.join

data/app/views/manifestations/show.txt.ruby

@@ -0,0 +1,5 @@
+Manifestation.csv_header(
+  role: current_user_role_name
+).to_csv(col_sep: "\t") + @manifestation.to_hash(
+  role: current_user_role_name
+).values.to_csv(col_sep: "\t")

data/app/views/resource_import_files/_results.html.erb

@@ -1,4 +1,10 @@
 <h2><%= t('activerecord.models.resource_import_result') %></h2>
+
+<p>
+  <%= link_to((image_tag 'icons/page_white_excel.png', size: '16x16', alt: 'TSV', class: 'enju_icon'), resource_import_results_path(resource_import_file_id: @resource_import_file.id, format: :txt)) -%>
+  (<%= link_to 'TSV', resource_import_results_path(resource_import_file_id: @resource_import_file.id, format: :txt) -%>)
+</p>
+
 <table class="table table-striped index">
   <tr>
     <th><%= t('activerecord.attributes.resource_import_result.lineno') %></th>

data/app/views/resource_import_results/index.html.erb

@@ -13,15 +13,4 @@
 </div>
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
-  <ul>
-    <li>
-    <% if @resource_import_file %>
-      <%= link_to((image_tag 'icons/page_white_excel.png', size: '16x16', alt: 'TSV', class: 'enju_icon'), resource_import_results_path(resource_import_file_id: @resource_import_file.id, format: :txt)) -%>
-      (<%= link_to 'TSV', resource_import_results_path(resource_import_file_id: @resource_import_file.id, format: :txt) -%>)
-    <% else %>
-      <%= link_to((image_tag 'icons/page_white_excel.png', size: '16x16', alt: 'TSV', class: 'enju_icon'), resource_import_results_path(format: :txt)) -%>
-      (<%= link_to 'TSV', resource_import_results_path(format: :txt) -%>)
-    <% end %>
-    </li>
-  </ul>
 </div>

data/app/views/series_statements/_form.html.erb

@@ -24,20 +24,18 @@
     <%= f.label :title_subseries_transcription %><br />
     <%= f.text_field :title_subseries_transcription %>
   </div>
-  <!--
   <div class="field">
-    <%= f.label :numbering %><br />
-    <%= f.text_field :numbering %>
+    <%= f.label :creator_string %><br />
+    <%= f.text_field :creator_string %>
   </div>
   <div class="field">
-    <%= f.label :numbering_subseries -%><br />
-    <%= f.text_field :numbering_subseries %>
+    <%= f.label :volume_number_string %><br />
+    <%= f.text_field :volume_number_string %>
   </div>
   <div class="field">
-    <%= f.label :series_statement_identifier -%><br />
-    <%= f.text_field :series_statement_identifier, class: 'resource_identifier' %>
+    <%= f.label :series_master %><br />
+    <%= f.check_box :series_master %>
   </div>
-  -->
   <div class="field">
     <%= f.label :note -%><br />
     <%= f.text_area :note, class: 'resource_textarea' -%>

data/app/views/series_statements/show.html.erb

@@ -23,6 +23,18 @@
         <% end %>
       </td>
     </tr>
+    <tr>
+      <td><%= t('activerecord.attributes.series_statement.volume_number_string') -%></td>
+      <td><%= @series_statement.volume_number_string %></td>
+    </tr>
+    <tr>
+      <td><%= t('activerecord.attributes.series_statement.creator_string') -%></td>
+      <td><%= @series_statement.creator_string %></td>
+    </tr>
+    <tr>
+      <td><%= t('activerecord.attributes.series_statement.series_master') -%></td>
+      <td><%= localized_boolean(@series_statement.series_master) %></td>
+    </tr>
     <tr>
       <td><%= t('activerecord.attributes.series_statement.note') -%></td>
       <td><%= @series_statement.note %></td>

data/config/locales/translation_en.yml

@@ -78,7 +78,7 @@ en:
         memo: Memo
         repository_content: Repository content
         lock_version: Lock version
-        carrier_type: Manifestation form
+        carrier_type: Carrier type
         language: Language
         lccn: LCCN
         issn: ISSN
@@ -99,12 +99,16 @@ en:
         extent: Extent
         dimensions: Dimensions
         fulltext_content: Fulltext content
+        custom_property: Custom property
       manifestation/subjects:
           term: Subject
       manifestation/classifications:
           category: Classification
       manifestation/identifiers:
           body: Identifier
+      manifestation/custom_properties:
+        label: Label
+        value: Value
       item:
         call_number: Call number
         item_identifier: Item identifier
@@ -123,6 +127,10 @@ en:
         budget_type_id: Budget type
         bookstore_id: Bookstore
         required_role_id: Required role
+        custom_property: Custom property
+      item/custom_properties:
+        label: Label
+        value: Value
       agent:
         last_name: Last name
         middle_name: Middle name
@@ -333,6 +341,9 @@ en:
       series_statement_merge_list:
         title: Title
       series_statement_merge:
+      custom_property:
+        label: Label
+        value: Value
 
   resource_import_file:
     update_relationship: Update relationship

data/config/locales/translation_ja.yml

@@ -99,12 +99,16 @@ ja:
         extent: ページ数
         dimensions: 大きさ
         fulltext_content: 全文あり
+        custom_property: カスタム項目
       manifestation/subjects:
-          term: 件名
+        term: 件名
       manifestation/classifications:
-          category: 分類
+        category: 分類
       manifestation/identifiers:
-          body: 識別子
+        body: 識別子
+      manifestation/custom_properties:
+        label: 項目名
+        value: 値
       item:
         call_number: 請求記号
         item_identifier: 所蔵情報ID
@@ -123,6 +127,10 @@ ja:
         budget_type_id: 予算種別
         bookstore_id: 書店
         required_role_id: 閲覧に必要な権限
+        custom_property: カスタム項目
+      item/custom_properties:
+        label: 項目名
+        value: 値
       agent:
         last_name: 姓
         middle_name: ミドルネーム
@@ -337,6 +345,9 @@ ja:
       series_statement_merge_list:
         title: タイトル
       series_statement_merge:
+      custom_property:
+        label: 項目名
+        value: 値
 
   resource_import_file:
     update_relationship: 関連を更新

data/db/migrate/001_create_agents.rb

@@ -13,7 +13,6 @@ class CreateAgents < ActiveRecord::Migration[4.2]
       t.text :full_name_transcription
       t.text :full_name_alternative
       t.timestamps
-      t.datetime :deleted_at
       t.string :zip_code_1
       t.string :zip_code_2
       t.text :address_1

data/db/migrate/005_create_manifestations.rb

@@ -9,7 +9,6 @@ class CreateManifestations < ActiveRecord::Migration[4.2]
       t.datetime :date_of_publication
       t.datetime :copyright_date
       t.timestamps
-      t.datetime :deleted_at
       t.string :access_address
       t.integer :language_id, default: 1, null: false
       t.integer :carrier_type_id, default: 1, null: false

data/db/migrate/006_create_items.rb

@@ -4,7 +4,6 @@ class CreateItems < ActiveRecord::Migration[4.2]
       t.string :call_number
       t.string :item_identifier
       t.timestamps
-      t.datetime :deleted_at
       t.integer :shelf_id, default: 1, null: false
       t.boolean :include_supplements, default: false, null: false
       t.text :note

data/db/migrate/20191219122214_create_custom_properties.rb

@@ -0,0 +1,12 @@
+class CreateCustomProperties < ActiveRecord::Migration[5.2]
+  def change
+    create_table :custom_properties do |t|
+      t.integer :resource_id, null: false
+      t.string :resource_type, null: false
+      t.text :label, null: false
+      t.text :value
+
+      t.timestamps
+    end
+  end
+end

data/lib/enju_biblio/version.rb

@@ -1,3 +1,3 @@
 module EnjuBiblio
-  VERSION = "0.4.0.beta.2"
+  VERSION = "0.4.0.rc.1".freeze
 end