blacklight 5.0.3 → 5.1.0

data/spec/lib/blacklight/configuration_spec.rb

@@ -55,6 +55,18 @@ describe "Blacklight::Configuration" do
     end
   end
 
+  describe "config.index.respond_to" do
+    it "should have a list of additional formats for index requests to respond to" do
+      @config.index.respond_to.xml = true
+
+      @config.index.respond_to.csv = { :layout => false }
+
+      @config.index.respond_to.yaml = lambda { render text: "" }
+
+      expect(@config.index.respond_to.keys).to eq [:xml, :csv, :yaml]
+    end
+  end
+
   describe "spell_max" do
     it "should default to 5" do
       expect(Blacklight::Configuration.new.spell_max).to eq 5
@@ -152,6 +164,13 @@ describe "Blacklight::Configuration" do
       expect(@config.facet_fields).to have(2).fields
     end
 
+    it "should accept array form with a block" do
+      expect do |b|
+        @config.add_facet_field([{ :field => 'format', :label => 'Format'}, { :field => 'publication_date', :label => 'Publication Date' }], &b)
+      end.to yield_control.twice
+    end
+
+
     it "should create default label from titleized solr field" do
       @config.add_facet_field("publication_date")
         
@@ -167,7 +186,18 @@ describe "Blacklight::Configuration" do
     it "should raise on nil solr field name" do
       expect { @config.add_facet_field(nil) }.to raise_error ArgumentError
     end
-    
+
+    it "should take wild-carded field names and dereference them to solr fields" do
+      @config.stub(luke_fields: { 
+        "some_field_facet" => {}, 
+        "another_field_facet" => {},
+        "a_facet_field" => {},
+        })
+      expect { |b| @config.add_index_field "*_facet", &b }.to yield_control.twice
+
+      expect(@config.index_fields.keys).to eq ["some_field_facet", "another_field_facet"]
+    end
+
   end
   
   describe "add_index_field" do
@@ -201,6 +231,17 @@ describe "Blacklight::Configuration" do
       expect { @config.add_index_field(nil) }.to raise_error ArgumentError
     end
 
+    it "should take wild-carded field names and dereference them to solr fields" do
+      @config.stub(luke_fields: { 
+        "some_field_display" => {}, 
+        "another_field_display" => {},
+        "a_facet_field" => {},
+        })
+      @config.add_index_field "*_display"
+
+      expect(@config.index_fields.keys).to eq ["some_field_display", "another_field_display"]
+    end
+
   end
   
   describe "add_show_field" do
@@ -235,6 +276,17 @@ describe "Blacklight::Configuration" do
       expect { @config.add_show_field(nil) }.to raise_error ArgumentError
     end
        
+    it "should take wild-carded field names and dereference them to solr fields" do
+      @config.stub(luke_fields: { 
+        "some_field_display" => {}, 
+        "another_field_display" => {},
+        "a_facet_field" => {},
+        })
+      @config.add_show_field "*_display"
+
+      expect(@config.show_fields.keys).to eq ["some_field_display", "another_field_display"]
+    end
+
   end
     
   

data/spec/lib/blacklight/solr_helper_spec.rb

@@ -263,7 +263,31 @@ describe 'Blacklight::SolrHelper' do
       end
     end
 
-    describe "Allow passing :sort when defining facet" do
+    describe "#add_solr_fields_to_query" do
+      let(:blacklight_config) do
+        config = Blacklight::Configuration.new do |config|
+
+          config.add_index_field 'an_index_field', solr_params: { 'hl.alternativeField' => 'field_x'}
+          config.add_show_field 'a_show_field', solr_params: { 'hl.alternativeField' => 'field_y'}
+          config.add_field_configuration_to_solr_request!
+        end
+      end
+
+      subject do
+        solr_parameters = Blacklight::Solr::Request.new
+        
+        add_solr_fields_to_query(solr_parameters, {})
+
+        solr_parameters
+      end
+
+      it "should add any extra solr parameters from index and show fields" do
+        expect(subject[:'f.an_index_field.hl.alternativeField']).to eq "field_x"
+        expect(subject[:'f.a_show_field.hl.alternativeField']).to eq "field_y"
+      end
+    end
+
+    describe "#add_facetting_to_solr" do
 
       let(:blacklight_config) do
          config = Blacklight::Configuration.new
@@ -271,12 +295,13 @@ describe 'Blacklight::SolrHelper' do
          config.add_facet_field 'test_field', :sort => 'count'
          config.add_facet_field 'some-query', :query => {'x' => {:fq => 'some:query' }}, :ex => 'xyz'
          config.add_facet_field 'some-pivot', :pivot => ['a','b'], :ex => 'xyz'
+         config.add_facet_field 'some-field', solr_params: { 'facet.mincount' => 15 }
          config.add_facet_fields_to_solr_request!
 
          config
       end
 
-      it "should return the correct solr parameters" do
+      it "should add sort parameters" do
 
         solr_parameters = Blacklight::Solr::Request.new
         
@@ -296,6 +321,14 @@ describe 'Blacklight::SolrHelper' do
         expect(solr_parameters[:'facet.query']).to include('{!ex=xyz}some:query')
         expect(solr_parameters[:'facet.pivot']).to include('{!ex=xyz}a,b')
       end
+
+      it "should add any additional solr_params" do
+        solr_parameters = Blacklight::Solr::Request.new
+
+        add_facetting_to_solr(solr_parameters, {})
+
+        expect(solr_parameters[:'f.some-field.facet.mincount']).to eq 15
+      end
     end
 
     describe "with a complex parameter environment" do
@@ -1028,11 +1061,11 @@ describe 'Blacklight::SolrHelper' do
         # Okay, this is cheesy, since we included SolrHelper directly
         # into our example groups, we need to set an iVar here, so it will
         # use it. 
-        @response = {"responseHeader" => {"params" => {"facet.limit" => 11}}}        
+        @response = double(params:{"facet.limit" => 11})      
         expect(facet_limit_for("language_facet")).to eq 10
       end
       it "should get from specific field in @response if available" do
-        @response = {"responseHeader" => {"params" => {"facet.limit" => 11,"f.language_facet.facet.limit" => 16}}}
+        @response = double(params: {"facet.limit" => 11,"f.language_facet.facet.limit" => 16})
         expect(facet_limit_for("language_facet")).to eq 15
       end
     end

data/spec/test_app_templates/Gemfile.extra

@@ -0,0 +1,21 @@
+platforms :jruby do
+  gem 'jdbc-sqlite3'
+  gem 'mediashelf-loggable', '>= 0.4.8'
+  gem 'therubyrhino'
+end
+
+platforms :ruby do
+ gem 'sqlite3'
+end
+
+gem 'jquery-rails'
+
+group :test do
+  gem 'rspec-rails', '~> 2.13'
+  gem 'generator_spec'
+  gem 'poltergeist'
+  gem 'simplecov'
+end
+
+gem 'jettywrapper', '>= 1.2.0'
+

data/spec/test_app_templates/lib/generators/test_app_generator.rb

@@ -11,8 +11,13 @@ class TestAppGenerator < Rails::Generators::Base
     end
   end
 
+  def copy_blacklight_test_app_rake_task
+    copy_file "lib/tasks/blacklight_test_app.rake"
+  end
+
   def remove_index 
     remove_file "public/index.html"
+    remove_file 'app/assets/images/rails.png'
   end
 
   def run_blacklight_generator

data/spec/test_app_templates/lib/tasks/blacklight_test_app.rake

@@ -0,0 +1,14 @@
+require 'rspec/core/rake_task'
+
+desc "run the blacklight gem spec"
+gem_home = File.expand_path('../../../../..', __FILE__)
+
+namespace :blacklight_test_app do
+
+  RSpec::Core::RakeTask.new(:spec) do |t|
+    t.pattern = gem_home + '/spec/**/*_spec.rb'
+    t.rspec_opts = "--colour"
+    t.ruby_opts = "-I#{gem_home}/spec"
+  end
+
+end

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

@@ -14,7 +14,7 @@ describe "catalog/constraints" do
   end
 
   it "should render a start over link" do
-    view.should_receive(:search_action_url).with({}).and_return('http://xyz')
+    view.should_receive(:search_action_path).with({}).and_return('http://xyz')
     view.stub(query_has_constraints?: true)
     view.stub(:blacklight_config).and_return(blacklight_config)
     render partial: "catalog/constraints"
@@ -23,7 +23,7 @@ describe "catalog/constraints" do
   end
 
   it "should render a start over link with the current view type" do
-    view.should_receive(:search_action_url).with(view: :xyz).and_return('http://xyz?view=xyz')
+    view.should_receive(:search_action_path).with(view: :xyz).and_return('http://xyz?view=xyz')
     view.stub(query_has_constraints?: true)
     params[:view] = 'xyz'
     view.stub(:blacklight_config).and_return(blacklight_config)

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

@@ -3,7 +3,9 @@ require 'spec_helper'
 describe "catalog/facet_layout" do
 
   let :blacklight_config do
-    Blacklight::Configuration.new
+    Blacklight::Configuration.new do |config|
+      config.facet_fields[facet_field.field] = facet_field
+    end
   end
 
   let :facet_field do

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

@@ -1,60 +1,62 @@
 require 'spec_helper'
 
 describe "catalog/_facets" do
+  let(:blacklight_config) { Blacklight::Configuration.new }
+
   before do
-    @mock_config = Blacklight::Configuration.new
-    view.stub(:blacklight_config => @mock_config)
-  end
-  it "should not have a header if no facets are displayed" do
-    view.stub(:render_facet_partials => '')
-    render
-    expect(rendered).to_not have_selector('h4')
+    view.stub(blacklight_config: blacklight_config)
+    view.stub(:search_action_path) do |*args|
+      catalog_index_url *args
+    end
   end
 
-  it "should have a header" do
-
-      @mock_field_1 = double(:field => 'facet_field_1',
-                       :label => 'label')
-      @mock_display_facet_1 = double(:name => 'facet_field_1', :items => [Blacklight::SolrResponse::Facets::FacetItem.new(:value => 'Value', :hits => 1234)])
-      view.stub(:facet_field_names => [:facet_field_1],
-                :facet_limit_for => 10 )
-
-      @response = double()
-      @response.stub(:facet_by_field_name).with(:facet_field_1) { @mock_display_facet_1 }
-
-    view.stub(:render_facet_partials => '')
-    render
-    expect(rendered).to have_selector('h4')
+  context "without any facet fields" do
+    it "should not have a header if no facets are displayed" do
+      view.stub(:render_facet_partials => '')
+      render
+      expect(rendered).to_not have_selector('h4')
+    end
   end
+  context "with facet fields" do
+
+    let :facet_field do
+      Blacklight::Configuration::FacetField.new(field: 'facet_field_1', label: 'label').normalize!
+    end
 
-  describe "facet display" do
     before do
-      @mock_field_1 = double(:field => 'facet_field_1',
-                       :label => 'label')
-      @mock_display_facet_1 = double(:name => 'facet_field_1', :items => [Blacklight::SolrResponse::Facets::FacetItem.new(:value => 'Value', :hits => 1234)])
-      view.stub(:facet_field_names => [:facet_field_1],
-                :facet_limit_for => 10 )
+      blacklight_config.facet_fields['facet_field_1'] = facet_field
 
-      @response = double()
-      @response.stub(:facet_by_field_name).with(:facet_field_1) { @mock_display_facet_1 }
+        @mock_display_facet_1 = double(:name => 'facet_field_1', sort: nil, offset: nil, :items => [Blacklight::SolrResponse::Facets::FacetItem.new(:value => 'Value', :hits => 1234)])
+        view.stub(:facet_field_names => [:facet_field_1],
+                  :facet_limit_for => 10 )
 
-    end 
+        @response = double()
+        @response.stub(:facet_by_field_name).with(:facet_field_1) { @mock_display_facet_1 }
+    end
 
-    it "should have a(n accessible) header" do
+    it "should have a header" do
+      view.stub(:render_facet_partials => '')
       render
-      expect(rendered).to have_selector('h5')
+      expect(rendered).to have_selector('h4')
     end
 
-    it "should list values" do
-      render
 
-      # The .facet-content class is used by blacklight_range_limit js, and
-      # should be applied to the .panel-collapse div that contains the collapsible
-      # facet content. Please make sure it remains if possible. 
-      expect(rendered).to have_selector('.facet-content a.facet_select')
-      expect(rendered).to have_selector('.facet-content .facet-count')    
-    end
+    describe "facet display" do
+      it "should have a(n accessible) header" do
+        render
+        expect(rendered).to have_selector('h5')
+      end
+
+      it "should list values" do
+        render
 
+        # The .facet-content class is used by blacklight_range_limit js, and
+        # should be applied to the .panel-collapse div that contains the collapsible
+        # facet content. Please make sure it remains if possible. 
+        expect(rendered).to have_selector('.facet-content a.facet_select')
+        expect(rendered).to have_selector('.facet-content .facet-count')    
+      end
+    end
   end
 end
 

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

@@ -0,0 +1,30 @@
+require 'spec_helper'
+
+describe 'catalog/facet.html.erb' do
+  let(:display_facet) { double }
+  let(:blacklight_config) { Blacklight::Configuration.new }
+  before :each do
+    blacklight_config.add_facet_field 'xyz', label: "Facet title"
+    view.stub(:blacklight_config).and_return(blacklight_config)
+    stub_template 'catalog/_facet_pagination.html.erb' => 'pagination'
+    assign :facet, blacklight_config.facet_fields['xyz']
+    assign :display_facet, display_facet
+  end
+
+  it "should have the facet title" do
+    view.stub(:render_facet_limit)
+    render
+    expect(rendered).to have_selector 'h3', text: "Facet title"
+  end
+
+  it "should render facet pagination" do
+    view.stub(:render_facet_limit)
+    render
+    expect(rendered).to have_content 'pagination'
+  end
+
+  it "should render the facet limit" do
+    view.should_receive(:render_facet_limit).with(display_facet, layout: false)
+    render
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 5.0.3
+  version: 5.1.0
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -17,7 +17,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-13 00:00:00.000000000 Z
+date: 2014-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -81,6 +81,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.6
+- !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
@@ -151,34 +165,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: capybara
-  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'
-- !ruby/object:Gem::Dependency
-  name: poltergeist
-  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'
 - !ruby/object:Gem::Dependency
   name: engine_cart
   requirement: !ruby/object:Gem::Requirement
@@ -469,7 +455,9 @@ files:
 - spec/support/features.rb
 - spec/support/features/session_helpers.rb
 - spec/support/include_text.rb
+- spec/test_app_templates/Gemfile.extra
 - spec/test_app_templates/lib/generators/test_app_generator.rb
+- spec/test_app_templates/lib/tasks/blacklight_test_app.rake
 - spec/views/catalog/_constraints.html.erb_spec.rb
 - spec/views/catalog/_constraints_element.html.erb_spec.rb
 - spec/views/catalog/_document.html.erb_spec.rb
@@ -485,9 +473,9 @@ files:
 - spec/views/catalog/_sort_and_per_page.html.erb_spec.rb
 - spec/views/catalog/_thumbnail_default.erb_spec.rb
 - spec/views/catalog/_view_type_group.html.erb_spec.rb
+- spec/views/catalog/facet.html.erb_spec.rb
 - spec/views/catalog/index.atom.builder_spec.rb
 - spec/views/catalog/index.html.erb_spec.rb
-- spec/views/catalog/opensearch.xml.builder_spec.rb
 - spec/views/catalog/show.html.erb_spec.rb
 - tasks/blacklight.rake
 homepage: http://projectblacklight.org/
@@ -510,7 +498,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Blacklight provides a discovery interface for any Solr (http://lucene.apache.org/solr)
@@ -572,7 +560,9 @@ test_files:
 - spec/support/features.rb
 - spec/support/features/session_helpers.rb
 - spec/support/include_text.rb
+- spec/test_app_templates/Gemfile.extra
 - spec/test_app_templates/lib/generators/test_app_generator.rb
+- spec/test_app_templates/lib/tasks/blacklight_test_app.rake
 - spec/views/catalog/_constraints.html.erb_spec.rb
 - spec/views/catalog/_constraints_element.html.erb_spec.rb
 - spec/views/catalog/_document.html.erb_spec.rb
@@ -588,7 +578,7 @@ test_files:
 - spec/views/catalog/_sort_and_per_page.html.erb_spec.rb
 - spec/views/catalog/_thumbnail_default.erb_spec.rb
 - spec/views/catalog/_view_type_group.html.erb_spec.rb
+- spec/views/catalog/facet.html.erb_spec.rb
 - spec/views/catalog/index.atom.builder_spec.rb
 - spec/views/catalog/index.html.erb_spec.rb
-- spec/views/catalog/opensearch.xml.builder_spec.rb
 - spec/views/catalog/show.html.erb_spec.rb