blacklight 3.2.0pre1 → 3.2.0pre2

data/VERSION

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

data/lib/blacklight/configuration/search_field.rb

@@ -1,12 +1,17 @@
 module Blacklight
-  class Configuration::SearchField < Configuration::SolrField
+  class Configuration::SearchField < OpenStructWithHashAccess
     def normalize! blacklight_config
       # Some normalization, calculate display_label from key,
       # and make sure we have a qt from defaults.             
-      self.key = self.field
+      self.key ||= self.field
+      self.field ||= self.key
       self.label ||= self.key.try(:titlecase)
       self.qt ||= blacklight_config.default_solr_params[:qt] if blacklight_config.default_solr_params
     end
+
+    def validate!
+      raise ArgumentError.new("Must supply a search field key") if self.key.nil?
+    end
   end
 end
 

data/lib/blacklight/configuration/sort_field.rb

@@ -1,5 +1,5 @@
 module Blacklight
-  class Configuration::SortField < Configuration::SolrField
+  class Configuration::SortField < OpenStructWithHashAccess
     def normalize! blacklight_config
       self.sort ||= self.field
 

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

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

data/test_support/spec/lib/blacklight_configuration_spec.rb

@@ -203,6 +203,12 @@ describe "Blacklight::Configuration" do
   describe "add_search_field" do
     it "should accept hash form" do
       c = Blacklight::Configuration.new
+      c.add_search_field(:key => "my_search_key")
+      c.search_fields["my_search_key"].should_not be_nil
+    end
+
+    it "should accept two-arg hash form" do
+      c = Blacklight::Configuration.new
       
       c.add_search_field("my_search_type",
           :key => "my_search_type",
@@ -260,6 +266,12 @@ describe "Blacklight::Configuration" do
   
   describe "add_sort_field" do
     it "should take a hash" do
+      c = Blacklight::Configuration.new
+      c.add_sort_field(:key => "my_sort_key", :sort => "score desc")
+      c.sort_fields["my_sort_key"].should_not be_nil
+    end
+
+    it "should take a two-arg form with a hash" do
       @config.add_sort_field("score desc, pub_date_sort desc, title_sort asc", :label => "relevance") 
 
       

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 3.2.0pre1
+  version: 3.2.0pre2
   prerelease: 5
 platform: ruby
 authors:
@@ -20,7 +20,7 @@ date: 2011-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2152421360 !ruby/object:Gem::Requirement
+  requirement: &2165181060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -28,10 +28,10 @@ dependencies:
         version: 3.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *2152421360
+  version_requirements: *2165181060
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &2152436680 !ruby/object:Gem::Requirement
+  requirement: &2165225320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -39,10 +39,10 @@ dependencies:
         version: '1.5'
   type: :runtime
   prerelease: false
-  version_requirements: *2152436680
+  version_requirements: *2165225320
 - !ruby/object:Gem::Dependency
   name: unicode
-  requirement: &2152435560 !ruby/object:Gem::Requirement
+  requirement: &2165224280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -50,10 +50,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152435560
+  version_requirements: *2165224280
 - !ruby/object:Gem::Dependency
   name: marc
-  requirement: &2152434620 !ruby/object:Gem::Requirement
+  requirement: &2165222960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -61,10 +61,10 @@ dependencies:
         version: 0.4.3
   type: :runtime
   prerelease: false
-  version_requirements: *2152434620
+  version_requirements: *2165222960
 - !ruby/object:Gem::Dependency
   name: rsolr
-  requirement: &2152434020 !ruby/object:Gem::Requirement
+  requirement: &2165221960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -72,10 +72,10 @@ dependencies:
         version: 1.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *2152434020
+  version_requirements: *2165221960
 - !ruby/object:Gem::Dependency
   name: rsolr-ext
-  requirement: &2152433500 !ruby/object:Gem::Requirement
+  requirement: &2165221360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -83,10 +83,10 @@ dependencies:
         version: 1.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *2152433500
+  version_requirements: *2165221360
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &2152432940 !ruby/object:Gem::Requirement
+  requirement: &2165220820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -94,10 +94,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152432940
+  version_requirements: *2165220820
 - !ruby/object:Gem::Dependency
   name: sass-rails
-  requirement: &2152432240 !ruby/object:Gem::Requirement
+  requirement: &2165219480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -105,10 +105,10 @@ dependencies:
         version: 3.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *2152432240
+  version_requirements: *2165219480
 - !ruby/object:Gem::Dependency
   name: jettywrapper
-  requirement: &2152431480 !ruby/object:Gem::Requirement
+  requirement: &2165218460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -116,10 +116,10 @@ dependencies:
         version: 1.2.0
   type: :development
   prerelease: false
-  version_requirements: *2152431480
+  version_requirements: *2165218460
 - !ruby/object:Gem::Dependency
   name: compass
-  requirement: &2152430640 !ruby/object:Gem::Requirement
+  requirement: &2165227180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -127,7 +127,7 @@ dependencies:
         version: 0.12.alpha.2
   type: :runtime
   prerelease: false
-  version_requirements: *2152430640
+  version_requirements: *2165227180
 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
@@ -432,7 +432,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1358212209663666339
+      hash: -2728276321394562257
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: