blacklight 3.2.0 → 3.2.1

data/VERSION

@@ -1 +1 @@
-3.2.0
+3.2.1

data/app/helpers/blacklight/facets_helper_behavior.rb

@@ -53,9 +53,10 @@ module Blacklight::FacetsHelperBehavior
     end
     options = options.dup
     options[:partial] ||= facet_partial_name(display_facet)
-    options[:layout] ||= "facet_layout"
+    options[:layout] ||= "facet_layout" unless options.has_key?(:layout)
     options[:locals] ||= {}
     options[:locals][:solr_field] ||= display_facet.name 
+    options[:locals][:solr_fname] ||= display_facet.name # DEPRECATED
     options[:locals][:facet_field] ||= facet_configuration_for_field(display_facet.name)
     options[:locals][:display_facet] ||= display_facet 
 

data/test_support/spec/helpers/facets_helper_spec.rb

@@ -44,6 +44,7 @@ describe FacetsHelper do
       helper.should_receive(:render).with(hash_including(:partial => 'facet_limit', 
                                                          :locals => { 
                                                             :solr_field => 'basic_field', 
+                                                            :solr_fname => 'basic_field',
                                                             :facet_field => helper.blacklight_config.facet_fields['basic_field'],
                                                             :display_facet => @mock_facet  }
                                                         ))
@@ -67,6 +68,18 @@ describe FacetsHelper do
       helper.should_receive(:render).with(hash_including(:partial => 'custom_facet_partial'))
       helper.render_facet_limit(@mock_facet)
     end 
+
+    it "should use a partial layout for rendering the facet frame" do
+      @mock_facet = mock(:name => 'my_facet_field_with_custom_partial')
+      helper.should_receive(:render).with(hash_including(:layout => 'facet_layout'))
+      helper.render_facet_limit(@mock_facet)
+    end
+
+    it "should allow the caller to opt-out of facet layouts" do
+      @mock_facet = mock(:name => 'my_facet_field_with_custom_partial')
+      helper.should_receive(:render).with(hash_including(:layout => nil))
+      helper.render_facet_limit(@mock_facet, :layout => nil)
+    end
   end
 
   describe "add_facet_params" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -16,11 +16,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-15 00:00:00.000000000 Z
+date: 2011-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2152785840 !ruby/object:Gem::Requirement
+  requirement: &2164460960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -28,10 +28,10 @@ dependencies:
         version: 3.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *2152785840
+  version_requirements: *2164460960
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &2152785260 !ruby/object:Gem::Requirement
+  requirement: &2164459800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -39,10 +39,10 @@ dependencies:
         version: '1.5'
   type: :runtime
   prerelease: false
-  version_requirements: *2152785260
+  version_requirements: *2164459800
 - !ruby/object:Gem::Dependency
   name: unicode
-  requirement: &2152820780 !ruby/object:Gem::Requirement
+  requirement: &2164459020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -50,10 +50,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152820780
+  version_requirements: *2164459020
 - !ruby/object:Gem::Dependency
   name: marc
-  requirement: &2152813900 !ruby/object:Gem::Requirement
+  requirement: &2164457760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -61,10 +61,10 @@ dependencies:
         version: 0.4.3
   type: :runtime
   prerelease: false
-  version_requirements: *2152813900
+  version_requirements: *2164457760
 - !ruby/object:Gem::Dependency
   name: rsolr
-  requirement: &2152828760 !ruby/object:Gem::Requirement
+  requirement: &2164456000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -72,10 +72,10 @@ dependencies:
         version: 1.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *2152828760
+  version_requirements: *2164456000
 - !ruby/object:Gem::Dependency
   name: rsolr-ext
-  requirement: &2152828120 !ruby/object:Gem::Requirement
+  requirement: &2164455440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -83,10 +83,10 @@ dependencies:
         version: 1.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *2152828120
+  version_requirements: *2164455440
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &2152827400 !ruby/object:Gem::Requirement
+  requirement: &2164454860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -94,10 +94,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152827400
+  version_requirements: *2164454860
 - !ruby/object:Gem::Dependency
   name: sass-rails
-  requirement: &2152826720 !ruby/object:Gem::Requirement
+  requirement: &2164454200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -105,10 +105,10 @@ dependencies:
         version: 3.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *2152826720
+  version_requirements: *2164454200
 - !ruby/object:Gem::Dependency
   name: jettywrapper
-  requirement: &2152826120 !ruby/object:Gem::Requirement
+  requirement: &2164478240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -116,10 +116,10 @@ dependencies:
         version: 1.2.0
   type: :development
   prerelease: false
-  version_requirements: *2152826120
+  version_requirements: *2164478240
 - !ruby/object:Gem::Dependency
   name: compass
-  requirement: &2152825320 !ruby/object:Gem::Requirement
+  requirement: &2164477480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -127,7 +127,7 @@ dependencies:
         version: 0.12.alpha.2
   type: :runtime
   prerelease: false
-  version_requirements: *2152825320
+  version_requirements: *2164477480
 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
@@ -435,7 +435,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4385228888453993087
+      hash: 3140418882790698087
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -444,7 +444,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4385228888453993087
+      hash: 3140418882790698087
 requirements: []
 rubyforge_project: blacklight
 rubygems_version: 1.8.10