blacklight-maps 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8eea160d9da93d7b442489febe098f42ce323c2c
-  data.tar.gz: 7fdb19ab07e58ea19ab787a393d69f3916e40fd5
+  metadata.gz: bc71dc7dfe0b126d989b4076ee3caf03f16b319c
+  data.tar.gz: 94a0708fa6cab6c59b73e5c6519b95addc33efdf
 SHA512:
-  metadata.gz: 41125c066a77d9e8844f685a1adfdd0bf19525865713b732752c07a10286c3ef3ee54e934293ef7920e02eee19da07f86a7d3dcee6b14868ce934eac1e0ca4c5
-  data.tar.gz: 88e97911466aec101c484a0b1abe98acf826ac13dd30f69fa811e68eb430ff65fe2c5fb5e21afb470f4e436e9175eec594069ba3a10c9505aeadfb00e01e6992
+  metadata.gz: 1e9c2ca3243093244412d93dd265bd8b06ecaacd15892fdc9a92e2fbf15535df24205d56e81d9d46b77468e8d13ce61ff5d1556c24610eec1798c384302278de
+  data.tar.gz: de5b485da3d27a1b3b7d59db34bb62c47dedffd0db6e6ce91baf73e8d7becf8628c03d06ed050cf261e736d104f9859b5e482e7b38e65bc5866ca5217ddf32c7

data/.travis.yml

@@ -3,23 +3,24 @@ notifications:
 language: ruby
 sudo: false
 rvm:
-  - 2.2.0
-  - 2.1.0
-  - 2.0.0
-  - 1.9.3
-  - jruby-19mode
+  - 2.3.0
+
+matrix:
+  include:
+    - rvm: 2.2.4
+      env: "RAILS_VERSION=4.1.14"
+
+before_install:
+  - gem install bundler
+
+env:
+ - "RAILS_VERSION=4.2.6"
 
 notifications:
   irc: "irc.freenode.org#blacklight"
   email:
       - blacklight-commits@googlegroups.com
 
-env:
-  global:
-    - JRUBY_OPTS="-J-Xms512m -J-Xmx1024m"
+global_env:
     - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
 
-matrix:
-  allow_failures:
-    - rvm: jruby-19mode
-    - rvm: 1.9.3

data/README.md

@@ -196,7 +196,8 @@ The table below indicates which versions of Blacklight Maps are compatible with
 
 Blacklight Maps version | works with Blacklight version
 ----------------------- | ---------------------
->= 0.4.0 | >= 5.12.0 to < 6.*
+0.5.0 | >= 6.1.0
+0.4.0 | >= 5.12.0 to < 6.*
 <= 0.3.3 | >= 5.1 to <= 5.11.2
 
 ## Contributing

data/app/assets/javascripts/blacklight-maps/blacklight-maps-browse.js

@@ -182,7 +182,13 @@
     * Checks to see if there are any features in the markers MarkerClusterGroup
     */
     function hasAnyFeatures() {
-      return !$.isEmptyObject(markers._featureGroup._layers);
+      var has_features = false;
+      markers.eachLayer(function (layer) {
+        if (!$.isEmptyObject(layer)) {
+          has_features = true;
+        }
+      });
+      return has_features;
     }
 
     // remove stale params, add new params, and run a new search

data/app/helpers/blacklight/blacklight_maps_helper_behavior.rb

@@ -26,7 +26,7 @@ module Blacklight::BlacklightMapsHelperBehavior
   def link_to_bbox_search bbox_coordinates
     coords_for_search = bbox_coordinates.map { |v| v.to_s }
     link_to(t('blacklight.maps.interactions.bbox_search'),
-            catalog_index_path(spatial_search_type: "bbox",
+            search_catalog_path(spatial_search_type: "bbox",
                                coordinates: "[#{coords_for_search[1]},#{coords_for_search[0]} TO #{coords_for_search[3]},#{coords_for_search[2]}]",
                                view: default_document_index_view_type))
   end
@@ -36,11 +36,11 @@ module Blacklight::BlacklightMapsHelperBehavior
     if params[:f] && params[:f][field] && params[:f][field].include?(field_value)
       new_params = params
     else
-      new_params = add_facet_params(field, field_value)
+      new_params = search_state.add_facet_params(field, field_value)
     end
     new_params[:view] = default_document_index_view_type
     link_to(displayvalue.presence || field_value,
-            catalog_index_path(new_params.except(:id, :spatial_search_type, :coordinates)))
+            search_catalog_path(new_params.except(:id, :spatial_search_type, :coordinates)))
   end
 
   # create a link to a spatial search for a set of point coordinates
@@ -49,7 +49,7 @@ module Blacklight::BlacklightMapsHelperBehavior
     new_params[:spatial_search_type] = "point"
     new_params[:coordinates] = "#{point_coordinates[1]},#{point_coordinates[0]}"
     new_params[:view] = default_document_index_view_type
-    link_to(t('blacklight.maps.interactions.point_search'), catalog_index_path(new_params))
+    link_to(t('blacklight.maps.interactions.point_search'), search_catalog_path(new_params))
   end
 
   # return the facet field containing geographic data
@@ -76,8 +76,8 @@ module Blacklight::BlacklightMapsHelperBehavior
   end
 
   # render the map for #index and #map views
-  def render_index_map
-    render :partial => 'catalog/index_map',
+  def render_index_mapview
+    render :partial => 'catalog/index_mapview',
            :locals => {:geojson_features => serialize_geojson(map_facet_values)}
   end
 

data/app/views/catalog/_document_maps.html.erb

@@ -1,4 +1,4 @@
 <% # container for all documents in map view -%>
 <div id="documents" class="map">
-  <%= render_index_map %>
+  <%= render_index_mapview %>
 </div>

data/app/views/catalog/{_index_map.html.erb → _index_mapview.html.erb}

@@ -1,6 +1,6 @@
 <%= blacklight_map_tag('blacklight-index-map',
                        {data:{searchcontrol: true,
-                              catalogpath: catalog_index_path,
+                              catalogpath: search_catalog_path,
                               placenamefield: blacklight_config.view.maps.placename_field,
                               clustercount:'hits',
                               searchresultsview: default_document_index_view_type

data/blacklight-maps.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "rails"
-  spec.add_dependency "blacklight", ">= 5.12.0"
+  spec.add_dependency "blacklight", ">= 6.1.0"
   spec.add_dependency "bootstrap-sass", "~> 3.2"
   spec.add_dependency "leaflet-rails"
   spec.add_dependency "leaflet-markercluster-rails"

data/config/jetty.yml

@@ -3,5 +3,5 @@ development:
   jetty_port: 8983 
 test:
   startup_wait: 60
-  jetty_port: <%= ENV['TEST_JETTY_PORT'] || 8888 %> 
+  jetty_port: <%= ENV['TEST_JETTY_PORT'] || 8888 %>
   <%= ENV['TEST_JETTY_PATH'] ? "jetty_home: " + ENV['TEST_JETTY_PATH'] : '' %>

data/lib/blacklight/maps.rb

@@ -9,18 +9,5 @@ module Blacklight
     require 'blacklight/maps/geometry'
     require 'blacklight/maps/maps_search_builder'
 
-    def self.inject!
-      CatalogController.send(:include, BlacklightMaps::ControllerOverride)
-      CatalogController.send(:include, BlacklightMaps::RenderConstraintsOverride)
-      CatalogController.send(:helper, BlacklightMaps::RenderConstraintsOverride) unless
-          CatalogController.helpers.is_a?(BlacklightMaps::RenderConstraintsOverride)
-
-      # inject into SearchHistory and SavedSearches so spatial queries display properly
-      SearchHistoryController.send(:helper, BlacklightMaps::RenderConstraintsOverride) unless
-          SearchHistoryController.helpers.is_a?(BlacklightMaps::RenderConstraintsOverride)
-      SavedSearchesController.send(:helper, BlacklightMaps::RenderConstraintsOverride) unless
-          SavedSearchesController.helpers.is_a?(BlacklightMaps::RenderConstraintsOverride)
-    end
-
   end
 end

data/lib/blacklight/maps/controller_override.rb

@@ -1,25 +1,14 @@
 module BlacklightMaps
   module ControllerOverride
     extend ActiveSupport::Concern
-    included do
-
-      if self.respond_to? :search_params_logic
-        search_params_logic << :add_spatial_search_to_solr
-      end
-
-      if self.blacklight_config.search_builder_class
-        self.blacklight_config.search_builder_class.send(:include,
-                                                         BlacklightMaps::MapsSearchBuilder
-        ) unless
-            self.blacklight_config.search_builder_class.include?(
-                BlacklightMaps::MapsSearchBuilder
-            )
-      end
 
+    included do
+      self.send(:include, BlacklightMaps::RenderConstraintsOverride)
+      self.send(:helper, BlacklightMaps::RenderConstraintsOverride)
     end
 
     def map
-      (@response, @document_list) = search_results(params, search_params_logic)
+      (@response, @document_list) = search_results(params)
       params[:view] = 'maps'
       respond_to do |format|
         format.html

data/lib/blacklight/maps/engine.rb

@@ -5,29 +5,28 @@ require 'leaflet-markercluster-rails'
 module Blacklight
   module Maps
     class Engine < Rails::Engine
+
       # Set some default configurations
-      Blacklight::Configuration.default_values[:view].maps.geojson_field = "geojson"
-      Blacklight::Configuration.default_values[:view].maps.placename_property = "placename"
-      Blacklight::Configuration.default_values[:view].maps.coordinates_field = "coordinates"
-      Blacklight::Configuration.default_values[:view].maps.search_mode = "placename" # or 'coordinates'
-      Blacklight::Configuration.default_values[:view].maps.spatial_query_dist = 0.5
-      Blacklight::Configuration.default_values[:view].maps.placename_field = "placename_field"
-      Blacklight::Configuration.default_values[:view].maps.coordinates_facet_field = "coordinates_facet_field"
-      Blacklight::Configuration.default_values[:view].maps.facet_mode = "geojson" # or 'coordinates'
-      Blacklight::Configuration.default_values[:view].maps.tileurl = "http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png"
-      Blacklight::Configuration.default_values[:view].maps.mapattribution = 'Map data &copy; <a href="http://openstreetmap.org">OpenStreetMap</a> contributors, <a href="http://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>'
-      Blacklight::Configuration.default_values[:view].maps.maxzoom = 18
-      Blacklight::Configuration.default_values[:view].maps.show_initial_zoom = 5
+      initializer 'blacklight-maps.default_config' do |app|
+        Blacklight::Configuration.default_values[:view].maps.geojson_field = "geojson"
+        Blacklight::Configuration.default_values[:view].maps.placename_property = "placename"
+        Blacklight::Configuration.default_values[:view].maps.coordinates_field = "coordinates"
+        Blacklight::Configuration.default_values[:view].maps.search_mode = "placename" # or 'coordinates'
+        Blacklight::Configuration.default_values[:view].maps.spatial_query_dist = 0.5
+        Blacklight::Configuration.default_values[:view].maps.placename_field = "placename_field"
+        Blacklight::Configuration.default_values[:view].maps.coordinates_facet_field = "coordinates_facet_field"
+        Blacklight::Configuration.default_values[:view].maps.facet_mode = "geojson" # or 'coordinates'
+        Blacklight::Configuration.default_values[:view].maps.tileurl = "http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png"
+        Blacklight::Configuration.default_values[:view].maps.mapattribution = 'Map data &copy; <a href="http://openstreetmap.org">OpenStreetMap</a> contributors, <a href="http://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>'
+        Blacklight::Configuration.default_values[:view].maps.maxzoom = 18
+        Blacklight::Configuration.default_values[:view].maps.show_initial_zoom = 5
+      end
 
       # Add our helpers
       initializer 'blacklight-maps.helpers' do |app|
         ActionView::Base.send :include, BlacklightMapsHelper
       end
 
-      config.to_prepare do
-        Blacklight::Maps.inject!
-      end
-
       # This makes our rake tasks visible.
       rake_tasks do
         Dir.chdir(File.expand_path(File.join(File.dirname(__FILE__), '..', '..'))) do

data/lib/blacklight/maps/maps_search_builder.rb

@@ -1,5 +1,10 @@
 module BlacklightMaps
-  module MapsSearchBuilder
+  module MapsSearchBuilderBehavior
+    extend ActiveSupport::Concern
+
+    included do
+      self.default_processor_chain += [:add_spatial_search_to_solr]
+    end
 
     # add spatial search params to solr
     def add_spatial_search_to_solr(solr_parameters = {})

data/lib/blacklight/maps/render_constraints_override.rb

@@ -40,15 +40,14 @@ module BlacklightMaps
     # Render the spatial query constraints
     def render_spatial_query(localized_params = params)
       # So simple don't need a view template, we can just do it here.
-      scope = localized_params.delete(:route_set) || self
       return ''.html_safe if localized_params[:coordinates].blank?
 
       render_constraint_element(spatial_constraint_label(localized_params),
                                 localized_params[:coordinates],
                                 :classes => ['coordinates'],
-                                :remove => scope.url_for(localized_params.merge(:coordinates=>nil,
-                                                                                :spatial_search_type=>nil,
-                                                                                :action=>'index')))
+                                :remove => remove_constraint_url(localized_params.merge(:coordinates=>nil,
+                                                                                        :spatial_search_type=>nil,
+                                                                                        :action=>'index')))
     end
 
     def spatial_constraint_label(params)

data/lib/blacklight/maps/version.rb

@@ -1,5 +1,5 @@
 module Blacklight
   module Maps
-    VERSION = "0.4.0"
+    VERSION = "0.5.0"
   end
 end

data/lib/generators/blacklight_maps/install_generator.rb

@@ -21,5 +21,41 @@ module BlacklightMaps
         end
       end
     end
+
+    def inject_search_builder
+      inject_into_file 'app/models/search_builder.rb', after: /include Blacklight::Solr::SearchBuilderBehavior.*$/ do
+        "\n  include BlacklightMaps::MapsSearchBuilderBehavior\n"
+      end
+    end
+
+    def install_catalog_controller_mixin
+      inject_into_file "app/controllers/catalog_controller.rb", after: /include Blacklight::Catalog.*$/  do
+        "\n  include BlacklightMaps::ControllerOverride\n"
+      end
+    end
+
+    def install_search_history_controller
+      target_file = "app/controllers/search_history_controller.rb"
+      if File.exists?(target_file)
+        inject_into_file target_file, after: /include Blacklight::SearchHistory/ do
+          "\n  helper BlacklightMaps::RenderConstraintsOverride\n"
+        end
+      else
+        copy_file "search_history_controller.rb", target_file
+      end
+    end
+
+    def install_saved_searches_controller
+      target_file = "app/controllers/saved_searches_controller.rb"
+      if File.exists?(target_file)
+        inject_into_file target_file, after: /include Blacklight::SavedSearches/ do
+          "\n  helper BlacklightMaps::RenderConstraintsOverride\n"
+        end
+      else
+        copy_file "saved_searches_controller.rb", target_file
+      end
+    end
+
+
   end
 end

data/lib/generators/blacklight_maps/templates/saved_searches_controller.rb

@@ -0,0 +1,5 @@
+class SavedSearchesController < ApplicationController
+  include Blacklight::SavedSearches
+
+  helper BlacklightMaps::RenderConstraintsOverride
+end

data/lib/generators/blacklight_maps/templates/search_history_controller.rb

@@ -0,0 +1,5 @@
+class SearchHistoryController < ApplicationController
+  include Blacklight::SearchHistory
+
+  helper BlacklightMaps::RenderConstraintsOverride
+end

data/lib/railties/blacklight_maps.rake

@@ -6,8 +6,9 @@ namespace :blacklight_maps do
     desc "Put sample data into solr"
     task :seed => :environment do
       docs = YAML::load(File.open(File.expand_path(File.join('..', '..', '..', 'spec', 'fixtures', 'sample_solr_documents.yml'), __FILE__)))
-      Blacklight.solr.add docs
-      Blacklight.solr.commit
+      conn = Blacklight.default_index.connection
+      conn.add docs
+      conn.commit
     end
   end
 end

data/spec/features/initial_view_spec.rb

@@ -9,13 +9,13 @@ feature 'Initial view parameter', js: true do
     end
   end
   scenario 'defaults to zoom area of markers' do
-    visit catalog_index_path f: { format: ['Book'] }, view: 'maps'
+    visit search_catalog_path f: { format: ['Book'] }, view: 'maps'
     expect(page).to have_css '.leaflet-marker-icon.marker-cluster', count: 8
   end
   scenario 'when provided sets map to its view' do
     map_tag = '<div id="blacklight-index-map" data-initialview="[[37.65, -122.56],[37.89, -122.27]]" data-maxzoom="18" data-tileurl="http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png" data-mapattribution="Map data &amp;copy; &lt;a href=&quot;http://openstreetmap.org&quot;&gt;OpenStreetMap&lt;/a&gt; contributors, &lt;a href=&quot;http://creativecommons.org/licenses/by-sa/2.0/&quot;&gt;CC-BY-SA&lt;/a&gt;" data-searchcontrol="true" data-catalogpath="/catalog" data-placenamefield="placename_field" data-clustercount="hits" />'.html_safe
     expect_any_instance_of(Blacklight::BlacklightMapsHelperBehavior).to receive(:blacklight_map_tag).and_return(map_tag)
-    visit catalog_index_path f: { format: ['Book'] }, view: 'maps'
+    visit search_catalog_path f: { format: ['Book'] }, view: 'maps'
     expect(page).to_not have_css '.leaflet-marker-icon.marker-cluster'
   end
 end

data/spec/features/maps_spec.rb

@@ -16,7 +16,7 @@ describe "Map View", js: true do
           config.add_facet_field 'geojson', :limit => -2, :label => 'GeoJSON', :show => false
           config.add_facet_fields_to_solr_request!
         end
-        visit catalog_index_path :q => 'korea', :view => 'maps'
+        visit search_catalog_path :q => 'korea', :view => 'maps'
       end
 
       it "should display map elements" do
@@ -158,7 +158,7 @@ describe "Map View", js: true do
           config.add_facet_fields_to_solr_request!
         end
         visit map_path
-        #print page.html # debugging
+        # print page.html # debugging
       end
 
       it "should display map elements" do
@@ -199,54 +199,4 @@ describe "Map View", js: true do
 
   end
 
-  describe "catalog#show maplet view" do
-
-    before :each do
-      CatalogController.configure_blacklight do |config|
-        # add maplet to show partials
-        config.show.partials << :show_maplet
-      end
-      visit catalog_path('2008308175')
-    end
-
-    it "should show the maplet" do
-      expect(page).to have_selector("#blacklight-show-map")
-    end
-
-    it "should show the mapped item count" do
-      expect(page).to have_selector(".mapped-count .badge", text: "2")
-    end
-
-    it "should show a bounding box and a point marker" do
-      expect(page).to have_selector(".leaflet-overlay-pane path.leaflet-clickable")
-      expect(page).to have_selector(".leaflet-marker-icon")
-    end
-
-    describe "click marker icon" do
-
-      before { find(".leaflet-marker-icon").click }
-
-      it "should show a popup with correct content" do
-        expect(page).to have_selector("div.leaflet-popup-content-wrapper")
-        expect(page).to have_content("India")
-      end
-
-    end
-
-    describe "click bbox path" do
-
-      before do
-        0.upto(4) { find("a.leaflet-control-zoom-in").click } #so bbox not covered by point
-        find(".leaflet-overlay-pane svg").click
-      end
-
-      it "should show a popup with correct content" do
-        expect(page).to have_selector("div.leaflet-popup-content-wrapper")
-        expect(page).to have_content("[68.162386, 6.7535159, 97.395555, 35.5044752]")
-      end
-
-    end
-
-  end
-
 end

data/spec/features/show_view_maplet_spec.rb

@@ -0,0 +1,92 @@
+require 'spec_helper'
+
+describe "catalog#show view", js: true do
+
+  before :each do
+    CatalogController.blacklight_config = Blacklight::Configuration.new
+    CatalogController.configure_blacklight do |config|
+      # add maplet to show view partials
+      config.show.partials << :show_maplet
+    end
+  end
+
+  describe "item with point feature" do
+
+    before :each do
+      visit solr_document_path("00314247")
+    end
+
+    it "should display the maplet" do
+      expect(page).to have_selector("#blacklight-show-map-container")
+    end
+
+    it "should have a single marker icon" do
+      expect(page).to have_selector(".leaflet-marker-icon", count: 1)
+    end
+
+    describe "click marker icon" do
+
+      before { find(".leaflet-marker-icon").click }
+
+      it "should show a popup with correct content" do
+        expect(page).to have_selector("div.leaflet-popup-content-wrapper")
+        expect(page).to have_content("Japan")
+      end
+
+    end
+
+  end
+
+  describe "item with point and bbox features" do
+
+    before :each do
+      visit solr_document_path("2008308175")
+    end
+
+    it "should show the correct mapped item count" do
+      expect(page).to have_selector(".mapped-count .badge", text: "2")
+    end
+
+    it "should show a bounding box and a point marker" do
+      expect(page).to have_selector(".leaflet-overlay-pane path.leaflet-clickable")
+      expect(page).to have_selector(".leaflet-marker-icon")
+    end
+
+    describe "click bbox path" do
+
+      before do
+        0.upto(4) { find("a.leaflet-control-zoom-in").click } #so bbox not covered by point
+        find(".leaflet-overlay-pane svg").click
+      end
+
+      it "should show a popup with correct content" do
+        expect(page).to have_selector("div.leaflet-popup-content-wrapper")
+        expect(page).to have_content("[68.162386, 6.7535159, 97.395555, 35.5044752]")
+      end
+
+    end
+
+  end
+
+  describe "item with bbox feature" do
+
+    before :each do
+      CatalogController.configure_blacklight do |config|
+        # set maxzoom so we can test whether initial zoom is correct
+        config.view.maps.maxzoom = 8
+      end
+      visit solr_document_path("2009373514")
+    end
+
+    it "should display a bounding box" do
+      expect(page).to have_selector(".leaflet-overlay-pane path.leaflet-clickable")
+    end
+
+    it "should zoom to the correct map bounds" do
+      # if initial zoom >= maxzoom, zoom-in control will be disabled
+      expect(page).to have_selector(".leaflet-control-zoom-in.leaflet-disabled")
+    end
+
+  end
+
+end

data/spec/fixtures/sample_solr_documents.yml

@@ -2759,3 +2759,103 @@
   coordinates:
   - 113.835078 22.1533884 114.4069561 22.561968
   - 114.109497 22.396428
+- subject_addl_t:
+  - 1990-
+  - 2005-2015
+  - Economic conditions 1997-
+  - Politics and government 1997-
+  title_display: Test item with bounding box only
+  subject_era_facet:
+  - 1990-
+  - 2005-2015
+  - 1997-
+  id: '2009373514'
+  isbn_t:
+  - '9789573908678'
+  - '9573908670'
+  subject_geo_facet:
+  - Economic history
+  - World politics
+  - Hong Kong (China)
+  lc_alpha_facet:
+  - HC
+  title_series_t:
+  - Lin Xingzhi zuo pin ji ; 51
+  author_t:
+  - Lin, Xingzhi.
+  lc_1letter_facet:
+  - H - Social Sciences
+  marc_display: "<?xml version=\"1.0\" encoding=\"UTF-8\"?><collection xmlns=\"http://www.loc.gov/MARC21/slim\"><record><leader>01213nam
+    a22003614a 4500</leader><controlfield tag=\"001\">  2009373513</controlfield><controlfield
+    tag=\"003\">DLC</controlfield><controlfield tag=\"005\">20090121153231.0</controlfield><controlfield
+    tag=\"008\">090114s2008    ch            000 0 chi d</controlfield><datafield
+    tag=\"010\" ind1=\" \" ind2=\" \"><subfield code=\"a\">  2009373513</subfield></datafield><datafield
+    tag=\"020\" ind1=\" \" ind2=\" \"><subfield code=\"a\">9789573908678</subfield></datafield><datafield
+    tag=\"020\" ind1=\" \" ind2=\" \"><subfield code=\"a\">9573908670</subfield></datafield><datafield
+    tag=\"035\" ind1=\" \" ind2=\" \"><subfield code=\"a\">(OCoLC)ocn268619391</subfield></datafield><datafield
+    tag=\"040\" ind1=\" \" ind2=\" \"><subfield code=\"a\">HUA</subfield><subfield
+    code=\"c\">HUA</subfield><subfield code=\"d\">HKP</subfield><subfield code=\"d\">DLC</subfield></datafield><datafield
+    tag=\"042\" ind1=\" \" ind2=\" \"><subfield code=\"a\">lccopycat</subfield></datafield><datafield
+    tag=\"043\" ind1=\" \" ind2=\" \"><subfield code=\"a\">a-cc-hk</subfield></datafield><datafield
+    tag=\"050\" ind1=\"0\" ind2=\"0\"><subfield code=\"a\">HC59.15</subfield><subfield
+    code=\"b\">.L533 2008</subfield></datafield><datafield tag=\"066\" ind1=\" \"
+    ind2=\" \"><subfield code=\"c\">$1</subfield></datafield><datafield tag=\"100\"
+    ind1=\"1\" ind2=\" \"><subfield code=\"6\">880-01</subfield><subfield code=\"a\">Lin,
+    Xingzhi.</subfield></datafield><datafield tag=\"245\" ind1=\"1\" ind2=\"0\"><subfield
+    code=\"6\">880-02</subfield><subfield code=\"a\">Ci an zhou bian /</subfield><subfield
+    code=\"c\">Lin Xingzhi zhu.</subfield></datafield><datafield tag=\"250\" ind1=\"
+    \" ind2=\" \"><subfield code=\"6\">880-03</subfield><subfield code=\"a\">Chu ban.</subfield></datafield><datafield
+    tag=\"260\" ind1=\" \" ind2=\" \"><subfield code=\"6\">880-04</subfield><subfield
+    code=\"a\">Taibei Xian Banqiao Shi :</subfield><subfield code=\"b\">Yuan jing
+    chu ban shi ye you xian gong si,</subfield><subfield code=\"c\">2008.</subfield></datafield><datafield
+    tag=\"300\" ind1=\" \" ind2=\" \"><subfield code=\"a\">5, 300 p. ;</subfield><subfield
+    code=\"c\">21 cm.</subfield></datafield><datafield tag=\"490\" ind1=\"0\" ind2=\"
+    \"><subfield code=\"6\">880-05</subfield><subfield code=\"a\">Lin Xingzhi zuo
+    pin ji ;</subfield><subfield code=\"v\">51</subfield></datafield><datafield tag=\"651\"
+    ind1=\" \" ind2=\"0\"><subfield code=\"a\">Economic history</subfield><subfield
+    code=\"y\">1990-</subfield></datafield><datafield tag=\"651\" ind1=\" \" ind2=\"0\"><subfield
+    code=\"a\">World politics</subfield><subfield code=\"y\">2005-2015.</subfield></datafield><datafield
+    tag=\"651\" ind1=\" \" ind2=\"0\"><subfield code=\"a\">Hong Kong (China)</subfield><subfield
+    code=\"x\">Economic conditions</subfield><subfield code=\"y\">1997-</subfield></datafield><datafield
+    tag=\"651\" ind1=\" \" ind2=\"0\"><subfield code=\"a\">Hong Kong (China)</subfield><subfield
+    code=\"x\">Politics and government</subfield><subfield code=\"y\">1997-</subfield></datafield><datafield
+    tag=\"880\" ind1=\"1\" ind2=\" \"><subfield code=\"6\">100-01/$1</subfield><subfield
+    code=\"a\">林行止.</subfield></datafield><datafield tag=\"880\" ind1=\"1\" ind2=\"0\"><subfield
+    code=\"6\">245-02/$1</subfield><subfield code=\"a\">次按驟變 /</subfield><subfield
+    code=\"c\">林行止著.</subfield></datafield><datafield tag=\"880\" ind1=\" \" ind2=\"
+    \"><subfield code=\"6\">250-03/$1</subfield><subfield code=\"a\">初版.</subfield></datafield><datafield
+    tag=\"880\" ind1=\" \" ind2=\" \"><subfield code=\"6\">260-04/$1</subfield><subfield
+    code=\"a\">臺北縣板橋市 :</subfield><subfield code=\"b\">遠景出版事業有限公司,</subfield><subfield
+    code=\"c\">2008.</subfield></datafield><datafield tag=\"880\" ind1=\"0\" ind2=\"
+    \"><subfield code=\"6\">490-05/$1</subfield><subfield code=\"a\">林行止作品集 ;</subfield><subfield
+    code=\"v\">51</subfield></datafield></record></collection>"
+  published_display:
+  - Taibei Xian Banqiao Shi
+  author_display: Lin, Xingzhi
+  lc_callnum_display:
+  - HC59.15 .L533 2008
+  title_t:
+  - Test item with bounding box only /
+  pub_date:
+  - '2008'
+  pub_date_sort: 2008
+  format: Book
+  lc_b4cutter_facet:
+  - HC59.15
+  material_type_display:
+  - 5, 300 p.
+  subject_t:
+  - Economic history
+  - World politics
+  - Hong Kong (China)
+  title_sort: test item with bounding box only
+  author_sort: Lin Xingzhi Ci an zhou bian
+  title_addl_t:
+  - Ci an zhou bian /
+  language_facet:
+  - Chinese
+  timestamp: '2014-02-03T18:42:53.056Z'
+  geojson:
+  - "{\"type\":\"Feature\",\"geometry\":{\"type\":\"Polygon\",\"coordinates\":[[[115.1, 20.1], [118.1, 20.1], [118.1, 21.1], [115.1, 21.1], [115.1, 20.1]]]},\"bbox\":[115.1, 20.1, 118.1, 21.1]}"
+  coordinates:
+  - 115.1 20.1 118.1 21.1

data/spec/helpers/blacklight_maps_helper_spec.rb

@@ -4,10 +4,11 @@ require 'spec_helper'
 describe BlacklightMapsHelper do
 
   let(:blacklight_config) { Blacklight::Configuration.new }
+  let(:search_state) { Blacklight::SearchState.new({}, blacklight_config) }
 
   def create_response
     raw_response = eval(mock_query_response)
-    Blacklight::SolrResponse.new(raw_response, raw_response['params'])
+    Blacklight::Solr::Response.new(raw_response, raw_response['params'])
   end
 
   let(:r) { create_response }
@@ -20,6 +21,8 @@ describe BlacklightMapsHelper do
     CatalogController.blacklight_config = Blacklight::Configuration.new
     @request = ActionDispatch::TestRequest.new
     @catalog = CatalogController.new
+    allow(helper).to receive_messages(blacklight_configuration_context: Blacklight::Configuration::Context.new(@catalog))
+    allow(helper).to receive(:search_state).and_return(search_state)
     @catalog.request = @request
     @catalog.action_name = "index"
     helper.instance_variable_set(:@_controller, @catalog)
@@ -120,9 +123,9 @@ describe BlacklightMapsHelper do
       @response = r
     end
 
-    it "should return an array of Blacklight::SolrResponse::Facets::FacetItem items" do
+    it "should return an array of Blacklight::Solr::Response::Facets::FacetItem items" do
       expect(helper.map_facet_values.class).to eq(Array)
-      expect(helper.map_facet_values.first.class).to eq(Blacklight::SolrResponse::Facets::FacetItem)
+      expect(helper.map_facet_values.first.class).to eq(Blacklight::Solr::Response::Facets::FacetItem)
       expect(helper.map_facet_values.length).to eq(5)
     end
 
@@ -136,14 +139,14 @@ describe BlacklightMapsHelper do
 
   end
 
-  describe "render_index_map" do
+  describe "render_index_mapview" do
 
     before do
       @response = r
     end
 
-    it "should render the 'catalog/index_map' partial" do
-      expect(helper.render_index_map).to include("$('#blacklight-index-map').blacklight_leaflet_map")
+    it "should render the 'catalog/index_mapview' partial" do
+      expect(helper.render_index_mapview).to include("$('#blacklight-index-map').blacklight_leaflet_map")
     end
 
   end

data/spec/lib/blacklight/maps/maps_search_builder_spec.rb

@@ -1,55 +1,46 @@
 require 'spec_helper'
 
-describe BlacklightMaps::MapsSearchBuilder do
+describe BlacklightMaps::MapsSearchBuilderBehavior do
 
-  class MapsSearchBuilderTestClass
-    cattr_accessor :blacklight_config, :blacklight_params
+  let(:blacklight_config) { CatalogController.blacklight_config.deep_copy }
+  let(:user_params) { Hash.new }
+  let(:context) { CatalogController.new }
 
-    include Blacklight::SearchHelper
-    include BlacklightMaps::MapsSearchBuilder
+  before { allow(context).to receive(:blacklight_config).and_return(blacklight_config) }
 
-    def initialize blacklight_config, blacklight_params
-      self.blacklight_config = blacklight_config
-      self.blacklight_params = blacklight_params
+  let(:search_builder_class) do
+    Class.new(Blacklight::SearchBuilder) do
+      include Blacklight::Solr::SearchBuilderBehavior
+      include BlacklightMaps::MapsSearchBuilderBehavior
     end
-
   end
 
-  let(:blacklight_config) { Blacklight::Configuration.new }
-  let(:blacklight_params) { Hash.new }
-  let(:solr_parameters) { Blacklight::Solr::Request.new }
-
-  describe "add_spatial_search_to_solr" do
+  let(:search_builder) { search_builder_class.new(context) }
 
-    before { @obj = MapsSearchBuilderTestClass.new blacklight_config, blacklight_params }
+  describe 'add_spatial_search_to_solr' do
 
-    describe "coordinate search" do
+    describe 'coordinate search' do
 
-      before do
-        @obj.blacklight_params[:coordinates] = "35.86166,104.195397"
-        @obj.blacklight_params[:spatial_search_type] = "point"
-      end
+      subject { search_builder.with({coordinates: '35.86166,104.195397', spatial_search_type: 'point'}) }
 
-      it "should return a coordinate point spatial search if coordinates are given" do
-        expect(@obj.add_spatial_search_to_solr(solr_parameters)[:fq].first).to include('geofilt')
-        expect(@obj.add_spatial_search_to_solr(solr_parameters)[:pt]).to eq(@obj.blacklight_params[:coordinates])
+      it 'should return a coordinate point spatial search if coordinates are given' do
+        expect(subject[:fq].first).to include('geofilt')
+        expect(subject[:pt]).to eq('35.86166,104.195397')
       end
 
     end
 
-    describe "bbox search" do
+    describe 'bbox search' do
 
-      before do
-        @obj.blacklight_params[:coordinates] = "[6.7535159,68.162386 TO 35.5044752,97.395555]"
-        @obj.blacklight_params[:spatial_search_type] = "bbox"
-      end
+      subject { search_builder.with({coordinates: '[6.7535159,68.162386 TO 35.5044752,97.395555]',
+                                     spatial_search_type: 'bbox'}) }
 
-      it "should return a bbox spatial search if a bbox is given" do
-        expect(@obj.add_spatial_search_to_solr(solr_parameters)[:fq].first).to include(blacklight_config.view.maps.coordinates_field)
+      it 'should return a bbox spatial search if a bbox is given' do
+        expect(subject[:fq].first).to include(blacklight_config.view.maps.coordinates_field)
       end
 
     end
 
   end
 
-end
+end

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

@@ -1,6 +1,7 @@
 require 'rails/generators'
 
 class TestAppGenerator < Rails::Generators::Base
+  source_root "../../spec/test_app_templates"
 
   def remove_index 
     remove_file "public/index.html"
@@ -20,4 +21,12 @@ class TestAppGenerator < Rails::Generators::Base
     generate 'blacklight_maps:install'
   end
 
+  def configure_test_assets
+    insert_into_file 'config/environments/test.rb', :after => 'Rails.application.configure do' do
+      %q{
+  config.assets.digest = false
+}
+    end
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight-maps
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Chris Beer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-13 00:00:00.000000000 Z
+date: 2016-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -31,14 +31,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.12.0
+        version: 6.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.12.0
+        version: 6.1.0
 - !ruby/object:Gem::Dependency
   name: bootstrap-sass
   requirement: !ruby/object:Gem::Requirement
@@ -197,12 +197,12 @@ files:
 - Rakefile
 - app/assets/javascripts/blacklight-maps.js
 - app/assets/javascripts/blacklight-maps/blacklight-maps-browse.js
-- app/assets/stylesheets/blacklight_maps/blacklight-maps.css.scss
-- app/assets/stylesheets/blacklight_maps/default.css.scss
+- app/assets/stylesheets/blacklight_maps/blacklight-maps.scss
+- app/assets/stylesheets/blacklight_maps/default.scss
 - app/helpers/blacklight/blacklight_maps_helper_behavior.rb
 - app/helpers/blacklight_maps_helper.rb
 - app/views/catalog/_document_maps.html.erb
-- app/views/catalog/_index_map.html.erb
+- app/views/catalog/_index_mapview.html.erb
 - app/views/catalog/_map_placename_search.html.erb
 - app/views/catalog/_map_spatial_search.html.erb
 - app/views/catalog/_show_maplet_default.html.erb
@@ -225,12 +225,15 @@ files:
 - lib/blacklight/maps/version.rb
 - lib/generators/blacklight_maps/install_generator.rb
 - lib/generators/blacklight_maps/templates/blacklight_maps.css.scss
+- lib/generators/blacklight_maps/templates/saved_searches_controller.rb
+- lib/generators/blacklight_maps/templates/search_history_controller.rb
 - lib/railties/blacklight_maps.rake
 - solr_conf/conf/schema.xml
 - solr_conf/conf/solrconfig.xml
 - spec/controllers/catalog_controller_spec.rb
 - spec/features/initial_view_spec.rb
 - spec/features/maps_spec.rb
+- spec/features/show_view_maplet_spec.rb
 - spec/fixtures/sample_solr_documents.yml
 - spec/helpers/blacklight_maps_helper_spec.rb
 - spec/lib/blacklight/maps/export_spec.rb
@@ -260,7 +263,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Maps for Blacklight
@@ -268,6 +271,7 @@ test_files:
 - spec/controllers/catalog_controller_spec.rb
 - spec/features/initial_view_spec.rb
 - spec/features/maps_spec.rb
+- spec/features/show_view_maplet_spec.rb
 - spec/fixtures/sample_solr_documents.yml
 - spec/helpers/blacklight_maps_helper_spec.rb
 - spec/lib/blacklight/maps/export_spec.rb