blacklight 3.6.1.1 → 3.7.0

data/test_support/spec/helpers/search_history_constraints_helper_spec.rb

@@ -12,6 +12,9 @@ describe SearchHistoryConstraintsHelper do
     end
   end
 
+  before(:each) do
+    helper.stub(:blacklight_config).and_return(@config)
+  end
 
   describe "render_search_to_s_*" do
     describe "render_search_to_s_element" do

data/test_support/spec/lib/solr_helper_spec.rb

@@ -79,7 +79,8 @@ describe 'Blacklight::SolrHelper' do
         @produced_params[:rows].should == 10
       end
       it 'should have default facet fields' do
-        @produced_params[:"facet.field"].should == blacklight_config[:default_solr_params][:"facet.field"]
+        # remove local params from the facet.field
+        @produced_params[:"facet.field"].map { |x| x.gsub(/\{![^}]+\}/, '') }.should == blacklight_config.facet_fields_to_add_to_solr
       end
       
       it "should have default qt"  do
@@ -116,7 +117,6 @@ describe 'Blacklight::SolrHelper' do
 
         solr_params[:q].should be_blank
         solr_params["spellcheck.q"].should be_blank
-        solr_params[:"facet.field"].should == blacklight_config[:default_solr_params][:"facet.field"]
 
         @single_facet.each_value do |value|
           solr_params[:fq].should include("{!raw f=#{@single_facet.keys[0]}}#{value}")
@@ -154,7 +154,12 @@ describe 'Blacklight::SolrHelper' do
       end
     end
 
-    describe "facet_value_to_fq_string", :focus => true do
+    describe "facet_value_to_fq_string" do
+
+      let :blacklight_config do
+         Blacklight::Configuration.new
+      end
+
       it "should use the raw handler for strings" do
         facet_value_to_fq_string("facet_name", "my value").should  == "{!raw f=facet_name}my value" 
       end
@@ -183,9 +188,22 @@ describe 'Blacklight::SolrHelper' do
         facet_value_to_fq_string("facet_name", "1.11").should  == "facet_name:1.11"
       end
 
+      it "should pass date-type fields through" do
+        blacklight_config.facet_fields.stub(:[]).with('facet_name').and_return(mock(:date => true, :query => nil, :tag => nil))
+
+        facet_value_to_fq_string("facet_name", "2012-01-01").should  == "facet_name:2012-01-01"
+      end
+
       it "should handle range requests" do
         facet_value_to_fq_string("facet_name", 1..5).should  == "facet_name:[1 TO 5]"
       end
+
+      it "should add tag local parameters" do
+        blacklight_config.facet_fields.stub(:[]).with('facet_name').and_return(mock(:query => nil, :tag => 'asdf', :date => nil))
+
+        facet_value_to_fq_string("facet_name", true).should  == "{!tag=asdf}facet_name:true"
+        facet_value_to_fq_string("facet_name", "my value").should  == "{!raw f=facet_name tag=asdf}my value"
+      end
     end
 
     describe "solr parameters for a field search from config (subject)" do
@@ -213,9 +231,7 @@ describe 'Blacklight::SolrHelper' do
       it "should include spellcheck.q, without LocalParams" do
         @solr_params["spellcheck.q"].should == "wome"
       end
-      it "should include facet.field from default_solr_params" do
-        @solr_params[:"facet.field"].should == blacklight_config[:default_solr_params][:"facet.field"]
-      end
+
       it "should include spellcheck.dictionary from field def solr_parameters" do
         @solr_params[:"spellcheck.dictionary"].should == "subject"
       end
@@ -241,6 +257,38 @@ describe 'Blacklight::SolrHelper' do
       end
     end
 
+    describe "converts a String fq into an Array" do
+      it "should return the correct overriden parameter" do
+        solr_parameters = {:fq => 'a string' }
+        
+        add_facet_fq_to_solr(solr_parameters, {})
+
+        solr_parameters[:fq].should be_a_kind_of Array
+      end
+    end
+
+    describe "Allow passing :sort when defining facet" do
+
+      let(:blacklight_config) do
+         config = Blacklight::Configuration.new
+
+         config.add_facet_field 'test_field', :sort => 'count'
+         config.add_facet_fields_to_solr_request!
+
+         config
+      end
+
+      it "should return the correct solr parameters" do
+
+        solr_parameters = { }
+        
+        add_facetting_to_solr(solr_parameters, {})
+
+        solr_parameters[:'facet.field'].should include('test_field')
+        solr_parameters[:'f.test_field.facet.sort'].should == 'count'
+      end
+    end
+
     describe "with a complex parameter environment" do
       def blacklight_config          
         config = Blacklight::Configuration.new
@@ -610,7 +658,7 @@ describe 'Blacklight::SolrHelper' do
       @facets.size.should > 1
     end
     it 'should have all facets specified in initializer' do      
-      blacklight_config[:default_solr_params][:"facet.field"].each do |field|
+      blacklight_config.facet_fields_to_add_to_solr.each do |field|
         @facets.find {|f| f.name == field}.should_not be_nil        
       end
     end
@@ -869,7 +917,7 @@ describe 'Blacklight::SolrHelper' do
     end
     it "should handle no facet_limits in config" do
       def blacklight_config
-        config = super.inheritable_copy
+        config = Blacklight::Configuration.new
         config.facet_fields = {}
         return config
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 3.6.1.1
+  version: 3.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -17,7 +17,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-19 00:00:00.000000000 Z
+date: 2012-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -274,7 +274,6 @@ files:
 - app/controllers/bookmarks_controller.rb
 - app/controllers/catalog_controller.rb
 - app/controllers/feedback_controller.rb
-- app/controllers/folder_controller.rb
 - app/controllers/saved_searches_controller.rb
 - app/controllers/search_history_controller.rb
 - app/helpers/blacklight/blacklight_helper_behavior.rb
@@ -311,7 +310,6 @@ files:
 - app/views/catalog/_facet_limit.html.erb
 - app/views/catalog/_facet_pagination.html.erb
 - app/views/catalog/_facets.html.erb
-- app/views/catalog/_folder_control.html.erb
 - app/views/catalog/_home.html.erb
 - app/views/catalog/_home_text.html.erb
 - app/views/catalog/_index_default.html.erb
@@ -365,6 +363,7 @@ files:
 - lib/blacklight/catalog.rb
 - lib/blacklight/configurable.rb
 - lib/blacklight/configuration.rb
+- lib/blacklight/configuration/facet_field.rb
 - lib/blacklight/configuration/fields.rb
 - lib/blacklight/configuration/search_field.rb
 - lib/blacklight/configuration/solr_field.rb
@@ -428,7 +427,6 @@ files:
 - test_support/data/test_data.utf8.mrc
 - test_support/features/bookmarks.feature
 - test_support/features/did_you_mean.feature
-- test_support/features/folder.feature
 - test_support/features/librarian_view.feature
 - test_support/features/record_view.feature
 - test_support/features/saved_searches.feature
@@ -439,7 +437,6 @@ files:
 - test_support/features/search_sort.feature
 - test_support/features/step_definitions/bookmarks_steps.rb
 - test_support/features/step_definitions/error_steps.rb
-- test_support/features/step_definitions/folder_steps.rb
 - test_support/features/step_definitions/general_steps.rb
 - test_support/features/step_definitions/record_view_steps.rb
 - test_support/features/step_definitions/saved_searches_steps.rb
@@ -453,8 +450,8 @@ files:
 - test_support/features/support/paths.rb
 - test_support/features/support/selectors.rb
 - test_support/spec/controllers/application_controller_spec.rb
+- test_support/spec/controllers/bookmarks_controller_spec.rb
 - test_support/spec/controllers/catalog_controller_spec.rb
-- test_support/spec/controllers/folder_controller_spec.rb
 - test_support/spec/controllers/search_history_controller_spec.rb
 - test_support/spec/data/sample_docs.yml
 - test_support/spec/data/test_data.utf8.mrc
@@ -511,7 +508,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3828227521653845396
+      hash: -1006739623696902057
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -520,7 +517,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3828227521653845396
+      hash: -1006739623696902057
 requirements: []
 rubyforge_project: blacklight
 rubygems_version: 1.8.23

data/app/controllers/folder_controller.rb

@@ -1,54 +0,0 @@
-# -*- encoding : utf-8 -*-
-class FolderController < ApplicationController
-  include Blacklight::Configurable
-  include Blacklight::SolrHelper
-
-  copy_blacklight_config_from(CatalogController)
-
-  helper CatalogHelper
-
-  # fetch the documents that match the ids in the folder
-  def index
-    @response, @documents = get_solr_response_for_field_values(SolrDocument.unique_key,session[:folder_document_ids] || [])
-  end
-    
-
-  # add a document_id to the folder. :id of action is solr doc id 
-  def update
-    session[:folder_document_ids] = session[:folder_document_ids] || []
-    session[:folder_document_ids] << params[:id] 
-    # Rails 3 uses a one line notation for setting the flash notice.
-    #    flash[:notice] = "#{params[:title] || "Item"} successfully added to Folder"
-    respond_to do |format|
-      format.html { redirect_to :back, :notice =>  I18n.t('blacklight.folder.add.success', :title => params[:title] || 'Item') }
-      format.js { render :json => session[:folder_document_ids] }
-    end
-  end
- 
-  # remove a document_id from the folder. :id of action is solr_doc_id
-  def destroy
-    session[:folder_document_ids].delete(params[:id])
-          
-    respond_to do |format|
-      format.html do
-        flash[:notice] = I18n.t('blacklight.folder.remove.success', :title => params[:title] || 'Item')
-        redirect_to :back
-      end
-      format.js do
-        render :json => {"OK" => "OK"}
-      end
-    end
-          
-  end
- 
-  # get rid of the items in the folder
-  def clear
-    flash[:notice] = I18n.t('blacklight.folder.clear.success')
-    session[:folder_document_ids] = []
-    respond_to do |format|
-      format.html { redirect_to :back }
-      format.js { render :json => session[:folder_document_ids] }
-    end
-  end
- 
-end

data/app/views/catalog/_folder_control.html.erb

@@ -1,12 +0,0 @@
-<%-   
-  # pass in local :document with a SolrDocument
-  method = (item_in_folder?(document.id) ? "delete" : "put")
-  label = (item_in_folder?(document.id) ? t('blacklight.search.folder.unselect') : t('blacklight.search.folder.select'))
-  cssClass = (item_in_folder?(document.id) ? "deleteFolder" : "addFolder")
--%>
-
-<%= form_tag( folder_path(document), :method => method, :class=> "folder_toggle #{cssClass}", "data-doc-id" => document.id, :title=>h(document[document_show_link_field])) do -%>  
-  <%= hidden_field(:bookmark, :title, :value => document[document_show_link_field]) %>
-  <%= submit_tag(label, :class=>"folder_submit", :id => "folder_submit_#{document.id}") %>
-<% end %>
-

data/test_support/features/folder.feature

@@ -1,67 +0,0 @@
-Feature: User Folder
-  In order to keep track of items
-  As a user
-  I want to be able to store items in my folder
-
-  Scenario: Ensure "Add to Folder" form is present in search results
-    Given I am on the home page
-    When I fill in "q" with "history"
-    And I select "All Fields" from "search_field"
-    And I press "search" 
-    Then I should see an add to folder form
-      
-  Scenario: Ensure "Add to Folder" for is present on individual record
-    Given I am on the document page for id 2007020969
-    Then I should see an add to folder form
- 	  
-  Scenario: Adding an item to the folder should produce a status message
-    Given I am on the home page
-    And I follow "English"
-    And I add record 2008308175 to my folder
-    Then I should see "Selected Items (1)"
-
-  Scenario: Do not show "Add to Favorites" when not logged in
-    Given I have record 2007020969 in my folder
-    When I follow "Selected Items"
-    Then I should not see "Add to Folder"
-	  
-  Scenario: Show "Add to Favorites" when logged in and viewing folder
-    Given I am logged in as "user1"
-    And I have record 2007020969 in my folder
-    When I follow "Selected Items"
-    Then I should see "Add to Bookmarks"
-    	  
-  Scenario: Do multiple citations when the folder has multiple items
-    Given I have record 2007020969 in my folder
-    And I have record 2008308175 in my folder
-    When I follow "Selected Items"
-    And I follow "Cite"
-    Then I should see "Pluvial Nectar of Blessings : a Supplication to the Noble Lama Mahaguru Padmasambhava. Dharamsala: Library of Tibetan Works and Archives, 2002."
-    And I should see "a Native American elder has her say : an oral history. 1st Atria Books hardcover ed. New York: Atria Books."
- 	  
-  Scenario: Make sure the folder page doesn't bomb if there is no search session
-    Given I am on the folder page
-    # That's all that is needed -- it will fail to render if it's not right
-	  
-  Scenario: Don't show the tools if there are no items in the folder
-    Given I am on the folder page
-    Then I should not see the Folder tools
-
-  Scenario: Show the tools if there are items in the folder
-    Given I have record 2008308175 in my folder
-    And I follow "Selected Items"
-    Then I should see the Folder tools
- 	  
-  Scenario: Controls on the record view
-    When I am on the document page for id 2008308175
-    Then I should see an add to folder form
-    Given I have record 2008308175 in my folder
-    When I am on the document page for id 2008308175
-    Then I should see a remove from folder form
- 	  
-  Scenario: Controls on the folder view
-    Given I have record 2008308175 in my folder
-    When I am on the folder page
-    Then I should see a remove from folder form
-    When I remove record 2008308175 from my folder
-    Then I should not see the Folder tools

data/test_support/features/step_definitions/folder_steps.rb

@@ -1,27 +0,0 @@
-# -*- encoding : utf-8 -*-
-Then /^I should see an add to folder form$/ do
-  page.should have_selector("form.addFolder")
-end
-
-Then /^I should see a remove from folder form$/ do
-  page.should have_selector("form.deleteFolder")
-end
-
-When /^I (add|remove) record (.+) (to|from) my folder$/ do |add_or_remove, id, wording|
-  click_button("folder_submit_#{id}")
-end
-
-Given /^I have record (.+) in my folder$/ do |arg1|
-  visit catalog_path(arg1)
-  click_button("Select")
-  click_link("Selected Items")
-end
-
-Then /^I (should|should not) see the Folder tools$/ do |comparator|
-  case comparator
-    when "should"
-      page.should have_selector("ul.folderTools")
-    when "should not"
-      page.should_not have_selector("ul.folderTools")
-    end
-end 

data/test_support/spec/controllers/folder_controller_spec.rb

@@ -1,47 +0,0 @@
-# -*- encoding : utf-8 -*-
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-describe FolderController do
-  before(:each) do
-    request.env["HTTP_REFERER"] = "/"
-  end
-  
-  it "should add items to list" do
-    @mock_response = mock()
-    @mock_document = mock()
-    @mock_document2 = mock()
-    @mock_document.stub(:export_formats => {})
-    controller.stub(:get_solr_response_for_field_values => [@mock_response, [@mock_document, @mock_document2]])
-
-    get :update, :id =>"77826928"
-    session[:folder_document_ids].length.should == 1
-    get :update, :id => "94120425"
-    session[:folder_document_ids].length.should == 2
-    session[:folder_document_ids].should include("77826928")
-    get :index
-    assigns[:documents].length.should == 2
-    assigns[:documents].first.should == @mock_document
-  end
-  it "should delete an item from list" do
-    get :update, :id =>"77826928"
-    get :update, :id => "94120425"
-    get :destroy, :id =>"77826928"
-    session[:folder_document_ids].length.should == 1
-    session[:folder_document_ids].should_not include("77826928")
-  end
-  it "should clear list" do
-    get :update, :id =>"77826928"
-    get :update, :id => "94120425"
-    get :clear
-    session[:folder_document_ids].length.should == 0
-  end
-
-  it "should generate flash messages for normal requests" do
-    get :update, :id => "77826928"
-    flash[:notice].length.should_not == 0
-  end
-  it "should clear flash messages after xhr request" do
-    xhr :get, :update, :id => "77826928"
-    flash[:notice].should == nil
-  end
-end
-