blacklight 5.11.3 → 5.12.0

data/spec/lib/blacklight/solr_response_spec.rb

@@ -28,13 +28,13 @@ describe Blacklight::SolrResponse do
   end
 
   it 'should provide facet helpers' do
-    expect(r.facets.size).to eq 2
+    expect(r.aggregations.size).to eq 2
 
-    field_names = r.facets.collect{|facet|facet.name}
+    field_names = r.aggregations.collect{|key, facet|facet.name}
     expect(field_names.include?('cat')).to be true
     expect(field_names.include?('manu')).to be  true
 
-    first_facet = r.facets.select { |x| x.name == 'cat'}.first
+    first_facet = r.aggregations['cat']
     expect(first_facet.name).to eq 'cat'
 
     expect(first_facet.items.size).to eq 10
@@ -46,7 +46,7 @@ describe Blacklight::SolrResponse do
 
     expect(received).to eq expected
 
-    r.facets.each do |facet|
+    r.aggregations.each do |key, facet|
       expect(facet).to respond_to :name
       expect(facet).to respond_to :sort
       expect(facet).to respond_to :offset
@@ -70,14 +70,6 @@ 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 = double(:human => 'xyz')
-
-    allow(r.docs.first).to receive(: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)
@@ -115,7 +107,7 @@ describe Blacklight::SolrResponse do
 
   it 'should return the correct value when calling facet_by_field_name' do
     r = create_response
-    facet = r.facet_by_field_name('cat')
+    facet = r.aggregations['cat']
     expect(facet.name).to eq 'cat'
   end
 

data/spec/lib/document_presenter_spec.rb

@@ -3,10 +3,17 @@ require 'spec_helper'
 describe Blacklight::DocumentPresenter do
   include Capybara::RSpecMatchers
   let(:request_context) { double(:add_facet_params => '') }
-  let(:document) { double }
   let(:config) { Blacklight::Configuration.new }
 
   subject { Blacklight::DocumentPresenter.new(document, request_context, config) }
+  
+  let(:document) do
+    SolrDocument.new(id: 1, 
+                     'link_to_search_true' => 'x', 
+                     'link_to_search_named' => 'x',
+                     'qwer' => 'document qwer value',
+                     'mnbv' => 'document mnbv value')
+  end
 
   describe "render_index_field_value" do
     let(:config) do 
@@ -20,23 +27,21 @@ describe Blacklight::DocumentPresenter do
         config.add_index_field 'explicit_accessor', :accessor => :solr_doc_accessor
         config.add_index_field 'explicit_accessor_with_arg', :accessor => :solr_doc_accessor_with_arg
         config.add_index_field 'alias', field: 'qwer'
+        config.add_index_field 'with_default', default: 'value'
       end
     end
     it "should check for an explicit value" do
-      expect(document).to_not receive(:get).with('asdf', :sep => nil)
       value = subject.render_index_field_value 'asdf', :value => 'asdf'
       expect(value).to eq 'asdf'
     end
 
     it "should check for a helper method to call" do
-      allow(document).to receive(:get).with('asdf', :sep => nil)
       allow(request_context).to receive(:render_asdf_index_field).and_return('custom asdf value')
       value = subject.render_index_field_value 'asdf'
       expect(value).to eq 'custom asdf value'
     end
 
     it "should check for a link_to_search" do
-      allow(document).to receive(:get).with('link_to_search_true', :sep => nil).and_return('x')
       allow(request_context).to receive(:add_facet_params).and_return(:f => { :link_to_search_true => ['x'] })
       allow(request_context).to receive(:search_action_path).with(:f => { :link_to_search_true => ['x'] }).and_return('/foo')
       allow(request_context).to receive(:link_to).with("x", '/foo').and_return('bar')
@@ -45,7 +50,6 @@ describe Blacklight::DocumentPresenter do
     end
 
     it "should check for a link_to_search with a field name" do
-      allow(document).to receive(:get).with('link_to_search_named', :sep => nil).and_return('x')
       allow(request_context).to receive(:add_facet_params).and_return(:f => { :some_field => ['x'] })
       allow(request_context).to receive(:search_action_path).with(:f => { :some_field => ['x'] }).and_return('/foo')
       allow(request_context).to receive(:link_to).with("x", '/foo').and_return('bar')
@@ -54,14 +58,12 @@ describe Blacklight::DocumentPresenter do
     end
 
     it "should gracefully handle when no highlight field is available" do
-      expect(document).to_not receive(:get)
       allow(document).to receive(:has_highlight_field?).and_return(false)
       value = subject.render_index_field_value 'highlight'
       expect(value).to be_blank
     end
 
     it "should check for a highlighted field" do
-      expect(document).to_not receive(:get)
       allow(document).to receive(:has_highlight_field?).and_return(true)
       allow(document).to receive(:highlight_field).with('highlight').and_return(['<em>highlight</em>'.html_safe])
       value = subject.render_index_field_value 'highlight'
@@ -69,40 +71,42 @@ describe Blacklight::DocumentPresenter do
     end
 
     it "should check the document field value" do
-      allow(document).to receive(:get).with('qwer', :sep => nil).and_return('document qwer value')
       value = subject.render_index_field_value 'qwer'
       expect(value).to eq 'document qwer value'
     end
 
     it "should work with index fields that aren't explicitly defined" do
-      allow(document).to receive(:get).with('mnbv', :sep => nil).and_return('document mnbv value')
       value = subject.render_index_field_value 'mnbv'
       expect(value).to eq 'document mnbv value'
     end
 
     it "should call an accessor on the solr document" do
-      allow(document).to receive_messages(:solr_doc_accessor => "123")
+      allow(document).to receive_messages(solr_doc_accessor: "123")
       value = subject.render_index_field_value 'solr_doc_accessor'
       expect(value).to eq "123"
     end
 
     it "should call an explicit accessor on the solr document" do
-      allow(document).to receive_messages(:solr_doc_accessor => "123")
+      allow(document).to receive_messages(solr_doc_accessor: "123")
       value = subject.render_index_field_value 'explicit_accessor'
       expect(value).to eq "123"
     end
-
-    it "should call an implicit accessor on the solr document" do
-      expect(document).to receive(:solr_doc_accessor_with_arg).with('explicit_accessor_with_arg').and_return("123")
+    
+    it "should call an accessor on the solr document with the field as an argument" do
+      allow(document).to receive(:solr_doc_accessor_with_arg).with('explicit_accessor_with_arg').and_return("123")
       value = subject.render_index_field_value 'explicit_accessor_with_arg'
       expect(value).to eq "123"
     end
 
     it "should support solr field configuration" do
-      allow(document).to receive(:get).with('qwer', :sep => nil).and_return('document qwer value')
       value = subject.render_index_field_value 'alias'
       expect(value).to eq "document qwer value"
     end
+    
+    it "should support default values in the field configuration" do
+      value = subject.render_index_field_value 'with_default'
+      expect(value).to eq "value"
+    end
   end
   
   describe "render_document_show_field_value" do
@@ -121,21 +125,18 @@ describe Blacklight::DocumentPresenter do
     end
 
     it "should check for an explicit value" do
-      expect(document).to_not receive(:get).with('asdf', :sep => nil)
       expect(request_context).to_not receive(:render_asdf_document_show_field)
       value = subject.render_document_show_field_value 'asdf', :value => 'val1'
       expect(value).to eq 'val1'
     end
 
     it "should check for a helper method to call" do
-      allow(document).to receive(:get).with('asdf', :sep => nil)
       allow(request_context).to receive(:render_asdf_document_show_field).and_return('custom asdf value')
       value = subject.render_document_show_field_value 'asdf'
       expect(value).to eq 'custom asdf value'
     end
 
     it "should check for a link_to_search" do
-      allow(document).to receive(:get).with('link_to_search_true', :sep => nil).and_return('x')
       allow(request_context).to receive(:search_action_path).with('').and_return('/foo')
       allow(request_context).to receive(:link_to).with("x", '/foo').and_return('bar')
       value = subject.render_document_show_field_value 'link_to_search_true'
@@ -143,7 +144,6 @@ describe Blacklight::DocumentPresenter do
     end
 
     it "should check for a link_to_search with a field name" do
-      allow(document).to receive(:get).with('link_to_search_named', :sep => nil).and_return('x')
       allow(request_context).to receive(:search_action_path).with('').and_return('/foo')
       allow(request_context).to receive(:link_to).with("x", '/foo').and_return('bar')
       value = subject.render_document_show_field_value 'link_to_search_named'
@@ -151,14 +151,12 @@ describe Blacklight::DocumentPresenter do
     end
 
     it "should gracefully handle when no highlight field is available" do
-      expect(document).to_not receive(:get)
       allow(document).to receive(:has_highlight_field?).and_return(false)
       value = subject.render_document_show_field_value 'highlight'
       expect(value).to be_blank
     end
 
     it "should check for a highlighted field" do
-      expect(document).to_not receive(:get)
       allow(document).to receive(:has_highlight_field?).and_return(true)
       allow(document).to receive(:highlight_field).with('highlight').and_return(['<em>highlight</em>'.html_safe])
       value = subject.render_document_show_field_value 'highlight'
@@ -167,37 +165,35 @@ describe Blacklight::DocumentPresenter do
 
 
     it "should check the document field value" do
-      allow(document).to receive(:get).with('qwer', :sep => nil).and_return('document qwer value')
       value = subject.render_document_show_field_value 'qwer'
       expect(value).to eq 'document qwer value'
     end
 
     it "should work with show fields that aren't explicitly defined" do
-      allow(document).to receive(:get).with('mnbv', :sep => nil).and_return('document mnbv value')
       value = subject.render_document_show_field_value 'mnbv'
       expect(value).to eq 'document mnbv value'
     end
 
     it "should call an accessor on the solr document" do
-      allow(document).to receive_messages(:solr_doc_accessor => "123")
+      allow(document).to receive_messages(solr_doc_accessor: "123")
       value = subject.render_document_show_field_value 'solr_doc_accessor'
       expect(value).to eq "123"
     end
 
     it "should call an explicit accessor on the solr document" do
-      allow(document).to receive_messages(:solr_doc_accessor => "123")
+      allow(document).to receive_messages(solr_doc_accessor: "123")
       value = subject.render_document_show_field_value 'explicit_accessor'
       expect(value).to eq "123"
     end
 
     it "should call an explicit array-style accessor on the solr document" do
-      allow(document).to receive_messages(:solr_doc_accessor => double(:some_method => "123"))
+      allow(document).to receive_message_chain(:solr_doc_accessor, some_method: "123")
       value = subject.render_document_show_field_value 'explicit_array_accessor'
       expect(value).to eq "123"
     end
 
     it "should call an accessor on the solr document with the field as an argument" do
-      expect(document).to receive(:solr_doc_accessor_with_arg).with('explicit_accessor_with_arg').and_return("123")
+      allow(document).to receive(:solr_doc_accessor_with_arg).with('explicit_accessor_with_arg').and_return("123")
       value = subject.render_document_show_field_value 'explicit_accessor_with_arg'
       expect(value).to eq "123"
     end

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

@@ -31,7 +31,7 @@ describe "catalog/_facets" do
                   :facet_limit_for => 10 )
 
         @response = double()
-        allow(@response).to receive(:facet_by_field_name).with("facet_field_1") { @mock_display_facet_1 }
+        allow(@response).to receive(:aggregations).and_return("facet_field_1" => @mock_display_facet_1)
     end
 
     it "should have a header" do

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

@@ -20,20 +20,9 @@ describe "/catalog/_index_default.erb" do
     @fname_3 = "empty_field"
     @fname_4 = "four_field"
     
-    @document = double("solr_doc")
-    allow(@document).to receive(:get).with(@fname_1, hash_including(:sep => nil)).and_return("val_1")
-    allow(@document).to receive(:get).with(@fname_2, hash_including(:sep => nil)).and_return("val_2")
-    allow(@document).to receive(:get).with(@fname_3, hash_including(:sep => nil)).and_return(nil)
-    allow(@document).to receive(:get).with(@fname_4, hash_including(:sep => nil)).and_return("val_4")
-    
-    allow(@document).to receive(:has?).with(@fname_1).and_return(true)
-    allow(@document).to receive(:has?).with(@fname_2).and_return(true)
-    allow(@document).to receive(:has?).with(@fname_3).and_return(false)
-    allow(@document).to receive(:has?).with(@fname_4).and_return(true)
-    
-    # cover any remaining fields in initalizer
-    allow(@document).to receive(:[])
     
+    @document = SolrDocument.new(id: 1, @fname_1 => "val_1", @fname_2 => "val2", @fname_4 => "val_4")
+
     @flabel_1 = "One:"
     @flabel_3 = "Three:"
     @flabel_4 = "Four:"

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

@@ -22,19 +22,7 @@ describe "/catalog/_show_default.html.erb" do
     @fname_3 = "empty_field"
     @fname_4 = "four_field"
     
-    @document = double("solr_doc")
-    allow(@document).to receive(:get).with(@fname_1, hash_including(:sep => nil)).and_return("val_1")
-    allow(@document).to receive(:get).with(@fname_2, hash_including(:sep => nil)).and_return("val_2")
-    allow(@document).to receive(:get).with(@fname_3, hash_including(:sep => nil)).and_return(nil)
-    allow(@document).to receive(:get).with(@fname_4, hash_including(:sep => nil)).and_return("val_4")
-    
-    allow(@document).to receive(:has?).with(@fname_1).and_return(true)
-    allow(@document).to receive(:has?).with(@fname_2).and_return(true)
-    allow(@document).to receive(:has?).with(@fname_3).and_return(false)
-    allow(@document).to receive(:has?).with(@fname_4).and_return(true)
-    
-    # cover any remaining fields in initalizer
-    allow(@document).to receive(:[])
+    @document = SolrDocument.new(id: 1, @fname_1 => "val_1", @fname_2 => "val2", @fname_4 => "val_4")
     
     @flabel_1 = "One:"
     @flabel_3 = "Two:"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 5.11.3
+  version: 5.12.0
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -17,7 +17,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-26 00:00:00.000000000 Z
+date: 2015-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -59,14 +59,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: '0.15'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: '0.15'
 - !ruby/object:Gem::Dependency
   name: rsolr
   requirement: !ruby/object:Gem::Requirement
@@ -314,6 +314,7 @@ files:
 - app/views/blacklight/nav/_bookmark.html.erb
 - app/views/blacklight/nav/_saved_searches.html.erb
 - app/views/blacklight/nav/_search_history.html.erb
+- app/views/bookmarks/_clear_bookmarks_widget.html.erb
 - app/views/bookmarks/_tools.html.erb
 - app/views/bookmarks/index.html.erb
 - app/views/catalog/_bookmark_control.html.erb
@@ -452,6 +453,7 @@ files:
 - lib/blacklight/solr/facet_paginator.rb
 - lib/blacklight/solr/request.rb
 - lib/blacklight/solr/search_builder.rb
+- lib/blacklight/solr/search_builder_behavior.rb
 - lib/blacklight/solr_helper.rb
 - lib/blacklight/solr_repository.rb
 - lib/blacklight/solr_response.rb
@@ -471,6 +473,7 @@ files:
 - lib/generators/blacklight/document_generator.rb
 - lib/generators/blacklight/install_generator.rb
 - lib/generators/blacklight/models_generator.rb
+- lib/generators/blacklight/search_builder_generator.rb
 - lib/generators/blacklight/templates/alternate_controller.rb
 - lib/generators/blacklight/templates/blacklight.css.scss
 - lib/generators/blacklight/templates/blacklight.en.yml
@@ -478,6 +481,7 @@ files:
 - lib/generators/blacklight/templates/config/blacklight.yml
 - lib/generators/blacklight/templates/config/initializers/blacklight_initializer.rb
 - lib/generators/blacklight/templates/config/jetty.yml
+- lib/generators/blacklight/templates/search_builder.rb
 - lib/generators/blacklight/templates/solr_document.rb
 - lib/generators/blacklight/test_support_generator.rb
 - lib/generators/blacklight/user_generator.rb
@@ -518,6 +522,7 @@ files:
 - spec/lib/blacklight/document/dublin_core_spec.rb
 - spec/lib/blacklight/document/email_spec.rb
 - spec/lib/blacklight/document/sms_spec.rb
+- spec/lib/blacklight/document_spec.rb
 - spec/lib/blacklight/facet_paginator_spec.rb
 - spec/lib/blacklight/facet_spec.rb
 - spec/lib/blacklight/routes_spec.rb
@@ -637,6 +642,7 @@ test_files:
 - spec/lib/blacklight/document/dublin_core_spec.rb
 - spec/lib/blacklight/document/email_spec.rb
 - spec/lib/blacklight/document/sms_spec.rb
+- spec/lib/blacklight/document_spec.rb
 - spec/lib/blacklight/facet_paginator_spec.rb
 - spec/lib/blacklight/facet_spec.rb
 - spec/lib/blacklight/routes_spec.rb