blacklight_advanced_search 6.0.2 → 6.1.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.rspec +2 -0
- data/.rubocop.yml +15 -0
- data/.rubocop_todo.yml +351 -0
- data/.solr_wrapper.yml +5 -0
- data/.travis.yml +4 -7
- data/Gemfile +18 -11
- data/Rakefile +24 -34
- data/VERSION +1 -1
- data/app/controllers/advanced_controller.rb +5 -7
- data/app/controllers/blacklight_advanced_search/advanced_controller.rb +5 -8
- data/app/helpers/advanced_helper.rb +4 -6
- data/blacklight_advanced_search.gemspec +11 -8
- data/lib/blacklight_advanced_search.rb +29 -34
- data/lib/blacklight_advanced_search/advanced_query_parser.rb +12 -13
- data/lib/blacklight_advanced_search/advanced_search_builder.rb +28 -32
- data/lib/blacklight_advanced_search/catalog_helper_override.rb +11 -34
- data/lib/blacklight_advanced_search/controller.rb +1 -1
- data/lib/blacklight_advanced_search/filter_parser.rb +7 -9
- data/lib/blacklight_advanced_search/parsing_nesting_parser.rb +5 -8
- data/lib/blacklight_advanced_search/redirect_legacy_params_filter.rb +23 -25
- data/lib/blacklight_advanced_search/render_constraints_override.rb +46 -33
- data/lib/blacklight_advanced_search/version.rb +0 -1
- data/lib/generators/blacklight_advanced_search/assets_generator.rb +4 -8
- data/lib/generators/blacklight_advanced_search/blacklight_advanced_search_generator.rb +0 -2
- data/lib/generators/blacklight_advanced_search/install_generator.rb +9 -5
- data/lib/generators/blacklight_advanced_search/templates/advanced_controller.rb +0 -2
- data/lib/parsing_nesting/grammar.rb +22 -25
- data/lib/parsing_nesting/tree.rb +156 -168
- data/solr/conf/_rest_managed.json +3 -0
- data/solr/conf/admin-extra.html +31 -0
- data/solr/conf/elevate.xml +36 -0
- data/solr/conf/mapping-ISOLatin1Accent.txt +246 -0
- data/solr/conf/protwords.txt +21 -0
- data/solr/conf/schema.xml +635 -0
- data/solr/conf/scripts.conf +24 -0
- data/solr/conf/solrconfig.xml +411 -0
- data/solr/conf/spellings.txt +2 -0
- data/solr/conf/stopwords.txt +58 -0
- data/solr/conf/stopwords_en.txt +58 -0
- data/solr/conf/synonyms.txt +31 -0
- data/solr/conf/xslt/example.xsl +132 -0
- data/solr/conf/xslt/example_atom.xsl +67 -0
- data/solr/conf/xslt/example_rss.xsl +66 -0
- data/solr/conf/xslt/luke.xsl +337 -0
- data/solr/sample_solr_documents.yml +2692 -0
- data/spec/features/blacklight_advanced_search_form_spec.rb +0 -2
- data/spec/helpers/advanced_helper_spec.rb +0 -2
- data/spec/integration/blacklight_stub_spec.rb +0 -2
- data/spec/lib/advanced_search_builder_spec.rb +7 -14
- data/spec/lib/blacklight_advanced_search/render_constraints_override_spec.rb +39 -0
- data/spec/lib/deep_merge_spec.rb +109 -34
- data/spec/lib/filter_parser_spec.rb +8 -14
- data/spec/parsing_nesting/build_tree_spec.rb +73 -81
- data/spec/parsing_nesting/consuming_spec.rb +2 -12
- data/spec/parsing_nesting/to_solr_spec.rb +93 -130
- data/spec/spec_helper.rb +0 -3
- data/spec/test_app_templates/app/controllers/catalog_controller.rb +3 -3
- data/spec/test_app_templates/lib/generators/test_app_generator.rb +3 -3
- metadata +63 -13
- data/spec/spec.opts +0 -4
data/spec/spec_helper.rb
CHANGED
@@ -3,12 +3,10 @@ ENV["RAILS_ENV"] = "test"
|
|
3
3
|
require 'engine_cart'
|
4
4
|
EngineCart.load_application!
|
5
5
|
|
6
|
-
|
7
6
|
require 'capybara/rspec'
|
8
7
|
require 'rspec/rails'
|
9
8
|
require 'capybara/rails'
|
10
9
|
|
11
|
-
|
12
10
|
RSpec.configure do |config|
|
13
11
|
# Maintain this rspec2 behavior even in rspec3, until we
|
14
12
|
# adjust our stuff. Deprecation warning was:
|
@@ -26,4 +24,3 @@ RSpec.configure do |config|
|
|
26
24
|
# --------------------------------------------------------------------------------
|
27
25
|
config.infer_spec_type_from_file_location!
|
28
26
|
end
|
29
|
-
|
@@ -18,16 +18,16 @@ class CatalogController < ApplicationController
|
|
18
18
|
config.add_facet_field 'language_facet'
|
19
19
|
|
20
20
|
config.add_search_field('title') do |field|
|
21
|
-
field.solr_local_parameters = { :qf => "title_t", :pf => "title_t"}
|
21
|
+
field.solr_local_parameters = { :qf => "title_t", :pf => "title_t" }
|
22
22
|
end
|
23
23
|
|
24
24
|
config.add_search_field('author') do |field|
|
25
|
-
field.solr_local_parameters = { :qf => "author_t", :pf => "author_t"}
|
25
|
+
field.solr_local_parameters = { :qf => "author_t", :pf => "author_t" }
|
26
26
|
end
|
27
27
|
|
28
28
|
config.add_search_field('dummy_field') do |field|
|
29
29
|
field.include_in_advanced_search = false
|
30
|
-
field.solr_local_parameters = { :qf => "author_t", :pf => "author_t"}
|
30
|
+
field.solr_local_parameters = { :qf => "author_t", :pf => "author_t" }
|
31
31
|
end
|
32
32
|
end
|
33
33
|
end
|
@@ -3,13 +3,13 @@ require 'rails/generators'
|
|
3
3
|
class TestAppGenerator < Rails::Generators::Base
|
4
4
|
source_root File.expand_path("../../../../spec/test_app_templates", __FILE__)
|
5
5
|
|
6
|
-
def remove_index
|
6
|
+
def remove_index
|
7
7
|
remove_file "public/index.html"
|
8
8
|
remove_file 'app/assets/images/rails.png'
|
9
9
|
end
|
10
10
|
|
11
11
|
def run_blacklight_generator
|
12
|
-
say_status("warning", "GENERATING BL", :yellow)
|
12
|
+
say_status("warning", "GENERATING BL", :yellow)
|
13
13
|
|
14
14
|
generate 'blacklight:install'
|
15
15
|
end
|
@@ -19,7 +19,7 @@ class TestAppGenerator < Rails::Generators::Base
|
|
19
19
|
end
|
20
20
|
|
21
21
|
def run_test_support_generator
|
22
|
-
say_status("warning", "GENERATING test_support", :yellow)
|
22
|
+
say_status("warning", "GENERATING test_support", :yellow)
|
23
23
|
|
24
24
|
generate 'blacklight:test_support'
|
25
25
|
end
|
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: 6.0
|
4
|
+
version: 6.1.0
|
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: 2016-
|
12
|
+
date: 2016-09-28 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: blacklight
|
@@ -88,33 +88,61 @@ dependencies:
|
|
88
88
|
- !ruby/object:Gem::Version
|
89
89
|
version: '0'
|
90
90
|
- !ruby/object:Gem::Dependency
|
91
|
-
name:
|
91
|
+
name: solr_wrapper
|
92
92
|
requirement: !ruby/object:Gem::Requirement
|
93
93
|
requirements:
|
94
|
-
- - "
|
94
|
+
- - "~>"
|
95
95
|
- !ruby/object:Gem::Version
|
96
|
-
version:
|
96
|
+
version: '0.14'
|
97
97
|
type: :development
|
98
98
|
prerelease: false
|
99
99
|
version_requirements: !ruby/object:Gem::Requirement
|
100
100
|
requirements:
|
101
|
-
- - "
|
101
|
+
- - "~>"
|
102
102
|
- !ruby/object:Gem::Version
|
103
|
-
version:
|
103
|
+
version: '0.14'
|
104
104
|
- !ruby/object:Gem::Dependency
|
105
105
|
name: engine_cart
|
106
106
|
requirement: !ruby/object:Gem::Requirement
|
107
107
|
requirements:
|
108
108
|
- - "~>"
|
109
109
|
- !ruby/object:Gem::Version
|
110
|
-
version: '0.
|
110
|
+
version: '0.10'
|
111
111
|
type: :development
|
112
112
|
prerelease: false
|
113
113
|
version_requirements: !ruby/object:Gem::Requirement
|
114
114
|
requirements:
|
115
115
|
- - "~>"
|
116
116
|
- !ruby/object:Gem::Version
|
117
|
-
version: '0.
|
117
|
+
version: '0.10'
|
118
|
+
- !ruby/object:Gem::Dependency
|
119
|
+
name: rubocop
|
120
|
+
requirement: !ruby/object:Gem::Requirement
|
121
|
+
requirements:
|
122
|
+
- - ">="
|
123
|
+
- !ruby/object:Gem::Version
|
124
|
+
version: '0'
|
125
|
+
type: :development
|
126
|
+
prerelease: false
|
127
|
+
version_requirements: !ruby/object:Gem::Requirement
|
128
|
+
requirements:
|
129
|
+
- - ">="
|
130
|
+
- !ruby/object:Gem::Version
|
131
|
+
version: '0'
|
132
|
+
- !ruby/object:Gem::Dependency
|
133
|
+
name: rubocop-rspec
|
134
|
+
requirement: !ruby/object:Gem::Requirement
|
135
|
+
requirements:
|
136
|
+
- - ">="
|
137
|
+
- !ruby/object:Gem::Version
|
138
|
+
version: '0'
|
139
|
+
type: :development
|
140
|
+
prerelease: false
|
141
|
+
version_requirements: !ruby/object:Gem::Requirement
|
142
|
+
requirements:
|
143
|
+
- - ">="
|
144
|
+
- !ruby/object:Gem::Version
|
145
|
+
version: '0'
|
118
146
|
description:
|
119
147
|
email:
|
120
148
|
- blacklight-development@googlegroups.com
|
@@ -123,6 +151,10 @@ extensions: []
|
|
123
151
|
extra_rdoc_files: []
|
124
152
|
files:
|
125
153
|
- ".gitignore"
|
154
|
+
- ".rspec"
|
155
|
+
- ".rubocop.yml"
|
156
|
+
- ".rubocop_todo.yml"
|
157
|
+
- ".solr_wrapper.yml"
|
126
158
|
- ".travis.yml"
|
127
159
|
- Gemfile
|
128
160
|
- LICENSE
|
@@ -169,22 +201,40 @@ files:
|
|
169
201
|
- lib/parsing_nesting/Readme.rdoc
|
170
202
|
- lib/parsing_nesting/grammar.rb
|
171
203
|
- lib/parsing_nesting/tree.rb
|
204
|
+
- solr/conf/_rest_managed.json
|
205
|
+
- solr/conf/admin-extra.html
|
206
|
+
- solr/conf/elevate.xml
|
207
|
+
- solr/conf/mapping-ISOLatin1Accent.txt
|
208
|
+
- solr/conf/protwords.txt
|
209
|
+
- solr/conf/schema.xml
|
210
|
+
- solr/conf/scripts.conf
|
211
|
+
- solr/conf/solrconfig.xml
|
212
|
+
- solr/conf/spellings.txt
|
213
|
+
- solr/conf/stopwords.txt
|
214
|
+
- solr/conf/stopwords_en.txt
|
215
|
+
- solr/conf/synonyms.txt
|
216
|
+
- solr/conf/xslt/example.xsl
|
217
|
+
- solr/conf/xslt/example_atom.xsl
|
218
|
+
- solr/conf/xslt/example_rss.xsl
|
219
|
+
- solr/conf/xslt/luke.xsl
|
220
|
+
- solr/sample_solr_documents.yml
|
172
221
|
- spec/features/blacklight_advanced_search_form_spec.rb
|
173
222
|
- spec/helpers/advanced_helper_spec.rb
|
174
223
|
- spec/integration/blacklight_stub_spec.rb
|
175
224
|
- spec/lib/advanced_search_builder_spec.rb
|
225
|
+
- spec/lib/blacklight_advanced_search/render_constraints_override_spec.rb
|
176
226
|
- spec/lib/deep_merge_spec.rb
|
177
227
|
- spec/lib/filter_parser_spec.rb
|
178
228
|
- spec/parsing_nesting/build_tree_spec.rb
|
179
229
|
- spec/parsing_nesting/consuming_spec.rb
|
180
230
|
- spec/parsing_nesting/to_solr_spec.rb
|
181
231
|
- spec/rcov.opts
|
182
|
-
- spec/spec.opts
|
183
232
|
- spec/spec_helper.rb
|
184
233
|
- spec/test_app_templates/app/controllers/catalog_controller.rb
|
185
234
|
- spec/test_app_templates/lib/generators/test_app_generator.rb
|
186
235
|
homepage: http://projectblacklight.org/
|
187
|
-
licenses:
|
236
|
+
licenses:
|
237
|
+
- Apache 2.0
|
188
238
|
metadata: {}
|
189
239
|
post_install_message:
|
190
240
|
rdoc_options: []
|
@@ -202,7 +252,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
202
252
|
version: '0'
|
203
253
|
requirements: []
|
204
254
|
rubyforge_project: blacklight
|
205
|
-
rubygems_version: 2.
|
255
|
+
rubygems_version: 2.5.1
|
206
256
|
signing_key:
|
207
257
|
specification_version: 4
|
208
258
|
summary: Blacklight Advanced Search plugin
|
@@ -211,13 +261,13 @@ test_files:
|
|
211
261
|
- spec/helpers/advanced_helper_spec.rb
|
212
262
|
- spec/integration/blacklight_stub_spec.rb
|
213
263
|
- spec/lib/advanced_search_builder_spec.rb
|
264
|
+
- spec/lib/blacklight_advanced_search/render_constraints_override_spec.rb
|
214
265
|
- spec/lib/deep_merge_spec.rb
|
215
266
|
- spec/lib/filter_parser_spec.rb
|
216
267
|
- spec/parsing_nesting/build_tree_spec.rb
|
217
268
|
- spec/parsing_nesting/consuming_spec.rb
|
218
269
|
- spec/parsing_nesting/to_solr_spec.rb
|
219
270
|
- spec/rcov.opts
|
220
|
-
- spec/spec.opts
|
221
271
|
- spec/spec_helper.rb
|
222
272
|
- spec/test_app_templates/app/controllers/catalog_controller.rb
|
223
273
|
- spec/test_app_templates/lib/generators/test_app_generator.rb
|
data/spec/spec.opts
DELETED