blacklight 3.7.1 → 3.7.2

data/VERSION

@@ -1 +1 @@
-3.7.1
+3.7.2

data/lib/blacklight/solr_helper.rb

@@ -439,10 +439,10 @@ module Blacklight::SolrHelper
     # Need to set as f.facet_field.facet.limit to make sure we
     # override any field-specific default in the solr request handler. 
     solr_params[:"f.#{facet_field}.facet.limit"] = 
-      if solr_params["facet.limit"] 
+      if respond_to?(:facet_list_limit)
+        facet_list_limit.to_s.to_i + 1  
+      elsif solr_params["facet.limit"] 
         solr_params["facet.limit"].to_i + 1
-      elsif respond_to?(:facet_list_limit)
-        facet_list_limit.to_s.to_i + 1
       else
         20 + 1
       end
@@ -463,24 +463,16 @@ module Blacklight::SolrHelper
     # Make the solr call
     response =find(blacklight_config.solr_request_handler, solr_params)
 
-    limit =       
-      if respond_to?(:facet_list_limit)
-        facet_list_limit.to_s.to_i
-      elsif solr_params[:"f.#{facet_field}.facet.limit"]
-        solr_params[:"f.#{facet_field}.facet.limit"] - 1
-      else
-        nil
-      end
-
-    
+    limit = solr_params[:"f.#{facet_field}.facet.limit"] -1
+        
     # Actually create the paginator!
     # NOTE: The sniffing of the proper sort from the solr response is not
     # currently tested for, tricky to figure out how to test, since the
     # default setup we test against doesn't use this feature. 
     return     Blacklight::Solr::FacetPaginator.new(response.facets.first.items, 
-      :offset => solr_params['facet.offset'], 
+      :offset => solr_params[:"f.#{facet_field}.facet.offset"], 
       :limit => limit,
-      :sort => response["responseHeader"]["params"]["f.#{facet_field}.facet.sort"] || response["responseHeader"]["params"]["facet.sort"]
+      :sort => response["responseHeader"]["params"][:"f.#{facet_field}.facet.sort"] || response["responseHeader"]["params"]["facet.sort"]
     )
   end
   

data/lib/generators/blacklight/blacklight_generator.rb

@@ -69,8 +69,12 @@ EOF
   def generate_devise_assets
     if options[:devise]
       gem "devise"
-      gem "devise-guests"
-      run "bundle install"      
+      gem "devise-guests", "~> 0.2"
+
+      Bundler.with_clean_env do
+       run "bundle install"
+      end
+      
       generate "devise:install"
       generate "devise", model_name.classify
       generate "devise:views"
@@ -155,8 +159,12 @@ EOF
   def add_sass_configuration
     gem 'compass-rails', '~> 1.0.0', :group => :assets
     gem 'compass-susy-plugin', '~> 0.9.0', :group => :assets
-    run "bundle install"
-      insert_into_file "config/application.rb", :after => "config.assets.enabled = true" do <<EOF
+    
+    Bundler.with_clean_env do
+     run "bundle install"
+    end
+
+    insert_into_file "config/application.rb", :after => "config.assets.enabled = true" do <<EOF
     
     # Default SASS Configuration, check out https://github.com/rails/sass-rails for details
     config.assets.compress = !Rails.env.development?

data/test_support/bin/test.sh

@@ -109,8 +109,6 @@ gem 'simplecov-rcov', :platform => :mri_19
 end
 
 gem 'jettywrapper', '>= 1.2.0'
-gem \"devise\"
-gem \"devise-guests\"
 " >> Gemfile
 
 bundle install

data/test_support/spec/lib/solr_helper_spec.rb

@@ -438,6 +438,7 @@ describe 'Blacklight::SolrHelper' do
         config.add_facet_fields_to_solr_request!
         config.add_facet_field 'format'
         config.add_facet_field 'format_ordered', :sort => :count
+        config.add_facet_field 'format_limited', :limit => 5
 
       end
     end
@@ -467,7 +468,13 @@ describe 'Blacklight::SolrHelper' do
         solr_params = solr_facet_params(@facet_field)
         solr_params[:"f.#{@facet_field}.facet.limit"].should == 1001
       end
+
+      it 'uses controller method for limit when a ordinary limit is set' do
+        solr_params = solr_facet_params(@facet_field)
+        solr_params[:"f.#{@facet_field}.facet.limit"].should == 1001
+      end
     end
+
     it 'uses the default sort' do
       solr_params = solr_facet_params(@facet_field)
       solr_params[:"f.#{@facet_field}.facet.sort"].should be_blank

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 3.7.1
+  version: 3.7.2
   prerelease: 
 platform: ruby
 authors:
@@ -17,7 +17,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-09 00:00:00.000000000 Z
+date: 2012-10-15 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: -2496092326738603899
+      hash: -3316550167436372560
 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: -2496092326738603899
+      hash: -3316550167436372560
 requirements: []
 rubyforge_project: blacklight
 rubygems_version: 1.8.23