blacklight_advanced_search 5.2.0 → 5.2.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.gitignore +1 -0
- data/Gemfile +19 -6
- data/VERSION +1 -1
- data/blacklight_advanced_search.gemspec +1 -1
- data/lib/blacklight_advanced_search/controller.rb +21 -29
- data/spec/test_app_templates/lib/generators/test_app_generator.rb +1 -1
- metadata +5 -5
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: fb68c4b7b6f6fbe62c4f6080aeba080f1f28af23
|
4
|
+
data.tar.gz: dcc1f42eec4a0f45f64de6a5323dd620de0e0f8a
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 71a9e1063c93f5daab27648cc616d892642d1560db2158f1f1a2585542db96adf7602159c81c7658c8f258d35fc3748564c741484941713f32841a02cdd23784
|
7
|
+
data.tar.gz: 63a3c3aeba623484f6935a9c4faac5b99f104f5177633ad071f3e5cf508b1a8a8d6c9be6a31e8573040fc8fca0a201fe1b6ced03816d61f021112525833885d5
|
data/.gitignore
CHANGED
data/Gemfile
CHANGED
@@ -2,17 +2,30 @@ source 'http://rubygems.org'
|
|
2
2
|
|
3
3
|
gemspec
|
4
4
|
|
5
|
-
|
6
|
-
|
7
|
-
|
8
|
-
|
5
|
+
# BEGIN ENGINE_CART BLOCK
|
6
|
+
# engine_cart: 0.8.0
|
7
|
+
# engine_cart stanza: 0.8.0
|
8
|
+
# the below comes from engine_cart, a gem used to test this Rails engine gem in the context of a Rails app.
|
9
|
+
file = File.expand_path("Gemfile", ENV['ENGINE_CART_DESTINATION'] || ENV['RAILS_ROOT'] || File.expand_path(".internal_test_app", File.dirname(__FILE__)))
|
10
|
+
if File.exist?(file)
|
11
|
+
begin
|
12
|
+
eval_gemfile file
|
13
|
+
rescue Bundler::GemfileError => e
|
14
|
+
Bundler.ui.warn '[EngineCart] Skipping Rails application dependencies:'
|
15
|
+
Bundler.ui.warn e.message
|
16
|
+
end
|
9
17
|
else
|
18
|
+
Bundler.ui.warn "[EngineCart] Unable to find test application dependencies in #{file}, using placeholder dependencies"
|
19
|
+
|
10
20
|
gem 'rails', ENV['RAILS_VERSION'] if ENV['RAILS_VERSION']
|
11
21
|
|
12
|
-
if ENV['RAILS_VERSION']
|
22
|
+
if ENV['RAILS_VERSION'].nil? || ENV['RAILS_VERSION'] =~ /^4.2/
|
23
|
+
gem 'bootstrap-sass', '>= 3.3.5.1'
|
13
24
|
gem 'responders', "~> 2.0"
|
14
25
|
gem 'sass-rails', ">= 5.0"
|
15
26
|
else
|
27
|
+
gem 'bootstrap-sass', '< 3.3.5' # 3.3.5 requires sass 3.3, incompatible with sass-rails 4.x
|
16
28
|
gem 'sass-rails', "< 5.0"
|
17
29
|
end
|
18
|
-
end
|
30
|
+
end
|
31
|
+
# END ENGINE_CART BLOCK
|
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
5.2.
|
1
|
+
5.2.1
|
@@ -24,5 +24,5 @@ Gem::Specification.new do |s|
|
|
24
24
|
s.add_development_dependency "rspec-rails", "~> 3.0"
|
25
25
|
s.add_development_dependency "capybara"
|
26
26
|
s.add_development_dependency 'jettywrapper', ">= 1.4.2"
|
27
|
-
s.add_development_dependency 'engine_cart', "~> 0.
|
27
|
+
s.add_development_dependency 'engine_cart', "~> 0.8"
|
28
28
|
end
|
@@ -1,53 +1,45 @@
|
|
1
1
|
require 'blacklight_advanced_search/parsing_nesting_parser'
|
2
2
|
|
3
3
|
# This module gets included into CatalogController, or another SearchHelper
|
4
|
-
# includer, to add behavior into search_params_logic.
|
4
|
+
# includer, to add behavior into search_params_logic.
|
5
5
|
module BlacklightAdvancedSearch::Controller
|
6
6
|
extend ActiveSupport::Concern
|
7
7
|
|
8
8
|
included do
|
9
|
-
# default
|
10
|
-
|
11
|
-
#
|
12
|
-
|
13
|
-
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
# Parse app URL params used for adv searches
|
9
|
+
# default advanced config values
|
10
|
+
blacklight_config.advanced_search ||= Blacklight::OpenStructWithHashAccess.new
|
11
|
+
#blacklight_config.advanced_search[:qt] ||= 'advanced'
|
12
|
+
blacklight_config.advanced_search[:url_key] ||= 'advanced'
|
13
|
+
blacklight_config.advanced_search[:query_parser] ||= 'dismax'
|
14
|
+
blacklight_config.advanced_search[:form_solr_parameters] ||= {}
|
15
|
+
|
16
|
+
if respond_to? :search_params_logic
|
17
|
+
# Parse app URL params used for adv searches
|
19
18
|
self.search_params_logic += [:add_advanced_search_to_solr]
|
20
19
|
end
|
21
20
|
|
22
|
-
|
23
|
-
|
24
|
-
|
25
|
-
|
26
|
-
|
27
|
-
|
21
|
+
# Silence deprecations that occur when this code is executed before blacklight
|
22
|
+
# has generated a SearchBuilder.
|
23
|
+
Deprecation.silence Blacklight::Configuration do
|
24
|
+
unless blacklight_config.search_builder_class.include? BlacklightAdvancedSearch::AdvancedSearchBuilder
|
25
|
+
blacklight_config.search_builder_class.send(:include,
|
26
|
+
BlacklightAdvancedSearch::AdvancedSearchBuilder
|
28
27
|
)
|
28
|
+
end
|
29
29
|
end
|
30
|
-
|
31
|
-
|
30
|
+
|
32
31
|
# Display advanced search constraints properly
|
33
32
|
helper BlacklightAdvancedSearch::RenderConstraintsOverride
|
34
33
|
helper BlacklightAdvancedSearch::CatalogHelperOverride
|
35
34
|
helper_method :is_advanced_search?, :advanced_query
|
36
35
|
end
|
37
|
-
|
36
|
+
|
38
37
|
def is_advanced_search? req_params = params
|
39
|
-
(req_params[:search_field] ==
|
38
|
+
(req_params[:search_field] == blacklight_config.advanced_search[:url_key]) ||
|
40
39
|
req_params[:f_inclusive]
|
41
40
|
end
|
42
41
|
|
43
42
|
def advanced_query
|
44
|
-
BlacklightAdvancedSearch::QueryParser.new(params,
|
43
|
+
BlacklightAdvancedSearch::QueryParser.new(params, blacklight_config) if is_advanced_search?
|
45
44
|
end
|
46
|
-
|
47
45
|
end
|
48
|
-
|
49
|
-
|
50
|
-
|
51
|
-
|
52
|
-
|
53
|
-
|
@@ -1,7 +1,7 @@
|
|
1
1
|
require 'rails/generators'
|
2
2
|
|
3
3
|
class TestAppGenerator < Rails::Generators::Base
|
4
|
-
source_root File.expand_path("../../../../test_app_templates", __FILE__)
|
4
|
+
source_root File.expand_path("../../../../spec/test_app_templates", __FILE__)
|
5
5
|
|
6
6
|
def remove_index
|
7
7
|
remove_file "public/index.html"
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: blacklight_advanced_search
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 5.2.
|
4
|
+
version: 5.2.1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Jonathan Rochkind
|
@@ -9,7 +9,7 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2015-
|
12
|
+
date: 2015-11-05 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: blacklight
|
@@ -101,14 +101,14 @@ dependencies:
|
|
101
101
|
requirements:
|
102
102
|
- - "~>"
|
103
103
|
- !ruby/object:Gem::Version
|
104
|
-
version: '0.
|
104
|
+
version: '0.8'
|
105
105
|
type: :development
|
106
106
|
prerelease: false
|
107
107
|
version_requirements: !ruby/object:Gem::Requirement
|
108
108
|
requirements:
|
109
109
|
- - "~>"
|
110
110
|
- !ruby/object:Gem::Version
|
111
|
-
version: '0.
|
111
|
+
version: '0.8'
|
112
112
|
description:
|
113
113
|
email:
|
114
114
|
- blacklight-development@googlegroups.com
|
@@ -196,7 +196,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
196
196
|
version: '0'
|
197
197
|
requirements: []
|
198
198
|
rubyforge_project: blacklight
|
199
|
-
rubygems_version: 2.4.5
|
199
|
+
rubygems_version: 2.4.5.1
|
200
200
|
signing_key:
|
201
201
|
specification_version: 4
|
202
202
|
summary: Blacklight Advanced Search plugin
|