enju_biblio 0.3.2 → 0.3.3

data/app/models/produce.rb

@@ -1,4 +1,4 @@
-class Produce < ActiveRecord::Base
+class Produce < ApplicationRecord
   belongs_to :agent
   belongs_to :manifestation, touch: true
   belongs_to :produce_type, optional: true

data/app/models/produce_type.rb

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

data/app/models/realize.rb

@@ -1,4 +1,4 @@
-class Realize < ActiveRecord::Base
+class Realize < ApplicationRecord
   belongs_to :agent
   belongs_to :expression, class_name: 'Manifestation', foreign_key: 'expression_id', touch: true
   belongs_to :realize_type, optional: true

data/app/models/realize_type.rb

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

data/app/models/resource_export_file.rb

@@ -1,4 +1,4 @@
-class ResourceExportFile < ActiveRecord::Base
+class ResourceExportFile < ApplicationRecord
   include Statesman::Adapters::ActiveRecordQueries
   include ExportFile
 
@@ -37,12 +37,14 @@ class ResourceExportFile < ActiveRecord::Base
     end
     tempfile.close
     self.resource_export = File.new(tempfile.path, "r")
-    if save
-      send_message
-    end
+    save!
     transition_to!(:completed)
+    mailer = ResourceExportMailer.completed(self)
+    send_message(mailer)
   rescue => e
     transition_to!(:failed)
+    mailer = ResourceExportMailer.failed(self)
+    send_message(mailer)
     raise e
   end
 

data/app/models/resource_export_file_transition.rb

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

data/app/models/resource_import_file.rb

@@ -1,4 +1,4 @@
-class ResourceImportFile < ActiveRecord::Base
+class ResourceImportFile < ApplicationRecord
   include Statesman::Adapters::ActiveRecordQueries
   include ImportFile
   default_scope { order('resource_import_files.id DESC') }
@@ -216,13 +216,16 @@ class ResourceImportFile < ActiveRecord::Base
     Sunspot.commit
     rows.close
     transition_to!(:completed)
-    send_message
+    mailer = ResourceImportMailer.completed(self)
+    send_message(mailer)
     Rails.cache.write("manifestation_search_total", Manifestation.search.total)
     num
   rescue => e
     self.error_message = "line #{row_num}: #{e.message}"
     save
     transition_to!(:failed)
+    mailer = ResourceImportMailer.failed(self)
+    send_message(mailer)
     raise e
   end
 
@@ -314,12 +317,16 @@ class ResourceImportFile < ActiveRecord::Base
         if item.manifestation
           fetch(row, edit_mode: 'update')
         end
+
+        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)
+        end
+
         shelf = Shelf.find_by(name: row['shelf'].to_s.strip)
-        circulation_status = CirculationStatus.find_by(name: row['circulation_status'])
-        checkout_type = CheckoutType.find_by(name: row['checkout_type'])
         bookstore = Bookstore.find_by(name: row['bookstore'])
         required_role = Role.find_by(name: row['required_role'])
-        use_restriction = UseRestriction.find_by(name: row['use_restriction'].to_s.strip)
 
         item.shelf = shelf if shelf
         item.circulation_status = circulation_status if circulation_status
@@ -371,10 +378,14 @@ class ResourceImportFile < ActiveRecord::Base
       import_result.save!
     end
     transition_to!(:completed)
+    mailer = ResourceImportMailer.completed(self)
+    send_message(mailer)
   rescue => e
     self.error_message = "line #{row_num}: #{e.message}"
     save
     transition_to!(:failed)
+    mailer = ResourceImportMailer.failed(self)
+    send_message(mailer)
     raise e
   end
 
@@ -393,10 +404,14 @@ class ResourceImportFile < ActiveRecord::Base
       end
     end
     transition_to!(:completed)
+    mailer = ResourceImportMailer.completed(self)
+    send_message(mailer)
   rescue => e
     self.error_message = "line #{row_num}: #{e.message}"
     save
     transition_to!(:failed)
+    mailer = ResourceImportMailer.failed(self)
+    send_message(mailer)
     raise e
   end
 
@@ -431,6 +446,15 @@ class ResourceImportFile < ActiveRecord::Base
       row_num += 1
     end
     transition_to!(:completed)
+    mailer = ResourceImportMailer.completed(self)
+    send_message(mailer)
+  rescue => e
+    self.error_message = "line #{row_num}: #{e.message}"
+    save
+    transition_to!(:failed)
+    mailer = ResourceImportMailer.failed(self)
+    send_message(mailer)
+    raise e
   end
 
   private
@@ -754,7 +778,7 @@ class ResourceImportFile < ActiveRecord::Base
   def set_identifier(row)
     identifiers = []
     %w(isbn issn doi jpno ncid).each do |id_type|
-      if row["#{id_type}"].present?
+      if row[id_type.to_s].present?
         row[id_type].split(/\/\//).each do |identifier_s|
           import_id = Identifier.new(body: identifier_s)
           identifier_type = IdentifierType.find_by(name: id_type)

data/app/models/resource_import_file_transition.rb

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

data/app/models/resource_import_result.rb

@@ -1,4 +1,4 @@
-class ResourceImportResult < ActiveRecord::Base
+class ResourceImportResult < ApplicationRecord
   default_scope { order('resource_import_results.id') }
   scope :file_id, proc{|file_id| where(resource_import_file_id: file_id)}
   scope :failed, -> { where(manifestation_id: nil) }

data/app/models/series_statement.rb

@@ -1,4 +1,4 @@
-class SeriesStatement < ActiveRecord::Base
+class SeriesStatement < ApplicationRecord
   has_many :series_statement_merges, dependent: :destroy
   has_many :series_statement_merge_lists, through: :series_statement_merges
   belongs_to :manifestation, touch: true, optional: true

data/app/models/series_statement_merge.rb

@@ -1,4 +1,4 @@
-class SeriesStatementMerge < ActiveRecord::Base
+class SeriesStatementMerge < ApplicationRecord
   belongs_to :series_statement
   belongs_to :series_statement_merge_list
   validates_presence_of :series_statement, :series_statement_merge_list

data/app/models/series_statement_merge_list.rb

@@ -1,4 +1,4 @@
-class SeriesStatementMergeList < ActiveRecord::Base
+class SeriesStatementMergeList < ApplicationRecord
   has_many :series_statement_merges, dependent: :destroy
   has_many :series_statements, through: :series_statement_merges
   validates_presence_of :title

data/app/views/agent_import_mailer/completed.en.text.erb

@@ -0,0 +1,9 @@
+The following import task is completed.
+
+ID: <%= @agent_import_file.id %>
+Created at: <%= @agent_import_file.created_at %>
+Detail: <%= agent_import_file_url(@agent_import_file) %>
+
+--  
+<%= @library_group.display_name %>
+<%= root_url %>

data/app/views/agent_import_mailer/completed.ja.text.erb

@@ -0,0 +1,9 @@
+以下の人物・団体のインポートが完了しました。
+
+ID: <%= @agent_import_file.id %>
+作成時刻: <%= @agent_import_file.created_at %>
+詳細: <%= agent_import_file_url(@agent_import_file) %>
+
+--  
+<%= @library_group.display_name %>
+<%= root_url %>

data/app/views/agent_import_mailer/failed.en.text

@@ -0,0 +1,9 @@
+The following import task failed.
+
+ID: <%= @agent_import_file.id %>
+Created at: <%= @agent_import_file.created_at %>
+Detail: <%= agent_import_file_url(@agent_import_file) %>
+
+--  
+<%= @library_group.display_name %>
+<%= root_url %>

data/app/views/agent_import_mailer/failed.ja.text.erb

@@ -0,0 +1,9 @@
+以下の人物・団体のインポートに失敗しました。
+
+ID: <%= @agent_import_file.id %>
+作成時刻: <%= @agent_import_file.created_at %>
+詳細: <%= agent_import_file_url(@agent_import_file) %>
+
+--  
+<%= @library_group.display_name %>
+<%= root_url %>

data/app/views/items/show.html+phone.erb

@@ -20,15 +20,6 @@
     <%= @item.checkout_type.display_name.localize -%>
   </p>
 
-  <p>
-    <strong><%= t('activerecord.models.lending_policy') -%>:</strong>
-    <ul>
-      <%- @item.lending_policies.each do |lending_policy| -%>
-        <li><%= lending_policy.user_group.display_name.localize -%></li>
-      <%- end -%>
-    </ul>
-  </p>
-
   <p>
     <strong><%= t('activerecord.models.circulation_status') -%>:</strong>
     <%= @item.circulation_status.display_name.localize -%>

data/app/views/items/show.html.erb

@@ -32,15 +32,6 @@
     <%= link_to @item.checkout_type.display_name.localize, @item.checkout_type -%>
   </p>
 
-  <p>
-    <strong><%= t('activerecord.models.lending_policy') -%>:</strong>
-    <ul>
-      <%- @item.lending_policies.each do |lending_policy| -%>
-        <li><%= link_to lending_policy.user_group.display_name.localize, lending_policy -%></li>
-      <%- end -%>
-    </ul>
-  </p>
-
   <p>
     <strong><%= t('activerecord.models.circulation_status') -%>:</strong>
     <%= link_to @item.circulation_status.display_name.localize, @item.circulation_status -%>
@@ -152,9 +143,6 @@
       <%- end -%>
     <% end %>
     <% if defined?(EnjuCirculation) %>
-      <% if policy(LendingPolicy).index? %>
-        <li><%= link_to t('page.listing', model: t('activerecord.models.lending_policy')), lending_policies_path(item_id: @item.id) -%></li>
-      <% end %>
       <% if policy(Checkout).index? %>
         <li><%= link_to t('page.checkout_history'), checkouts_path(item_id: @item.id) -%></li>
       <% end %>

data/app/views/manifestations/_manifestation.json.jbuilder

@@ -0,0 +1,53 @@
+json.id manifestation.id
+json.original_title manifestation.original_title
+json.title_alternative manifestation.title_alternative
+json.title_transcription manifestation.title_transcription
+json.title_alternative_transcription manifestation.title_alternative_transcription
+json.pub_date manifestation.pub_date
+json.statement_of_responsibility manifestation.statement_of_responsibility
+json.creators do
+  json.array!(manifestation.creators) do |creator|
+    json.full_name creator.full_name
+  end
+end
+json.contributors do
+  json.array!(manifestation.contributors) do |contributor|
+    json.full_name contributor.full_name
+  end
+end
+json.publishers do
+  json.array!(manifestation.publishers) do |publisher|
+    json.full_name publisher.full_name
+  end
+end
+json.publication_place manifestation.publication_place
+json.extent manifestation.extent
+json.dimensions manifestation.dimensions
+json.identifiers do
+  json.array!(manifestation.identifiers) do |identifier|
+    json.identifier_type identifier.identifier_type.name
+    json.body identifier.body
+  end
+end
+json.subjects do
+  json.array!(manifestation.subjects) do |subject|
+    json.subject_heading_type subject.subject_heading_type.name
+    json.term subject.term
+  end
+end
+json.classfifications do
+  json.array!(manifestation.classifications) do |classification|
+    json.classification_type classification.classification_type.name
+    json.term classification.category
+  end
+end
+json.access_address manifestation.access_address
+json.items do
+  json.array!(manifestation.items.available.on_shelf) do |item|
+    json.item_identifier item.item_identifier
+    json.shelf item.shelf.display_name
+    json.circulation_status item.circulation_status.display_name if defined?(EnjuCirculationStatus)
+  end
+end
+json.created_at manifestation.created_at
+json.updated_at manifestation.updated_at

data/app/views/manifestations/index.json.jbuilder

@@ -0,0 +1,6 @@
+json.total_count @count[:query_result]
+json.results do
+  json.array!(@manifestations) do |manifestation|
+    json.partial!(manifestation)
+  end
+end

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

@@ -6,28 +6,8 @@
   <%= f.error_messages -%>
 
   <div class="field">
-    <%= f.label :picture_attachable_type -%><br />
-    <%= f.text_field :picture_attachable_type -%>
-  </div>
-
-  <div class="field">
-    <%= f.label t('page.attachable') -%><br />
-    <%= f.text_field :picture_attachable_id -%>
-  </div>
-
-  <div class="field">
-    <%= f.label :picture_file_size -%><br />
-    <%= f.text_field :picture_file_size -%>
-  </div>
-
-  <div class="field">
-    <%= f.label :picture_content_type -%><br />
-    <%= f.text_field :picture_content_type -%>
-  </div>
-
-  <div class="field">
-    <%= f.label :picture_file_name -%><br />
-    <%= f.text_field :picture_file_name -%>
+    <%= f.label t('page.file') -%><br />
+    <%= f.file_field :picture -%>
   </div>
 
   <div class="actions">

data/app/views/resource_export_mailer/completed.en.text.erb

@@ -0,0 +1,9 @@
+The following export task is completed.
+
+ID: <%= @resource_export_file.id %>
+Created at: <%= @resource_export_file.created_at %>
+Detail: <%= resource_export_file_url(@resource_export_file) %>
+
+--  
+<%= @library_group.display_name %>
+<%= root_url %>

data/app/views/resource_export_mailer/completed.ja.text.erb

@@ -0,0 +1,9 @@
+以下の資料のインポートが完了しました。
+
+ID: <%= @resource_export_file.id %>
+作成時刻: <%= @resource_export_file.created_at %>
+詳細: <%= resource_export_file_url(@resource_export_file) %>
+
+--  
+<%= @library_group.display_name %>
+<%= root_url %>

data/app/views/resource_export_mailer/failed.en.text.erb

@@ -0,0 +1,9 @@
+The following export task failed.
+
+ID: <%= @resource_export_file.id %>
+Created at: <%= @resource_export_file.created_at %>
+Detail: <%= resource_export_file_url(@resource_export_file) %>
+
+--  
+<%= @library_group.display_name %>
+<%= root_url %>

data/app/views/resource_export_mailer/failed.ja.text.erb

@@ -0,0 +1,9 @@
+以下の資料のインポートに失敗しました。
+
+ID: <%= @resource_export_file.id %>
+作成時刻: <%= @resource_export_file.created_at %>
+詳細: <%= resource_export_file_url(@resource_export_file) %>
+
+--  
+<%= @library_group.display_name %>
+<%= root_url %>

data/app/views/resource_import_mailer/completed.en.text.erb

@@ -0,0 +1,9 @@
+The following import task is completed.
+
+ID: <%= @resource_import_file.id %>
+Created at: <%= @resource_import_file.created_at %>
+Detail: <%= resource_import_file_url(@resource_import_file) %>
+
+--  
+<%= @library_group.display_name %>
+<%= root_url %>

data/app/views/resource_import_mailer/completed.ja.text.erb

@@ -0,0 +1,9 @@
+以下の資料のインポートが完了しました。
+
+ID: <%= @resource_import_file.id %>
+作成時刻: <%= @resource_import_file.created_at %>
+詳細: <%= resource_import_file_url(@resource_import_file) %>
+
+--  
+<%= @library_group.display_name %>
+<%= root_url %>

data/app/views/resource_import_mailer/failed.en.text.erb

@@ -0,0 +1,9 @@
+The following import task failed.
+
+ID: <%= @resource_import_file.id %>
+Created at: <%= @resource_import_file.created_at %>
+Detail: <%= resource_import_file_url(@resource_import_file) %>
+
+--  
+<%= @library_group.display_name %>
+<%= root_url %>

data/app/views/resource_import_mailer/failed.ja.text.erb

@@ -0,0 +1,9 @@
+以下の資料のインポートに失敗しました。
+
+ID: <%= @resource_import_file.id %>
+作成時刻: <%= @resource_import_file.created_at %>
+詳細: <%= resource_import_file_url(@resource_import_file) %>
+
+--  
+<%= @library_group.display_name %>
+<%= root_url %>