enju_biblio 0.3.13 → 0.3.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: afa249847e374fa2a87ea6801bfb851af30e99edc72fd982a32ce52d1674fa0c
-  data.tar.gz: 5ab7f1b8abd52e9c841c0445dd1a04db2d752fd077aada5672d70ea2ed2d8262
+  metadata.gz: 14cf69a7672b13c89901dff244c8bdee230a07559357dff1f201e9c3a1357e65
+  data.tar.gz: a65e04a7a889cc94e6c384443a56949494540c94efdcf79d1bb81a6fd212862e
 SHA512:
-  metadata.gz: e937c7448b783f607e851da92fa21b38c7bb44677b572e47b7f11a3ef5cc9133e76e74a1b2a13657041acfbeef89ed9240fbbe8cc606179167606cfd8fd5075a
-  data.tar.gz: 42b259f6e9d84b40a93b66d649c171b1d8a6ec84cdffc773d8871223a5de707383e3e82dfaddb4ceb76d980001cb8e1ec6096b35d29647dd298d0426460a936a
+  metadata.gz: 4c7432c6014d1fe4943d137598c16c83048252d2d65eda23fe235d222bff97e00886f407ba1b6d003d287ef3e706df5b56f360d7e5f11560a134bafdb02b5828
+  data.tar.gz: 0aa1a8a22c15e84486894ca72a97eef72eb5fea69572cc81cb825cf5e51e255c79515d89b4b952e56c65b20644c99eb2b970d0f95db8458c53a946a1b24c0fab

data/app/controllers/agent_import_results_controller.rb

@@ -15,7 +15,7 @@ class AgentImportResultsController < ApplicationController
     respond_to do |format|
       format.html # index.html.erb
       format.json { render json: @agent_import_results }
-      format.txt
+      format.text
     end
   end
 

data/app/controllers/items_controller.rb

@@ -18,7 +18,7 @@ class ItemsController < ApplicationController
     @count = {}
     if user_signed_in?
       if current_user.has_role?('Librarian')
-        if params[:format] == 'txt'
+        if params[:format] == 'text'
           per_page = 65534
         elsif params[:mode] == 'barcode'
           per_page = 40
@@ -134,7 +134,7 @@ class ItemsController < ApplicationController
     respond_to do |format|
       format.html # index.html.erb
       format.json
-      format.txt  { render layout: false }
+      format.text
       format.atom
     end
   end

data/app/controllers/manifestations_controller.rb

@@ -29,7 +29,7 @@ class ManifestationsController < ApplicationController
       sort, @count = {}, {}
       query = ""
 
-      if params[:format] == 'txt'
+      if request.format.text?
         per_page = 65534
       end
 
@@ -251,7 +251,7 @@ class ManifestationsController < ApplicationController
       format.html.phone
       format.xml  { render xml: @manifestations }
       format.rss  { render layout: false }
-      format.txt  { render layout: false }
+      format.text  { render layout: false }
       format.rdf  { render layout: false }
       format.atom
       format.mods
@@ -321,8 +321,8 @@ class ManifestationsController < ApplicationController
       format.rdf
       format.mods
       format.json
-      format.txt
-      format.js
+      format.text
+      format.js { render template: 'manifestations/show.js' }
       format.download {
         if @manifestation.attachment.path
           if ENV['ENJU_STORAGE'] == 's3'

data/app/controllers/resource_import_results_controller.rb

@@ -7,7 +7,7 @@ class ResourceImportResultsController < ApplicationController
   def index
     @resource_import_file = ResourceImportFile.find_by(id: params[:resource_import_file_id])
     if @resource_import_file
-      if params[:format].to_s.downcase == 'txt'
+      if params[:format].to_s.downcase == 'text'
         @resource_import_results = @resource_import_file.resource_import_results
       else
         @resource_import_results = @resource_import_file.resource_import_results.page(params[:page])
@@ -19,7 +19,7 @@ class ResourceImportResultsController < ApplicationController
     respond_to do |format|
       format.html # index.html.erb
       format.json { render json: @resource_import_results }
-      format.txt
+      format.text
     end
   end
 

data/app/models/identifier.rb

@@ -14,6 +14,10 @@ class Identifier < ApplicationRecord
   acts_as_list scope: :manifestation_id
   strip_attributes only: :body
 
+  after_destroy do
+    manifestation&.touch
+  end
+
   def check_identifier
     case identifier_type.try(:name)
     when 'isbn'

data/app/models/item.rb

@@ -19,7 +19,7 @@ class Item < ApplicationRecord
   belongs_to :budget_type, optional: true
   has_one :accept, dependent: :destroy
   has_one :withdraw, dependent: :destroy
-  has_many :item_custom_values, -> { joins(:item_custom_property).order(:position) }
+  has_many :item_custom_values, -> { joins(:item_custom_property).order(:position) }, dependent: :destroy
 
   belongs_to :shelf, counter_cache: true
   accepts_nested_attributes_for :item_custom_values, reject_if: :all_blank
@@ -109,6 +109,7 @@ class Item < ApplicationRecord
       item_identifier: item_identifier,
       binding_item_identifier: binding_item_identifier,
       call_number: call_number,
+      library: shelf&.library&.name,
       shelf: shelf&.name,
       item_note: note,
       accepted_at: accept&.created_at,
@@ -123,7 +124,7 @@ class Item < ApplicationRecord
         budget_type: budget_type&.name,
         item_required_role: required_role.name,
         item_price: price,
-        memo: memo
+        item_memo: memo
       })
 
       ItemCustomProperty.order(:position).each do |custom_property|

data/app/models/manifestation.rb

@@ -25,7 +25,7 @@ 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) }
+  has_many :manifestation_custom_values, -> { joins(:manifestation_custom_property).order(:position) }, dependent: :destroy
   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
@@ -37,7 +37,7 @@ class Manifestation < ApplicationRecord
     text :title, default_boost: 2 do
       titles
     end
-    [ :fulltext, :note, :creator, :contributor, :publisher, :description, :statement_of_responsibility ].each do |field|
+    [ :fulltext, :note, :creator, :contributor, :publisher, :abstract, :description, :statement_of_responsibility ].each do |field|
       text field do
         if series_master?
           derived_manifestations.map{|c| c.send(field) }.flatten.compact
@@ -584,9 +584,10 @@ class Manifestation < ApplicationRecord
       height: height,
       width: width,
       depth: depth,
-      price: price,
+      manifestation_price: price,
       access_address: access_address,
       manifestation_required_role: required_role.name,
+      abstract: abstract,
       description: description,
       note: note
     }
@@ -615,7 +616,7 @@ class Manifestation < ApplicationRecord
 
     if ['Administrator', 'Librarian'].include?(role)
       record.merge!({
-        memo: memo
+        manifestation_memo: memo
       })
       ManifestationCustomProperty.order(:position).each do |custom_property|
         custom_value = manifestation_custom_values.find_by(manifestation_custom_property: custom_property)

data/app/models/picture_file.rb

@@ -24,7 +24,7 @@ class PictureFile < ApplicationRecord
   validates_associated :picture_attachable
   default_scope { order('picture_files.position') }
   # http://railsforum.com/viewtopic.php?id=11615
-  acts_as_list scope: 'picture_attachable_type=\'#{picture_attachable_type}\''
+  acts_as_list scope: :picture_attachable
   strip_attributes only: :picture_attachable_type
 
   paginates_per 10

data/app/models/resource_import_file.rb

@@ -458,12 +458,12 @@ class ResourceImportFile < ApplicationRecord
       edition edition_string serial_number isbn issn manifestation_price
       width height depth number_of_pages jpno lccn budget_type bookstore
       language fulltext_content required_role doi content_type frequency
-      extent start_page end_page dimensions
+      extent start_page end_page dimensions abstract manifestation_memo
       ncid
       ndl_bib_id
       statement_of_responsibility acquired_at call_number circulation_status
       binding_item_identifier binding_call_number binded_at item_price
-      use_restriction include_supplements item_note item_url
+      use_restriction include_supplements item_note item_url item_memo
       dummy
     )
     header_columns += ManifestationCustomProperty.order(:position).pluck(:name).map{|c| "manifestation:#{c}"}
@@ -541,7 +541,8 @@ class ResourceImportFile < ApplicationRecord
       binding_call_number: row['binding_call_number'],
       binded_at: binded_at,
       url: row['item_url'],
-      note: row['item_note'].try(:gsub, /\\n/, "\n")
+      note: row['item_note'].try(:gsub, /\\n/, "\n"),
+      memo: row['item_memo'].try(:gsub, /\\n/, "\n")
     )
     manifestation.items << item
     if defined?(EnjuCirculation)
@@ -600,6 +601,7 @@ class ResourceImportFile < ApplicationRecord
 
     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.memo = row['item_memo'].try(:gsub, /\\n/, "\n") if row['item_memo'].present?
     item.url = row['item_url'] if row['item_url'].present?
 
     if row['include_supplements']
@@ -716,9 +718,11 @@ class ResourceImportFile < ApplicationRecord
         depth: row['depth'],
         height: row['height'],
         price: row['manifestation_price'],
+        abstract: row['abstract'].try(:gsub, /\\n/, "\n"),
         description: row['description'].try(:gsub, /\\n/, "\n"),
         #:description_transcription => row['description_transcription'],
         note: row['note'].try(:gsub, /\\n/, "\n"),
+        memo: row['manifestation_memo'].try(:gsub, /\\n/, "\n"),
         statement_of_responsibility: row['statement_of_responsibility'],
         access_address: row['access_address'],
         manifestation_identifier: row['manifestation_identifier'],
@@ -783,7 +787,7 @@ class ResourceImportFile < ApplicationRecord
             unless identifiers.empty?
               identifiers.each do |v|
                 v.manifestation = manifestation
-                v.save!
+                v.save
               end
             end
           else

data/app/views/agent_relationship_types/index.html.erb

@@ -18,7 +18,7 @@
 <%- @agent_relationship_types.each do |agent_relationship_type| -%>
   <tr class="line<%= cycle("0", "1") -%>">
     <td>
-      <%- if policy(agent).update?_relationship_type -%>
+      <%- if policy(agent_relationship_type).update? -%>
         <%= move_position(agent_relationship_type) -%>
       <%- end -%>
     </td>
@@ -29,10 +29,10 @@
       <%= agent_relationship_type.note %>
     </td>
     <td>
-      <%- if policy(agent).update?_relationship_type -%>
+      <%- if policy(agent_relationship_type).update? -%>
         <%= link_to t('page.edit'), edit_agent_relationship_type_path(agent_relationship_type) -%>
       <% end %>
-      <%- if policy(agent).destroy?_relationship_type -%>
+      <%- if policy(agent_relationship_type).destroy? -%>
         <%= link_to t('page.destroy'), agent_relationship_type_path(agent_relationship_type), data: {confirm: t('page.are_you_sure')}, method: :delete -%>
       <%- end -%>
     </td>

data/app/views/items/index.text.ruby

@@ -0,0 +1,13 @@
+csv = %w[title isbn item_identifier call_number created_at].to_csv(col_sep: "\t")
+
+@items.map{|item|
+  [
+    item.manifestation.original_title,
+    item.manifestation.identifier_contents(:isbn).join("; "),
+    item.item_identifier,
+    item.call_number,
+    item.created_at
+  ]
+}
+
+csv

data/app/views/manifestations/_title.html.erb

@@ -19,7 +19,7 @@
       <%= t('agent.publisher') -%>: <%= agents_list(manifestation.publishers.readable_by(current_user), itemprop: 'publisher') -%>
     <% end %>
     <%- if manifestation.date_of_publication? -%>
-      <meta itemprop="publishDate" content="<%= manifestation.date_of_publication.iso8601 %>" />
+      <meta itemprop="datePublished" content="<%= manifestation.date_of_publication.iso8601 %>" />
       (<%= t('activerecord.attributes.manifestation.pub_date') %>: <%= manifestation.pub_date -%>)
     <%- end -%>
     <%- if manifestation.access_address? -%>

data/app/views/manifestations/index.text.ruby

@@ -0,0 +1,13 @@
+csv = (Manifestation.csv_header(role: current_user_role_name) + Item.csv_header(role: current_user_role_name)).to_csv(col_sep: "\t")
+
+@manifestations.map{|manifestation|
+  if manifestation.items.empty?
+    csv += manifestation.to_hash(role: current_user_role_name).values.to_csv(col_sep: "\t")
+  else
+    manifestation.items.each do |item|
+      csv += (manifestation.to_hash(role: current_user_role_name).values + item.to_hash(role: current_user_role_name).values).to_csv(col_sep: "\t")
+    end
+  end
+}
+
+csv

data/lib/enju_biblio/version.rb

@@ -1,3 +1,3 @@
 module EnjuBiblio
-  VERSION = "0.3.13".freeze
+  VERSION = "0.3.16".freeze
 end

data/spec/controllers/items_controller_spec.rb

@@ -47,6 +47,11 @@ describe ItemsController do
         expect(assigns(:items).count).to eq 1
       end
 
+      it 'accepts text format' do
+        get :index, format: :text
+        expect(assigns(:items)).to_not be_nil
+      end
+
       describe 'in JSON response' do
         render_views
         it 'should not assign unnecessary attributes' do

data/spec/controllers/manifestations_controller_spec.rb

@@ -51,8 +51,8 @@ describe ManifestationsController do
         expect(assigns(:manifestations)).to_not be_nil
       end
 
-      it 'assigns all manifestations as @manifestations in txt format without operation' do
-        get :index, format: 'txt'
+      it 'assigns all manifestations as @manifestations in text format without operation' do
+        get :index, format: :text
         expect(response).to be_successful
         expect(assigns(:manifestations)).to_not be_nil
         expect(response).to render_template('manifestations/index')

data/spec/fixtures/items.yml

@@ -10,6 +10,7 @@ item_00001:
   id: 1
   include_supplements: false
   created_at: 2007-08-24 23:46:00.484813 +09:00
+  memo: 所蔵確認用のメモ
 item_00002: 
   updated_at: 2007-08-24 23:46:01.641413 +09:00
   item_identifier: '00002'

data/spec/fixtures/manifestations.yml

@@ -4,7 +4,7 @@ manifestation_00001:
   language_id: 1
   updated_at: 2007-11-19 16:59:00.293393 +09:00
   original_title: "よくわかる最新Webサービス技術の基本と仕組み : 標準Webシステム技術とeコマース基盤技術入門"
-  price: 
+  price: 1980
   manifestation_identifier: 00001
   depth: 
   date_of_publication: 
@@ -18,6 +18,7 @@ manifestation_00001:
   repository_content: true
   extent: "123p"
   dimensions: "25cm"
+  memo: 確認用の書誌情報
 manifestation_00002: 
   carrier_type_id: 1
   language_id: 1

data/spec/models/manifestation_spec.rb

@@ -158,6 +158,12 @@ describe Manifestation, solr: true do
       csv["classification:ndc9"].compact.inject(0){|count, a| count += 1 if a == '400'; count}.should eq manifestations(:manifestation_00001).items.count
       csv["extent"].compact.should_not be_empty
       csv["dimensions"].compact.should_not be_empty
+      csv["manifestation_memo"].compact.should be_empty
+      csv["item_memo"].compact.should be_empty
+      expect(csv["manifestation_price"].compact.first).to eq "1980"
+      expect(csv["item_price"].compact.first).to eq nil
+      expect(csv["library"].compact.first).to eq "web"
+      expect(csv["shelf"].compact.first).to eq "web"
     end
 
     it "should export edition fields" do
@@ -212,17 +218,25 @@ describe Manifestation, solr: true do
       expect(csv["bookstore"].compact).not_to be_empty
       expect(csv["item_price"].compact).not_to be_empty
       expect(csv["budget_type"].compact).not_to be_empty
+      expect(csv["manifestation_memo"].compact).not_to be_empty
+      expect(csv["item_memo"].compact).not_to be_empty
     end
 
     it 'should escape LF/CR to "\n"' do
-      manifestation = FactoryBot.create(:manifestation, description: "test\ntest", note: "test\ntest")
+      manifestation = FactoryBot.create(:manifestation,
+        abstract: "test\ntest",
+        description: "test\ntest",
+        note: "test\ntest"
+      )
       item = FactoryBot.create(:item, manifestation: manifestation, note: "test\ntest")
       lines = Manifestation.export
       csv = CSV.parse(lines, headers: true, col_sep: "\t")
+      expect(csv["abstract"].compact).not_to be_empty
       expect(csv["description"].compact).not_to be_empty
       expect(csv["note"].compact).not_to be_empty
       expect(csv["item_note"].compact).not_to be_empty
       m = csv.find{|row| row["manifestation_id"].to_i == manifestation.id }
+      expect(m["abstract"]).to eq "test\ntest"
       expect(m["description"]).to eq "test\ntest"
       expect(m["note"]).to eq "test\ntest"
       expect(m["item_note"]).to eq "test\ntest"

data/spec/models/picture_file_spec.rb

@@ -1,8 +1,14 @@
 require 'rails_helper'
 
 describe PictureFile do
-  # pending "add some examples to (or delete) #{__FILE__}"
+  fixtures :all
 
+  it "should move position" do
+    picture_file = PictureFile.find(1)
+    expect(picture_file.first?).to be_truthy
+    picture_file.move_lower
+    expect(picture_file.last?).to be_truthy
+  end
 end
 
 # == Schema Information

data/spec/models/resource_import_file_spec.rb

@@ -67,6 +67,8 @@ describe ResourceImportFile do
         item_10101.manifestation.frequency.name.should eq 'monthly'
         item_10101.manifestation.extent.should eq 'xv, 213 pages'
         item_10101.manifestation.dimensions.should eq '20cm'
+        expect(item_10101.memo).to eq '個別資料メモ1'
+        expect(item_10101.manifestation.memo).to eq '書誌メモ1'
 
         item_10102 = Item.find_by(item_identifier: '10102')
         item_10102.manifestation.date_of_publication.should eq Time.zone.parse('2001-01-01')
@@ -167,6 +169,22 @@ describe ResourceImportFile do
         expect(item_10103.manifestation.manifestation_custom_values.pluck(:value)).to eq ["カスタム項目テスト1", "カスタム項目テスト2"]
         expect(item_10103.item_custom_values.pluck(:value)).to eq ['カスタム項目テスト3', 'カスタム項目テスト4']
       end
+
+      it "should import multiple rows in a cell" do
+        file = ResourceImportFile.create(
+          resource_import: File.new("#{Rails.root}/../../examples/resource_import_file_sample5.tsv"),
+          default_shelf_id: 3,
+          user: users(:admin),
+          edit_mode: 'create'
+        )
+        file.import_start
+
+        manifestation = Manifestation.find_by(manifestation_identifier: 10201)
+        expect(manifestation.original_title).to eq "改行を含む\nタイトル"
+        expect(manifestation.abstract).to eq "改行を含む\n目次の\n情報"
+        expect(manifestation.note).to eq "改行を\n含む\n注記の\n情報"
+        expect(manifestation.description).to eq "改行を\n含む\n説明の情報"
+      end
     end
 
     describe "ISBN import" do

data/spec/views/agent_import_results/{index.txt.ruby_spec.rb → index.text.ruby_spec.rb}

@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-describe "agent_import_results/index.txt.ruby" do
+describe "agent_import_results/index.text.ruby" do
   fixtures :all
 
   before(:each) do

data/spec/views/manifestations/{index.txt.ruby_spec.rb → index.text.ruby_spec.rb}

@@ -1,6 +1,6 @@
 require "rails_helper.rb"
 
-describe "manifestations/index.txt.ruby" do
+describe "manifestations/index.text.ruby" do
   before(:each) do
     manifestation = FactoryBot.create(:manifestation)
     manifestation.items << FactoryBot.create(:item, bookstore_id: 1, budget_type_id: 1, price: 100)

data/spec/views/manifestations/{show.txt.ruby_spec.rb → show.text.ruby_spec.rb}

@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-describe "manifestations/show.txt.ruby" do
+describe "manifestations/show.text.ruby" do
   fixtures :all
 
   before(:each) do

data/spec/views/resource_import_results/{index.txt.ruby_spec.rb → index.text.ruby_spec.rb}

@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-describe "resource_import_results/index.txt.ruby" do
+describe "resource_import_results/index.text.ruby" do
   fixtures :all
 
   before(:each) do