enju_biblio 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 836cf0a1a87e3a07150b740a8e78cd7d5defab94
-  data.tar.gz: 8fc7b9a482ac87b2331b6ac9fa4e86a6d5bdc8ad
+  metadata.gz: 9893d9b60d1b30b4a84d629dd3deb2b602329e2c
+  data.tar.gz: 8bfc7f9fffeca21b65ea21d64243acc030434dce
 SHA512:
-  metadata.gz: 629db7eb1fa73ca8a465f4982bf86daa6f8f08711445e93e71d7f7e7df4cc7c40e22f4aafe945d7da5cb1436d3f12568a8856c40e9ba184d8f63fee2f5efb01b
-  data.tar.gz: 72253f4984444ecc211b0291311efbd79d4cd279bf9af793488d11b63ee37773f18d60f0c048f592c44bc9d849865d84b8165d8b51f76ec96ddd37b82f30f1c6
+  metadata.gz: bcb3bd66a7b1af5678600f4e2810ace4d52bb24f5c968588808095e247cb276af20d1463cf519a96af693bb1b2957552d43dfdc50f754d745c6c8cdc982d158c
+  data.tar.gz: 66467ac7341fc55fa76bbee17ac70951a4d5aba6aa55afb05e766ef047a24d6d4bd774eb87486dc985479c5342dfd903faf19b3f7dd99cee54588ade11e66782

data/app/models/manifestation.rb

@@ -583,12 +583,15 @@ class Manifestation < ActiveRecord::Base
     end
     header += %w(
       circulation_status
-      use_restriction
       shelf
       library
       item_created_at
       item_updated_at
     )
+    case role.to_sym
+    when :Administrator, :Librarian
+      header << "use_restriction"
+    end
 
     header.to_csv(options)
   end
@@ -678,11 +681,14 @@ class Manifestation < ActiveRecord::Base
           item_lines << Checkout.where(item_id: i.id).size
         end
         item_lines << i.circulation_status.try(:name)
-        item_lines << i.use_restriction.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)
+        end
         lines << item_lines
       end
     else

data/lib/enju_biblio/version.rb

@@ -1,3 +1,3 @@
 module EnjuBiblio
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/spec/models/manifestation_spec.rb

@@ -306,6 +306,19 @@ describe Manifestation, solr: true do
       expect(m["note"]).to eq 'test\ntest'
       expect(m["item_note"]).to eq 'test\ntest'
     end
+
+    it "should not export use_restriction for Guest" do
+      manifestation = FactoryBot.create(:manifestation)
+      use_restriction = UseRestriction.find(1)
+      item = FactoryBot.create(:item, manifestation: manifestation, use_restriction: use_restriction)
+      lines = Manifestation.export(format: :txt, role: "Guest")
+      csv = CSV.parse(lines, headers: true, col_sep: "\t")
+      expect(csv["use_restriction"].compact).to be_empty
+
+      lines = Manifestation.export(format: :txt, role: "Administrator")
+      csv = CSV.parse(lines, headers: true, col_sep: "\t")
+      expect(csv["use_restriction"].compact).not_to be_empty
+    end
   end
 
   if defined?(EnjuCirculation)

data/spec/models/resource_import_file_spec.rb

@@ -18,7 +18,7 @@ describe ResourceImportFile do
         old_items_count = Item.count
         old_agents_count = Agent.count
         old_import_results_count = ResourceImportResult.count
-        @file.import_start.should eq({manifestation_imported: 9, item_imported: 9, manifestation_found: 6, item_found: 3, failed: 7})
+        @file.import_start.should eq({manifestation_imported: 10, item_imported: 10, manifestation_found: 6, item_found: 3, failed: 7})
         manifestation = Item.find_by(item_identifier: '11111').manifestation
         manifestation.publishers.first.full_name.should eq 'test4'
         manifestation.publishers.first.full_name_transcription.should eq 'てすと4'
@@ -26,11 +26,11 @@ describe ResourceImportFile do
         manifestation.produces.first.produce_type.name.should eq 'publisher'
         manifestation.creates.first.create_type.name.should eq 'author'
         manifestation.identifier_contents(:issn).should eq ['03875806']
-        Manifestation.count.should eq old_manifestations_count + 9
-        Item.count.should eq old_items_count + 9
+        Manifestation.count.should eq old_manifestations_count + 10
+        Item.count.should eq old_items_count + 10
         Agent.count.should eq old_agents_count + 9
         @file.resource_import_results.order(:id).first.body.split("\t").first.should eq 'manifestation_identifier'
-        ResourceImportResult.count.should eq old_import_results_count + 22
+        ResourceImportResult.count.should eq old_import_results_count + 23
 
         manifestation_101 = Manifestation.find_by(manifestation_identifier: '101')
         manifestation_101.series_statements.count.should eq 1
@@ -39,6 +39,7 @@ describe ResourceImportFile do
         manifestation_101.series_statements.first.title_subseries.should eq '副シリーズ'
         manifestation_101.series_statements.first.title_subseries_transcription.should eq 'ふくしりーず'
         manifestation_101.items.order(:id).last.call_number.should eq '007|A'
+        manifestation_101.serial.should be_falsy
 
         item_10101 = Item.find_by(item_identifier: '10101')
         item_10101.manifestation.creators.size.should eq 2
@@ -115,6 +116,8 @@ describe ResourceImportFile do
         manifestation_104.original_title.should eq 'test10'
         manifestation_104.creators.collect(&:full_name).should eq ['test3']
         manifestation_104.publishers.collect(&:full_name).should eq ['test4']
+        manifestation_105 = Manifestation.find_by(manifestation_identifier: '105')
+        manifestation_105.serial.should be_truthy
 
         ResourceImportResult.where(manifestation_id: manifestation_101.id).order(:id).last.error_message.should eq "line 22: #{I18n.t('import.manifestation_found')}"
         ResourceImportResult.where(item_id: item_10101.id).order(:id).last.error_message.should eq "line 9: #{I18n.t('import.item_found')}"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enju_biblio
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Kosuke Tanabe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-29 00:00:00.000000000 Z
+date: 2018-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: enju_library
@@ -114,126 +114,126 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0.rc.1
+        version: 1.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0.rc.1
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: enju_manifestation_viewer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0.rc.1
+        version: 0.3.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0.rc.1
+        version: 0.3.1
 - !ruby/object:Gem::Dependency
   name: enju_subject
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0.rc.1
+        version: 0.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0.rc.1
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: enju_inventory
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0.beta.1
+        version: 0.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0.beta.1
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: enju_bookmark
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0.beta.1
+        version: 0.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0.beta.1
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: enju_event
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0.rc.1
+        version: 0.3.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0.rc.1
+        version: 0.3.1
 - !ruby/object:Gem::Dependency
   name: enju_circulation
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0.rc.1
+        version: 0.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0.rc.1
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: enju_ndl
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0.rc.1
+        version: 0.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0.rc.1
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: enju_oai
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0.beta.1
+        version: 0.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0.beta.1
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -378,16 +378,16 @@ dependencies:
   name: resque
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.27'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.27'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement