enju_biblio 0.3.11 → 0.3.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ddb2060da09b931f698c95fe7183cea10953bb55d708d79cf118311af367c2b
-  data.tar.gz: de17c215f560054db264c931878c2a1ff2fd3ed0811911fb2feab4384afd03a0
+  metadata.gz: 13bb317c73b54a9d6ff4bc74db706b224929d3474f1de724d53abd0a3c075e12
+  data.tar.gz: 3fc674acbf36775a9394609f1a3108230c94e62455fdf257371571b58d330990
 SHA512:
-  metadata.gz: c577988123593c8b17f9cbe904492a4f148fb51d98f8294e863e639375303c9901a4fe8a67e3c471d1e406ab98399d86d6bd1b4bd6723ed547e2118f43c165a2
-  data.tar.gz: 6e65d6634be373354842dee7cf6fb8c6dd2e3b9683185b8ffbc5246e45061fe20e7f4c6566d24118a823598c439939ec7036bda2c9fc48e6eb82da6f3e187498
+  metadata.gz: bad673e2ff6572eee73c8ba3314c28895876e41e86e24545f7c8dd090d059544f01c280bb4e0c9cd668d4daa19db04c03771a6b6ddc9d0d385ad42162bf8f51d
+  data.tar.gz: cc53497b07c0d9fea3e1186b9be7e401e47aabb4b32df2087b949e5b95eabb270a0cc056fefc7aea7f65edc31b1f7f02662e1403f1c6704bcad5e1b40eaf3f4f

data/app/controllers/items_controller.rb

@@ -51,6 +51,17 @@ class ItemsController < ApplicationController
 
     unless @inventory_file
       search = Sunspot.new_search(Item)
+      selected_attributes = [
+        :id, :item_identifier, :call_number, :manifestation_id, :acquired_at,
+        :binding_item_identifier, :binding_call_number, :binded_at,
+        :include_supplements, :url, :note,
+        :circulation_status_id, :shelf_id,
+        :created_at, :updated_at
+      ]
+      selected_attributes += [
+        :memo, :required_role_id, :budget_type_id, :bookstore_id, :price
+      ] if current_user.try(:has_role?, 'Librarian')
+      search.data_accessor_for(Item).select = selected_attributes
       set_role_query(current_user, search)
 
       @query = query.dup
@@ -122,7 +133,7 @@ class ItemsController < ApplicationController
 
     respond_to do |format|
       format.html # index.html.erb
-      format.json { render json: @items }
+      format.json
       format.txt  { render layout: false }
       format.atom
     end
@@ -137,7 +148,7 @@ class ItemsController < ApplicationController
 
     respond_to do |format|
       format.html # show.html.erb
-      format.json { render json: @item }
+      format.json
     end
   end
 

data/app/controllers/manifestations_controller.rb

@@ -33,25 +33,14 @@ class ManifestationsController < ApplicationController
         per_page = 65534
       end
 
-      if params[:format] == 'sru'
-        if params[:operation] == 'searchRetrieve'
-          sru = Sru.new(params)
-          query = sru.cql.to_sunspot
-          sort = sru.sort_by
-        else
-          render template: 'manifestations/explain', layout: false
-          return
-        end
+      if params[:api] == 'openurl'
+        openurl = Openurl.new(params)
+        @manifestations = openurl.search
+        query = openurl.query_text
+        sort = set_search_result_order(params[:sort_by], params[:order])
       else
-        if params[:api] == 'openurl'
-          openurl = Openurl.new(params)
-          @manifestations = openurl.search
-          query = openurl.query_text
-          sort = set_search_result_order(params[:sort_by], params[:order])
-        else
-          query = make_query(params[:query], params)
-          sort = set_search_result_order(params[:sort_by], params[:order])
-        end
+        query = make_query(params[:query], params)
+        sort = set_search_result_order(params[:sort_by], params[:order])
       end
 
       # 絞り込みを行わない状態のクエリ
@@ -191,37 +180,37 @@ class ManifestationsController < ApplicationController
       else
         per_page = Manifestation.default_per_page
       end
-      if params[:format] == 'sru'
-        #search.query.start_record(params[:startRecord] || 1, params[:maximumRecords] || 200)
+
+      pub_dates = parse_pub_date(params)
+      pub_date_range = {}
+
+      if pub_dates[:from] == '*'
+        pub_date_range[:from] = 0
       else
-        pub_dates = parse_pub_date(params)
-        pub_date_range = {}
-        if pub_dates[:from] == '*'
-          pub_date_range[:from] = 0
-        else
-          pub_date_range[:from] = Time.zone.parse(pub_dates[:from]).year
-        end
-        if pub_dates[:until] == '*'
-          pub_date_range[:until] = 10000
-        else
-          pub_date_range[:until] = Time.zone.parse(pub_dates[:until]).year
-        end
-        if params[:pub_year_range_interval]
-          pub_year_range_interval = params[:pub_year_range_interval].to_i
-        else
-          pub_year_range_interval = @library_group.pub_year_facet_range_interval || 10
-        end
+        pub_date_range[:from] = Time.zone.parse(pub_dates[:from]).year
+      end
+      if pub_dates[:until] == '*'
+        pub_date_range[:until] = 10000
+      else
+        pub_date_range[:until] = Time.zone.parse(pub_dates[:until]).year
+      end
 
-        search.build do
-          facet :reservable if defined?(EnjuCirculation)
-          facet :carrier_type
-          facet :library
-          facet :language
-          facet :pub_year, range: pub_date_range[:from]..pub_date_range[:until], range_interval: pub_year_range_interval
-          facet :subject_ids if defined?(EnjuSubject)
-          paginate page: page.to_i, per_page: per_page
-        end
+      if params[:pub_year_range_interval]
+        pub_year_range_interval = params[:pub_year_range_interval].to_i
+      else
+        pub_year_range_interval = @library_group.pub_year_facet_range_interval || 10
       end
+
+      search.build do
+        facet :reservable if defined?(EnjuCirculation)
+        facet :carrier_type
+        facet :library
+        facet :language
+        facet :pub_year, range: pub_date_range[:from]..pub_date_range[:until], range_interval: pub_year_range_interval
+        facet :subject_ids if defined?(EnjuSubject)
+        paginate page: page.to_i, per_page: per_page
+      end
+
       search_result = search.execute
       if @count[:query_result] > @max_number_of_results
         max_count = @max_number_of_results
@@ -261,7 +250,6 @@ class ManifestationsController < ApplicationController
       format.html
       format.html.phone
       format.xml  { render xml: @manifestations }
-      format.sru  { render layout: false }
       format.rss  { render layout: false }
       format.txt  { render layout: false }
       format.rdf  { render layout: false }

data/app/views/items/_item.json.jbuilder

@@ -0,0 +1,17 @@
+json.id item.id
+json.manifestation_id item.manifestation_id
+json.item_identifier item.item_identifier
+json.call_number item.call_number
+json.shelf item.shelf.name
+if defined?(EnjuCirculation)
+  json.circulation_status item.circulation_status&.name
+end
+json.binding_item_identifier item.binding_item_identifier
+json.binding_call_number item.binding_call_number
+json.binded_at item.binded_at
+json.acquired_at item.acquired_at
+json.include_supplements item.include_supplements
+json.url item.url
+json.note item.note
+json.created_at item.created_at
+json.updated_at item.updated_at

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

@@ -0,0 +1,5 @@
+json.results do
+  json.array!(@items) do |item|
+    json.partial!(item)
+  end
+end

data/app/views/items/show.json.jbuilder

@@ -0,0 +1 @@
+json.partial!(@item)

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/lib/enju_biblio/version.rb

@@ -1,3 +1,3 @@
 module EnjuBiblio
-  VERSION = "0.3.11".freeze
+  VERSION = "0.3.12".freeze
 end

data/spec/controllers/items_controller_spec.rb

@@ -46,6 +46,18 @@ describe ItemsController do
         expect(assigns(:items)).to_not be_nil
         expect(assigns(:items).count).to eq 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
 
     describe 'When logged in as User' do
@@ -55,6 +67,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 +107,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

@@ -58,25 +58,6 @@ describe ManifestationsController do
         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/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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enju_biblio
 version: !ruby/object:Gem::Version
-  version: 0.3.11
+  version: 0.3.12
 platform: ruby
 authors:
 - Kosuke Tanabe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-31 00:00:00.000000000 Z
+date: 2021-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: enju_library
@@ -746,6 +746,7 @@ files:
 - app/views/item_custom_properties/new.html.erb
 - app/views/item_custom_properties/show.html.erb
 - app/views/items/_form.html.erb
+- app/views/items/_item.json.jbuilder
 - app/views/items/_observe_field.html.erb
 - app/views/items/_shelf_picture.html+phone.erb
 - app/views/items/_shelf_picture.html.erb
@@ -753,10 +754,12 @@ files:
 - app/views/items/edit.html.erb
 - app/views/items/index.html+phone.erb
 - app/views/items/index.html.erb
+- app/views/items/index.json.jbuilder
 - app/views/items/index.txt.erb
 - app/views/items/new.html.erb
 - app/views/items/show.html+phone.erb
 - app/views/items/show.html.erb
+- app/views/items/show.json.jbuilder
 - app/views/languages/_form.html.erb
 - app/views/languages/edit.html.erb
 - app/views/languages/index.html.erb
@@ -853,7 +856,6 @@ files:
 - app/views/manifestations/_title.html.erb
 - app/views/manifestations/edit.html.erb
 - app/views/manifestations/error.xml
-- app/views/manifestations/explain.sru
 - app/views/manifestations/index.atom.builder
 - app/views/manifestations/index.html+phone.erb
 - app/views/manifestations/index.html.erb
@@ -862,7 +864,6 @@ files:
 - app/views/manifestations/index.opds.builder
 - app/views/manifestations/index.rdf.builder
 - app/views/manifestations/index.rss.builder
-- app/views/manifestations/index.sru.builder
 - app/views/manifestations/index.txt.ruby
 - app/views/manifestations/new.html.erb
 - app/views/manifestations/show.html+phone.erb
@@ -1079,8 +1080,6 @@ files:
 - lib/enju_biblio.rb
 - lib/enju_biblio/engine.rb
 - lib/enju_biblio/openurl.rb
-- lib/enju_biblio/porta_cql.rb
-- lib/enju_biblio/sru.rb
 - lib/enju_biblio/version.rb
 - lib/generators/enju_biblio/setup/USAGE
 - lib/generators/enju_biblio/setup/setup_generator.rb
@@ -1622,6 +1621,8 @@ files:
 - spec/views/item_custom_properties/new.html.erb_spec.rb
 - spec/views/item_custom_properties/show.html.erb_spec.rb
 - spec/views/items/index.html.erb_spec.rb
+- spec/views/items/index.json.jbuilder_spec.rb
+- spec/views/items/show.json.jbuilder_spec.rb
 - spec/views/manifestation_custom_properties/edit.html.erb_spec.rb
 - spec/views/manifestation_custom_properties/index.html.erb_spec.rb
 - spec/views/manifestation_custom_properties/new.html.erb_spec.rb
@@ -2033,7 +2034,9 @@ test_files:
 - spec/views/item_custom_properties/edit.html.erb_spec.rb
 - spec/views/item_custom_properties/index.html.erb_spec.rb
 - spec/views/item_custom_properties/show.html.erb_spec.rb
+- spec/views/items/show.json.jbuilder_spec.rb
 - spec/views/items/index.html.erb_spec.rb
+- spec/views/items/index.json.jbuilder_spec.rb
 - spec/views/series_statement_merge_lists/new.html.erb_spec.rb
 - spec/views/series_statement_merge_lists/edit.html.erb_spec.rb
 - spec/views/series_statement_merge_lists/index.html.erb_spec.rb

data/app/views/manifestations/explain.sru

@@ -1,9 +0,0 @@
-<sru:explainResponse xmlns:sru="http://www.loc.gov/zing/srw/">
- <sru:version>1.2</sru:version>
- <sru:record>
-   <sru:recordPacking>XML</sru:recordPacking>
-   <sru:recordSchema>http://explain.z3950.org/dtd/2.1/</sru:recordSchema>
-   <sru:recordData>
-   </sru:recordData>
- </sru:record>
-</sru:explainResponse>

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

@@ -1,101 +0,0 @@
-if @sru
-  unless @sru.extra_response_data.empty?
-    @extra_response = true
-    @facets = @sru.extra_response_data[:facets]
-    @dpid = @sru.extra_response_data[:dpid]
-    @webget = @sru.extra_response_data[:webget]
-    @digitalize = @sru.extra_response_data[:digitalize]
-    @porta_type = @sru.extra_response_data[:porta_type]
-    @payment = @sru.extra_response_data[:payment]
-    @ndc = @sru.extra_response_data[:ndc]
-    @date = @sru.extra_response_data[:date]
-  end
-
-  @version = @sru.version
-  @packing = @sru.packing
-  @number_of_records = @manifestations.total_count
-  @next_record_position = @sru.start + @manifestations.limit_value
-end
-
-def search_retrieve_response!(xml)
-  xml.searchRetrieveResponse xmlns: "http://www.loc.gov/zing/srw/" do
-    xml.version @version
-    xml.numberOfRecords @number_of_records
-    extra_response_data!(xml) if @extra_response
-    xml.records do
-      @manifestations.each_with_index do |rec, idx|
-        xml.record do
-          record!(xml, rec, idx + 1)
-        end
-      end
-    end
-    xml.nextRecordPosition @next_record_position
-  end
-end
-
-def extra_response_data!(xml)
-  xml.extraResponseData do
-    xml.facets @facets do
-      lst_tag!(xml, "REPOSITORY_NO", 'dcndl_porta:dpid', @dpid)
-      lst_tag!(xml, "WEBGET_TYPE", 'dcndl_porta:type.Web-get', @webget)
-      lst_tag!(xml, "DIGITALIZE_TYPE", 'dcndl_porta:type.Digitalize', @digitalize)
-      lst_tag!(xml, "PORTA_TYPE", 'dcndl_porta:PORTAType', @porta_type)
-      lst_tag!(xml, "PAYMENT_TYPE", 'dcndl_porta:type.Payment', @payment)
-      lst_tag!(xml, "NDC", 'int', @ndc)
-      lst_tag!(xml, "ISSUED_DATE", 'int', @date)
-    end
-  end
-end
-
-def lst_tag!(xml, lst_name, tag_name, hash)
-  xml.lst name: lst_name do
-    value_sort(hash).each do |item|
-      xml.tag! tag_name, {name: item[0]}, item[1]
-    end
-  end
-end
-
-def record!(xml, rec, position)
-  xml.recordSchema 'info:srw/schema/1/dc-v1.1'
-  xml.recordPacking @packing
-  xml.recordData{|x| x << (/\Axml\Z/io =~ @packing ? get_record(rec) : CGI::escapeHTML(get_record(rec)))}
-  xml.recordPosition position
-end
-
-def get_record(manifestation)
-  xml = Builder::XmlMarkup.new
-  xml.tag! 'srw_dc:dc',
-    'xmlns:dc' => "http://purl.org/dc/elements/1.1/",
-    'xmlns:srw_dc' => "info:srw/schema/1/dc-v1.1",
-    'xmlns:xsi' => "http://www.w3.org/2001/XMLSchema-instance",
-    'xsi:schemaLocation' => "info:srw/schema/1/dc-v1.1 http://www.loc.gov/standards/sru/dc-schema.xsd" do
-    cache([manifestation, fragment: 'index_sru', role: current_user_role_name, locale: @locale]) do
-      xml.tag! 'dc:title', manifestation.original_title
-      manifestation.creators.readable_by(current_user).each do |agent|
-        xml.tag! 'dc:creator', agent.full_name
-      end
-      manifestation.contributors.each do |agent|
-        xml.tag! 'dc:contributor', agent.full_name
-      end
-      manifestation.publishers.each do |agent|
-        xml.tag! 'dc:publisher', agent.full_name
-      end
-      if defined?(EnjuSubject)
-        manifestation.subjects.each do |subject|
-          xml.tag! "dc:subject", subject.term
-        end
-      end
-      xml.tag! 'dc:description', manifestation.description
-    end
-  end
-end
-
-def value_sort(hash)
-  hash.to_a.sort do |a, b|
-    (b[1] <=> a[1]) * 2 + (a[0] <=> b[0])
-  end
-end
-
-xml = Builder::XmlMarkup.new indent: 2
-xml.instruct! directive_tag=:xml, encoding: 'UTF-8'
-search_retrieve_response!(xml)

data/lib/enju_biblio/porta_cql.rb

@@ -1,282 +0,0 @@
-require 'strscan'
-
-class QueryError < RuntimeError; end
-class QuerySyntaxError < QueryError; end
-
-class Cql
-  def initialize(line)
-    @logic = nil
-    @query = split_clause_text(line).collect{|txt| Clause.new(txt)}
-
-    from_day, @query = extract_with_index(@query, /from/io)
-    @from = comp_date(from_day)
-    until_day, @query = extract_with_index(@query, /until/io)
-    @until = comp_date(until_day)
-    sort_by, @query = extract_with_index(@query, /sortBy/io)
-    @sort_by = sort_by ? sort_by.terms.first : ''
-  end
-
-  attr_reader :query, :from, :until, :sort_by, :logic
-
-  def ==(other)
-    instance_variables.all? do |val|
-      instance_variable_get(val) == other.instance_variable_get(val)
-    end
-  end
-
-  def to_sunspot
-    (@query.collect{|c| c.to_sunspot} + date_range(@from, @until)).join(" #{@logic} ")
-  end
-
-  def split_clause_text(line)
-    clauses = []
-
-    s = StringScanner.new(line)
-    text = ''
-    while s.rest?
-      case
-      when s.scan(/\s+/)
-        text << s.matched
-      when s.scan(/"(?:[^"\\]|\\.)*"/)
-        text << s.matched
-      when s.scan(/(AND|OR)/i)
-        logic = s.matched.upcase
-        if @logic
-          raise QuerySyntaxError unless @logic == logic
-        else
-          @logic = logic
-        end
-        clauses << text.strip
-        text = ''
-      when s.scan(/\S*/)
-        text << s.matched
-      end
-    end
-    clauses << text.strip
-    clauses.collect{|txt| txt.gsub(/(\A\(|\)\Z)/, '')}
-  end
-
-  private
-  def extract_with_index(arr, reg)
-    element, rest = arr.partition{|c| reg =~ c.index }
-    [element.last, rest]
-  end
-
-  def date_range(from_date, until_date)
-    unless from_date == '*' and until_date == '*'
-      ["pub_date_dm:[#{from_date} TO #{until_date}]"]
-    else
-      []
-    end
-  end
-
-  def comp_date(date)
-    if date
-      text = date.terms[0]
-      date_text = case text
-      when /\A\d{4}-\d{2}-\d{2}\Z/
-        text
-      when /\A\d{4}-\d{2}\Z/
-        (text + '-01')
-      when /\A\d{4}\Z/
-        (text + '-01-01')
-      else
-        raise QuerySyntaxError, text.to_s
-      end
-      begin
-        Time.zone.parse(date_text).utc.iso8601.to_s
-      rescue
-        raise QuerySyntaxError, date.to_s
-      end
-    else
-      '*'
-    end
-  end
-end
-
-class ScannerError < QuerySyntaxError; end
-class AdapterError < QuerySyntaxError; end
-
-class Clause
-  INDEX = /(dpid|dpgroupid|title|creator|publisher|ndc|description|subject|isbn|issn|jpno|from|until|anywhere|porta_type|digitalize_type|webget_type|payment_type|ndl_agent_type|ndlc|itemno)/io
-  SORT_BY = /sortBy/io
-  RELATION = /(=|exact|\^|any|all)/io
-
-  MATCH_ALL = %w[title creator publisher]
-  MATCH_EXACT = %w[dpid dpgroupid isbn issn jpno porta_type digitalize_type webget_type payment_type ndl_agent_type itemno]
-  MATCH_PART = %w[description subject]
-  MATCH_AHEAD = %w[ndc ndlc]
-  MATCH_DATE = %w[from until]
-  MATCH_ANYWHERE = %w[anywhere]
-  LOGIC_ALL = %w[title creator publisher description subject anywhere]
-  LOGIC_ANY = %w[dpid ndl_agent_type]
-  LOGIC_EQUAL = %w[dpgroupid ndc isbn issn jpno from until porta_type digitalize_type webget_type payment_type ndlc itemno]
-  MULTIPLE = %w[dpid title creator publisher description subject anywhere ndl_agent_type]
-
-  def initialize(text)
-    unless text.empty?
-      @index, @relation, @terms = scan(text)
-      porta_adapter
-      @field = @index
-    else
-      @index = ''
-    end
-  end
-
-  attr_reader :index, :relation, :terms
-
-  def ==(other)
-    instance_variables.all? do |val|
-      instance_variable_get(val) == other.instance_variable_get(val)
-    end
-  end
-
-  def scan(text)
-    ss = StringScanner.new(text)
-    index = ''
-    relation = ''
-    terms = []
-
-    if ss.scan(INDEX) or ss.scan(SORT_BY)
-      index = ss[0]
-    end
-    # else
-    #  raise ScannerError, "index or the sortBy is requested in '#{text}'"
-    # end
-    ss.scan(/\s+/)
-    if ss.scan(RELATION)
-      relation = ss[0].upcase
-    end
-    # else
-    #  raise ScannerError, "relation is requested in '#{text}'"
-    # end
-    ss.scan(/\s+/)
-    if ss.scan(/.+/)
-      terms = ss[0].gsub(/(\A\"|\"\Z)/, '').split
-    else
-      raise ScannerError, "search term(s) is requested in '#{text}'"
-    end
-
-    [index, relation, terms]
-  end
-
-  def porta_adapter
-    logic_adapter
-    multiple_adapter
-  end
-
-  def logic_adapter
-    case
-    when LOGIC_ALL.include?(@index)
-      raise AdapterError unless %w[ALL ANY = EXACT ^].include?(@relation)
-    when LOGIC_ANY.include?(@index)
-      raise AdapterError unless %w[ANY =].include?(@relation)
-    when LOGIC_EQUAL.include?(@index)
-      raise AdapterError unless %w[=].include?(@relation)
-    end
-  end
-
-  def multiple_adapter
-    unless MULTIPLE.include?(@index)
-      raise AdapterError if @terms.size > 1
-    end
-  end
-
-  def to_sunspot
-    case
-    when MATCH_ALL.include?(@index)
-      to_sunspot_match_all
-    when MATCH_EXACT.include?(@index)
-      to_sunspot_match_exact
-    when MATCH_PART.include?(@index)
-      to_sunspot_match_part
-    when MATCH_AHEAD.include?(@index)
-      to_sunspot_match_ahead
-    when MATCH_ANYWHERE.include?(@index)
-      to_sunspot_match_anywhere
-    when @index.empty?
-      @terms.join(' ')
-    end
-  end
-
-  def to_sunspot_match_all
-    term = @terms.join(' ')
-    case @relation
-    when /\A=\Z/
-      unless /\A\^(.+)/ =~ term
-        "%s_%s:(%s)" % [@field, :text, term]
-      else
-        ahead_tarm = $1.gsub("\s", '').downcase
-        "connect_%s_%s:(%s*)" % [@field, :s, ahead_tarm]
-      end
-    when /\AEXACT\Z/
-      "%s_%s:(%s)" % [@field, :sm, term.gsub(' ', '')]
-    when /\AANY\Z/
-      "%s_%s:(%s)" % [@field, :text, multiple_to_sunspot(@terms, :any)]
-    when /\AALL\Z/
-      "%s_%s:(%s)" % [@field, :text, multiple_to_sunspot(@terms, :all)]
-    else
-      raise QuerySyntaxError
-    end
-  end
-
-  def to_sunspot_match_exact
-    case @relation
-    when /\A=\Z/
-      term = @terms.join(' ')
-      type = @field != 'issn' ? :sm : :s
-      "%s_%s:(%s)" % [@field, type, term]
-    when /\AANY\Z/
-      "%s_%s:(%s)" % [@field, :sm, multiple_to_sunspot(@terms, :any)]
-    else
-      raise QuerySyntaxError
-    end
-  end
-
-  def to_sunspot_match_part
-    case @relation
-    when /\A=\Z/
-      term = @terms.join(' ')
-      "%s_%s:(%s)" % [@field, :text, trim_ahead(term)]
-    when /\AANY\Z/
-      "%s_%s:(%s)" % [@field, :text, multiple_to_sunspot(@terms, :any)]
-    when /\AALL\Z/
-      "%s_%s:(%s)" % [@field, :text, multiple_to_sunspot(@terms, :all)]
-    else
-      raise QuerySyntaxError
-    end
-  end
-
-  def to_sunspot_match_ahead
-    "%s_%s:(%s*)" % [@field, :s, @terms.first]
-  end
-
-  def to_sunspot_match_anywhere
-    case @relation
-    when /\A=\Z/
-      term = @terms.join(' ')
-      "(%s)" % [trim_ahead(term)]
-    when /\AANY\Z/
-      "(%s)" % [multiple_to_sunspot(@terms, :any)]
-    when /\AALL\Z/
-      "(%s)" % [multiple_to_sunspot(@terms, :all)]
-    else
-      raise QuerySyntaxError
-    end
-  end
-
-
-  private
-  def multiple_to_sunspot(terms, relation)
-    boolean = relation == :any ? ' OR ' : ' AND '
-    (terms.map{|t| trim_ahead(t)}.join(boolean)).to_s
-  end
-
-  def trim_ahead(term)
-    term.sub(/\A\^+/,'')
-  end
-end
-
-if $PROGRAM_NAME == __FILE__
-  require 'porta_cql_test'
-end

data/lib/enju_biblio/sru.rb

@@ -1,85 +0,0 @@
-require 'enju_biblio/porta_cql'
-
-class QueryArgumentError < QueryError; end
-
-class Sru
-  ASC_KEYS = %w(title creator) unless Object.const_defined?(:ASC_KEYS)
-  DESC_KEYS = %w(created_at updated_at date_of_publication) unless Object.const_defined?(:DESC_KEYS)
-  SORT_KEYS = ASC_KEYS + DESC_KEYS unless Object.const_defined?(:SORY_KEYS)
-  MULTI_KEY_MAP = {'title' => 'sort_title'} unless Object.const_defined?(:MULTI_KEY_MAP)
-  def initialize(params)
-    raise QueryArgumentError, 'sru :query is required item.' unless params.key?(:query)
-
-    @cql = Cql.new(params[:query])
-    @version = params.key?(:version) ? params[:version] : '1.2'
-    @start = params.key?(:startRecord) ? params[:startRecord].to_i : 1
-    @maximum = params.key?(:maximumRecords) ? params[:maximumRecords].to_i : 200
-    @maximum = 1000 if 1000 < @maximum
-    @packing = params.key?(:recordPacking) ? params[:recordPacking] : 'string'
-    @schema = params.key?(:recordSchema) ? params[:recordSchema] : 'dc'
-    @sort_key = params[:sortKeys]
-
-    @manifestations = []
-    @extra_response_data = {}
-  end
-
-  attr_reader :version, :cql, :start, :maximum, :packing, :schema, :path, :ascending
-  attr_reader :manifestations, :extra_response_data, :number_of_records, :next_record_position
-
-  def sort_by
-    sort = {sort_by: 'created_at', order: 'desc'}
-    unless '1.1' == @version
-      @path, @ascending = @cql.sort_by.split('/')
-    else
-      @path, @ascending = @sort_key.split(',') if @sort_key
-    end
-    # TODO ソート基準が入手しやすさの場合の処理
-    if SORT_KEYS.include?(@path)
-      if MULTI_KEY_MAP.keys.include?(@path)
-        sort[:sort_by] = MULTI_KEY_MAP[@path]
-      else
-        sort[:sort_by] = @path
-      end
-      sort[:order] = 'asc' if ASC_KEYS.include?(@path)
-      case @ascending
-      when /\A(1|ascending)\Z/
-        sort[:order] = 'asc'
-      when /\A(0|descending)\Z/
-        sort[:order] = 'desc'
-      end
-    end
-    sort
-  end
-
-  def search
-    sunspot_query = @cql.to_sunspot
-    search = Sunspot.new_search(Manifestation)
-    role = Role.default_role
-    search.build do
-      fulltext sunspot_query
-      with(:required_role_id).less_than_or_equal_to role.id
-      paginate page: 1, per_page: 10000
-    end
-    @manifestations = search.execute!.results
-    @extra_response_data = get_extra_response_data
-    @number_of_records, @next_record_position = get_number_of_records
-
-    @manifestations
-  end
-
-  def get_extra_response_data
-    # TODO: NDL で必要な項目が決定し、更に enju にそのフィールドが設けられた後で正式な実装を行なう。
-    if @search.respond_to?(:erd)
-      @schema == 'dc' ? @search.erd : {}
-    end
-  end
-
-  def get_number_of_records
-    # TODO: sunspot での取得方法が分かり次第、正式な実装を行なう。
-    @schema == 'dc' ? [1405, 1406] : [40,11]
-  end
-end
-
-if $PROGRAM_NAME == __FILE__
-  require 'sru_test'
-end