enju_biblio 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a23d1ef687793d665f0bc4af86c00a09d1979e0d70292120bdbf9ec0e4c1b7af
-  data.tar.gz: 2e37b0bf8d14c64eacc7fd4027ec6df757b3d8e05cdd9b24378636af6801c38b
+  metadata.gz: 2888d4c10b1fd92841241ecba36a6d2f7ea687d4c9f667db6460ae1231503c76
+  data.tar.gz: 528744242fa80482bb5c08328619d916ee481b9a6fd5209d705cbfd0b6079d1a
 SHA512:
-  metadata.gz: 53a8ec2efd849064fd1ec1f9d22b2f7c8c9b38c253c99940a63a6cefe691944f4a6b0f2273ab4ba3935d6b7ff889430fe78bea168b998eede3fc4904704b18ec
-  data.tar.gz: e608f4dd26a8d8be692205d4b0ec757e2d1eb77b5e5c3c1fb2bf582f2063219c8c626c9c534f19a5f7614e43bc45140f069b45b5739832d8aa58aade6bc68396
+  metadata.gz: 4dfd6f2cc2000df1e14f289c191e11f7124b1587547fa4df7fc03876472f7797773cd15fd399ae8481b2dfc2a1394bf2345403f509b7555e13ccec4a19e7d452
+  data.tar.gz: a2f56218856579f419fa8759b4cf57c9b75aee8b43f4524b53fd0daab0b4289e9aac6ab76adf85ee98bce277c5b928f020b03e656ec100c3b3938e557d6f0875

data/app/controllers/manifestations_controller.rb

@@ -267,7 +267,7 @@ class ManifestationsController < ApplicationController
       format.rdf  { render layout: false }
       format.atom
       format.mods
-      format.json { render json: @manifestations }
+      format.json
       format.js
     end
   end

data/app/jobs/agent_import_file_job.rb

@@ -1,4 +1,4 @@
-class AgentImportFileJob < ActiveJob::Base
+class AgentImportFileJob < ApplicationJob
   queue_as :enju_leaf
 
   def perform(agent_import_file)

data/app/jobs/resource_export_file_job.rb

@@ -1,4 +1,4 @@
-class ResourceExportFileJob < ActiveJob::Base
+class ResourceExportFileJob < ApplicationJob
   queue_as :enju_leaf
 
   def perform(resource_export_file)

data/app/jobs/resource_import_file_job.rb

@@ -1,4 +1,4 @@
-class ResourceImportFileJob < ActiveJob::Base
+class ResourceImportFileJob < ApplicationJob
   queue_as :enju_leaf
 
   def perform(resource_import_file)

data/app/mailers/agent_import_mailer.rb

@@ -0,0 +1,17 @@
+class AgentImportMailer < ApplicationMailer
+  def completed(agent_import_file)
+    @agent_import_file = agent_import_file
+    @library_group = LibraryGroup.site_config
+    from = "#{LibraryGroup.system_name(agent_import_file.user.profile.locale)} <#{@library_group.user.email}>"
+    subject = "#{I18n.t('agent_import_mailer.completed.subject')}: #{@agent_import_file.id}"
+    mail(from: from, to: agent_import_file.user.email, subject: subject)
+  end
+
+  def failed(agent_import_file)
+    @agent_import_file = agent_import_file
+    @library_group = LibraryGroup.site_config
+    from = "#{LibraryGroup.system_name(agent_import_file.user.profile.locale)} <#{@library_group.user.email}>"
+    subject = "#{I18n.t('agent_import_mailer.failed.subject')}: #{@agent_import_file.id}"
+    mail(from: from, to: agent_import_file.user.email, subject: subject)
+  end
+end

data/app/mailers/resource_export_mailer.rb

@@ -0,0 +1,17 @@
+class ResourceExportMailer < ApplicationMailer
+  def completed(resource_export_file)
+    @resource_export_file = resource_export_file
+    @library_group = LibraryGroup.site_config
+    from = "#{LibraryGroup.system_name(resource_export_file.user.profile.locale)} <#{@library_group.user.email}>"
+    subject = "#{I18n.t('resource_export_mailer.completed.subject')}: #{@resource_export_file.id}"
+    mail(from: from, to: resource_export_file.user.email, subject: subject)
+  end
+
+  def failed(resource_export_file)
+    @resource_export_file = resource_export_file
+    @library_group = LibraryGroup.site_config
+    from = "#{LibraryGroup.system_name(resource_export_file.user.profile.locale)} <#{@library_group.user.email}>"
+    subject = "#{I18n.t('resource_export_mailer.failed.subject')}: #{@resource_export_file.id}"
+    mail(from: from, to: resource_export_file.user.email, subject: subject)
+  end
+end

data/app/mailers/resource_import_mailer.rb

@@ -0,0 +1,17 @@
+class ResourceImportMailer < ApplicationMailer
+  def completed(resource_import_file)
+    @resource_import_file = resource_import_file
+    @library_group = LibraryGroup.site_config
+    from = "#{LibraryGroup.system_name(resource_import_file.user.profile.locale)} <#{@library_group.user.email}>"
+    subject = "#{I18n.t('resource_import_mailer.completed.subject')}: #{@resource_import_file.id}"
+    mail(from: from, to: resource_import_file.user.email, subject: subject)
+  end
+
+  def failed(resource_import_file)
+    @resource_import_file = resource_import_file
+    @library_group = LibraryGroup.site_config
+    from = "#{LibraryGroup.system_name(resource_import_file.user.profile.locale)} <#{@library_group.user.email}>"
+    subject = "#{I18n.t('resource_import_mailer.failed.subject')}: #{@resource_import_file.id}"
+    mail(from: from, to: resource_import_file.user.email, subject: subject)
+  end
+end

data/app/models/agent.rb

@@ -1,4 +1,4 @@
-class Agent < ActiveRecord::Base
+class Agent < ApplicationRecord
   scope :readable_by, lambda{ |user|
     if user
       where('required_role_id <= ?', user.try(:user_has_role).try(:role_id))
@@ -17,7 +17,7 @@ class Agent < ActiveRecord::Base
   has_many :derived_agents, through: :children, source: :child
   has_many :original_agents, through: :parents, source: :parent
   has_many :picture_files, as: :picture_attachable, dependent: :destroy
-  has_many :donates
+  has_many :donates, dependent: :destroy
   has_many :donated_items, through: :donates, source: :item
   has_many :owns, dependent: :destroy
   has_many :items, through: :owns
@@ -97,7 +97,7 @@ class Agent < ActiveRecord::Base
   def set_date_of_birth
     return if birth_date.blank?
     begin
-      date = Time.zone.parse("#{birth_date}")
+      date = Time.zone.parse(birth_date.to_s)
     rescue ArgumentError
       begin
         date = Time.zone.parse("#{birth_date}-01")
@@ -115,7 +115,7 @@ class Agent < ActiveRecord::Base
   def set_date_of_death
     return if death_date.blank?
     begin
-      date = Time.zone.parse("#{death_date}")
+      date = Time.zone.parse(death_date.to_s)
     rescue ArgumentError
       begin
         date = Time.zone.parse("#{death_date}-01")

data/app/models/agent_import_file.rb

@@ -1,4 +1,4 @@
-class AgentImportFile < ActiveRecord::Base
+class AgentImportFile < ApplicationRecord
   include Statesman::Adapters::ActiveRecordQueries
   include ImportFile
   default_scope { order('agent_import_files.id DESC') }
@@ -88,10 +88,14 @@ class AgentImportFile < ActiveRecord::Base
     Sunspot.commit
     rows.close
     transition_to!(:completed)
+    mailer = AgentImportMailer.completed(self)
+    send_message(mailer)
     return num
   rescue => e
     self.error_message = "line #{row_num}: #{e.message}"
     transition_to!(:failed)
+    mailer = AgentImportMailer.failed(self)
+    send_message(mailer)
     raise e
   end
 
@@ -128,9 +132,13 @@ class AgentImportFile < ActiveRecord::Base
       end
     end
     transition_to!(:completed)
+    mailer = AgentImportMailer.completed(self)
+    send_message(mailer)
   rescue => e
     self.error_message = "line #{row_num}: #{e.message}"
     transition_to!(:failed)
+    mailer = AgentImportMailer.failed(self)
+    send_message(mailer)
     raise e
   end
 
@@ -151,9 +159,13 @@ class AgentImportFile < ActiveRecord::Base
       end
     end
     transition_to!(:completed)
+    mailer = AgentImportMailer.completed(self)
+    send_message(mailer)
   rescue => e
     self.error_message = "line #{row_num}: #{e.message}"
     transition_to!(:failed)
+    mailer = AgentImportMailer.failed(self)
+    send_message(mailer)
     raise e
   end
 

data/app/models/agent_import_file_transition.rb

@@ -1,4 +1,4 @@
-class AgentImportFileTransition < ActiveRecord::Base
+class AgentImportFileTransition < ApplicationRecord
   include Statesman::Adapters::ActiveRecordTransition
 
   

data/app/models/agent_import_result.rb

@@ -1,4 +1,4 @@
-class AgentImportResult < ActiveRecord::Base
+class AgentImportResult < ApplicationRecord
   default_scope { order('agent_import_results.id') }
   scope :file_id, proc{|file_id| where(agent_import_file_id: file_id)}
   scope :failed, -> { where(agent_id: nil) }

data/app/models/agent_merge.rb

@@ -1,4 +1,4 @@
-class AgentMerge < ActiveRecord::Base
+class AgentMerge < ApplicationRecord
   belongs_to :agent
   belongs_to :agent_merge_list
   validates_presence_of :agent, :agent_merge_list

data/app/models/agent_merge_list.rb

@@ -1,4 +1,4 @@
-class AgentMergeList < ActiveRecord::Base
+class AgentMergeList < ApplicationRecord
   has_many :agent_merges, dependent: :destroy
   has_many :agents, through: :agent_merges
   validates_presence_of :title

data/app/models/agent_relationship.rb

@@ -1,4 +1,4 @@
-class AgentRelationship < ActiveRecord::Base
+class AgentRelationship < ApplicationRecord
   belongs_to :parent, foreign_key: 'parent_id', class_name: 'Agent'
   belongs_to :child, foreign_key: 'child_id', class_name: 'Agent'
   belongs_to :agent_relationship_type, optional: true

data/app/models/agent_relationship_type.rb

@@ -1,4 +1,4 @@
-class AgentRelationshipType < ActiveRecord::Base
+class AgentRelationshipType < ApplicationRecord
   include MasterModel
   default_scope { order('agent_relationship_types.position') }
   has_many :agent_relationships

data/app/models/agent_type.rb

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

data/app/models/carrier_type.rb

@@ -1,4 +1,4 @@
-class CarrierType < ActiveRecord::Base
+class CarrierType < ApplicationRecord
   include MasterModel
   default_scope { order("carrier_types.position") }
   has_many :manifestations

data/app/models/content_type.rb

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

data/app/models/country.rb

@@ -1,4 +1,4 @@
-class Country < ActiveRecord::Base
+class Country < ApplicationRecord
   include MasterModel
   default_scope { order('countries.position') }
   has_many :agents

data/app/models/create.rb

@@ -1,4 +1,4 @@
-class Create < ActiveRecord::Base
+class Create < ApplicationRecord
   belongs_to :agent
   belongs_to :work, class_name: 'Manifestation', foreign_key: 'work_id', touch: true
   belongs_to :create_type, optional: true

data/app/models/create_type.rb

@@ -1,4 +1,4 @@
-class CreateType < ActiveRecord::Base
+class CreateType < ApplicationRecord
   include MasterModel
   default_scope { order('create_types.position') }
 end

data/app/models/donate.rb

@@ -1,4 +1,4 @@
-class Donate < ActiveRecord::Base
+class Donate < ApplicationRecord
   belongs_to :agent
   belongs_to :item
   validates_associated :agent, :item

data/app/models/form_of_work.rb

@@ -1,4 +1,4 @@
-class FormOfWork < ActiveRecord::Base
+class FormOfWork < ApplicationRecord
   include MasterModel
   default_scope { order('form_of_works.position') }
   has_many :works

data/app/models/frequency.rb

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

data/app/models/identifier.rb

@@ -1,4 +1,4 @@
-class Identifier < ActiveRecord::Base
+class Identifier < ApplicationRecord
   belongs_to :identifier_type
   belongs_to :manifestation, touch: true, optional: true
 

data/app/models/identifier_type.rb

@@ -1,4 +1,4 @@
-class IdentifierType < ActiveRecord::Base
+class IdentifierType < ApplicationRecord
   include MasterModel
   default_scope { order('identifier_types.position') }
   has_many :identifiers

data/app/models/import_request.rb

@@ -1,4 +1,4 @@
-class ImportRequest < ActiveRecord::Base
+class ImportRequest < ApplicationRecord
   include Statesman::Adapters::ActiveRecordQueries
   default_scope { order('import_requests.id DESC') }
   belongs_to :manifestation, optional: true

data/app/models/import_request_transition.rb

@@ -1,4 +1,4 @@
-class ImportRequestTransition < ActiveRecord::Base
+class ImportRequestTransition < ApplicationRecord
   include Statesman::Adapters::ActiveRecordTransition
 
   

data/app/models/item.rb

@@ -1,4 +1,4 @@
-class Item < ActiveRecord::Base
+class Item < ApplicationRecord
   scope :on_shelf, -> { includes(:shelf).references(:shelf).where('shelves.name != ?', 'web') }
   scope :on_web, -> { includes(:shelf).references(:shelf).where('shelves.name = ?', 'web') }
   scope :available, -> {}
@@ -10,7 +10,7 @@ class Item < ActiveRecord::Base
   delegate :display_name, to: :shelf, prefix: true
   has_many :owns
   has_many :agents, through: :owns
-  has_many :donates
+  has_many :donates, dependent: :destroy
   has_many :donors, through: :donates, source: :agent
   has_one :resource_import_result
   belongs_to :manifestation, touch: true
@@ -90,7 +90,7 @@ class Item < ActiveRecord::Base
   def removable?
     if defined?(EnjuCirculation)
       return false if circulation_status.name == 'Removed'
-      return false if checkouts.not_returned.exists?
+      return false if checkouts.exists?
       true
     else
       true

data/app/models/language.rb

@@ -1,29 +1,13 @@
-class Language < ActiveRecord::Base
+class Language < ApplicationRecord
   include MasterModel
-  default_scope { order('languages.position') }
   # If you wish to change the field names for brevity, feel free to enable/modify these.
   # alias_attribute :iso1, :iso_639_1
   # alias_attribute :iso2, :iso_639_2
   # alias_attribute :iso3, :iso_639_3
 
   # Validations
-  validates_presence_of :iso_639_1, :iso_639_2, :iso_639_3
+  validates :iso_639_1, :iso_639_2, :iso_639_3, presence: true
   validates :name, presence: true, format: { with: /\A[0-9A-Za-z][0-9A-Za-z_\-\s,]*[0-9a-z]\Z/ }
-  after_save :clear_available_languages_cache
-  after_destroy :clear_available_languages_cache
-
-  def self.all_cache
-    if Rails.env == 'production'
-      Rails.cache.fetch('language_all'){Language.all.to_a}
-    else
-      Language.all
-    end
-  end
-
-  def clear_available_languages_cache
-    Rails.cache.delete('language_all')
-    Rails.cache.delete('available_languages')
-  end
 
   def self.available_languages
     Language.where(iso_639_1: I18n.available_locales.map{|l| l.to_s}).order(:position)

data/app/models/license.rb

@@ -1,4 +1,4 @@
-class License < ActiveRecord::Base
+class License < ApplicationRecord
   include MasterModel
   default_scope { order('licenses.position') }
 end

data/app/models/manifestation.rb

@@ -1,4 +1,4 @@
-class Manifestation < ActiveRecord::Base
+class Manifestation < ApplicationRecord
   enju_manifestation_viewer if defined?(EnjuManifestationViewer)
   enju_ndl_ndl_search if defined?(EnjuNdl)
   enju_loc_search if defined?(EnjuLoc)
@@ -678,16 +678,28 @@ class Manifestation < ActiveRecord::Base
         when :Administrator, :Librarian
           item_lines << i.bookstore.try(:name)
           item_lines << i.budget_type.try(:name)
-          item_lines << Checkout.where(item_id: i.id).size
+          if defined?(EnjuCirtulation)
+            item_lines << Checkout.where(item_id: i.id).count
+          else
+            item_lines << ''
+          end
+        end
+        if defined?(EnjuCirtulation)
+          item_lines << i.circulation_status.try(:name)
+        else
+          item_lines << ''
         end
-        item_lines << i.circulation_status.try(:name)
         item_lines << i.shelf.name
         item_lines << i.shelf.library.name
         item_lines << i.created_at
         item_lines << i.updated_at
         case options[:role].to_sym
         when :Administrator, :Librarian
-          item_lines << i.use_restriction.try(:name)
+          if defined?(EnjuCirtulation)
+            item_lines << i.use_restriction.try(:name)
+          else
+            item_lines << ''
+          end
         end
         lines << item_lines
       end

data/app/models/manifestation_relationship.rb

@@ -1,4 +1,4 @@
-class ManifestationRelationship < ActiveRecord::Base
+class ManifestationRelationship < ApplicationRecord
   belongs_to :parent, foreign_key: 'parent_id', class_name: 'Manifestation'
   belongs_to :child, foreign_key: 'child_id', class_name: 'Manifestation'
   belongs_to :manifestation_relationship_type, optional: true

data/app/models/manifestation_relationship_type.rb

@@ -1,4 +1,4 @@
-class ManifestationRelationshipType < ActiveRecord::Base
+class ManifestationRelationshipType < ApplicationRecord
   include MasterModel
   default_scope { order('manifestation_relationship_types.position') }
   has_many :manifestation_relationships

data/app/models/medium_of_performance.rb

@@ -1,4 +1,4 @@
-class MediumOfPerformance < ActiveRecord::Base
+class MediumOfPerformance < ApplicationRecord
   include MasterModel
   default_scope { order('medium_of_performances.position') }
   has_many :works

data/app/models/own.rb

@@ -1,4 +1,4 @@
-class Own < ActiveRecord::Base
+class Own < ApplicationRecord
   belongs_to :agent
   belongs_to :item
 

data/app/models/picture_file.rb

@@ -1,4 +1,4 @@
-class PictureFile < ActiveRecord::Base
+class PictureFile < ApplicationRecord
   scope :attached, -> { where('picture_attachable_id IS NOT NULL') }
   belongs_to :picture_attachable, polymorphic: true
   before_save :extract_dimensions