bento_search 0.6.0 → 0.7.0

data/test/view/std_item_test.rb

@@ -12,8 +12,10 @@ class StdItemTest < ActionView::TestCase
       assert_select ".bento_item_title", item.title do 
         assert_select "a", false
       end
+            
+      
       # No author/title/etc rows, cause we don't have data
-      assert_select ".bento_item_authors", false
+      assert_select ".authors", false
       assert_select ".bento_item_key_meta", false
       
       assert_select ".bento_item_row", false
@@ -24,16 +26,28 @@ class StdItemTest < ActionView::TestCase
     assert_select(".bento_item_other_links", 0)
   end
   
+  def test_has_counter_when_results_passed_in
+    results = BentoSearch::Results.new
+    results.start = 9
+    results << (item = BentoSearch::ResultItem.new(:title => "Some Title"))
+        
+    render :partial => "bento_search/std_item", :object => item, :as => "item", :locals => { :results => results, :item_counter => 5}
+    
+    assert_select ".bento_index", :text => "15."
+  end
+  
   def test_complete_article_item
     hash = {}
     hash[:title] = "Some Title"   
     hash[:link] = "http://example.org/1"
+    hash[:year] = "2001"
     hash[:journal_title] = "Journal of Invalid Results"
     hash[:volume] = "10"
     hash[:issue] = "1"
     hash[:start_page] = "101"
     hash[:end_page] = "120"
     hash[:format] = "MusicRecording"
+    hash[:abstract] = "This is an abstract."
     item = BentoSearch::ResultItem.new( hash )
     item.authors.push BentoSearch::Author.new(:display => "Smith, J.")
     
@@ -46,14 +60,17 @@ class StdItemTest < ActionView::TestCase
       
       # Make sure we have the items for complete citation
       
-
-      assert_select ".bento_item_authors"
-      assert_select ".bento_item_about" , 
-        Regexp.new(Regexp.escape( I18n.t(item.format, :scope => [:bento_search, :format])   ))
-        
+      assert_select ".bento_item_row.first_about" do
+        assert_select ".authors"
+        assert_select ".date"
+      end
       
-      assert_select ".bento_item_row"
-      assert_select ".published_in"
+      assert_select ".bento_item_row.abstract"
+      
+      assert_select ".bento_item_about" , 
+        Regexp.new(Regexp.escape( I18n.t(item.format, :scope => [:bento_search, :format])   ))        
+              
+      assert_select ".bento_item_row.second_about"      
     end              
     
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bento_search
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-25 00:00:00.000000000 Z
+date: 2012-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -70,17 +70,23 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.4
+    - - <
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.4
+    - - <
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -221,9 +227,11 @@ files:
 - app/models/bento_search/openurl_creator.rb
 - app/models/bento_search/author.rb
 - app/models/bento_search/search_engine.rb
+- app/views/bento_search/_no_results.html.erb
 - app/views/bento_search/_wrap_with_count.html.erb
 - app/views/bento_search/_search_error.html.erb
 - app/views/bento_search/search/search.html.erb
+- app/views/bento_search/_item_title.html.erb
 - app/views/bento_search/_std_item.html.erb
 - app/views/bento_search/_link.html.erb
 - app/helpers/bento_search_helper.rb
@@ -237,6 +245,9 @@ files:
 - app/search_engines/bento_search/eds_engine.rb
 - app/search_engines/bento_search/mock_engine.rb
 - app/search_engines/bento_search/xerxes_engine.rb
+- app/item_decorators/bento_search/standard_decorator.rb
+- app/item_decorators/bento_search/ebscohost/conditional_openurl_main_link.rb
+- app/item_decorators/bento_search/decorator_base.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/only_premade_openurl.rb
@@ -286,20 +297,29 @@ files:
 - test/dummy/script/rails
 - test/dummy/config.ru
 - test/dummy/db/test.sqlite3
+- test/dummy/db/development.sqlite3
 - test/dummy/log/test.log
 - test/dummy/log/development.log
 - test/helper/bento_search_helper_test.rb
+- test/helper/bento_truncate_helper_test.rb
 - test/vcr_cassettes/summon/proper_tags_for_snippets.yml
 - test/vcr_cassettes/summon/search.yml
 - test/vcr_cassettes/summon/bad_auth.yml
 - test/vcr_cassettes/xerxes/live_search.yml
 - test/vcr_cassettes/worldcat_sru_dc/smoke_test.yml
+- test/vcr_cassettes/worldcat_sru_dc/max_out_pagination.yml
 - test/vcr_cassettes/primo/search_smoke_test.yml
 - test/vcr_cassettes/primo/proper_tags_for_snippets.yml
+- test/vcr_cassettes/ebscohost/another_dissertation.yml
 - test/vcr_cassettes/ebscohost/live_search.yml
+- test/vcr_cassettes/ebscohost/fulltext_info.yml
 - test/vcr_cassettes/ebscohost/error_bad_db.yml
+- test/vcr_cassettes/ebscohost/live_pathological_book_item_example.yml
 - test/vcr_cassettes/ebscohost/error_bad_password.yml
+- test/vcr_cassettes/ebscohost/dissertation_example.yml
+- test/vcr_cassettes/ebscohost/live_dissertation.yml
 - test/vcr_cassettes/ebscohost/get_info.yml
+- test/vcr_cassettes/ebscohost/live_book_example.yml
 - test/vcr_cassettes/ebscohost/live_search_smoke_test.yml
 - test/vcr_cassettes/eds/basic_search_smoke_test.yml
 - test/vcr_cassettes/eds/get_auth_token.yml
@@ -308,6 +328,7 @@ files:
 - test/vcr_cassettes/eds/get_with_auth_recovers_from_bad_auth.yml
 - test/vcr_cassettes/google_site/empty_result_set.yml
 - test/vcr_cassettes/google_site/without_highlighting.yml
+- test/vcr_cassettes/google_site/gets_format_string.yml
 - test/vcr_cassettes/google_site/with_highlighting.yml
 - test/vcr_cassettes/google_site/basic_smoke_test.yml
 - test/vcr_cassettes/google_site/pagination_object_is_correct_for_actual_page_when_you_ask_for_too_far.yml
@@ -316,11 +337,11 @@ files:
 - test/vcr_cassettes/scopus/bad_api_key_should_return_error_response.yml
 - test/vcr_cassettes/scopus/escaped_chars.yml
 - test/vcr_cassettes/scopus/zero_results_search.yml
+- test/vcr_cassettes/max_out_pagination.yml
 - test/vcr_cassettes/gbs/pagination.yml
 - test/vcr_cassettes/gbs/error_condition.yml
 - test/vcr_cassettes/gbs/search.yml
 - test/vcr_cassettes/gbs/empty_results.yml
-- test/unit/result_item_display_test.rb
 - test/unit/eds_engine_test.rb
 - test/unit/result_item_test.rb
 - test/unit/item_decorators_test.rb
@@ -328,7 +349,6 @@ files:
 - test/unit/google_site_search_test.rb
 - test/unit/search_engine_test.rb
 - test/unit/search_engine_base_test.rb
-- test/unit/worldcat_sru_dc_engine_test.rb
 - test/unit/register_engine_test.rb
 - test/unit/google_books_engine_test.rb
 - test/unit/summon_engine_test.rb
@@ -340,6 +360,8 @@ files:
 - test/unit/multi_searcher_test.rb
 - test/unit/pagination_test.rb
 - test/test_helper.rb
+- test/decorator/standard_decorator_test.rb
+- test/decorator/decorator_base_test.rb
 - test/functional/bento_search/search_controller_test.rb
 homepage: http://github.com/jrochkind/bento_search
 licenses: []
@@ -355,7 +377,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3621427557222993930
+      hash: 328039758736182277
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -364,7 +386,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3621427557222993930
+      hash: 328039758736182277
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -405,20 +427,29 @@ test_files:
 - test/dummy/script/rails
 - test/dummy/config.ru
 - test/dummy/db/test.sqlite3
+- test/dummy/db/development.sqlite3
 - test/dummy/log/test.log
 - test/dummy/log/development.log
 - test/helper/bento_search_helper_test.rb
+- test/helper/bento_truncate_helper_test.rb
 - test/vcr_cassettes/summon/proper_tags_for_snippets.yml
 - test/vcr_cassettes/summon/search.yml
 - test/vcr_cassettes/summon/bad_auth.yml
 - test/vcr_cassettes/xerxes/live_search.yml
 - test/vcr_cassettes/worldcat_sru_dc/smoke_test.yml
+- test/vcr_cassettes/worldcat_sru_dc/max_out_pagination.yml
 - test/vcr_cassettes/primo/search_smoke_test.yml
 - test/vcr_cassettes/primo/proper_tags_for_snippets.yml
+- test/vcr_cassettes/ebscohost/another_dissertation.yml
 - test/vcr_cassettes/ebscohost/live_search.yml
+- test/vcr_cassettes/ebscohost/fulltext_info.yml
 - test/vcr_cassettes/ebscohost/error_bad_db.yml
+- test/vcr_cassettes/ebscohost/live_pathological_book_item_example.yml
 - test/vcr_cassettes/ebscohost/error_bad_password.yml
+- test/vcr_cassettes/ebscohost/dissertation_example.yml
+- test/vcr_cassettes/ebscohost/live_dissertation.yml
 - test/vcr_cassettes/ebscohost/get_info.yml
+- test/vcr_cassettes/ebscohost/live_book_example.yml
 - test/vcr_cassettes/ebscohost/live_search_smoke_test.yml
 - test/vcr_cassettes/eds/basic_search_smoke_test.yml
 - test/vcr_cassettes/eds/get_auth_token.yml
@@ -427,6 +458,7 @@ test_files:
 - test/vcr_cassettes/eds/get_with_auth_recovers_from_bad_auth.yml
 - test/vcr_cassettes/google_site/empty_result_set.yml
 - test/vcr_cassettes/google_site/without_highlighting.yml
+- test/vcr_cassettes/google_site/gets_format_string.yml
 - test/vcr_cassettes/google_site/with_highlighting.yml
 - test/vcr_cassettes/google_site/basic_smoke_test.yml
 - test/vcr_cassettes/google_site/pagination_object_is_correct_for_actual_page_when_you_ask_for_too_far.yml
@@ -435,11 +467,11 @@ test_files:
 - test/vcr_cassettes/scopus/bad_api_key_should_return_error_response.yml
 - test/vcr_cassettes/scopus/escaped_chars.yml
 - test/vcr_cassettes/scopus/zero_results_search.yml
+- test/vcr_cassettes/max_out_pagination.yml
 - test/vcr_cassettes/gbs/pagination.yml
 - test/vcr_cassettes/gbs/error_condition.yml
 - test/vcr_cassettes/gbs/search.yml
 - test/vcr_cassettes/gbs/empty_results.yml
-- test/unit/result_item_display_test.rb
 - test/unit/eds_engine_test.rb
 - test/unit/result_item_test.rb
 - test/unit/item_decorators_test.rb
@@ -447,7 +479,6 @@ test_files:
 - test/unit/google_site_search_test.rb
 - test/unit/search_engine_test.rb
 - test/unit/search_engine_base_test.rb
-- test/unit/worldcat_sru_dc_engine_test.rb
 - test/unit/register_engine_test.rb
 - test/unit/google_books_engine_test.rb
 - test/unit/summon_engine_test.rb
@@ -459,4 +490,6 @@ test_files:
 - test/unit/multi_searcher_test.rb
 - test/unit/pagination_test.rb
 - test/test_helper.rb
+- test/decorator/standard_decorator_test.rb
+- test/decorator/decorator_base_test.rb
 - test/functional/bento_search/search_controller_test.rb

data/test/unit/result_item_display_test.rb

@@ -1,39 +0,0 @@
-require 'test_helper'
-
-
-
-class ResultItemDisplayTest < ActiveSupport::TestCase
-  Author = BentoSearch::Author
-  ResultItem = BentoSearch::ResultItem
-  
-  test "author with first and last" do
-    author = Author.new(:last => "Smith", :first => "John")
-    
-    str = ResultItem.new.author_display(author)
-    
-    assert_equal "Smith, J", str    
-  end
-  
-  test "author with display form and just last" do
-    author = Author.new(:last => "Smith", :display => "Display Form")
-    
-    str = ResultItem.new.author_display(author)
-    
-    assert_equal "Display Form", str
-  end
-  
-  test "Author with just last" do
-    author = Author.new(:last => "Johnson")
-    
-    str = ResultItem.new.author_display(author)
-    
-    assert_equal "Johnson", str
-    
-  end
-  
-  test "Missing title" do
-    assert_equal I18n.translate("bento_search.missing_title"), ResultItem.new.complete_title
-  end
-    
-  
-end

data/test/unit/worldcat_sru_dc_engine_test.rb

@@ -1,120 +0,0 @@
-require 'test_helper'
-
-require 'cgi'
-require 'uri'
-
-#
-#
-# Using the MARCXML response is way too much work, but the XML 'DC' response
-# is awfully stunted. We do what we can with it, but resulting metadata
-# is weird. 
-#
-class WorldcatSruDcEngineTest < ActiveSupport::TestCase
-  extend TestWithCassette
-
-  @@api_key = ENV["WORLDCAT_API_KEY"] || "DUMMY_API_KEY"
-  
-  VCR.configure do |c|
-    c.filter_sensitive_data("DUMMY_API_KEY", :worldcat_sru_dc) { @@api_key }
-  end
-
-  
-  def setup
-    @config = {:api_key => @@api_key}
-    @engine = BentoSearch::WorldcatSruDcEngine.new(@config)
-  end
-  
-  def test_construct_url
-    query = 'cancer\'s "one two"'
-    url = @engine.construct_query_url(:query => query, :per_page => 10)
-    
-    query_hash = CGI.parse(URI.parse(url).query)
-
-    assert_equal [@engine.configuration.api_key],      query_hash["wskey"]
-    assert_equal ['info:srw/schema/1/dc'], query_hash["recordSchema"]
-    assert_equal [@engine.construct_cql_query(:query => query)],   query_hash["query"]
-  end
-  
-  def test_construct_pagination
-    url = @engine.construct_query_url(:query => "cancer", :per_page => 20, :start => 20)
-    
-    query_hash = CGI.parse(URI.parse(url).query)
-    
-    assert_equal ["20"],  query_hash["maximumRecords"]
-    assert_equal ["21"],  query_hash["startRecord"]
-  end
-  
-  def test_construct_sort
-    url = @engine.construct_query_url(:query => "cancer", :sort => "date_desc")
-      
-    query_hash = CGI.parse(URI.parse(url).query)
-    
-    assert_present query_hash["sortKeys"]
-  end
-  
-  def test_construct_fielded_search
-    cql = @engine.construct_cql_query(:query => "cancer", :search_field => "srw.ti")
-    
-    assert_equal 'srw.ti = "cancer"', cql
-  end
-  
-  def test_construct_servicelevel
-    url = @engine.construct_query_url(:query => "cancer")    
-    query_hash = CGI.parse(URI.parse(url).query)
-    assert_not_include query_hash["servicelevel"], "full"
-        
-    url = @engine.construct_query_url(:query => "cancer auth", :auth => true)    
-    query_hash = CGI.parse(URI.parse(url).query)
-    assert_include query_hash["servicelevel"], "full"
-    
-    default_on = BentoSearch::WorldcatSruDcEngine.new(@config.merge(:auth => true))
-    
-    url = default_on.construct_query_url(:query => "cancer")    
-    query_hash = CGI.parse(URI.parse(url).query)
-    assert_include query_hash["servicelevel"], "full"
-    
-    url = default_on.construct_query_url(:query => "cancer", :auth => false)    
-    query_hash = CGI.parse(URI.parse(url).query)
-    assert_not_include query_hash["servicelevel"], "full"    
-  end
-  
-  def test_construct_cql
-    # test proper escaping and such
-    cql = @engine.construct_cql_query(:query => "alpha's beta \"one two\" thr\"ee")
-
-    components = cql.split(" AND ")
-    
-    assert_equal 4, components.length
-    
-    ["srw.kw = \"beta\"", 
-     "srw.kw = \"alpha's\"", 
-     "srw.kw = \"one two\"",  
-     "srw.kw = \"thr\\\"ee\""].each do |clause|
-      assert_include components, clause
-    end        
-  end
-  
-  test_with_cassette("smoke test", :worldcat_sru_dc) do
-    results = @engine.search("anarchism")
-    
-    assert_present results
-    
-    assert_present results.total_items
-    
-    first = results.first
-    
-    assert_present first.title
-    assert_present first.authors
-    assert_present first.publisher
-    assert_present first.oclcnum
-    
-    assert_present first.year
-    
-    assert_present first.abstract
-    
-    assert_present first.link
-    
-    assert_present first.language_code      
-  end
-  
-end