blacklight_advanced_search 5.2.0 → 5.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 42196e18fa408ad581faf0d48166bf86578c40f6
-  data.tar.gz: 6137564dd1ffdbc2b29e9e553515b74834af7fff
+  metadata.gz: fb68c4b7b6f6fbe62c4f6080aeba080f1f28af23
+  data.tar.gz: dcc1f42eec4a0f45f64de6a5323dd620de0e0f8a
 SHA512:
-  metadata.gz: 94fd18c2f7bf110903cd2f8a6c33de4e56b6422ab37337b9e0690046fc068a4073d2d27912719da12b296af7797cdfa339ac44b39ee580b3856f108dd5f8b0df
-  data.tar.gz: df99f7c358ab936301edb9fafc0d710164ff05b5f086f313dd8e4218fd53bdbf7df05a56dfc7df26cad36aad57f9ef6d3fd4e1f9ac15065c635d61441c4f0536
+  metadata.gz: 71a9e1063c93f5daab27648cc616d892642d1560db2158f1f1a2585542db96adf7602159c81c7658c8f258d35fc3748564c741484941713f32841a02cdd23784
+  data.tar.gz: 63a3c3aeba623484f6935a9c4faac5b99f104f5177633ad071f3e5cf508b1a8a8d6c9be6a31e8573040fc8fca0a201fe1b6ced03816d61f021112525833885d5

data/.gitignore

@@ -4,6 +4,7 @@ coverage/
 log/*
 *.log
 /spec/internal
+.internal_test_app
 /jetty
 Gemfile.lock
 pkg/*

data/Gemfile

@@ -2,17 +2,30 @@ source 'http://rubygems.org'
 
 gemspec
 
-file = File.expand_path("Gemfile", ENV['ENGINE_CART_DESTINATION'] || ENV['RAILS_ROOT'] || File.expand_path("../spec/internal", __FILE__))
-if File.exists?(file)
-  puts "Loading #{file} ..." if $DEBUG # `ruby -d` or `bundle -v`
-  instance_eval File.read(file)
+# BEGIN ENGINE_CART BLOCK
+# engine_cart: 0.8.0
+# engine_cart stanza: 0.8.0
+# the below comes from engine_cart, a gem used to test this Rails engine gem in the context of a Rails app.
+file = File.expand_path("Gemfile", ENV['ENGINE_CART_DESTINATION'] || ENV['RAILS_ROOT'] || File.expand_path(".internal_test_app", File.dirname(__FILE__)))
+if File.exist?(file)
+  begin
+    eval_gemfile file
+  rescue Bundler::GemfileError => e
+    Bundler.ui.warn '[EngineCart] Skipping Rails application dependencies:'
+    Bundler.ui.warn e.message
+  end
 else
+  Bundler.ui.warn "[EngineCart] Unable to find test application dependencies in #{file}, using placeholder dependencies"
+
   gem 'rails', ENV['RAILS_VERSION'] if ENV['RAILS_VERSION']
 
-  if ENV['RAILS_VERSION'] and ENV['RAILS_VERSION'] =~ /^4.2/
+  if ENV['RAILS_VERSION'].nil? || ENV['RAILS_VERSION'] =~ /^4.2/
+    gem 'bootstrap-sass', '>= 3.3.5.1'
     gem 'responders', "~> 2.0"
     gem 'sass-rails', ">= 5.0"
   else
+    gem 'bootstrap-sass', '< 3.3.5' # 3.3.5 requires sass 3.3, incompatible with sass-rails 4.x
     gem 'sass-rails', "< 5.0"
   end
-end
+end
+# END ENGINE_CART BLOCK

data/VERSION

@@ -1 +1 @@
-5.2.0
+5.2.1

data/blacklight_advanced_search.gemspec

@@ -24,5 +24,5 @@ Gem::Specification.new do |s|
   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.6"
+  s.add_development_dependency 'engine_cart', "~> 0.8"
 end

data/lib/blacklight_advanced_search/controller.rb

@@ -1,53 +1,45 @@
 require 'blacklight_advanced_search/parsing_nesting_parser'
 
 # This module gets included into CatalogController, or another SearchHelper
-# includer, to add behavior into search_params_logic. 
+# includer, to add behavior into search_params_logic.
 module BlacklightAdvancedSearch::Controller
   extend ActiveSupport::Concern
 
   included do
-    # default adv config values
-    self.blacklight_config.advanced_search ||= Blacklight::OpenStructWithHashAccess.new
-    #self.blacklight_config.advanced_search[:qt] ||= 'advanced'
-    self.blacklight_config.advanced_search[:url_key] ||= 'advanced'
-    self.blacklight_config.advanced_search[:query_parser] ||= 'dismax'
-    self.blacklight_config.advanced_search[:form_solr_parameters] ||= {}    
-    
-    
-    if self.respond_to? :search_params_logic
-      # Parse app URL params used for adv searches 
+    # default advanced config values
+    blacklight_config.advanced_search ||= Blacklight::OpenStructWithHashAccess.new
+    #blacklight_config.advanced_search[:qt] ||= 'advanced'
+    blacklight_config.advanced_search[:url_key] ||= 'advanced'
+    blacklight_config.advanced_search[:query_parser] ||= 'dismax'
+    blacklight_config.advanced_search[:form_solr_parameters] ||= {}
+
+    if 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 
+    # Silence deprecations that occur when this code is executed before blacklight
+    # has generated a SearchBuilder.
+    Deprecation.silence Blacklight::Configuration do
+      unless blacklight_config.search_builder_class.include? BlacklightAdvancedSearch::AdvancedSearchBuilder
+        blacklight_config.search_builder_class.send(:include,
+                BlacklightAdvancedSearch::AdvancedSearchBuilder
             )
+      end
     end
-          
-          
+
     # Display advanced search constraints properly
     helper BlacklightAdvancedSearch::RenderConstraintsOverride
     helper BlacklightAdvancedSearch::CatalogHelperOverride
     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[:search_field] == blacklight_config.advanced_search[:url_key]) ||
     req_params[:f_inclusive]
   end
 
   def advanced_query
-    BlacklightAdvancedSearch::QueryParser.new(params, self.blacklight_config ) if is_advanced_search?  
+    BlacklightAdvancedSearch::QueryParser.new(params, blacklight_config) if is_advanced_search?
   end
-  
 end
-
-  
-
-
-  
-

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

@@ -1,7 +1,7 @@
 require 'rails/generators'
 
 class TestAppGenerator < Rails::Generators::Base
-  source_root File.expand_path("../../../../test_app_templates", __FILE__)
+  source_root File.expand_path("../../../../spec/test_app_templates", __FILE__)
 
   def remove_index 
     remove_file "public/index.html"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight_advanced_search
 version: !ruby/object:Gem::Version
-  version: 5.2.0
+  version: 5.2.1
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-12 00:00:00.000000000 Z
+date: 2015-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blacklight
@@ -101,14 +101,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.8'
 description: 
 email:
 - blacklight-development@googlegroups.com
@@ -196,7 +196,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: blacklight
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Blacklight Advanced Search plugin