blacklight 3.2.2 → 3.3.0

data/.gitignore

@@ -18,3 +18,4 @@ Gemfile.lock
 tmp/test_app
 .rvmrc
 pkg/*
+*.swp

data/VERSION

@@ -1 +1 @@
-3.2.2
+3.3.0

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

@@ -69,7 +69,7 @@ $(document).ready(function() {
 //page load, and later called on document ready. 
 (function($) {
     Blacklight.do_search_context_behavior = function() {
-      $('a[data-counter]').click(function() {
+      $('a[data-counter]').click(function(event) {
       var f = document.createElement('form'); f.style.display = 'none'; 
       this.parentNode.appendChild(f); 
       f.method = 'POST'; 
@@ -255,7 +255,7 @@ $(document).ready(function() {
         var label = $('<label>')
           .addClass( options.css_class )
           .attr("for", options.css_class + '_' + unique_id)
-          .attr("title", form.attr("title"));
+          .attr("title", form.attr("title") || "");
           
           
         function update_state_for(state) {

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

@@ -1,4 +1,4 @@
 /* This is the default blacklight theme. */
 
-@import 'blacklight/grids/susy';
+@import 'grids/susy';
 @import 'blacklight/blacklight_base';

data/app/assets/stylesheets/blacklight/grids/_susy.css.scss

@@ -8,7 +8,7 @@ $col-width: 2.5em !default;
 $gutter-width: .5em !default;
 $side-gutter-width: 2em !default;
 
-@import "blacklight/grids/susy_framework";
+@import "susy";
 @import "compass/utilities";
 
 /* Header Container Layout */

data/app/helpers/blacklight/blacklight_helper_behavior.rb

@@ -76,8 +76,8 @@ module Blacklight::BlacklightHelperBehavior
   # renders next to title. Includes just 'Folder' by default.
   def render_index_doc_actions(document, options={})   
     content = []
-    content << render(:partial => 'bookmark_control', :locals => {:document=> document}.merge(options)) if has_user_authentication_provider? and current_user
-    content << render(:partial => 'folder_control', :locals => {:document=> document}.merge(options))
+    content << render(:partial => 'catalog/bookmark_control', :locals => {:document=> document}.merge(options)) if has_user_authentication_provider? and current_user
+    content << render(:partial => 'catalog/folder_control', :locals => {:document=> document}.merge(options))
 
     content_tag("div", content.join("\n").html_safe, :class=>"documentFunctions")
   end
@@ -86,8 +86,8 @@ module Blacklight::BlacklightHelperBehavior
   # renders next to title. By default includes 'Folder' and 'Bookmarks'
   def render_show_doc_actions(document=@document, options={})
     content = []
-    content << render(:partial => 'bookmark_control', :locals => {:document=> document}.merge(options)) if has_user_authentication_provider? and current_user
-    content << render(:partial => 'folder_control', :locals => {:document=> document}.merge(options))
+    content << render(:partial => 'catalog/bookmark_control', :locals => {:document=> document}.merge(options)) if has_user_authentication_provider? and current_user
+    content << render(:partial => 'catalog/folder_control', :locals => {:document=> document}.merge(options))
 
     content_tag("div", content.join("\n").html_safe, :class=>"documentFunctions")
   end
@@ -204,14 +204,14 @@ module Blacklight::BlacklightHelperBehavior
   # based on the value of doc[:format]
   # if this value is blank (nil/empty) the "default" is used
   # if the partial is not found, the "default" partial is rendered instead
-  def render_document_partial(doc, action_name)
+  def render_document_partial(doc, action_name, locals = {})
     format = document_partial_name(doc)
 
     document_partial_path_templates.each do |str|
       # XXX rather than handling this logic through exceptions, maybe there's a Rails internals method
       # for determining if a partial template exists..
       begin
-        return render :partial => (str % [action_name, format]), :locals=>{:document=>doc}  
+        return render :partial => (str % [action_name, format]), :locals=>locals.merge({:document=>doc})  
       rescue ActionView::MissingTemplate 
         nil
       end
@@ -275,7 +275,7 @@ module Blacklight::BlacklightHelperBehavior
   def link_to_document(doc, opts={:label=>nil, :counter => nil, :results_view => true})
     label ||= blacklight_config.index.show_link.to_sym
     label = render_document_index_label doc, opts
-    link_to label, doc, :'data-counter' => opts[:counter]
+    link_to label, doc, { :'data-counter' => opts[:counter] }.merge(opts.reject { |k,v| [:label, :counter, :results_view].include? k  })
   end
 
   # link_back_to_catalog(:label=>'Back to Search')

data/app/helpers/blacklight/facets_helper_behavior.rb

@@ -72,7 +72,9 @@ module Blacklight::FacetsHelperBehavior
   # 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?
+    # display when show is nil or true
+    display = facet_configuration_for_field(display_facet.name).show != false
+    return display && display_facet.items.present?
   end
 
   # the name of the partial to use to render a facet field. Can be over-ridden for custom

data/app/helpers/blacklight/render_constraints_helper_behavior.rb

@@ -26,7 +26,7 @@ module Blacklight::RenderConstraintsHelperBehavior
       render_constraint_element(label,
             localized_params[:q], 
             :classes => ["query"], 
-            :remove => catalog_index_path(localized_params.merge(:q=>nil, :action=>'index')))
+            :remove => url_for(localized_params.merge(:q=>nil, :action=>'index')))
     else
       "".html_safe
     end
@@ -46,7 +46,7 @@ module Blacklight::RenderConstraintsHelperBehavior
     values.map do |val|
       render_constraint_element( facet_field_labels[facet],
                   val, 
-                  :remove => catalog_index_path(remove_facet_params(facet, val, localized_params)),
+                  :remove => url_for(remove_facet_params(facet, val, localized_params)),
                   :classes => ["filter", "filter-" + facet.parameterize] 
                 ) + "\n"                 					            
     end

data/app/helpers/blacklight/search_history_constraints_helper_behavior.rb

@@ -19,7 +19,7 @@ module Blacklight::SearchHistoryConstraintsHelperBehavior
   def render_search_to_s_q(params)
     return "".html_safe if params[:q].blank?
     
-    label = (params[:search_field] == default_search_field[:key]) ? 
+    label = (default_search_field && params[:search_field] == default_search_field[:key]) ? 
       nil :
       label_for_search_field(params[:search_field])
     

data/app/views/catalog/_constraints_element.html.erb

@@ -21,7 +21,7 @@
                 if label.blank?
                   "Remove constraint #{options[:escape_value] ? h(value) : value}"
                 else
-                  "Remove constraint #{options[:escape_value] ? h(value) : value}: #{options[:escape_value] ? h(value) : value}"
+                  "Remove constraint #{options[:escape_label] ? h(label) : label}: #{options[:escape_value] ? h(value) : value}"
                 end              
         %>                
         <%= link_to(accessible_remove_label,

data/app/views/catalog/_home_text.html.erb

@@ -1,6 +1,6 @@
 <h3>Welcome!</h3>
 <p>To modify this text to your specifications, copy this file located in the blacklight plugin directory:<br/>
-&nbsp;&nbsp;&nbsp;vendor/plugins/blacklight/app/views/catalog/_home_text.html.erb</p>
+&nbsp;&nbsp;&nbsp;<%= Blacklight.root %>/app/views/catalog/_home_text.html.erb</p>
 <p>to your top level rails app:<br/>
-&nbsp;&nbsp;&nbsp;app/views/catalog/_home_text.html.erb</p>
-Note that you will need to create the 'catalog' directory under views.
+&nbsp;&nbsp;&nbsp;<%= Rails.root %>/app/views/catalog/_home_text.html.erb</p>
+Note that you will need to create the 'catalog' directory under views.

data/app/views/search_history/index.html.erb

@@ -10,11 +10,15 @@
   <%-  @searches.each_with_index do |search,index| -%>
     <%= content_tag :tr, :id => "document_#{index + 1}" do %>
       <td class="query"><%= link_to_previous_search(search.query_params) %></td>
-      <td class="actions"><%- if has_user_authentication_provider? && current_user && search.saved? -%>
-        <%= button_to "forget", forget_search_path(search.id) %>
-      <%- else -%>
-        <%= button_to "save", save_search_path(search.id), :method => :put %>
-      <%- end -%></td>
+      <%- if has_user_authentication_provider? -%>
+        <td class="actions">
+          <%- if current_user && search.saved? -%>
+            <%= button_to "forget", forget_search_path(search.id) %>
+          <%- else -%>
+            <%= button_to "save", save_search_path(search.id), :method => :put %>
+          <%- end -%>
+        </td>
+      <%- end -%>
     <% end #content_tag %>
   <%- end -%>
   </table>

data/blacklight.gemspec

@@ -27,7 +27,8 @@ Gem::Specification.new do |s|
   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"
+  s.add_dependency "sass-rails", "~> 3.2.0"
   s.add_development_dependency "jettywrapper", ">= 1.2.0"
-  s.add_dependency "compass", ">= 0.12.alpha.2"
+  s.add_dependency "compass-rails", "~> 1.0.0"
+  s.add_dependency "compass-susy-plugin", ">= 0.9.0"
 end

data/lib/blacklight/configurable.rb

@@ -45,7 +45,7 @@ module Blacklight::Configurable
     # The default configuration object, by default it reads from Blacklight.config for backwards
     # compatibility with Blacklight <= 3.1
     def default_configuration
-      Blacklight::Configurable.default_configuration
+      Blacklight::Configurable.default_configuration.inheritable_copy
     end
   end
 

data/lib/blacklight/solr_helper.rb

@@ -261,6 +261,8 @@ module Blacklight::SolrHelper
     # Convert a facet/value pair into a solr fq parameter
     def facet_value_to_fq_string(facet_field, value) 
       case
+        when (value.is_a?(TrueClass) or value.is_a?(FalseClass) or value == 'true' or value == 'false')
+          "#{facet_field}:#{value}"
         when (value.is_a?(Integer) or (value.to_i.to_s == value if value.respond_to? :to_i))
           "#{facet_field}:#{value}"
         when (value.is_a?(Float) or (value.to_f.to_s == value if value.respond_to? :to_f))

data/lib/generators/blacklight/blacklight_generator.rb

@@ -147,6 +147,9 @@ EOF
   end
 
   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
     
     # Default SASS Configuration, check out https://github.com/rails/sass-rails for details
@@ -156,7 +159,7 @@ EOF
 EOF
       end
 
-      copy_file "config/sass.rb", "config/initializers/sass.rb"
+      copy_file "config/compass.rb", "config/compass.rb"
   end
 
   private  

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

@@ -36,6 +36,9 @@ class CatalogController < ApplicationController
     # on the solr side in the request handler itself. Request handler defaults
     # sniffing requires solr requests to be made with "echoParams=all", for
     # app code to actually have it echo'd back to see it.  
+    #
+    # :show may be set to false if you don't want the facet to be drawn in the 
+    # facet bar
     config.add_facet_field 'format', :label => 'Format' 
     config.add_facet_field 'pub_date', :label => 'Publication Year' 
     config.add_facet_field 'subject_topic_facet', :label => 'Topic', :limit => 20 
@@ -48,6 +51,9 @@ class CatalogController < ApplicationController
     # previously. Simply remove these lines if you'd rather use Solr request
     # handler defaults, or have no facets.
     config.default_solr_params[:'facet.field'] = config.facet_fields.keys
+    #use this instead if you don't want to query facets marked :show=>false
+    #config.default_solr_params[:'facet.field'] = config.facet_fields.select{ |k, v| v[:show] != false}.keys
+
 
     # solr fields to be displayed in the index (search results) view
     #   The ordering of the field names is the order of the display 

data/lib/generators/blacklight/templates/config/compass.rb

@@ -0,0 +1,2 @@
+require 'susy'
+project_type = :rails

data/test_support/bin/test.sh

@@ -85,7 +85,8 @@ gem 'blacklight', :path => '../../'
 gem 'jquery-rails'
 
 group :assets do
-  gem 'compass', '0.12.alpha.2'
+  gem 'compass-rails', '~> 1.0.0'
+  gem 'compass-susy-plugin', '~> 0.9.0'
 end
 
 

data/test_support/spec/helpers/blacklight_helper_spec.rb

@@ -266,6 +266,13 @@ describe BlacklightHelper do
       @document = SolrDocument.new(data)
       link_to_document(@document, { :label => :title_display, :counter => 5  }).should =~ /data-counter="5"/
      end
+     it "passes on the title attribute to the link_to_with_data method" do
+       link_to_document(@mock_doc,:label=>"Some crazy long label...",:title=>"Some crazy longer label").should match(/title=\"Some crazy longer label\"/)
+     end
+
+     it "doesn't add an erroneous title attribute if one isn't provided" do
+       link_to_document(@mock_doc,:label=>"Some crazy long label...").should_not match(/title=/)
+     end
    end
 
 
@@ -318,7 +325,39 @@ describe BlacklightHelper do
       response = render_link_rel_alternates(@document)
       response.html_safe?.should == true
     end
-    
   end
+
+  describe "with a config" do
+    before do
+      @config = Blacklight::Configuration.new.configure do |config| 
+        config.show.html_title = "title_display"
+        config.show.heading = "title_display"
+        config.show.display_type = 'format'
+        
+        config.index.show_link = 'title_display'
+        config.index.record_display_type = 'format'   
+      end
+
+      @document = SolrDocument.new('title_display' => "A Fake Document", 'id'=>'8')
+      helper.stub(:blacklight_config).and_return(@config)
+      helper.stub(:has_user_authentication_provider?).and_return(true)
+      helper.stub(:current_user).and_return(User.new)
+    end
+    describe "render_index_doc_actions" do
+      it "should render partials" do
+        response = helper.render_index_doc_actions(@document)
+        response.should have_selector(".bookmark_toggle")
+        response.should have_selector(".folder_toggle")
+      end
+    end
+    describe "render_show_doc_actions" do
+      it "should render partials" do
+        response = helper.render_show_doc_actions(@document)
+        response.should have_selector(".bookmark_toggle")
+        response.should have_selector(".folder_toggle")
+      end
+    end
+  end
+
   
 end

data/test_support/spec/helpers/facets_helper_spec.rb

@@ -2,14 +2,27 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 describe FacetsHelper do
 
   describe "should_render_facet?" do
+    before do
+      @config = Blacklight::Configuration.new do |config|
+        config.add_facet_field 'basic_field'
+        config.add_facet_field 'no_show', :show=>false
+      end
+
+      helper.stub(:blacklight_config => @config)
+    end
     it "should render facets with items" do
-      a = mock(:items => [1,2])
+      a = mock(:items => [1,2], :name=>'basic_field')
       helper.should_render_facet?(a).should == true
     end
     it "should not render facets without items" do
-      empty = mock(:items => [])
+      empty = mock(:items => [], :name=>'basic_field')
       helper.should_render_facet?(empty).should ==  false
     end
+
+    it "should not render facets where show is set to false" do
+      a = mock(:items => [1,2], :name=>'no_show')
+      helper.should_render_facet?(a).should ==  false
+    end
   end
 
   describe "facet_by_field_name" do

data/test_support/spec/helpers/render_constraints_helper_spec.rb

@@ -0,0 +1,30 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe RenderConstraintsHelper do
+
+  before do
+    ## Pretend that we're in a controller at /advanced_search
+    Journey::Route.any_instance.stub(:format).and_return('/advanced_search')
+  end
+  describe '#render_constraints_query' do
+    it "should have a link relative to the current url" do
+      helper.render_constraints_query(:q=>'foobar', :f=>{:type=>'journal'}).should have_selector "a[href='/advanced_search?f%5Btype%5D=journal']"
+    end
+  end
+
+  describe '#render_filter_element' do
+    before do
+      @config = Blacklight::Configuration.new do |config|
+        config.add_facet_field 'type'
+      end
+      helper.stub(:blacklight_config => @config)
+    end
+    it "should have a link relative to the current url" do
+      result = helper.render_filter_element('type', ['journal'], {:q=>'biz'})
+      result.size.should == 1
+      # I'm not certain how the ampersand gets in there. It's not important.
+      result.first.should have_selector "a[href='/advanced_search?&q=biz']"
+    end
+  end
+
+end

data/test_support/spec/lib/blacklight_configurable_spec.rb

@@ -86,6 +86,19 @@ describe "Blacklight::Configurable" do
       instance.blacklight_config.foo.should be_nil
       klass.blacklight_config.foo.should == "bar"
     end
+
+    it "configurable classes should not mutate the default configuration object" do
+      klass = Class.new
+      klass.send(:include, Blacklight::Configurable)
+      klass.blacklight_config.foo = "bar"
+
+      klass2 = Class.new
+      klass2.send(:include, Blacklight::Configurable)
+      klass2.blacklight_config.foo = "asdf"
+
+      klass.blacklight_config.foo.should == "bar"
+      klass2.blacklight_config.foo.should == "asdf"
+    end
     
   end
 end

data/test_support/spec/lib/blacklight_configuration_spec.rb

@@ -125,6 +125,12 @@ describe "Blacklight::Configuration" do
         
       @config.facet_fields["publication_date"].label.should == "Publication Date"
     end
+
+    it "should allow you to not show the facet in the facet bar" do
+      @config.add_facet_field("publication_date", :show=>false)
+        
+      @config.facet_fields["publication_date"]['show'].should be_false
+    end
     
     it "should raise on nil solr field name" do
       lambda { @config.add_facet_field(nil) }.should raise_error ArgumentError

data/test_support/spec/lib/solr_helper_spec.rb

@@ -159,6 +159,14 @@ describe 'Blacklight::SolrHelper' do
         facet_value_to_fq_string("facet_name", "my value").should  == "{!raw f=facet_name}my value" 
       end
 
+      it "should pass booleans through" do
+        facet_value_to_fq_string("facet_name", true).should  == "facet_name:true"
+      end
+
+      it "should pass boolean-like strings through" do
+        facet_value_to_fq_string("facet_name", "true").should  == "facet_name:true"
+      end
+
       it "should pass integers through" do
         facet_value_to_fq_string("facet_name", 1).should  == "facet_name:1"
       end

data/test_support/spec/views/catalog/_constraints_element.html.erb_spec.rb

@@ -23,6 +23,12 @@ describe "catalog/_constraints_element.html.erb" do
         s.should have_selector("a.btnRemove.imgReplace[href='http://remove']")
       end    
     end
+
+    it "should have an accessible remove label" do
+      rendered.should have_selector("a.imgReplace") do |s|
+        s.should have_content("Remove constraint my label: my value")
+      end
+    end
   end
 
   describe "with checkmark suppressed" do

data/test_support/spec/views/catalog/_facets.html.erb_spec.rb

@@ -1,6 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
-describe "catalog/_facets.html.erb" do
+describe "catalog/_facets" do
   before do
     @mock_config = Blacklight::Configuration.new
     view.stub(:blacklight_config => @mock_config)

data/test_support/spec/views/catalog/index.atom.builder_spec.rb

@@ -1,8 +1,7 @@
 # -*- encoding : utf-8 -*-
 require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
-describe "catalog/index.atom.builder" do  
-
+describe "catalog/index" do  
 
   before(:all) do
     @config ||= Blacklight::Configuration.from_legacy_configuration({
@@ -57,7 +56,14 @@ describe "catalog/index.atom.builder" do
     @response = @rsolr_response
  
     view.stub!(:blacklight_config).and_return(@config)
-    render 
+    view.stub!(:search_field_options_for_select).and_return([])
+
+    if Rails.version >= "3.2.0"
+      render :template => 'catalog/index', :formats => [:atom] 
+    else
+      render :template => 'catalog/index.atom'
+    end
+
 
     # We need to use rexml to test certain things that have_tag wont' test    
     # note that response is depricated rails 3, use "redered" instead. 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 3.2.2
+  version: 3.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -16,11 +16,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-25 00:00:00.000000000 Z
+date: 2012-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2152624320 !ruby/object:Gem::Requirement
+  requirement: &2153768840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -28,10 +28,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *2152624320
+  version_requirements: *2153768840
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &2152623840 !ruby/object:Gem::Requirement
+  requirement: &2153768360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -39,10 +39,10 @@ dependencies:
         version: '1.5'
   type: :runtime
   prerelease: false
-  version_requirements: *2152623840
+  version_requirements: *2153768360
 - !ruby/object:Gem::Dependency
   name: unicode
-  requirement: &2152623460 !ruby/object:Gem::Requirement
+  requirement: &2153767980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -50,10 +50,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152623460
+  version_requirements: *2153767980
 - !ruby/object:Gem::Dependency
   name: marc
-  requirement: &2152622540 !ruby/object:Gem::Requirement
+  requirement: &2153767440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -61,10 +61,10 @@ dependencies:
         version: 0.4.3
   type: :runtime
   prerelease: false
-  version_requirements: *2152622540
+  version_requirements: *2153767440
 - !ruby/object:Gem::Dependency
   name: rsolr
-  requirement: &2152621760 !ruby/object:Gem::Requirement
+  requirement: &2153766920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -72,10 +72,10 @@ dependencies:
         version: 1.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *2152621760
+  version_requirements: *2153766920
 - !ruby/object:Gem::Dependency
   name: rsolr-ext
-  requirement: &2152621120 !ruby/object:Gem::Requirement
+  requirement: &2153766020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -83,10 +83,10 @@ dependencies:
         version: 1.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *2152621120
+  version_requirements: *2153766020
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &2152620680 !ruby/object:Gem::Requirement
+  requirement: &2153765640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -94,21 +94,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152620680
+  version_requirements: *2153765640
 - !ruby/object:Gem::Dependency
   name: sass-rails
-  requirement: &2152620100 !ruby/object:Gem::Requirement
+  requirement: &2153765040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: 3.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *2152620100
+  version_requirements: *2153765040
 - !ruby/object:Gem::Dependency
   name: jettywrapper
-  requirement: &2152562760 !ruby/object:Gem::Requirement
+  requirement: &2153764540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -116,18 +116,29 @@ dependencies:
         version: 1.2.0
   type: :development
   prerelease: false
-  version_requirements: *2152562760
+  version_requirements: *2153764540
+- !ruby/object:Gem::Dependency
+  name: compass-rails
+  requirement: &2153764080 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *2153764080
 - !ruby/object:Gem::Dependency
-  name: compass
-  requirement: &2152562280 !ruby/object:Gem::Requirement
+  name: compass-susy-plugin
+  requirement: &2153763600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.12.alpha.2
+        version: 0.9.0
   type: :runtime
   prerelease: false
-  version_requirements: *2152562280
+  version_requirements: *2153763600
 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
@@ -173,7 +184,6 @@ files:
 - app/assets/stylesheets/blacklight/blacklight.css.scss
 - app/assets/stylesheets/blacklight/blacklight_defaults.css.scss
 - app/assets/stylesheets/blacklight/grids/_susy.css.scss
-- app/assets/stylesheets/blacklight/grids/_susy_framework.css.scss
 - app/assets/stylesheets/jquery/ui-lightness/images/ui-anim_basic_16x16.gif
 - app/assets/stylesheets/jquery/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png
 - app/assets/stylesheets/jquery/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png
@@ -330,7 +340,7 @@ files:
 - lib/generators/blacklight/templates/config/SolrMarc/translation_maps/instrument_map.properties
 - lib/generators/blacklight/templates/config/SolrMarc/translation_maps/language_map.properties
 - lib/generators/blacklight/templates/config/blacklight_config.rb
-- lib/generators/blacklight/templates/config/sass.rb
+- lib/generators/blacklight/templates/config/compass.rb
 - lib/generators/blacklight/templates/config/solr.yml
 - lib/generators/blacklight/templates/migrations/add_user_types_to_bookmarks_searches.rb
 - lib/generators/blacklight/templates/migrations/create_bookmarks.rb
@@ -386,6 +396,7 @@ files:
 - test_support/spec/helpers/facets_helper_spec.rb
 - test_support/spec/helpers/hash_as_hidden_fields_spec.rb
 - test_support/spec/helpers/html_head_helper_spec.rb
+- test_support/spec/helpers/render_constraints_helper_spec.rb
 - test_support/spec/helpers/search_history_constraints_helper_spec.rb
 - test_support/spec/lib/blacklight_configurable_spec.rb
 - test_support/spec/lib/blacklight_configuration_spec.rb
@@ -435,7 +446,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2527126427684428122
+      hash: 4535691040177281828
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -444,10 +455,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2527126427684428122
+      hash: 4535691040177281828
 requirements: []
 rubyforge_project: blacklight
-rubygems_version: 1.8.10
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: A next-generation Library Catalag for Universities

data/app/assets/stylesheets/blacklight/grids/_susy_framework.css.scss

@@ -1,228 +0,0 @@
-// Imports -------------------------------------------------------------------
-
-@import "compass/utilities/general/clearfix";
-@import "compass/utilities/general/float";
-@import "compass/layout/grid-background";
-
-// Variables -----------------------------------------------------------------
-
-// Your basic settings for the grid.
-$total-cols         : 12            !default;
-$col-width          : 4em           !default;
-$gutter-width       : 1em           !default;
-$side-gutter-width  : $gutter-width !default;
-
-// Controls for right-to-left or bi-directional sites.
-$from-direction     : left          !default;
-
-// The direction that +omega elements are floated by deafult.
-$omega-float        : opposite-position($from-direction)    !default;
-
-// Functions -----------------------------------------------------------------
-
-// Return the width of 'n' columns plus 'n - 1' gutters
-// plus page padding in non-nested contexts
-@function columns-width(
-  $n: false
-) {
-  $sg: 0;
-  @if not $n {
-    $n: $total-cols;
-    $sg: $side-gutter-width;
-  }
-  $columns-width: ($n*$col-width) + (ceil($n - 1)*$gutter-width) + ($sg*2);
-  @return $columns-width;
-}
-
-// Return the percentage for the target in a given context
-@function percent-width(
-  $t,
-  $c
-) {
-  $perc: ($t / $c) * 100%;
-  @return $perc;
-}
-
-// Return the percentage width of 'n' columns in a context of 'c'
-@function columns(
-  $n,
-  $c: false
-) {
-  $columns: percent-width(columns-width($n), columns-width($c));
-  @return $columns;
-}
-
-// Return the percentage width of a single gutter in a context of 'c'
-@function gutter(
-  $c: false
-) {
-  $gutter: percent-width($gutter-width, columns-width($c));
-  @return $gutter;
-}
-
-// Return the percentage width of a single side gutter in a context of 'c'
-@function side-gutter(
-  $c: false
-) {
-  $side-gutter: percent-width($side-gutter-width, columns-width($c));
-  @return $side-gutter;
-}
-
-// Return the percentage width of a single column in a context of 'c'
-@function column(
-  $c: false
-) {
-  $column: percent-width($col-width, columns-width($c));
-  @return $column;
-}
-
-// Base Mixin ----------------------------------------------------------------
-
-// Set the outer grid-containing element(s).
-@mixin container() {
-  @include pie-clearfix;
-  margin: auto;
-  width: columns-width();
-  max-width: 100%;
-}
-
-// Column Mixins -------------------------------------------------------------
-
-// Set +columns() on any column element, even nested ones.
-// The first agument [required] is the number of columns to span.
-// The second argument is the context (columns spanned by parent).
-//  - Context is required on any nested elements.
-//  - Context MUST NOT be declared on a top-level element.
-// By default a grid-column is floated left with a right gutter.
-//  - Override those with +float("right"), +alpha or +omega
-@mixin columns(
-  $n,
-  $context  : false,
-  $from     : $from-direction
-) {
-  $to   : opposite-position($from);
-  // the column is floated left
-  @include float($from);
-  // the width of the column is set as a percentage of the context
-  width: columns($n, $context);
-  // the right gutter is added as a percentage of the context
-  margin-#{$to}: gutter($context);
-}
-
-// @include `reset-column` to reset a column element to default block behavior
-@mixin reset-column(
-  $from : $from-direction
-) {
-  $to   : opposite-position($from);
-  @include reset-float;
-  width: auto;
-  margin-#{$to}: auto;
-}
-
-@mixin un-column(
-  $from : $from-direction
-) {
-  @include reset-column($from);
-}
-
-// @include `full` on an element that will span it's entire context.
-// There is no need for +columns, +alpha or +omega on a +full element.
-@mixin full(
-  $nested: false
-) {
-  clear: both;
-  @if not $nested {
-    margin: {
-      left: side-gutter();
-      right: side-gutter();
-    }
-  }
-}
-
-// Padding Mixins ------------------------------------------------------------
-
-// add empty colums as padding before an element.
-@mixin prefix(
-  $n,
-  $context  : false,
-  $from     : $from-direction
-) {
-  padding-#{$from}: columns($n, $context) + gutter($context);
-}
-
-// add empty colums as padding after an element.
-@mixin suffix(
-  $n,
-  $context  : false,
-  $from     : $from-direction
-) {
-  $to       : opposite-position($from);
-  padding-#{$to}: columns($n, $context) + gutter($context);
-}
-
-// add empty colums as padding before and after an element.
-@mixin pad(
-  $p    : false,
-  $s    : false,
-  $c    : false,
-  $from : $from-direction
-) {
-  @if $p {
-    @include prefix($p, $c, $from);
-  }
-  @if $s {
-    @include suffix($s, $c, $from);
-  }
-}
-
-// Alpha & Omega Mixins ------------------------------------------------------
-// I recommend that you pass the actual nested contexts (when nested) rather
-// than a true/false argument for the sake of consistency. Effect is the same,
-// but your code will be much more readable.
-
-// @include on any element spanning the first column in non-nested context to
-// take side-gutters into account.
-@mixin alpha(
-  $nested : false,
-  $from   : $from-direction
-) {
-  @if not $nested {
-    margin-#{$from}: side-gutter();
-  } @else {
-    @warn "The alpha mixin is not needed in a nested context";
-  }
-}
-
-// @include on the last element of a row, in order to take side-gutters and
-// the page edge into account. Set the $nested argument for nested columns.
-@mixin omega(
-  $nested : false,
-  $from   : $from-direction
-) {
-  $to     : opposite-position($from);
-  $hack   : opposite-position($omega-float);
-  $sg     : 0;
-  @if not $nested {
-    $sg: side-gutter();
-  }
-  @include float($omega-float);
-  margin-#{$to}: $sg;
-  @if $legacy-support-for-ie6 or $legacy-support-for-ie7 {
-    #margin-#{$hack}: - $gutter-width;
-  }
-}
-
-// Susy Grid Backgrounds -----------------------------------------------------
-
-@mixin susy-grid-background {
-  @include column-grid-background($total-cols, $col-width, $gutter-width, $side-gutter-width, $force-fluid: true);
-}
-
-@mixin show-grid($img:false) {
-  @warn "show-grid is deprecated in favor of susy-grid-background.";
-  @if $img {
-    @warn "show-grid and susy-grid-background no longer use any images or take any arguments.";
-  }
-  @include susy-grid-background;
-}
-

data/lib/generators/blacklight/templates/config/sass.rb

@@ -1,4 +0,0 @@
-Rails.configuration.sass.tap do |config|
-  require 'compass'
-  config.load_paths << "#{Gem.loaded_specs['compass'].full_gem_path}/frameworks/compass/stylesheets"
-end