geoblacklight 0.11.1 → 0.12.0

data/{lib → app/models/concerns}/geoblacklight/solr_document.rb

@@ -5,6 +5,7 @@ module Geoblacklight
 
     include Geoblacklight::SolrDocument::Finder
     include Geoblacklight::SolrDocument::CartoDb
+    include Geoblacklight::SolrDocument::Inspection
 
     delegate :download_types, to: :references
     delegate :viewer_protocol, to: :item_viewer
@@ -26,10 +27,6 @@ module Geoblacklight
       (direct_download || download_types.present?) && available?
     end
 
-    def download_types
-      references.download_types
-    end
-
     def references
       References.new(self)
     end
@@ -51,18 +48,26 @@ module Geoblacklight
     end
 
     def itemtype
-      "http://schema.org/Dataset"
+      'http://schema.org/Dataset'
     end
 
     def bounding_box_as_wsen
-      s = fetch(Settings.GEOMETRY_FIELD.to_sym)
-      if s =~ /^\s*ENVELOPE\(\s*([-\.\d]+)\s*,\s*([-\.\d]+)\s*,\s*([-\.\d]+)\s*,\s*([-\.\d]+)\s*\)\s*$/
-        w, s, e, n = $1, $4, $2, $3
+      geom_field = fetch(Settings.GEOMETRY_FIELD.to_sym)
+      exp = /^\s*ENVELOPE\(
+                  \s*([-\.\d]+)\s*,
+                  \s*([-\.\d]+)\s*,
+                  \s*([-\.\d]+)\s*,
+                  \s*([-\.\d]+)\s*
+                  \)\s*$/x # uses 'x' option for free-spacing mode
+      bbox_match = exp.match(geom_field)
+      if bbox_match
+        w, e, n, s = bbox_match.captures
         return "#{w} #{s} #{e} #{n}"
       else
         return s # as-is, not a WKT
       end
     end
+
     ##
     # Provides a convenience method to access a SolrDocument's References
     # endpoint url without having to check and see if it is available

data/{lib → app/models/concerns}/geoblacklight/solr_document/finder.rb

@@ -11,7 +11,6 @@ module Geoblacklight
       ##
       # Class level finder methods for documents
       module ClassMethods
-
         ##
         # Find a Solr Document from an index
         # @param [String]
@@ -36,4 +35,4 @@ module Geoblacklight
       end
     end
   end
-end
+end

data/app/models/concerns/geoblacklight/solr_document/inspection.rb

@@ -0,0 +1,15 @@
+module Geoblacklight
+  module SolrDocument
+    ##
+    # Module to provide inspection logic for solr document
+    module Inspection
+      ##
+      # Returns boolean about whether document viewer protocol is inspectable
+      # @return [Boolean]
+      def inspectable?
+        %w(wms)
+          .include? viewer_protocol
+      end
+    end
+  end
+end

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

@@ -1,5 +1,5 @@
 <% document ||= @document %>
 <div id='viewer-container' class="col-md-8">
-  <%= content_tag :div, id: 'map', data: { map: 'item', protocol: document.viewer_protocol, url: document.viewer_endpoint, 'layer-id' => wxs_identifier(document), 'map-bbox' => document.bounding_box_as_wsen, 'catalog-path'=> catalog_index_path, available: document_available?, basemap: geoblacklight_basemap } do %>
+  <%= content_tag :div, id: 'map', data: { map: 'item', protocol: document.viewer_protocol.camelize, url: document.viewer_endpoint, 'layer-id' => wxs_identifier(document), 'map-bbox' => document.bounding_box_as_wsen, 'catalog-path'=> catalog_index_path, available: document_available?, inspect: show_attribute_table?, basemap: geoblacklight_basemap } do %>
   <% end %>
 </div>

data/config/initializers/rails_config.rb

@@ -1,3 +1,3 @@
 RailsConfig.setup do |config|
-  config.const_name = "Settings"
-end
+  config.const_name = 'Settings'
+end

data/geoblacklight.gemspec

@@ -18,9 +18,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'blacklight', '~> 5.12.0'
+  spec.add_dependency 'blacklight', '~> 5.12', '< 6'
   spec.add_dependency 'leaflet-rails', '~> 0.7.3'
-  spec.add_dependency 'blacklight_range_limit', '~> 5.0.3'
   spec.add_dependency 'font-awesome-rails', '~> 4.1.0.0'
   spec.add_dependency 'rails_config', '~> 0.4.2'
   spec.add_dependency 'faraday'
@@ -31,9 +30,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake', '~> 10.3.2'
   spec.add_development_dependency 'rspec-rails', '~> 3.0.1'
   spec.add_development_dependency 'jettywrapper', '>= 2.0'
-  spec.add_development_dependency 'engine_cart', '~> 0.4.0'
+  spec.add_development_dependency 'engine_cart', '~> 0.8'
   spec.add_development_dependency 'capybara', '~> 2.3.0'
-  spec.add_development_dependency 'poltergeist', '~> 1.5.0'
+  spec.add_development_dependency 'poltergeist', '~> 1.5'
   spec.add_development_dependency 'factory_girl_rails'
   spec.add_development_dependency 'database_cleaner'
 end

data/lib/generators/geoblacklight/install_generator.rb

@@ -2,33 +2,35 @@ require 'rails/generators'
 
 module Geoblacklight
   class Install < Rails::Generators::Base
-
     source_root File.expand_path('../templates', __FILE__)
 
-    class_option :jettywrapper, type: :boolean, default: false, desc: 'Use jettywrapper to download and control Jetty'
+    class_option :jettywrapper,
+                 type: :boolean,
+                 default: false,
+                 desc: 'Use jettywrapper to download and control Jetty'
 
-    desc "Install Geoblacklight"
+    desc 'Install Geoblacklight'
 
     def install_jettywrapper
       return unless options[:jettywrapper]
       copy_file 'config/jetty.yml'
 
       append_to_file 'Rakefile',
-        "\nZIP_URL = \"https://github.com/projectblacklight/blacklight-jetty/archive/v4.10.3.zip\"\n" +
-        "require 'jettywrapper'\n"
+                     "\nZIP_URL = \"https://github.com/projectblacklight/blacklight-jetty/archive/v4.10.3.zip\"\n" \
+                       "require 'jettywrapper'\n"
     end
 
     def assets
-      copy_file "geoblacklight.css.scss", "app/assets/stylesheets/geoblacklight.css.scss"
-      copy_file "geoblacklight.js", "app/assets/javascripts/geoblacklight.js"
+      copy_file 'geoblacklight.css.scss', 'app/assets/stylesheets/geoblacklight.css.scss'
+      copy_file 'geoblacklight.js', 'app/assets/javascripts/geoblacklight.js'
 
       append_to_file 'config/initializers/assets.rb',
-        "\nRails.application.config.assets.precompile += %w( favicon.ico )\n"
+                     "\nRails.application.config.assets.precompile += %w( favicon.ico )\n"
     end
 
     def create_blacklight_catalog
-      remove_file "app/controllers/catalog_controller.rb"
-      copy_file "catalog_controller.rb", "app/controllers/catalog_controller.rb"
+      remove_file 'app/controllers/catalog_controller.rb'
+      copy_file 'catalog_controller.rb', 'app/controllers/catalog_controller.rb'
     end
 
     def rails_config
@@ -48,30 +50,29 @@ module Geoblacklight
     end
 
     def create_downloads_directory
-      FileUtils.mkdir_p("tmp/cache/downloads") unless File.directory?("tmp/cache/downloads")
+      FileUtils.mkdir_p('tmp/cache/downloads') unless File.directory?('tmp/cache/downloads')
     end
 
     # Necessary for bootstrap-sass 3.2
     def inject_sprockets
-      blacklight_css = Dir["app/assets/stylesheets/blacklight.css.scss"].first
+      blacklight_css = Dir['app/assets/stylesheets/blacklight.css.scss'].first
       if blacklight_css
         insert_into_file blacklight_css, before: "@import 'bootstrap';" do
           "@import 'bootstrap-sprockets';\n"
         end
       else
-        say_status "warning", "Can not find blacklight.css.scss, did not insert our require", :red
+        say_status 'warning', 'Can not find blacklight.css.scss, did not insert our require', :red
       end
     end
 
     def disable_turbolinks
-      gsub_file('app/assets/javascripts/application.js', /\/\/= require turbolinks/, '')
+      gsub_file('app/assets/javascripts/application.js', %r{\/\/= require turbolinks}, '')
     end
 
     def bundle_install
       Bundler.with_clean_env do
-        run "bundle install"
+        run 'bundle install'
       end
     end
-
   end
 end

data/lib/generators/geoblacklight/templates/catalog_controller.rb

@@ -79,11 +79,7 @@ class CatalogController < ApplicationController
     config.add_facet_field 'dct_spatial_sm', :label => 'Place', :limit => 8
     config.add_facet_field 'dct_isPartOf_sm', :label => 'Collection', :limit => 8
 
-    config.add_facet_field 'solr_year_i', :label => 'Year', :limit => 10, :range => {
-      # :num_segments => 6,
-      :assumed_boundaries => [1100, 2015]
-      # :segments => true
-    }
+    config.add_facet_field 'solr_year_i', :label => 'Year', :limit => 10
 
     config.add_facet_field 'dc_rights_s', label: 'Access', limit: 8, partial: "icon_facet"
     config.add_facet_field 'layer_geom_type_s', label: 'Data type', limit: 8, partial: "icon_facet"

data/lib/generators/geoblacklight/templates/geoblacklight.css.scss

@@ -1,4 +1,3 @@
 /*
 *= require geoblacklight/application
-*= require blacklight_range_limit
 */

data/lib/generators/geoblacklight/templates/geoblacklight.js

@@ -3,6 +3,5 @@
 //= require geoblacklight/viewers
 //= require geoblacklight/modules
 //= require geoblacklight/downloaders
-//= require blacklight_range_limit
 //= require leaflet-iiif
 //= require readmore.min

data/lib/geoblacklight.rb

@@ -1,19 +1,14 @@
-require "geoblacklight/engine"
+require 'geoblacklight/engine'
 
 module Geoblacklight
   require 'geoblacklight/bounding_box'
   require 'geoblacklight/catalog_helper_override'
-  require 'geoblacklight/config'
   require 'geoblacklight/constants'
   require 'geoblacklight/controller_override'
   require 'geoblacklight/exceptions'
   require 'geoblacklight/geoblacklight_helper_behavior'
-  require 'geoblacklight/document_presenter'
   require 'geoblacklight/view_helper_override'
   require 'geoblacklight/item_viewer'
-  require 'geoblacklight/solr_document/finder'
-  require 'geoblacklight/solr_document/carto_db'
-  require 'geoblacklight/solr_document'
   require 'geoblacklight/wms_layer'
   require 'geoblacklight/wms_layer/feature_info_response'
   require 'geoblacklight/download'

data/lib/geoblacklight/bounding_box.rb

@@ -28,7 +28,8 @@ module Geoblacklight
     # @return [Geoblacklight::BoundingBox]
     def self.from_rectangle(rectangle)
       rectangle_array = rectangle.split(' ')
-      fail Geoblacklight::Exceptions::WrongBoundingBoxFormat, 'Bounding box should be a string in Solr rectangle syntax e.g."W S E N"' if rectangle_array.count != 4
+      message = 'Bounding box should be a string in Solr rectangle syntax e.g."W S E N"'
+      fail Geoblacklight::Exceptions::WrongBoundingBoxFormat, message if rectangle_array.count != 4
       new(
         rectangle_array[0],
         rectangle_array[1],

data/lib/geoblacklight/catalog_helper_override.rb

@@ -1,6 +1,5 @@
 module Geoblacklight
   module CatalogHelperOverride
-
     ##
     # Removes spatial query from params
     # @param [Symbol] symbol of field to be removed

data/lib/geoblacklight/download.rb

@@ -39,7 +39,7 @@ module Geoblacklight
     # @return [String] filename of the completed download
     def create_download_file
       download = initiate_download
-      File.open("#{file_path_and_name}.tmp", 'wb')  do |file|
+      File.open("#{file_path_and_name}.tmp", 'wb') do |file|
         if download.headers['content-type'] == @options[:content_type]
           file.write download.body
         else
@@ -49,7 +49,8 @@ module Geoblacklight
       File.rename("#{file_path_and_name}.tmp", "#{file_path_and_name}")
       file_name
     rescue Geoblacklight::Exceptions::WrongDownloadFormat => error
-      Geoblacklight.logger.error "#{error} expected #{@options[:content_type]} received #{download.headers['content-type']}"
+      Geoblacklight.logger.error "#{error} expected #{@options[:content_type]} "\
+                                 "received #{download.headers['content-type']}"
       File.delete("#{file_path_and_name}.tmp")
       raise Geoblacklight::Exceptions::ExternalDownloadFailed, message: 'Wrong download type'
     end
@@ -57,7 +58,7 @@ module Geoblacklight
     ##
     # Initiates download from a remote source url using the `request_params`.
     # Will catch Faraday::Error::ConnectionFailed and
-    # Faraday::Error::TimeoutError 
+    # Faraday::Error::TimeoutError
     # @return [Faraday::Request] returns a Faraday::Request object
     def initiate_download
       conn = Faraday.new(url: url)
@@ -66,10 +67,14 @@ module Geoblacklight
         request.options.timeout = timeout
         request.options.open_timeout = timeout
       end
-    rescue Faraday::Error::ConnectionFailed => error
-      raise Geoblacklight::Exceptions::ExternalDownloadFailed, message: 'Download connection failed', url: conn.url_prefix.to_s
-    rescue Faraday::Error::TimeoutError => error
-      raise Geoblacklight::Exceptions::ExternalDownloadFailed, message: 'Download timed out', url: conn.url_prefix.to_s
+    rescue Faraday::Error::ConnectionFailed
+      raise Geoblacklight::Exceptions::ExternalDownloadFailed,
+            message: 'Download connection failed',
+            url: conn.url_prefix.to_s
+    rescue Faraday::Error::TimeoutError
+      raise Geoblacklight::Exceptions::ExternalDownloadFailed,
+            message: 'Download timed out',
+            url: conn.url_prefix.to_s
     end
 
     ##

data/lib/geoblacklight/download/hgl_download.rb

@@ -1,10 +1,9 @@
 module Geoblacklight
   class HglDownload < Geoblacklight::Download
     def initialize(document, email, options = {})
-
       request_params = {
-        "LayerName" => document[:layer_id_s].sub(/^cite:/, ''),
-        "UserEmail" => email
+        'LayerName' => document[:layer_id_s].sub(/^cite:/, ''),
+        'UserEmail' => email
       }
       super(document, {
         request_params: request_params,

data/lib/geoblacklight/download/kmz_download.rb

@@ -1,9 +1,15 @@
 module Geoblacklight
   class KmzDownload < Geoblacklight::Download
-    KMZ_DOWNLOAD_PARAMS = { service: 'wms', version: '1.1.0', request: 'GetMap', srsName: 'EPSG:900913', format: 'application/vnd.google-earth.kmz', width: 2000, height: 2000 }
-    
+    KMZ_DOWNLOAD_PARAMS = { service: 'wms',
+                            version: '1.1.0',
+                            request: 'GetMap',
+                            srsName: 'EPSG:900913',
+                            format: 'application/vnd.google-earth.kmz',
+                            width: 2000, height: 2000 }
+
     def initialize(document, options = {})
-      request_params = KMZ_DOWNLOAD_PARAMS.merge(layers: document[:layer_id_s], bbox: document.bounding_box_as_wsen.split(' ').join(', '))
+      bbox_wsen = document.bounding_box_as_wsen.split(' ').join(', ')
+      request_params = KMZ_DOWNLOAD_PARAMS.merge(layers: document[:layer_id_s], bbox: bbox_wsen)
       super(document, {
         type: 'kmz',
         extension: 'kmz',

data/lib/geoblacklight/download/shapefile_download.rb

@@ -1,6 +1,10 @@
 module Geoblacklight
   class ShapefileDownload < Geoblacklight::Download
-    SHAPEFILE_DOWNLOAD_PARAMS = { service: 'wfs', version: '2.0.0', request: 'GetFeature', srsName: 'EPSG:4326', outputformat: 'SHAPE-ZIP' }
+    SHAPEFILE_DOWNLOAD_PARAMS = { service: 'wfs',
+                                  version: '2.0.0',
+                                  request: 'GetFeature',
+                                  srsName: 'EPSG:4326',
+                                  outputformat: 'SHAPE-ZIP' }
 
     def initialize(document, options = {})
       request_params = SHAPEFILE_DOWNLOAD_PARAMS.merge(typeName: document[:layer_id_s])

data/lib/geoblacklight/engine.rb

@@ -3,19 +3,17 @@ require 'leaflet-rails'
 require 'font-awesome-rails'
 require 'rails_config'
 require 'faraday'
-require 'blacklight_range_limit'
 require 'nokogiri'
 require 'coderay'
 require 'geoblacklight-icons'
 
 module Geoblacklight
   class Engine < ::Rails::Engine
-
     Blacklight::Configuration.default_values[:view].split.partials = ['index']
     Blacklight::Configuration.default_values[:view].delete_field('list')
     # GeoblacklightHelper is needed by all helpers, so we inject it
     # into action view base here.
-    initializer 'geoblacklight.helpers' do |app|
+    initializer 'geoblacklight.helpers' do
       ActionView::Base.send :include, GeoblacklightHelper
     end
 

data/lib/geoblacklight/exceptions.rb

@@ -7,7 +7,7 @@ module Geoblacklight
 
       ##
       # URL tried from failed download
-      # @return [String] 
+      # @return [String]
       def url
         @options[:url].to_s
       end

data/lib/geoblacklight/metadata.rb

@@ -1,6 +1,5 @@
 module Geoblacklight
   class Metadata
-
     ##
     # Instantiates a Geoblacklight::Metadata object used for retrieving and
     # formatting metadata

data/lib/geoblacklight/references.rb

@@ -75,9 +75,9 @@ module Geoblacklight
     # present
     # @return (see #downloads_by_format)
     def vector_download_formats
-      if wfs && wms
-        { shapefile: wfs.to_hash, kmz: wms.to_hash, geojson: wfs.to_hash } if wms.present? && wfs.present?
-      end
+      { shapefile: wfs.to_hash,
+        kmz: wms.to_hash,
+        geojson: wfs.to_hash } if wms.present? && wfs.present?
     end
 
     ##
@@ -103,6 +103,5 @@ module Geoblacklight
         super
       end
     end
-
   end
 end

data/lib/geoblacklight/routes.rb

@@ -6,13 +6,15 @@ module Geoblacklight
     end
 
     def web_services_routes(primary_resource)
-      add_routes do |options|
+      add_routes do
         post 'wms/handle'
         resources :download, only: [:show, :file]
         get 'download/file/:id' => 'download#file', as: :download_file
         get 'download/hgl/:id' => 'download#hgl', as: :download_hgl
-        get "#{primary_resource}/:id/web_services" => "#{primary_resource}#web_services", as: "web_services_#{primary_resource}"
-        get "#{primary_resource}/:id/metadata" => "#{primary_resource}#metadata", as: "metadata_#{primary_resource}"
+        get "#{primary_resource}/:id/web_services" => "#{primary_resource}#web_services",
+            as: "web_services_#{primary_resource}"
+        get "#{primary_resource}/:id/metadata" => "#{primary_resource}#metadata",
+            as: "metadata_#{primary_resource}"
       end
     end
   end