bento_search 1.5.0 → 2.0.0.rc1

data/test/view/atom_results_test.rb

@@ -4,7 +4,7 @@ require 'nokogiri'
 
 class AtomResultsTest < ActionView::TestCase
   include ActionView::Helpers::UrlHelper
-  
+
   @@namespaces = {
     "atom"        => "http://www.w3.org/2005/Atom",
     "opensearch"  => "http://a9.com/-/spec/opensearch/1.1/",
@@ -12,7 +12,7 @@ class AtomResultsTest < ActionView::TestCase
     "dcterms"     => "http://purl.org/dc/terms/",
     "bibo"        => "http://purl.org/ontology/bibo/"
   }
-  
+
   # Instead of using assert_select, we do it ourselves with nokogiri
   # for better namespace control.
   #
@@ -21,26 +21,26 @@ class AtomResultsTest < ActionView::TestCase
   #   assert matched_node.first["attribute"] == "foo"
   # end
   def assert_node(xml, xpath, options = {})
-    result = xml.xpath(xpath, @@namespaces)         
-    
+    result = xml.xpath(xpath, @@namespaces)
+
     assert result.length > 0, "Expected xpath '#{xpath}' to match in #{xml.to_s[0..200]}..."
-    
+
     if options[:text]
       assert_equal options[:text], result.text.strip, "Expected #{options[:text]} as content of #{result.to_s[0..200]}"
     end
-    
+
     yield result if block_given?
   end
-  
+
   def setup
     @total_items = 1000
     @start       = 6
     @per_page    = 15
-    
-    
-    @engine = BentoSearch::MockEngine.new(:total_items => @total_items)    
+
+
+    @engine = BentoSearch::MockEngine.new(:total_items => @total_items)
     @results = @engine.search("some query", :start => @start, :per_page => @per_page)
-    
+
     # but fill the first result elements with some non-blank data to test
     @article = BentoSearch::ResultItem.new(
       :title      => "An Article", #
@@ -66,7 +66,7 @@ class AtomResultsTest < ActionView::TestCase
         BentoSearch::Link.new(:url => "http://example.org/bare_link"),
         BentoSearch::Link.new(
           :url    => "http://example.org/label_and_type",
-          :label  => "A link somewhere",      
+          :label  => "A link somewhere",
           :type   => "application/pdf"
         ),
         BentoSearch::Link.new(
@@ -93,189 +93,189 @@ class AtomResultsTest < ActionView::TestCase
       :oclcnum   => "12124345",
       :year      => "2004"
     )
-    
-    
-     
+
+
+
     @results[0] = @article
     @results[1] = @article_with_html_abstract
     @results[3] = @article_with_full_date
-    @results[4] = @book    
+    @results[4] = @book
   end
-  
+
   def test_smoke_atom_validate
     # Validate under Atom schema. Should we validate under prism and dc schemas
     # too? Not sure if it makes sense, or if there's even a relevant schema
-    # for how we're using em. So of just basic 'smoke' value. 
+    # for how we're using em. So of just basic 'smoke' value.
     render :template => "bento_search/atom_results", :locals => {:atom_results => @results}
     xml_response = Nokogiri::XML( rendered ) { |config| config.strict }
-    
+
     atom_xsd_filepath = File.expand_path("../../support/atom.xsd.xml",  __FILE__)
-    schema_xml        = Nokogiri::XML(File.read(atom_xsd_filepath))
+    schema_xml        = Nokogiri::XML(File.open(atom_xsd_filepath))
     # modify to add processContents lax so it'll let us include elements from
-    # external namespaces. 
+    # external namespaces.
     schema_xml.xpath("//xs:any[@namespace='##other']", {"xs" => "http://www.w3.org/2001/XMLSchema"}).each do |node|
       node["processContents"] = "lax"
-    end    
-    
+    end
+
     schema = Nokogiri::XML::Schema.from_document( schema_xml )
-        
-    assert_empty schema.validate(xml_response), "Validates with atom XSD schema"       
+
+    assert_empty schema.validate(xml_response), "Validates with atom XSD schema"
   end
-  
-  
+
+
   def test_feed_metadata
-    render :template => "bento_search/atom_results", :locals => {:atom_results => @results}    
-    xml_response = Nokogiri::XML( rendered ) 
-    
-    assert_node(xml_response, "atom:feed") do |feed|            
+    render :template => "bento_search/atom_results", :locals => {:atom_results => @results}
+    xml_response = Nokogiri::XML( rendered )
+
+    assert_node(xml_response, "atom:feed") do |feed|
       assert_node(feed, "atom:title")
       assert_node(feed, "atom:author")
       assert_node(feed, "atom:updated")
-      
+
       assert_node(feed, "opensearch:totalResults", :text => @total_items.to_s)
       assert_node(feed, "opensearch:startIndex",   :text => @start.to_s)
       assert_node(feed, "opensearch:itemsPerPage", :text => @per_page.to_s)
     end
-    
+
   end
-  
+
   def test_article_entry_example
-    render :template => "bento_search/atom_results", :locals => {:atom_results => @results}    
-    xml_response = Nokogiri::XML( rendered ) 
-    
+    render :template => "bento_search/atom_results", :locals => {:atom_results => @results}
+    xml_response = Nokogiri::XML( rendered )
+
     assert_node(xml_response, "./atom:feed/atom:entry[1]") do |article|
-      assert_node(article, "atom:title", :text => @article.title)  
+      assert_node(article, "atom:title", :text => @article.title)
       assert_node(article, "prism:coverDate", :text => @article.year)
-      
+
       assert_node(article, "prism:issn", :text => @article.issn)
       assert_node(article, "prism:doi", :text => @article.doi)
-      
+
       assert_node(article, "prism:volume", :text => @article.volume)
       assert_node(article, "prism:number",  :text => @article.issue)
-      
+
       assert_node(article, "prism:startingPage", :text => @article.start_page)
       assert_node(article, "prism:endingPage",   :text => @article.end_page)
-      
+
       assert_node(article, "prism:publicationName", :text => @article.source_title)
-      
+
       abstract = article.at_xpath("atom:summary", @@namespaces)
       assert_present abstract, "Has an abstract"
       assert_equal "text", abstract["type"], "Abstract type text"
       assert_equal @article.abstract, abstract.text
-      
+
       assert_node(article, "dcterms:language[@vocabulary='http://dbpedia.org/resource/ISO_639-1']", :text => @article.language_iso_639_1)
       assert_node(article, "dcterms:language[@vocabulary='http://dbpedia.org/resource/ISO_639-3']", :text => @article.language_iso_639_3)
-      assert_node(article, "dcterms:language[not(@vocabulary)]", :text => @article.language_str)   
-      
+      assert_node(article, "dcterms:language[not(@vocabulary)]", :text => @article.language_str)
+
       assert_node(article, "dcterms:type[not(@vocabulary)]", :text => @article.format_str)
-            
+
       assert_node(article, "dcterms:type[@vocabulary='http://schema.org/']", :text => @article.schema_org_type_url)
       assert_node(article, "dcterms:type[@vocabulary='http://purl.org/NET/bento_search/ontology']", :text => @article.format)
-      
-      # Just make sure right number of author elements, with right structure. 
+
+      # Just make sure right number of author elements, with right structure.
       assert_node(article, "atom:author/atom:name") do |authors|
         assert_equal @article.authors.length, authors.length, "right number of author elements"
       end
-      
+
       # Links. Main link is just rel=alternate
-      assert_node(article, 
+      assert_node(article,
         "atom:link[@rel='alternate'][@href='#{@article.link}']")
-      
+
       # other links also there, default rel=related
-      assert_node(article, 
+      assert_node(article,
         "atom:link[@rel='related'][@type='application/pdf'][@title='A link somewhere'][@href='http://example.org/label_and_type']")
       assert_node(article,
-        "atom:link[@rel='something'][@href='http://example.org/rel']")                  
-    end    
-            
+        "atom:link[@rel='something'][@href='http://example.org/rel']")
+    end
+
   end
-  
-  
+
+
   def test_with_unique_id
-    @results  = @engine.search("find")    
+    @results  = @engine.search("find")
     @results[0] = BentoSearch::ResultItem.new(
-      :title => "Something",      
+      :title => "Something",
       :unique_id => "a000:/01",
       :engine_id => "some_engine"
     )
-    
-    render :template => "bento_search/atom_results", :locals => {:atom_results => @results}    
+
+    render :template => "bento_search/atom_results", :locals => {:atom_results => @results}
     xml_response = Nokogiri::XML( rendered )
-    
+
     with_unique_id = xml_response.xpath("./atom:feed/atom:entry", @@namespaces)[0]
-    
+
     assert_node(with_unique_id, "atom:id") do |id|
       # based off of engine_id and unique_id
       assert_includes id.text, "some_engine"
       assert_includes id.text, "a000%3A%2F01"
-    end      
+    end
   end
-  
+
   def test_with_html_abstract
-    render :template => "bento_search/atom_results", :locals => {:atom_results => @results}    
+    render :template => "bento_search/atom_results", :locals => {:atom_results => @results}
     xml_response = Nokogiri::XML( rendered )
-    
+
     with_html_abstract = xml_response.xpath("./atom:feed/atom:entry", @@namespaces)[1]
-    
-    assert_node(with_html_abstract, "atom:summary[@type='html']", :text => @article_with_html_abstract.abstract.to_s)      
+
+    assert_node(with_html_abstract, "atom:summary[@type='html']", :text => @article_with_html_abstract.abstract.to_s)
   end
-  
+
   def test_book
-    render :template => "bento_search/atom_results", :locals => {:atom_results => @results}    
+    render :template => "bento_search/atom_results", :locals => {:atom_results => @results}
     xml_response = Nokogiri::XML( rendered )
-        
+
     book = xml_response.xpath("./atom:feed/atom:entry", @@namespaces)[4]
-    
+
     assert_node(book, "dcterms:type[@vocabulary='http://purl.org/NET/bento_search/ontology']", :text => "Book")
     assert_node(book, "dcterms:type[@vocabulary='http://schema.org/']", :text => "http://schema.org/Book")
-    
+
     assert_node(book, "dcterms:publisher", :text => @book.publisher)
-    
+
     assert_node(book, "prism:isbn", :text => @book.isbn)
-    
+
     assert_node(book, "bibo:oclcnum", :text => @book.oclcnum)
   end
-  
+
   def test_with_full_date
-    render :template => "bento_search/atom_results", :locals => {:atom_results => @results}    
+    render :template => "bento_search/atom_results", :locals => {:atom_results => @results}
     xml_response = Nokogiri::XML( rendered )
-    
+
     with_full_date = xml_response.at_xpath("./atom:feed/atom:entry[4]", @@namespaces)
-    
-    assert_node(with_full_date, "prism:coverDate", :text => "2011-05-06")    
+
+    assert_node(with_full_date, "prism:coverDate", :text => "2011-05-06")
   end
 
   def test_nil_results
     # should render a more or less empty atom response for
     # nil results, convenient to not raise on nil
-    render :template => "bento_search/atom_results", :locals => {:atom_results => nil}   
+    render :template => "bento_search/atom_results", :locals => {:atom_results => nil}
   end
-  
+
   def test_locals_for_feed_name_and_author
-    render( :template => "bento_search/atom_results", 
-      :locals => {:atom_results => @results, 
+    render( :template => "bento_search/atom_results",
+      :locals => {:atom_results => @results,
                   :feed_name => "My Feed",
                   :feed_author_name => "ACME Seed And Feed Products"}
     )
-                  
+
     xml_response = Nokogiri::XML( rendered )
-    
+
     assert_node(xml_response, "./atom:feed/atom:title", :text => "My Feed")
     assert_node(xml_response, "./atom:feed/atom:author/atom:name", :text => "ACME Seed And Feed Products")
   end
-  
+
   def test_html_in_title_stripped
     results = BentoSearch::Results.new
     results << BentoSearch::ResultItem.new(
       :title => "html <b>title</b>".html_safe
     )
-    
+
     render(:template => "bento_search/atom_results", :locals => {:atom_results => results})
     xml_response = Nokogiri::XML( rendered )
-        
+
     assert_node(xml_response, "./atom:feed/atom:entry[1]/atom:title", :text => "html title")
-    
+
   end
-  
-  
+
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bento_search
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 2.0.0.rc1
 platform: ruby
 authors:
 - Jonathan Rochkind
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-09-23 00:00:00.000000000 Z
+date: 2021-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.3
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.3
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: confstruct
   requirement: !ruby/object:Gem::Requirement
@@ -166,44 +166,30 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '6.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.11.0
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.11.0
-- !ruby/object:Gem::Dependency
-  name: celluloid
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-description: 
-email: 
+        version: '3.0'
+description:
+email:
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -212,22 +198,17 @@ files:
 - README.md
 - Rakefile
 - app/assets/images/bento_search/large_loader.gif
-- app/assets/javascripts/bento_search.js
 - app/assets/javascripts/bento_search/ajax_load.js
 - app/assets/stylesheets/bento_search/suggested_styles.css
 - app/controllers/bento_search/bento_search_controller.rb
 - app/controllers/bento_search/search_controller.rb
 - app/helpers/bento_search_helper.rb
 - app/item_decorators/bento_search/decorator_base.rb
-- app/item_decorators/bento_search/ebscohost/conditional_openurl_main_link.rb
 - app/item_decorators/bento_search/no_links.rb
-- app/item_decorators/bento_search/only_premade_openurl.rb
-- app/item_decorators/bento_search/openurl_add_other_link.rb
-- app/item_decorators/bento_search/openurl_main_link.rb
 - app/item_decorators/bento_search/standard_decorator.rb
 - app/models/bento_search/author.rb
+- app/models/bento_search/concurrent_searcher.rb
 - app/models/bento_search/link.rb
-- app/models/bento_search/multi_searcher.rb
 - app/models/bento_search/openurl_creator.rb
 - app/models/bento_search/registrar.rb
 - app/models/bento_search/result_item.rb
@@ -249,6 +230,7 @@ files:
 - app/search_engines/bento_search/summon_engine.rb
 - app/search_engines/bento_search/worldcat_sru_dc_engine.rb
 - app/search_engines/bento_search/xerxes_engine.rb
+- app/views/bento_search/_ajax_loading.html.erb
 - app/views/bento_search/_atom_item.atom.builder
 - app/views/bento_search/_item_title.html.erb
 - app/views/bento_search/_link.html.erb
@@ -264,6 +246,7 @@ files:
 - lib/bento_search/routes.rb
 - lib/bento_search/util.rb
 - lib/bento_search/version.rb
+- lib/generators/bento_search/install/ajax_load_js_generator.rb
 - lib/generators/bento_search/pull_ebsco_dbs_generator.rb
 - lib/generators/bento_search/templates/ebsco_global_var.erb
 - lib/http_client_patch/include_client.rb
@@ -272,6 +255,7 @@ files:
 - test/decorator/standard_decorator_test.rb
 - test/dummy/README.rdoc
 - test/dummy/Rakefile
+- test/dummy/app/assets/config/manifest.js
 - test/dummy/app/assets/javascripts/application.js
 - test/dummy/app/assets/stylesheets/application.css
 - test/dummy/app/controllers/application_controller.rb
@@ -289,7 +273,6 @@ files:
 - test/dummy/config/initializers/backtrace_silencers.rb
 - test/dummy/config/initializers/inflections.rb
 - test/dummy/config/initializers/mime_types.rb
-- test/dummy/config/initializers/secret_token.rb
 - test/dummy/config/initializers/session_store.rb
 - test/dummy/config/initializers/wrap_parameters.rb
 - test/dummy/config/locales/en.yml
@@ -317,10 +300,11 @@ files:
 - test/search_engines/xerxes_engine_test.rb
 - test/support/atom.xsd.xml
 - test/support/test_with_cassette.rb
+- test/support/xml.xsd
 - test/test_helper.rb
+- test/unit/concurrent_searcher_test.rb
 - test/unit/handle_highlight_tags_test.rb
 - test/unit/item_decorators_test.rb
-- test/unit/multi_searcher_test.rb
 - test/unit/openurl_creator_test.rb
 - test/unit/pagination_test.rb
 - test/unit/register_engine_test.rb
@@ -352,7 +336,10 @@ files:
 - test/vcr_cassettes/ebscohost/live_search_smoke_test.yml
 - test/vcr_cassettes/ebscohost/multi-field_author_title.yml
 - test/vcr_cassettes/ebscohost/multi-field_citation_numbers.yml
+- test/vcr_cassettes/eds/FullText_CustomLink.yml
 - test/vcr_cassettes/eds/basic_search_smoke_test.yml
+- test/vcr_cassettes/eds/catalog_ebook_query.yml
+- test/vcr_cassettes/eds/catalog_query.yml
 - test/vcr_cassettes/eds/get_auth_token.yml
 - test/vcr_cassettes/eds/get_auth_token_failure.yml
 - test/vcr_cassettes/eds/get_with_auth.yml
@@ -403,7 +390,7 @@ files:
 homepage: http://github.com/jrochkind/bento_search
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -414,19 +401,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5
-signing_key: 
+rubygems_version: 3.2.22
+signing_key:
 specification_version: 4
 summary: An abstraction/normalization layer for querying and displaying results for
   external search engines, in Ruby on Rails.
 test_files:
 - test/decorator/decorator_base_test.rb
 - test/decorator/standard_decorator_test.rb
+- test/dummy/README.rdoc
+- test/dummy/Rakefile
+- test/dummy/app/assets/config/manifest.js
 - test/dummy/app/assets/javascripts/application.js
 - test/dummy/app/assets/stylesheets/application.css
 - test/dummy/app/controllers/application_controller.rb
@@ -443,7 +432,6 @@ test_files:
 - test/dummy/config/initializers/backtrace_silencers.rb
 - test/dummy/config/initializers/inflections.rb
 - test/dummy/config/initializers/mime_types.rb
-- test/dummy/config/initializers/secret_token.rb
 - test/dummy/config/initializers/session_store.rb
 - test/dummy/config/initializers/wrap_parameters.rb
 - test/dummy/config/locales/en.yml
@@ -453,8 +441,6 @@ test_files:
 - test/dummy/public/422.html
 - test/dummy/public/500.html
 - test/dummy/public/favicon.ico
-- test/dummy/Rakefile
-- test/dummy/README.rdoc
 - test/dummy/script/rails
 - test/functional/bento_search/search_controller_test.rb
 - test/helper/bento_search_helper_test.rb
@@ -474,10 +460,11 @@ test_files:
 - test/search_engines/xerxes_engine_test.rb
 - test/support/atom.xsd.xml
 - test/support/test_with_cassette.rb
+- test/support/xml.xsd
 - test/test_helper.rb
+- test/unit/concurrent_searcher_test.rb
 - test/unit/handle_highlight_tags_test.rb
 - test/unit/item_decorators_test.rb
-- test/unit/multi_searcher_test.rb
 - test/unit/openurl_creator_test.rb
 - test/unit/pagination_test.rb
 - test/unit/register_engine_test.rb
@@ -491,6 +478,7 @@ test_files:
 - test/vcr_cassettes/doaj_articles/live_get_identifier__raises_on_no_results.yml
 - test/vcr_cassettes/doaj_articles/multifield_author-title.yml
 - test/vcr_cassettes/doaj_articles/pagination.yml
+- test/vcr_cassettes/ebscohost/RILM_record_with_ISSN_in__jid__element.yml
 - test/vcr_cassettes/ebscohost/affiliation_search.yml
 - test/vcr_cassettes/ebscohost/another_dissertation.yml
 - test/vcr_cassettes/ebscohost/dissertation_example.yml
@@ -508,8 +496,10 @@ test_files:
 - test/vcr_cassettes/ebscohost/live_search_smoke_test.yml
 - test/vcr_cassettes/ebscohost/multi-field_author_title.yml
 - test/vcr_cassettes/ebscohost/multi-field_citation_numbers.yml
-- test/vcr_cassettes/ebscohost/RILM_record_with_ISSN_in__jid__element.yml
+- test/vcr_cassettes/eds/FullText_CustomLink.yml
 - test/vcr_cassettes/eds/basic_search_smoke_test.yml
+- test/vcr_cassettes/eds/catalog_ebook_query.yml
+- test/vcr_cassettes/eds/catalog_query.yml
 - test/vcr_cassettes/eds/get_auth_token.yml
 - test/vcr_cassettes/eds/get_auth_token_failure.yml
 - test/vcr_cassettes/eds/get_with_auth.yml