blacklight 4.5.0 → 4.6.0

data/spec/helpers/facets_helper_spec.rb

@@ -1,4 +1,8 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+require 'nokogiri'
+require 'equivalent-xml'
+
 describe FacetsHelper do
   let(:blacklight_config) { Blacklight::Configuration.new }
 
@@ -190,12 +194,6 @@ describe FacetsHelper do
       helper.render_facet_limit(@mock_facet)
     end
 
-    it "should send a deprecation warning if the method is called using the old-style signature" do
-      helper.should_receive(:render_facet_partials).with(['asdf'])
-      $stderr.should_receive(:puts)
-      helper.render_facet_limit('asdf')
-    end
-
     it "should render a facet _not_ declared in the configuration" do
       @mock_facet = double(:name => 'asdf', :items => [1,2,3])
       helper.should_receive(:render).with(hash_including(:partial => 'facet_limit'))
@@ -378,7 +376,10 @@ describe FacetsHelper do
  
       helper.should_receive(:facet_display_value).and_return('Z')
       helper.should_receive(:add_facet_params_and_redirect).and_return('link')
-      helper.render_facet_value('simple_field', double(:value => 'A', :hits => 10)).should == (helper.link_to("Z", "link", :class => "facet_select") + " " + (helper.content_tag :span, 10, :class => 'count')).html_safe
+      expected  = Nokogiri::HTML "<a class=\"facet_select\" href=\"link\">Z</a> <span class=\"count\">10</span>"
+      rendered  = Nokogiri::HTML helper.render_facet_value('simple_field', double(:value => 'A', :hits => 10))
+
+      rendered.should be_equivalent_to(expected).respecting_element_order
     end
 
 

data/spec/helpers/html_head_helper_spec.rb

@@ -11,7 +11,10 @@ describe HtmlHeadHelper do
       end
     end
     it "should include script tags specified in controller#javascript_includes" do
-      html = helper.render_js_includes
+
+      html = Deprecation.silence(Blacklight::HtmlHeadHelperBehavior) do
+        helper.render_js_includes
+      end
 
       if Rails::VERSION::MAJOR == 4 
         html.should have_selector("script[src='/javascripts/some_js.js']")
@@ -40,7 +43,10 @@ describe HtmlHeadHelper do
       end
     end
     it "should render stylesheets specified in controller #stylesheet_links" do
-      html = helper.render_stylesheet_includes      
+
+      html = Deprecation.silence(Blacklight::HtmlHeadHelperBehavior) do
+        helper.render_stylesheet_includes
+      end
 
       if Rails::VERSION::MAJOR == 4 
         html.should have_selector("link[href='/stylesheets/my_stylesheet.css'][rel='stylesheet']")
@@ -65,7 +71,10 @@ describe HtmlHeadHelper do
     end
 
     it "should include content specified in controller#extra_head_content" do
-      html = helper.render_extra_head_content
+
+      html = Deprecation.silence(Blacklight::HtmlHeadHelperBehavior) do
+        helper.render_extra_head_content
+      end
 
       html.should have_selector("link[rel=a]")
       html.should have_selector("link[rel=b]")
@@ -77,9 +86,11 @@ describe HtmlHeadHelper do
   describe "render_head_content" do
     describe "with no methods defined" do
       it "should return empty string without complaint" do
-      lambda {helper.render_head_content}.should_not raise_error
-      helper.render_head_content.should be_blank
-      helper.render_head_content.html_safe?.should == true
+        Deprecation.silence(Blacklight::HtmlHeadHelperBehavior) do
+          lambda {helper.render_head_content}.should_not raise_error
+          helper.render_head_content.should be_blank
+          helper.render_head_content.html_safe?.should == true
+        end
       end
     end
     describe "with methods defined" do
@@ -99,7 +110,10 @@ describe HtmlHeadHelper do
       end
       before(:each) do
         helper.should_receive(:content_for).with(:head).and_return("<meta keywords=\"foo bar\"/>".html_safe)
-        @output = helper.render_head_content
+
+        @output = Deprecation.silence(Blacklight::HtmlHeadHelperBehavior) do
+          helper.render_head_content
+        end
       end
       it "should include extra_head_content" do
         @output.should have_selector("madeup_tag")
@@ -128,7 +142,10 @@ describe HtmlHeadHelper do
         helper.should_receive(:render_js_includes).and_return("".html_safe)
         helper.should_receive(:render_stylesheet_includes).and_return("".html_safe)
         helper.should_receive(:content_for).with(:head).and_return("".html_safe)
-        helper.render_head_content.should be_html_safe
+
+        Deprecation.silence(Blacklight::HtmlHeadHelperBehavior) do
+          helper.render_head_content.should be_html_safe
+        end
       end
     end
   end

data/spec/lib/blacklight_solr_response_spec.rb

@@ -69,6 +69,15 @@ describe Blacklight::SolrResponse do
     expect(r).to be_a_kind_of Kaminari::PageScopeMethods
   end
 
+  it "should provide a model name helper" do
+    first_doc_model_name = 'xyz'
+
+    r.docs.first.stub(:model_name).and_return first_doc_model_name
+
+    expect(r.model_name).to eq first_doc_model_name
+
+  end
+
   describe "FacetItem" do
     it "should work with a field,value tuple" do
       item = Blacklight::SolrResponse::Facets::FacetItem.new('value', 15)

data/spec/lib/marc_export_spec.rb

@@ -676,14 +676,7 @@ describe Blacklight::Solr::Document::MarcExport do
       @music_record.export_as_refworks_marc_txt.should == "LEADER 01828cjm a2200409 a 4500001    a4768316\n003    SIRSI\n007    sd fungnnmmned\n008    020117p20011990xxuzz    h              d\n245 00 Music for horn |h[sound recording] / |cBrahms, Beethoven, von Krufft.\n260    [United States] : |bHarmonia Mundi USA, |cp2001.\n700 1  Greer, Lowell.\n700 1  Lubin, Steven.\n700 1  Chase, Stephanie, |d1957-\n700 12 Brahms, Johannes, |d1833-1897. |tTrios, |mpiano, violin, horn, |nop. 40, |rE? major.\n700 12 Beethoven, Ludwig van, |d1770-1827. |tSonatas, |mhorn, piano, |nop. 17, |rF major.\n700 12 Krufft, Nikolaus von, |d1779-1818. |tSonata, |mhorn, piano, |rF major.\n"
     end
     describe "for UTF-8 record" do
-      it "should export in Unicode normalized C form" do
-
-        begin
-          require 'unicode'
-        rescue LoadError
-          Blacklight.logger.should_receive(:warn) unless defined? :JRUBY_VERSION
-        end
-
+      it "should export in Unicode normalized C form" do        
         @utf8_exported = @record_utf8_decomposed.export_as_refworks_marc_txt
 
         if defined? Unicode

data/spec/views/catalog/_search_header.erb_spec.rb

@@ -0,0 +1,17 @@
+# -*- encoding : utf-8 -*-
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+
+# spec for sidebar partial in catalog show view
+
+describe "/catalog/_search_header.html.erb" do
+
+  it "should render the default search header partials" do
+    stub_template "_did_you_mean.html.erb" => "did_you_mean"
+    stub_template "_constraints.html.erb" => "constraints"
+    stub_template "_sort_and_per_page.html.erb" => "sort_and_per_page"
+    render
+    expect(rendered).to match /did_you_mean/
+    expect(rendered).to match /constraints/
+    expect(rendered).to match /sort_and_per_page/
+  end
+end

data/spec/views/catalog/_show_sidebar.erb_spec.rb

@@ -18,9 +18,9 @@ describe "/catalog/_show_sidebar.html.erb" do
 
   it "should show more-like-this titles in the sidebar" do
   	@document = SolrDocument.new :id => 1, :title_s => 'abc', :format => 'default'
-  	@document.stub(:more_like_this).and_return([SolrDocument.new({ 'id' => 2, 'title_display' => 'Title of MLT Document' })])
+  	@document.stub(:more_like_this).and_return([SolrDocument.new({ 'id' => '2', 'title_display' => 'Title of MLT Document' })])
     render
     rendered.should include_text("More Like This")
     rendered.should include_text("Title of MLT Document")
   end
-end
+end

data/spec/views/catalog/index.html.erb_spec.rb

@@ -15,4 +15,17 @@ describe "catalog/index.html.erb" do
     render
     expect(rendered).to match /sidebar_content/
   end
+
+  it "should render the search_header partial " do
+    stub_template "catalog/_results_pagination.html.erb" => ""
+    stub_template "catalog/_search_header.html.erb" => "header_content"
+
+    view.stub(:blacklight_config).and_return(Blacklight::Configuration.new)
+    view.stub(:has_search_parameters?).and_return(true)
+    view.stub(:extra_head_content).and_return([])
+    view.stub(:render_opensearch_response_metadata).and_return("")
+    view.stub(:response_has_no_search_results?).and_return(true)
+    render
+    expect(rendered).to match /header_content/
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 4.5.0
+  version: 4.6.0
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -17,7 +17,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-24 00:00:00.000000000 Z
+date: 2014-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -135,6 +135,20 @@ dependencies:
     - - <
       - !ruby/object:Gem::Version
         version: '2.4'
+- !ruby/object:Gem::Dependency
+  name: deprecation
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: jettywrapper
   requirement: !ruby/object:Gem::Requirement
@@ -177,6 +191,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: 0.1.0
+- !ruby/object:Gem::Dependency
+  name: equivalent-xml
+  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: Blacklight is an open source Solr user interface discovery platform.
   You can use Blacklight to enable searching and browsing of your collections. Blacklight
   uses the Apache Solr search engine to search full text and/or metadata.
@@ -292,6 +320,7 @@ files:
 - app/views/catalog/_refworks_form.html.erb
 - app/views/catalog/_results_pagination.html.erb
 - app/views/catalog/_search_form.html.erb
+- app/views/catalog/_search_header.html.erb
 - app/views/catalog/_search_sidebar.html.erb
 - app/views/catalog/_show_default.html.erb
 - app/views/catalog/_show_more_like_this.html.erb
@@ -487,6 +516,7 @@ files:
 - spec/views/catalog/_document_list.html.erb_spec.rb
 - spec/views/catalog/_facets.html.erb_spec.rb
 - spec/views/catalog/_index_default.erb_spec.rb
+- spec/views/catalog/_search_header.erb_spec.rb
 - spec/views/catalog/_show_default.erb_spec.rb
 - spec/views/catalog/_show_sidebar.erb_spec.rb
 - spec/views/catalog/_thumbnail_default.erb_spec.rb
@@ -514,7 +544,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: blacklight
-rubygems_version: 2.0.3
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Blacklight provides a discovery interface for any Solr (http://lucene.apache.org/solr)
@@ -587,6 +617,7 @@ test_files:
 - spec/views/catalog/_document_list.html.erb_spec.rb
 - spec/views/catalog/_facets.html.erb_spec.rb
 - spec/views/catalog/_index_default.erb_spec.rb
+- spec/views/catalog/_search_header.erb_spec.rb
 - spec/views/catalog/_show_default.erb_spec.rb
 - spec/views/catalog/_show_sidebar.erb_spec.rb
 - spec/views/catalog/_thumbnail_default.erb_spec.rb