enju_biblio 0.3.9 → 0.3.11

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

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

@@ -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
@@ -311,56 +322,24 @@ 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')
+          item = update_item(item, row)
         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
+        ResourceImportFile.import_item_custom_value(row, item).each do |value|
+          value.update!(item: item)
         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
+        ResourceImportFile.import_manifestation_custom_value(row, item.manifestation).each do |value|
+          value.update!(manifestation: item.manifestation)
         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.manifestation.reload
         item.save!
         import_result.item = item
@@ -372,6 +351,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
@@ -397,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
@@ -422,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
@@ -482,6 +466,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}"}
@@ -578,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
@@ -764,6 +807,7 @@ class ResourceImportFile < ApplicationRecord
         manifestation.set_agent_role_type(publishers_list, scope: :publisher)
       end
     end
+
     manifestation
   end
 
@@ -790,6 +834,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?, 'Administrator')
+  end
+
+  def update?
+    true if user.try(:has_role?, 'Administrator')
+  end
+
+  def destroy?
+    true if user.try(:has_role?, 'Administrator')
+  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?, 'Administrator')
+  end
+
+  def update?
+    true if user.try(:has_role?, 'Administrator')
+  end
+
+  def destroy?
+    true if user.try(:has_role?, 'Administrator')
+  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 %>