blacklight 3.2.1 → 3.2.2

data/VERSION

@@ -1 +1 @@
-3.2.1
+3.2.2

data/app/helpers/blacklight/facets_helper_behavior.rb

@@ -21,29 +21,31 @@ module Blacklight::FacetsHelperBehavior
 
   # Render a collection of facet fields
   def render_facet_partials fields = facet_field_names, options = {}
-    solr_fields = fields.map do |solr_field|
-      case solr_field
-        when String, Symbol
-          @response.facet_by_field_name(solr_field)
-        when Blacklight::Configuration::FacetField
-          @response.facet_by_field_name(solr_field.field)
-        else
-          solr_field
-        end
-    end.compact
+    solr_fields = fields.map { |solr_field| facet_by_field_name(solr_field) }.compact
 
     solr_fields.map do |display_facet|
-      next if display_facet.items.blank?
       render_facet_limit(display_facet, options)
     end.compact.join("\n").html_safe
   end
 
+  # Get a FacetField object from the @response
+  def facet_by_field_name solr_field
+    case solr_field
+      when String, Symbol
+        @response.facet_by_field_name(solr_field)
+      when Blacklight::Configuration::FacetField
+        @response.facet_by_field_name(solr_field.field)
+      else
+        solr_field
+      end
+  end
+
   # used in the catalog/_facets partial and elsewhere
   # Renders a single section for facet limit with a specified
   # solr field used for faceting. Can be over-ridden for custom
   # display on a per-facet basis. 
   #
-  # @param [RSolr::Ext::Response::Facets::FacetField] facet_field
+  # @param [RSolr::Ext::Response::Facets::FacetField] display_facet 
   # @param [Hash] options parameters to use for rendering the facet limit partial
   #
   def render_facet_limit(display_facet, options = {})
@@ -51,6 +53,7 @@ module Blacklight::FacetsHelperBehavior
       $stderr.puts "DEPRECATION WARNING: Blacklight::FacetsHelper#render_facet_limit: use #render_facet_partials to render facets by field name"
       return render_facet_partials([display_facet])
     end
+    return if not should_render_facet?(display_facet)
     options = options.dup
     options[:partial] ||= facet_partial_name(display_facet)
     options[:layout] ||= "facet_layout" unless options.has_key?(:layout)
@@ -63,6 +66,15 @@ module Blacklight::FacetsHelperBehavior
     render(options)
   end
 
+  ##
+  # Determine if Blacklight should render the display_facet or not
+  #
+  # By default, only render facets with items.
+  # @param [RSolr::Ext::Response::Facets::FacetField] display_facet 
+  def should_render_facet? display_facet
+    return !display_facet.items.blank?
+  end
+
   # the name of the partial to use to render a facet field. Can be over-ridden for custom
   # display on a per-facet basis. 
   def facet_partial_name(display_facet = nil)

data/blacklight.gemspec

@@ -20,14 +20,14 @@ Gem::Specification.new do |s|
 
   # PRODUCTION GEM REQUIREMENTS
   # ---------------------------------------   
-  s.add_dependency "rails",     "~> 3.1.1"
+  s.add_dependency "rails",     "~> 3.1"
   s.add_dependency "nokogiri",  "~>1.5"     # XML Parser
   s.add_dependency "unicode"                # provides C-form normalization of unicode characters, as required by refworks.
   s.add_dependency "marc",      "~> 0.4.3"  # Marc record parser
   s.add_dependency "rsolr",     "~> 1.0.6"  # Library for interacting with rSolr.
   s.add_dependency "rsolr-ext", '~> 1.0.3'  # extension to the above for some rails-ish behaviors - currently embedded in our solr document ojbect.
   s.add_dependency "kaminari"               # the pagination (page 1,2,3, etc..) of our search results
-  s.add_dependency "sass-rails", "~> 3.1.1"
+  s.add_dependency "sass-rails", "~> 3.1"
   s.add_development_dependency "jettywrapper", ">= 1.2.0"
   s.add_dependency "compass", ">= 0.12.alpha.2"
 end

data/lib/blacklight/configuration/fields.rb

@@ -28,114 +28,111 @@ module Blacklight
         end
       end
 
-      module InstanceMethods
-        # Add a solr field configuration to the given configuration key
-        #
-        # The recommended and strongly encouraged format is a field name, configuration pair, e.g.:
-        #     add_solr_field :index_field, 'format', :label => 'Format' 
-        #
-        # Alternative formats include:
-        #
-        # * a field name and block format:
-        #
-        #     add_solr_field :index_field, 'format' do |field|
-        #       field.label = 'Format'
-        #     end
-        #
-        # * a plain block:
-        #
-        #     add_solr_field :index_field do |field|
-        #       field.field = 'format'
-        #       field.label = 'Format'
-        #     end
-        # 
-        # * a configuration hash:
-        #
-        #     add_solr_field :index_field, :field => 'format', :label => 'Format'
-        #   
-        # * a Field instance: 
-        #
-        #     add_solr_field :index_field, IndexField.new(:field => 'format', :label => 'Format')
-        #
-        # * an array of hashes: 
-        #
-        #     add_solr_field :index_field, [{:field => 'format', :label => 'Format'}, IndexField.new(:field => 'date', :label => 'Date')]
-        #
-        #
-        # @param String config_key 
-        # @param Array *args 
-        # @para
-        #
-        def add_solr_field config_key, *args, &block
-          field_config = case args.first
-            when String
-              field_config_from_key_and_hash(config_key, *args)
-            when Symbol
-              args.first = args.first.to_s
-              field_config_from_key_and_hash(config_key, *args)
-            when Array
-              field_config_from_array(config_key, *args)
-            else
-              field_config_from_field_or_hash(config_key, *args)
-          end
-
-          return if field_config.is_a? Array
-    
-          if block_given?
-            yield field_config
-          end
-              
-          field_config.normalize!(self)
-          field_config.validate!
+      # Add a solr field configuration to the given configuration key
+      #
+      # The recommended and strongly encouraged format is a field name, configuration pair, e.g.:
+      #     add_solr_field :index_field, 'format', :label => 'Format' 
+      #
+      # Alternative formats include:
+      #
+      # * a field name and block format:
+      #
+      #     add_solr_field :index_field, 'format' do |field|
+      #       field.label = 'Format'
+      #     end
+      #
+      # * a plain block:
+      #
+      #     add_solr_field :index_field do |field|
+      #       field.field = 'format'
+      #       field.label = 'Format'
+      #     end
+      # 
+      # * a configuration hash:
+      #
+      #     add_solr_field :index_field, :field => 'format', :label => 'Format'
+      #   
+      # * a Field instance: 
+      #
+      #     add_solr_field :index_field, IndexField.new(:field => 'format', :label => 'Format')
+      #
+      # * an array of hashes: 
+      #
+      #     add_solr_field :index_field, [{:field => 'format', :label => 'Format'}, IndexField.new(:field => 'date', :label => 'Date')]
+      #
+      #
+      # @param String config_key 
+      # @param Array *args 
+      # @para
+      #
+      def add_solr_field config_key, *args, &block
+        field_config = case args.first
+          when String
+            field_config_from_key_and_hash(config_key, *args)
+          when Symbol
+            args.first = args.first.to_s
+            field_config_from_key_and_hash(config_key, *args)
+          when Array
+            field_config_from_array(config_key, *args)
+          else
+            field_config_from_field_or_hash(config_key, *args)
+        end
 
-          self[config_key.pluralize][ field_config.field ] = field_config            
+        return if field_config.is_a? Array
+  
+        if block_given?
+          yield field_config
         end
+            
+        field_config.normalize!(self)
+        field_config.validate!
 
-        protected
-        # Add a solr field by a solr field name and hash 
-        def field_config_from_key_and_hash config_key, solr_field, field_or_hash = {}
-          field_config = field_config_from_field_or_hash(config_key, field_or_hash)
-          field_config.field = solr_field
+        self[config_key.pluralize][ field_config.field ] = field_config            
+      end
 
-          field_config
-        end
+      protected
+      # Add a solr field by a solr field name and hash 
+      def field_config_from_key_and_hash config_key, solr_field, field_or_hash = {}
+        field_config = field_config_from_field_or_hash(config_key, field_or_hash)
+        field_config.field = solr_field
 
-        # Add multiple solr fields using a hash or Field instance
-        def field_config_from_array config_key, array_of_fields_or_hashes
-          array_of_fields_or_hashes.map do |field_or_hash| 
-            add_solr_field(config_key, field_or_hash)
-          end
-        end
+        field_config
+      end
 
-        # Add a solr field using a hash or Field instance
-        def field_config_from_field_or_hash config_key, field_or_hash = {}
-          hash_arg_to_config(field_or_hash, field_class_from_key(config_key))
+      # Add multiple solr fields using a hash or Field instance
+      def field_config_from_array config_key, array_of_fields_or_hashes
+        array_of_fields_or_hashes.map do |field_or_hash| 
+          add_solr_field(config_key, field_or_hash)
         end
+      end
 
-        # for our add_* methods, takes the optional hash param,
-        # and makes it into a specific config OpenStruct, like
-        # FacetField or SearchField. Or if the param already was
-        # one, that's cool. Or if the param is nil, make
-        # an empty one. Second argument is an actual class object. 
-        def hash_arg_to_config(hash_arg, klass)
-          case hash_arg
-          when Hash 
-            klass.new(hash_arg)
-          when NilClass 
-            klass.new
-          else 
-            # this assumes it already is an element of klass, or acts like one,
-            # if not something bad will happen later, that's your problem. 
-            hash_arg
-          end
-        end
+      # Add a solr field using a hash or Field instance
+      def field_config_from_field_or_hash config_key, field_or_hash = {}
+        hash_arg_to_config(field_or_hash, field_class_from_key(config_key))
+      end
 
-        private
-        # convert a config key to the appropriate Field class
-        def field_class_from_key key
-          "Blacklight::Configuration::#{key.camelcase}".constantize
+      # for our add_* methods, takes the optional hash param,
+      # and makes it into a specific config OpenStruct, like
+      # FacetField or SearchField. Or if the param already was
+      # one, that's cool. Or if the param is nil, make
+      # an empty one. Second argument is an actual class object. 
+      def hash_arg_to_config(hash_arg, klass)
+        case hash_arg
+        when Hash 
+          klass.new(hash_arg)
+        when NilClass 
+          klass.new
+        else 
+          # this assumes it already is an element of klass, or acts like one,
+          # if not something bad will happen later, that's your problem. 
+          hash_arg
         end
+      end
 
+      private
+      # convert a config key to the appropriate Field class
+      def field_class_from_key key
+        "Blacklight::Configuration::#{key.camelcase}".constantize
       end
     end
   end

data/lib/blacklight/search_fields.rb

@@ -26,7 +26,6 @@
 #
 ##
 module Blacklight::SearchFields
-  extend ActiveSupport::Memoizable
   extend ActiveSupport::Concern
 
   included do
@@ -35,7 +34,6 @@ module Blacklight::SearchFields
 
   # Looks up search field config list from blacklight_config[:search_fields], and
   # 'normalizes' all field config hashes using normalize_config method. 
-  # Memoized for efficiency of normalization. 
   def search_field_list
     blacklight_config.search_fields.values
   end

data/lib/generators/blacklight/templates/solr_document.rb

@@ -3,7 +3,7 @@ class SolrDocument
 
   include Blacklight::Solr::Document
 
-  # unique_key = 'id'
+  # self.unique_key = 'id'
   
   # The following shows how to setup this blacklight document to display marc documents
   extension_parameters[:marc_source_field] = :marc_display

data/test_support/bin/test.sh

@@ -2,6 +2,10 @@
 # test.sh
 # Create a default rails appliaction, install blacklight, and run all the tests.
 
+#If null or empty, use default value
+RAILS_VERSION=${RAILS_VERSION:-"~> 3.2"}
+JETTY_URL=${JETTY_URL:-"https://github.com/projectblacklight/blacklight-jetty/zipball/v3.5.0"}
+
 before="$(date +%s)"
 benchmark() 
 {
@@ -47,12 +51,11 @@ else
   exit 1
 fi
 
-
 rvm use "$@" --create
 check_errs $? "rvm failed.  please run 'rvm install $@', and then re-run these tests." 
 
-if ! gem query -n rails -v ">=3.1.1" --installed > /dev/null; then
-  gem install --no-rdoc --no-ri 'rails'
+if ! gem query -n rails -v "$RAILS_VERSION" --installed > /dev/null; then
+  gem install --no-rdoc --no-ri 'rails' -v "$RAILS_VERSION"
 fi
 
 if ! gem query -n bundler -v ">=1.0" --installed > /dev/null; then
@@ -61,77 +64,70 @@ fi
 
 rails new test_app
 cd test_app
+rm public/index.html
+
 echo "
-source 'http://rubygems.org'
-gem 'rack', '1.3.3'
-gem 'rails', '~> 3.1.1'
 platforms :jruby do
   gem 'jruby-openssl'
   gem 'activerecord-jdbcsqlite3-adapter'
   gem 'jdbc-sqlite3'
   gem 'mediashelf-loggable', '>= 0.4.8'
+  gem 'therubyrhino'
 end
+
 platforms :ruby do
  gem 'sqlite3-ruby', :require => 'sqlite3'
+ gem 'execjs'
+ gem 'therubyracer'
 end
+
 gem 'blacklight', :path => '../../'
 gem 'jquery-rails'
 
 group :assets do
-  gem 'sass-rails', '~> 3.1.1'
-  gem 'coffee-rails', '~> 3.1.1'
-  gem 'uglifier'
   gem 'compass', '0.12.alpha.2'
-   
-  platforms :ruby do
-    gem 'execjs'
-    gem 'therubyracer'
-  end
-
-  platforms :jruby do
-    gem 'therubyrhino'
-  end
 end
 
 
 # For testing
 group :development, :test do 
-       gem 'rspec'
-       gem 'rspec-rails', '>=2.5.0'       
-       gem 'generator_spec'
-       gem 'cucumber-rails'
-       gem 'database_cleaner'  
-       gem 'capybara'
-       gem 'webrat'
+  gem 'rspec'
+  gem 'rspec-rails'
+  gem 'generator_spec'
+  gem 'cucumber-rails'
+  gem 'database_cleaner'
+  gem 'capybara'
 end
 
 gem 'jettywrapper', '>= 1.2.0'
 gem \"devise\"
-" > Gemfile
+" >> Gemfile
 
-bundle install --local &> /dev/null 
-bundle update
-# If a local install fails, try a full install.
-if [ "$?" -ne "0" ]
-then
-  bundle install
-fi
+bundle install
 check_errs $? "Bundle install failed." 
+
 rails generate blacklight -d
 check_errs $?  "Blacklight generator failed" 
+
 bundle exec rake db:migrate
 check_errs $? "Rake Migration failed" 
+
 rails g cucumber:install &> /dev/null 
-jetty_zip="/tmp/bl_jetty_3_5_0.zip"
+
+
+jetty_zip=$( echo $JETTY_URL | awk '{split($0,a,"/"); print "/tmp/blacklight_jetty_"a[length(a)]}')
 if [ ! -f $jetty_zip ]
 then
-  curl -L https://github.com/projectblacklight/blacklight-jetty/zipball/v3.5.0 -o $jetty_zip
+  curl -L $JETTY_URL -o $jetty_zip
   check_errs $? "Jetty file does not exist, and cannot be downloaded."
 fi
+
 rails g blacklight:jetty test_jetty -e test -d $jetty_zip
-  check_errs $? "Jetty setup failed."
-rm public/index.html
+check_errs $? "Jetty setup failed."
+
 bundle exec rake solr:marc:index_test_data RAILS_ENV=test
+
 bundle exec rake blacklight:hudson
 check_errs $? "Tests failed." 
+
 benchmark

data/test_support/features/step_definitions/saved_searches_steps.rb

@@ -1,14 +1,11 @@
 # -*- encoding : utf-8 -*-
 Given /^I am logged in as "([^\"]*)"$/ do |login|
   email = "#{login}@#{login}.com"
-  user = User.create(:login => login, :email => email, :password => "password", :password_confirmation => "password")
-#  visit user_sessions_path(:user_session => {:login => login, :password => "password"}), :post
-#  User.find(user.id).should_not be_nil
+  user = User.create(:email => email, :password => "password", :password_confirmation => "password")
   visit new_user_session_path
   fill_in("user_email", :with => email) 
   fill_in("user_password", :with => "password") 
   click_button("Sign in")
-#  response.body.should =~ /Logged/m  
   step 'I should see "Log Out"'
 end
 

data/test_support/spec/controllers/catalog_controller_spec.rb

@@ -329,7 +329,7 @@ describe CatalogController do
       it "should respond to an extension-registered format properly" do
         get :show, :id => doc_id, :format => "mock" # This no longer works: :format => "mock"
         response.should be_success
-        response.should contain("mock_export")
+        response.body.should =~ /mock_export/
       end
       
 

data/test_support/spec/helpers/facets_helper_spec.rb

@@ -1,8 +1,30 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 describe FacetsHelper do
 
+  describe "should_render_facet?" do
+    it "should render facets with items" do
+      a = mock(:items => [1,2])
+      helper.should_render_facet?(a).should == true
+    end
+    it "should not render facets without items" do
+      empty = mock(:items => [])
+      helper.should_render_facet?(empty).should ==  false
+    end
+  end
+
+  describe "facet_by_field_name" do
+    it "should retrieve the facet from the response given a string" do
+      a = mock(:name => 'a', :items => [1,2])
+
+      @response = mock()
+      @response.should_receive(:facet_by_field_name).with('a') { a }
+
+      helper.facet_by_field_name('a').should == a
+    end
+  end
+
   describe "render_facet_partials" do
-    it "should only render facets with items" do
+    it "should try to render all provided facets " do
       a = mock(:items => [1,2])
       b = mock(:items => ['b','c'])
       empty = mock(:items => [])
@@ -11,20 +33,22 @@ describe FacetsHelper do
 
       helper.should_receive(:render_facet_limit).with(a, {})
       helper.should_receive(:render_facet_limit).with(b, {})
-      helper.should_not_receive(:render_facet_limit).with(empty, {})
+      helper.should_receive(:render_facet_limit).with(empty, {})
+
       helper.render_facet_partials fields
     end
 
-    it "should look up facet fields in the response when given strings or symbols" do
-
-      a = mock(:name => 'a', :items => [1,2])
+    it "should default to the configured facets" do
+      a = mock(:items => [1,2])
+      b = mock(:items => ['b','c'])
+      helper.should_receive(:facet_field_names) { [a,b] }
 
-      @response = mock()
-      @response.should_receive(:facet_by_field_name).with('a') { a }
       helper.should_receive(:render_facet_limit).with(a, {})
+      helper.should_receive(:render_facet_limit).with(b, {})
 
-      helper.render_facet_partials ['a']
+      helper.render_facet_partials
     end
+
   end
 
   describe "render_facet_limit" do
@@ -40,7 +64,7 @@ describe FacetsHelper do
     end
 
     it "should set basic local variables" do
-      @mock_facet = mock(:name => 'basic_field')
+      @mock_facet = mock(:name => 'basic_field', :items => [1,2,3])
       helper.should_receive(:render).with(hash_including(:partial => 'facet_limit', 
                                                          :locals => { 
                                                             :solr_field => 'basic_field', 
@@ -58,25 +82,25 @@ describe FacetsHelper do
     end
 
     it "should render a facet _not_ declared in the configuration" do
-      @mock_facet = mock(:name => 'asdf')
+      @mock_facet = mock(:name => 'asdf', :items => [1,2,3])
       helper.should_receive(:render).with(hash_including(:partial => 'facet_limit'))
       helper.render_facet_limit(@mock_facet)
     end
 
     it "should get the partial name from the configuration" do
-      @mock_facet = mock(:name => 'my_facet_field_with_custom_partial')
+      @mock_facet = mock(:name => 'my_facet_field_with_custom_partial', :items => [1,2,3])
       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')
+      @mock_facet = mock(:name => 'my_facet_field_with_custom_partial', :items => [1,2,3])
       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')
+      @mock_facet = mock(:name => 'my_facet_field_with_custom_partial', :items => [1,2,3])
       helper.should_receive(:render).with(hash_including(:layout => nil))
       helper.render_facet_limit(@mock_facet, :layout => nil)
     end

data/test_support/spec/lib/blacklight_solr_document_spec.rb

@@ -21,7 +21,8 @@ describe "Blacklight::Solr::Document" do
    
     context "Unique Key" do
       it "should use a configuration-defined document unique key" do
-        MockDocument.should_receive(:unique_key).and_return(:my_unique_key)
+        MockDocument.unique_key = 'my_unique_key'
+
         @document = MockDocument.new :id => 'asdf', :my_unique_key => '1234'
         @document.id.should == '1234'
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 3.2.1
+  version: 3.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -16,22 +16,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-16 00:00:00.000000000 Z
+date: 2012-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2164460960 !ruby/object:Gem::Requirement
+  requirement: &2152624320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.1.1
+        version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *2164460960
+  version_requirements: *2152624320
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &2164459800 !ruby/object:Gem::Requirement
+  requirement: &2152623840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -39,10 +39,10 @@ dependencies:
         version: '1.5'
   type: :runtime
   prerelease: false
-  version_requirements: *2164459800
+  version_requirements: *2152623840
 - !ruby/object:Gem::Dependency
   name: unicode
-  requirement: &2164459020 !ruby/object:Gem::Requirement
+  requirement: &2152623460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -50,10 +50,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2164459020
+  version_requirements: *2152623460
 - !ruby/object:Gem::Dependency
   name: marc
-  requirement: &2164457760 !ruby/object:Gem::Requirement
+  requirement: &2152622540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -61,10 +61,10 @@ dependencies:
         version: 0.4.3
   type: :runtime
   prerelease: false
-  version_requirements: *2164457760
+  version_requirements: *2152622540
 - !ruby/object:Gem::Dependency
   name: rsolr
-  requirement: &2164456000 !ruby/object:Gem::Requirement
+  requirement: &2152621760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -72,10 +72,10 @@ dependencies:
         version: 1.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *2164456000
+  version_requirements: *2152621760
 - !ruby/object:Gem::Dependency
   name: rsolr-ext
-  requirement: &2164455440 !ruby/object:Gem::Requirement
+  requirement: &2152621120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -83,10 +83,10 @@ dependencies:
         version: 1.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *2164455440
+  version_requirements: *2152621120
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &2164454860 !ruby/object:Gem::Requirement
+  requirement: &2152620680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -94,21 +94,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2164454860
+  version_requirements: *2152620680
 - !ruby/object:Gem::Dependency
   name: sass-rails
-  requirement: &2164454200 !ruby/object:Gem::Requirement
+  requirement: &2152620100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.1.1
+        version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *2164454200
+  version_requirements: *2152620100
 - !ruby/object:Gem::Dependency
   name: jettywrapper
-  requirement: &2164478240 !ruby/object:Gem::Requirement
+  requirement: &2152562760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -116,10 +116,10 @@ dependencies:
         version: 1.2.0
   type: :development
   prerelease: false
-  version_requirements: *2164478240
+  version_requirements: *2152562760
 - !ruby/object:Gem::Dependency
   name: compass
-  requirement: &2164477480 !ruby/object:Gem::Requirement
+  requirement: &2152562280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -127,7 +127,7 @@ dependencies:
         version: 0.12.alpha.2
   type: :runtime
   prerelease: false
-  version_requirements: *2164477480
+  version_requirements: *2152562280
 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: 3140418882790698087
+      hash: 2527126427684428122
 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: 3140418882790698087
+      hash: 2527126427684428122
 requirements: []
 rubyforge_project: blacklight
 rubygems_version: 1.8.10