blacklight_advanced_search 6.1.0 → 6.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a0d1a3ae8894d6913705748f4f0c36cd946aed0
-  data.tar.gz: 490f7bd162c8016890aafb194d6f2219fd4275ed
+  metadata.gz: f94e150438b2ed6a6fabd89cfbd050babfbcd96e
+  data.tar.gz: ad24822b9631e506de17d7a11db709dba64a68e7
 SHA512:
-  metadata.gz: 37e8e598f7d4f513085ba671ceed8f9ad3fe273235fcb05c690dfd9912af8848af63e4a68d5e60ae6d709e9c2156240bca9e1d6d567259d55a8e581ce1c3aa48
-  data.tar.gz: 7be40cbe6fcbcf8b5c14220f4f7ddaedc94c519576938c8766862e2c3d6890ea445d9b6a3c5ae5df37823edf84067bd54af7951d22367a1257a4539733e9d646
+  metadata.gz: 72a0b4d1718c5f03c69df999c11bc2465d787c0198932e7f964c06bb20097c9db6950107ea9c14eb65f6c4a77bbe0ba3a4c06f29cafa2680c24eb65761650a29
+  data.tar.gz: 3961675ce8655a762252fce99bede4bfd758c52e2a96ff33c69263ce722bbf27143599fc8bc3a27052c0b6393daacc379fce12712310afc97317bdf235e4ae2c

data/.rubocop.yml

@@ -13,3 +13,9 @@ Rails:
 
 Metrics/LineLength:
   Max: 185
+
+Metrics/BlockLength:
+  Exclude:
+    - 'Rakefile'
+    - 'spec/**/*'
+    - 'lib/generators/**/*'

data/.rubocop_todo.yml

@@ -349,3 +349,9 @@ Style/TrailingUnderscoreVariable:
 Style/VariableName:
   Exclude:
     - 'lib/parsing_nesting/tree.rb'
+
+Style/RedundantReturn:
+  Enabled: false
+
+Style/GuardClause:
+  Enabled: false

data/VERSION

@@ -1 +1 @@
-6.1.0
+6.2.0

data/blacklight_advanced_search.gemspec

@@ -28,4 +28,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'engine_cart', "~> 0.10"
   s.add_development_dependency 'rubocop'
   s.add_development_dependency 'rubocop-rspec'
+  s.add_development_dependency 'rsolr'
 end

data/lib/blacklight_advanced_search/advanced_search_builder.rb

@@ -48,8 +48,8 @@ module BlacklightAdvancedSearch
     # parse and send it straight to solr same as if advanced_parse_q
     # were not being used.
     def add_advanced_parse_q_to_solr(solr_parameters)
-      unless scope.params[:q].blank?
-        field_def = search_field_def_for_key(scope.params[:search_field]) ||
+      unless blacklight_params[:q].blank?
+        field_def = search_field_def_for_key(blacklight_params[:search_field]) ||
           default_search_field
 
         # If the individual field has advanced_parse_q suppressed, punt
@@ -61,7 +61,7 @@ module BlacklightAdvancedSearch
         # See if we can parse it, if we can't, we're going to give up
         # and just allow basic search, perhaps with a warning.
         begin
-          adv_search_params = ParsingNesting::Tree.parse(scope.params[:q], blacklight_config.advanced_search[:query_parser]).to_single_query_params(solr_local_params)
+          adv_search_params = ParsingNesting::Tree.parse(blacklight_params[:q], blacklight_config.advanced_search[:query_parser]).to_single_query_params(solr_local_params)
 
           BlacklightAdvancedSearch.deep_merge!(solr_parameters, solr_direct_params)
           BlacklightAdvancedSearch.deep_merge!(solr_parameters, adv_search_params)

data/lib/generators/blacklight_advanced_search/install_generator.rb

@@ -47,20 +47,19 @@ module BlacklightAdvancedSearch
     end
 
     def install_localized_search_form
-      if options[:force] || 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"))
+      return unless options[:force] || 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 + <<-EOF.strip_heredoc
-        \n\n
-        <div class="navbar-form">
-          <%= link_to 'More options', blacklight_advanced_search_engine.advanced_search_path(search_state.to_h), class: 'advanced_search btn btn-default'%>
-        </div>
-        EOF
+      new_file_contents = source_file + <<-EOF.strip_heredoc
+      \n\n
+      <div class="navbar-form">
+        <%= link_to 'More options', blacklight_advanced_search_engine.advanced_search_path(search_state.to_h), class: 'advanced_search btn btn-default'%>
+      </div>
+      EOF
 
-        create_file("app/views/catalog/_search_form.html.erb", new_file_contents)
-      end
+      create_file("app/views/catalog/_search_form.html.erb", new_file_contents)
     end
   end
 end

data/spec/lib/advanced_search_builder_spec.rb

@@ -10,24 +10,24 @@ describe BlacklightAdvancedSearch::AdvancedSearchBuilder do
       end
     end
 
-    let!(:obj) do
+    let(:obj) do
       class BACTestClass
-        cattr_accessor :blacklight_config
+        cattr_accessor :blacklight_config, :blacklight_params
         include Blacklight::SearchHelper
         include BlacklightAdvancedSearch::AdvancedSearchBuilder
-        def initialize(blacklight_config)
+        def initialize(blacklight_config, blacklight_params)
           self.blacklight_config = blacklight_config
+          self.blacklight_params = blacklight_params
         end
       end
-      BACTestClass.new blacklight_config
+      BACTestClass.new blacklight_config, params
     end
 
     context "with basic functionality" do
       let(:solr_params) { {} }
 
       describe "a simple example" do
-        let(:params) { double("params", params: { :q => "one two AND three OR four" }) }
-        before { allow(obj).to receive(:scope).and_return(params) }
+        let(:params) { { :q => "one two AND three OR four" } }
         it "catches the query" do
           obj.add_advanced_parse_q_to_solr(solr_params)
           expect(solr_params[:defType]).to eq("lucene")
@@ -39,8 +39,7 @@ describe BlacklightAdvancedSearch::AdvancedSearchBuilder do
 
       describe "an unparseable example" do
         let(:unparseable_q) { "foo bar\'s AND" }
-        let(:params) { double("params", params: { :q => unparseable_q }) }
-        before { allow(obj).to receive(:scope).and_return(params) }
+        let(:params) { { :q => unparseable_q } }
         it "passes through" do
           obj.add_advanced_parse_q_to_solr(solr_params)
           expect(solr_params[:q]).to eq(unparseable_q)
@@ -48,8 +47,7 @@ describe BlacklightAdvancedSearch::AdvancedSearchBuilder do
       end
 
       context "when advanced_parse is false" do
-        let(:params) { double("params", params: { :search_field => "special_field", :q => "one two AND three OR four" }) }
-        before { allow(obj).to receive(:scope).and_return(params) }
+        let(:params) { { :search_field => "special_field", :q => "one two AND three OR four" } }
         it "ignores fields" do
           obj.add_advanced_parse_q_to_solr(solr_params)
           expect(solr_params).not_to have_key(:q)

data/spec/spec_helper.rb

@@ -3,6 +3,7 @@ ENV["RAILS_ENV"] = "test"
 require 'engine_cart'
 EngineCart.load_application!
 
+require 'rsolr'
 require 'capybara/rspec'
 require 'rspec/rails'
 require 'capybara/rails'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight_advanced_search
 version: !ruby/object:Gem::Version
-  version: 6.1.0
+  version: 6.2.0
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-28 00:00:00.000000000 Z
+date: 2016-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blacklight
@@ -143,6 +143,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rsolr
+  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'
 description: 
 email:
 - blacklight-development@googlegroups.com
@@ -252,7 +266,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: blacklight
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Blacklight Advanced Search plugin