blacklight 3.0.0 → 3.1.0

data/test_support/spec/helpers/facets_helper_spec.rb

@@ -0,0 +1,100 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+describe FacetsHelper do
+
+  describe "add_facet_params" do
+    before do
+      @params_no_existing_facet = {:q => "query", :search_field => "search_field", :per_page => "50"}
+      @params_existing_facets = {:q => "query", :search_field => "search_field", :per_page => "50", :f => {"facet_field_1" => ["value1"], "facet_field_2" => ["value2", "value2a"]}}
+    end
+
+    it "should add facet value for no pre-existing facets" do
+      helper.stub!(:params).and_return(@params_no_existing_facet)
+
+      result_params = helper.add_facet_params("facet_field", "facet_value")
+      result_params[:f].should be_a_kind_of(Hash)
+      result_params[:f]["facet_field"].should be_a_kind_of(Array)
+      result_params[:f]["facet_field"].should == ["facet_value"]
+    end
+
+    it "should add a facet param to existing facet constraints" do
+      helper.stub!(:params).and_return(@params_existing_facets)
+      
+      result_params = helper.add_facet_params("facet_field_2", "new_facet_value")
+
+      result_params[:f].should be_a_kind_of(Hash)
+
+      @params_existing_facets[:f].each_pair do |facet_field, value_list|
+        result_params[:f][facet_field].should be_a_kind_of(Array)
+        
+        if facet_field == 'facet_field_2'
+          result_params[:f][facet_field].should == (@params_existing_facets[:f][facet_field] | ["new_facet_value"])
+        else
+          result_params[:f][facet_field].should ==  @params_existing_facets[:f][facet_field]
+        end        
+      end
+    end
+    it "should leave non-facet params alone" do
+      [@params_existing_facets, @params_no_existing_facet].each do |params|
+        helper.stub!(:params).and_return(params)
+
+        result_params = helper.add_facet_params("facet_field_2", "new_facet_value")
+
+        params.each_pair do |key, value|
+          next if key == :f
+          result_params[key].should == params[key]
+        end        
+      end
+    end    
+  end
+
+  describe "add_facet_params_and_redirect" do
+    before do
+      catalog_facet_params = {:q => "query", 
+                :search_field => "search_field", 
+                :per_page => "50",
+                :page => "5",
+                :f => {"facet_field_1" => ["value1"], "facet_field_2" => ["value2", "value2a"]},
+                Blacklight::Solr::FacetPaginator.request_keys[:offset] => "100",
+                Blacklight::Solr::FacetPaginator.request_keys[:sort] => "index",
+                :id => 'facet_field_name'
+      }
+      helper.stub!(:params).and_return(catalog_facet_params)
+    end
+    it "should redirect to 'index' action" do
+      params = helper.add_facet_params_and_redirect("facet_field_2", "facet_value")
+
+      params[:action].should == "index"
+    end
+    it "should not include request parameters used by the facet paginator" do
+      params = helper.add_facet_params_and_redirect("facet_field_2", "facet_value")
+
+      bad_keys = Blacklight::Solr::FacetPaginator.request_keys.values + [:id]
+      bad_keys.each do |paginator_key|
+        params.keys.should_not include(paginator_key)        
+      end
+    end
+    it 'should remove :page request key' do
+      params = helper.add_facet_params_and_redirect("facet_field_2", "facet_value")
+
+      params.keys.should_not include(:page)
+    end
+    it "should otherwise do the same thing as add_facet_params" do
+      added_facet_params = helper.add_facet_params("facet_field_2", "facet_value")
+      added_facet_params_from_facet_action = helper.add_facet_params_and_redirect("facet_field_2", "facet_value")
+
+      added_facet_params_from_facet_action.each_pair do |key, value|
+        next if key == :action
+        value.should == added_facet_params[key]
+      end      
+    end
+  end
+
+  describe "remove_facet_params" do
+
+  end
+
+  describe "facet_in_params?" do
+
+  end
+  
+end

data/test_support/spec/helpers/html_head_helper_spec.rb

@@ -0,0 +1,90 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+describe HtmlHeadHelper do
+
+  describe "render_js_includes" do
+    helper do 
+      def javascript_includes
+        [ 
+          ["some_js.js", {:plugin => :blacklight}],
+          ["other_js"]
+        ]
+      end
+    end
+    it "should include script tags specified in controller#javascript_includes" do
+      html = helper.render_js_includes
+      if use_asset_pipeline?
+        html.should have_selector("script[src='/assets/some_js.js'][type='text/javascript']")
+        html.should have_selector("script[src='/assets/other_js.js'][type='text/javascript']")
+      else
+        html.should have_selector("script[src='/javascripts/some_js.js'][type='text/javascript']")
+        html.should have_selector("script[src='/javascripts/other_js.js'][type='text/javascript']")      
+      end
+
+      html.html_safe?.should == true
+    end
+  end
+
+  describe "render_stylesheet_links" do
+    helper do 
+      def stylesheet_links
+        [ 
+          ["my_stylesheet", {:plugin => :blacklight}],
+          ["other_stylesheet"]
+        ]
+      end
+    end
+    it "should render stylesheets specified in controller #stylesheet_links" do
+      html = helper.render_stylesheet_includes      
+      if use_asset_pipeline?
+        html.should have_selector("link[href='/assets/my_stylesheet.css'][rel='stylesheet'][type='text/css']")
+        html.should have_selector("link[href='/assets/other_stylesheet.css'][rel='stylesheet'][type='text/css']")
+      else
+        html.should have_selector("link[href='/stylesheets/my_stylesheet.css'][rel='stylesheet'][type='text/css']")
+        html.should have_selector("link[href='/stylesheets/other_stylesheet.css'][rel='stylesheet'][type='text/css']")
+      end
+      html.html_safe?.should == true
+    end
+  end
+  
+  describe "render_extra_head_content" do
+    helper do 
+      def extra_head_content
+        ['<link rel="a">', '<link rel="b">']
+      end
+    end
+
+    it "should include content specified in controller#extra_head_content" do
+      html = helper.render_extra_head_content
+
+      html.should have_selector("link[rel=a]")
+      html.should have_selector("link[rel=b]")
+
+      html.html_safe?.should == true
+    end
+  end
+
+  describe "render_head_content" do
+    describe "with no methods defined" do
+      it "should return empty string without complaint" do
+      lambda {helper.render_head_content}.should_not raise_error
+      helper.render_head_content.should be_blank
+      helper.render_head_content.html_safe?.should == true
+      end
+    end
+    describe "with methods defined" do
+      it "should include all head content" do
+        helper.should_receive(:render_extra_head_content).and_return("".html_safe)
+        helper.should_receive(:render_js_includes).and_return("".html_safe)
+        helper.should_receive(:render_stylesheet_includes).and_return("".html_safe)
+        helper.should_receive(:content_for).with(:head).and_return("".html_safe)
+        helper.render_head_content.should be_html_safe
+      end
+    end
+  end
+
+  private
+  def use_asset_pipeline?
+    (Rails::VERSION::MAJOR >= 3 and Rails::VERSION::MINOR >= 1) and Rails.application.config.assets.enabled
+  end
+
+end

data/test_support/spec/helpers/solr_helper_spec.rb

@@ -74,7 +74,7 @@ describe 'Blacklight::SolrHelper' do
             end
         end 
                          
-        CustomizableHelper.solr_search_params_logic << :add_foo_to_solr_params
+        CustomizableHelper.solr_search_params_logic += [:add_foo_to_solr_params]
         
         
         obj = CustomizableHelper.new

metadata

@@ -1,15 +1,10 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: blacklight
-version: !ruby/object:Gem::Version 
-  hash: 7
+version: !ruby/object:Gem::Version
+  version: 3.1.0
   prerelease: 
-  segments: 
-  - 3
-  - 0
-  - 0
-  version: 3.0.0
 platform: ruby
-authors: 
+authors:
 - Jonathan Rochkind
 - Matt Mitchell
 - Chris Beer
@@ -21,124 +16,97 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-11 00:00:00 -04:00
+date: 2011-09-28 00:00:00.000000000 -04:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rails
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2161073300 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: nokogiri
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2161073300
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: &2161072180 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 1
-        - 5
-        version: "1.5"
+      - !ruby/object:Gem::Version
+        version: '1.5'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: unicode
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2161072180
+- !ruby/object:Gem::Dependency
+  name: unicode
+  requirement: &2161071400 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: marc
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *2161071400
+- !ruby/object:Gem::Dependency
+  name: marc
+  requirement: &2161070280 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 0
-        - 4
-        - 3
+      - !ruby/object:Gem::Version
         version: 0.4.3
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rsolr
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *2161070280
+- !ruby/object:Gem::Dependency
+  name: rsolr
+  requirement: &2161069300 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rsolr-ext
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *2161069300
+- !ruby/object:Gem::Dependency
+  name: rsolr-ext
+  requirement: &2161067680 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :runtime
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: kaminari
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *2161067680
+- !ruby/object:Gem::Dependency
+  name: kaminari
+  requirement: &2161066800 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id007
-description: "Blacklight is a free and open source ruby-on-rails based discovery interface (a.k.a. \xE2\x80\x9Cnext-generation catalog\xE2\x80\x9D) especially optimized for heterogeneous collections. You can use it as a library catalog, as a front end for a digital repository, or as a single-search interface to aggregate digital content that would otherwise be siloed."
-email: 
+  prerelease: false
+  version_requirements: *2161066800
+description: Blacklight is a free and open source ruby-on-rails based discovery interface
+  (a.k.a. “next-generation catalog”) especially optimized for heterogeneous collections.
+  You can use it as a library catalog, as a front end for a digital repository, or
+  as a single-search interface to aggregate digital content that would otherwise be
+  siloed.
+email:
 - blacklight-development@googlegroups.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .gitmodules
 - .yardopts
@@ -185,8 +153,10 @@ files:
 - app/helpers/blacklight_helper.rb
 - app/helpers/bookmarks_helper.rb
 - app/helpers/catalog_helper.rb
+- app/helpers/facets_helper.rb
 - app/helpers/feedback_helper.rb
 - app/helpers/hash_as_hidden_fields.rb
+- app/helpers/html_head_helper.rb
 - app/helpers/render_constraints_helper.rb
 - app/helpers/saved_searches_helper.rb
 - app/helpers/search_history_helper.rb
@@ -223,7 +193,6 @@ files:
 - app/views/catalog/_show_tools.html.erb
 - app/views/catalog/_sms_form.html.erb
 - app/views/catalog/_sort_and_per_page.html.erb
-- app/views/catalog/_unapi_microformat.html.erb
 - app/views/catalog/citation.html.erb
 - app/views/catalog/email.erb
 - app/views/catalog/endnote.endnote.erb
@@ -239,7 +208,6 @@ files:
 - app/views/catalog/show.html.erb
 - app/views/catalog/show.refworks.erb
 - app/views/catalog/sms.erb
-- app/views/catalog/unapi.xml.builder
 - app/views/feedback/complete.html.erb
 - app/views/feedback/show.html.erb
 - app/views/folder/_tools.html.erb
@@ -263,7 +231,6 @@ files:
 - db/seeds.rb
 - install.rb
 - install/solr.yml
-- lib/.DS_Store
 - lib/blacklight.rb
 - lib/blacklight/catalog.rb
 - lib/blacklight/comma_link_renderer.rb
@@ -271,6 +238,7 @@ files:
 - lib/blacklight/controller.rb
 - lib/blacklight/engine.rb
 - lib/blacklight/exceptions.rb
+- lib/blacklight/kaminari_relevant_pages_patch.rb
 - lib/blacklight/routes.rb
 - lib/blacklight/search_fields.rb
 - lib/blacklight/solr.rb
@@ -320,6 +288,7 @@ files:
 - lib/railties/solr_marc.rake
 - tasks/blacklight_tasks.rake
 - test_support/.rspec
+- test_support/bin/run-tests.sh
 - test_support/bin/test.sh
 - test_support/data/test_data.utf8.mrc
 - test_support/features/bookmarks.feature
@@ -348,7 +317,6 @@ files:
 - test_support/features/support/env.rb
 - test_support/features/support/paths.rb
 - test_support/features/support/selectors.rb
-- test_support/features/unapi.feature
 - test_support/spec/controllers/application_controller_spec.rb
 - test_support/spec/controllers/catalog_controller_spec.rb
 - test_support/spec/controllers/folder_controller_spec.rb
@@ -357,7 +325,9 @@ files:
 - test_support/spec/data/test_data.utf8.mrc
 - test_support/spec/helpers/blacklight_helper_spec.rb
 - test_support/spec/helpers/catalog_helper_spec.rb
+- test_support/spec/helpers/facets_helper_spec.rb
 - test_support/spec/helpers/hash_as_hidden_fields_spec.rb
+- test_support/spec/helpers/html_head_helper_spec.rb
 - test_support/spec/helpers/render_constraints_helper_spec.rb
 - test_support/spec/helpers/search_history_helper_spec.rb
 - test_support/spec/helpers/solr_helper_spec.rb
@@ -391,41 +361,36 @@ files:
 - test_support/spec/views/catalog/_show_partials/_default.html.erb_spec.rb
 - test_support/spec/views/catalog/index.atom.builder_spec.rb
 - test_support/spec/views/catalog/show.html.erb_spec.rb
-- test_support/spec/views/catalog/unapi.xml.builder_spec.rb
 - uninstall.rb
 has_rdoc: true
 homepage: http://projectblacklight.org/
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 2766889527846263557
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: 2766889527846263557
 requirements: []
-
 rubyforge_project: blacklight
-rubygems_version: 1.5.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A next-geration Library Catalag for Universities
 test_files: []
-