blacklight 4.1.0 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 85237ab5ca9df6a7dceedb02ee41c653bea8f99b
-  data.tar.gz: d8e94fa7a2eb458e6e072f5b9178a59874d28672
+  metadata.gz: 64ee8019553f491ded8b0186b6d9d30358c2ca25
+  data.tar.gz: d4935e93a6fa56fb5ae42f32f0140e61bb1b0032
 SHA512:
-  metadata.gz: cd6f5b56a806020627da8539450d8b9e259960d8f6e74e1cfbc2b2be140868705c69f57edb245bcf3fa971aadef6ad3020c67b4c87d47c2a7d4a9d661767a01d
-  data.tar.gz: 3e1b35b3aa99e852e2d43c93135937d0ed4392b7356a08368768f0c2951cd756d0881147aa86e448957322ec2b3d44d5f3227fc4c40afb19eaf999257bed605e
+  metadata.gz: 9e75097a23a6c9e685bf6c7924ae387ee47e14ef1723f43660d5597591dae6d0b6a3c50120fddb18dfe9373609215966623c33eae70ff7bf89d8db8c7a36b284
+  data.tar.gz: 011cc55da8d2cc401dbb59450545b3b120e75e2919d960abe8c24c3c25d42c645f14c29d4efa77000101539b506c89af8e2feb9e493b7e1aaf27d59537fd3f50

data/.gitignore

@@ -4,8 +4,7 @@ coverage.data
 coverage/
 db/*.sqlite3
 db/schema.rb
-jetty/logs/*.log
-jetty/solr/data/*
+jetty
 log/*
 webrat-*
 config/SolrMarc/*.log*
@@ -15,7 +14,7 @@ tmp/*
 *.log
 .bundle
 Gemfile.lock
-tmp/test_app
+spec/internal
 .rvmrc
 pkg/*
 *.sw[pon]

data/.travis.yml

@@ -10,13 +10,13 @@ gemfile:
   - gemfiles/rails3.gemfile
   - gemfiles/rails4.gemfile
 
-script:
-  - test_support/bin/test.sh
+# script:
+#   - test_support/bin/test.sh
 
 notifications:
   irc: "irc.freenode.org#blacklight"
   email:
       - blacklight-commits@googlegroups.com
 
-before_install:
-  - gem install bundler
+# before_install:
+#   - gem install bundler

data/Rakefile

@@ -8,3 +8,11 @@ end
 
 require 'rake'
 Bundler::GemHelper.install_tasks
+
+# load rake tasks defined in lib/tasks that are not loaded in lib/active_fedora.rb
+load "tasks/blacklight.rake"
+
+task :default => [:ci]
+task :spec => ['blacklight:spec']
+task :clean => ['blacklight:clean']
+

data/VERSION

@@ -1 +1 @@
-4.1.0
+4.2.0

data/app/assets/javascripts/blacklight/checkbox_submit.js

@@ -64,7 +64,7 @@
         label.append(span);  
           
         function update_state_for(state) {
-            checkbox.attr("checked", state);
+            checkbox.prop("checked", state);
             label.toggleClass("checked", state);
             if (state) {    
                //Set the Rails hidden field that fakes an HTTP verb

data/app/controllers/bookmarks_controller.rb

@@ -52,7 +52,7 @@ class BookmarksController < CatalogController
     end
 
     if request.xhr?
-      render :text => "", :status => (success ? "200" : "500" )
+      success ? head(:no_content) : render(:text => "", :status => "500")
     else
       if @bookmarks.length > 0 && success
         flash[:notice] = I18n.t('blacklight.bookmarks.add.success', :count => @bookmarks.length)
@@ -80,7 +80,7 @@ class BookmarksController < CatalogController
       redirect_to :back
     else
       # ajaxy request needs no redirect and should not have flash set
-      render :text => "", :status => (success ? "200" : "500")
+      success ? head(:no_content) : render(:text => "", :status => "500")
     end        
   end
   

data/app/helpers/blacklight/facets_helper_behavior.rb

@@ -103,7 +103,7 @@ module Blacklight::FacetsHelperBehavior
   # options consist of:
   # :suppress_link => true # do not make it a link, used for an already selected value for instance
   def render_facet_value(facet_solr_field, item, options ={})    
-    (link_to_unless(options[:suppress_link], item.label, add_facet_params_and_redirect(facet_solr_field, item), :class=>"facet_select") + " " + render_facet_count(item.hits)).html_safe
+    (link_to_unless(options[:suppress_link], facet_display_value(facet_solr_field, item), add_facet_params_and_redirect(facet_solr_field, item), :class=>"facet_select") + " " + render_facet_count(item.hits)).html_safe
   end
 
   # Standard display of a SELECTED facet value, no link, special span
@@ -215,24 +215,26 @@ module Blacklight::FacetsHelperBehavior
   end
 
   def facet_display_value field, item
-    
-    value = facet_value_for_facet_item(item)
-
     facet_config = facet_configuration_for_field(field)
-
-    display_label = value
-
-    if facet_config.query and facet_config.query[value]
-      display_label = facet_config.query[value][:label]     
+    
+    value = if item.respond_to? :label
+      value = item.label
+    else
+      facet_value_for_facet_item(item)
     end
 
-    if facet_config.date
-      localization_options = {}
-      localization_options = facet_config.date unless facet_config.date === true
-      display_label = l(value.to_datetime, localization_options)
+    display_label = case
+      when facet_config.helper_method
+        display_label = send facet_config.helper_method, value 
+      when (facet_config.query and facet_config.query[value])
+        display_label = facet_config.query[value][:label]     
+      when facet_config.date
+        localization_options = {}
+        localization_options = facet_config.date unless facet_config.date === true
+        display_label = l(value.to_datetime, localization_options)
+      else
+        value
     end
-
-    display_label
   end
 
   private

data/app/views/layouts/blacklight.html.erb

@@ -26,7 +26,6 @@
       <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
     <![endif]-->
 
-    <%= favicon_link_tag asset_path('favicon.ico') %>
   </head>
   <% onload_text = "$('input#q').focus();" if params[:q].to_s.empty? and params[:f].to_s.empty? and params[:id].nil? %>
   <body onload="<%= onload_text %>" class="<%= render_body_class %>">

data/blacklight.gemspec

@@ -29,5 +29,6 @@ Gem::Specification.new do |s|
   s.add_dependency "kaminari", "~> 0.13"  # the pagination (page 1,2,3, etc..) of our search results
   s.add_dependency "sass-rails"
   s.add_dependency "bootstrap-sass", "~> 2.2.0"
-  s.add_development_dependency "jettywrapper", ">= 1.2.0"
+  s.add_development_dependency "jettywrapper", ">= 1.4.1"
+  s.add_development_dependency "rspec-rails"
 end

data/config/jetty.yml

@@ -0,0 +1,4 @@
+default:
+  startup_wait: 15
+  jetty_port: <%= ENV['TEST_JETTY_PORT'] || 8888 %> 
+  <%= ENV['TEST_JETTY_PATH'] ? "jetty_home: " + ENV['TEST_JETTY_PATH'] : '' %>

data/lib/railties/blacklight_cucumber.rake

@@ -10,7 +10,7 @@
 ENV['RAILS_ROOT'] = Rails.root.to_s
 
 # blacklight_features, where to find features inside blacklight source?
-blacklight_features = File.expand_path("./test_support/features", Blacklight.root)
+blacklight_features = File.expand_path("features", Blacklight.root)
 
 unless ARGV.any? {|a| a =~ /^gems/} # Don't load anything when running the gems:* tasks
 

data/spec/controllers/bookmarks_controller_spec.rb

@@ -0,0 +1,42 @@
+# -*- encoding : utf-8 -*-
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe BookmarksController do
+  include Devise::TestHelpers
+  
+  # jquery 1.9 ajax does error callback if 200 returns empty body. so use 204 instead. 
+  describe "update" do
+    it "has a 204 status code when creating a new one" do
+      xhr :put, :update, :id => '2007020969', :format => :js
+      response.should be_success
+      response.code.should == "204"
+    end
+    
+    it "has a 500 status code when fails is success" do
+      @controller.stub_chain(:current_or_guest_user, :existing_bookmark_for).and_return(false)
+      @controller.stub_chain(:current_or_guest_user, :persisted?).and_return(true)
+      @controller.stub_chain(:current_or_guest_user, :bookmarks, :create).and_return(false)  
+      xhr :put, :update, :id => 'iamabooboo', :format => :js
+      response.code.should == "500"
+    end
+  end
+  
+  describe "delete" do
+    it "has a 204 status code when delete is success" do
+      xhr :delete, :destroy, :id => '2007020969', :format => :js
+      response.should be_success
+      response.code.should == "204"
+    end
+
+   it "has a 500 status code when delete is not success" do
+      bm = mock(Bookmark)
+      @controller.stub_chain(:current_or_guest_user, :existing_bookmark_for).and_return(bm)
+      @controller.stub_chain(:current_or_guest_user, :bookmarks, :delete).and_return(false)
+     
+      xhr :delete, :destroy, :id => 'pleasekillme', :format => :js
+     #
+      response.code.should == "500"
+    end
+  end
+  
+end

data/{test_support/spec → spec}/helpers/facets_helper_spec.rb

@@ -364,24 +364,51 @@ describe FacetsHelper do
 
   end
 
+  describe "render_facet_value" do
+    it "should use facet_display_value" do
+      helper.stub(:facet_configuration_for_field).with('simple_field').and_return(mock(:query => nil, :date => nil, :helper_method => nil, :single => false))
+ 
+      helper.should_receive(:facet_display_value).and_return('Z')
+      helper.should_receive(:add_facet_params_and_redirect).and_return('link')
+      helper.render_facet_value('simple_field', mock(:value => 'A', :hits => 10)).should == "<a href=\"link\" class=\"facet_select\">Z</a> <span class=\"count\">10</span>"
+    end
+
+
+    it "should suppress the link" do
+      helper.stub(:facet_configuration_for_field).with('simple_field').and_return(mock(:query => nil, :date => nil, :helper_method => nil, :single => false))
+ 
+      helper.should_receive(:facet_display_value).and_return('Z')
+      helper.should_receive(:add_facet_params_and_redirect).and_return('link')
+      helper.render_facet_value('simple_field', mock(:value => 'A', :hits => 10), :suppress_link => true).should == "Z <span class=\"count\">10</span>"
+    end
+  end
+ 
   describe "#facet_display_value" do
     it "should just be the facet value for an ordinary facet" do
-      helper.stub(:facet_configuration_for_field).with('simple_field').and_return(mock(:query => nil, :date => nil))
+      helper.stub(:facet_configuration_for_field).with('simple_field').and_return(mock(:query => nil, :date => nil, :helper_method => nil))
       helper.facet_display_value('simple_field', 'asdf').should == 'asdf'
     end
 
+    it "should allow you to pass in a :helper_method argument to the configuration" do
+      helper.stub(:facet_configuration_for_field).with('helper_field').and_return(mock(:query => nil, :date => nil, :helper_method => :my_facet_value_renderer))
+    
+      helper.should_receive(:my_facet_value_renderer).with('qwerty').and_return('abc')
+
+      helper.facet_display_value('helper_field', 'qwerty').should == 'abc'
+    end
+
     it "should extract the configuration label for a query facet" do
-      helper.stub(:facet_configuration_for_field).with('query_facet').and_return(mock(:query => { 'query_key' => { :label => 'XYZ'}}, :date => nil))
+      helper.stub(:facet_configuration_for_field).with('query_facet').and_return(mock(:query => { 'query_key' => { :label => 'XYZ'}}, :date => nil, :helper_method => nil))
       helper.facet_display_value('query_facet', 'query_key').should == 'XYZ'
     end
 
     it "should localize the label for date-type facets" do
-      helper.stub(:facet_configuration_for_field).with('date_facet').and_return(mock('date' => true, :query => nil))
+      helper.stub(:facet_configuration_for_field).with('date_facet').and_return(mock('date' => true, :query => nil, :helper_method => nil))
       helper.facet_display_value('date_facet', '2012-01-01').should == 'Sun, 01 Jan 2012 00:00:00 +0000'
     end
 
     it "should localize the label for date-type facets with the supplied localization options" do
-      helper.stub(:facet_configuration_for_field).with('date_facet').and_return(mock('date' => { :format => :short }, :query => nil))
+      helper.stub(:facet_configuration_for_field).with('date_facet').and_return(mock('date' => { :format => :short }, :query => nil, :helper_method => nil))
       helper.facet_display_value('date_facet', '2012-01-01').should == '01 Jan 00:00'
     end
   end

data/{test_support/spec → spec}/lib/blacklight_spec.rb

@@ -20,7 +20,7 @@ describe Blacklight do
   context 'root' do
 
     before(:all) do
-      @blroot = File.expand_path(File.join(__FILE__, '..', '..', '..', '..'))
+      @blroot = File.expand_path(File.join(__FILE__, '..', '..', '..' ))
     end
 
     it 'should return the full path to the BL plugin' do