bento_search 1.2.0 → 1.2.1

data/test/functional/bento_search/search_controller_test.rb

@@ -42,7 +42,7 @@ module BentoSearch
       assert_response :success
       assert_not_nil assigns(:results)
       
-      assert_template "bento_search/search"
+      assert_template "bento_search/search/search"
       
       # meta tag with count
       assert_tag(:tag => "meta", :attributes => {"itemprop" => "total_items", "content" => /^\d+$/ })
@@ -57,7 +57,7 @@ module BentoSearch
       # warning?
       assert_response :success
       
-      assert_template "bento_search/search"
+      assert_template "bento_search/search/search"
       assert_template "bento_search/_search_error"
       
       assert_no_tag(:tag => "meta", :attributes => {"itemprop" => "total_items"})
@@ -75,7 +75,7 @@ module BentoSearch
       assert_not_nil assigns(:partial_wrapper)
       
       assert_template "bento_search/_wrap_with_count"
-      assert_template "bento_search/search"
+      assert_template "bento_search/search/search"
     end
     
     test "non-routable engine" do
@@ -126,7 +126,7 @@ module BentoSearch
       
       begin
         Rails.application.routes.draw do
-          match "/custom_search" => "bento_search/search_controller_test/custom_search#search"
+          get "/custom_search" => "bento_search/search_controller_test/custom_search#search"
         end
         @controller = CustomSearchController.new
         

data/test/helper/bento_search_helper_test.rb

@@ -2,9 +2,6 @@
 
 require 'test_helper'
 
-# this seems to work? Rails view testing is a mess. 
-require 'sprockets/helpers/rails_helper'
-
 class BentoSearchHelperTest < ActionView::TestCase
   include BentoSearchHelper
   

data/test/helper/bento_truncate_helper_test.rb

@@ -2,8 +2,6 @@
 
 require 'test_helper'
 
-# this seems to work? Rails view testing is a mess. 
-require 'sprockets/helpers/rails_helper'
 
 class BentoSearchHelperTest < ActionView::TestCase
   include BentoSearchHelper

data/test/search_engines/ebsco_host_engine_test.rb

@@ -46,7 +46,7 @@ class EbscoHostEngineTest < ActiveSupport::TestCase
     assert_equal ["relevance"], query_params["sort"]
 
     @engine.configuration.databases.each do |db|
-      assert_include query_params["db"], db
+      assert_includes query_params["db"], db
     end
   end
 

data/test/search_engines/eds_engine_test.rb

@@ -58,8 +58,8 @@ class EdsEngineTest < ActiveSupport::TestCase
     
     assert_equal "1", parts.first
     
-    assert_include parts, "SourceType:Academic Journals"
-    assert_include parts, "SourceType:Magazines"        
+    assert_includes parts, "SourceType:Academic Journals"
+    assert_includes parts, "SourceType:Magazines"        
   end
   
   def test_has_http_timeout_set

data/test/search_engines/google_books_engine_test.rb

@@ -111,7 +111,7 @@ class GoogleBooksEngineTest < ActiveSupport::TestCase
     
     url = @engine.send(:args_to_search_url, :query => "cancer", :sort => "relevance")
     
-    assert_not_match "&orderBy", url    
+    refute_match "&orderBy", url    
   end
   
   def test_fielded_search    

data/test/search_engines/primo_engine_test.rb

@@ -64,7 +64,7 @@ class PrimoEngineTest < ActiveSupport::TestCase
 
     assert first.title.html_safe?, "title is HTML safe"
 
-    assert_include first.title, '<b class="bento_search_highlight">'
+    assert_includes first.title, '<b class="bento_search_highlight">'
 
     assert_present first.snippets
 

data/test/search_engines/summon_engine_test.rb

@@ -114,9 +114,9 @@ class SummonEngineTest < ActiveSupport::TestCase
 
     query_params = CGI.parse( URI.parse(uri).query )
 
-    assert_include query_params["s.fvf"], "ContentType,Newspaper Article,true"
-    assert_include query_params["s.fvf"], "ContentType,Book,true"
-    assert_include query_params["s.role"], "authenticated"
+    assert_includes query_params["s.fvf"], "ContentType,Newspaper Article,true"
+    assert_includes query_params["s.fvf"], "ContentType,Book,true"
+    assert_includes query_params["s.role"], "authenticated"
 
   end
 
@@ -129,7 +129,7 @@ class SummonEngineTest < ActiveSupport::TestCase
 
     query_params = CGI.parse( URI.parse(uri).query )
 
-    assert_include query_params['s.hl'], "false"
+    assert_includes query_params['s.hl'], "false"
   end
 
 
@@ -143,11 +143,11 @@ class SummonEngineTest < ActiveSupport::TestCase
     query_params = CGI.parse( URI.parse(uri).query )
 
     assert_equal    1,    query_params["a"].try(:length)
-    assert_include  query_params["a"], "a"
+    assert_includes  query_params["a"], "a"
 
     assert_equal    2,    query_params["b"].try(:length)
-    assert_include  query_params["b"], "b1"
-    assert_include  query_params["b"], "b2"
+    assert_includes  query_params["b"], "b1"
+    assert_includes  query_params["b"], "b2"
   end
 
   def test_construct_peer_reviewed_only
@@ -156,7 +156,7 @@ class SummonEngineTest < ActiveSupport::TestCase
     query_params = CGI.parse( URI.parse(uri).query )
 
     assert_kind_of Array, query_params["s.fvf"]
-    assert_include query_params["s.fvf"], "IsPeerReviewed,true"
+    assert_includes query_params["s.fvf"], "IsPeerReviewed,true"
   end
 
   def test_construct_online_only
@@ -165,7 +165,7 @@ class SummonEngineTest < ActiveSupport::TestCase
     query_params = CGI.parse( URI.parse(uri).query )
 
     assert_kind_of Array, query_params["s.fvf"]
-    assert_include query_params["s.fvf"], "IsFullText,true"
+    assert_includes query_params["s.fvf"], "IsFullText,true"
   end
 
   def test_construct_pubyear_range
@@ -173,7 +173,7 @@ class SummonEngineTest < ActiveSupport::TestCase
 
     query_params = CGI.parse( URI.parse(uri).query )
 
-    assert_include query_params["s.rf"], "PublicationDate,1990:2000"
+    assert_includes query_params["s.rf"], "PublicationDate,1990:2000"
   end
 
   def test_construct_pubyear_range_open_bottom
@@ -181,7 +181,7 @@ class SummonEngineTest < ActiveSupport::TestCase
 
     query_params = CGI.parse( URI.parse(uri).query )
 
-    assert_include query_params["s.rf"], "PublicationDate,*:2000"
+    assert_includes query_params["s.rf"], "PublicationDate,*:2000"
   end
 
   def test_construct_pubyear_range_open_top
@@ -189,7 +189,7 @@ class SummonEngineTest < ActiveSupport::TestCase
 
     query_params = CGI.parse( URI.parse(uri).query )
 
-    assert_include query_params["s.rf"], "PublicationDate,1990:*"
+    assert_includes query_params["s.rf"], "PublicationDate,1990:*"
   end
 
 
@@ -231,8 +231,8 @@ class SummonEngineTest < ActiveSupport::TestCase
 
     first = results.first
 
-    assert_include first.title, '<b class="bento_search_highlight">'
-    assert_include first.title, '</b>'
+    assert_includes first.title, '<b class="bento_search_highlight">'
+    assert_includes first.title, '</b>'
 
     assert first.title.html_safe?, "title is HTML safe"
   end
@@ -244,7 +244,7 @@ class SummonEngineTest < ActiveSupport::TestCase
 
     assert_present results.first.snippets
 
-    assert_include results.first.snippets.first, '<b class="bento_search_highlight">'
+    assert_includes results.first.snippets.first, '<b class="bento_search_highlight">'
   end
 
   test_with_cassette("live #get(id)", :summon) do

data/test/search_engines/worldcat_sru_dc_engine_test.rb

@@ -61,21 +61,21 @@ class WorldcatSruDcEngineTest < ActiveSupport::TestCase
   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"
+    assert_not_includes 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"
+    assert_includes 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"
+    assert_includes 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"    
+    assert_not_includes query_hash["servicelevel"], "full"    
   end
   
   def test_construct_cql
@@ -90,7 +90,7 @@ class WorldcatSruDcEngineTest < ActiveSupport::TestCase
      "srw.kw = \"alpha's\"", 
      "srw.kw = \"one two\"",  
      "srw.kw = \"thr\\\"ee\""].each do |clause|
-      assert_include components, clause
+      assert_includes components, clause
     end        
   end
   

data/test/test_helper.rb

@@ -49,4 +49,19 @@ if ! defined? VCR
   end
 end
 
+# re-open to add 
+# some custom assertions, that used to be in mini-test, or that
+# we wanted to add. 
+class ActiveSupport::TestCase
 
+  def assert_present(object, msg = nil)
+    msg ||= "expected #{object} to be #present?"
+    assert(object.present?, msg)
+  end
+
+  def assert_blank(object, msg = nil)
+    msg ||= "expected #{object} to be #blank?"
+    assert object.blank?, msg
+  end
+
+end

data/test/unit/openurl_creator_test.rb

@@ -39,7 +39,7 @@ class OpenurlCreatorTest < ActiveSupport::TestCase
     assert_equal "100",         r.metadata["epage"]
     assert_equal "Journal of Fakes", r.metadata["jtitle"]
     assert_equal "12345678",    r.metadata["issn"]
-    assert_include r.identifiers, "info:doi/XXXX"
+    assert_includes r.identifiers, "info:doi/XXXX"
     
     assert_equal "John",        r.metadata["aufirst"]
     assert_equal "Smith",       r.metadata["aulast"]
@@ -61,7 +61,7 @@ class OpenurlCreatorTest < ActiveSupport::TestCase
 
     r = BentoSearch::OpenurlCreator.new(item).to_openurl.referent
 
-    assert_include r.identifiers, "info:pmid/#{pmid}"
+    assert_includes r.identifiers, "info:pmid/#{pmid}"
   end
 
   
@@ -166,7 +166,7 @@ class OpenurlCreatorTest < ActiveSupport::TestCase
     openurl = item.to_openurl
     
     # The legal way:
-    assert_include openurl.referent.identifiers, 'info:oclcnum/12345'
+    assert_includes openurl.referent.identifiers, 'info:oclcnum/12345'
     # Not actually legal but common practice:
     assert_equal '12345',openurl.referent.metadata["oclcnum"] 
   end
@@ -200,7 +200,7 @@ class OpenurlCreatorTest < ActiveSupport::TestCase
     
     kev = openurl.kev
     
-    assert_include kev, "&rft_id=info%3Adoi%2F10.3305%2Fnh.2012.27.5.5997"        
+    assert_includes kev, "&rft_id=info%3Adoi%2F10.3305%2Fnh.2012.27.5.5997"        
   end
   
   def test_openurl_disabled

data/test/unit/ris_creator_test.rb

@@ -97,62 +97,62 @@ class RISCreatorTest < ActiveSupport::TestCase
   def test_article        
     lines = ris_parse RISCreator.new(@@article).export    
     
-    assert_include lines, ['TY', 'JOUR']
-    assert_include lines, ['TI', @@article.title]
-    assert_include lines, ['T2', @@article.source_title]
-    assert_include lines, ['SN', @@article.issn]
-    assert_include lines, ['VL', @@article.volume]
-    assert_include lines, ['IS', @@article.issue]
-    assert_include lines, ['SP', @@article.start_page]    
-    assert_include lines, ['EP', @@article.end_page]
-    assert_include lines, ['DO', @@article.doi]
-    assert_include lines, ['AB', @@article.abstract]
+    assert_includes lines, ['TY', 'JOUR']
+    assert_includes lines, ['TI', @@article.title]
+    assert_includes lines, ['T2', @@article.source_title]
+    assert_includes lines, ['SN', @@article.issn]
+    assert_includes lines, ['VL', @@article.volume]
+    assert_includes lines, ['IS', @@article.issue]
+    assert_includes lines, ['SP', @@article.start_page]    
+    assert_includes lines, ['EP', @@article.end_page]
+    assert_includes lines, ['DO', @@article.doi]
+    assert_includes lines, ['AB', @@article.abstract]
 
-    assert_include lines, ['AU', "Smith, John Q."]
-    assert_include lines, ['AU', "Lopez, Maria"]
-    assert_include lines, ['AU', "Some Guy"]
+    assert_includes lines, ['AU', "Smith, John Q."]
+    assert_includes lines, ['AU', "Lopez, Maria"]
+    assert_includes lines, ['AU', "Some Guy"]
   end
   
   def test_book
     lines = ris_parse RISCreator.new(@@book).export
     
-    assert_include lines, ['TY', 'BOOK']
-    assert_include lines, ['TI', @@book.title]
-    assert_include lines, ['PY', @@book.year]
-    assert_include lines, ['PB', @@book.publisher]
-    assert_include lines, ['SN', @@book.isbn]
+    assert_includes lines, ['TY', 'BOOK']
+    assert_includes lines, ['TI', @@book.title]
+    assert_includes lines, ['PY', @@book.year]
+    assert_includes lines, ['PB', @@book.publisher]
+    assert_includes lines, ['SN', @@book.isbn]
     
-    assert_include lines, ['AU', "Smith, John Q."]
+    assert_includes lines, ['AU', "Smith, John Q."]
   end
   
   def test_book_chapter
     lines = ris_parse RISCreator.new(@@book_chapter).export
     
-    assert_include lines, ['TY', 'CHAP']
+    assert_includes lines, ['TY', 'CHAP']
     
-    assert_include lines, ['TI', @@book_chapter.title]
-    assert_include lines, ['T2', @@book_chapter.source_title]
-    assert_include lines, ['PY', @@book_chapter.year]
-    assert_include lines, ['PB', @@book_chapter.publisher]
-    assert_include lines, ['SP', @@book_chapter.start_page]
+    assert_includes lines, ['TI', @@book_chapter.title]
+    assert_includes lines, ['T2', @@book_chapter.source_title]
+    assert_includes lines, ['PY', @@book_chapter.year]
+    assert_includes lines, ['PB', @@book_chapter.publisher]
+    assert_includes lines, ['SP', @@book_chapter.start_page]
   end
   
   def test_dissertation
     lines = ris_parse RISCreator.new(@@dissertation).export
     
-    assert_include lines, ['TY', 'THES']
+    assert_includes lines, ['TY', 'THES']
     
-    assert_include lines, ['TI', @@dissertation.title]
-    assert_include lines, ['PB', @@dissertation.publisher]
-    assert_include lines, ['PY', @@dissertation.year]
+    assert_includes lines, ['TI', @@dissertation.title]
+    assert_includes lines, ['PB', @@dissertation.publisher]
+    assert_includes lines, ['PY', @@dissertation.year]
   end
   
   def test_article_with_full_date
     lines = ris_parse RISCreator.new(@@article_with_full_date).export
     
-    assert_include lines, ['TY', 'JOUR']
+    assert_includes lines, ['TY', 'JOUR']
     
-    assert_include lines, ['DA', '2011/09/01']    
+    assert_includes lines, ['DA', '2011/09/01']    
   end
   
     

data/test/view/atom_results_test.rb

@@ -206,8 +206,8 @@ class AtomResultsTest < ActionView::TestCase
     
     assert_node(with_unique_id, "atom:id") do |id|
       # based off of engine_id and unique_id
-      assert_include id.text, "some_engine"
-      assert_include id.text, "a000%3A%2F01"
+      assert_includes id.text, "some_engine"
+      assert_includes id.text, "a000%3A%2F01"
     end      
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bento_search
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,24 +9,30 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-13 00:00:00.000000000 Z
+date: 2014-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.2.3
+    - - <
+      - !ruby/object:Gem::Version
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.2.3
+    - - <
+      - !ruby/object:Gem::Version
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: confstruct
   requirement: !ruby/object:Gem::Requirement
@@ -424,7 +430,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3285258891763332847
+      hash: 1645003956500659211
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -433,7 +439,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3285258891763332847
+      hash: 1645003956500659211
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23