enju_biblio 0.3.9 → 0.3.10.rc.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 26edca170abbc3255a6a2f00579b4da714df3bbe174873e4b110c79da9c59a87
-  data.tar.gz: 2e7d74038d3e5bfb1f2fb44f54a6e86aad624b84e8f20c55cb818a4bf74e8bf0
+  metadata.gz: 77d5c642a35ec134208140ee6fbf038219d633619ba7a4a50927bcd14522e685
+  data.tar.gz: 814c6c8c7c795efa2cc55365805e1bbee2d7689d730593c56f00d012a7d4fa52
 SHA512:
-  metadata.gz: b6e053f60b7a611c81ddc0b052def4209d96d1fd23044dc81296dc755e19409d64b625109f34da67588c7984fce670cc4b74973b99af927a459ea910b6d9f4c5
-  data.tar.gz: 1d920ee17e99acf17fd92e18ff3186139daf93940e1be813b5b1f99ffdc0d008029bde5735c05a4978363b185d32090b4f683f3abc63786d7641285f903924f2
+  metadata.gz: 969d8e56c2adfdc2b82b63bf193d28092348c7cb01675cc19e59e936e9ab73ab9878f8403a82397420c3f9469d37bbbcdf610f3d465980c6d5607d9219be510b
+  data.tar.gz: be66e593d2fd98df02e694169b53554aadd7a9d3369e731a96eede7bd3ef7336a48372025d55a4de462156d8d6018c4ee5b02954b49676f0d9a20cd90e161c96

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,64 @@
+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: 'Item custom property was successfully created.'
+    else
+      render :new
+    end
+  end
+
+  # PATCH/PUT /item_custom_properties/1
+  def update
+    if @item_custom_property.update(item_custom_property_params)
+      redirect_to @item_custom_property, notice: 'Item custom property was successfully updated.'
+    else
+      render :edit
+    end
+  end
+
+  # DELETE /item_custom_properties/1
+  def destroy
+    @item_custom_property.destroy
+    redirect_to item_custom_properties_url, notice: 'Item custom property was successfully destroyed.'
+  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,64 @@
+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: 'Manifestation custom property was successfully created.'
+    else
+      render :new
+    end
+  end
+
+  # PATCH/PUT /manifestation_custom_properties/1
+  def update
+    if @manifestation_custom_property.update(manifestation_custom_property_params)
+      redirect_to @manifestation_custom_property, notice: 'Manifestation custom property was successfully updated.'
+    else
+      render :edit
+    end
+  end
+
+  # DELETE /manifestation_custom_properties/1
+  def destroy
+    @manifestation_custom_property.destroy
+    redirect_to manifestation_custom_properties_url, notice: 'Manifestation custom property was successfully destroyed.'
+  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

@@ -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,
@@ -122,6 +124,11 @@ class Item < ApplicationRecord
         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),

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                        :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
+#

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                      :bigint           not null, primary key
+#  item_custom_property_id :bigint           not null
+#  item_id                 :bigint           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
@@ -606,6 +608,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.try(:value)
+      end
     end
 
     if defined?(EnjuSubject)
@@ -659,6 +665,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

data/app/models/manifestation_custom_property.rb

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

data/app/models/manifestation_custom_value.rb

@@ -0,0 +1,17 @@
+class ManifestationCustomValue < ApplicationRecord
+  belongs_to :manifestation_custom_property
+  belongs_to :manifestation, required: false
+  validates :manifestation_custom_property, uniqueness: {scope: :manifestation_id}
+end
+
+# == Schema Information
+#
+# Table name: manifestation_custom_values
+#
+#  id                               :bigint           not null, primary key
+#  manifestation_custom_property_id :bigint           not null
+#  manifestation_id                 :bigint           not null
+#  value                            :text
+#  created_at                       :datetime         not null
+#  updated_at                       :datetime         not null
+#

data/app/models/medium_of_performance.rb

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

data/app/models/resource_import_file.rb

@@ -76,12 +76,13 @@ class ResourceImportFile < ApplicationRecord
     #end
     row_num = 1
 
-    ResourceImportResult.create!(resource_import_file_id: id, body: rows.headers.join("\t"))
+    ResourceImportResult.create!(resource_import_file_id: id, body: (%w( imported_manifestation_id imported_item_id ) + rows.headers).join("\t"))
     rows.each do |row|
       row_num += 1
-      import_result = ResourceImportResult.create!(resource_import_file_id: id, body: row.fields.join("\t"))
+      import_result = ResourceImportResult.new(resource_import_file_id: id)
       if row['dummy'].to_s.strip.present?
         import_result.error_message = "line #{row_num}: #{I18n.t('import.dummy')}"
+        import_result.body = ([nil, nil] + row.fields).join("\t")
         import_result.save!
         next
       end
@@ -92,6 +93,7 @@ class ResourceImportFile < ApplicationRecord
         import_result.item = item
         import_result.manifestation = item.manifestation
         import_result.error_message = "line #{row_num}: #{I18n.t('import.item_found')}"
+        import_result.body = ([item.manifestation.id, item.id] + row.fields).join("\t")
         import_result.save!
         num[:item_found] += 1
         next
@@ -187,8 +189,13 @@ class ResourceImportFile < ApplicationRecord
       import_result.manifestation = manifestation
 
       if manifestation
+        ResourceImportFile.import_manifestation_custom_value(row, manifestation).each do |value|
+          value.update!(manifestation: manifestation)
+        end
+
+        item = nil
         if item_identifier.present? || row['shelf'].present? || row['call_number'].present?
-          import_result.item = create_item(row, manifestation)
+          item = create_item(row, manifestation)
         else
           if manifestation.fulltext_content?
             item = create_item(row, manifestation)
@@ -200,17 +207,21 @@ class ResourceImportFile < ApplicationRecord
           end
           num[:failed] += 1
         end
+
+        if item
+          ResourceImportFile.import_item_custom_value(row, item).each do |value|
+            value.update!(item: item)
+          end
+
+          import_result.item = item
+        end
       else
         num[:failed] += 1
       end
 
+      import_result.body = ([manifestation.try(:id), item.try(:id)] + row.fields).join("\t")
       import_result.save!
-      num[:item_imported] +=1 if import_result.item
-
-      if row_num % 50 == 0
-        Sunspot.commit
-        GC.start
-      end
+      num[:item_imported] += 1 if import_result.item
     end
 
     Sunspot.commit
@@ -361,6 +372,14 @@ class ResourceImportFile < ApplicationRecord
             item.include_supplements = false if item.include_supplements
           end
         end
+
+        ResourceImportFile.import_item_custom_value(row, item).each do |value|
+          value.update!(item: item)
+        end
+        ResourceImportFile.import_manifestation_custom_value(row, item.manifestation).each do |value|
+          value.update!(manifestation: item.manifestation)
+        end
+
         item.manifestation.reload
         item.save!
         import_result.item = item
@@ -372,6 +391,9 @@ class ResourceImportFile < ApplicationRecord
         end
         if manifestation
           fetch(row, edit_mode: 'update')
+          ResourceImportFile.import_manifestation_custom_value(row, manifestation).each do |value|
+            value.update!(manifestation: manifestation)
+          end
           import_result.manifestation = manifestation
         end
       end
@@ -482,6 +504,9 @@ class ResourceImportFile < ApplicationRecord
       use_restriction include_supplements item_note item_url
       dummy
     )
+    header_columns += ManifestationCustomProperty.order(:position).pluck(:name).map{|c| "manifestation:#{c}"}
+    header_columns += ItemCustomProperty.order(:position).pluck(:name).map{|c| "item:#{c}"}
+
     if defined?(EnjuSubject)
       header_columns += ClassificationType.order(:position).pluck(:name).map{|c| "classification:#{c}"}
       header_columns += SubjectHeadingType.order(:position).pluck(:name).map{|s| "subject:#{s}"}
@@ -764,6 +789,7 @@ class ResourceImportFile < ApplicationRecord
         manifestation.set_agent_role_type(publishers_list, scope: :publisher)
       end
     end
+
     manifestation
   end
 
@@ -790,6 +816,52 @@ class ResourceImportFile < ApplicationRecord
     end
     identifiers
   end
+
+  def self.import_manifestation_custom_value(row, manifestation)
+    values = []
+    ManifestationCustomProperty.order(:position).pluck(:name).map{|c| "manifestation:#{c}"}.each do |column_name|
+      value = nil
+      property = column_name.split(':').last
+      next if row[column_name].blank?
+      if manifestation
+        value = manifestation.manifestation_custom_values.find_by(manifestation_custom_property: property)
+      end
+
+      if value
+        value.value = row[column_name]
+      else
+        value = ManifestationCustomValue.new(
+          manifestation_custom_property: ManifestationCustomProperty.find_by(name: property),
+          value: row[column_name]
+        )
+      end
+      values << value
+    end
+    values
+  end
+
+  def self.import_item_custom_value(row, item)
+    values = []
+    ItemCustomProperty.order(:position).pluck(:name).map{|c| "item:#{c}"}.each do |column_name|
+      value = nil
+      property = column_name.split(':').last
+      next if row[column_name].blank?
+      if item
+        value = item.item_custom_values.find_by(item_custom_property: property)
+      end
+
+      if value
+        value.value = row[column_name]
+      else
+        value = ItemCustomValue.new(
+          item_custom_property: ItemCustomProperty.find_by(name: property),
+          value: row[column_name]
+        )
+      end
+      values << value
+    end
+    values
+  end
 end
 
 # == Schema Information

data/app/policies/item_custom_property_policy.rb

@@ -0,0 +1,21 @@
+class ItemCustomPropertyPolicy < ApplicationPolicy
+  def index?
+    true if user.try(:has_role?, 'Librarian')
+  end
+
+  def show?
+    true if user.try(:has_role?, 'Librarian')
+  end
+
+  def create?
+    true if user.try(:has_role?, 'Librarian')
+  end
+
+  def update?
+    true if user.try(:has_role?, 'Librarian')
+  end
+
+  def destroy?
+    true if user.try(:has_role?, 'Librarian')
+  end
+end

data/app/policies/manifestation_custom_property_policy.rb

@@ -0,0 +1,21 @@
+class ManifestationCustomPropertyPolicy < ApplicationPolicy
+  def index?
+    true if user.try(:has_role?, 'Librarian')
+  end
+
+  def show?
+    true if user.try(:has_role?, 'Librarian')
+  end
+
+  def create?
+    true if user.try(:has_role?, 'Librarian')
+  end
+
+  def update?
+    true if user.try(:has_role?, 'Librarian')
+  end
+
+  def destroy?
+    true if user.try(:has_role?, 'Librarian')
+  end
+end

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

@@ -0,0 +1,32 @@
+<%= form_with(model: item_custom_property, local: true) do |form| %>
+  <% if item_custom_property.errors.any? %>
+    <div id="error_explanation">
+      <h2><%= pluralize(item_custom_property.errors.count, "error") %> prohibited this item_custom_property from being saved:</h2>
+
+      <ul>
+        <% item_custom_property.errors.full_messages.each do |message| %>
+          <li><%= message %></li>
+        <% end %>
+      </ul>
+    </div>
+  <% end %>
+
+  <div class="form-group">
+    <%= form.label :name %>
+    <%= form.text_field :name, class: 'form-control' %>
+  </div>
+
+  <div class="form-group">
+    <%= form.label :display_name %>
+    <%= form.text_area :display_name, class: 'form-control' %>
+  </div>
+
+  <div class="form-group">
+    <%= form.label :note %>
+    <%= form.text_area :note, class: 'form-control' %>
+  </div>
+
+  <div class="actions">
+    <%= form.submit class: 'btn btn-primary' -%>
+  </div>
+<% end %>

data/app/views/item_custom_properties/edit.html.erb

@@ -0,0 +1,6 @@
+<h1><%= t('page.editing', model: t('activerecord.models.item_custom_property')) -%></h1>
+
+<%= render 'form', item_custom_property: @item_custom_property %>
+
+<%= link_to t('page.show'), @item_custom_property %> |
+<%= link_to t('page.back'), item_custom_properties_path %>