blacklight_advanced_search 2.2.0 → 5.0.0

data/lib/blacklight_advanced_search/render_constraints_override.rb

@@ -18,7 +18,7 @@ module BlacklightAdvancedSearch::RenderConstraintsOverride
     if (@advanced_query.nil? || @advanced_query.keyword_queries.empty? )
       return super(my_params)
     else
-      content = ""
+      content = []
       @advanced_query.keyword_queries.each_pair do |field, query|
         label = search_field_def_for_key(field)[:label]
         content << render_constraint_element(
@@ -29,10 +29,13 @@ module BlacklightAdvancedSearch::RenderConstraintsOverride
       end
       if (@advanced_query.keyword_op == "OR" &&
           @advanced_query.keyword_queries.length > 1)
-        content = '<span class="inclusive_or appliedFilter">' + '<span class="operator">Any of:</span>' + content + '</span>'
+        content.unshift content_tag(:span, "Any of:", class:'operator')
+        content_tag :span, class: "inclusive_or appliedFilter well" do
+          safe_join(content.flatten, "\n")
+        end
+      else
+        safe_join(content.flatten, "\n")    
       end
-
-      return content
     end
   end
 
@@ -44,9 +47,9 @@ module BlacklightAdvancedSearch::RenderConstraintsOverride
 
     if (@advanced_query)
       @advanced_query.filters.each_pair do |field, value_list|
-        label = facet_field_labels[field]
+        label = facet_field_label(field)
         content << render_constraint_element(label,
-          value_list.join(" OR "),
+          safe_join(value_list, " <strong class='text-muted constraint-connector'>OR</strong> ".html_safe),
           :remove => catalog_index_path( remove_advanced_filter_group(field, my_params) )
           )
       end
@@ -55,6 +58,26 @@ module BlacklightAdvancedSearch::RenderConstraintsOverride
     return content
   end
 
+  # override of BL method, so our inclusive facet selections
+  # are still recgonized for eg highlighting facet with selected
+  # values. 
+  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
+    query = BlacklightAdvancedSearch::QueryParser.new(params, self.blacklight_config )
+    if query.filters.keys.include?( field )
+      params[:f] ||= {}
+      params[:f][field] ||= []
+      return true
+    end
+
+    return false
+  end
+
   def render_search_to_s_filters(my_params)
     content = super(my_params)
 
@@ -62,7 +85,10 @@ module BlacklightAdvancedSearch::RenderConstraintsOverride
 
     if (advanced_query.filters.length > 0)
       advanced_query.filters.each_pair do |field, values|
-        label = facet_field_labels[field]
+        # old-style, may still be in history
+        values = values.keys if values.kind_of? Hash
+
+        label = facet_field_label(field)
 
         content << render_search_to_s_element(
           label,

data/spec/features/blacklight_advanced_search_form_spec.rb

@@ -11,8 +11,8 @@ describe "Blacklight Advanced Search Form" do
     end
 
     it "should have field and facet blocks" do
-      page.should have_selector('.query_column')
-      page.should have_selector('.limit_column')
+      page.should have_selector('.query-criteria')
+      page.should have_selector('.limit-criteria')
     end
 
     describe "query column" do
@@ -25,8 +25,8 @@ describe "Blacklight Advanced Search Form" do
       end
 
       it "should list the configured search fields" do
-        page.should have_selector '.advanced_search_field #title'
-        page.should have_selector '.advanced_search_field #author'
+        page.should have_selector '.advanced-search-field #title'
+        page.should have_selector '.advanced-search-field #author'
       end
 
       it "should not list the search fields listed as not to be included in adv search" do
@@ -46,7 +46,7 @@ describe "Blacklight Advanced Search Form" do
 
     it "scope searches to fields" do
       fill_in "title", :with => "Medicine"
-      click_on "advanced_search"
+      click_on "advanced-search-submit"
       puts page.current_url
       page.should have_content "Remove constraint Title: Medicine"
       page.should have_content "2007020969"

data/spec/lib/deep_merge_spec.rb

@@ -0,0 +1,45 @@
+require 'spec_helper'
+
+describe "BlacklightAdvancedSearch#deep_merge!" do
+  before do
+    @ahash = {"a" => "a", "b" => "b", 
+            "array1" => [1,2], "array2" => [3,4],
+            "hash1"  => {"a" => "a", "array" => [1], "b" => "b"},
+            "hash2"  => {"a2" => "a2", "array2" => [12], "b2" => "b2"}
+    }
+
+    BlacklightAdvancedSearch.deep_merge!(@ahash, {
+      "a" => "NEW A",
+      "array1" => [3, 4],
+      "hash1"  => {
+        "array" => [2],
+        "b" => "NEW B"
+      },
+      "c" => "NEW C"
+    })
+  end
+
+
+  it "leaves un-collided content alone" do
+    expect(@ahash["b"]).to eq("b")
+    expect(@ahash["array2"]).to eq([3,4])
+    expect(@ahash["hash2"]).to eq({"a2" => "a2", "array2" => [12], "b2" => "b2"})
+  end
+
+  it "adds new content" do
+    expect(@ahash["c"]).to eq("NEW C")
+  end
+
+  it "merges an array" do
+    expect(@ahash["array1"]).to eq([1,2,3,4])
+  end
+
+  it "merges a hash, recursive like" do
+    expect(@ahash["hash1"]).to eq({
+      "a" => "a",
+      "array" => [1,2],
+      "b" => "NEW B"
+    })
+  end
+    
+end

data/spec/test_app_templates/Gemfile.extra

@@ -3,6 +3,8 @@ platforms :jruby do
   gem 'therubyrhino'
 end
 
+gem 'blacklight', github: 'projectblacklight/blacklight', branch: 'master'
+
 group :test do
   gem 'rspec-rails', '~> 2.13'
   gem 'generator_spec'

data/spec/test_app_templates/lib/generators/test_app_generator.rb

@@ -15,7 +15,7 @@ class TestAppGenerator < Rails::Generators::Base
   def run_blacklight_generator
     say_status("warning", "GENERATING BL", :yellow)       
 
-    generate 'blacklight', '--marc'
+    generate 'blacklight:install'
   end
 
   def run_blacklight_advanced_search

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight_advanced_search
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 5.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,24 +10,30 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-05 00:00:00.000000000 Z
+date: 2014-03-18 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: '4.0'
+        version: '5.1'
+    - - <
+      - !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'
+    - - <
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: parslet
   requirement: !ruby/object:Gem::Requirement
@@ -44,6 +50,22 @@ dependencies:
     - - ! '>='
       - !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
@@ -97,17 +119,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.2
 description: 
 email:
 - blacklight-development@googlegroups.com
@@ -119,11 +141,10 @@ files:
 - .travis.yml
 - Gemfile
 - LICENSE
-- README.rdoc
+- README.md
 - Rakefile
 - VERSION
 - app/assets/javascripts/blacklight_advanced_search.js
-- app/assets/javascripts/blacklight_advanced_search/blacklight_advanced_search_javascript.js
 - app/assets/stylesheets/blacklight_advanced_search.css
 - app/assets/stylesheets/blacklight_advanced_search/advanced_results.css
 - app/assets/stylesheets/blacklight_advanced_search/blacklight_advanced_search_styles.css.scss
@@ -131,15 +152,17 @@ files:
 - app/controllers/blacklight_advanced_search/advanced_controller.rb
 - app/helpers/advanced_helper.rb
 - app/views/advanced/_advanced_search_facets.html.erb
+- app/views/advanced/_advanced_search_facets_as_select.html.erb
 - app/views/advanced/_advanced_search_fields.html.erb
 - app/views/advanced/_advanced_search_form.html.erb
 - app/views/advanced/_advanced_search_help.html.erb
-- app/views/advanced/_facet_layout.html.erb
+- app/views/advanced/_advanced_search_submit_btns.html.erb
 - app/views/advanced/_facet_limit.html.erb
 - app/views/advanced/index.html.erb
 - app/views/blacklight_advanced_search/_facet_limit.html.erb
 - blacklight_advanced_search.gemspec
 - config/jetty.yml
+- config/locales/blacklight_advanced_search.en.yml
 - config/routes.rb
 - lib/blacklight_advanced_search.rb
 - lib/blacklight_advanced_search/advanced_query_parser.rb
@@ -149,6 +172,7 @@ files:
 - lib/blacklight_advanced_search/filter_parser.rb
 - lib/blacklight_advanced_search/parse_basic_q.rb
 - lib/blacklight_advanced_search/parsing_nesting_parser.rb
+- lib/blacklight_advanced_search/redirect_legacy_params_filter.rb
 - lib/blacklight_advanced_search/render_constraints_override.rb
 - lib/blacklight_advanced_search/version.rb
 - lib/generators/blacklight_advanced_search/assets_generator.rb
@@ -159,6 +183,7 @@ files:
 - lib/parsing_nesting/tree.rb
 - spec/features/blacklight_advanced_search_form_spec.rb
 - spec/integration/blacklight_stub_spec.rb
+- spec/lib/deep_merge_spec.rb
 - spec/lib/filter_parser_spec.rb
 - spec/parsing_nesting/build_tree_spec.rb
 - spec/parsing_nesting/consuming_spec.rb
@@ -184,7 +209,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4211602717521532640
+      hash: -3234438610145730217
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -193,7 +218,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4211602717521532640
+      hash: -3234438610145730217
 requirements: []
 rubyforge_project: blacklight
 rubygems_version: 1.8.23
@@ -203,6 +228,7 @@ summary: Blacklight Advanced Search plugin
 test_files:
 - spec/features/blacklight_advanced_search_form_spec.rb
 - spec/integration/blacklight_stub_spec.rb
+- spec/lib/deep_merge_spec.rb
 - spec/lib/filter_parser_spec.rb
 - spec/parsing_nesting/build_tree_spec.rb
 - spec/parsing_nesting/consuming_spec.rb

data/app/assets/javascripts/blacklight_advanced_search/blacklight_advanced_search_javascript.js

@@ -1,48 +0,0 @@
-$(document).ready(function() {
-
-  /* Stuff for handling the checkboxes */
-  /* When you click a checkbox, update readout */
-
-
-  /* Pass in a jquery obj holding the "selected facet element" spans,  get back
-     a string for display representing currently checked things. */
-  function checkboxesToString(checkbox_elements) {
-    var selectedLabels = new Array();
-    checkbox_elements.each(function() {
-        if ($(this).is(":checked")) {
-          selectedLabels.push( $(this).next('.facet-value').text());
-        }
-    });
-    return selectedLabels.join(" OR ");
-  }
-
-  //Pass in JQuery object of zero or more <div class="facet_item"> blocks,
-  //that contain an h3, some checkboxes, and a span.adv_facet_selections for
-  //display of current selections. Will update the span.
-  function updateSelectedDisplay(facet_item) {
-    var checkboxes = $(facet_item).find("input:checkbox");
-    var displaySpan = $(facet_item).find("span.adv_facet_selections");
-    var displayStr = checkboxesToString( checkboxes );
-
-    displaySpan.text( displayStr );
-    if (displayStr == "") {
-      displaySpan.hide();
-    } else {
-      displaySpan.show();
-    }
-
-
-  }
-
-  // on page load, set initial properly
-  $(".facet_item").each(function() {
-      updateSelectedDisplay(this);
-  });
-
-  //change on checkbox change
-  $(".facet_item input:checkbox").change( function() {
-      updateSelectedDisplay( $(this).closest(".facet_item"));
-  });
-
-
-});

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

@@ -1,5 +0,0 @@
-<div class="facet_item blacklight-<%= facet_field.field.parameterize %>">
-  <h5 class="twiddle"><%= facet_field.label -%> <i class="icon-chevron"></i><span class="adv_facet_selections" style="display:none;"></span></h5>
-
-  <%= yield %>
-</div>