geoblacklight 1.7.0 → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bb4ed10cd413d3a4e9d2dad9426f3daec4fd2ca2
-  data.tar.gz: 913bff7e68d24e3c7ff712691ec68425e804656a
+  metadata.gz: c5270535fbab7516ccc911e63dee5fdaf1b632d7
+  data.tar.gz: e699996e65fb6c49bb3cc9d15b5298862c57dedc
 SHA512:
-  metadata.gz: aa35b2e12fc1ee5056e74bf6bb6a2f068db3c35968f874025f4100815267cbe85fbc596dc2cfb29e3cf4f62b63f6534b77d067ed7297437c89cef66e05f87401
-  data.tar.gz: 9bae8b906915dc34bfec3b4f22e02157cab44c4aeed8dda2e69856942d1e309ac1342bcc23bcde35cf80809d78691e76717d4d3be470da01faf8c1ffa851586a
+  metadata.gz: 747b13d2a4fd7217b96f9b746f8af36c51a12be37d6fea198d3eeebcfe35ff479626a1563bcafe93384bfd1340086d65f6696ffcfcddeef95bb70ce8fc7f35bb
+  data.tar.gz: d7c85ac98ffe88c6a32b54c724522aa8bc5bc12f5ed3b674fe00030cde245ae6ff20088b485d5e74fb15e68a96ea23195f01a420d67bd279a7e939cda824f8f3

data/.travis.yml

@@ -2,18 +2,18 @@ dist: trusty
 addons:
   chrome: stable
 language: ruby
-sudo: false
+sudo: required
 
 notifications:
   email: false
 
 rvm:
-  - 2.4.1
+  - 2.4.3
 
 matrix:
   include:
-    - rvm: 2.3.4
-      env: "RAILS_VERSION=5.0.5"
+    - rvm: 2.3.6
+      env: "RAILS_VERSION=5.0.6"
 
 before_install:
   - gem update --system
@@ -21,7 +21,7 @@ before_install:
   - google-chrome-stable --headless --disable-gpu --remote-debugging-port=9222 http://localhost &
 
 env:
- - "RAILS_VERSION=5.1.3"
+ - "RAILS_VERSION=5.1.4 "
 
 global_env:
   - NOKOGIRI_USE_SYSTEM_LIBRARIES=true

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

@@ -1,8 +1,15 @@
 <ul class="facet-values list-unstyled">
   <% paginator = facet_paginator(facet_field, display_facet) %>
   <% paginator.items.each do |item| -%>
-  <li>
-    <%= render_facet_item_with_icon(field_name, item) %>
-  </li>
+    <li>
+      <%= render_facet_item_with_icon(field_name, item) %>
+    </li>
+  <% end %>
+  <% unless paginator.last_page? || params[:action] == "facet" %>
+    <li class="more_facets">
+      <%= link_to t("more_#{field_name}_html", scope: 'blacklight.search.facets', default: :more_html, field_name: facet_field.label), 
+        search_facet_path(id: facet_field.key),
+        class: 'more_facets_link' %>
+    </li>
   <% end %>
 </ul>

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

@@ -1,4 +1,5 @@
 <% document ||= @document %>
+<% doc_presenter = show_presenter(document) %>
 <div class="geoblacklight-view-panel">
   
   <%# From https://github.com/projectblacklight/blacklight/blob/master/app/views/catalog/_show_default.html.erb %>
@@ -8,7 +9,7 @@
     <% document_show_fields(document).each do |solr_fname, field| %>
       <% if should_render_show_field? document, field %>
         <dt class="blacklight-<%= solr_fname.parameterize %>"><%= render_document_show_field_label document, field: solr_fname %></dt>
-        <dd class="blacklight-<%= solr_fname.parameterize %>"><%= render_document_show_field_value document, field: solr_fname %></dd>
+        <dd class="blacklight-<%= solr_fname.parameterize %>"><%= doc_presenter.field_value solr_fname %></dd>
       <% end %>
     <% end %>
     <% if !@document.references.nil? && !@document.references.url.nil? %>

data/geoblacklight.gemspec

@@ -39,6 +39,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'capybara', '>= 2.5.0'
   spec.add_development_dependency 'selenium-webdriver'
   spec.add_development_dependency 'chromedriver-helper'
-  spec.add_development_dependency 'factory_girl_rails'
+  spec.add_development_dependency 'factory_bot_rails'
   spec.add_development_dependency 'database_cleaner', '~> 1.3'
 end

data/lib/geoblacklight/version.rb

@@ -1,3 +1,3 @@
 module Geoblacklight
-  VERSION = '1.7.0'.freeze
+  VERSION = '1.7.1'.freeze
 end

data/spec/factories/user.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :user do
     sequence(:email) { |n| "user#{n}@example.com" }
     password 'password'

data/spec/features/download_layer_spec.rb

@@ -86,7 +86,7 @@ feature 'Download layer' do
       fill_in('Email', with: 'foo@example.com')
       click_button('Request')
     end
-    using_wait_time 45 do
+    using_wait_time 95 do
       expect(page).to have_css('.alert-success')
       expect(page).to have_content('You should receive an email when your download is ready')
     end

data/spec/features/linkified_attribute_table_spec.rb

@@ -2,6 +2,7 @@ require 'spec_helper'
 
 feature 'Attribute table values', js: true do
   scenario 'are linkified' do
+    pending 'ArcGIS server returning an error'
     visit solr_document_path 'minnesota-e2f33b52-4039-4bbb-9095-b5cdc0175943'
     # Wait until SVG elements are added
     expect(page).to have_css '.leaflet-overlay-pane svg'

data/spec/features/split_view.html.erb_spec.rb

@@ -28,6 +28,7 @@ feature 'Index view', js: true do
     expect(page).to have_css('a.facet_select', text: 'Columbia', visible: true)
     expect(page).to have_css('a.facet_select', text: 'MIT', visible: true)
     expect(page).to have_css('a.facet_select', text: 'Stanford', visible: true)
+    expect(page).to have_css('a.more_facets_link', text: 'more Institution »', visible: true)
   end
 
   scenario 'hover on record should produce bounding box on map' do

data/spec/spec_helper.rb

@@ -38,8 +38,8 @@ require 'geoblacklight'
 
 Dir['./spec/support/**/*.rb'].sort.each { |f| require f }
 
-FactoryGirl.definition_file_paths = [File.expand_path('../factories', __FILE__)]
-FactoryGirl.find_definitions
+FactoryBot.definition_file_paths = [File.expand_path('../factories', __FILE__)]
+FactoryBot.find_definitions
 
 RSpec.configure do |config|
   config.use_transactional_fixtures = false

data/spec/support/features/session_helpers.rb

@@ -8,7 +8,7 @@ module Features
     end
 
     def sign_in
-      user = FactoryGirl.create(:user)
+      user = FactoryBot.create(:user)
       user.save
       visit new_user_session_path
       fill_in 'user_email', with: user.email

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geoblacklight
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.7.1
 platform: ruby
 authors:
 - Mike Graves
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-14 00:00:00.000000000 Z
+date: 2018-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -280,7 +280,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: factory_girl_rails
+  name: factory_bot_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -624,7 +624,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 2.5.2
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: A discovery platform for geospatial holdings