blacklight_advanced_search 1.0.0pre1 → 1.0.0pre2

data/README.rdoc

@@ -1,27 +1,38 @@
-This is an advanced search plugin for Blacklight ( http://www.projectblacklight.org ).  It is meant to be installed alongside the Blacklight plugin in your application's vendor/plugins directory.
-
+This is an advanced search plugin for Blacklight ( http://www.projectblacklight.org ).  
 
 == Pre-requisites:
 * The Blacklight plugin ( http://github.com/projectblacklight/blacklight )
-  * NOTE: 2.9 or later is required for current version of Advanced Search plugin. Older tagged versions of Advanced Search may work with older BL. 
-* Parslet gem ( https://github.com/kschiess/parslet )
+  * NOTE: Blacklight 3.x is required for current version of Advanced Search plugin
+  * advanced search plugin 0.12.0 will work with Blacklight 2.9/Rails2. 
+  * Older tagged versions of Advanced Search may work with older BL. 
+
 
 == Installation:
-Clone the advanced search plugin from github into your application's vendor/plugins directory 
-* cd into your application's vendor/plugins directory and run the following command:
- git clone http://github.com/projectblacklight/blacklight_advanced_search.git
 
-You can later use standard git commands to update the plugin to a new version.   
- 
-OR
+=== Blacklight 3.x/Rails 3
 
-from your application's main directory, run:
+Add to your application's Gemfile:
+   gem "blacklight_advanced_search"
 
- ./script/plugin install http://github.com/projectblacklight/blacklight_advanced_search.git
- 
+then run 'bundle install'.  Then run:
+   rails generate blacklight_advanced_search
 
-You can later use "./script/plugin update blacklight_advanced_search" to update to latest code.  
- 
+* The 'generate' command will copy some stylesheet/javascript assets to your local app (this architecture will likely change for Rails 3.1)
+* It will also OPTIONALLY install a config/initializers/blacklight_advanced_search.rb . Configuration in the initializer is optional, for many setups no configuration will be neccesary. See 'Configuration' section below.
+* 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 BlacklightAdvancedSearch.config[:advanced_parse_q] = true to enable AND/OR/NOT parsing even in ordinary search, this is not on by default.  
+
+=== Blacklight 2.x/Rails2
+
+Clone the advanced search plugin from github into your application's vendor/plugins directory , and switch
+to a version that works with BL 2.x/Rails2. 
+* cd into your application's vendor/plugins directory and run the following command:
+ git clone http://github.com/projectblacklight/blacklight_advanced_search.git
+ git checkout v0.12.0
+
+You can later use standard git commands to update the plugin to a new version.   
+  
 You will now need to add a parslet gem dependency to your app, since blacklight_advanced_search is not currently a gem itself, you have to do this manually. Add "config.gem 'parslet'" to your config/environment.rb, and then run:
 
   sudo rake gems:install

data/VERSION

@@ -1 +1 @@
-1.0.0pre1
+1.0.0pre2

data/lib/generators/blacklight_advanced_search/blacklight_advanced_search_generator.rb

@@ -7,5 +7,17 @@ class BlacklightAdvancedSearchGenerator < Rails::Generators::Base
   def copy_public_assets
     BlacklightAdvancedSearch::AssetsGenerator.start
   end
+  
+  def install_config_file
+    if options[:force] or yes?("Install optional example Blacklight Advanced Search config file?")
+      copy_file("blacklight_advanced_search_config.rb", "config/initializers/blacklight_advanced_search.rb")
+    end
+  end
+  
+  def install_localized_search_form
+    if options[:force] or yes?("Install local search form with advanced link?")      
+      copy_file("_search_form.html.erb", "app/views/catalog/_search_form.html.erb")      
+    end
+  end
 
 end

data/lib/generators/blacklight_advanced_search/templates/blacklight_advanced_search_config.rb

@@ -5,7 +5,7 @@
 #
 # NOTE WELL: Using a seperate request handler is just one option, in most cases
 # it's simpler to use your default solr request handler set in Blacklight itself,
-# in which case you would not want to set any of the configuration below!
+# in which case you can delete/comment out this entire file!
 # See README. 
 
 BlacklightAdvancedSearch.config.merge!(

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: blacklight_advanced_search
 version: !ruby/object:Gem::Version 
-  hash: 1923831947
+  hash: 1923831949
   prerelease: 5
   segments: 
   - 1
   - 0
   - 0
   - pre
-  - 1
-  version: 1.0.0pre1
+  - 2
+  version: 1.0.0pre2
 platform: ruby
 authors: 
 - Jonathan Rochkind
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-22 00:00:00 Z
+date: 2011-06-23 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails