blacklight_advanced_search 5.0.1 → 5.1.0

data/VERSION

@@ -1 +1 @@
-5.0.1
+5.1.0

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

@@ -6,7 +6,7 @@
       </div>
 
       <div class="submit-buttons pull-right">
-        <%= link_to t('blacklight_advanced_search.form.start_over'), advanced_search_path, :class =>"btn btn-default" %>
+        <%= link_to t('blacklight_advanced_search.form.start_over'), advanced_search_path, :class =>"btn btn-default advanced-search-start-over" %>
 
         <%= submit_tag t('blacklight_advanced_search.form.search_btn'), :class=>'btn btn-primary advanced-search-submit', :id => "advanced-search-submit" %>
       </div>

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

@@ -4,7 +4,7 @@
 
     <h1 class="advanced page-header">
         <%= t('blacklight_advanced_search.form.title') %>
-        <%= link_to t('blacklight_advanced_search.form.start_over'), advanced_search_path, :class =>"btn btn-default pull-right" %>
+        <%= link_to t('blacklight_advanced_search.form.start_over'), advanced_search_path, :class =>"btn btn-default pull-right advanced-search-start-over" %>
     </h1>
 
     <div class="row">

data/blacklight_advanced_search.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency "blacklight", ">= 5.1", "< 6.0"
+  s.add_dependency "blacklight", ">= 5.2", "< 6.0"
   s.add_dependency "parslet"
 
   s.add_development_dependency "blacklight_marc"

data/lib/blacklight_advanced_search/advanced_query_parser.rb

@@ -51,7 +51,7 @@ module BlacklightAdvancedSearch
     def filters
       unless (@filters)
         @filters = {}
-        return @filters unless @params[:f_inclusive]
+        return @filters unless @params[:f_inclusive] && @params[:f_inclusive].respond_to?(:each_pair)
         @params[:f_inclusive].each_pair do |field, value_array|
           @filters[field] ||= value_array.dup
         end

data/lib/blacklight_advanced_search/catalog_helper_override.rb

@@ -13,6 +13,10 @@ module BlacklightAdvancedSearch::CatalogHelperOverride
       my_params = my_params.dup
       my_params[:f_inclusive] = my_params[:f_inclusive].dup
       my_params[:f_inclusive].delete(field)
+
+      if my_params[:f_inclusive].empty?
+        my_params.delete :f_inclusive
+      end
     end
     my_params
   end

data/lib/blacklight_advanced_search/redirect_legacy_params_filter.rb

@@ -12,7 +12,7 @@
       def self.before(controller)
         params = controller.send(:params)
 
-        if params[:f_inclusive]
+        if params[:f_inclusive] && params[:f_inclusive].respond_to?(:each_pair)
           legacy_converted = false
 
           params[:f_inclusive].each_pair do |field, value|

data/lib/blacklight_advanced_search/render_constraints_override.rb

@@ -64,14 +64,9 @@ module BlacklightAdvancedSearch::RenderConstraintsOverride
   def facet_field_in_params?(field)
     return true if super
 
-    # otherwise use our own logic. And work around a weird bug
-    # in BL that assumes params[:f][field] will exist if facet_field_in_params?
-    # hacky insistence on params[:f] etc won't be neccesary if after:
-    # https://github.com/projectblacklight/blacklight/pull/790
+    # otherwise use our own logic.
     query = BlacklightAdvancedSearch::QueryParser.new(params, self.blacklight_config )
     if query.filters.keys.include?( field )
-      params[:f] ||= {}
-      params[:f][field] ||= []
       return true
     end
 

data/spec/spec_helper.rb

@@ -10,6 +10,20 @@ require 'capybara/rails'
 
 
 RSpec.configure do |config|
+  # Maintain this rspec2 behavior even in rspec3, until we
+  # adjust our stuff. Deprecation warning was:
+  # --------------------------------------------------------------------------------
+  # rspec-rails 3 will no longer automatically infer an example group's spec type
+  # from the file location. You can explicitly opt-in to this feature using this
+  # snippet:
 
+  # RSpec.configure do |config|
+  #   config.infer_spec_type_from_file_location!
+  # end
+
+  # If you wish to manually label spec types via metadata you can safely ignore
+  # this warning and continue upgrading to RSpec 3 without addressing it.
+  # --------------------------------------------------------------------------------
+  config.infer_spec_type_from_file_location!
 end
 

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: blacklight_advanced_search
 version: !ruby/object:Gem::Version
-  version: 5.0.1
+  version: 5.1.0
+  prerelease: 
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -9,110 +10,124 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-07 00:00:00.000000000 Z
+date: 2014-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blacklight
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '5.1'
-    - - "<"
+        version: '5.2'
+    - - <
       - !ruby/object:Gem::Version
         version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '5.1'
-    - - "<"
+        version: '5.2'
+    - - <
       - !ruby/object:Gem::Version
         version: '6.0'
 - !ruby/object:Gem::Dependency
   name: parslet
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: blacklight_marc
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: jettywrapper
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.4.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.4.2
 - !ruby/object:Gem::Dependency
   name: engine_cart
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.2.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.2.2
 description: 
@@ -122,8 +137,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
+- .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE
 - README.md
@@ -182,26 +197,33 @@ files:
 - spec/test_app_templates/lib/tasks/blacklight_test_app.rake
 homepage: http://projectblacklight.org/
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 816155266112980095
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 816155266112980095
 requirements: []
 rubyforge_project: blacklight
-rubygems_version: 2.2.2
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Blacklight Advanced Search plugin
 test_files:
 - spec/features/blacklight_advanced_search_form_spec.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 000da5f4dfcf42001bd6386e88f7be6b1ffe6984
-  data.tar.gz: e2f09aac472a8ed22902db017c6c0969a2e35d86
-SHA512:
-  metadata.gz: b509e758a16e53ee206dce4ff9dc404da1fa82a5915288881d595885200661704191fab5562a3aed26d4e0f3b63509cb528587fe75e2a5ff14b93dcda42968b2
-  data.tar.gz: a257bd6fe46823b305657adf4c492b7cce133b426eed3aaf6e7372303cb3f7411fab7f135e625cd08bf71ec24b09eecaaaff39efc26bd9a4da1e2e52714c54c1