enju_oai 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 84d4b8eb920d61b55cc6e551fcda0599a6e94075
-  data.tar.gz: ff29d269d0ef01af3a2c6e15baea0a89923cef05
+SHA256:
+  metadata.gz: 657cc7609b6f1f359d2c84821e58e5db324be49aaf55a98e6824cfd333f3bf58
+  data.tar.gz: 904de4f9a94cababee669cb39df0b30e3e3ad8edb4f08ced264d2f9c6ef72cfd
 SHA512:
-  metadata.gz: 06a9aa40fdd30a5d3069365912735b30a2493dabfe6f6ff5b0a7c86705ddb2c459059333e64e5a20218eb795315c9e1d7f2061c84f113b13dfa4b3489fe18309
-  data.tar.gz: 000cca4464e13a37467367c95cd7bf11f70dde75708934d61f811693826f4ac9e150ae7858bd9113c38d627c135090082611bee6b560bb6bb022eb10da57fdcd
+  metadata.gz: 931d716daefe83e49001901fdd18cda465fc32ad1887778b4a8c7652a0430fb23aa78866c211906014d222e77b67141aa17957a0f73f0bfc62c236d8bec8a8da
+  data.tar.gz: fd09adc6f23c069163510135780c861a6bb688992f0f25bbe1a356e8e2985c996418758da82158abb3b7b935cbe4da8f4cd6b6ba534fafcf49f3d2abcf18655b

data/README.md

@@ -0,0 +1,11 @@
+# EnjuEvent
+[![Travis CI](https://travis-ci.com/next-l/enju_oai.svg?branch=1.3)](https://travis-ci.com/next-l/enju_oai)
+[![Coverage Status](https://coveralls.io/repos/github/next-l/enju_oai/badge.svg?branch=1.3)](https://coveralls.io/github/next-l/enju_oai?branch=1.3)
+[![security](https://hakiri.io/github/next-l/enju_oai/1.3.svg)](https://hakiri.io/github/next-l/enju_oai/1.3)
+
+This project rocks and uses MIT-LICENSE.
+
+## 製作者・貢献者 (Authors and contributors)
+* [TANABE, Kosuke](https://github.com/nabeta) ([@nabeta](https://twitter.com/nabeta))
+* [Project Next-L](https://www.next-l.jp) ([@ProjectNextL](https://twitter.com/ProjectNextL))
+

data/app/controllers/oai_controller.rb

@@ -22,6 +22,7 @@ class OaiController < ApplicationController
         order_by :updated_at, :desc
         paginate cursor: token, per_page: oai_per_page
         with(:updated_at).between(from_time..until_time)
+        with(:required_role_id).equal_to Role.default_role.id
       end
       @manifestations = search.execute!.results
 

data/app/views/oai/list_identifiers.xml.builder

@@ -9,20 +9,18 @@ xml.tag! "OAI-PMH", :xmlns => "http://www.openarchives.org/OAI/2.0/",
   end
   xml.ListIdentifiers do
     @manifestations.each do |manifestation|
-      cache([manifestation, fragment: 'list_identifiers_oai', role: current_user_role_name, locale: @locale]) do
-        xml.header do
-          xml.identifier manifestation.oai_identifier
-          xml.datestamp manifestation.updated_at.utc.iso8601
-          manifestation.series_statements.each do |series_statement|
-            xml.setSpec series_statement.id
-          end
+      xml.header do
+        xml.identifier manifestation.oai_identifier
+        xml.datestamp manifestation.updated_at.utc.iso8601
+        manifestation.series_statements.each do |series_statement|
+          xml.setSpec series_statement.id
         end
       end
     end
-    if @manifestations.last_page?
-      xml.resumptionToken nil, completeListSize: @manifestations.total_count
-    else
+    if @manifestations.next_page_cursor
       xml.resumptionToken CGI.escape(@manifestations.next_page_cursor), completeListSize: @manifestations.total_count
+    else
+      xml.resumptionToken nil, completeListSize: @manifestations.total_count
     end
   end
 end

data/app/views/oai/list_records.xml.builder

@@ -9,29 +9,27 @@ xml.tag! "OAI-PMH", :xmlns => "http://www.openarchives.org/OAI/2.0/",
   end
   xml.ListRecords do
     @manifestations.each do |manifestation|
-      cache([manifestation, fragment: 'list_records_oai', role: current_user_role_name, locale: @locale]) do
-        xml.record do
-          xml.header do
-            xml.identifier manifestation.oai_identifier
-            xml.datestamp manifestation.updated_at.utc.iso8601
-          end
-          xml.metadata do
-            case @oai[:metadataPrefix]
-            when 'oai_dc', nil
-              render 'record_oai_dc', manifestation: manifestation, xml_builder: xml
-            when 'junii2'
-              render 'record_junii2', manifestation: manifestation, xml_builder: xml
-            when 'dcndl'
-              render 'record_dcndl', manifestation: manifestation, xml_builder: xml
-            end
+      xml.record do
+        xml.header do
+          xml.identifier manifestation.oai_identifier
+          xml.datestamp manifestation.updated_at.utc.iso8601
+        end
+        xml.metadata do
+          case @oai[:metadataPrefix]
+          when 'oai_dc', nil
+            render 'record_oai_dc', manifestation: manifestation, xml_builder: xml
+          when 'junii2'
+            render 'record_junii2', manifestation: manifestation, xml_builder: xml
+          when 'dcndl'
+            render 'record_dcndl', manifestation: manifestation, xml_builder: xml
           end
         end
       end
     end
-    if @manifestations.last_page?
-      xml.resumptionToken nil, completeListSize: @manifestations.total_count
-    else
+    if @manifestations.next_page_cursor
       xml.resumptionToken CGI.escape(@manifestations.next_page_cursor), completeListSize: @manifestations.total_count
+    else
+      xml.resumptionToken nil, completeListSize: @manifestations.total_count
     end
   end
 end

data/lib/enju_oai/oai_controller.rb

@@ -14,6 +14,7 @@ module EnjuOai
         when 'ListSets'
         when 'ListMetadataFormats'
         when 'ListIdentifiers'
+          oai[:metadataPrefix] = params[:metadataPrefix]
           unless valid_metadata_format?(params[:metadataPrefix])
             oai[:errors] << "badArgument"
           end

data/lib/enju_oai/version.rb

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

data/spec/cassette_library/oai/list_records_xml_builder/when_metadataPrefix_is_dcndl/renders_well-formed_XML.yml

@@ -2,13 +2,13 @@
 http_interactions:
 - request:
     method: get
-    uri: http://iss.ndl.go.jp/api/sru?maximumRecords=1&onlyBib=true&operation=searchRetrieve&query=(itemno=R100000002-I000008369884-00)&recordSchema=dcndl
+    uri: https://iss.ndl.go.jp/api/sru?maximumRecords=1&onlyBib=true&operation=searchRetrieve&query=(itemno=R100000002-I000008369884-00)&recordSchema=dcndl
     body:
       encoding: US-ASCII
       string: ''
     headers:
       User-Agent:
-      - Faraday v0.13.1
+      - Faraday v0.15.4
       Accept-Encoding:
       - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
       Accept:
@@ -19,43 +19,44 @@ http_interactions:
       message: OK
     headers:
       Date:
-      - Sun, 24 Dec 2017 14:04:29 GMT
+      - Sun, 31 Mar 2019 17:41:26 GMT
+      X-Ua-Compatible:
+      - IE=Edge,chrome=1
+      Etag:
+      - '"87a80ab1645d4156152f1fee7074af4e"'
       Cache-Control:
       - max-age=0, private, must-revalidate
       X-Runtime:
-      - '1.372156'
-      Etag:
-      - '"9e9a67f99ebaee5f708dd6b1d8baf94f"'
-      X-Ua-Compatible:
-      - IE=Edge,chrome=1
+      - '1.457844'
+      Content-Length:
+      - '9881'
       Status:
       - '200'
       Content-Type:
       - application/xml; charset=utf-8
       Set-Cookie:
-      - ROUTEID=.ps19; path=/
-      - TS01cb7804=011338590a7459f78cdb911c9f82a12f76c4771492652279d2c3d230a335caf6cbc160d00a6952cc1314af66f6a32ade2d0f94f462;
-        path=/; domain=.iss.ndl.go.jp
-      - TS01f3cfdf=011338590ae11402eef47f0cc0f4b9c88ec46cee54148b389819a3d4af0770f78a3197bbcacbb531f1c0638f9e25c9474d89cb923e65ef4069b53e7e0fd59133260f7d2dcf5b2610ae91edd214af2ab18f80ead2ed;
+      - HTTP_Z308_KEY_DATA_01=; domain=.ndl.go.jp; path=/; expires=Thu, 01-Jan-1970
+        00:00:00 GMT
+      - ROUTEID=.ps21; path=/
+      - TS0162cc8a=011338590a514376898e160ff4df9a9e5fd61c62535fdd42159fcdad87d3a2eefa401e016b28afd532ae7aec3689bf9f32643f79b1353a13c592d1ec4071b4138959a32e8e3381682c81b0884f3e47ff5300482141;
+        path=/; domain=.ndl.go.jp
+      - TS01f3cfdf=011338590a675a502cad0b6c8ecba8f9e138ac9061710f1ddce5e0a5781b1fe46e8ce2ab9c2b7e3ca585de00cdb6d23ad292c250a0eb2b1bb0aa06afd3164d953319687792a40023a8d61dfe6732213afb71b8526ec000e0463e3e4a0f746760528c3b2402;
         Path=/
-      - _front_session_id=0b067ff701b4b5a594805e9d240c9e9f; domain=.iss.ndl.go.jp;
-        path=/; expires=Sun, 24-Dec-2017 15:04:30 GMT; HttpOnly
-      - ndl.go.jp=rd2o00000000000000000000ffff0a024f68o80; path=/
-      - serverid=1101; path=/
-      Vary:
-      - Accept-Encoding,User-Agent
+      - _front_session_id=64a051560c3717ffe3bd480172cd8b5f;Secure; path=/; expires=Sun,
+        31-Mar-2019 18:41:28 GMT; HttpOnly
+      - cookieId=;secure; domain=.ndl.go.jp; path=/; expires=Thu, 01-Jan-1970 00:00:00
+        GMT
+      - ndl.go.jp=rd2o00000000000000000000ffff0a024f76o80; path=/
+      - serverid=1103; path=/
+      - sessionId=; domain=.ndl.go.jp; path=/; expires=Thu, 01-Jan-1970 00:00:00 GMT
       X-Content-Type-Options:
       - nosniff
       X-Frame-Options:
       - SAMEORIGIN
-      Content-Length:
-      - '2091'
-      Connection:
-      - close
     body:
       encoding: ASCII-8BIT
       string: !binary |-
-        <?xml version="1.0" encoding="UTF-8"?>
<searchRetrieveResponse xmlns="http://www.loc.gov/zing/srw/">
  <version>1.2</version>
  <numberOfRecords>1</numberOfRecords>
  <nextRecordPosition>0</nextRecordPosition>
  <extraResponseData>
&lt;facets&gt;
  &lt;lst name=&quot;REPOSITORY_NO&quot;&gt;
    &lt;int name=&quot;R100000001&quot;&gt;1&lt;/int&gt;
    &lt;int name=&quot;R100000002&quot;&gt;1&lt;/int&gt;
  &lt;/lst&gt;
  &lt;lst name=&quot;NDC&quot;&gt;
    &lt;int name=&quot;0&quot;&gt;1&lt;/int&gt;
  &lt;/lst&gt;
  &lt;lst name=&quot;ISSUED_DATE&quot;&gt;
    &lt;int name=&quot;2006&quot;&gt;1&lt;/int&gt;
  &lt;/lst&gt;
  &lt;lst name=&quot;LIBRARY&quot;&gt;
    &lt;int name=&quot;三重県立図書館&quot;&gt;1&lt;/int&gt;
    &lt;int name=&quot;京都府立図書館&quot;&gt;1&lt;/int&gt;
    &lt;int name=&quot;佐賀県立図書館&quot;&gt;1&lt;/int&gt;
    &lt;int name=&quot;兵庫県立図書館&quot;&gt;1&lt;/int&gt;
    &lt;int name=&quot;北海道立図書館&quot;&gt;1&lt;/int&gt;
    &lt;int name=&quot;千葉市中央図書館&quot;&gt;1&lt;/int&gt;
    &lt;int name=&quot;千葉県立東部図書館&quot;&gt;1&lt;/int&gt;
    &lt;int name=&quot;和歌山県立図書館&quot;&gt;1&lt;/int&gt;
    &lt;int name=&quot;国立国会図書館&quot;&gt;1&lt;/int&gt;
    &lt;int name=&quot;埼玉県立熊谷図書館&quot;&gt;1&lt;/int&gt;
    &lt;int name=&quot;大分県立図書館&quot;&gt;1&lt;/int&gt;
    &lt;int name=&quot;大阪市立図書館&quot;&gt;1&lt;/int&gt;
    &lt;int name=&quot;大阪府立中央図書館&quot;&gt;1&lt;/int&gt;
    &lt;int name=&quot;奈良県立図書情報館&quot;&gt;1&lt;/int&gt;
    &lt;int name=&quot;宮城県図書館&quot;&gt;1&lt;/int&gt;
    &lt;int name=&quot;宮崎県立図書館&quot;&gt;1&lt;/int&gt;
    &lt;int name=&quot;富山県立図書館&quot;&gt;1&lt;/int&gt;
    &lt;int name=&quot;山口県立山口図書館&quot;&gt;1&lt;/int&gt;
    &lt;int name=&quot;山梨県立図書館&quot;&gt;1&lt;/int&gt;
    &lt;int name=&quot;岐阜県図書館&quot;&gt;1&lt;/int&gt;
    &lt;int name=&quot;岡山県立図書館&quot;&gt;1&lt;/int&gt;
    &lt;int name=&quot;岩手県立図書館&quot;&gt;1&lt;/int&gt;
    &lt;int name=&quot;島根県立図書館&quot;&gt;1&lt;/int&gt;
    &lt;int name=&quot;広島市立中央図書館&quot;&gt;1&lt;/int&gt;
    &lt;int name=&quot;徳島県立図書館&quot;&gt;1&lt;/int&gt;
    &lt;int name=&quot;愛知県図書館&quot;&gt;1&lt;/int&gt;
    &lt;int name=&quot;新潟県立図書館&quot;&gt;1&lt;/int&gt;
    &lt;int name=&quot;東京都立中央図書館&quot;&gt;1&lt;/int&gt;
    &lt;int name=&quot;栃木県立図書館&quot;&gt;1&lt;/int&gt;
    &lt;int name=&quot;横浜市中央図書館&quot;&gt;1&lt;/int&gt;
    &lt;int name=&quot;沖縄県立図書館&quot;&gt;1&lt;/int&gt;
    &lt;int name=&quot;滋賀県立図書館&quot;&gt;1&lt;/int&gt;
    &lt;int name=&quot;熊本県立図書館&quot;&gt;1&lt;/int&gt;
    &lt;int name=&quot;県立長野図書館&quot;&gt;1&lt;/int&gt;
    &lt;int name=&quot;石川県立図書館&quot;&gt;1&lt;/int&gt;
    &lt;int name=&quot;福井県立図書館&quot;&gt;1&lt;/int&gt;
    &lt;int name=&quot;福岡市総合図書館&quot;&gt;1&lt;/int&gt;
    &lt;int name=&quot;福岡県立図書館&quot;&gt;1&lt;/int&gt;
    &lt;int name=&quot;福島県立図書館&quot;&gt;1&lt;/int&gt;
    &lt;int name=&quot;秋田県立図書館&quot;&gt;1&lt;/int&gt;
    &lt;int name=&quot;群馬県立図書館&quot;&gt;1&lt;/int&gt;
    &lt;int name=&quot;茨城県立図書館&quot;&gt;1&lt;/int&gt;
    &lt;int name=&quot;青森県立図書館&quot;&gt;1&lt;/int&gt;
    &lt;int name=&quot;静岡市立中央図書館&quot;&gt;1&lt;/int&gt;
    &lt;int name=&quot;静岡県立中央図書館&quot;&gt;1&lt;/int&gt;
    &lt;int name=&quot;香川県立図書館&quot;&gt;1&lt;/int&gt;
    &lt;int name=&quot;鳥取県立図書館&quot;&gt;1&lt;/int&gt;
    &lt;int name=&quot;鹿児島県立図書館&quot;&gt;1&lt;/int&gt;
  &lt;/lst&gt;
&lt;/facets&gt;
  </extraResponseData>
  <records>
    <record>
      <recordSchema>info:srw/schema/1/dc-v1.1</recordSchema>
      <recordPacking>string</recordPacking>
      <recordData>
&lt;rdf:RDF xmlns:rdf=&quot;http://www.w3.org/1999/02/22-rdf-syntax-ns#&quot; xmlns:foaf=&quot;http://xmlns.com/foaf/0.1/&quot; xmlns:owl=&quot;http://www.w3.org/2002/07/owl#&quot; xmlns:dcterms=&quot;http://purl.org/dc/terms/&quot; xmlns:rdfs=&quot;http://www.w3.org/2000/01/rdf-schema#&quot; xmlns:dc=&quot;http://purl.org/dc/elements/1.1/&quot; xmlns:dcndl=&quot;http://ndl.go.jp/dcndl/terms/&quot;&gt;
  &lt;dcndl:BibAdminResource rdf:about=&quot;http://iss.ndl.go.jp/books/R100000002-I000008369884-00&quot;&gt;
    &lt;dcndl:catalogingStatus&gt;C7&lt;/dcndl:catalogingStatus&gt;
    &lt;dcndl:bibRecordCategory&gt;R100000002&lt;/dcndl:bibRecordCategory&gt;
    &lt;dcndl:record rdf:resource=&quot;http://iss.ndl.go.jp/books/R100000002-I000008369884-00#material&quot;/&gt;
  &lt;/dcndl:BibAdminResource&gt;
  &lt;dcndl:BibResource rdf:about=&quot;http://iss.ndl.go.jp/books/R100000002-I000008369884-00#material&quot;&gt;
    &lt;dcterms:identifier rdf:datatype=&quot;http://ndl.go.jp/dcndl/terms/JPNO&quot;&gt;21143688&lt;/dcterms:identifier&gt;
    &lt;dcterms:identifier rdf:datatype=&quot;http://ndl.go.jp/dcndl/terms/ISBN&quot;&gt;4-88367-131-3&lt;/dcterms:identifier&gt;
    &lt;rdfs:seeAlso rdf:resource=&quot;http://id.ndl.go.jp/jpno/21143688&quot;/&gt;
    &lt;rdfs:seeAlso rdf:resource=&quot;http://iss.ndl.go.jp/isbn/4883671313&quot;/&gt;
    &lt;dcterms:title&gt;情報検索演習&lt;/dcterms:title&gt;
    &lt;dc:title&gt;
      &lt;rdf:Description&gt;
        &lt;rdf:value&gt;情報検索演習&lt;/rdf:value&gt;
        &lt;dcndl:transcription&gt;ジョウホウ ケンサク エンシュウ&lt;/dcndl:transcription&gt;
      &lt;/rdf:Description&gt;
    &lt;/dc:title&gt;
    &lt;dcndl:seriesTitle&gt;
      &lt;rdf:Description&gt;
        &lt;rdf:value&gt;新・図書館学シリーズ ; 6&lt;/rdf:value&gt;
        &lt;dcndl:transcription&gt;シン トショカンガク シリーズ&lt;/dcndl:transcription&gt;
      &lt;/rdf:Description&gt;
    &lt;/dcndl:seriesTitle&gt;
    &lt;dcndl:edition&gt;3訂&lt;/dcndl:edition&gt;
    &lt;dcterms:creator&gt;
      &lt;foaf:Agent rdf:about=&quot;http://id.ndl.go.jp/auth/entity/00985986&quot;&gt;
        &lt;foaf:name&gt;原田, 智子, 1947-&lt;/foaf:name&gt;
        &lt;dcndl:transcription&gt;ハラダ, トモコ&lt;/dcndl:transcription&gt;
      &lt;/foaf:Agent&gt;
    &lt;/dcterms:creator&gt;
    &lt;dcterms:creator&gt;
      &lt;foaf:Agent rdf:about=&quot;http://id.ndl.go.jp/auth/entity/01068510&quot;&gt;
        &lt;foaf:name&gt;江草, 由佳&lt;/foaf:name&gt;
        &lt;dcndl:transcription&gt;エグサ, ユカ&lt;/dcndl:transcription&gt;
      &lt;/foaf:Agent&gt;
    &lt;/dcterms:creator&gt;
    &lt;dcterms:creator&gt;
      &lt;foaf:Agent rdf:about=&quot;http://id.ndl.go.jp/auth/entity/01059460&quot;&gt;
        &lt;foaf:name&gt;小山, 憲司, 1971-&lt;/foaf:name&gt;
        &lt;dcndl:transcription&gt;コヤマ, ケンジ&lt;/dcndl:transcription&gt;
      &lt;/foaf:Agent&gt;
    &lt;/dcterms:creator&gt;
    &lt;dcterms:creator&gt;
      &lt;foaf:Agent rdf:about=&quot;http://id.ndl.go.jp/auth/entity/00147978&quot;&gt;
        &lt;foaf:name&gt;高山, 正也, 1941-&lt;/foaf:name&gt;
        &lt;dcndl:transcription&gt;タカヤマ, マサヤ&lt;/dcndl:transcription&gt;
      &lt;/foaf:Agent&gt;
    &lt;/dcterms:creator&gt;
    &lt;dcterms:creator&gt;
      &lt;foaf:Agent rdf:about=&quot;http://id.ndl.go.jp/auth/entity/00146163&quot;&gt;
        &lt;foaf:name&gt;植松, 貞夫, 1948-&lt;/foaf:name&gt;
        &lt;dcndl:transcription&gt;ウエマツ, サダオ&lt;/dcndl:transcription&gt;
      &lt;/foaf:Agent&gt;
    &lt;/dcterms:creator&gt;
    &lt;dc:creator&gt;原田智子 編&lt;/dc:creator&gt;
    &lt;dc:creator&gt;原田智子, 江草由佳, 小山憲司, 澤井清 共著&lt;/dc:creator&gt;
    &lt;dcndl:seriesCreator&gt;高山正也, 植松貞夫 監修&lt;/dcndl:seriesCreator&gt;
    &lt;dcterms:publisher&gt;
      &lt;foaf:Agent&gt;
        &lt;foaf:name&gt;樹村房&lt;/foaf:name&gt;
        &lt;dcndl:transcription&gt;ジュソンボウ&lt;/dcndl:transcription&gt;
        &lt;dcndl:location&gt;東京&lt;/dcndl:location&gt;
      &lt;/foaf:Agent&gt;
    &lt;/dcterms:publisher&gt;
    &lt;dcndl:publicationPlace rdf:datatype=&quot;http://purl.org/dc/terms/ISO3166&quot;&gt;JP&lt;/dcndl:publicationPlace&gt;
    &lt;dcterms:date&gt;2006.10&lt;/dcterms:date&gt;
    &lt;dcterms:issued rdf:datatype=&quot;http://purl.org/dc/terms/W3CDTF&quot;&gt;2006&lt;/dcterms:issued&gt;
    &lt;dcterms:subject&gt;
      &lt;rdf:Description rdf:about=&quot;http://id.ndl.go.jp/auth/ndlsh/00575010&quot;&gt;
        &lt;rdf:value&gt;情報検索&lt;/rdf:value&gt;
      &lt;/rdf:Description&gt;
    &lt;/dcterms:subject&gt;
    &lt;dcterms:subject rdf:resource=&quot;http://id.ndl.go.jp/class/ndlc/UL41&quot;/&gt;
    &lt;dcterms:subject rdf:resource=&quot;http://id.ndl.go.jp/class/ndc9/007.58&quot;/&gt;
    &lt;dcterms:language rdf:datatype=&quot;http://purl.org/dc/terms/ISO639-2&quot;&gt;jpn&lt;/dcterms:language&gt;
    &lt;dcterms:extent&gt;203p ; 21cm&lt;/dcterms:extent&gt;
    &lt;dcndl:price&gt;1900円&lt;/dcndl:price&gt;
    &lt;dcterms:audience&gt;一般&lt;/dcterms:audience&gt;
    &lt;dcndl:materialType rdfs:label=&quot;図書&quot; rdf:resource=&quot;http://ndl.go.jp/ndltype/Book&quot;/&gt;
    &lt;dcterms:accessRights&gt;S01P99U99&lt;/dcterms:accessRights&gt;
  &lt;/dcndl:BibResource&gt;
&lt;/rdf:RDF&gt;
      </recordData>
      <recordPosition>1</recordPosition>
    </record>
  </records>
</searchRetrieveResponse>

+        <?xml version="1.0" encoding="UTF-8"?>
<searchRetrieveResponse xmlns="http://www.loc.gov/zing/srw/">
  <version>1.2</version>
  <numberOfRecords>1</numberOfRecords>
  <nextRecordPosition>0</nextRecordPosition>
  <extraResponseData>
&lt;facets&gt;
  &lt;lst name=&quot;REPOSITORY_NO&quot;&gt;
    &lt;int name=&quot;R100000001&quot;&gt;1&lt;/int&gt;
    &lt;int name=&quot;R100000002&quot;&gt;1&lt;/int&gt;
  &lt;/lst&gt;
  &lt;lst name=&quot;NDC&quot;&gt;
    &lt;int name=&quot;0&quot;&gt;1&lt;/int&gt;
  &lt;/lst&gt;
  &lt;lst name=&quot;ISSUED_DATE&quot;&gt;
    &lt;int name=&quot;2006&quot;&gt;1&lt;/int&gt;
  &lt;/lst&gt;
  &lt;lst name=&quot;LIBRARY&quot;&gt;
    &lt;int name=&quot;三重県立図書館&quot;&gt;1&lt;/int&gt;
    &lt;int name=&quot;京都府立図書館&quot;&gt;1&lt;/int&gt;
    &lt;int name=&quot;佐賀県立図書館&quot;&gt;1&lt;/int&gt;
    &lt;int name=&quot;兵庫県立図書館&quot;&gt;1&lt;/int&gt;
    &lt;int name=&quot;北海道立図書館&quot;&gt;1&lt;/int&gt;
    &lt;int name=&quot;千葉市中央図書館&quot;&gt;1&lt;/int&gt;
    &lt;int name=&quot;千葉県立東部図書館&quot;&gt;1&lt;/int&gt;
    &lt;int name=&quot;和歌山県立図書館&quot;&gt;1&lt;/int&gt;
    &lt;int name=&quot;国立国会図書館&quot;&gt;1&lt;/int&gt;
    &lt;int name=&quot;埼玉県立熊谷図書館&quot;&gt;1&lt;/int&gt;
    &lt;int name=&quot;堺市立中央図書館&quot;&gt;1&lt;/int&gt;
    &lt;int name=&quot;大分県立図書館&quot;&gt;1&lt;/int&gt;
    &lt;int name=&quot;大阪市立図書館&quot;&gt;1&lt;/int&gt;
    &lt;int name=&quot;大阪府立中央図書館&quot;&gt;1&lt;/int&gt;
    &lt;int name=&quot;奈良県立図書情報館&quot;&gt;1&lt;/int&gt;
    &lt;int name=&quot;宮城県図書館&quot;&gt;1&lt;/int&gt;
    &lt;int name=&quot;宮崎県立図書館&quot;&gt;1&lt;/int&gt;
    &lt;int name=&quot;富山県立図書館&quot;&gt;1&lt;/int&gt;
    &lt;int name=&quot;山口県立山口図書館&quot;&gt;1&lt;/int&gt;
    &lt;int name=&quot;山梨県立図書館&quot;&gt;1&lt;/int&gt;
    &lt;int name=&quot;岐阜県図書館&quot;&gt;1&lt;/int&gt;
    &lt;int name=&quot;岡山県立図書館&quot;&gt;1&lt;/int&gt;
    &lt;int name=&quot;岩手県立図書館&quot;&gt;1&lt;/int&gt;
    &lt;int name=&quot;島根県立図書館&quot;&gt;1&lt;/int&gt;
    &lt;int name=&quot;川崎市立図書館&quot;&gt;1&lt;/int&gt;
    &lt;int name=&quot;広島市立中央図書館&quot;&gt;1&lt;/int&gt;
    &lt;int name=&quot;徳島県立図書館&quot;&gt;1&lt;/int&gt;
    &lt;int name=&quot;愛知県図書館&quot;&gt;1&lt;/int&gt;
    &lt;int name=&quot;新潟県立図書館&quot;&gt;1&lt;/int&gt;
    &lt;int name=&quot;東京都立中央図書館&quot;&gt;1&lt;/int&gt;
    &lt;int name=&quot;栃木県立図書館&quot;&gt;1&lt;/int&gt;
    &lt;int name=&quot;横浜市中央図書館&quot;&gt;1&lt;/int&gt;
    &lt;int name=&quot;沖縄県立図書館&quot;&gt;1&lt;/int&gt;
    &lt;int name=&quot;滋賀県立図書館&quot;&gt;1&lt;/int&gt;
    &lt;int name=&quot;熊本県立図書館&quot;&gt;1&lt;/int&gt;
    &lt;int name=&quot;県立長野図書館&quot;&gt;1&lt;/int&gt;
    &lt;int name=&quot;石川県立図書館&quot;&gt;1&lt;/int&gt;
    &lt;int name=&quot;福井県立図書館&quot;&gt;1&lt;/int&gt;
    &lt;int name=&quot;福岡市総合図書館&quot;&gt;1&lt;/int&gt;
    &lt;int name=&quot;福岡県立図書館&quot;&gt;1&lt;/int&gt;
    &lt;int name=&quot;福島県立図書館&quot;&gt;1&lt;/int&gt;
    &lt;int name=&quot;秋田県立図書館&quot;&gt;1&lt;/int&gt;
    &lt;int name=&quot;群馬県立図書館&quot;&gt;1&lt;/int&gt;
    &lt;int name=&quot;茨城県立図書館&quot;&gt;1&lt;/int&gt;
    &lt;int name=&quot;青森県立図書館&quot;&gt;1&lt;/int&gt;
    &lt;int name=&quot;静岡市立中央図書館&quot;&gt;1&lt;/int&gt;
    &lt;int name=&quot;静岡県立中央図書館&quot;&gt;1&lt;/int&gt;
    &lt;int name=&quot;香川県立図書館&quot;&gt;1&lt;/int&gt;
    &lt;int name=&quot;鳥取県立図書館&quot;&gt;1&lt;/int&gt;
    &lt;int name=&quot;鹿児島県立図書館&quot;&gt;1&lt;/int&gt;
  &lt;/lst&gt;
&lt;/facets&gt;
  </extraResponseData>
  <records>
    <record>
      <recordSchema>info:srw/schema/1/dc-v1.1</recordSchema>
      <recordPacking>string</recordPacking>
      <recordData>
&lt;rdf:RDF xmlns:dc=&quot;http://purl.org/dc/elements/1.1/&quot; xmlns:rdf=&quot;http://www.w3.org/1999/02/22-rdf-syntax-ns#&quot; xmlns:rdfs=&quot;http://www.w3.org/2000/01/rdf-schema#&quot; xmlns:foaf=&quot;http://xmlns.com/foaf/0.1/&quot; xmlns:dcndl=&quot;http://ndl.go.jp/dcndl/terms/&quot; xmlns:owl=&quot;http://www.w3.org/2002/07/owl#&quot; xmlns:dcterms=&quot;http://purl.org/dc/terms/&quot;&gt;
  &lt;dcndl:BibAdminResource rdf:about=&quot;http://iss.ndl.go.jp/books/R100000002-I000008369884-00&quot;&gt;
    &lt;dcndl:catalogingStatus&gt;C7&lt;/dcndl:catalogingStatus&gt;
    &lt;dcndl:bibRecordCategory&gt;R100000002&lt;/dcndl:bibRecordCategory&gt;
    &lt;dcndl:record rdf:resource=&quot;http://iss.ndl.go.jp/books/R100000002-I000008369884-00#material&quot;/&gt;
  &lt;/dcndl:BibAdminResource&gt;
  &lt;dcndl:BibResource rdf:about=&quot;http://iss.ndl.go.jp/books/R100000002-I000008369884-00#material&quot;&gt;
    &lt;dcterms:identifier rdf:datatype=&quot;http://ndl.go.jp/dcndl/terms/JPNO&quot;&gt;21143688&lt;/dcterms:identifier&gt;
    &lt;dcterms:identifier rdf:datatype=&quot;http://ndl.go.jp/dcndl/terms/ISBN&quot;&gt;4-88367-131-3&lt;/dcterms:identifier&gt;
    &lt;rdfs:seeAlso rdf:resource=&quot;http://id.ndl.go.jp/jpno/21143688&quot;/&gt;
    &lt;rdfs:seeAlso rdf:resource=&quot;http://iss.ndl.go.jp/isbn/4883671313&quot;/&gt;
    &lt;dcterms:title&gt;情報検索演習&lt;/dcterms:title&gt;
    &lt;dc:title&gt;
      &lt;rdf:Description&gt;
        &lt;rdf:value&gt;情報検索演習&lt;/rdf:value&gt;
        &lt;dcndl:transcription&gt;ジョウホウ ケンサク エンシュウ&lt;/dcndl:transcription&gt;
      &lt;/rdf:Description&gt;
    &lt;/dc:title&gt;
    &lt;dcndl:seriesTitle&gt;
      &lt;rdf:Description&gt;
        &lt;rdf:value&gt;新・図書館学シリーズ ; 6&lt;/rdf:value&gt;
        &lt;dcndl:transcription&gt;シン トショカンガク シリーズ&lt;/dcndl:transcription&gt;
      &lt;/rdf:Description&gt;
    &lt;/dcndl:seriesTitle&gt;
    &lt;dcndl:edition&gt;3訂&lt;/dcndl:edition&gt;
    &lt;dcterms:creator&gt;
      &lt;foaf:Agent rdf:about=&quot;http://id.ndl.go.jp/auth/entity/00985986&quot;&gt;
        &lt;foaf:name&gt;原田, 智子, 1947-&lt;/foaf:name&gt;
        &lt;dcndl:transcription&gt;ハラダ, トモコ&lt;/dcndl:transcription&gt;
      &lt;/foaf:Agent&gt;
    &lt;/dcterms:creator&gt;
    &lt;dcterms:creator&gt;
      &lt;foaf:Agent rdf:about=&quot;http://id.ndl.go.jp/auth/entity/01068510&quot;&gt;
        &lt;foaf:name&gt;江草, 由佳&lt;/foaf:name&gt;
        &lt;dcndl:transcription&gt;エグサ, ユカ&lt;/dcndl:transcription&gt;
      &lt;/foaf:Agent&gt;
    &lt;/dcterms:creator&gt;
    &lt;dcterms:creator&gt;
      &lt;foaf:Agent rdf:about=&quot;http://id.ndl.go.jp/auth/entity/01059460&quot;&gt;
        &lt;foaf:name&gt;小山, 憲司, 1971-&lt;/foaf:name&gt;
        &lt;dcndl:transcription&gt;コヤマ, ケンジ&lt;/dcndl:transcription&gt;
      &lt;/foaf:Agent&gt;
    &lt;/dcterms:creator&gt;
    &lt;dcterms:creator&gt;
      &lt;foaf:Agent rdf:about=&quot;http://id.ndl.go.jp/auth/entity/00147978&quot;&gt;
        &lt;foaf:name&gt;高山, 正也, 1941-&lt;/foaf:name&gt;
        &lt;dcndl:transcription&gt;タカヤマ, マサヤ&lt;/dcndl:transcription&gt;
      &lt;/foaf:Agent&gt;
    &lt;/dcterms:creator&gt;
    &lt;dcterms:creator&gt;
      &lt;foaf:Agent rdf:about=&quot;http://id.ndl.go.jp/auth/entity/00146163&quot;&gt;
        &lt;foaf:name&gt;植松, 貞夫, 1948-&lt;/foaf:name&gt;
        &lt;dcndl:transcription&gt;ウエマツ, サダオ&lt;/dcndl:transcription&gt;
      &lt;/foaf:Agent&gt;
    &lt;/dcterms:creator&gt;
    &lt;dc:creator&gt;原田智子 編&lt;/dc:creator&gt;
    &lt;dc:creator&gt;原田智子, 江草由佳, 小山憲司, 澤井清 共著&lt;/dc:creator&gt;
    &lt;dcndl:seriesCreator&gt;高山正也, 植松貞夫 監修&lt;/dcndl:seriesCreator&gt;
    &lt;dcterms:publisher&gt;
      &lt;foaf:Agent&gt;
        &lt;foaf:name&gt;樹村房&lt;/foaf:name&gt;
        &lt;dcndl:transcription&gt;ジュソンボウ&lt;/dcndl:transcription&gt;
        &lt;dcndl:location&gt;東京&lt;/dcndl:location&gt;
      &lt;/foaf:Agent&gt;
    &lt;/dcterms:publisher&gt;
    &lt;dcndl:publicationPlace rdf:datatype=&quot;http://purl.org/dc/terms/ISO3166&quot;&gt;JP&lt;/dcndl:publicationPlace&gt;
    &lt;dcterms:date&gt;2006.10&lt;/dcterms:date&gt;
    &lt;dcterms:issued rdf:datatype=&quot;http://purl.org/dc/terms/W3CDTF&quot;&gt;2006&lt;/dcterms:issued&gt;
    &lt;dcterms:subject&gt;
      &lt;rdf:Description rdf:about=&quot;http://id.ndl.go.jp/auth/ndlsh/00575010&quot;&gt;
        &lt;rdf:value&gt;情報検索&lt;/rdf:value&gt;
      &lt;/rdf:Description&gt;
    &lt;/dcterms:subject&gt;
    &lt;dcterms:subject rdf:resource=&quot;http://id.ndl.go.jp/class/ndlc/UL41&quot;/&gt;
    &lt;dcterms:subject rdf:resource=&quot;http://id.ndl.go.jp/class/ndc9/007.58&quot;/&gt;
    &lt;dcterms:language rdf:datatype=&quot;http://purl.org/dc/terms/ISO639-2&quot;&gt;jpn&lt;/dcterms:language&gt;
    &lt;dcterms:extent&gt;203p ; 21cm&lt;/dcterms:extent&gt;
    &lt;dcndl:price&gt;1900円&lt;/dcndl:price&gt;
    &lt;dcterms:audience&gt;一般&lt;/dcterms:audience&gt;
    &lt;dcndl:materialType rdf:resource=&quot;http://ndl.go.jp/ndltype/Book&quot; rdfs:label=&quot;図書&quot;/&gt;
    &lt;dcterms:accessRights&gt;S01P99U99&lt;/dcterms:accessRights&gt;
  &lt;/dcndl:BibResource&gt;
&lt;/rdf:RDF&gt;
      </recordData>
      <recordPosition>1</recordPosition>
    </record>
  </records>
</searchRetrieveResponse>

     http_version: 
-  recorded_at: Sun, 24 Dec 2017 14:04:31 GMT
+  recorded_at: Sun, 31 Mar 2019 17:41:27 GMT
 recorded_with: VCR 4.0.0

data/spec/controllers/oai_controller_spec.rb

@@ -63,12 +63,37 @@ RSpec.describe OaiController, type: :controller do
         assigns(:manifestation).should_not be_nil
         response.should render_template('oai/provider')
       end
+
       it "assigns all manifestations as @manifestations in oai format with GetRecord with identifier for junii2 metadata" do
         get :provider, params: { format: 'xml', verb: 'GetRecord', identifier: 'oai:localhost:manifestations-1', metadataPrefix: 'junii2' }
         assigns(:manifestations).should be_nil
         assigns(:manifestation).should_not be_nil
         response.should render_template('oai/get_record')
       end
+
+      it "should return only public identifiers for oai_dc metadata" do
+        get :provider, params: { format: 'xml', verb: 'ListIdentifiers', metadataPrefix: 'oai_dc' }
+        expect(assigns(:manifestations).map(&:id).include?(11)).to be_falsy
+        expect(assigns(:manifestations).map(&:id).include?(24)).to be_falsy
+      end
+
+      it "should return only public identifiers for junii2 metadata" do
+        get :provider, params: { format: 'xml', verb: 'ListIdentifiers', metadataPrefix: 'junii2' }
+        expect(assigns(:manifestations).map(&:id).include?(11)).to be_falsy
+        expect(assigns(:manifestations).map(&:id).include?(24)).to be_falsy
+      end
+
+      it "should return only public records for oai_dc metadata" do
+        get :provider, params: { format: 'xml', verb: 'ListRecords', metadataPrefix: 'oai_dc' }
+        expect(assigns(:manifestations).map(&:id).include?(11)).to be_falsy
+        expect(assigns(:manifestations).map(&:id).include?(24)).to be_falsy
+      end
+
+      it "should return only public records for junii2 metadata" do
+        get :provider, params: { format: 'xml', verb: 'ListRecords', metadataPrefix: 'junii2' }
+        expect(assigns(:manifestations).map(&:id).include?(11)).to be_falsy
+        expect(assigns(:manifestations).map(&:id).include?(24)).to be_falsy
+      end
     end
   end
 end

data/spec/dummy/app/models/application_record.rb

@@ -0,0 +1,3 @@
+class ApplicationRecord < ActiveRecord::Base
+  self.abstract_class = true
+end

data/spec/dummy/config/application.rb

@@ -10,7 +10,7 @@ require "enju_nii"
 module Dummy
   class Application < Rails::Application
     # Initialize configuration defaults for originally generated Rails version.
-    config.load_defaults 5.1
+    config.load_defaults 5.2
 
     # Settings in config/environments/* take precedence over those specified here.
     # Application configuration should go into files in config/initializers

data/spec/dummy/config/database.yml

@@ -1,30 +1,25 @@
-sqlite: &sqlite
+# SQLite version 3.x
+#   gem install sqlite3
+#
+#   Ensure the SQLite 3 gem is defined in your Gemfile
+#   gem 'sqlite3'
+#
+default: &default
   adapter: sqlite3
-  database: db/<%= Rails.env %>.sqlite3
-
-mysql: &mysql
-  adapter: mysql2
-  username: root
-  password:
-  database: enju_<%= Rails.env %>
-
-postgresql: &postgresql
-  adapter: postgresql
-  username: postgres
-  password:
-  database: enju_<%= Rails.env %>
-
-defaults: &defaults
-  pool: 5
+  pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
   timeout: 5000
-  host: localhost
-  <<: *<%= ENV['DB'] || "sqlite" %>
 
 development:
-  <<: *defaults
+  <<: *default
+  database: db/development.sqlite3
 
+# Warning: The database defined as "test" will be erased and
+# re-generated from your development database when you run "rake".
+# Do not set this db to the same as development or production.
 test:
-  <<: *defaults
+  <<: *default
+  database: db/test.sqlite3
 
 production:
-  <<: *defaults
+  <<: *default
+  database: db/production.sqlite3

data/spec/dummy/db/migrate/059_create_libraries.rb

@@ -1,7 +1,7 @@
 class CreateLibraries < ActiveRecord::Migration[4.2]
   def change
     create_table :libraries do |t|
-      t.string :name, null: false
+      t.string :name, index: true, null: false
       t.text :display_name
       t.string :short_display_name, null: false
       t.string :zip_code
@@ -14,15 +14,13 @@ class CreateLibraries < ActiveRecord::Migration[4.2]
       t.text :note
       t.integer :call_number_rows, default: 1, null: false
       t.string :call_number_delimiter, default: "|", null: false
-      t.integer :library_group_id, default: 1, null: false
+      t.references :library_group, index: true, null: false
       t.integer :users_count, default: 0, null: false
       t.integer :position
-      t.integer :country_id
+      t.references :country
 
       t.timestamps
       t.datetime :deleted_at
     end
-    add_index :libraries, :library_group_id
-    add_index :libraries, :name, unique: true
   end
 end

data/spec/dummy/db/migrate/069_create_shelves.rb

@@ -4,12 +4,11 @@ class CreateShelves < ActiveRecord::Migration[4.2]
       t.string :name, null: false
       t.text :display_name
       t.text :note
-      t.integer :library_id, default: 1, null: false
+      t.references :library, index: true, null: false
       t.integer :items_count, default: 0, null: false
       t.integer :position
       t.timestamps
       t.datetime :deleted_at
     end
-    add_index :shelves, :library_id
   end
 end

data/spec/dummy/db/migrate/080_create_library_groups.rb

@@ -3,7 +3,7 @@ class CreateLibraryGroups < ActiveRecord::Migration[4.2]
     create_table :library_groups do |t|
       t.string :name, null: false
       t.text :display_name
-      t.string :short_name, null: false
+      t.string :short_name, index: true, null: false
       t.text :my_networks
       t.text :login_banner
       t.text :note
@@ -12,6 +12,5 @@ class CreateLibraryGroups < ActiveRecord::Migration[4.2]
 
       t.timestamps
     end
-    add_index :library_groups, :short_name
   end
 end

data/spec/dummy/db/migrate/120_create_baskets.rb

@@ -1,12 +1,11 @@
 class CreateBaskets < ActiveRecord::Migration[4.2]
   def change
     create_table :baskets do |t|
-      t.integer :user_id
+      t.references :user, index: true
       t.text :note
       t.integer :lock_version, default: 0, null: false
 
       t.timestamps
     end
-    add_index :baskets, :user_id
   end
 end

data/spec/dummy/db/migrate/20081006090811_create_subscriptions.rb

@@ -3,15 +3,12 @@ class CreateSubscriptions < ActiveRecord::Migration[4.2]
     create_table :subscriptions do |t|
       t.text :title, null: false
       t.text :note
-      #t.integer :subscription_list_id, :integer
-      t.integer :user_id
-      t.integer :order_list_id
+      t.references :user, index: true
+      t.references :order_list, index: true
       t.datetime :deleted_at
       t.integer :subscribes_count, default: 0, null: false
 
       t.timestamps
     end
-    add_index :subscriptions, :user_id
-    add_index :subscriptions, :order_list_id
   end
 end

data/spec/dummy/db/migrate/20081006093246_create_subscribes.rb

@@ -1,14 +1,13 @@
 class CreateSubscribes < ActiveRecord::Migration[4.2]
   def change
     create_table :subscribes do |t|
-      t.integer :subscription_id, null: false
+      t.references :subscription, index: true, null: false
       t.integer :work_id, null: false
       t.datetime :start_at, null: false
       t.datetime :end_at, null: false
 
       t.timestamps
     end
-    add_index :subscribes, :subscription_id
     add_index :subscribes, :work_id
   end
 end

data/spec/dummy/db/migrate/20081027150907_create_picture_files.rb

@@ -3,9 +3,7 @@ class CreatePictureFiles < ActiveRecord::Migration[4.2]
     create_table :picture_files do |t|
       t.integer :picture_attachable_id
       t.string :picture_attachable_type
-      t.string :content_type
       t.text :title
-      t.string :thumbnail
       t.integer :position
 
       t.timestamps

data/spec/dummy/db/migrate/20091012101112_add_dcndl_schema.rb

@@ -8,7 +8,7 @@ class AddDcndlSchema < ActiveRecord::Migration[4.2]
     add_column :manifestations, :valid_until, :timestamp
     add_column :manifestations, :date_submitted, :timestamp
     add_column :manifestations, :date_accepted, :timestamp
-    add_column :manifestations, :date_caputured, :timestamp
+    add_column :manifestations, :date_captured, :timestamp
     rename_column :manifestations, :copyright_date, :date_copyrighted
   end
 
@@ -21,7 +21,7 @@ class AddDcndlSchema < ActiveRecord::Migration[4.2]
     remove_column :manifestations, :valid_until
     remove_column :manifestations, :date_submitted
     remove_column :manifestations, :date_accepted
-    remove_column :manifestations, :date_caputured
+    remove_column :manifestations, :date_captured
     rename_column :manifestations, :date_copyrighted, :copyright_date
   end
 end