blacklight_advanced_search 1.2.2 → 1.2.3

data/README.rdoc

@@ -23,7 +23,7 @@ then run 'bundle install'.  Then run:
 * The 'generate' command will install 'require' statements for the plugin's assets into your application's application.js/application.css asset pipeline files
 * And it can optionally install a localized search form with a link to advanced search. If you've already localized your search form you'll want to do this manually instead. 
 
-You may want to set `blacklight_config.advanced_search.advanced_parse_q = true` to enable AND/OR/NOT parsing even in ordinary search, this is not on by default.  
+You may want to  `include BlacklightAdvancedSearch::ParseBasicQ` in your CatalogController to enable AND/OR/NOT parsing even in ordinary search, this is not on by default.  
 
 == Accessing
  

data/VERSION

@@ -1 +1 @@
-1.2.2
+1.2.3

data/lib/blacklight_advanced_search/render_constraints_override.rb

@@ -12,7 +12,7 @@ module BlacklightAdvancedSearch::RenderConstraintsOverride
     else
       content = ""
       @advanced_query.keyword_queries.each_pair do |field, query|
-        label = search_field_def_for_key(field)[:display_label]
+        label = search_field_def_for_key(field)[:label]
         content << render_constraint_element(
           label, query,
           :remove =>
@@ -75,7 +75,7 @@ module BlacklightAdvancedSearch::RenderConstraintsOverride
         # Need to do something to make the inclusive-or search clear
 
         display_as = advanced_query.keyword_queries.collect do |field, query|
-          h( search_field_def_for_key(field)[:display_label] + ": " + query )
+          h( search_field_def_for_key(field)[:label] + ": " + query )
         end.join(" ; ")
         
         content << render_search_to_s_element("Any of",
@@ -84,7 +84,7 @@ module BlacklightAdvancedSearch::RenderConstraintsOverride
         )
     elsif (advanced_query.keyword_queries.length > 0) 
       advanced_query.keyword_queries.each_pair do |field, query|
-        label = search_field_def_for_key(field)[:display_label]
+        label = search_field_def_for_key(field)[:label]
 
         content << render_search_to_s_element(label, query)
       end    

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight_advanced_search
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-20 00:00:00.000000000 Z
+date: 2012-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &11933380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,15 +22,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.0'
+  version_requirements: *11933380
 - !ruby/object:Gem::Dependency
   name: blacklight
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &11932060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -41,18 +36,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 3.2.1
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.2'
+  version_requirements: *11932060
 - !ruby/object:Gem::Dependency
   name: parslet
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &11930240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -60,15 +47,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *11930240
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &11928860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,15 +58,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *11928860
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &11928440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -92,15 +69,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *11928440
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &11928020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -108,15 +80,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *11928020
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &11927600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -124,15 +91,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *11927600
 - !ruby/object:Gem::Dependency
   name: launchy
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &11955640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -140,12 +102,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *11955640
 description: 
 email:
 - blacklight-development@googlegroups.com
@@ -234,7 +191,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: blacklight
-rubygems_version: 1.8.19
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Blacklight Advanced Search plugin