enju_biblio 0.3.11 → 0.3.14

data/app/views/manifestations/index.rss.builder

@@ -5,11 +5,11 @@ xml.rss('version' => "2.0",
         'xmlns:atom' => "http://www.w3.org/2005/Atom"){
   xml.channel{
     xml.title t('manifestation.query_search_result', query: @query, library_group_name: @library_group.display_name.localize)
-    xml.link "#{request.protocol}#{request.host_with_port}#{url_for(filtered_params.merge(format: nil, only_path: true))}"
+    xml.link "#{request.protocol}#{request.host_with_port}#{url_for(request.params.merge(format: nil, only_path: true))}"
     xml.description "Next-L Enju, an open source integrated library system developed by Project Next-L"
     xml.language @locale.to_s
     xml.ttl "60"
-    xml.tag! "atom:link", rel: 'self', href: "#{request.protocol}#{request.host_with_port}#{url_for(filtered_params.merge(format: :rss, only_path: true))}"
+    xml.tag! "atom:link", rel: 'self', href: "#{request.protocol}#{request.host_with_port}#{url_for(request.params.merge(format: :rss, only_path: true))}"
     xml.tag! "atom:link", rel: 'alternate', href: manifestations_url
     xml.tag! "atom:link", rel: 'search', type: 'application/opensearchdescription+xml', href: page_opensearch_url
     if params[:query].present?

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.11".freeze
+  VERSION = "0.3.14".freeze
 end

data/lib/enju_biblio.rb

@@ -1,7 +1,5 @@
 require "enju_biblio/engine"
 require "enju_biblio/openurl"
-require "enju_biblio/porta_cql"
-require "enju_biblio/sru"
 
 module EnjuBiblio
 end

data/spec/controllers/items_controller_spec.rb

@@ -46,6 +46,23 @@ describe ItemsController do
         expect(assigns(:items)).to_not be_nil
         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
+          get :index, format: :json
+          expect(response.body).to match /manifestation_id/
+          expect(response.body).not_to match /price/
+          expect(response.body).not_to match /memo/
+          expect(response.body).not_to match /bookstore_id/
+          expect(response.body).not_to match /budget_type_id/
+        end
+      end
     end
 
     describe 'When logged in as User' do
@@ -55,6 +72,18 @@ describe ItemsController do
         get :index
         expect(assigns(:items)).to_not be_nil
       end
+
+      describe 'in JSON response' do
+        render_views
+        it 'should not assign unnecessary attributes' do
+          get :index, format: :json
+          expect(response.body).to match /manifestation_id/
+          expect(response.body).not_to match /price/
+          expect(response.body).not_to match /memo/
+          expect(response.body).not_to match /bookstore_id/
+          expect(response.body).not_to match /budget_type_id/
+        end
+      end
     end
 
     describe 'When not logged in' do
@@ -83,6 +112,18 @@ describe ItemsController do
         assigns(:shelf).should eq Shelf.find(1)
         expect(assigns(:items)).to eq assigns(:shelf).items.order('created_at DESC').page(1)
       end
+
+      describe 'in JSON response' do
+        render_views
+        it 'should not assign unnecessary attributes' do
+          get :index, format: :json
+          expect(response.body).to match /manifestation_id/
+          expect(response.body).not_to match /price/
+          expect(response.body).not_to match /memo/
+          expect(response.body).not_to match /bookstore_id/
+          expect(response.body).not_to match /budget_type_id/
+        end
+      end
     end
   end
 

data/spec/controllers/manifestations_controller_spec.rb

@@ -51,32 +51,13 @@ 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')
       end
 
-      it 'assigns all manifestations as @manifestations in sru format without operation' do
-        get :index, format: 'sru'
-        assert_response :success
-        expect(assigns(:manifestations)).to be_nil
-        expect(response).to render_template('manifestations/explain')
-      end
-
-      it 'assigns all manifestations as @manifestations in sru format with operation' do
-        get :index, params: { format: 'sru', operation: 'searchRetrieve', query: 'ruby' }
-        expect(assigns(:manifestations)).to_not be_nil
-        expect(response).to render_template('manifestations/index')
-      end
-
-      it 'assigns all manifestations as @manifestations in sru format with operation and title' do
-        get :index, params: { format: 'sru', query: 'title=ruby', operation: 'searchRetrieve' }
-        expect(assigns(:manifestations)).to_not be_nil
-        expect(response).to render_template('manifestations/index')
-      end
-
       it 'assigns all manifestations as @manifestations in openurl' do
         get :index, params: { api: 'openurl', title: 'ruby' }
         expect(assigns(:manifestations)).to_not be_nil

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

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

@@ -98,71 +98,6 @@ describe Manifestation, solr: true do
     lambda{Openurl.new({aufirst: "テスト 名称"})}.should raise_error(OpenurlQuerySyntaxError)
   end
 
-  it "should search in sru" do
-    sru = Sru.new({query: "title=Ruby"})
-    sru.search
-    sru.manifestations.size.should eq 18
-    sru.manifestations.first.titles.first.should eq 'Ruby'
-    sru = Sru.new({query: "title=^ruby"})
-    sru.search
-    sru.manifestations.size.should eq 9
-    sru = Sru.new({query: 'title ALL "awk sed"'})
-    sru.search
-    sru.manifestations.size.should eq 2
-    sru.manifestations.collect{|m| m.id}.should eq [184, 116]
-    sru = Sru.new({query: 'title ANY "ruby awk sed"'})
-    sru.search
-    sru.manifestations.size.should eq 22
-    sru = Sru.new({query: 'isbn=9784756137470'})
-    sru.search
-    sru.manifestations.first.id.should eq 114
-    sru = Sru.new({query: "creator=テスト"})
-    sru.search
-    sru.manifestations.size.should eq 1
-  end
-
-  it "should search date in sru" do
-    sru = Sru.new({query: "from = 2000-09 AND until = 2000-11-01"})
-    sru.search
-    sru.manifestations.size.should eq 1
-    sru.manifestations.first.id.should eq 120
-    sru = Sru.new({query: "from = 1993-02-24"})
-    sru.search
-    sru.manifestations.size.should eq 5
-    sru = Sru.new({query: "until = 2006-08-06"})
-    sru.search
-    sru.manifestations.size.should eq 4
-  end
-
-  it "should accept sort_by in sru" do
-    sru = Sru.new({query: "title=Ruby"})
-    sru.sort_by.should eq({sort_by: 'created_at', order: 'desc'})
-    sru = Sru.new({query: 'title=Ruby AND sortBy="title/sort.ascending"', sortKeys: 'creator,0', version: '1.2'})
-    sru.sort_by.should eq({sort_by: 'sort_title', order: 'asc'})
-    sru = Sru.new({query: 'title=Ruby AND sortBy="title/sort.ascending"', sortKeys: 'creator,0', version: '1.1'})
-    sru.sort_by.should eq({sort_by: 'creator', order: 'desc'})
-    sru = Sru.new({query: 'title=Ruby AND sortBy="title/sort.ascending"', sortKeys: 'creator,1', version: '1.1'})
-    sru.sort_by.should eq({sort_by: 'creator', order: 'asc'})
-    sru = Sru.new({query: 'title=Ruby AND sortBy="title'})
-    sru.sort_by.should eq({sort_by: 'sort_title', order: 'asc'})
-    # TODO ソート基準が入手しやすさの場合の処理
-  end
-
-  it "should accept ranges in sru" do
-    sru = Sru.new({query: "from = 1993-02-24 AND until = 2006-08-06 AND title=プログラミング"})
-    sru.search
-    sru.manifestations.size.should eq 2
-    sru = Sru.new({query: "until = 2000 AND title=プログラミング"})
-    sru.search
-    sru.manifestations.size.should eq 1
-    sru = Sru.new({query: "from = 2006 AND title=プログラミング"})
-    sru.search
-    sru.manifestations.size.should eq 1
-    sru = Sru.new({query: "from = 2007 OR title=awk"})
-    sru.search
-    sru.manifestations.size.should eq 6
-  end
-
   it "should_get_number_of_pages" do
     manifestations(:manifestation_00001).number_of_pages.should eq 100
   end
@@ -223,6 +158,8 @@ 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
     end
 
     it "should export edition fields" do
@@ -277,17 +214,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/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/system/items_spec.rb

@@ -111,5 +111,11 @@ RSpec.describe 'Manifestations', type: :system do
       visit item_path(@item.id, locale: :ja)
       expect(page).not_to have_content @item.price
     end
+
+    it 'should add a link to url' do
+      @item.update(url: 'http://example.jp')
+      visit item_path(@item.id)
+      expect(page).to have_link 'http://example.jp'
+    end
   end
 end

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/items/index.json.jbuilder_spec.rb

@@ -0,0 +1,15 @@
+require "rails_helper.rb"
+
+describe "items/index.json.jbuilder", solr: true do
+  before(:each) do
+    item = FactoryBot.create(:item)
+    @items = assign(:items, [item] )
+  end
+
+  it "should export JSON format" do
+    params[:format] = "json"
+    render
+    expect(rendered).not_to match(/memo/)
+  end
+end
+

data/spec/views/items/show.json.jbuilder_spec.rb

@@ -0,0 +1,15 @@
+require 'rails_helper'
+
+describe "items/show.json.jbuilder" do
+  fixtures :all
+
+  before(:each) do
+    assign(:item, FactoryBot.create(:item))
+  end
+
+  it "renders a template" do
+    render
+    expect(rendered).to match(/item_identifier/)
+    expect(rendered).not_to match(/memo/)
+  end
+end

data/spec/views/manifestations/index.html.erb_spec.rb

@@ -12,11 +12,11 @@ describe "manifestations/index" do
     @reservable_facet = @carrier_type_facet = @language_facet = @library_facet = @pub_year_facet = []
     @seconds = 0
     @max_number_of_results = 500
-    view.stub(:filtered_params).and_return(ActionController::Parameters.new(per_page: 50).permit(:per_page))
   end
 
   describe "sort_by menu" do
     it "should reflect per_page params for views" do
+      params[:per_page] = 50
       render
       expect(rendered).to have_selector "select#per_page option[value='50'][selected='selected']"
     end

data/spec/views/manifestations/index.rdf.builder_spec.rb

@@ -5,7 +5,6 @@ describe "manifestations/index.rdf.builder" do
     manifestation = FactoryBot.create(:manifestation)
     @manifestations = assign(:manifestations, [manifestation] )
     @library_group = LibraryGroup.first
-    view.stub(:filtered_params).and_return(ActionController::Parameters.new(per_page: 50).permit([:per_page]))
   end
 
   it "should export RDF format" 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