enju_biblio 0.3.10.rc.1 → 0.3.10.rc.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 77d5c642a35ec134208140ee6fbf038219d633619ba7a4a50927bcd14522e685
-  data.tar.gz: 814c6c8c7c795efa2cc55365805e1bbee2d7689d730593c56f00d012a7d4fa52
+  metadata.gz: 594364b4007cd3a2d5af9b206dc7d579c1ed730c373b9fe729fd3de1861f823f
+  data.tar.gz: 53f930524db4aeeaf96d8afb953930e42c131d5220b3dadb7d36c0d92b28468c
 SHA512:
-  metadata.gz: 969d8e56c2adfdc2b82b63bf193d28092348c7cb01675cc19e59e936e9ab73ab9878f8403a82397420c3f9469d37bbbcdf610f3d465980c6d5607d9219be510b
-  data.tar.gz: be66e593d2fd98df02e694169b53554aadd7a9d3369e731a96eede7bd3ef7336a48372025d55a4de462156d8d6018c4ee5b02954b49676f0d9a20cd90e161c96
+  metadata.gz: 69f690f9759526909b6526c7af9c27ee59fdbb2f55749ef04d37e7843979768baf792d4db9ed7998f2a98393f46a985241b0014737a5caebb27319db9f219e93
+  data.tar.gz: 108835494715119038df44b303a935abd29f370fd587e344b419554cca9492a352b03aa13e78617937bd9a03d72401caf56544c21a40c0f7e9135831fbade087

data/app/controllers/item_custom_properties_controller.rb

@@ -25,7 +25,7 @@ class ItemCustomPropertiesController < ApplicationController
     @item_custom_property = ItemCustomProperty.new(item_custom_property_params)
 
     if @item_custom_property.save
-      redirect_to @item_custom_property, notice: 'Item custom property was successfully created.'
+      redirect_to @item_custom_property, notice: t('controller.successfully_created', model: t('activerecord.models.item_custom_property'))
     else
       render :new
     end
@@ -33,8 +33,13 @@ class ItemCustomPropertiesController < ApplicationController
 
   # PATCH/PUT /item_custom_properties/1
   def update
+    if params[:move]
+      move_position(@item_custom_property, params[:move])
+      return
+    end
+
     if @item_custom_property.update(item_custom_property_params)
-      redirect_to @item_custom_property, notice: 'Item custom property was successfully updated.'
+      redirect_to @item_custom_property, notice: t('controller.successfully_updated', model: t('activerecord.models.item_custom_property'))
     else
       render :edit
     end
@@ -43,7 +48,7 @@ class ItemCustomPropertiesController < ApplicationController
   # DELETE /item_custom_properties/1
   def destroy
     @item_custom_property.destroy
-    redirect_to item_custom_properties_url, notice: 'Item custom property was successfully destroyed.'
+    redirect_to item_custom_properties_url, notice: t('controller.successfully_deleted', model: t('activerecord.models.item_custom_property'))
   end
 
   private

data/app/controllers/manifestation_custom_properties_controller.rb

@@ -25,7 +25,7 @@ class ManifestationCustomPropertiesController < ApplicationController
     @manifestation_custom_property = ManifestationCustomProperty.new(manifestation_custom_property_params)
 
     if @manifestation_custom_property.save
-      redirect_to @manifestation_custom_property, notice: 'Manifestation custom property was successfully created.'
+      redirect_to @manifestation_custom_property, notice: t('controller.successfully_created', model: t('activerecord.models.manifestation_custom_property'))
     else
       render :new
     end
@@ -33,8 +33,13 @@ class ManifestationCustomPropertiesController < ApplicationController
 
   # PATCH/PUT /manifestation_custom_properties/1
   def update
+    if params[:move]
+      move_position(@manifestation_custom_property, params[:move])
+      return
+    end
+
     if @manifestation_custom_property.update(manifestation_custom_property_params)
-      redirect_to @manifestation_custom_property, notice: 'Manifestation custom property was successfully updated.'
+      redirect_to @manifestation_custom_property, notice: t('controller.successfully_updated', model: t('activerecord.models.manifestation_custom_property'))
     else
       render :edit
     end
@@ -43,7 +48,7 @@ class ManifestationCustomPropertiesController < ApplicationController
   # DELETE /manifestation_custom_properties/1
   def destroy
     @manifestation_custom_property.destroy
-    redirect_to manifestation_custom_properties_url, notice: 'Manifestation custom property was successfully destroyed.'
+    redirect_to manifestation_custom_properties_url, notice: t('controller.successfully_deleted', model: t('activerecord.models.manifestation_custom_property'))
   end
 
   private

data/app/controllers/manifestations_controller.rb

@@ -332,7 +332,7 @@ class ManifestationsController < ApplicationController
       }
       format.rdf
       format.mods
-      format.json { render json: @manifestation }
+      format.json
       format.txt
       format.js
       format.download {

data/app/models/item.rb

@@ -107,10 +107,11 @@ class Item < ApplicationRecord
     record = {
       item_id: id,
       item_identifier: item_identifier,
+      binding_item_identifier: binding_item_identifier,
       call_number: call_number,
       shelf: shelf.name,
       item_note: note,
-      accepted_at: accept.try(:created_at),
+      accepted_at: accept&.created_at,
       acquired_at: acquired_at,
       item_created_at: created_at,
       item_updated_at: updated_at
@@ -118,8 +119,9 @@ class Item < ApplicationRecord
 
     if ['Administrator', 'Librarian'].include?(role)
       record.merge!({
-        bookstore: bookstore.try(:name),
-        budget_type: budget_type.try(:name),
+        bookstore: bookstore&.name,
+        budget_type: budget_type&.name,
+        item_required_role: required_role.name,
         item_price: price,
         memo: memo
       })
@@ -131,7 +133,9 @@ class Item < ApplicationRecord
 
       if defined?(EnjuCirculation)
         record.merge!({
-          use_restriction: use_restriction.try(:name),
+          use_restriction: use_restriction&.name,
+          circulation_status: circulation_status&.name,
+          checkout_type: checkout_type&.name,
           total_checkouts: checkouts.count
         })
       end

data/app/models/item_custom_property.rb

@@ -8,11 +8,11 @@ end
 #
 # Table name: item_custom_properties
 #
-#  id                        :bigint           not null, primary key
-#  name                      :string           not null
-#  display_name_translations :jsonb            not null
-#  note                      :text
-#  position                  :integer          default(1), not null
-#  created_at                :datetime         not null
-#  updated_at                :datetime         not null
+#  id           :integer          not null, primary key
+#  name         :string           not null
+#  display_name :text             not null
+#  note         :text
+#  position     :integer          default(1), not null
+#  created_at   :datetime         not null
+#  updated_at   :datetime         not null
 #

data/app/models/item_custom_value.rb

@@ -8,9 +8,9 @@ end
 #
 # Table name: item_custom_values
 #
-#  id                      :bigint           not null, primary key
-#  item_custom_property_id :bigint           not null
-#  item_id                 :bigint           not null
+#  id                      :integer          not null, primary key
+#  item_custom_property_id :integer          not null
+#  item_id                 :integer          not null
 #  value                   :text
 #  created_at              :datetime         not null
 #  updated_at              :datetime         not null

data/app/models/manifestation.rb

@@ -96,7 +96,7 @@ class Manifestation < ApplicationRecord
       end
     end
     string :language do
-      language.try(:name)
+      language&.name
     end
     string :item_identifier, multiple: true do
       if series_master?
@@ -120,7 +120,7 @@ class Manifestation < ApplicationRecord
     end
     time :date_of_publication
     integer :pub_year do
-      date_of_publication.try(:year)
+      date_of_publication&.year
     end
     integer :creator_ids, multiple: true
     integer :contributor_ids, multiple: true
@@ -357,7 +357,7 @@ class Manifestation < ApplicationRecord
   # TODO: よりよい推薦方法
   def self.pickup(keyword = nil, current_user = nil)
     return nil if self.cached_numdocs < 5
-    if current_user.try(:role)
+    if current_user&.role
       current_role_id = current_user.role.id
     else
       current_role_id = 1
@@ -433,7 +433,7 @@ class Manifestation < ApplicationRecord
   end
 
   def index_series_statement
-    series_statements.map{|s| s.index; s.root_manifestation.try(:index)}
+    series_statements.map{|s| s.index; s.root_manifestation&.index}
   end
 
   def acquired_at
@@ -541,16 +541,34 @@ class Manifestation < ApplicationRecord
   def to_hash(role: 'Guest')
     record = {
       manifestation_id: id,
-      title: original_title,
+      original_title: original_title,
       title_alternative: title_alternative,
       title_transcription: title_transcription,
       statement_of_responsibility: statement_of_responsibility,
       serial: serial,
       manifestation_identifier: manifestation_identifier,
-      creator: creators.pluck(:full_name).join('//'),
-      contributor: contributors.pluck(:full_name).join('//'),
-      publisher: publishers.pluck(:full_name).join('//'),
-      date_of_publication: date_of_publication,
+      creator: creates.map{|create|
+        if create.create_type
+          "#{create.agent.full_name}||#{create.creator_type.name}"
+        else
+          "#{create.agent.full_name}"
+        end
+      }.join('//'),
+      contributor: realizes.map{|realize|
+        if realize.realize_type
+          "#{realize.agent.full_name}||#{realize.realize_type.name}"
+        else
+          "#{realize.agent.full_name}"
+        end
+      }.join('//'),
+      publisher: produces.map{|produce|
+        if produce.produce_type
+          "#{produce.agent.full_name}||#{produce.realize_type.name}"
+        else
+          "#{produce.agent.full_name}"
+        end
+      }.join('//'),
+      pub_date: date_of_publication,
       year_of_publication: year_of_publication,
       publication_place: publication_place,
       manifestation_created_at: created_at,
@@ -577,13 +595,13 @@ class Manifestation < ApplicationRecord
       depth: depth,
       price: price,
       access_address: access_address,
-      required_role: required_role.name,
+      manifestation_required_role: required_role.name,
       description: description,
       note: note
     }
 
     IdentifierType.find_each do |type|
-      record[type.name.to_sym] = identifiers.where(identifier_type: type).pluck(:body).join('//')
+      record[:"identifier:#{type.name.to_sym}"] = identifiers.where(identifier_type: type).pluck(:body).join('//')
     end
 
     series = series_statements.order(:position)
@@ -610,7 +628,7 @@ class Manifestation < ApplicationRecord
       })
       ManifestationCustomProperty.order(:position).each do |custom_property|
         custom_value = manifestation_custom_values.find_by(manifestation_custom_property: custom_property)
-        record[:"manifestation:#{custom_property.name}"] = custom_value.try(:value)
+        record[:"manifestation:#{custom_property.name}"] = custom_value&.value
       end
     end
 
@@ -623,6 +641,14 @@ class Manifestation < ApplicationRecord
       end
     end
 
+    if defined?(EnjuNdl)
+      record["jpno"] = identifier_contents(:jpno).first
+    end
+
+    if defined?(EnjuNii)
+      record["ncid"] = ncid_record&.body
+    end
+
     record
   end
 

data/app/models/manifestation_custom_property.rb

@@ -8,11 +8,11 @@ end
 #
 # Table name: manifestation_custom_properties
 #
-#  id                        :bigint           not null, primary key
-#  name                      :string           not null
-#  display_name_translations :jsonb            not null
-#  note                      :text
-#  position                  :integer          default(1), not null
-#  created_at                :datetime         not null
-#  updated_at                :datetime         not null
+#  id           :integer          not null, primary key
+#  name         :string           not null
+#  display_name :text             not null
+#  note         :text
+#  position     :integer          default(1), not null
+#  created_at   :datetime         not null
+#  updated_at   :datetime         not null
 #

data/app/models/manifestation_custom_value.rb

@@ -8,9 +8,9 @@ end
 #
 # Table name: manifestation_custom_values
 #
-#  id                               :bigint           not null, primary key
-#  manifestation_custom_property_id :bigint           not null
-#  manifestation_id                 :bigint           not null
+#  id                               :integer          not null, primary key
+#  manifestation_custom_property_id :integer          not null
+#  manifestation_id                 :integer          not null
 #  value                            :text
 #  created_at                       :datetime         not null
 #  updated_at                       :datetime         not null

data/app/models/picture_file.rb

@@ -45,9 +45,7 @@ end
 #  id                      :integer          not null, primary key
 #  picture_attachable_id   :integer
 #  picture_attachable_type :string
-#  content_type            :string
 #  title                   :text
-#  thumbnail               :string
 #  position                :integer
 #  created_at              :datetime
 #  updated_at              :datetime

data/app/models/resource_export_file.rb

@@ -31,8 +31,10 @@ class ResourceExportFile < ApplicationRecord
     transition_to!(:started)
     role_name = user.try(:role).try(:name)
     tsv = Manifestation.export(role: role_name)
-    self.resource_export = StringIO.new(tsv)
-    self.resource_export.instance_write(:filename, "resource_export.txt")
+    file = StringIO.new(tsv)
+    file.class.class_eval { attr_accessor :original_filename, :content_type }
+    file.original_filename =  'resource_export.txt'
+    self.resource_export = file
     save!
     transition_to!(:completed)
     mailer = ResourceExportMailer.completed(self)

data/app/models/resource_import_file.rb

@@ -322,55 +322,15 @@ class ResourceImportFile < ApplicationRecord
     rows.each do |row|
       row_num += 1
       import_result = ResourceImportResult.create!(resource_import_file_id: id, body: row.fields.join("\t"))
-      item_identifier = row['item_identifier'].to_s.strip
-      item = Item.find_by(item_identifier: item_identifier) if item_identifier.present?
+      item = Item.find_by(item_identifier: row['item_identifier'].to_s.strip) if row['item_identifier'].to_s.strip.present?
+      unless item
+        item = Item.find_by(id: row['item_id'].to_s.strip) if row['item_id'].to_s.strip.present?
+      end
+
       if item
         if item.manifestation
           fetch(row, edit_mode: 'update')
-        end
-
-        shelf = Shelf.find_by(name: row['shelf'].to_s.strip)
-        bookstore = Bookstore.find_by(name: row['bookstore'])
-        required_role = Role.find_by(name: row['required_role'])
-
-        item.shelf = shelf if shelf
-        item.bookstore = bookstore if bookstore
-        item.required_role = required_role if required_role
-
-        acquired_at = Time.zone.parse(row['acquired_at']) rescue nil
-        binded_at = Time.zone.parse(row['binded_at']) rescue nil
-        item.acquired_at = acquired_at if acquired_at
-        item.binded_at = binded_at if binded_at
-
-        if defined?(EnjuCirculation)
-          circulation_status = CirculationStatus.find_by(name: row['circulation_status'])
-          checkout_type = CheckoutType.find_by(name: row['checkout_type'])
-          use_restriction = UseRestriction.find_by(name: row['use_restriction'].to_s.strip)
-          item.circulation_status = circulation_status if circulation_status
-          item.checkout_type = checkout_type if checkout_type
-          item.use_restriction = use_restriction if use_restriction
-        end
-
-        item_columns = %w(
-          call_number
-          binding_item_identifier binding_call_number binded_at
-        )
-        item_columns.each do |column|
-          if row[column].present?
-            item.assign_attributes(:"#{column}" => row[column])
-          end
-        end
-
-        item.price = row['item_price'] if row['item_price'].present?
-        item.note = row['item_note'].try(:gsub, /\\n/, "\n") if row['item_note'].present?
-        item.url = row['item_url'] if row['item_url'].present?
-
-        if row['include_supplements']
-          if %w(t true).include?(row['include_supplements'].downcase.strip)
-            item.include_supplements = true
-          else
-            item.include_supplements = false if item.include_supplements
-          end
+          item = update_item(item, row)
         end
 
         ResourceImportFile.import_item_custom_value(row, item).each do |value|
@@ -419,8 +379,11 @@ class ResourceImportFile < ApplicationRecord
 
     rows.each do |row|
       row_num += 1
-      item_identifier = row['item_identifier'].to_s.strip
-      item = Item.find_by(item_identifier: item_identifier)
+      item = Item.find_by(item_identifier: row['item_identifier'].to_s.strip) if row['item_identifier'].to_s.strip.present?
+      unless item
+        item = Item.find_by(id: row['item_id'].to_s.strip) if row['item_id'].to_s.strip.present?
+      end
+
       if item
         item.destroy if item.removable?
       end
@@ -444,10 +407,9 @@ class ResourceImportFile < ApplicationRecord
     row_num = 1
 
     rows.each do |row|
-      item_identifier = row['item_identifier'].to_s.strip
-      item = Item.find_by(item_identifier: item_identifier)
+      item = Item.find_by(item_identifier: row['item_identifier'].to_s.strip) if row['item_identifier'].to_s.strip.present?
       unless item
-        item = Item.find_by(id: row['item_id'].to_s.strip)
+        item = Item.find_by(id: row['item_id'].to_s.strip) if row['item_id'].to_s.strip.present?
       end
 
       manifestation_identifier = row['manifestation_identifier'].to_s.strip
@@ -603,12 +565,68 @@ class ResourceImportFile < ApplicationRecord
     item
   end
 
+  def update_item(item, row)
+    shelf = Shelf.find_by(name: row['shelf'].to_s.strip)
+    bookstore = Bookstore.find_by(name: row['bookstore'])
+    required_role = Role.find_by(name: row['required_role'])
+
+    item.shelf = shelf if shelf
+    item.bookstore = bookstore if bookstore
+    item.required_role = required_role if required_role
+
+    acquired_at = Time.zone.parse(row['acquired_at']) rescue nil
+    binded_at = Time.zone.parse(row['binded_at']) rescue nil
+    item.acquired_at = acquired_at if acquired_at
+    item.binded_at = binded_at if binded_at
+
+    if defined?(EnjuCirculation)
+      circulation_status = CirculationStatus.find_by(name: row['circulation_status'])
+      checkout_type = CheckoutType.find_by(name: row['checkout_type'])
+      use_restriction = UseRestriction.find_by(name: row['use_restriction'].to_s.strip)
+      item.circulation_status = circulation_status if circulation_status
+      item.checkout_type = checkout_type if checkout_type
+      item.use_restriction = use_restriction if use_restriction
+    end
+
+    item_columns = %w(
+      call_number
+      binding_item_identifier binding_call_number binded_at
+    )
+    item_columns.each do |column|
+      if row[column].present?
+        item.assign_attributes(:"#{column}" => row[column])
+      end
+    end
+
+    item.price = row['item_price'] if row['item_price'].present?
+    item.note = row['item_note'].try(:gsub, /\\n/, "\n") if row['item_note'].present?
+    item.url = row['item_url'] if row['item_url'].present?
+
+    if row['include_supplements']
+      if %w(t true).include?(row['include_supplements'].downcase.strip)
+        item.include_supplements = true
+      else
+        item.include_supplements = false if item.include_supplements
+      end
+    end
+
+    item
+  end
+
   def fetch(row, options = {edit_mode: 'create'})
-    case options[:edit_mode]
-    when 'create'
-      manifestation = nil
-    when 'update'
-      manifestation = Item.find_by(item_identifier: row['item_identifier'].to_s.strip).try(:manifestation)
+    manifestation = nil
+    item = nil
+
+    if options[:edit_mode] == 'update'
+      if row['item_identifier'].to_s.strip.present?
+        item = Item.find_by(item_identifier: row['item_identifier'].to_s.strip)
+      end
+      if row['item_id'].to_s.strip.present?
+        item = Item.find_by(id: row['item_id'].to_s.strip)
+      end
+
+      manifestation = item.manifestation if item
+
       unless manifestation
         manifestation_identifier = row['manifestation_identifier'].to_s.strip
         manifestation = Manifestation.find_by(manifestation_identifier: manifestation_identifier) if manifestation_identifier