blacklight 4.0.1 → 4.1.0

data/test_support/spec/lib/blacklight_configuration_spec.rb

@@ -80,6 +80,34 @@ describe "Blacklight::Configuration" do
       @config.facet_fields.should_not include(@mock_facet)
     end
   end
+
+  describe "add alternative solr fields" do
+    it "should let you define any arbitrary solr field" do
+      Blacklight::Configuration.define_field_access :my_custom_field
+
+      config = Blacklight::Configuration.new do |config|
+        config.add_my_custom_field 'qwerty', :label => "asdf"
+      end
+
+      
+
+      config.my_custom_fields.keys.should include('qwerty')
+    end
+
+    it "should let you define a field accessor that uses an existing field-type" do
+
+      Blacklight::Configuration.define_field_access :my_custom_facet_field, :class => Blacklight::Configuration::FacetField
+
+      config = Blacklight::Configuration.new do |config|
+        config.add_my_custom_facet_field 'qwerty', :label => "asdf"
+      end
+
+      
+
+      config.my_custom_facet_fields['qwerty'].should be_a_kind_of(Blacklight::Configuration::FacetField)
+    end
+
+  end
   
   describe "add_facet_field" do
     it "should accept field name and hash form arg" do

data/test_support/spec/lib/solr_helper_spec.rb

@@ -31,6 +31,10 @@ describe 'Blacklight::SolrHelper' do
     @config = config
   end
 
+  def blacklight_solr
+    Blacklight.solr
+  end
+
   include Blacklight::SolrHelper
 
   before(:each) do
@@ -547,11 +551,9 @@ describe 'Blacklight::SolrHelper' do
 
       it "should use the configured request handler " do
         blacklight_config.stub(:solr_request_handler => 'custom_request_handler')
-        Blacklight.solr.should_receive(:paginate) do |page, rows, path, params|
-          page.should == 1
-          rows.should == 10
+        Blacklight.solr.should_receive(:send_and_receive) do |path, params|
           path.should == 'select'
-          params[:params].should include(:qt=>"custom_request_handler", :q=>"", "spellcheck.q"=>"", :"facet.field"=>["format", "{!ex=pub_date_single}pub_date", "subject_topic_facet", "language_facet", "lc_1letter_facet", "subject_geo_facet", "subject_era_facet"], :"facet.query"=>["pub_date:[2007 TO *]", "pub_date:[2002 TO *]", "pub_date:[1987 TO *]"], :"f.subject_topic_facet.facet.limit"=>21, :sort=>"score desc, pub_date_sort desc, title_sort asc")
+          params[:params].should include(:start => 0, :rows => 10, :qt=>"custom_request_handler", :q=>"", "spellcheck.q"=>"", :"facet.field"=>["format", "{!ex=pub_date_single}pub_date", "subject_topic_facet", "language_facet", "lc_1letter_facet", "subject_geo_facet", "subject_era_facet"], :"facet.query"=>["pub_date:[2007 TO *]", "pub_date:[2002 TO *]", "pub_date:[1987 TO *]"], :"f.subject_topic_facet.facet.limit"=>21, :sort=>"score desc, pub_date_sort desc, title_sort asc")
         end.and_return({'response'=>{'docs'=>[]}})
         get_search_results(:q => @all_docs_query)
       end
@@ -579,6 +581,7 @@ describe 'Blacklight::SolrHelper' do
         solr_response = query_solr(:q => @single_word_query)
         solr_response.docs.size.should > 0
       end
+
     end
 
     describe 'for All Docs Query, No Facets' do
@@ -749,6 +752,13 @@ describe 'Blacklight::SolrHelper' do
       solr_response1.docs.size.should == num_results
     end
 
+    it 'should get number of rows requested' do
+      num_results = 4  # non-default value
+      (solr_response1, document_list1) = get_search_results(:q => @all_docs_query, :rows => num_results)
+      solr_response1.docs.size.should == document_list1.size
+      solr_response1.docs.size.should == num_results
+    end
+
     it 'should skip appropriate number of results when requested - default per page' do
       page = 3
       (solr_response2, document_list2) = get_search_results(:q => @all_docs_query, :page => page)

data/test_support/spec/routing/catalog_routing_spec.rb

@@ -0,0 +1,67 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe "Routing" do
+  describe "Paths Generated by Custom Routes:" do
+    # paths generated by custom routes
+    it "should map {:controller => 'catalog', :action => 'email'} to /catalog/email" do
+      { :get => "/catalog/email" }.should route_to(:controller => 'catalog', :action => 'email')
+
+    end
+    it "should map {:controller => 'catalog', :action => 'sms'} to /catalog/sms" do
+      { :get => "/catalog/sms" }.should route_to(:controller => 'catalog', :action => 'sms')
+    end
+    it "should map { :controller => 'catalog', :action => 'show', :id => 666 } to /catalog/666" do
+      { :get => "/catalog/666" }.should route_to(:controller => 'catalog', :action => 'show', :id => "666")
+    end
+    it "should map {:controller => 'catalog', :id => '111', :action => 'librarian_view'} to /catalog/111/librarian_view" do
+      { :get => "/catalog/111/librarian_view" }.should route_to(:controller => 'catalog', :action => 'librarian_view', :id => "111")
+    end
+  end
+
+  # parameters generated from routes
+  describe "Parameters Generated from Routes:" do
+    it "should map /catalog/email to {:controller => 'catalog', :action => 'email'}" do
+      { :get => "/catalog/email" }.should route_to(:controller => 'catalog', :action => 'email')
+    end
+    it "should map /catalog/sms to {:controller => 'catalog', :action => 'sms'}" do
+      { :get => "/catalog/sms" }.should route_to(:controller => 'catalog', :action => 'sms')
+    end
+    it "should map /catalog/666 to {:controller => 'catalog', :action => 'show', :id => 666}" do
+      { :get => "/catalog/666" }.should route_to(:controller => 'catalog', :action => 'show', :id => "666")
+    end
+    it "should map /catalog/111/librarian_view to {:controller => 'catalog', :action => 'librarian_view', :id => 111}" do
+      { :get => "/catalog/111/librarian_view" }.should route_to(:controller => 'catalog', :action => 'librarian_view', :id => "111")
+    end
+  end
+
+  describe "catalog_path for SolrDocument", :test => true do
+    it "should route correctly" do
+      { :get => catalog_path(SolrDocument.new(:id => 'asdf')) }.should route_to(:controller => 'catalog', :action => 'show', :id => 'asdf')
+    end
+
+    context "should escape solr document ids" do
+
+      it "should pass-through url-valid ids" do
+        { :get => catalog_path(SolrDocument.new(:id => 'qwerty'))}.should route_to(:controller => 'catalog', :action => 'show', :id => 'qwerty')
+      end
+
+      it "should route url-like ids" do
+        pending "This works if you configure your routing to have very liberal constraints on :id.. not sure how to go about testing it though"
+        { :get => catalog_path(SolrDocument.new(:id => 'http://example.com'))}.should route_to(:controller => 'catalog', :action => 'show', :id => 'http://example.com')
+      end
+
+      it "should route ids with whitespace" do
+        { :get => catalog_path(SolrDocument.new(:id => 'mm 123')) }.should route_to(:controller => 'catalog', :action => 'show', :id => 'mm 123')
+      end
+
+      it "should route ids with a literal '+'" do
+        { :get => catalog_path(SolrDocument.new(:id => 'this+that')) }.should route_to(:controller => 'catalog', :action => 'show', :id => 'this+that')
+      end
+
+      it "should route ids with a literal '/" do
+        pending "This works if you configure your routing to have very liberal constraints on :id.. not sure how to go about testing it though"
+        { :get => catalog_path(SolrDocument.new(:id => 'and/or')) }.should route_to(:controller => 'catalog', :action => 'show', :id => 'and/or')
+      end
+    end
+  end
+end

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

@@ -19,8 +19,8 @@ describe "catalog/index" do
     @response, @document_list = c.get_search_results(@params)
 
     # munge the solr response to match test expectations
-    @document_list[1] = SolrDocument.new(@document_list[1].to_mash.reject! { |k,v| k == "author_display" })
-    @document_list[5] = SolrDocument.new(@document_list[1].to_mash.reject! { |k,v| k == "marc_display" })
+    @document_list[1] = SolrDocument.new(@document_list[1].with_indifferent_access.reject! { |k,v| k == "author_display" })
+    @document_list[5] = SolrDocument.new(@document_list[1].with_indifferent_access.reject! { |k,v| k == "marc_display" })
   end
   before(:each) do
     # Not sure what Assigns was doing here ... dhf
@@ -33,11 +33,7 @@ describe "catalog/index" do
     view.stub!(:blacklight_config).and_return(@config)
     view.stub!(:search_field_options_for_select).and_return([])
 
-    if Rails.version >= "3.2.0"
-      render :template => 'catalog/index', :formats => [:atom] 
-    else
-      render :template => 'catalog/index.atom'
-    end
+    render :template => 'catalog/index', :formats => [:atom] 
 
     # We need to use rexml to test certain things that have_tag wont' test    
     # note that response is depricated rails 3, use "redered" instead. 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 4.1.0
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -15,21 +15,43 @@ authors:
 - Naomi Dushay
 autorequire: 
 bindir: bin
-cert_chain: []
-date: 2012-12-11 00:00:00.000000000 Z
+cert_chain:
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIDaDCCAlCgAwIBAgIBATANBgkqhkiG9w0BAQUFADA9MQ4wDAYDVQQDDAVjaHJp
+  czEVMBMGCgmSJomT8ixkARkWBWNiZWVyMRQwEgYKCZImiZPyLGQBGRYEaW5mbzAe
+  Fw0xMzAzMDcwNDI1MzRaFw0xNDAzMDcwNDI1MzRaMD0xDjAMBgNVBAMMBWNocmlz
+  MRUwEwYKCZImiZPyLGQBGRYFY2JlZXIxFDASBgoJkiaJk/IsZAEZFgRpbmZvMIIB
+  IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2UC2Jw9BQ7bNTyVHaxGKbCqV
+  H+BggkU9CWOBB8YA7j2ebcAjRlj6AemKWHB0fPEi9qmGaE1bMbus8IJbFcjkZNqG
+  6yHVdOq9tacSH4iiEdH3QioWSte0zY7vwD9u92QLaNzUAm9yjIYF6ZDNM/dl25Hb
+  UYDURJXfLOKe3AivodRujsHRxDLFpS6FjdmwB9m8N2JBs/uOrUULB48aaa36pWWE
+  w4rhqT9kOpZl8BRdE/pTrePlQGDZ8Oe74gVWJth4lavtMaPP+UqHigmlnFvWO9+D
+  a+9q1qwvQ3ySYRJIACIsYaY6rlhZ6i+PGKhbCnG6at6bC9TVu2JfKbC/LBP9mwID
+  AQABo3MwcTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQU61dLp5FY
+  qfqrGhr0V8WPGwAIEKQwGwYDVR0RBBQwEoEQY2hyaXNAY2JlZXIuaW5mbzAbBgNV
+  HRIEFDASgRBjaHJpc0BjYmVlci5pbmZvMA0GCSqGSIb3DQEBBQUAA4IBAQBuQW5N
+  6NaEla5fJftOPCecLSB5z8oS+fAO8LbfcUqHSo+y/1ZkN8kF8Y1SaoqPpqxuOZ4g
+  zX+X6k0gJHLKHTNufTaLhORd66Tp1raoW2qqKEcoshOcoQyw/mh9KYLVaQEX8US8
+  0yZ9dRMWFtRjwvkvueNMzLZidH+GsaDq/bxR9/9PAv+4RxQRYw+nrAglf2DxINSI
+  o8CdBnIKvzS1JRgM172NHIwScyJdDFWxfBh1CTG9VRXTwQfyQmM0h1GThWYcdNw7
+  W4KPvarE4dgxT4TXIIKkh/K/Z9yaYt73biInVukEI9H2HHWkuAyblxg1jcR/zy+w
+  K27NJ2vhSpx2PPhb
+  -----END CERTIFICATE-----
+date: 2013-03-07 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'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
@@ -50,7 +72,7 @@ dependencies:
   name: marc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.4.3
     - - <
@@ -60,7 +82,7 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.4.3
     - - <
@@ -98,14 +120,14 @@ dependencies:
   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
@@ -126,14 +148,14 @@ dependencies:
   name: jettywrapper
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.2.0
 description: Blacklight is an open source Solr user interface discovery platform.
@@ -291,7 +313,10 @@ files:
 - app/views/shared/_header_navbar.html.erb
 - blacklight.gemspec
 - config/locales/blacklight.en.yml
+- config/locales/blacklight.fr.yml
 - config/routes.rb
+- gemfiles/rails3.gemfile
+- gemfiles/rails4.gemfile
 - lib/SolrMarc.jar
 - lib/blacklight.rb
 - lib/blacklight/catalog.rb
@@ -372,6 +397,7 @@ files:
 - test_support/features/search.feature
 - test_support/features/search_filters.feature
 - test_support/features/search_history.feature
+- test_support/features/search_pagination.feature
 - test_support/features/search_results.feature
 - test_support/features/search_sort.feature
 - test_support/features/step_definitions/bookmarks_steps.rb
@@ -381,6 +407,7 @@ files:
 - test_support/features/step_definitions/saved_searches_steps.rb
 - test_support/features/step_definitions/search_facets_steps.rb
 - test_support/features/step_definitions/search_history_steps.rb
+- test_support/features/step_definitions/search_pagination_steps.rb
 - test_support/features/step_definitions/search_result_steps.rb
 - test_support/features/step_definitions/search_steps.rb
 - test_support/features/step_definitions/user_steps.rb
@@ -424,6 +451,7 @@ files:
 - test_support/spec/models/solr_docment_spec.rb
 - test_support/spec/rcov.opts
 - test_support/spec/requests/alternate_controller_spec.rb
+- test_support/spec/routing/catalog_routing_spec.rb
 - test_support/spec/spec.opts
 - test_support/spec/spec_helper.rb
 - test_support/spec/support/assert_difference.rb
@@ -444,20 +472,19 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: blacklight
-rubygems_version: 2.0.0.preview2
+rubygems_version: 2.0.0
 signing_key: 
 specification_version: 4
 summary: Blacklight provides a discovery interface for any Solr (http://lucene.apache.org/solr)
   index.
 test_files: []
-has_rdoc: