blacklight_advanced_search 6.3.1 → 6.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8156e789ee66f1e0ea1d36b6b41911ed857d3102
-  data.tar.gz: 810a801b6979eeb1567b734dba238d5adfb238c0
+  metadata.gz: 8365d9d4f076bf6a58ec18ea43463eebdb731548
+  data.tar.gz: e5d13463ee038b937f495392c03495e9e74a0fc5
 SHA512:
-  metadata.gz: 5445c21147710a2e6f4e278842735fcd5e57e3161434808a713a238f672ad0a239682cdd84fe3480ac6a9f2865cf7bcfce2a3ac74331e54d97229484fd144e75
-  data.tar.gz: 9573952d47629c2d9cd4e95fc273be2d7916037fa3d8d3c87da036186de49104b0ae5d05141813a830d26867acc0664476282fd8a277e6f2fa8f8d5cc2a17ef7
+  metadata.gz: 7498bba1f4df86db9bde461fa099e3af88a00e55bc20fb5818d40285f292c96e41aa13348f38ce98777be784e458f1f84ed8032c845fabcdfc54b526594ca8fe
+  data.tar.gz: 1172e9a02a4442f23711f4be3bff51489329e95a5e782361e7eb79b887e7721fa30cb5453bf61f5cd96878b1260ca5a91a8f3eaf4bb3f3316adb2fea30c349a9

data/Rakefile

@@ -27,7 +27,7 @@ task :ci => ['rubocop', 'engine_cart:generate'] do
   require 'solr_wrapper'
 
   SolrWrapper.wrap(port: '8983') do |solr|
-    solr.with_collection(name: 'blacklight-core', dir: File.join(File.expand_path(File.dirname(__FILE__)), "solr", "conf")) do
+    solr.with_collection(name: 'blacklight-core', dir: File.join(File.expand_path(__dir__), "solr", "conf")) do
       Rake::Task['fixtures'].invoke
       Rake::Task['spec'].invoke
     end

data/VERSION

@@ -1 +1 @@
-6.3.1
+6.4.0

data/app/views/advanced/_advanced_search_form.html.erb

@@ -7,7 +7,7 @@
 
 <%= form_tag search_catalog_path, :class => 'advanced form-horizontal', :method => :get do  %>
 
-  <%= render_hash_as_hidden_fields(search_state.params_for_search(advanced_search_context)) %>
+  <%= render_hash_as_hidden_fields(advanced_search_context) %>
 
   <div class="input-criteria">
 

data/lib/blacklight_advanced_search/parsing_nesting_parser.rb

@@ -10,6 +10,6 @@ module BlacklightAdvancedSearch::ParsingNestingParser
   def local_param_hash(key, config)
     field_def = config.search_fields[key]
 
-    (field_def[:solr_parameters] || {}).merge(field_def[:solr_local_parameters] || {})
+    (field_def[:solr_adv_parameters] || field_def[:solr_parameters] || {}).merge(field_def[:solr_local_parameters] || {})
   end
 end

data/spec/features/blacklight_advanced_search_form_spec.rb

@@ -54,4 +54,22 @@ describe "Blacklight Advanced Search Form" do
     visit '/advanced'
     expect(page).to have_selector('input#title')
   end
+
+  describe "prepopulated advanced search form" do
+    before do
+      visit '/advanced?all_fields=&author=&commit=Search&op=AND&search_field=advanced&title=cheese'
+    end
+
+    it "should not create hidden inputs for search fields" do
+      expect(page).not_to have_selector('.advanced input[type="hidden"][name="title"]', visible: false)
+      expect(page).to have_selector('.advanced input[type="text"][name="title"]')
+    end
+
+    it "should not have multiple parameters for a search field" do
+      fill_in "title", :with => "bread"
+      click_on "advanced-search-submit"
+      expect(page.current_url).to match(/bread/)
+      expect(page.current_url).not_to match(/cheese/)
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight_advanced_search
 version: !ruby/object:Gem::Version
-  version: 6.3.1
+  version: 6.4.0
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-15 00:00:00.000000000 Z
+date: 2018-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blacklight