blacklight 3.7.0 → 3.7.1

data/VERSION

@@ -1 +1 @@
-3.7.0
+3.7.1

data/app/assets/stylesheets/blacklight/_catalog.css.scss

@@ -9,8 +9,11 @@
 
   .label
   {
-    left:-100000000px;
-    position:absolute;
+ position: absolute !important;
+  height: 1px; width: 1px; 
+  overflow: hidden;
+  clip: rect(1px 1px 1px 1px); /* IE6, IE7 */
+  clip: rect(1px, 1px, 1px, 1px);
   }
 }
 

data/lib/blacklight/controller.rb

@@ -10,7 +10,7 @@ module Blacklight::Controller
     base.send :before_filter, :default_html_head # add JS/stylesheet stuff
     # now in application.rb file under config.filter_parameters
     # filter_parameter_logging :password, :password_confirmation 
-    base.send :helper_method, :current_user_session, :current_user
+    base.send :helper_method, :current_user_session, :current_user, :current_or_guest_user
     base.send :after_filter, :discard_flash_if_xhr    
 
     # handle basic authorization exception with #access_denied
@@ -32,17 +32,6 @@ module Blacklight::Controller
 
   end
 
-  def method_missing(meth, *args, &block)
-    if meth.to_s == "current_or_guest_user"
-      # Add the method
-      define_method(meth) { blacklight_current_or_guest_user }
-
-      blacklight_current_or_guest_user
-    else
-      super
-    end
-  end
-
     # test for exception notifier plugin
     def error
       raise RuntimeError, "Generating a test error..."
@@ -119,9 +108,14 @@ module Blacklight::Controller
     # end
 
     # Here's a stub implementation we'll add if it isn't provided for us
-    def blacklight_current_or_guest_user
-      current_user if has_user_authentication_provider?
+    def current_or_guest_user
+      if defined? super
+        super
+      else
+        current_user if has_user_authentication_provider?
+      end
     end
+    alias_method :blacklight_current_or_guest_user, :current_or_guest_user
 
     ##
     # We discard flash messages generated by the xhr requests to avoid

data/lib/blacklight/solr_helper.rb

@@ -446,8 +446,8 @@ module Blacklight::SolrHelper
       else
         20 + 1
       end
-    solr_params['facet.offset'] = input[  Blacklight::Solr::FacetPaginator.request_keys[:offset]  ].to_i # will default to 0 if nil
-    solr_params['facet.sort'] = input[  Blacklight::Solr::FacetPaginator.request_keys[:sort] ]     
+    solr_params[:"f.#{facet_field}.facet.offset"] = input[  Blacklight::Solr::FacetPaginator.request_keys[:offset]  ].to_i # will default to 0 if nil
+    solr_params[:"f.#{facet_field}.facet.sort"] = input[  Blacklight::Solr::FacetPaginator.request_keys[:sort] ] if  input[  Blacklight::Solr::FacetPaginator.request_keys[:sort] ]   
     solr_params[:rows] = 0
 
     return solr_params

data/test_support/spec/lib/solr_helper_spec.rb

@@ -434,6 +434,12 @@ describe 'Blacklight::SolrHelper' do
 
       @sort_key = Blacklight::Solr::FacetPaginator.request_keys[:sort]
       @offset_key = Blacklight::Solr::FacetPaginator.request_keys[:offset]
+      @config = Blacklight::Configuration.new do |config|
+        config.add_facet_fields_to_solr_request!
+        config.add_facet_field 'format'
+        config.add_facet_field 'format_ordered', :sort => :count
+
+      end
     end
     it 'sets rows to 0' do
       @generated_solr_facet_params[:rows].should == 0
@@ -442,16 +448,17 @@ describe 'Blacklight::SolrHelper' do
       @generated_solr_facet_params["facet.field".to_sym].should == @facet_field
     end
     it 'defaults offset to 0' do
-      @generated_solr_facet_params['facet.offset'].should == 0
+      @generated_solr_facet_params[:"f.#{@facet_field}.facet.offset"].should == 0
     end
     it 'uses offset manually set, and converts it to an integer' do
       solr_params = solr_facet_params(@facet_field, @offset_key => "100")
-      solr_params['facet.offset'].should == 100
+      solr_params[:"f.#{@facet_field}.facet.offset"].should == 100
     end
     it 'defaults limit to 20' do
       solr_params = solr_facet_params(@facet_field)
       solr_params[:"f.#{@facet_field}.facet.limit"].should == 21
     end
+
     describe 'if facet_list_limit is defined in controller' do
       def facet_list_limit
         1000
@@ -461,9 +468,20 @@ describe 'Blacklight::SolrHelper' do
         solr_params[:"f.#{@facet_field}.facet.limit"].should == 1001
       end
     end
-    it 'uses sort set manually' do
+    it 'uses the default sort' do
+      solr_params = solr_facet_params(@facet_field)
+      solr_params[:"f.#{@facet_field}.facet.sort"].should be_blank
+    end
+
+    it "uses the field-specific sort" do
+      @facet_field = 'format_ordered'
+      solr_params = solr_facet_params(@facet_field)
+      solr_params[:"f.#{@facet_field}.facet.sort"].should == :count
+    end
+
+    it 'uses sort provided in the parameters' do
       solr_params = solr_facet_params(@facet_field, @sort_key => "index")
-      solr_params['facet.sort'].should == 'index'
+      solr_params[:"f.#{@facet_field}.facet.sort"].should == 'index'
     end
     it "comes up with the same params as #solr_search_params to constrain context for facet list" do
       search_params = {:q => 'tibetan history', :f=> {:format=>'Book', :language_facet=>'Tibetan'}}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 3.7.0
+  version: 3.7.1
   prerelease: 
 platform: ruby
 authors:
@@ -17,7 +17,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-25 00:00:00.000000000 Z
+date: 2012-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -508,7 +508,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1006739623696902057
+      hash: -2496092326738603899
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -517,7 +517,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1006739623696902057
+      hash: -2496092326738603899
 requirements: []
 rubyforge_project: blacklight
 rubygems_version: 1.8.23