enju_biblio 0.3.8 → 0.3.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14f03cf53c6970882201d12cf5dce14dcd8299abe9b86a85395fc7a5469c0e65
-  data.tar.gz: 62953ed2450999eb1622b5552d84fd845e6332de65ba4bd4b853a95fff5c5af3
+  metadata.gz: 3d531d406b5fda2fe6871aacfff5e40ee50b4b9e705011b48194043636435d4f
+  data.tar.gz: 254254c68a6ad93a6e05ca9db4bcc38dcb5abd6ba100cdb26dd9f1d6cc8a3ee1
 SHA512:
-  metadata.gz: ce8d9794d43731afcd91bdc6e84a5f49ef3f98ab17a80016b306956fc4ecfebec23a9f7ace9e992d1cea0eb8d76d2a12ef9c151edc773d587bf7db75787f642a
-  data.tar.gz: 6981d61da93ea05bb04bb3d218b6152bc2db9bbed3365049748fc7df5442d82ef2ae5de904d3cf3f479bdadd67346d31f52bba1f03fffe181cc2f6114dc79aa8
+  metadata.gz: ab53272b3a84a1970be279892113c5296ca7eb3ee5fa8058d807b716737597dabe1d4a087e1abfed6763853920a922096ba0d932de6e2645bb3dfb96040e3f50
+  data.tar.gz: 9967b069e6d50dd77c0ed2f1d42c06d574d1138164e569043fb00861bd4b6246105288f052fb0351993a60531e87f9c79266def019ac45e749f548caf1162e02

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,9 +274,8 @@ class ItemsController < ApplicationController
       :binding_item_identifier, :binding_call_number, :binded_at,
       :use_restriction_id, :memo,
       {item_has_use_restriction_attributes: :use_restriction_id}, # EnjuCirculation
-      {custom_properties_attributes: [
-        :id, :label, :value,
-        :_destroy
+      {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 {
@@ -355,8 +355,8 @@ class ManifestationsController < ApplicationController
   # GET /manifestations/new.json
   def new
     @manifestation = Manifestation.new
-    @manifestation.language = Language.where(iso_639_1: @locale).first
-    @parent = Manifestation.where(id: params[:parent_id]).first if params[:parent_id].present?
+    @manifestation.language = Language.find_by(iso_639_1: @locale)
+    @parent = Manifestation.find_by(id: params[:parent_id]) if params[:parent_id].present?
     if @parent
       @manifestation.parent_id = @parent.id
       [ :original_title, :title_transcription,
@@ -550,9 +550,8 @@ class ManifestationsController < ApplicationController
         :id, :body, :identifier_type_id,
         :_destroy
       ]},
-      {custom_properties_attributes: [
-        :id, :label, :value,
-        :_destroy
+      {manifestation_custom_values_attributes: [
+        :id, :manifestation_custom_property_id, :manifestation_id, :value,:_destroy
       ]}
     )
   end
@@ -738,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])
@@ -783,7 +782,7 @@ class ManifestationsController < ApplicationController
     if options[:pub_date_from].blank?
       pub_date[:from] = "*"
     else
-      year = options[:pub_date_from].rjust(4, "0")
+      year = options[:pub_date_from].to_s.gsub(/\D/, '').rjust(4, "0")
       if year.length == 4
         pub_date[:from] = Time.zone.parse(Time.utc(year).to_s).beginning_of_year.utc.iso8601
       else
@@ -797,7 +796,7 @@ class ManifestationsController < ApplicationController
     if options[:pub_date_until].blank?
       pub_date[:until] = "*"
     else
-      year = options[:pub_date_until].rjust(4, "0")
+      year = options[:pub_date_until].to_s.gsub(/\D/, '').rjust(4, "0")
       if year.length == 4
         pub_date[:until] = Time.zone.parse(Time.utc(year).to_s).end_of_year.utc.iso8601
       else
@@ -812,8 +811,6 @@ class ManifestationsController < ApplicationController
 
   def set_pub_date(query, options)
     unless options[:pub_date_from].blank? && options[:pub_date_until].blank?
-      options[:pub_date_from].to_s.gsub!(/\D/, '')
-      options[:pub_date_until].to_s.gsub!(/\D/, '')
       pub_date = parse_pub_date(options)
       query = "#{query} date_of_publication_d:[#{pub_date[:from]} TO #{pub_date[:until]}]"
     end

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.rb

@@ -76,7 +76,7 @@ class Agent < ApplicationRecord
   paginates_per 10
 
   def set_role_and_name
-    self.required_role = Role.where(name: 'Librarian').first if required_role_id.nil?
+    self.required_role = Role.find_by(name: 'Librarian') if required_role_id.nil?
     set_full_name
   end
 
@@ -202,15 +202,15 @@ class Agent < ApplicationRecord
   end
 
   def created(work)
-    creates.where(work_id: work.id).first
+    creates.find_by(work_id: work.id)
   end
 
   def realized(expression)
-    realizes.where(expression_id: expression.id).first
+    realizes.find_by(expression_id: expression.id)
   end
 
   def produced(manifestation)
-    produces.where(manifestation_id: manifestation.id).first
+    produces.find_by(manifestation_id: manifestation.id)
   end
 
   def owned(item)
@@ -222,7 +222,7 @@ class Agent < ApplicationRecord
     agent_lists.each do |agent_list|
       name_and_role = agent_list[:full_name].split('||')
       if agent_list[:agent_identifier].present?
-        agent = Agent.where(agent_identifier: agent_list[:agent_identifier]).first
+        agent = Agent.find_by(agent_identifier: agent_list[:agent_identifier])
       else
         agents_matched = Agent.where(full_name: name_and_role[0])
         agents_matched = agents_matched.where(place: agent_list[:place]) if agent_list[:place]
@@ -237,7 +237,7 @@ class Agent < ApplicationRecord
           place: agent_list[:place],
           language_id: 1,
         )
-        agent.required_role = Role.where(name: 'Guest').first
+        agent.required_role = Role.find_by(name: 'Guest')
         agent.save
       end
       agents << agent

data/app/models/agent_import_file.rb

@@ -116,7 +116,7 @@ class AgentImportFile < ApplicationRecord
     rows.each do |row|
       row_num += 1
       next if row['dummy'].to_s.strip.present?
-      agent = Agent.where(id: row['id']).first
+      agent = Agent.find_by(id: row['id'])
       if agent
         agent.full_name = row['full_name'] if row['full_name'].to_s.strip.present?
         agent.full_name_transcription = row['full_name_transcription'] if row['full_name_transcription'].to_s.strip.present?
@@ -151,7 +151,7 @@ class AgentImportFile < ApplicationRecord
     rows.each do |row|
       row_num += 1
       next if row['dummy'].to_s.strip.present?
-      agent = Agent.where(id: row['id'].to_s.strip).first
+      agent = Agent.find_by(id: row['id'].to_s.strip)
       if agent
         agent.picture_files.destroy_all
         agent.reload
@@ -225,15 +225,15 @@ class AgentImportFile < ApplicationRecord
 
     #if row['username'].to_s.strip.blank?
       agent.email = row['email'].to_s.strip
-      agent.required_role = Role.where(name: row['required_role'].to_s.strip.camelize).first || Role.where(name: 'Guest').first
+      agent.required_role = Role.find_by(name: row['required_role'].to_s.strip.camelize) || Role.find_by(name: 'Guest')
     #else
     #  agent.required_role = Role.where(name: row['required_role'].to_s.strip.camelize).first || Role.where('Librarian').first
     #end
-    language = Language.where(name: row['language'].to_s.strip.camelize).first
-    language = Language.where(iso_639_2: row['language'].to_s.strip.downcase).first unless language
-    language = Language.where(iso_639_1: row['language'].to_s.strip.downcase).first unless language
+    language = Language.find_by(name: row['language'].to_s.strip.camelize)
+    language = Language.find_by(iso_639_2: row['language'].to_s.strip.downcase) unless language
+    language = Language.find_by(iso_639_1: row['language'].to_s.strip.downcase) unless language
     agent.language = language if language
-    country = Country.where(name: row['country'].to_s.strip).first
+    country = Country.find_by(name: row['country'].to_s.strip)
     agent.country = country if country
     agent
   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,12 +19,12 @@ class Item < ApplicationRecord
   belongs_to :budget_type, optional: true
   has_one :accept, dependent: :destroy
   has_one :withdraw, dependent: :destroy
-  has_many :custom_properties, as: :resource, dependent: :destroy
-  accepts_nested_attributes_for :custom_properties, allow_destroy: true, 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)}
+  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,
@@ -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,
+      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,25 +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
       })
 
-      # 最もカスタム項目の多い資料について、カスタム項目の個数を取得する
-      ActiveRecord::Base.connection.execute('SELECT max(record_count) FROM (SELECT count(*) AS record_count, resource_id, resource_type FROM custom_properties GROUP BY resource_id, resource_type) AS type_count ;').first.values[0].to_i.times do |i|
-        property = custom_properties[i]
-        if property
-          record[:"item_custom_property_#{i + 1}"] = "#{property.label}: #{property.value}"
-        else
-          record[:"item_custom_property_#{i + 1}"] = nil
-        end
+      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