blacklight_advanced_search 5.1.2 → 5.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a33cedcfe2d2ab6b0d6e13b59590f437a677c28f
-  data.tar.gz: 31a0d2c735d319c12d3b68f9ec628488422ae7b6
+  metadata.gz: bff9b8e310bf1d4bc8712103ef0d4c3887662ebc
+  data.tar.gz: dde5a134cceff1ff2c419f28fdf5c17760b55186
 SHA512:
-  metadata.gz: 63f77f4d587c6e992d989d1cd77fc29c06e1501dce50ef1dfadac14897d8a046634ed763e965020a99d4e612d23ab99b951e25cac8490bf739ccab996a6a9019
-  data.tar.gz: c150f0260b05357f3def4aa0dbfd1f96247fa9fcaef7cb55b76ba897b17553997f40b169b40f9c27520d01c25b219acb43935ac1bf3ad80eb1a77029aa8b9486
+  metadata.gz: c60a43939cf1b6f6acd6491b578d4d60dd4c2896261cd268284822e5b89eaec1f298d94aac23d32a87773f9430a2a98f20ac499277a38b62a1349446c54356da
+  data.tar.gz: 6a63d2ef79e82bd6184cac02a67008f2bf3fdf8301b952f66f6e1141422de6e1fae13e3736eafc87eb4deb6a768447b658e6a08f4ce03b27a46a94d972489462

data/.travis.yml

@@ -2,10 +2,10 @@ notifications:
   email: false
 
 rvm:
+  - 2.2
   - 2.1
-  - 2.0
-  - 1.9.3
-  - jruby-19mode
+  # - 1.9.3
+  # - jruby-19mode
 
 notifications:
   irc: "irc.freenode.org#blacklight"

data/Gemfile

@@ -7,14 +7,12 @@ if File.exists?(file)
   puts "Loading #{file} ..." if $DEBUG # `ruby -d` or `bundle -v`
   instance_eval File.read(file)
 else
-  gem 'rails', ENV['RAILS_VERSION']
-  
-  # explicitly include sass-rails to get compatible sprocket dependencies
+  gem 'rails', ENV['RAILS_VERSION'] if ENV['RAILS_VERSION']
+
   if ENV['RAILS_VERSION'] and ENV['RAILS_VERSION'] =~ /^4.2/
-    gem 'sass-rails', ">= 5.0.0.beta1"
     gem 'responders', "~> 2.0"
+    gem 'sass-rails', ">= 5.0"
   else
     gem 'sass-rails', "< 5.0"
-    gem 'coffee-rails', "~> 4.0.0"
   end
 end

data/README.md

@@ -32,7 +32,7 @@ Add to your application's Gemfile:
 
 then run 'bundle install'.  Then run:
 
-    rails generate blacklight_advanced_search
+    rails generate blacklight_advanced_search:install
 
 * 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. 

data/Rakefile

@@ -5,14 +5,15 @@ require 'rdoc/task'
 require 'bundler/setup'
 Bundler::GemHelper.install_tasks
 
-ZIP_URL = "https://github.com/projectblacklight/blacklight-jetty/archive/v4.0.0.zip"
+ZIP_URL = "https://github.com/projectblacklight/blacklight-jetty/archive/v4.10.3.zip"
 APP_ROOT = File.dirname(__FILE__)
 
 require 'rspec/core/rake_task'
 require 'engine_cart/rake_task'
 
+EngineCart.fingerprint_proc = EngineCart.rails_fingerprint_proc
+
 require 'jettywrapper'
-require 'blacklight'
 
 task :default => :ci
 

data/VERSION

@@ -1 +1 @@
-5.1.2
+5.1.3

data/app/controllers/blacklight_advanced_search/advanced_controller.rb

@@ -54,12 +54,6 @@ class BlacklightAdvancedSearch::AdvancedController < CatalogController
     # ensure empty query is all records, to fetch available facets on entire corpus
     input[:q] ||= '{!lucene}*:*'
     
-    # solr_repository was introduced in Blacklight 5.8
-    if respond_to? :solr_repository
-      solr_repository.search(input)
-    else
-      # first arg nil, use default search path.
-      find nil, input.to_hash
-    end
+    repository.search(input)
   end
 end

data/app/views/blacklight_advanced_search/_facet_limit.html.erb

@@ -2,7 +2,7 @@
   <div class="inclusive_or well">
     <h4>Any of:</h4>
     <ul class="list-unstyled facet-values">
-    <% @advanced_query.filters[solr_field].each do |value| %>
+    <% advanced_query.filters[solr_field].each do |value| %>
         <li>
             <span class="selected"><%= h(value) %></span> 
             <%= link_to(remove_advanced_facet_param(solr_field, value, params), :class => "remove") do %>

data/blacklight_advanced_search.gemspec

@@ -17,13 +17,12 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency "blacklight", ">= 5.2", "< 6.0"
+  s.add_dependency "blacklight", "~> 5.10"
   s.add_dependency "parslet"
 
-  s.add_development_dependency "blacklight_marc"
   s.add_development_dependency "rails"
-  s.add_development_dependency "rspec-rails", "~> 2.99"
+  s.add_development_dependency "rspec-rails", "~> 3.0"
   s.add_development_dependency "capybara"
   s.add_development_dependency 'jettywrapper', ">= 1.4.2"
-  s.add_development_dependency 'engine_cart', "~> 0.4"
+  s.add_development_dependency 'engine_cart', "~> 0.6"
 end

data/lib/blacklight_advanced_search/advanced_search_builder.rb

@@ -0,0 +1,31 @@
+module BlacklightAdvancedSearch
+  module AdvancedSearchBuilder
+    def is_advanced_search?
+      (blacklight_params[:search_field] == self.blacklight_config.advanced_search[:url_key]) || blacklight_params[:f_inclusive]
+    end
+
+    # this method should get added into the search_params_logic
+    # list, in a position AFTER normal query handling (:add_query_to_solr),
+    # so it'll overwrite that if and only if it's an advanced search.
+    # adds a 'q' and 'fq's based on advanced search form input. 
+    def add_advanced_search_to_solr(solr_parameters)
+      # If we've got the hint that we're doing an 'advanced' search, then
+      # map that to solr #q, over-riding whatever some other logic may have set, yeah.
+      # the hint right now is :search_field request param is set to a magic
+      # key. OR of :f_inclusive is set for advanced params, we need processing too.     
+      if is_advanced_search?
+        # Set this as a controller instance variable, not sure if some views/helpers depend on it. Better to leave it as a local variable
+        # if not, more investigation later.       
+        advanced_query = BlacklightAdvancedSearch::QueryParser.new(blacklight_params, self.blacklight_config )      
+        BlacklightAdvancedSearch.deep_merge!(solr_parameters, advanced_query.to_solr )
+        if advanced_query.keyword_queries.length > 0
+          # force :qt if set, fine if it's nil, we'll use whatever CatalogController
+          # ordinarily uses.         
+          solr_parameters[:qt] = self.blacklight_config.advanced_search[:qt]
+          solr_parameters[:defType] = "lucene"        
+        end
+        
+      end
+    end
+  end
+end

data/lib/blacklight_advanced_search/catalog_helper_override.rb

@@ -24,7 +24,7 @@ module BlacklightAdvancedSearch::CatalogHelperOverride
   # Special display for facet limits that include adv search inclusive
   # or limits.
   def facet_partial_name(display_facet = nil)
-    return "blacklight_advanced_search/facet_limit" if @advanced_query && @advanced_query.filters.keys.include?( display_facet.name )
+    return "blacklight_advanced_search/facet_limit" if advanced_query && advanced_query.filters.keys.include?( display_facet.name )
     super 
   end
 

data/lib/blacklight_advanced_search/controller.rb

@@ -1,7 +1,7 @@
 require 'blacklight_advanced_search/parsing_nesting_parser'
 
-# This module gets included into CatalogController, or another SolrHelper
-# includer, to add behavior into solr_search_params_logic. 
+# This module gets included into CatalogController, or another SearchHelper
+# includer, to add behavior into search_params_logic. 
 module BlacklightAdvancedSearch::Controller
   extend ActiveSupport::Concern
 
@@ -14,44 +14,35 @@ module BlacklightAdvancedSearch::Controller
     self.blacklight_config.advanced_search[:form_solr_parameters] ||= {}    
     
     
-    # Parse app URL params used for adv searches 
-    self.solr_search_params_logic += [:add_advanced_search_to_solr]
-    
+    if self.respond_to? :search_params_logic
+      # Parse app URL params used for adv searches 
+      self.search_params_logic += [:add_advanced_search_to_solr]
+    end
+
+    if self.blacklight_config.search_builder_class
+    self.blacklight_config.search_builder_class.send(:include,  
+              BlacklightAdvancedSearch::AdvancedSearchBuilder  
+          ) unless
+          self.blacklight_config.search_builder_class.include?(   
+              BlacklightAdvancedSearch::AdvancedSearchBuilder 
+            )
+    end
+          
+          
     # Display advanced search constraints properly
     helper BlacklightAdvancedSearch::RenderConstraintsOverride
     helper BlacklightAdvancedSearch::CatalogHelperOverride
-    helper_method :is_advanced_search?
+    helper_method :is_advanced_search?, :advanced_query
   end
   
   def is_advanced_search? req_params = params
     (req_params[:search_field] == self.blacklight_config.advanced_search[:url_key]) ||
-          req_params[:f_inclusive]
+    req_params[:f_inclusive]
   end
-  
-  # this method should get added into the solr_search_params_logic
-  # list, in a position AFTER normal query handling (:add_query_to_solr),
-  # so it'll overwrite that if and only if it's an advanced search.
-  # adds a 'q' and 'fq's based on advanced search form input. 
-  def add_advanced_search_to_solr(solr_parameters, req_params = params)
-    # If we've got the hint that we're doing an 'advanced' search, then
-    # map that to solr #q, over-riding whatever some other logic may have set, yeah.
-    # the hint right now is :search_field request param is set to a magic
-    # key. OR of :f_inclusive is set for advanced params, we need processing too.     
-    if is_advanced_search? req_params
-      # Set this as a controller instance variable, not sure if some views/helpers depend on it. Better to leave it as a local variable
-      # if not, more investigation later.       
-      @advanced_query = BlacklightAdvancedSearch::QueryParser.new(req_params, self.blacklight_config )      
-      BlacklightAdvancedSearch.deep_merge!(solr_parameters, @advanced_query.to_solr )
-      if @advanced_query.keyword_queries.length > 0
-        # force :qt if set, fine if it's nil, we'll use whatever CatalogController
-        # ordinarily uses.         
-        solr_parameters[:qt] = self.blacklight_config.advanced_search[:qt]
-        solr_parameters[:defType] = "lucene"        
-      end
-      
-    end
+
+  def advanced_query
+    BlacklightAdvancedSearch::QueryParser.new(params, self.blacklight_config ) if is_advanced_search?  
   end
-          
   
 end
 

data/lib/blacklight_advanced_search/parse_basic_q.rb

@@ -15,7 +15,7 @@ module BlacklightAdvancedSearch::ParseBasicQ
   include Blacklight::SearchFields
   
   included do
-    self.solr_search_params_logic += [:add_advanced_parse_q_to_solr]
+    self.search_params_logic += [:add_advanced_parse_q_to_solr]
   end
 
   # Different versions of Parslet raise different exception classes,
@@ -27,9 +27,9 @@ module BlacklightAdvancedSearch::ParseBasicQ
   end
   
   
-  # This method can be included in solr_search_params_logic to have us
+  # This method can be included in search_params_logic to have us
   # parse an ordinary entered :q for AND/OR/NOT and produce appropriate
-  # Solr query. Note that it is NOT included in solr_search_params_logic
+  # Solr query. Note that it is NOT included in search_params_logic
   # by default when this module is included, because it is optional behavior.
   # BlacklightAdvancedSearch init code will add it to CatalogController
   # if it's configured to do so. You can of course add it yourself

data/lib/blacklight_advanced_search/render_constraints_override.rb

@@ -12,14 +12,13 @@ module BlacklightAdvancedSearch::RenderConstraintsOverride
   end
 
   #Over-ride of Blacklight method, provide advanced constraints if needed,
-  # otherwise call super. Existence of an @advanced_query instance variable
-  # is our trigger that we're in advanced mode.
+  # otherwise call super.
   def render_constraints_query(my_params = params)
-    if (@advanced_query.nil? || @advanced_query.keyword_queries.empty? )
+    if (advanced_query.nil? || advanced_query.keyword_queries.empty? )
       return super(my_params)
     else
       content = []
-      @advanced_query.keyword_queries.each_pair do |field, query|
+      advanced_query.keyword_queries.each_pair do |field, query|
         label = search_field_def_for_key(field)[:label]
         content << render_constraint_element(
           label, query,
@@ -27,8 +26,8 @@ module BlacklightAdvancedSearch::RenderConstraintsOverride
             catalog_index_path(remove_advanced_keyword_query(field,my_params))
         )
       end
-      if (@advanced_query.keyword_op == "OR" &&
-          @advanced_query.keyword_queries.length > 1)
+      if (advanced_query.keyword_op == "OR" &&
+          advanced_query.keyword_queries.length > 1)
         content.unshift content_tag(:span, "Any of:", class:'operator')
         content_tag :span, class: "inclusive_or appliedFilter well" do
           safe_join(content.flatten, "\n")
@@ -40,13 +39,12 @@ module BlacklightAdvancedSearch::RenderConstraintsOverride
   end
 
   #Over-ride of Blacklight method, provide advanced constraints if needed,
-  # otherwise call super. Existence of an @advanced_query instance variable
-  # is our trigger that we're in advanced mode.
+  # otherwise call super.
   def render_constraints_filters(my_params = params)
     content = super(my_params)
 
-    if (@advanced_query)
-      @advanced_query.filters.each_pair do |field, value_list|
+    if (advanced_query)
+      advanced_query.filters.each_pair do |field, value_list|
         label = facet_field_label(field)
         content << render_constraint_element(label,
           safe_join(value_list, " <strong class='text-muted constraint-connector'>OR</strong> ".html_safe),

data/lib/blacklight_advanced_search.rb

@@ -1,4 +1,5 @@
 module BlacklightAdvancedSearch
+  autoload :AdvancedSearchBuilder, 'blacklight_advanced_search/advanced_search_builder'
   autoload :Controller, 'blacklight_advanced_search/controller'
   autoload :RenderConstraintsOverride, 'blacklight_advanced_search/render_constraints_override'
   autoload :CatalogHelperOverride, 'blacklight_advanced_search/catalog_helper_override'

data/lib/generators/blacklight_advanced_search/blacklight_advanced_search_generator.rb

@@ -1,24 +1,10 @@
 require 'rails/generators'
 
 class BlacklightAdvancedSearchGenerator < Rails::Generators::Base
-  source_root File.expand_path('../templates', __FILE__)
 
-  require File.expand_path('../assets_generator.rb', __FILE__)  
   def inject_asset_requires
-    BlacklightAdvancedSearch::AssetsGenerator.start
+    say "`rails g blacklight_advanced_search` is deprecated; use blacklight_advanced_search:install instead", :red
+    generate "blacklight_advanced_search:install"
   end
   
-  
-  def install_localized_search_form
-    if options[:force] or yes?("Install local search form with advanced link? (y/N)", :green)
-      # We're going to copy the search from from actual currently loaded
-      # Blacklight into local app as custom local override -- but add our link at the end too. 
-      source_file = File.read(File.join(Blacklight.root, "app/views/catalog/_search_form.html.erb"))
-
-      new_file_contents = source_file + "\n\n<%= link_to 'More options', advanced_search_path(params), :class=>'advanced_search'%>"
-
-      create_file("app/views/catalog/_search_form.html.erb", new_file_contents)      
-    end
-  end
-
 end

data/lib/generators/blacklight_advanced_search/install_generator.rb

@@ -0,0 +1,25 @@
+require 'rails/generators'
+
+module BlacklightAdvancedSearch
+  class InstallGenerator < Rails::Generators::Base
+    source_root File.expand_path('../templates', __FILE__)
+
+    def inject_asset_requires
+      generate "blacklight_advanced_search:assets"
+    end
+    
+    
+    def install_localized_search_form
+      if options[:force] or yes?("Install local search form with advanced link? (y/N)", :green)
+        # We're going to copy the search from from actual currently loaded
+        # Blacklight into local app as custom local override -- but add our link at the end too. 
+        source_file = File.read(File.join(Blacklight.root, "app/views/catalog/_search_form.html.erb"))
+
+        new_file_contents = source_file + "\n\n<%= link_to 'More options', advanced_search_path(params), :class=>'advanced_search'%>"
+
+        create_file("app/views/catalog/_search_form.html.erb", new_file_contents)      
+      end
+    end
+  end
+
+end

data/spec/parsing_nesting/parse_basic_q_spec.rb

@@ -12,16 +12,14 @@ describe "NestingParser" do
   # It gets kind of a mess of dependencies, sorry. 
   class ParseBasicQTestClass
     cattr_accessor :blacklight_config
-    cattr_accessor :blacklight_solr
 
-    include Blacklight::SolrHelper
+    include Blacklight::SearchHelper
     
     include BlacklightAdvancedSearch::ParseBasicQ
 
 
-    def initialize blacklight_config, blacklight_solr
+    def initialize blacklight_config
       self.blacklight_config = blacklight_config
-      self.blacklight_solr = blacklight_solr
     end
 
     def params
@@ -48,7 +46,7 @@ describe "NestingParser" do
           field.advanced_parse = false
         end
       end
-      @obj = ParseBasicQTestClass.new @blacklight_config, Blacklight.solr 
+      @obj = ParseBasicQTestClass.new @blacklight_config 
     end
 
     it "catches a simple example" do

data/spec/test_app_templates/lib/generators/test_app_generator.rb

@@ -15,7 +15,7 @@ class TestAppGenerator < Rails::Generators::Base
   end
 
   def run_blacklight_advanced_search
-    generate 'blacklight_advanced_search', '--force'
+    generate 'blacklight_advanced_search:install', '--force'
   end
 
   def run_test_support_generator

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight_advanced_search
 version: !ruby/object:Gem::Version
-  version: 5.1.2
+  version: 5.1.3
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -9,28 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-17 00:00:00.000000000 Z
+date: 2015-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blacklight
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '5.2'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '5.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '5.2'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '5.10'
 - !ruby/object:Gem::Dependency
   name: parslet
   requirement: !ruby/object:Gem::Requirement
@@ -45,20 +39,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: blacklight_marc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -79,14 +59,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.99'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.99'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -121,14 +101,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.6'
 description: 
 email:
 - blacklight-development@googlegroups.com
@@ -165,6 +145,7 @@ files:
 - config/routes.rb
 - lib/blacklight_advanced_search.rb
 - lib/blacklight_advanced_search/advanced_query_parser.rb
+- lib/blacklight_advanced_search/advanced_search_builder.rb
 - lib/blacklight_advanced_search/catalog_helper_override.rb
 - lib/blacklight_advanced_search/controller.rb
 - lib/blacklight_advanced_search/engine.rb
@@ -176,6 +157,7 @@ files:
 - lib/blacklight_advanced_search/version.rb
 - lib/generators/blacklight_advanced_search/assets_generator.rb
 - lib/generators/blacklight_advanced_search/blacklight_advanced_search_generator.rb
+- lib/generators/blacklight_advanced_search/install_generator.rb
 - lib/generators/blacklight_advanced_search/templates/advanced_controller.rb
 - lib/parsing_nesting/Readme.rdoc
 - lib/parsing_nesting/grammar.rb
@@ -213,7 +195,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: blacklight
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Blacklight Advanced Search plugin