blacklight 4.7.0 → 4.8.0

data/spec/views/catalog/index.atom.builder_spec.rb

@@ -30,8 +30,8 @@ describe "catalog/index" do
     # but okay. 
 
     params.merge!( @params )
-    view.stub(:blacklight_config).and_return(@config)
-    view.stub(:search_field_options_for_select).and_return([])
+    allow(view).to receive(:blacklight_config).and_return(@config)
+    allow(view).to receive(:search_field_options_for_select).and_return([])
 
     render :template => 'catalog/index', :formats => [:atom] 
 
@@ -41,51 +41,51 @@ describe "catalog/index" do
   end
 
   it "should have contextual information" do
-    rendered.should have_selector("link[rel=self]")
-    rendered.should have_selector("link[rel=next]")
-    rendered.should have_selector("link[rel=previous]")
-    rendered.should have_selector("link[rel=first]")
-    rendered.should have_selector("link[rel=last]")
-    rendered.should have_selector("link[rel='alternate'][type='text/html']")
-    rendered.should have_selector("link[rel=search][type='application/opensearchdescription+xml']") 
+    expect(rendered).to have_selector("link[rel=self]")
+    expect(rendered).to have_selector("link[rel=next]")
+    expect(rendered).to have_selector("link[rel=previous]")
+    expect(rendered).to have_selector("link[rel=first]")
+    expect(rendered).to have_selector("link[rel=last]")
+    expect(rendered).to have_selector("link[rel='alternate'][type='text/html']")
+    expect(rendered).to have_selector("link[rel=search][type='application/opensearchdescription+xml']") 
   end
   
   it "should get paging data correctly from response" do
     # Can't use have_tag for namespaced elements, sorry.    
-    @response_xml.elements["/feed/opensearch:totalResults"].text.should == "30"
-    @response_xml.elements["/feed/opensearch:startIndex"].text.should == "10"
-    @response_xml.elements["/feed/opensearch:itemsPerPage"].text.should == "10"        
+    expect(@response_xml.elements["/feed/opensearch:totalResults"].text).to eq("30")
+    expect(@response_xml.elements["/feed/opensearch:startIndex"].text).to eq("10")
+    expect(@response_xml.elements["/feed/opensearch:itemsPerPage"].text).to eq("10")        
   end
   
   it "should include an opensearch Query role=request" do
         
-    @response_xml.elements.to_a("/feed/opensearch:itemsPerPage").length.should == 1
+    expect(@response_xml.elements.to_a("/feed/opensearch:itemsPerPage").length).to eq(1)
     query_el = @response_xml.elements["/feed/opensearch:Query"]
-    query_el.should_not be_nil
-    query_el.attributes["role"].should == "request"
-    query_el.attributes["searchTerms"].should == ""
-    query_el.attributes["startPage"].should == "2"    
+    expect(query_el).not_to be_nil
+    expect(query_el.attributes["role"]).to eq("request")
+    expect(query_el.attributes["searchTerms"]).to eq("")
+    expect(query_el.attributes["startPage"]).to eq("2")    
   end
   
   it "should have ten entries" do
-    rendered.should have_selector("entry", :count => 10)
+    expect(rendered).to have_selector("entry", :count => 10)
   end
   
   describe "entries" do
     it "should have a title" do
-      rendered.should have_selector("entry > title")
+      expect(rendered).to have_selector("entry > title")
     end
     it "should have an updated" do
-      rendered.should have_selector("entry > updated")
+      expect(rendered).to have_selector("entry > updated")
     end
     it "should have html link" do
-      rendered.should have_selector("entry > link[rel=alternate][type='text/html']")
+      expect(rendered).to have_selector("entry > link[rel=alternate][type='text/html']")
     end
     it "should have an id" do
-      rendered.should have_selector("entry > id")
+      expect(rendered).to have_selector("entry > id")
     end
     it "should have a summary" do
-      rendered.should have_selector("entry > summary") 
+      expect(rendered).to have_selector("entry > summary") 
     end
     
     describe "with an author" do
@@ -93,7 +93,7 @@ describe "catalog/index" do
         @entry = @response_xml.elements.to_a("/feed/entry")[0]
       end
       it "should have author tag" do
-        @entry.elements["author/name"].should_not be_nil              
+        expect(@entry.elements["author/name"]).not_to be_nil              
       end
     end
     
@@ -102,7 +102,7 @@ describe "catalog/index" do
         @entry = @response_xml.elements.to_a("/feed/entry")[1]
       end
       it "should not have an author tag" do
-        @entry.elements["author/name"].should be_nil
+        expect(@entry.elements["author/name"]).to be_nil
       end
     end
   end
@@ -113,10 +113,10 @@ describe "catalog/index" do
         @entry = @response_xml.elements.to_a("/feed/entry")[0]
       end
       it "should include a link rel tag" do
-        @entry.to_s.should have_selector("link[rel=alternate][type='application/marc']")
+        expect(@entry.to_s).to have_selector("link[rel=alternate][type='application/marc']")
       end
       it "should have content embedded" do
-        @entry.to_s.should have_selector("content")
+        expect(@entry.to_s).to have_selector("content")
       end
     end
     describe "for an entry with NO content available" do
@@ -124,7 +124,7 @@ describe "catalog/index" do
         @entry = @response_xml.elements.to_a("/feed/entry")[5]
       end
       it "should include content" do
-        @entry.to_s.should_not have_selector("content[type='application/marc']")
+        expect(@entry.to_s).not_to have_selector("content[type='application/marc']")
       end
     end
   end

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

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe "catalog/index.html.erb" do
   it "should render the sidebar and content panes" do
-    view.stub(:blacklight_config).and_return(Blacklight::Configuration.new)
+    allow(view).to receive(:blacklight_config).and_return(Blacklight::Configuration.new)
     render
     expect(rendered).to match /id="sidebar"/
     expect(rendered).to match /id="content"/
@@ -11,7 +11,7 @@ describe "catalog/index.html.erb" do
   it "should render the search_sidebar partial " do
     stub_template "catalog/_search_sidebar.html.erb" => "sidebar_content"
 
-    view.stub(:blacklight_config).and_return(Blacklight::Configuration.new)
+    allow(view).to receive(:blacklight_config).and_return(Blacklight::Configuration.new)
     render
     expect(rendered).to match /sidebar_content/
   end
@@ -20,10 +20,10 @@ describe "catalog/index.html.erb" 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("")
+    allow(view).to receive(:blacklight_config).and_return(Blacklight::Configuration.new)
+    allow(view).to receive(:has_search_parameters?).and_return(true)
+    allow(view).to receive(:extra_head_content).and_return([])
+    allow(view).to receive(:render_opensearch_response_metadata).and_return("")
     assign(:response, double(:empty? => true))
     render
     expect(rendered).to match /header_content/

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 4.7.0
+  version: 4.8.0
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -17,28 +17,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-05 00:00:00.000000000 Z
+date: 2018-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.2.6
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.2.6
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -101,20 +95,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.13'
-- !ruby/object:Gem::Dependency
-  name: sass-rails
-  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: bootstrap-sass
   requirement: !ruby/object:Gem::Requirement
@@ -167,30 +147,30 @@ dependencies:
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: engine_cart
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
   requirement: !ruby/object:Gem::Requirement
@@ -247,25 +227,25 @@ files:
 - app/assets/javascripts/blacklight/zebra_stripe.js
 - app/assets/javascripts/improved-modal/bootstrap-modal.js
 - app/assets/javascripts/improved-modal/bootstrap-modalmanager.js
-- app/assets/stylesheets/blacklight/_blacklight_base.css.scss
-- app/assets/stylesheets/blacklight/_bookmark.css.scss
-- app/assets/stylesheets/blacklight/_catalog.css.scss
-- app/assets/stylesheets/blacklight/_dropdown.css.scss
-- app/assets/stylesheets/blacklight/_facets.css.scss
-- app/assets/stylesheets/blacklight/_footer.css.scss
-- app/assets/stylesheets/blacklight/_group.css.scss
-- app/assets/stylesheets/blacklight/_header.css.scss
-- app/assets/stylesheets/blacklight/_layout.css.scss
-- app/assets/stylesheets/blacklight/_mixins.css.scss
-- app/assets/stylesheets/blacklight/_modal.css.scss
-- app/assets/stylesheets/blacklight/_print.css.scss
-- app/assets/stylesheets/blacklight/_responsive.css.scss
-- app/assets/stylesheets/blacklight/_search_history.css.scss
-- app/assets/stylesheets/blacklight/blacklight.css.scss
-- app/assets/stylesheets/blacklight/blacklight_defaults.css.scss
-- app/assets/stylesheets/blacklight/responsive_partials/_catalog.css.scss
-- app/assets/stylesheets/blacklight/responsive_partials/_facets.css.scss
-- app/assets/stylesheets/blacklight/responsive_partials/_header.css.scss
+- app/assets/stylesheets/blacklight/_blacklight_base.scss
+- app/assets/stylesheets/blacklight/_bookmark.scss
+- app/assets/stylesheets/blacklight/_catalog.scss
+- app/assets/stylesheets/blacklight/_dropdown.scss
+- app/assets/stylesheets/blacklight/_facets.scss
+- app/assets/stylesheets/blacklight/_footer.scss
+- app/assets/stylesheets/blacklight/_group.scss
+- app/assets/stylesheets/blacklight/_header.scss
+- app/assets/stylesheets/blacklight/_layout.scss
+- app/assets/stylesheets/blacklight/_mixins.scss
+- app/assets/stylesheets/blacklight/_modal.scss
+- app/assets/stylesheets/blacklight/_print.scss
+- app/assets/stylesheets/blacklight/_responsive.scss
+- app/assets/stylesheets/blacklight/_search_history.scss
+- app/assets/stylesheets/blacklight/blacklight.scss
+- app/assets/stylesheets/blacklight/blacklight_defaults.scss
+- app/assets/stylesheets/blacklight/responsive_partials/_catalog.scss
+- app/assets/stylesheets/blacklight/responsive_partials/_facets.scss
+- app/assets/stylesheets/blacklight/responsive_partials/_header.scss
 - app/assets/stylesheets/improved-modal/bootstrap-modal.css
 - app/controllers/bookmarks_controller.rb
 - app/controllers/catalog_controller.rb
@@ -414,8 +394,6 @@ files:
 - doc/Theming.md
 - doc/User-Authentication.md
 - doc/testing.md
-- gemfiles/rails3.gemfile
-- gemfiles/rails4.gemfile
 - lib/SolrMarc.jar
 - lib/blacklight.rb
 - lib/blacklight/base.rb
@@ -464,7 +442,7 @@ files:
 - lib/generators/blacklight/marc_generator.rb
 - lib/generators/blacklight/models_generator.rb
 - lib/generators/blacklight/templates/alternate_controller.rb
-- lib/generators/blacklight/templates/blacklight.css.scss
+- lib/generators/blacklight/templates/blacklight.scss
 - lib/generators/blacklight/templates/catalog_controller.rb
 - lib/generators/blacklight/templates/config/SolrMarc/config-test.properties
 - lib/generators/blacklight/templates/config/SolrMarc/config.properties
@@ -588,7 +566,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: blacklight
-rubygems_version: 2.2.0
+rubygems_version: 2.5.2.1
 signing_key: 
 specification_version: 4
 summary: Blacklight provides a discovery interface for any Solr (http://lucene.apache.org/solr)

data/gemfiles/rails3.gemfile

@@ -1,25 +0,0 @@
-source 'http://rubygems.org'
-
-# Please see blacklight.gemspec for dependency information.
-gemspec :path=>"../"
-
-gem 'simplecov', :platform => :mri
-gem 'simplecov-rcov', :platform => :mri
-
-gem 'rails', "~> 3.2"
-
-gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
-
-group :test do
-  gem 'devise'
-  gem 'devise-guests'
-  gem "bootstrap-sass"
-  gem 'turbolinks'
-  gem 'uglifier'
-  gem 'poltergeist'
-end
-
-f = File.expand_path(File.dirname(__FILE__) + '/../spec/test_app_templates/Gemfile.extra')
-if File.exists?(f)
-  eval File.read(f), nil, f
-end

data/gemfiles/rails4.gemfile

@@ -1,24 +0,0 @@
-source 'http://rubygems.org'
-
-# Please see blacklight.gemspec for dependency information.
-gemspec :path=>"../"
-
-gem 'simplecov', :platform => :mri
-gem 'simplecov-rcov', :platform => :mri
-
-gem 'rails', '~> 4.0.0'
-
-gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
-
-group :test do
-  gem 'devise'
-  gem 'devise-guests'
-  gem "bootstrap-sass"
-  gem 'turbolinks'
-  gem 'poltergeist'
-end
-
-f = File.expand_path(File.dirname(__FILE__) + '/../spec/test_app_templates/Gemfile.extra')
-if File.exists?(f)
-  eval File.read(f), nil, f
-end