blacklight_advanced_search 1.0.0 → 1.1.0

data/README.rdoc

@@ -78,7 +78,7 @@ The optional installer script can install a sample blacklight_advanced_search.rb
 
 If you turn on this feature with `BlacklightAdvancedSearch.config[:advanced_parse_q] = true`, then the plugin will intercept queries entered in ordinary Blacklight search interface, and parse them for AND/OR/NOT (and parens), producing appropriate Solr query. This allows single-field boolean expressions to be entered in ordinary search, providing a consistent experience with advanced search. 
 
-When this feature is turned on, queries that don't have any special operators (eg: AND, OR, NOT, parens) will still be passed to Solr much the same as they were before. But queries with special operators will have appropriate Solr queries generated for them, usually including nested "_query_" elements, to have the same meaning they would in advanced search. 
+When this feature is turned on, queries that don't have any special operators (eg: AND, OR, NOT, parens) will still be passed to Solr much the same as they were before. But queries with special operators will have appropriate Solr queries generated for them, usually including nested "_query_" elements, to have the same meaning they would in advanced search. If a user enters something that is a syntax error for parsed search (for instance an unclosed phrase quote or paren), the logic will rescue from the parse erorr by running the exact user entered query direct to solr without advanced parsing. 
 
 Due to limitations of the logic, sometimes these generated Solr queries may not really be as simple as they could be, they may include a *single* nested _query_, which really doens't need to be a nested query at all, although it will still work fine. 
 

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.1.0

data/app/assets/javascripts/blacklight_advanced_search.js

@@ -0,0 +1,5 @@
+// Master manifest file for engine, so local app can require
+// this one file, but get all our files -- and local app
+// require does not need to change if we change file list.
+
+//= require_tree './blacklight_advanced_search'

data/app/assets/stylesheets/blacklight_advanced_search.css

@@ -0,0 +1,6 @@
+/* Master manifest file for engine, so local app can require
+ * this one file, but get all our files -- and local app
+ * require does not need to change if we change file list. 
+ *
+ *= require_tree './blacklight_advanced_search'
+ */

data/app/controllers/advanced_controller.rb

@@ -3,7 +3,7 @@
 class AdvancedController < CatalogController
   include AdvancedHelper # so we get the #advanced_search_context method
   
-  before_filter :setup_advanced_search_css, :setup_advanced_search_js, :only => :index
+  before_filter :setup_advanced_search_assets, :only => :index
   
   def index
     unless request.method==:post
@@ -53,10 +53,11 @@ class AdvancedController < CatalogController
     
     Blacklight.solr.find(input.to_hash)
   end
-  def setup_advanced_search_css
-    stylesheet_links << ["blacklight_advanced_search_styles", {:plugin=>:blacklight_advanced_search}]
-  end
-  def setup_advanced_search_js
-    javascript_includes << ["blacklight_advanced_search_javascript", {:plugin=>:blacklight_advanced_search}]
+  def setup_advanced_search_assets
+    unless BlacklightAdvancedSearch.use_asset_pipeline?
+      stylesheet_links << ["blacklight_advanced_search_styles", {:plugin=>:blacklight_advanced_search}]
+      javascript_includes << ["blacklight_advanced_search_javascript", {:plugin=>:blacklight_advanced_search}]
+    end
   end
+  
 end

data/lib/blacklight_advanced_search.rb

@@ -70,5 +70,9 @@ module BlacklightAdvancedSearch
       end
       return val
     end
+    
+    def self.use_asset_pipeline?
+      (Rails::VERSION::MAJOR >= 3 and Rails::VERSION::MINOR >= 1) and Rails.application.config.assets.enabled
+    end
 
 end

data/lib/generators/blacklight_advanced_search/assets_generator.rb

@@ -13,11 +13,31 @@ require 'rails/generators'
 require 'rails/generators/base'
 module BlacklightAdvancedSearch
   class AssetsGenerator < Rails::Generators::Base
-    source_root File.expand_path('../templates', __FILE__)
+    source_root File.join(BlacklightAdvancedSearch::Engine.root, 'app', 'assets')
 
     def assets
-      directory("public/stylesheets")
-      directory("public/javascripts")
+      if BlacklightAdvancedSearch.use_asset_pipeline?
+        original_css = File.binread("app/assets/stylesheets/application.css")
+        if original_css.include?("require 'blacklight_advanced_search'")
+          say_status("skipped", "insert into app/assets/stylesheets/application.css", :yellow)
+        else        
+          insert_into_file "app/assets/stylesheets/application.css", :before => "*/" do
+            "\n *= require 'blacklight_advanced_search'\n\n"
+          end
+        end
+        
+        original_js = File.binread("app/assets/javascripts/application.js")
+        if original_js.include?("require 'blacklight_advanced_search'")
+          say_status("skipped", "insert into app/assets/javascripts/application.js", :yellow)
+        else
+          insert_into_file "app/assets/javascripts/application.js", :after => "//= require jquery" do
+            "\n//= require 'blacklight_advanced_search'\n\n"
+          end
+        end
+      else
+        directory("stylesheets/blacklight_advanced_search", "public/stylesheets")
+        directory("javascripts/blacklight_advanced_search", "public/javascripts")        
+      end
     end
 
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: blacklight_advanced_search
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 19
   prerelease: 
   segments: 
   - 1
+  - 1
   - 0
-  - 0
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Jonathan Rochkind
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-12 00:00:00 -04:00
+date: 2011-09-20 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -77,8 +77,12 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
+- app/assets/javascripts/blacklight_advanced_search.js
+- app/assets/javascripts/blacklight_advanced_search/blacklight_advanced_search_javascript.js
+- app/assets/stylesheets/blacklight_advanced_search.css
+- app/assets/stylesheets/blacklight_advanced_search/advanced_results.css
+- app/assets/stylesheets/blacklight_advanced_search/blacklight_advanced_search_styles.css
 - app/controllers/advanced_controller.rb
-- app/controllers/application_controller.rb
 - app/helpers/advanced_helper.rb
 - app/views/advanced/_advanced_search_facets.html.erb
 - app/views/advanced/_advanced_search_fields.html.erb
@@ -102,9 +106,6 @@ files:
 - lib/generators/blacklight_advanced_search/blacklight_advanced_search_generator.rb
 - lib/generators/blacklight_advanced_search/templates/_search_form.html.erb
 - lib/generators/blacklight_advanced_search/templates/blacklight_advanced_search_config.rb
-- lib/generators/blacklight_advanced_search/templates/public/javascripts/blacklight_advanced_search_javascript.js
-- lib/generators/blacklight_advanced_search/templates/public/stylesheets/advanced_results.css
-- lib/generators/blacklight_advanced_search/templates/public/stylesheets/blacklight_advanced_search_styles.css
 - lib/parsing_nesting/Readme.rdoc
 - lib/parsing_nesting/grammar.rb
 - lib/parsing_nesting/tree.rb

data/app/controllers/application_controller.rb

@@ -1,5 +0,0 @@
-class ApplicationController < ActionController::Base
-  helper :all # include all helpers, all the time
-  protect_from_forgery # See ActionController::RequestForgeryProtection for details
-  
-end