blacklight 3.2.0pre2 → 3.2.0

data/VERSION

@@ -1 +1 @@
-3.2.0pre2
+3.2.0

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

@@ -0,0 +1,26 @@
+
+/* This file is generated by Blacklight. You probably don't want to edit
+   this file directly, or you'll have to manually merge your changes if later
+   versions of Blacklight change this file. Instead, use your own CSS file
+   which over-rides things in this file. Or of course you can choose
+   not to use the Blacklight CSS file at all in your local app. */
+
+
+@import "compass";
+@import "compass/reset";
+
+@import 'blacklight/blacklight_defaults';
+
+/* Import this to maintain the old YUI font styles */
+@import "blacklight/layout";
+@import "blacklight/formatting";
+@import "blacklight/header";
+@import "blacklight/catalog";
+@import "blacklight/facets";
+@import "blacklight/folder";
+@import "blacklight/search_history";
+@import "blacklight/print";
+
+
+/* IE 6 Adjustments */
+* html #search {left: -1.8em;}

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

@@ -6,7 +6,7 @@
 
 h1.site_title
 {
-	background:transparent asset_url($logo_url,image) no-repeat top left;
+	background:transparent asset_url($logo_image,image) no-repeat top left;
 	height:35px;
 	margin:0;
 	width:120px;

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

@@ -1,5 +1,3 @@
-@import "blacklight/susy_framework";
-@import "compass/utilities";
 
 /* Generic layout stuff */
 .hide 
@@ -10,7 +8,7 @@
 /* Global */
 body 
 {
-  background: asset_url('blacklight/bg.png',image) repeat-x top left; 
+  background: asset_url($background_image,image) repeat-x top left; 
   background-color: #707070;
   font: 0.7em Verdana, "Lucida Grande", "Lucida Sans Unicode", "Arial Unicode MS", Arial, sans-serif; 
   line-height: 1.4; 
@@ -18,62 +16,3 @@ body
   padding: 15px;
 }
 
-/* Header Container Layout */
-#page 
-{ 
-  @include container;
-  background: #fff asset_url('blacklight/border.png',image) repeat-x top left; 
-  margin: 0px auto;
-}
-
-#hd 
-{
-  @include full;
-  @include clearfix;
-  padding: 2em 0 2em 0;
-
-
-  #logo 
-  {
-    @include columns(12,24);
-  }
-  
-  #user_util_links 
-  { 
-    text-align: right;
-    @include columns(12,24);
-    @include omega(24);
-  }
-}
-
-#bd 
-{
-  @include full;
-  @include clearfix;
-  margin-bottom: 2em;
-
-  #main 
-  {
-    @include prefix(1,24);
-    @include columns(18,24);
-    @include omega(24);
-  }
-
-  #sidebar 
-  {
-    @include columns(5,24);
-    @include clearfix;
-    
-    p 
-    { 
-      padding-top: 2em;
-    }
-  }
-}
-
-#ft {
-  @include full;
-  @include clearfix;
-}
-
-

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

@@ -1,27 +1,4 @@
-/* This file is generated by Blacklight. You probably don't want to edit
-   this file directly, or you'll have to manually merge your changes if later
-   versions of Blacklight change this file. Instead, use your own CSS file
-   which over-rides things in this file. Or of course you can choose
-   not to use the Blacklight CSS file at all in your local app. */
+/* This is the default blacklight theme. */
 
-
-@import "compass";
-@import "compass/reset";
-
-@import 'blacklight/blacklight_defaults';
-
-/* Import this to maintain the old YUI font styles */
-@import "blacklight/layout";
-@import "blacklight/formatting";
-@import "blacklight/header";
-@import "blacklight/catalog";
-@import "blacklight/facets";
-@import "blacklight/folder";
-@import "blacklight/search_history";
-@import "blacklight/print";
-
-
-/* IE 6 Adjustments */
-* html #hd .yui-g .yui-u {margin-top: -5em;}
-* html #hd .yui-g .first {margin-top: 2em;}
-* html #search {left: -1.8em;}
+@import 'blacklight/grids/susy';
+@import 'blacklight/blacklight_base';

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

@@ -1,16 +1,9 @@
 /* Warning! If you want to change these, just copy them into your own theme css. But you want to remove the !default, which only will set them if not already set. */
 
-/* Grid parameters */
-/* changing total cols is not recommended unless you're going to redo blacklight/_layout.css.sass */
-$total-cols: 24 !default;
 
-/* But the widths are changeable to px, em. */
-$col-width: 2.5em !default;
-$gutter-width: .5em !default;
-$side-gutter-width: 2em !default;
 
-
-$logo_url: 'blacklight/logo.png' !default;
+$background_image: 'blacklight/bg.png' !default;
+$logo_image: 'blacklight/logo.png' !default;
 
 /* Various elements of search customization share these colors */
 

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

@@ -0,0 +1,72 @@
+
+/* Grid parameters */
+/* changing total cols is not recommended unless you're going to redo blacklight/_layout.css.sass */
+$total-cols: 24 !default;
+
+/* But the widths are changeable to px, em. */
+$col-width: 2.5em !default;
+$gutter-width: .5em !default;
+$side-gutter-width: 2em !default;
+
+@import "blacklight/grids/susy_framework";
+@import "compass/utilities";
+
+/* Header Container Layout */
+#page 
+{ 
+  @include container;
+  background: #fff asset_url('blacklight/border.png',image) repeat-x top left; 
+  margin: 0px auto;
+}
+
+#hd 
+{
+  @include full;
+  @include clearfix;
+  padding: 2em 0 2em 0;
+
+
+  #logo 
+  {
+    @include columns(12,24);
+  }
+  
+  #user_util_links 
+  { 
+    text-align: right;
+    @include columns(12,24);
+    @include omega(24);
+  }
+}
+
+#bd 
+{
+  @include full;
+  @include clearfix;
+  margin-bottom: 2em;
+
+  #main 
+  {
+    @include prefix(1,24);
+    @include columns(18,24);
+    @include omega(24);
+  }
+
+  #sidebar 
+  {
+    @include columns(5,24);
+    @include clearfix;
+    
+    p 
+    { 
+      padding-top: 2em;
+    }
+  }
+}
+
+#ft {
+  @include full;
+  @include clearfix;
+}
+
+

data/lib/blacklight.rb

@@ -1,7 +1,5 @@
 # -*- encoding : utf-8 -*-
-require 'kaminari'
-require 'blacklight/kaminari_relevant_pages_patch'
-require 'marc'
+require 'blacklight/kaminari_relevant_pages_patch' 
 require 'rsolr'
 require 'rsolr-ext'
 

data/lib/blacklight/kaminari_relevant_pages_patch.rb

@@ -34,4 +34,7 @@ module Blacklight
   end
 end
 
-Kaminari::Helpers::Paginator.send(:include, Blacklight::KaminariRelevantPagesPatch)
+require 'kaminari'
+if Gem.loaded_specs['kaminari'].version <= Gem::Version.create('0.12.4')
+  Kaminari::Helpers::Paginator.send(:include, Blacklight::KaminariRelevantPagesPatch)
+end

data/lib/blacklight/solr/document/marc.rb

@@ -17,6 +17,7 @@
 # SolrDocument.extension_paramters[:marc_source_field] = "name_of_solr_stored_field"
 # SolrDocument.extension_parameters[:marc_format_type] = :marc21 # or :marcxml
 module Blacklight::Solr::Document::Marc
+  require 'marc'
 
   include Blacklight::Solr::Document::MarcExport # All our export_as stuff based on to_marc. 
   

data/lib/generators/blacklight/assets_generator.rb

@@ -23,11 +23,11 @@ module Blacklight
   %q{
  * Required by Blacklight:
  *= require 'jquery/ui-lightness/jquery-ui-1.8.1.custom.css'
- * This is the standard blacklight theme.
- *= require 'blacklight/blacklight'         
  *
- * If you'd like to modify the default theme, please instead require 'blacklight_themes/standard', which
- * is in your local install at app/assets/stylesheets/blacklight_themes/ }
+ * This is the default theme. You can modify many of the settings 
+ * by editing your local app/assets/stylesheets/blacklight_themes/standard.css
+ *= require 'blacklight_themes/standard'         
+ *}
         end
       end
 

data/lib/generators/blacklight/templates/assets/standard.css.scss

@@ -1,51 +1,59 @@
+// All the parameters below are the defaults assumed by blacklight. If you want
+// to change one, uncomment and change.
+
+// The default grid used is the susy framework. (http://susy.oddbird.net)
 
 /* Grid parameters */
 /* changing total cols is not recommended unless you're going to redo blacklight/_layout.css.sass */
-$total-cols: 24;
+// $total-cols: 24;
 
 /* But the widths are changeable to px, em. */
-$col-width: 2.5em;
-$gutter-width: .5em;
-$side-gutter-width: 2em;
+// $col-width: 2.5em;
+// $gutter-width: .5em;
+// $side-gutter-width: 2em;
 
+@import 'blacklight/grids/susy';
 
-$logo_url: 'blacklight/logo.png';
+// $background_image: 'blacklight/bg.png';
+// $logo_image: 'blacklight/logo.png';
 
 /* Various elements of search customization share these colors */
 
-$search_ui_border_color: #AAAAAA;
-$search_ui_bg_color: #F0F0F0;
+// $search_ui_border_color: #AAAAAA;
+// $search_ui_bg_color: #F0F0F0;
 
 /* separates documents, facets */
-$dotted_border_color: #CCC;
+// $dotted_border_color: #CCC;
 
 /* background color of page */
-$page_bg_color: #2E4F81;
+// $page_bg_color: #2E4F81;
 
 
 /* label (field names) */
-$field_name_color: #888;
+// $field_name_color: #888;
 
 
 /* constraint (you searched for:) details: */
 
-$constraint_bg_color: #E2EDFE;
+// $constraint_bg_color: #E2EDFE;
 
-$constraint_border_color: #C4DAFE;
-$constraint_border_active_color: #FFD27A;
+// $constraint_border_color: #C4DAFE;
+// $constraint_border_active_color: #FFD27A;
 
 /* dialog that pops up when you pick more on facets */
-$facet_extended_button_bg_color: #F6F6F6;
-$facet_extended_button_border_color: #CCC;
-$facet_extended_disabled_button_bg_color: #E2EDFE;
-$facet_extended_disabled_border_color: #C4DAFE;
-$facet_extended_button_hover_bg_color: #DADADA;
-$facet_extended_button_hover_border_color: #999;
-$facet_extended_button_hover_color: #212121;
+// $facet_extended_button_bg_color: #F6F6F6;
+// $facet_extended_button_border_color: #CCC;
+// $facet_extended_disabled_button_bg_color: #E2EDFE;
+// $facet_extended_disabled_border_color: #C4DAFE;
+// $facet_extended_button_hover_bg_color: #DADADA;
+// $facet_extended_button_hover_border_color: #999;
+// $facet_extended_button_hover_color: #212121;
 
 /* border between items on marc view */
-$marc_item_separator: 1px solid #CCC;
+// $marc_item_separator: 1px solid #CCC;
 
-/* uses these variables in the blacklight stylesheet */
-@import 'blacklight/blacklight';
+// Currently unused, but this import handles mixins common to blacklight
+@import 'blacklight/mixins';
 
+// And then this imports the base blacklight stylesheet.
+@import 'blacklight/blacklight_base';

data/test_support/features/did_you_mean.feature

@@ -22,10 +22,7 @@ Feature: Did You Mean
     Then I should see "Did you mean"
     When I follow "yehudiyim"
     Then I should get results
-    # TODO:  it should be an title search, but I can't get step def right
-    #  (it works in the code)
-    # TODO: false positive?
-    # And I should see select list "select#search_field" with "Title" selected
+    And I should see select list "select#search_field" with "Title" selected
 
   Scenario: Author search - No Results with spelling suggestion
     When I am on the home page
@@ -36,10 +33,7 @@ Feature: Did You Mean
     Then I should see "Did you mean"
     When I follow "sharma"
     Then I should get results
-    # TODO:  it should be an author search, but I can't get step def right
-    #  (it works in the code)
-    # TODO: false positive?
-    #And I should see select list "select#search_field" with "Author" selected
+    And I should see select list "select#search_field" with "Author" selected
 
   Scenario: Subject search - No Results with spelling suggestion
     When I am on the home page
@@ -50,8 +44,7 @@ Feature: Did You Mean
     Then I should see "Did you mean"
     When I follow "women"
     Then I should get results
-    # TODO:  it should be an author search, but I can't get step def right
-    #  (it works in the code)
+    And I should see select list "select#search_field" with "Subject" selected
 
   Scenario: No Results - and no close spelling suggestions
     When I am on the home page
@@ -77,17 +70,15 @@ Feature: Did You Mean
     When I follow "bon"
     Then I should get results
 
-# can't get this to work with 30 rec index:
-#    need something to give results and give suggestion with MORE results
-#  Scenario: Num Results low enough to warrant spelling suggestion
-#    Given I am on the home page
-    # aya gives a single results;  bya gives more
-#    And I fill in "q" with "aya"
-#    And I press "search"
-#    Then I should get results
-#    And I should see "Did you mean"
-#    When I follow "bya"
-#    Then I should get results
+  Scenario: Num Results low enough to warrant spelling suggestion
+    Given I am on the home page
+    # ayaz gives a single results;  bya gives more
+    And I fill in "q" with "ayaz"
+    And I press "search"
+    Then I should get results
+    And I should see "Did you mean"
+    When I follow "bya"
+    Then I should get results
 
   Scenario: Too many results for spelling suggestion
     Given I am on the home page
@@ -96,14 +87,16 @@ Feature: Did You Mean
     And I press "search"
     Then I should not see "Did you mean"
 
-## can't get these to work with solr 3.4
-#  Scenario: Exact Threshold number of results for spelling suggestion
-#    Given I am on the home page
-#    # polit gives 5 results in 30 record demo index - 5 is default cutoff
-#    And I fill in "q" with "polit"
-#    And I press "search"
-#    Then I should see "Did you mean"
-#
+  Scenario: Exact Threshold number of results for spelling suggestion
+    Given I am on the home page
+    # polit gives 5 results in 30 record demo index - 5 is default cutoff
+    And I fill in "q" with "polit"
+    And I press "search"
+    Then I should see "Did you mean"
+
+## can't get this to work with solr 3.4
+## (something to do with the stemming for search fields vs dictionary fields)
+## rsolr-ext doesn't expose enough of the solr return to filter within Blacklight either
 #  Scenario: Same number of results as spelling suggestion
 #    Given I am on the home page
 #    # den gives 1 result in 30 record demo index - suggestion don is 1 result also

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 3.2.0pre2
-  prerelease: 5
+  version: 3.2.0
+  prerelease: 
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -16,11 +16,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-13 00:00:00.000000000 Z
+date: 2011-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2165181060 !ruby/object:Gem::Requirement
+  requirement: &2152785840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -28,10 +28,10 @@ dependencies:
         version: 3.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *2165181060
+  version_requirements: *2152785840
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &2165225320 !ruby/object:Gem::Requirement
+  requirement: &2152785260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -39,10 +39,10 @@ dependencies:
         version: '1.5'
   type: :runtime
   prerelease: false
-  version_requirements: *2165225320
+  version_requirements: *2152785260
 - !ruby/object:Gem::Dependency
   name: unicode
-  requirement: &2165224280 !ruby/object:Gem::Requirement
+  requirement: &2152820780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -50,10 +50,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2165224280
+  version_requirements: *2152820780
 - !ruby/object:Gem::Dependency
   name: marc
-  requirement: &2165222960 !ruby/object:Gem::Requirement
+  requirement: &2152813900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -61,10 +61,10 @@ dependencies:
         version: 0.4.3
   type: :runtime
   prerelease: false
-  version_requirements: *2165222960
+  version_requirements: *2152813900
 - !ruby/object:Gem::Dependency
   name: rsolr
-  requirement: &2165221960 !ruby/object:Gem::Requirement
+  requirement: &2152828760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -72,10 +72,10 @@ dependencies:
         version: 1.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *2165221960
+  version_requirements: *2152828760
 - !ruby/object:Gem::Dependency
   name: rsolr-ext
-  requirement: &2165221360 !ruby/object:Gem::Requirement
+  requirement: &2152828120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -83,10 +83,10 @@ dependencies:
         version: 1.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *2165221360
+  version_requirements: *2152828120
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &2165220820 !ruby/object:Gem::Requirement
+  requirement: &2152827400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -94,10 +94,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2165220820
+  version_requirements: *2152827400
 - !ruby/object:Gem::Dependency
   name: sass-rails
-  requirement: &2165219480 !ruby/object:Gem::Requirement
+  requirement: &2152826720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -105,10 +105,10 @@ dependencies:
         version: 3.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *2165219480
+  version_requirements: *2152826720
 - !ruby/object:Gem::Dependency
   name: jettywrapper
-  requirement: &2165218460 !ruby/object:Gem::Requirement
+  requirement: &2152826120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -116,10 +116,10 @@ dependencies:
         version: 1.2.0
   type: :development
   prerelease: false
-  version_requirements: *2165218460
+  version_requirements: *2152826120
 - !ruby/object:Gem::Dependency
   name: compass
-  requirement: &2165227180 !ruby/object:Gem::Requirement
+  requirement: &2152825320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -127,7 +127,7 @@ dependencies:
         version: 0.12.alpha.2
   type: :runtime
   prerelease: false
-  version_requirements: *2165227180
+  version_requirements: *2152825320
 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
@@ -160,17 +160,20 @@ files:
 - app/assets/javascripts/blacklight/blacklight.js
 - app/assets/javascripts/jquery-1.4.2.min.js
 - app/assets/javascripts/jquery-ui-1.8.1.custom.min.js
+- app/assets/stylesheets/blacklight/_blacklight_base.css.scss
 - app/assets/stylesheets/blacklight/_catalog.css.scss
 - app/assets/stylesheets/blacklight/_facets.css.scss
 - app/assets/stylesheets/blacklight/_folder.css.scss
 - app/assets/stylesheets/blacklight/_formatting.css.scss
 - app/assets/stylesheets/blacklight/_header.css.scss
 - app/assets/stylesheets/blacklight/_layout.css.scss
+- app/assets/stylesheets/blacklight/_mixins.css.scss
 - app/assets/stylesheets/blacklight/_print.css.scss
 - app/assets/stylesheets/blacklight/_search_history.css.scss
-- app/assets/stylesheets/blacklight/_susy_framework.css.scss
 - 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
@@ -432,13 +435,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2728276321394562257
+      hash: -4385228888453993087
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
+      segments:
+      - 0
+      hash: -4385228888453993087
 requirements: []
 rubyforge_project: blacklight
 rubygems_version: 1.8.10