enju_biblio 0.3.6 → 0.3.7

data/app/models/resource_export_file.rb

@@ -30,13 +30,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)

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/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.localize}: #{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

@@ -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/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/_show_detail_librarian.html.erb

@@ -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/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

@@ -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
@@ -333,6 +337,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
@@ -337,6 +341,9 @@ ja:
       series_statement_merge_list:
         title: タイトル
       series_statement_merge:
+      custom_property:
+        label: 項目名
+        value: 値
 
   resource_import_file:
     update_relationship: 関連を更新

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.3.6"
+  VERSION = "0.3.7"
 end

data/spec/controllers/items_controller_spec.rb

@@ -265,6 +265,19 @@ describe ItemsController do
           assigns(:item).manifestation.should_not be_nil
           expect(response).to redirect_to(item_url(assigns(:item)))
         end
+
+        it 'assigns custom properties to @item' do
+          item = FactoryBot.create(:item_custom_property).resource
+          custom_properties_attrs = {
+            custom_properties_attributes: [{label: 'test', value: 'テスト'}]
+          }
+          put :update, params: {
+            id: item.id, item: @attrs.merge(custom_properties_attrs)
+          }
+          expect(assigns(:item)).to eq item
+          expect(assigns(:item).custom_properties.map{|property| property.label}).to eq ['custom property 1', 'test']
+          expect(assigns(:item).custom_properties.map{|property| property.value}).to eq ['カスタム項目 1', 'テスト']
+        end
       end
 
       describe 'with invalid params' do
@@ -435,6 +448,18 @@ describe ItemsController do
           put :update, params: { id: @item, item: @invalid_attrs }
           expect(response).to render_template('edit')
         end
+
+        it 'assigns custom properties to @item' do
+          item = FactoryBot.create(:item_custom_property).resource
+          custom_properties_attrs = {
+            custom_properties_attributes: [{name: 'test', value: 'テスト'}]
+          }
+          put :update, params: {
+            id: item.id, item: @invalid_attrs.merge(custom_properties_attrs)
+          }
+          expect(assigns(:item).custom_properties.count).to eq 1
+          expect(assigns(:item)).to_not be_valid
+        end
       end
     end
 

data/spec/controllers/manifestations_controller_spec.rb

@@ -716,6 +716,19 @@ describe ManifestationsController do
           }
           expect(assigns(:manifestation)).to eq @manifestation
         end
+
+        it 'assigns custom properties to @manifestation' do
+          manifestation = FactoryBot.create(:manifestation_custom_property).resource
+          custom_properties_attrs = {
+            custom_properties_attributes: [{label: 'test', value: 'テスト'}]
+          }
+          put :update, params: {
+            id: manifestation.id, manifestation: @attrs.merge(custom_properties_attrs)
+          }
+          expect(assigns(:manifestation)).to eq manifestation
+          expect(assigns(:manifestation).custom_properties.map{|property| property.label}).to eq ['custom property 1', 'test']
+          expect(assigns(:manifestation).custom_properties.map{|property| property.value}).to eq ['カスタム項目 1', 'テスト']
+        end
       end
 
       describe 'with invalid params' do
@@ -741,6 +754,18 @@ describe ManifestationsController do
           }
           expect(assigns(:manifestation)).to_not be_valid
         end
+
+        it 'assigns custom properties to @manifestation' do
+          manifestation = FactoryBot.create(:manifestation_custom_property).resource
+          custom_properties_attrs = {
+            custom_properties_attributes: [{name: 'test', value: 'テスト'}]
+          }
+          put :update, params: {
+            id: manifestation.id, manifestation: @invalid_attrs.merge(custom_properties_attrs)
+          }
+          expect(assigns(:manifestation).custom_properties.count).to eq 1
+          expect(assigns(:manifestation)).to_not be_valid
+        end
       end
     end
 

data/spec/dummy/db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2019_08_18_075628) do
+ActiveRecord::Schema.define(version: 2019_12_19_122214) do
 
   create_table "accepts", force: :cascade do |t|
     t.integer "basket_id"
@@ -433,6 +433,15 @@ ActiveRecord::Schema.define(version: 2019_08_18_075628) do
     t.index ["work_id"], name: "index_creates_on_work_id"
   end
 
+  create_table "custom_properties", force: :cascade do |t|
+    t.integer "resource_id", null: false
+    t.string "resource_type", null: false
+    t.text "label", null: false
+    t.text "value"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+  end
+
   create_table "demands", force: :cascade do |t|
     t.integer "user_id"
     t.integer "item_id"

data/spec/factories/custom_property.rb

@@ -0,0 +1,18 @@
+FactoryBot.define do
+  factory :custom_property do
+    sequence(:label){|n| "custom property #{n}"}
+    sequence(:value){|n| "カスタム項目 #{n}"}
+  end
+
+  factory :manifestation_custom_property, class: CustomProperty do
+    association :resource, factory: :manifestation
+    sequence(:label){|n| "custom property #{n}"}
+    sequence(:value){|n| "カスタム項目 #{n}"}
+  end
+
+  factory :item_custom_property, class: CustomProperty do
+    association :resource, factory: :item
+    sequence(:label){|n| "custom property #{n}"}
+    sequence(:value){|n| "カスタム項目 #{n}"}
+  end
+end

data/spec/factories/series_statement.rb

@@ -2,9 +2,10 @@ FactoryBot.define do
   factory :series_statement do |f|
     f.sequence(:original_title){|n| "series_statement_#{n}"}
   end
-  factory :series_statement_serial, class: SeriesStatement do |f|
-    f.sequence(:original_title){|n| "series_statement_serial_#{n}" }
+  factory :series_statement_serial, class: SeriesStatement do
+    sequence(:original_title){|n| "series_statement_serial_#{n}" }
+    sequence(:creator_string){|n| "シリーズの著者 #{n}" }
     #f.root_manifestation_id{FactoryBot.create(:manifestation_serial).id}
-    f.series_master{true}
+    series_master{true}
   end
 end

data/spec/fixtures/items.yml

@@ -231,7 +231,7 @@ item_00021:
   include_supplements: false
   created_at: 2007-08-24 23:46:20.484813 +09:00
 item_00022: 
-  updated_at: 2007-08-24 23:46:20.484813 +09:00
+  updated_at: 2007-08-24 23:46:21.484813 +09:00
   item_identifier: '00022'
   circulation_status_id: 2
   checkout_type_id: 3
@@ -240,9 +240,9 @@ item_00022:
   manifestation_id: 11
   id: 22
   include_supplements: false
-  created_at: 2007-08-24 23:46:20.484813 +09:00
+  created_at: 2007-08-24 23:46:21.484813 +09:00
 item_00023: 
-  updated_at: 2007-08-24 23:46:20.484813 +09:00
+  updated_at: 2007-08-24 23:46:22.484813 +09:00
   item_identifier: '00023'
   circulation_status_id: 15
   checkout_type_id: 3
@@ -251,9 +251,9 @@ item_00023:
   manifestation_id: 11
   id: 23
   include_supplements: false
-  created_at: 2007-08-24 23:46:20.484813 +09:00
+  created_at: 2007-08-24 23:46:22.484813 +09:00
 item_00024: 
-  updated_at: 2007-08-24 23:46:08.607081 +09:00
+  updated_at: 2007-08-24 23:46:23.607081 +09:00
   item_identifier: '00024'
   circulation_status_id: 2
   checkout_type_id: 1
@@ -262,10 +262,10 @@ item_00024:
   manifestation_id: 102
   id: 24
   include_supplements: false
-  created_at: 2007-08-24 23:46:08.607081 +09:00
-  acquired_at: 2015-08-25 23:46:08.607081 +09:00
+  created_at: 2007-08-24 23:23:08.607081 +09:00
+  acquired_at: 2015-08-25 23:23:08.607081 +09:00
 item_00025: 
-  updated_at: 2007-08-24 23:46:08.607081 +09:00
+  updated_at: 2007-08-24 23:46:24.607081 +09:00
   item_identifier: '00025'
   circulation_status_id: 2
   checkout_type_id: 1
@@ -274,8 +274,8 @@ item_00025:
   manifestation_id: 102
   id: 25
   include_supplements: false
-  created_at: 2007-08-24 23:46:08.607081 +09:00
-  acquired_at: 2015-09-25 23:46:08.607081 +09:00
+  created_at: 2007-08-24 23:46:24.607081 +09:00
+  acquired_at: 2015-09-25 23:46:24.607081 +09:00
 
 # == Schema Information
 #
@@ -304,4 +304,5 @@ item_00025:
 #  binding_call_number     :string
 #  binded_at               :datetime
 #  manifestation_id        :integer          not null
+#  memo                    :text
 #