enju_biblio 0.3.9 → 0.3.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 26edca170abbc3255a6a2f00579b4da714df3bbe174873e4b110c79da9c59a87
-  data.tar.gz: 2e7d74038d3e5bfb1f2fb44f54a6e86aad624b84e8f20c55cb818a4bf74e8bf0
+  metadata.gz: 7ddb2060da09b931f698c95fe7183cea10953bb55d708d79cf118311af367c2b
+  data.tar.gz: de17c215f560054db264c931878c2a1ff2fd3ed0811911fb2feab4384afd03a0
 SHA512:
-  metadata.gz: b6e053f60b7a611c81ddc0b052def4209d96d1fd23044dc81296dc755e19409d64b625109f34da67588c7984fce670cc4b74973b99af927a459ea910b6d9f4c5
-  data.tar.gz: 1d920ee17e99acf17fd92e18ff3186139daf93940e1be813b5b1f99ffdc0d008029bde5735c05a4978363b185d32090b4f683f3abc63786d7641285f903924f2
+  metadata.gz: c577988123593c8b17f9cbe904492a4f148fb51d98f8294e863e639375303c9901a4fe8a67e3c471d1e406ab98399d86d6bd1b4bd6723ed547e2118f43c165a2
+  data.tar.gz: 6e65d6634be373354842dee7cf6fb8c6dd2e3b9683185b8ffbc5246e45061fe20e7f4c6566d24118a823598c439939ec7036bda2c9fc48e6eb82da6f3e187498

data/app/controllers/content_types_controller.rb

@@ -5,7 +5,7 @@ class ContentTypesController < ApplicationController
   # GET /content_types
   # GET /content_types.json
   def index
-    @content_types = ContentType.all
+    @content_types = ContentType.order(:position)
 
     respond_to do |format|
       format.html # index.html.erb

data/app/controllers/item_custom_properties_controller.rb

@@ -0,0 +1,69 @@
+class ItemCustomPropertiesController < ApplicationController
+  before_action :set_item_custom_property, only: [:show, :edit, :update, :destroy]
+  before_action :check_policy, only: [:index, :new, :create ]
+
+  # GET /item_custom_properties
+  def index
+    @item_custom_properties = ItemCustomProperty.order(:position)
+  end
+
+  # GET /item_custom_properties/1
+  def show
+  end
+
+  # GET /item_custom_properties/new
+  def new
+    @item_custom_property = ItemCustomProperty.new
+  end
+
+  # GET /item_custom_properties/1/edit
+  def edit
+  end
+
+  # POST /item_custom_properties
+  def create
+    @item_custom_property = ItemCustomProperty.new(item_custom_property_params)
+
+    if @item_custom_property.save
+      redirect_to @item_custom_property, notice: t('controller.successfully_created', model: t('activerecord.models.item_custom_property'))
+    else
+      render :new
+    end
+  end
+
+  # 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: t('controller.successfully_updated', model: t('activerecord.models.item_custom_property'))
+    else
+      render :edit
+    end
+  end
+
+  # DELETE /item_custom_properties/1
+  def destroy
+    @item_custom_property.destroy
+    redirect_to item_custom_properties_url, notice: t('controller.successfully_deleted', model: t('activerecord.models.item_custom_property'))
+  end
+
+  private
+    # Use callbacks to share common setup or constraints between actions.
+    def set_item_custom_property
+      @item_custom_property = ItemCustomProperty.find(params[:id])
+      authorize @item_custom_property
+    end
+
+    def check_policy
+      authorize ItemCustomProperty
+    end
+
+    # Only allow a trusted parameter "white list" through.
+    def item_custom_property_params
+      params.require(:item_custom_property).permit(:name, :display_name, :note)
+    end
+end

data/app/controllers/items_controller.rb

@@ -274,6 +274,9 @@ class ItemsController < ApplicationController
       :binding_item_identifier, :binding_call_number, :binded_at,
       :use_restriction_id, :memo,
       {item_has_use_restriction_attributes: :use_restriction_id}, # EnjuCirculation
+      {item_custom_values_attributes: [
+        :id, :item_custom_property_id, :item_id, :value,:_destroy
+      ]}
     )
   end
 

data/app/controllers/manifestation_custom_properties_controller.rb

@@ -0,0 +1,69 @@
+class ManifestationCustomPropertiesController < ApplicationController
+  before_action :set_manifestation_custom_property, only: [:show, :edit, :update, :destroy]
+  before_action :check_policy, only: [:index, :new, :create ]
+
+  # GET /manifestation_custom_properties
+  def index
+    @manifestation_custom_properties = ManifestationCustomProperty.order(:position)
+  end
+
+  # GET /manifestation_custom_properties/1
+  def show
+  end
+
+  # GET /manifestation_custom_properties/new
+  def new
+    @manifestation_custom_property = ManifestationCustomProperty.new
+  end
+
+  # GET /manifestation_custom_properties/1/edit
+  def edit
+  end
+
+  # POST /manifestation_custom_properties
+  def create
+    @manifestation_custom_property = ManifestationCustomProperty.new(manifestation_custom_property_params)
+
+    if @manifestation_custom_property.save
+      redirect_to @manifestation_custom_property, notice: t('controller.successfully_created', model: t('activerecord.models.manifestation_custom_property'))
+    else
+      render :new
+    end
+  end
+
+  # 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: t('controller.successfully_updated', model: t('activerecord.models.manifestation_custom_property'))
+    else
+      render :edit
+    end
+  end
+
+  # DELETE /manifestation_custom_properties/1
+  def destroy
+    @manifestation_custom_property.destroy
+    redirect_to manifestation_custom_properties_url, notice: t('controller.successfully_deleted', model: t('activerecord.models.manifestation_custom_property'))
+  end
+
+  private
+    # Use callbacks to share common setup or constraints between actions.
+    def set_manifestation_custom_property
+      @manifestation_custom_property = ManifestationCustomProperty.find(params[:id])
+      authorize @manifestation_custom_property
+    end
+
+    def check_policy
+      authorize ManifestationCustomProperty
+    end
+
+    # Only allow a trusted parameter "white list" through.
+    def manifestation_custom_property_params
+      params.require(:manifestation_custom_property).permit(:name, :display_name, :note)
+    end
+end

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 {
@@ -549,6 +549,9 @@ class ManifestationsController < ApplicationController
       {identifiers_attributes: [
         :id, :body, :identifier_type_id,
         :_destroy
+      ]},
+      {manifestation_custom_values_attributes: [
+        :id, :manifestation_custom_property_id, :manifestation_id, :value,:_destroy
       ]}
     )
   end
@@ -734,12 +737,12 @@ class ManifestationsController < ApplicationController
   end
 
   def prepare_options
-    @carrier_types = CarrierType.select([:id, :display_name, :position])
-    @content_types = ContentType.select([:id, :display_name, :position])
+    @carrier_types = CarrierType.order(:position).select([:id, :display_name, :position])
+    @content_types = ContentType.order(:position).select([:id, :display_name, :position])
     @roles = Role.select([:id, :display_name, :position])
-    @languages = Language.select([:id, :display_name, :position])
-    @frequencies = Frequency.select([:id, :display_name, :position])
-    @identifier_types = IdentifierType.select([:id, :display_name, :position])
+    @languages = Language.order(:position).select([:id, :display_name, :position])
+    @frequencies = Frequency.order(:position).select([:id, :display_name, :position])
+    @identifier_types = IdentifierType.order(:position).select([:id, :display_name, :position])
     @nii_types = NiiType.select([:id, :display_name, :position]) if defined?(EnjuNii)
     if defined?(EnjuSubject)
       @subject_types = SubjectType.select([:id, :display_name, :position])

data/app/controllers/resource_import_results_controller.rb

@@ -5,9 +5,13 @@ class ResourceImportResultsController < ApplicationController
   # GET /resource_import_results
   # GET /resource_import_results.json
   def index
-    @resource_import_file = ResourceImportFile.where(id: params[:resource_import_file_id]).first
+    @resource_import_file = ResourceImportFile.find_by(id: params[:resource_import_file_id])
     if @resource_import_file
-      @resource_import_results = @resource_import_file.resource_import_results.page(params[:page])
+      if params[:format].to_s.downcase == 'txt'
+        @resource_import_results = @resource_import_file.resource_import_results
+      else
+        @resource_import_results = @resource_import_file.resource_import_results.page(params[:page])
+      end
     else
       @resource_import_results = ResourceImportResult.page(params[:page])
     end

data/app/models/agent_type.rb

@@ -1,6 +1,5 @@
 class AgentType < ApplicationRecord
   include MasterModel
-  default_scope { order('agent_types.position') }
   has_many :agents
 end
 

data/app/models/carrier_type.rb

@@ -1,6 +1,5 @@
 class CarrierType < ApplicationRecord
   include MasterModel
-  default_scope { order("carrier_types.position") }
   has_many :manifestations
   if ENV['ENJU_STORAGE'] == 's3'
     has_attached_file :attachment, storage: :s3,

data/app/models/content_type.rb

@@ -1,6 +1,5 @@
 class ContentType < ApplicationRecord
   include MasterModel
-  default_scope { order('content_types.position') }
   has_many :manifestations
 end
 

data/app/models/form_of_work.rb

@@ -1,7 +1,6 @@
 class FormOfWork < ApplicationRecord
   include MasterModel
-  default_scope { order('form_of_works.position') }
-  has_many :works
+  has_many :works, class_name: 'Manifestation'
 end
 
 # == Schema Information

data/app/models/frequency.rb

@@ -1,6 +1,5 @@
 class Frequency < ApplicationRecord
   include MasterModel
-  default_scope { order('frequencies.position') }
   has_many :manifestations
 end
 

data/app/models/identifier_type.rb

@@ -1,6 +1,5 @@
 class IdentifierType < ApplicationRecord
   include MasterModel
-  default_scope { order('identifier_types.position') }
   has_many :identifiers
   validates :name, format: { with: /\A[0-9a-z][0-9a-z_\-]*[0-9a-z]\Z/ }
 end

data/app/models/item.rb

@@ -19,10 +19,12 @@ class Item < ApplicationRecord
   belongs_to :budget_type, optional: true
   has_one :accept, dependent: :destroy
   has_one :withdraw, dependent: :destroy
-  scope :accepted_between, lambda{|from, to| includes(:accept).where('items.created_at BETWEEN ? AND ?', Time.zone.parse(from).beginning_of_day, Time.zone.parse(to).end_of_day)}
+  has_many :item_custom_values, -> { joins(:item_custom_property).order(:position) }
 
   belongs_to :shelf, counter_cache: true
+  accepts_nested_attributes_for :item_custom_values, reject_if: :all_blank
 
+  scope :accepted_between, lambda{|from, to| includes(:accept).where('items.created_at BETWEEN ? AND ?', Time.zone.parse(from).beginning_of_day, Time.zone.parse(to).end_of_day)}
   validates_associated :bookstore
   validates :manifestation_id, presence: true
   validates :item_identifier, allow_blank: true, uniqueness: true,
@@ -105,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,
+      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
@@ -116,15 +119,23 @@ 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
       })
 
+      ItemCustomProperty.order(:position).each do |custom_property|
+        custom_value = item_custom_values.find_by(item_custom_property: custom_property)
+        record[:"item:#{custom_property.name}"] = custom_value.try(:value)
+      end
+
       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

@@ -0,0 +1,18 @@
+class ItemCustomProperty < ApplicationRecord
+  include MasterModel
+  validates :name, presence: true, uniqueness: true
+  acts_as_list
+end
+
+# == Schema Information
+#
+# Table name: item_custom_properties
+#
+#  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

@@ -0,0 +1,17 @@
+class ItemCustomValue < ApplicationRecord
+  belongs_to :item_custom_property
+  belongs_to :item, required: false
+  validates :item_custom_property, uniqueness: {scope: :item_id}
+end
+
+# == Schema Information
+#
+# Table name: item_custom_values
+#
+#  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/license.rb

@@ -1,6 +1,5 @@
 class License < ApplicationRecord
   include MasterModel
-  default_scope { order('licenses.position') }
 end
 
 # == Schema Information

data/app/models/manifestation.rb

@@ -25,11 +25,13 @@ class Manifestation < ApplicationRecord
   belongs_to :required_role, class_name: 'Role', foreign_key: 'required_role_id'
   has_one :resource_import_result
   has_many :identifiers, dependent: :destroy
+  has_many :manifestation_custom_values, -> { joins(:manifestation_custom_property).order(:position) }
   accepts_nested_attributes_for :creators, allow_destroy: true, reject_if: :all_blank
   accepts_nested_attributes_for :contributors, allow_destroy: true, reject_if: :all_blank
   accepts_nested_attributes_for :publishers, allow_destroy: true, reject_if: :all_blank
   accepts_nested_attributes_for :series_statements, allow_destroy: true, reject_if: :all_blank
   accepts_nested_attributes_for :identifiers, allow_destroy: true, reject_if: :all_blank
+  accepts_nested_attributes_for :manifestation_custom_values, reject_if: :all_blank
 
   searchable do
     text :title, default_boost: 2 do
@@ -94,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?
@@ -118,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
@@ -355,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
@@ -431,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
@@ -539,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.create_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.produce_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,
@@ -575,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)
@@ -606,6 +626,10 @@ class Manifestation < ApplicationRecord
       record.merge!({
         memo: memo
       })
+      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&.value
+      end
     end
 
     if defined?(EnjuSubject)
@@ -617,6 +641,14 @@ class Manifestation < ApplicationRecord
       end
     end
 
+    if defined?(EnjuNdl)
+      record["jpno"] = identifier_contents(:jpno).first
+    end
+
+    if defined?(EnjuNii)
+      record["ncid"] = identifier_contents(:ncid).first
+    end
+
     record
   end
 
@@ -659,6 +691,18 @@ class Manifestation < ApplicationRecord
       ]
     }.flatten
   end
+
+  def set_custom_property(row)
+    ManifestationCustomProperty.all.each do |property|
+      if row[property]
+        custom_value = ManifestationCustomValue.new(
+          manifestation: self,
+          manifestation_custom_property: property,
+          value: row[property]
+        )
+      end
+    end
+  end
 end
 
 # == Schema Information