geoblacklight 4.0.0.pre.alpha.1 → 4.0.0.pre.rc1

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

@@ -1,16 +0,0 @@
-<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>
-  <% 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),
-        data: { blacklight_modal: 'trigger' },
-        class: 'more_facets_link' %>
-    </li>
-  <% end %>
-</ul>

data/bin/coverage.rb

@@ -1,36 +0,0 @@
-# frozen_string_literal: true
-# Borrowed from https://github.com/pulibrary/figgy/blob/master/scripts/combine_coverage.rb
-require 'active_support/inflector'
-require 'simplecov'
-
-class SimpleCovHelper
-  def self.report_coverage(base_dir: './coverage_results')
-    min_cov = ENV['MINIMUM_COVERAGE'] || 100
-    SimpleCov.configure do
-      minimum_coverage(min_cov.to_i)
-    end
-    new(base_dir: base_dir).merge_results
-  end
-
-  attr_reader :base_dir
-
-  def initialize(base_dir:)
-    @base_dir = base_dir
-  end
-
-  def all_results
-    Dir["#{base_dir}/.resultset*.json"]
-  end
-
-  def merge_results
-    results = all_results.map { |file| SimpleCov::Result.from_hash(JSON.parse(File.read(file))) }
-    results = SimpleCov::ResultMerger.merge_results(*results)
-    results.format!
-    covered_percent = results.covered_percent.round(2)
-    return unless covered_percent < SimpleCov.minimum_coverage
-    $stderr.printf("Coverage (%.2f%%) is below the expected minimum coverage (%.2f%%).\n", covered_percent, SimpleCov.minimum_coverage)
-    Kernel.exit SimpleCov::ExitCodes::MINIMUM_COVERAGE
-  end
-end
-
-SimpleCovHelper.report_coverage

data/lib/generators/geoblacklight/templates/Procfile

@@ -1,3 +0,0 @@
-rails: bin/rails server --port=3000
-webpack: bin/webpack-dev-server
-

data/lib/generators/geoblacklight/templates/package.json

@@ -1,14 +0,0 @@
-{
-  "name": "internal",
-  "private": true,
-  "dependencies": {
-    "@rails/webpacker": "https://github.com/rails/webpacker.git"
-  },
-  "devDependencies": {
-    "babel-plugin-syntax-dynamic-import": "^6.18.0",
-    "babel-plugin-transform-class-properties": "^6.24.1",
-    "babel-plugin-transform-object-rest-spread": "^6.26.0",
-    "babel-preset-env": "^1.7.0",
-    "webpack-dev-server": "^3.6.0"
-  }
-}

data/lib/generators/geoblacklight/templates/webpacker.yml

@@ -1,67 +0,0 @@
-# Note: You must restart bin/webpack-dev-server for changes to take effect
-
-default: &default
-  source_path: app/javascript
-  source_entry_path: packs
-  public_output_path: packs
-  cache_path: tmp/cache/webpacker
-
-  # Additional paths webpack should lookup modules
-  # ['app/assets', 'engine/foo/app/assets']
-  resolved_paths: []
-
-  # Reload manifest.json on all requests so we reload latest compiled packs
-  cache_manifest: false
-
-  extensions:
-    - .js
-    - .sass
-    - .scss
-    - .css
-    - .module.sass
-    - .module.scss
-    - .module.css
-    - .png
-    - .svg
-    - .gif
-    - .jpeg
-    - .jpg
-
-development: &development
-  <<: *default
-  compile: true
-
-  # Reference: https://webpack.js.org/configuration/dev-server/
-  dev_server:
-    https: false
-    host: localhost
-    port: 3035
-    public: localhost:3035
-    hmr: false
-    # Inline should be set to true if using HMR
-    inline: true
-    overlay: true
-    compress: true
-    disable_host_check: true
-    use_local_ip: false
-    quiet: false
-    headers:
-      'Access-Control-Allow-Origin': '*'
-    watch_options:
-      ignored: /node_modules/
-
-
-test:
-  <<: *development
-
-  # Compile test packs to a separate directory
-  public_output_path: packs-test
-
-production:
-  <<: *default
-
-  # Production depends on precompilation of packs prior to booting for performance.
-  compile: false
-
-  # Cache manifest.json for performance
-  cache_manifest: true

data/lib/generators/geoblacklight/webpacker_generator.rb

@@ -1,36 +0,0 @@
-# frozen_string_literal: true
-require 'rails/generators'
-
-module Geoblacklight
-  class Webpacker < Rails::Generators::Base
-    source_root File.expand_path('../templates', __FILE__)
-
-    desc 'Integrate Webpacker for GeoBlacklight'
-
-    def webpacker_install
-      run 'bundle exec rails webpacker:install'
-    end
-
-    def webpacker_config
-      copy_file 'webpacker.yml', 'config/webpacker.yml'
-    end
-
-    def procfile
-      copy_file 'Procfile', 'Procfile'
-    end
-
-    def javascript_install
-      # This overrides the default dependencies specified using
-      # webpacker:install
-      copy_file 'package.json', 'package.json'
-      yarn_available = system('yarn --version')
-      if yarn_available
-        run 'yarn install'
-        run 'yarn upgrade'
-      else
-        run 'npm install'
-        run 'npm update'
-      end
-    end
-  end
-end

data/lib/geoblacklight/catalog_helper_override.rb

@@ -1,14 +0,0 @@
-# frozen_string_literal: true
-module Geoblacklight
-  module CatalogHelperOverride
-    ##
-    # Removes spatial query from params
-    # @param [Symbol] symbol of field to be removed
-    # @param [Hash] request parameters
-    def remove_spatial_filter_group(field, source_params = params)
-      p = source_params.dup.to_h
-      p.delete(field.to_s)
-      p
-    end
-  end
-end

data/spec/models/concerns/geoblacklight/spatial_search_behavior_spec.rb

@@ -1,97 +0,0 @@
-# frozen_string_literal: true
-require 'spec_helper'
-
-describe Geoblacklight::SpatialSearchBehavior do
-  subject { search_builder.with(user_params) }
-
-  let(:user_params) { {} }
-  let(:solr_params) { {} }
-  let(:blacklight_config) { CatalogController.blacklight_config.deep_copy }
-  let(:context) { CatalogController.new }
-  let(:search_builder_class) do
-    Class.new(Blacklight::SearchBuilder).tap do |klass|
-      include Blacklight::Solr::SearchBuilderBehavior
-      klass.include(described_class)
-    end
-  end
-  let(:search_builder) { search_builder_class.new(context) }
-
-  describe '#add_spatial_params' do
-    it 'returns the solr_params when no bbox is given' do
-      expect(subject.add_spatial_params(solr_params)).to eq solr_params
-    end
-
-    context 'when given a bounding box' do
-      let(:params) do
-        { bbox: '-180 -80 120 80' }
-      end
-
-      before do
-        subject.with(params)
-      end
-
-      it 'returns a spatial search if bbox is given' do
-        expect(subject.add_spatial_params(solr_params)[:fq].to_s).to include('Intersects')
-      end
-
-      it 'applies boost based on configured Settings.BBOX_WITHIN_BOOST' do
-        allow(Settings).to receive(:BBOX_WITHIN_BOOST).and_return 99
-        expect(subject.add_spatial_params(solr_params)[:bq].to_s).to include('^99')
-      end
-
-      it 'applies default boost of 10 when Settings.BBOX_WITHIN_BOOST not configured' do
-        allow(Settings).to receive(:BBOX_WITHIN_BOOST).and_return nil
-        expect(subject.add_spatial_params(solr_params)[:bq].to_s).to include('^10')
-      end
-
-      it 'applies overlapRatio when Settings.OVERLAP_RATIO_BOOST is configured' do
-        allow(Settings).to receive(:OVERLAP_RATIO_BOOST).and_return 2
-        expect(subject.add_spatial_params(solr_params)[:bf].to_s).to include('$overlap^2')
-      end
-
-      it 'does not apply overlapRatio when Settings.OVERLAP_RATIO_BOOST not configured' do
-        allow(Settings).to receive(:OVERLAP_RATIO_BOOST).and_return nil
-        expect(subject.add_spatial_params(solr_params)).not_to have_key(:overlap)
-      end
-
-      context 'when local boost parameter is present' do
-        before do
-          solr_params[:bf] = ['local_boost^5']
-        end
-
-        it 'appends overlap and includes the local boost' do
-          allow(Settings).to receive(:OVERLAP_RATIO_BOOST).and_return 2
-          expect(subject.add_spatial_params(solr_params)[:bf].to_s).to include('$overlap^2')
-          expect(solr_params[:bf].to_s).to include('local_boost^5')
-        end
-      end
-
-      context 'when the wrong format for the bounding box is used' do
-        before do
-          allow(subject).to receive(:bounding_box).and_raise(Geoblacklight::Exceptions::WrongBoundingBoxFormat)
-        end
-
-        it 'returns the spatial search without the boost or filter queries' do
-          expect(subject.add_spatial_params(solr_params)).to eq(bq: [])
-        end
-      end
-    end
-  end
-  describe '#envelope_bounds' do
-    let(:bbox) { instance_double(Geoblacklight::BoundingBox) }
-    before do
-      allow(bbox).to receive(:to_envelope).and_return('test')
-    end
-    it 'calls to_envelope on the bounding box' do
-      expect(subject).to receive(:bounding_box).and_return bbox
-      expect(subject.envelope_bounds).to eq 'test'
-    end
-  end
-  describe '#bounding_box' do
-    it 'creates a bounding box from a Solr lat-lon rectangle format' do
-      params = { bbox: '-120 -80 120 80' }
-      subject.with(params)
-      expect(subject.bounding_box).to be_an Geoblacklight::BoundingBox
-    end
-  end
-end