blacklight 6.0.0.pre3 → 6.0.0.pre4

data/spec/features/facets_spec.rb

@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 require 'spec_helper'
 
 describe "Facets" do

data/spec/features/record_view_spec.rb

@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 require 'spec_helper'
 
 describe "Record View" do

data/spec/features/search_context_spec.rb

@@ -1,5 +1,3 @@
-# -*- encoding : utf-8 -*-
-
 require 'spec_helper'
 
 describe "Search Results context", js: true do

data/spec/features/search_formats_spec.rb

@@ -1,5 +1,3 @@
-# -*- encoding : utf-8 -*-
-
 require 'spec_helper'
 
 describe "Search Formats" do

data/spec/features/search_pagination_spec.rb

@@ -1,5 +1,3 @@
-# -*- encoding : utf-8 -*-
-
 require 'spec_helper'
 
 describe "Search Pagination" do

data/spec/features/search_results_spec.rb

@@ -1,5 +1,3 @@
-# -*- encoding : utf-8 -*-
-
 require 'spec_helper'
 
 describe "Search Results" do

data/spec/features/search_spec.rb

@@ -1,5 +1,3 @@
-# -*- encoding : utf-8 -*-
-
 require 'spec_helper'
 
 describe "Search Page" do

data/spec/helpers/blacklight_helper_spec.rb

@@ -238,13 +238,13 @@ describe BlacklightHelper do
 
   describe "render_grouped_response?" do
     it "should check if the response ivar contains grouped data" do
-      assign(:response, double("SolrResponse", :grouped? => true))
+      assign(:response, double("Solr::Response", :grouped? => true))
       expect(helper.render_grouped_response?).to be true
     end
 
 
     it "should check if the response param contains grouped data" do
-      response = double("SolrResponse", :grouped? => true)
+      response = double("Solr::Response", :grouped? => true)
       expect(helper.render_grouped_response?(response)).to be true
     end
   end
@@ -284,15 +284,6 @@ describe BlacklightHelper do
       allow(helper).to receive(:document_partial_name).with(doc, :xyz)
       helper.render_document_partial(doc, :xyz)    
     end
-    
-    context "with a 1-arg form of document_partial_name" do
-      it "should only call the 1-arg form of the document_partial_name" do
-        allow(helper).to receive(:method).with(:document_partial_name).and_return(double(arity: 1))
-        allow(helper).to receive(:document_partial_name).with(doc)
-        allow(Deprecation).to receive(:warn)
-        helper.render_document_partial(doc, nil)
-      end
-    end
   end
 
   describe "#document_partial_name" do
@@ -394,7 +385,7 @@ describe BlacklightHelper do
 
     before do
       allow(helper).to receive(:blacklight_config).and_return(CatalogController.blacklight_config)
-      assign(:response, double("SolrResponse", grouped?: false, start: 0))
+      assign(:response, double("Solr::Response", grouped?: false, start: 0))
       allow(helper).to receive(:link_to_document).and_return('<a/>')
       allow(helper).to receive(:render_index_doc_actions).and_return('<div/>')
     end

data/spec/helpers/catalog_helper_spec.rb

@@ -226,6 +226,14 @@ describe CatalogHelper do
 
       expect(helper.render_thumbnail_tag document).to be_nil
     end
+
+    it "should return nil if no thumbnail is in the document" do
+      allow(helper).to receive_messages(:blacklight_config => Blacklight::Configuration.new(:index => Blacklight::OpenStructWithHashAccess.new(:thumbnail_field => :xyz) ))
+
+      allow(document).to receive(:has?).with(:xyz).and_return(false)
+
+      expect(helper.render_thumbnail_tag document).to be_nil
+    end
   end
 
   describe "thumbnail_url" do

data/spec/helpers/layout_helper_spec.rb

@@ -28,4 +28,11 @@ describe LayoutHelper do
       expect(helper.sidebar_classes).to eq 'col-md-3 col-sm-4'
     end
   end
+
+  describe '#container_classes' do
+    it 'returns a string of classe(s)' do
+      expect(helper.container_classes).to be_an String
+      expect(helper.container_classes).to eq 'container'
+    end
+  end
 end

data/spec/helpers/url_helper_spec.rb

@@ -182,13 +182,6 @@ describe BlacklightUrlHelper do
       expect(helper.link_to_document(@document, :title_display)).to have_selector("a", :text => '654321', :count => 1)
     end
 
-    it "should have the old deprecated behavior (second argument is a hash)" do
-      data = {'id'=>'123456','title_display'=>['654321'] }
-      @document = SolrDocument.new(data)
-      expect(Deprecation).to receive(:warn)
-      expect(helper.link_to_document(@document, { :label => "title_display" })).to have_selector("a", :text => 'title_display', :count => 1)
-    end
-
     it "should accept and return a string label" do
       data = {'id'=>'123456','title_display'=>['654321'] }
       @document = SolrDocument.new(data)

data/spec/lib/tasks/blacklight_task_spec.rb

@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 require 'spec_helper'
 require 'rake'
 

data/spec/models/record_mailer_spec.rb

@@ -1,6 +1,4 @@
-# -*- encoding : utf-8 -*-
-
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'spec_helper'
 
 describe RecordMailer do
   before(:each) do

data/spec/models/search_spec.rb

@@ -1,5 +1,4 @@
-# -*- encoding : utf-8 -*-
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'spec_helper'
 
 describe Search do
   describe "query_params" do

data/spec/models/solr_document_spec.rb

@@ -1,33 +1,31 @@
-# -*- encoding : utf-8 -*-
+require 'spec_helper'
 
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-
-  describe SolrDocument do
+describe SolrDocument do
+  
+  before(:each) do
     
-    before(:each) do
-      
-      @solrdoc = SolrDocument.new :id => '00282214', :format => ['Book'], :title_display => 'some-title'
+    @solrdoc = SolrDocument.new :id => '00282214', :format => ['Book'], :title_display => 'some-title'
+
+  end
+  
+  describe "new" do
+    it "should take a Hash as the argument" do
+      expect { SolrDocument.new(:id => 1) }.not_to raise_error
+    end
+  end
+  
+  describe "access methods" do
 
+    it "should have the right value for title_display" do
+      expect(@solrdoc[:title_display]).not_to be_nil
     end
     
-    describe "new" do
-      it "should take a Hash as the argument" do
-        expect { SolrDocument.new(:id => 1) }.not_to raise_error
-      end
+    it "should have the right value for format" do
+      expect(@solrdoc[:format][0]).to eq 'Book'
     end
     
-    describe "access methods" do
-
-      it "should have the right value for title_display" do
-        expect(@solrdoc[:title_display]).not_to be_nil
-      end
-      
-      it "should have the right value for format" do
-        expect(@solrdoc[:format][0]).to eq 'Book'
-      end
-      
-      it "should provide the item's solr id" do
-        expect(@solrdoc.id).to eq '00282214'
-      end
+    it "should provide the item's solr id" do
+      expect(@solrdoc.id).to eq '00282214'
     end
+  end
 end

data/spec/presenters/document_presenter_spec.rb

@@ -300,12 +300,6 @@ describe Blacklight::DocumentPresenter do
       expect(subject.render_field_value(['a', 'b'])).to eq "a and b"
     end
 
-    it "should use the separator from the Blacklight field configuration by default" do
-      Deprecation.silence(Blacklight::DocumentPresenter) do
-        expect(subject.render_field_value(['c', 'd'], double(separator: '; ', itemprop: nil, separator_options: nil))).to eq "c; d"
-      end
-    end
-
     it "should use the field_config.separator_options from the Blacklight field configuration" do
       expect(subject.render_field_value(['c', 'd'], double(separator: nil, itemprop: nil, separator_options: { two_words_connector: '; '}))).to eq "c; d"
     end
@@ -358,4 +352,32 @@ describe Blacklight::DocumentPresenter do
       expect(subject.document_show_html_title).to eq "value"
     end
   end
+
+  describe '#get_field_values' do
+    context 'for a field with the helper_method option' do
+      let(:field_name) { 'field_with_helper' }
+      let(:field_config) { config.add_facet_field 'field_with_helper', helper_method: 'render_field_with_helper' }
+
+      before do
+        document['field_with_helper'] = 'value'
+      end
+
+      it "should check call the helper method with arguments" do
+        allow(request_context).to receive(:render_field_with_helper) do |*args|
+          args.first
+        end
+
+        render_options = { a: 1 }
+
+        options = subject.get_field_values field_name, field_config, a: 1
+
+        expect(options).to include :document, :field, :value, :config, :a
+        expect(options[:document]).to eq document
+        expect(options[:field]).to eq 'field_with_helper'
+        expect(options[:value]).to eq 'value'
+        expect(options[:config]).to eq field_config
+        expect(options[:a]).to eq 1
+      end
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 # This file is copied to spec/ when you run 'rails generate rspec:install'
 # Has been customized by Blacklight to work when application is in one place,
 # and actual spec/ stuff is in another (the blacklight gem checkout).  

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

@@ -9,9 +9,12 @@ describe "catalog/_document" do
     Blacklight::Configuration.new
   end
 
-  it "should render the header, thumbnail and index by default" do
+  before do
     allow(view).to receive(:render_grouped_response?).and_return(false)
     allow(view).to receive(:blacklight_config).and_return(blacklight_config)
+  end
+
+  it "should render the header, thumbnail and index by default" do
     stub_template "catalog/_index_header_default.html.erb" => "document_header"
     stub_template "catalog/_thumbnail_default.html.erb" => "thumbnail_default"
     stub_template "catalog/_index_default.html.erb" => "index_default"
@@ -25,8 +28,6 @@ describe "catalog/_document" do
 
 
   it "should use the index.partials parameter to determine the partials to render" do
-    allow(view).to receive(:render_grouped_response?).and_return(false)
-    allow(view).to receive(:blacklight_config).and_return(blacklight_config)
     blacklight_config.index.partials = ['a', 'b', 'c']
     stub_template "catalog/_a_default.html.erb" => "a_partial"
     stub_template "catalog/_b_default.html.erb" => "b_partial"
@@ -36,4 +37,20 @@ describe "catalog/_document" do
     expect(rendered).to match /b_partial/
     expect(rendered).to match /c_partial/
   end
+
+  it 'has a css class with the document position' do
+    allow(view).to receive(:render_document_partials)
+
+    render partial: 'catalog/document', locals: { document: document, document_counter: 5 }
+
+    expect(rendered).to have_selector 'div.document-position-5'
+  end
+
+  it 'has a data attribute with the document position' do
+    allow(view).to receive(:render_document_partials)
+
+    render partial: 'catalog/document', locals: { document: document, document_counter: 5 }
+
+    expect(rendered).to have_selector 'div.document[@data-document-counter="5"]'
+  end
 end

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

@@ -14,7 +14,7 @@ describe "catalog/_sort_and_per_page" do
   end
 
   it "should render the pagination, sort, per page and view type controls" do
-    assign(:response, double("SolrResponse", limit_value: 1))
+    assign(:response, double("Solr::Response", limit_value: 1))
     stub_template "catalog/_paginate_compact.html.erb" => "paginate_compact"
     stub_template "catalog/_sort_widget.html.erb" => "sort_widget"
     stub_template "catalog/_per_page_widget.html.erb" => "per_page_widget"
@@ -27,7 +27,7 @@ describe "catalog/_sort_and_per_page" do
   end
 
   it "should not render the pagination controls with bad limit values" do
-    assign(:response, double("SolrResponse", limit_value: 0))
+    assign(:response, double("Solr::Response", limit_value: 0))
     stub_template "catalog/_paginate_compact.html.erb" => "paginate_compact"
     stub_template "catalog/_sort_widget.html.erb" => "sort_widget"
     stub_template "catalog/_per_page_widget.html.erb" => "per_page_widget"

data/spec/views/catalog/facet.json.jbuilder_spec.rb

@@ -0,0 +1,9 @@
+require 'spec_helper'
+describe "catalog/facet.json" do
+  it "renders facet json" do
+    assign :pagination, { items: [{ value: 'Book' }] }
+    render template: "catalog/facet.json", format: :json
+    hash = JSON.parse(rendered)
+    expect(hash).to eq('response' => { 'facets' => { 'items' => [{ 'value' => 'Book' }] } })
+  end
+end

data/spec/views/catalog/index.json.jbuilder_spec.rb

@@ -0,0 +1,30 @@
+require 'spec_helper'
+describe "catalog/index.json" do
+  let(:response) { double("response") }
+  let(:docs) { [{ id: '123', title_t: 'Book1' }, { id: '456', title_t: 'Book2' }] }
+  let(:facets) { double("facets") }
+  let(:config) { double("config") }
+  let(:presenter) { Blacklight::JsonPresenter.new(response, docs, facets, config) }
+
+  it "renders index json" do
+    allow(presenter).to receive(:pagination_info).and_return({ current_page: 1, next_page: 2,
+                                                               prev_page: nil })
+    allow(presenter).to receive(:search_facets_as_json).and_return(
+          [{ name: "format", label: "Format",
+             items: [{ value: 'Book', hits: 30, label: 'Book' }] }])
+    assign :presenter, presenter
+    render template: "catalog/index.json", format: :json
+    hash = JSON.parse(rendered)
+    expect(hash).to eq('response' => { 'docs' => [{ 'id' => '123', 'title_t' => 'Book1' },
+                                                  { 'id' => '456', 'title_t' => 'Book2' }],
+                                       'facets' => [{ 'name' => "format", 'label' => "Format",
+                                                      'items' => [
+                                                        { 'value' => 'Book',
+                                                          'hits' => 30,
+                                                          'label' => 'Book' }] }],
+                                       'pages' => { 'current_page' =>  1,
+                                                    'next_page' => 2,
+                                                    'prev_page' => nil } }
+                      )
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 6.0.0.pre3
+  version: 6.0.0.pre4
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -15,9 +15,9 @@ authors:
 - Naomi Dushay
 - Justin Coyne
 autorequire: 
-bindir: bin
+bindir: exe
 cert_chain: []
-date: 2015-11-08 00:00:00.000000000 Z
+date: 2015-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -315,6 +315,7 @@ files:
 - app/controllers/concerns/blacklight/search_helper.rb
 - app/controllers/concerns/blacklight/suggest.rb
 - app/controllers/concerns/blacklight/suggest_search.rb
+- app/controllers/concerns/blacklight/token_based_user.rb
 - app/controllers/saved_searches_controller.rb
 - app/controllers/search_history_controller.rb
 - app/controllers/suggest_controller.rb
@@ -357,20 +358,14 @@ files:
 - app/models/concerns/blacklight/document/semantic_fields.rb
 - app/models/concerns/blacklight/document/sms.rb
 - app/models/concerns/blacklight/solr/document.rb
-- app/models/concerns/blacklight/solr/document/dublin_core.rb
-- app/models/concerns/blacklight/solr/document/email.rb
-- app/models/concerns/blacklight/solr/document/export.rb
-- app/models/concerns/blacklight/solr/document/extensions.rb
 - app/models/concerns/blacklight/solr/document/more_like_this.rb
-- app/models/concerns/blacklight/solr/document/schema_org.rb
-- app/models/concerns/blacklight/solr/document/sms.rb
 - app/models/concerns/blacklight/suggest/response.rb
-- app/models/concerns/blacklight/token_based_user.rb
 - app/models/concerns/blacklight/user.rb
 - app/models/record_mailer.rb
 - app/models/search.rb
 - app/models/solr_document.rb
 - app/presenters/blacklight/document_presenter.rb
+- app/presenters/blacklight/json_presenter.rb
 - app/views/_flash_msg.html.erb
 - app/views/_user_util_links.html.erb
 - app/views/blacklight/nav/_bookmark.html.erb
@@ -425,11 +420,12 @@ files:
 - app/views/catalog/citation.html.erb
 - app/views/catalog/citation.js.erb
 - app/views/catalog/email.html.erb
-- app/views/catalog/email_sent.html.erb
 - app/views/catalog/email_success.html.erb
 - app/views/catalog/facet.html.erb
+- app/views/catalog/facet.json.jbuilder
 - app/views/catalog/index.atom.builder
 - app/views/catalog/index.html.erb
+- app/views/catalog/index.json.jbuilder
 - app/views/catalog/index.rss.builder
 - app/views/catalog/opensearch.json.erb
 - app/views/catalog/opensearch.xml.builder
@@ -437,7 +433,6 @@ files:
 - app/views/catalog/show.html.erb
 - app/views/catalog/show.refworks.erb
 - app/views/catalog/sms.html.erb
-- app/views/catalog/sms_sent.html.erb
 - app/views/catalog/sms_success.html.erb
 - app/views/kaminari/blacklight/_first_page.html.erb
 - app/views/kaminari/blacklight/_gap.html.erb
@@ -479,7 +474,6 @@ files:
 - lib/blacklight/configuration/field.rb
 - lib/blacklight/configuration/fields.rb
 - lib/blacklight/configuration/search_field.rb
-- lib/blacklight/configuration/solr_field.rb
 - lib/blacklight/configuration/sort_field.rb
 - lib/blacklight/configuration/tool_config.rb
 - lib/blacklight/configuration/view_config.rb
@@ -511,6 +505,8 @@ files:
 - lib/generators/blacklight/install_generator.rb
 - lib/generators/blacklight/models_generator.rb
 - lib/generators/blacklight/search_builder_generator.rb
+- lib/generators/blacklight/solr4_generator.rb
+- lib/generators/blacklight/solr5_generator.rb
 - lib/generators/blacklight/templates/alternate_controller.rb
 - lib/generators/blacklight/templates/blacklight.css.scss
 - lib/generators/blacklight/templates/blacklight.en.yml
@@ -638,8 +634,10 @@ files:
 - 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/facet.json.jbuilder_spec.rb
 - spec/views/catalog/index.atom.builder_spec.rb
 - spec/views/catalog/index.html.erb_spec.rb
+- spec/views/catalog/index.json.jbuilder_spec.rb
 - spec/views/catalog/opensearch.xml.builder_spec.rb
 - spec/views/catalog/show.html.erb_spec.rb
 - tasks/blacklight.rake
@@ -654,9 +652,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">"
@@ -768,7 +766,9 @@ test_files:
 - 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/facet.json.jbuilder_spec.rb
 - spec/views/catalog/index.atom.builder_spec.rb
 - spec/views/catalog/index.html.erb_spec.rb
+- spec/views/catalog/index.json.jbuilder_spec.rb
 - spec/views/catalog/opensearch.xml.builder_spec.rb
 - spec/views/catalog/show.html.erb_spec.rb