blacklight-maps 0.3.3 → 1.1.0

metadata

@@ -1,66 +1,65 @@
 --- !ruby/object:Gem::Specification
 name: blacklight-maps
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 1.1.0
 platform: ruby
 authors:
 - Chris Beer
 - Jack Reed
-autorequire: 
-bindir: bin
+- Eben English
+autorequire:
+bindir: exe
 cert_chain: []
-date: 2015-05-13 00:00:00.000000000 Z
+date: 2020-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: blacklight
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 7.8.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 7.8.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8'
 - !ruby/object:Gem::Dependency
-  name: blacklight
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: '5.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.1.0
-- !ruby/object:Gem::Dependency
-  name: bootstrap-sass
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+        version: '5.1'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '7'
 - !ruby/object:Gem::Dependency
-  name: leaflet-rails
+  name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -68,182 +67,194 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: leaflet-markercluster-rails
+  name: engine_cart
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
+        version: '2.1'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.63.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.63.0
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
+  name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '1.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
-  name: jettywrapper
+  name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.13.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.13.1
 - !ruby/object:Gem::Dependency
-  name: engine_cart
+  name: solr_wrapper
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
-- !ruby/object:Gem::Dependency
-  name: capybara
-  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'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: poltergeist
+  name: webdrivers
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
-description: 
+        version: '3.0'
+description: Blacklight plugin providing map views for records with geographic data.
 email:
 - cabeer@stanford.edu
 - pjreed@stanford.edu
+- eenglish@bpl.org
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - ".coveralls.yml"
 - ".gitignore"
+- ".rubocop.yml"
+- ".solr_wrapper.yml"
 - ".travis.yml"
 - CONTRIBUTING.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
+- app/assets/images/blacklight/maps.svg
 - 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
 - app/views/catalog/map.html.erb
 - blacklight-maps.gemspec
-- config/jetty.yml
+- config/locales/blacklight-maps-zh.yml
+- config/locales/blacklight-maps.ar.yml
+- config/locales/blacklight-maps.de.yml
 - config/locales/blacklight-maps.en.yml
+- config/locales/blacklight-maps.es.yml
+- config/locales/blacklight-maps.fr.yml
+- config/locales/blacklight-maps.hu.yml
+- config/locales/blacklight-maps.it.yml
+- config/locales/blacklight-maps.nl.yml
+- config/locales/blacklight-maps.pt-BR.yml
+- config/locales/blacklight-maps.sq.yml
 - config/routes.rb
 - docs/blacklight-maps_index-view.png
 - docs/blacklight-maps_map-view.png
 - docs/blacklight-maps_search-control.png
 - docs/blacklight-maps_show-view.png
 - lib/blacklight/maps.rb
-- lib/blacklight/maps/controller_override.rb
+- lib/blacklight/maps/controller.rb
 - lib/blacklight/maps/engine.rb
 - lib/blacklight/maps/export.rb
 - lib/blacklight/maps/geometry.rb
+- lib/blacklight/maps/maps_search_builder.rb
 - lib/blacklight/maps/render_constraints_override.rb
 - 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/search_history_controller.rb
+- lib/generators/blacklight_maps/templates/solr/conf/schema.xml
+- lib/generators/blacklight_maps/templates/solr/conf/solrconfig.xml
 - 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/fixtures/sample_solr_documents.yml
 - spec/helpers/blacklight_maps_helper_spec.rb
-- spec/lib/blacklight/maps/controller_override_spec.rb
 - spec/lib/blacklight/maps/export_spec.rb
 - spec/lib/blacklight/maps/geometry_spec.rb
+- spec/lib/blacklight/maps/maps_search_builder_spec.rb
 - spec/lib/blacklight/maps/render_constraints_override_spec.rb
 - spec/spec_helper.rb
-- spec/test_app_templates/Gemfile.extra
+- spec/system/index_view_spec.rb
+- spec/system/initial_view_spec.rb
+- spec/system/map_view_spec.rb
+- spec/system/show_view_maplet_spec.rb
 - spec/test_app_templates/lib/generators/test_app_generator.rb
-homepage: ''
+- vendor/assets/images/layers-2x.png
+- vendor/assets/images/layers.png
+- vendor/assets/images/marker-icon-2x.png
+- vendor/assets/images/marker-icon.png
+- vendor/assets/images/marker-shadow.png
+- vendor/assets/javascripts/leaflet.js.erb
+- vendor/assets/javascripts/leaflet.markercluster.js
+- vendor/assets/stylesheets/MarkerCluster.Default.css
+- vendor/assets/stylesheets/MarkerCluster.css
+- vendor/assets/stylesheets/leaflet.css
+homepage: https://github.com/projectblacklight/blacklight-maps
 licenses:
-- Apache 2.0
+- Apache-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -258,21 +269,21 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.2
-signing_key: 
+rubygems_version: 3.0.8
+signing_key:
 specification_version: 4
 summary: Maps for Blacklight
 test_files:
 - spec/controllers/catalog_controller_spec.rb
-- spec/features/initial_view_spec.rb
-- spec/features/maps_spec.rb
 - spec/fixtures/sample_solr_documents.yml
 - spec/helpers/blacklight_maps_helper_spec.rb
-- spec/lib/blacklight/maps/controller_override_spec.rb
 - spec/lib/blacklight/maps/export_spec.rb
 - spec/lib/blacklight/maps/geometry_spec.rb
+- spec/lib/blacklight/maps/maps_search_builder_spec.rb
 - spec/lib/blacklight/maps/render_constraints_override_spec.rb
 - spec/spec_helper.rb
-- spec/test_app_templates/Gemfile.extra
+- spec/system/index_view_spec.rb
+- spec/system/initial_view_spec.rb
+- spec/system/map_view_spec.rb
+- spec/system/show_view_maplet_spec.rb
 - spec/test_app_templates/lib/generators/test_app_generator.rb

data/config/jetty.yml

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

data/lib/blacklight/maps/controller_override.rb

@@ -1,33 +0,0 @@
-module BlacklightMaps
-  module ControllerOverride
-    extend ActiveSupport::Concern
-    included do
-      solr_search_params_logic << :add_spatial_search_to_solr
-    end
-
-    def map
-      (@response, @document_list) = get_search_results
-      params[:view] = 'maps'
-      respond_to do |format|
-        format.html
-      end
-    end
-
-    # add spatial search params to solr
-    def add_spatial_search_to_solr(solr_parameters, user_parameters)
-      if user_parameters[:spatial_search_type] && user_parameters[:coordinates]
-        solr_parameters[:fq] ||= []
-        if user_parameters[:spatial_search_type] == 'bbox'
-          solr_parameters[:fq] << blacklight_config.view.maps.coordinates_field + ":" + user_parameters[:coordinates]
-        else
-          solr_parameters[:fq] << "{!geofilt sfield=#{blacklight_config.view.maps.coordinates_field}}"
-          solr_parameters[:pt] = user_parameters[:coordinates]
-          solr_parameters[:d] = blacklight_config.view.maps.spatial_query_dist
-        end
-      end
-      solr_parameters
-    end
-
-  end
-
-end

data/spec/features/initial_view_spec.rb

@@ -1,21 +0,0 @@
-require 'spec_helper'
-
-feature 'Initial view parameter', js: true do
-  before :all do
-    CatalogController.configure_blacklight do |config|
-      config.view.maps.facet_mode = 'coordinates'
-      config.view.maps.coordinates_facet_field = 'coordinates_facet'
-      config.add_facet_field 'coordinates_facet', :limit => -2, :label => 'Coordinates', :show => false
-    end
-  end
-  scenario 'defaults to zoom area of markers' do
-    visit catalog_index_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'
-    expect(page).to_not have_css '.leaflet-marker-icon.marker-cluster'
-  end
-end

data/spec/features/maps_spec.rb

@@ -1,252 +0,0 @@
-require 'spec_helper'
-
-describe "Map View", js: true do
-
-  before :each do
-    CatalogController.blacklight_config = Blacklight::Configuration.new
-  end
-
-  describe "catalog#index and catalog#map views" do
-
-    describe "catalog#index map view" do
-
-      before :each do
-        CatalogController.configure_blacklight do |config|
-          # use geojson facet for blacklight-maps catalog#index map view specs
-          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'
-      end
-
-      it "should display map elements" do
-        expect(page).to have_selector("#documents.map")
-        expect(page).to have_selector("#blacklight-index-map")
-      end
-
-      it "should display tile layer attribution" do
-        expect(find("div.leaflet-control-container")).to have_content('OpenStreetMap contributors, CC-BY-SA')
-      end
-
-      describe "#sortAndPerPage" do
-
-        it "should show the mapped item count" do
-          expect(page).to have_selector(".mapped-count .badge", text: "4")
-        end
-
-        it "should show the mapped item caveat" do
-          expect(page).to have_selector(".mapped-caveat")
-        end
-
-        # TODO: placeholder spec: #sortAndPerPage > .view-type > .view-type-group
-        # should show active map icon. however, this spec doesn't work because
-        # Blacklight::ConfigurationHelperBehavior#has_alternative_views? returns false,
-        # so catalog/_view_type_group partial renders no content, can't figure out why
-        it "should show the map view icon" #do
-          #expect(page).to have_selector(".view-type-maps.active")
-        #end
-
-      end
-
-      describe "data attributes" do
-
-        it "maxzoom should be from config" do
-          expect(page).to have_selector("#blacklight-index-map[data-maxzoom='#{CatalogController.blacklight_config.view.maps.maxzoom}']")
-        end
-
-        it "tileurl should be from config" do
-          expect(page).to have_selector("#blacklight-index-map[data-tileurl='#{CatalogController.blacklight_config.view.maps.tileurl}']")
-        end
-
-      end
-
-      describe "marker clusters" do
-
-        before {
-          0.upto(2) { find("a.leaflet-control-zoom-out").click } # zoom out to create cluster
-        }
-
-        it "should have marker cluster div" do
-          expect(page).to have_selector("div.marker-cluster")
-        end
-
-        it "should only have one marker cluster" do
-          expect(page).to have_selector("div.marker-cluster", count: 1)
-        end
-
-        it "should show the result count" do
-          expect(find("div.marker-cluster")).to have_content(4)
-        end
-
-        describe "click marker cluster" do
-
-          before { find("div.marker-cluster").click }
-
-          it "should split into two marker clusters" do
-            expect(page).to have_selector("div.marker-cluster", count: 2)
-          end
-
-        end
-
-      end
-
-      describe "marker popups" do
-        before do
-          find('.marker-cluster', text: '1', match: :first).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("Seoul (Korea)")
-        end
-
-        describe "click search link" do
-
-          before { find("div.leaflet-popup-content a").click }
-
-          it "should run a new search" do
-            expect(page).to have_selector(".constraint-value .filterValue", text: "Seoul (Korea)")
-          end
-
-          it "should use the default view type" do
-            expect(current_url).to include("view=list")
-          end
-
-        end
-
-      end
-
-      describe "map search control" do
-
-        it "should have a search control" do
-          expect(page).to have_selector(".leaflet-control .search-control")
-        end
-
-        describe "search control hover" do
-
-          before { find(".search-control").hover }
-
-          it "should add a border to the map" do
-            expect(page).to have_selector(".leaflet-overlay-pane path")
-          end
-
-        end
-
-        describe "search control click" do
-
-          before { find(".search-control").click }
-
-          it "should run a new search" do
-            expect(page).to have_selector(".constraint.coordinates")
-            expect(current_url).to include("view=list")
-          end
-
-        end
-
-      end
-
-    end
-
-    describe "catalog#map view" do
-
-      before :each do
-        CatalogController.configure_blacklight do |config|
-          # use coordinates_facet facet for blacklight-maps catalog#map view specs
-          config.view.maps.facet_mode = 'coordinates'
-          config.view.maps.coordinates_facet_field = 'coordinates_facet'
-          config.add_facet_field 'coordinates_facet', :limit => -2, :label => 'Coordinates', :show => false
-          config.add_facet_fields_to_solr_request!
-        end
-        visit map_path
-        #print page.html # debugging
-      end
-
-      it "should display map elements" do
-        expect(page).to have_selector("#documents.map")
-        expect(page).to have_selector("#blacklight-index-map")
-      end
-
-      it "should display some markers" do
-        expect(page).to have_selector("div.marker-cluster")
-      end
-
-      describe "marker popups" do
-
-        before :each do
-          0.upto(1) { find("a.leaflet-control-zoom-in").click } # zoom in
-          find(".marker-cluster:first-child").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("[35.86166, 104.195397]")
-        end
-
-        describe "click search link" do
-
-          before { find("div.leaflet-popup-content a").click }
-
-          it "should run a new search" do
-            expect(page).to have_selector(".constraint-value .filterValue", text: "35.86166,104.195397")
-            expect(current_url).to include("view=list")
-          end
-
-        end
-
-      end
-
-    end
-
-  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