blacklight_oai_provider 5.0.0 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b00e5287f2ffa229d20459a1c8817abe39846888
-  data.tar.gz: 6abf579e82431c293cfcaa57f4317a170bb102ca
+  metadata.gz: a928d521835ccd466eb70eaed91ac54a0680c60b
+  data.tar.gz: 923dbe6d7ec7c741fe4b63418a3b3ca51e8ed000
 SHA512:
-  metadata.gz: 91e4142e3c0ccd46c65dc7dfbf63fc0e4e9f9034630ca212e23c1a9e7d1663a7ed8da7b7e37ee9a87e8d93bbe4fbff9700ea49e79f0228611d5993c0aba7e91c
-  data.tar.gz: 1ea843062141a4d0dc0d58e4d964bee245ae539e7241c1f41b0e0d50362ebb1caac5926f36fa9019b75385f4f638027abdc7184956d80e0e09f3137b0783a822
+  metadata.gz: 36e1822ae96de49092998f5e02bba8ed43f3811e905f324be337b398af8d758b9bc9cc56183c0fcdb1884c37b4cc34c07c12504be62a13ef16a6e66074e82a51
+  data.tar.gz: 56fbfd912c0a969f35609f61e997151bb5f7b96d41d254c785e9397d4603b628fb0a9f2d0c7a86bcfaf0e0a08f623c8c26962ddc16bb1756061944ff935f409f

data/README.md

@@ -66,7 +66,6 @@ configure_blacklight do |config|
       sample_id: '109660'
     },
     document: {
-      model: SolrDocument, # SolrDocument class being used, default: SolrDocument
       limit: 25            # number of records returned with each request, default: 15
       set_fields: [        # ability to define ListSets, optional, default: nil
         { label: 'language', solr_field: 'language_facet' }

data/VERSION

@@ -1 +1 @@
-5.0.0
+5.1.0

data/app/models/concerns/blacklight_oai_provider/solr_document.rb

@@ -3,7 +3,7 @@ module BlacklightOaiProvider
     extend ActiveSupport::Concern
 
     def timestamp
-      timestamp = get(self.class.timestamp_key)
+      timestamp = fetch(self.class.timestamp_key, nil)
       raise BlacklightOaiProvider::Exceptions::MissingTimestamp if timestamp.blank?
       Time.zone.parse(timestamp) # Solr timestamps are all in UTC.
     end

data/blacklight_oai_provider.gemspec

@@ -22,7 +22,7 @@ BlacklightOaiProvider v5.x implements configuration changes. Please visit README
   s.require_paths = ["lib"]
 
   s.add_dependency "rails", "~> 4.0"
-  s.add_dependency "blacklight", "~> 5.0"
+  s.add_dependency "blacklight", "~> 5.13"
   s.add_dependency "oai", "~> 0.4"
   s.add_development_dependency 'rspec-rails', "~> 3.0"
   s.add_development_dependency 'capybara'

data/lib/blacklight_oai_provider/solr_document_wrapper.rb

@@ -4,7 +4,7 @@ module BlacklightOaiProvider
 
     def initialize(controller, options = {})
       @controller      = controller
-      @document_model  = options[:model] || ::SolrDocument
+      @document_model  = @controller.blacklight_config.document_model
       @solr_timestamp  = document_model.timestamp_key
       @timestamp_field = 'timestamp' # method name used by ruby-oai
       @limit           = options[:limit] || 15
@@ -19,32 +19,34 @@ module BlacklightOaiProvider
     end
 
     def earliest
-      _response, records = @controller.get_search_results(@controller.params, { fl: solr_timestamp, sort: "#{solr_timestamp} asc", rows: 1 })
-      records.first.timestamp
+      builder = @controller.search_builder.merge(fl: solr_timestamp, sort: "#{solr_timestamp} asc", rows: 1)
+      response = @controller.repository.search(builder)
+      response.documents.first.timestamp
     end
 
     def latest
-      _response, records = @controller.get_search_results(@controller.params, { fl: solr_timestamp, sort: "#{solr_timestamp} desc", rows: 1 })
-      records.first.timestamp
+      builder = @controller.search_builder.merge(fl: solr_timestamp, sort: "#{solr_timestamp} desc", rows: 1)
+      response = @controller.repository.search(builder)
+      response.documents.first.timestamp
     end
 
     def find(selector, options = {})
       return next_set(options[:resumption_token]) if options[:resumption_token]
 
       if selector == :all
-        response, records = @controller.get_search_results(@controller.params, conditions(options))
+        response = @controller.repository.search(conditions(options))
 
         if limit && response.total > limit
           return select_partial(BlacklightOaiProvider::ResumptionToken.new(options.merge(last: 0), nil, response.total))
         end
+        response.documents
       else
-        _response, records = @controller.get_solr_response_for_doc_id selector.split('/', 2).last
+        @controller.fetch(selector.split('/', 2).last).first.documents.first
       end
-      records
     end
 
     def select_partial(token)
-      _response, records = @controller.get_search_results(@controller.params, token_conditions(token))
+      records = @controller.repository.search(token_conditions(token)).documents
 
       raise ::OAI::ResumptionTokenException unless records
 
@@ -60,23 +62,21 @@ module BlacklightOaiProvider
 
     private
 
-    def base_conditions
-      { sort: "#{solr_timestamp} asc", rows: limit }
-    end
-
     def token_conditions(token)
       conditions(token.to_conditions_hash).merge(start: token.last)
     end
 
     def conditions(options) # conditions/query derived from options
-      filters = []
+      query = @controller.search_builder.merge(sort: "#{solr_timestamp} asc", rows: limit).query
+
       if options[:from].present? || options[:until].present?
-        filters << "#{solr_timestamp}:[#{solr_date(options[:from])} TO #{solr_date(options[:until]).gsub('Z', '.999Z')}]"
+        query.append_filter_query(
+          "#{solr_timestamp}:[#{solr_date(options[:from])} TO #{solr_date(options[:until]).gsub('Z', '.999Z')}]"
+        )
       end
 
-      filters << @set.from_spec(options[:set]) if options[:set].present?
-
-      base_conditions.merge(fq: filters)
+      query.append_filter_query(@set.from_spec(options[:set])) if options[:set].present?
+      query
     end
 
     def solr_date(time)

data/lib/blacklight_oai_provider/solr_set.rb

@@ -7,7 +7,10 @@ module BlacklightOaiProvider
 
         params = { rows: 0, facet: true, 'facet.field' => solr_fields }
         solr_fields.each { |field| params["f.#{field}.facet.limit"] = -1 } # override any potential blacklight limits
-        response, _records = @controller.get_search_results(@controller.params, params)
+
+        builder = @controller.search_builder.merge(params)
+        response = @controller.repository.search(builder)
+
         sets_from_facets(response.facet_fields) if response.facet_fields
       end
 
@@ -19,8 +22,7 @@ module BlacklightOaiProvider
       # Returns array of sets for a solr document, or empty array if none are available.
       def sets_for(record)
         Array.wrap(@fields).map do |field|
-          values = record.get(field[:solr_field], sep: nil)
-          Array.wrap(values).map do |value|
+          record.fetch(field[:solr_field], []).map do |value|
             new("#{field[:label]}:#{value}")
           end
         end.flatten

data/lib/railties/blacklight_oai_provider.rake

@@ -6,7 +6,7 @@ namespace :blacklight_oai_provider do
       require 'yaml'
 
       docs = YAML.safe_load(File.open(File.join(BlacklightOaiProvider.root, 'solr', 'sample_solr_documents.yml')))
-      conn = RSolr.connect(Blacklight.solr_config)
+      conn = RSolr.connect(Blacklight.connection_config)
       conn.add docs
       conn.commit
     end

data/spec/controllers/catalog_controller_spec.rb

@@ -31,7 +31,6 @@ describe CatalogController do
 
     it 'return corrext document configuration' do
       expect(controller.oai_config[:document][:limit]).to be 25
-      expect(controller.oai_config[:document][:model]).to be_a Class
     end
   end
 

data/spec/test_app_templates/lib/generators/test_app_generator.rb

@@ -44,16 +44,16 @@ class TestAppGenerator < Rails::Generators::Base
     say_status("warning", "ADDING BL OIA-PMH CONFIG")
 
     insert_into_file "app/controllers/catalog_controller.rb", after: "    config.default_solr_params = { \n" do
-      "      :fl => '*',\n"
+      "      fl: '*',\n"
     end
 
     insert_into_file "app/controllers/catalog_controller.rb", after: "  configure_blacklight do |config|\n" do
       <<-CONFIG
     config.default_document_solr_params = {
-      :qt => 'search',
-      :fl => '*',
-      :rows => 1,
-      :q => '{!raw f=id v=$id}'
+      qt: 'search',
+      fl: '*',
+      rows: 1,
+      q: '{!raw f=id v=$id}'
     }
       CONFIG
     end
@@ -61,20 +61,19 @@ class TestAppGenerator < Rails::Generators::Base
     insert_into_file "app/controllers/catalog_controller.rb", after: "configure_blacklight do |config|\n" do
       <<-CONFIG
     config.oai = {
-      :provider => {
-        :repository_name => 'Test Repository',
-        :repository_url => 'http://localhost/catalog/oai',
-        :record_prefix => 'oai:test',
-        :admin_email => 'root@localhost',
-        :deletion_support => 'persistent',
-        :sample_id => '109660'
+      provider: {
+        repository_name: 'Test Repository',
+        repository_url: 'http://localhost/catalog/oai',
+        record_prefix: 'oai:test',
+        admin_email: 'root@localhost',
+        deletion_support: 'persistent',
+        sample_id: '109660'
       },
-      :document => {
-        :model => SolrDocument,
-        :set_fields => [
+      document: {
+        set_fields: [
           { label: 'language', solr_field: 'language_facet' }
         ],
-        :limit => 25
+        limit: 25
       }
     }
       CONFIG

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight_oai_provider
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 5.1.0
 platform: ruby
 authors:
 - Chris Beer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-22 00:00:00.000000000 Z
+date: 2017-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -31,14 +31,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.13'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.13'
 - !ruby/object:Gem::Dependency
   name: oai
   requirement: !ruby/object:Gem::Requirement