geoblacklight 0.5.1 → 0.6.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Rakefile +1 -1
- data/app/assets/javascripts/geoblacklight/modules/geosearch.js +9 -2
- data/app/assets/javascripts/geoblacklight/modules/results.js +1 -0
- data/app/assets/javascripts/geoblacklight/viewers/map.js +1 -1
- data/app/assets/stylesheets/geoblacklight/_geoblacklight.scss +2 -0
- data/app/assets/stylesheets/geoblacklight/modules/icon-customization.scss +12 -0
- data/app/assets/stylesheets/geoblacklight/modules/search_widgets.scss +5 -0
- data/app/assets/stylesheets/geoblacklight/modules/toolbar.scss +19 -0
- data/app/helpers/geoblacklight_helper.rb +11 -0
- data/app/views/catalog/_document_action.html.erb +6 -0
- data/app/views/catalog/_upper_metadata.html.erb +12 -38
- data/geoblacklight.gemspec +1 -1
- data/lib/generators/geoblacklight/install_generator.rb +11 -5
- data/lib/generators/geoblacklight/templates/catalog_controller.rb +13 -16
- data/lib/generators/geoblacklight/templates/config/jetty.yml +10 -0
- data/lib/geoblacklight.rb +2 -0
- data/lib/geoblacklight/catalog_helper_override.rb +14 -0
- data/lib/geoblacklight/controller_override.rb +2 -2
- data/lib/geoblacklight/version.rb +1 -1
- data/lib/geoblacklight/view_helper_override.rb +17 -3
- data/lib/tasks/geoblacklight.rake +6 -0
- data/spec/features/show_page_metadata_spec.rb +12 -0
- data/spec/features/split_view.html.erb_spec.rb +1 -0
- data/spec/lib/geoblacklight/view_helper_override_spec.rb +5 -5
- data/spec/test_app_templates/lib/generators/test_app_generator.rb +5 -1
- data/template.rb +3 -3
- metadata +11 -5
- data/app/views/catalog/_abstract_metadata.html.erb +0 -8
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 7c8f1900e61dbe0f9a8cbc0c0aac4f41fdf2bcf5
|
4
|
+
data.tar.gz: 63c2ccd8744af6d9772283e477936bc0cc347aac
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 43e61f86a2ef999a1caf8010fdd5df94243959d78105f72a2a49f24319cb0015d88ef0950c9aa44ff66eebc9930702add71aef6f2d3d4037c424b3fc92ee1306
|
7
|
+
data.tar.gz: 5ab609f6b12958646b3c1008d64eaf8dc951d848a33b6f3b634170825cd76ebbdedd3188822c4a159d3501469a6ea24aa010600be09d84f33f17e8a09a77fd0b
|
data/Rakefile
CHANGED
@@ -5,7 +5,7 @@ rescue LoadError
|
|
5
5
|
puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
|
6
6
|
end
|
7
7
|
|
8
|
-
BLACKLIGHT_JETTY_VERSION = '4.10.
|
8
|
+
BLACKLIGHT_JETTY_VERSION = '4.10.2'
|
9
9
|
ZIP_URL = "https://github.com/projectblacklight/blacklight-jetty/archive/v#{BLACKLIGHT_JETTY_VERSION}.zip"
|
10
10
|
APP_ROOT = File.dirname(__FILE__)
|
11
11
|
|
@@ -9,8 +9,15 @@
|
|
9
9
|
* @return {Array} Array of values as [sw.x, sw.y, ne.x, ne.y]
|
10
10
|
*/
|
11
11
|
L.boundsToBbox = function(bounds) {
|
12
|
-
var sw = bounds.getSouthWest()
|
13
|
-
ne = bounds.getNorthEast()
|
12
|
+
var sw = bounds.getSouthWest(),
|
13
|
+
ne = bounds.getNorthEast();
|
14
|
+
|
15
|
+
if ((ne.lng - sw.lng) >= 360) {
|
16
|
+
sw.lng = -180;
|
17
|
+
ne.lng = 180;
|
18
|
+
}
|
19
|
+
sw = sw.wrap();
|
20
|
+
ne = ne.wrap();
|
14
21
|
return [
|
15
22
|
L.Util.formatNum(sw.lng, 6),
|
16
23
|
L.Util.formatNum(sw.lat, 6),
|
@@ -58,6 +58,7 @@ Blacklight.onLoad(function() {
|
|
58
58
|
$('#documents').replaceWith($doc.find('#documents'));
|
59
59
|
$('#sidebar').replaceWith($doc.find('#sidebar'));
|
60
60
|
$('#sortAndPerPage').replaceWith($doc.find('#sortAndPerPage'));
|
61
|
+
$('#appliedParams').replaceWith($doc.find('#appliedParams'));
|
61
62
|
if ($('#map').next().length) {
|
62
63
|
$('#map').next().replaceWith($doc.find('#map').next());
|
63
64
|
} else {
|
@@ -12,7 +12,7 @@ GeoBlacklight.Viewer.Map = GeoBlacklight.Viewer.extend({
|
|
12
12
|
|
13
13
|
basemap: L.tileLayer(
|
14
14
|
'https://otile{s}-s.mqcdn.com/tiles/1.0.0/map/{z}/{x}/{y}.png', {
|
15
|
-
attribution: '© <a href="http://openstreetmap.org">OpenStreetMap</a> contributors, Tiles Courtesy of <a href="http://www.mapquest.com/" target="_blank">MapQuest</a> <img src="//developer.mapquest.com/content/osm/mq_logo.png">',
|
15
|
+
attribution: '© <a href="http://openstreetmap.org">OpenStreetMap</a> contributors, Tiles Courtesy of <a href="http://www.mapquest.com/" target="_blank">MapQuest</a> <img src="//developer.mapquest.com/content/osm/mq_logo.png" alt="">',
|
16
16
|
maxZoom: 18,
|
17
17
|
worldCopyJump: true,
|
18
18
|
subdomains: '1234' // see http://developer.mapquest.com/web/products/open/map
|
@@ -17,3 +17,15 @@
|
|
17
17
|
@extend .fa, .fa-lock, .text-muted;
|
18
18
|
width: 17px;
|
19
19
|
}
|
20
|
+
|
21
|
+
.geoblacklight-citation {
|
22
|
+
@extend .fa, .fa-bookmark;
|
23
|
+
}
|
24
|
+
|
25
|
+
.geoblacklight-sms {
|
26
|
+
@extend .fa, .fa-mobile;
|
27
|
+
}
|
28
|
+
|
29
|
+
.geoblacklight-email {
|
30
|
+
@extend .fa, .fa-envelope;
|
31
|
+
}
|
@@ -0,0 +1,19 @@
|
|
1
|
+
.show-tools {
|
2
|
+
a .geoblacklight {
|
3
|
+
color: $gray-light;
|
4
|
+
}
|
5
|
+
.geoblacklight-citation {
|
6
|
+
text-align: center;
|
7
|
+
width: 1.4em;
|
8
|
+
}
|
9
|
+
|
10
|
+
.geoblacklight-sms {
|
11
|
+
text-align: center;
|
12
|
+
width: 1.4em;
|
13
|
+
}
|
14
|
+
|
15
|
+
.geoblacklight-email {
|
16
|
+
text-align: center;
|
17
|
+
width: 1.4em;
|
18
|
+
}
|
19
|
+
}
|
@@ -65,4 +65,15 @@ module GeoblacklightHelper
|
|
65
65
|
def show_attribute_table?
|
66
66
|
return true if document_available? && @document.viewer_protocol == 'wms'
|
67
67
|
end
|
68
|
+
|
69
|
+
##
|
70
|
+
# Render value for a document's field as a truncate abstract
|
71
|
+
# div. Arguments come from Blacklight::DocumentPresenter's
|
72
|
+
# get_field_values method
|
73
|
+
# @param [Hash] args from get_field_values
|
74
|
+
def render_value_as_truncate_abstract(args)
|
75
|
+
content_tag :div, class: 'truncate-abstract' do
|
76
|
+
args[:value]
|
77
|
+
end
|
78
|
+
end
|
68
79
|
end
|
@@ -0,0 +1,6 @@
|
|
1
|
+
<%= link_to document_action_path(document_action_config, (local_assigns.has_key?(:url_opts) ? url_opts : {}).merge(({id: document} if document) || {})),
|
2
|
+
id: document_action_config.fetch(:id, "#{document_action_config.key}Link"),
|
3
|
+
data: {}.merge(({ajax_modal: "trigger"} if document_action_config.modal != false) || {}) do %>
|
4
|
+
<%= content_tag :span, '', class: "geoblacklight geoblacklight-#{document_action_config.key}" %>
|
5
|
+
<%= document_action_label(document_action_config.key, document_action_config) %>
|
6
|
+
<% end %>
|
@@ -1,45 +1,19 @@
|
|
1
1
|
<% document ||= @document %>
|
2
2
|
<div class="geoblacklight-view-panel">
|
3
|
-
|
3
|
+
|
4
|
+
<%# From https://github.com/projectblacklight/blacklight/blob/master/app/views/catalog/_show_default.html.erb %>
|
5
|
+
<%# default partial to display solr document fields in catalog show view -%>
|
4
6
|
<dl class="dl-horizontal">
|
5
|
-
|
6
|
-
|
7
|
-
|
7
|
+
<%# render 'abstract_metadata' %>
|
8
|
+
<% document_show_fields(document).each do |solr_fname, field| %>
|
9
|
+
<% if should_render_show_field? document, field %>
|
10
|
+
<dt class="blacklight-<%= solr_fname.parameterize %>"><%= render_document_show_field_label document, field: solr_fname %></dt>
|
11
|
+
<dd class="blacklight-<%= solr_fname.parameterize %>"><%= render_document_show_field_value document, field: solr_fname %></dd>
|
12
|
+
<% end %>
|
8
13
|
<% end %>
|
9
|
-
<%= render 'abstract_metadata' %>
|
10
|
-
<% if document['dc_publisher_s'].present? %>
|
11
|
-
<dt>Publishers</dt>
|
12
|
-
<dd itemprop="publisher"><%= document['dc_publisher_s'] %>
|
13
|
-
<% if document['dct_issued_s'].present? %>
|
14
|
-
<span itemprop="datePublished">
|
15
|
-
(<%= document['dct_issued_s'] %>)
|
16
|
-
</span>
|
17
|
-
<% end %>
|
18
|
-
</dd>
|
19
|
-
<% end %>
|
20
|
-
<% if document['dct_isPartOf_sm'].present? %>
|
21
|
-
<dt>Collections</dt>
|
22
|
-
<dd itemprop="isPartOf"><%= document['dct_isPartOf_sm'].sort.uniq.join(', ') %> </dd>
|
23
|
-
<% end %>
|
24
|
-
<% if document['dct_spatial_sm'].present? %>
|
25
|
-
<dt>Places</dt>
|
26
|
-
<dd itemprop="spatial"><%= render_facet_links('dct_spatial_sm', document['dct_spatial_sm']) %> </dd>
|
27
|
-
<% end %>
|
28
|
-
<% if document['dc_subject_sm'].present? %>
|
29
|
-
<dt>Subjects</dt>
|
30
|
-
<dd itemprop="keywords"><%= render_facet_links('dc_subject_sm', document['dc_subject_sm']) %> </dd>
|
31
|
-
<% end %>
|
32
|
-
<% if document['dct_temporal_sm'].present? %>
|
33
|
-
<dt>Years</dt>
|
34
|
-
<dd itemprop="temporal"><%= document['dct_temporal_sm'].sort.uniq.join(', ') %> </dd>
|
35
|
-
<% end %>
|
36
|
-
<% if document['dct_provenance_s'].present? %>
|
37
|
-
<dt>Held by</dt>
|
38
|
-
<dd><%= document['dct_provenance_s'] %></dd>
|
39
|
-
<% end %>
|
40
14
|
<% if !@document.references.nil? && !@document.references.url.nil? %>
|
41
|
-
|
42
|
-
|
15
|
+
<dt>More details at</dt>
|
16
|
+
<dd itemprop="url"><%= link_to @document.references.url.endpoint, @document.references.url.endpoint %></dd>
|
43
17
|
<% end %>
|
44
18
|
</dl>
|
45
|
-
</div>
|
19
|
+
</div>
|
data/geoblacklight.gemspec
CHANGED
@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
|
|
20
20
|
|
21
21
|
spec.add_dependency 'blacklight', '~> 5.8.2'
|
22
22
|
spec.add_dependency 'leaflet-rails', '~> 0.7.3'
|
23
|
-
spec.add_dependency 'blacklight_range_limit', '~> 5.0.
|
23
|
+
spec.add_dependency 'blacklight_range_limit', '~> 5.0.3'
|
24
24
|
spec.add_dependency 'font-awesome-rails', '~> 4.1.0.0'
|
25
25
|
spec.add_dependency 'rails_config'
|
26
26
|
spec.add_dependency 'faraday'
|
@@ -5,8 +5,19 @@ module Geoblacklight
|
|
5
5
|
|
6
6
|
source_root File.expand_path('../templates', __FILE__)
|
7
7
|
|
8
|
+
class_option :jettywrapper, type: :boolean, default: false, desc: 'Use jettywrapper to download and control Jetty'
|
9
|
+
|
8
10
|
desc "Install Geoblacklight"
|
9
11
|
|
12
|
+
def install_jettywrapper
|
13
|
+
return unless options[:jettywrapper]
|
14
|
+
copy_file 'config/jetty.yml'
|
15
|
+
|
16
|
+
append_to_file 'Rakefile',
|
17
|
+
"\nZIP_URL = \"https://github.com/projectblacklight/blacklight-jetty/archive/v4.10.2.zip\"\n" +
|
18
|
+
"require 'jettywrapper'\n"
|
19
|
+
end
|
20
|
+
|
10
21
|
def assets
|
11
22
|
copy_file "geoblacklight.css.scss", "app/assets/stylesheets/geoblacklight.css.scss"
|
12
23
|
copy_file "geoblacklight.js", "app/assets/javascripts/geoblacklight.js"
|
@@ -27,11 +38,6 @@ module Geoblacklight
|
|
27
38
|
end
|
28
39
|
end
|
29
40
|
|
30
|
-
def fixtures
|
31
|
-
FileUtils.mkdir_p 'spec/fixtures/solr_documents'
|
32
|
-
directory 'solr_documents', 'spec/fixtures/solr_documents'
|
33
|
-
end
|
34
|
-
|
35
41
|
def add_unique_key
|
36
42
|
inject_into_file 'app/models/solr_document.rb', after: "# self.unique_key = 'id'" do
|
37
43
|
"\n self.unique_key = 'layer_slug_s'"
|
@@ -111,22 +111,19 @@ class CatalogController < ApplicationController
|
|
111
111
|
|
112
112
|
|
113
113
|
# solr fields to be displayed in the show (single result) view
|
114
|
-
#
|
115
|
-
#
|
116
|
-
#
|
117
|
-
#
|
118
|
-
#
|
119
|
-
|
120
|
-
|
121
|
-
|
122
|
-
|
123
|
-
|
124
|
-
|
125
|
-
|
126
|
-
|
127
|
-
# config.add_show_field 'published_vern_display', :label => 'Published:'
|
128
|
-
# config.add_show_field 'lc_callnum_display', :label => 'Call number:'
|
129
|
-
# config.add_show_field 'isbn_t', :label => 'ISBN:'
|
114
|
+
# The ordering of the field names is the order of the display
|
115
|
+
#
|
116
|
+
# item_prop: [String] property given to span with Schema.org item property
|
117
|
+
# link_to_search: [Boolean] that can be passed to link to a facet search
|
118
|
+
# helper_method: [Symbol] method that can be used to render the value
|
119
|
+
config.add_show_field 'dc_creator_sm', label: 'Author(s)', itemprop: 'author'
|
120
|
+
config.add_show_field 'dc_description_s', label: 'Description', itemprop: 'description', helper_method: :render_value_as_truncate_abstract
|
121
|
+
config.add_show_field 'dc_publisher_s', label: 'Publisher', itemprop: 'publisher'
|
122
|
+
config.add_show_field 'dct_isPartOf_sm', label: 'Collection', itemprop: 'isPartOf'
|
123
|
+
config.add_show_field 'dct_spatial_sm', label: 'Place(s)', itemprop: 'spatial', link_to_search: true
|
124
|
+
config.add_show_field 'dc_subject_sm', label: 'Subject(s)', itemprop: 'keywords', link_to_search: true
|
125
|
+
config.add_show_field 'dct_temporal_sm', label: 'Year', itemprop: 'temporal'
|
126
|
+
config.add_show_field 'dct_provenance_s', label: 'Held by', link_to_search: true
|
130
127
|
|
131
128
|
# "fielded" search configuration. Used by pulldown among other places.
|
132
129
|
# For supported keys in hash, see rdoc for Blacklight::SearchFields
|
@@ -0,0 +1,10 @@
|
|
1
|
+
development:
|
2
|
+
startup_wait: 15
|
3
|
+
jetty_port: 8983
|
4
|
+
test:
|
5
|
+
startup_wait: 60
|
6
|
+
jetty_port: <%= ENV['TEST_JETTY_PORT'] || 8888 %>
|
7
|
+
<%= ENV['TEST_JETTY_PATH'] ? "jetty_home: " + ENV['TEST_JETTY_PATH'] : '' %>
|
8
|
+
production:
|
9
|
+
startup_wait: 15
|
10
|
+
jetty_port: 8983
|
data/lib/geoblacklight.rb
CHANGED
@@ -1,6 +1,7 @@
|
|
1
1
|
require "geoblacklight/engine"
|
2
2
|
|
3
3
|
module Geoblacklight
|
4
|
+
require 'geoblacklight/catalog_helper_override'
|
4
5
|
require 'geoblacklight/config'
|
5
6
|
require 'geoblacklight/constants'
|
6
7
|
require 'geoblacklight/controller_override'
|
@@ -20,6 +21,7 @@ module Geoblacklight
|
|
20
21
|
require 'geoblacklight/references'
|
21
22
|
def self.inject!
|
22
23
|
CatalogController.send(:include, Geoblacklight::ControllerOverride)
|
24
|
+
CatalogController.send(:include, Geoblacklight::CatalogHelperOverride)
|
23
25
|
CatalogController.send(:include, Geoblacklight::ViewHelperOverride)
|
24
26
|
CatalogController.send(:helper, Geoblacklight::ViewHelperOverride) unless
|
25
27
|
CatalogController.helpers.is_a?(Geoblacklight::ViewHelperOverride)
|
@@ -0,0 +1,14 @@
|
|
1
|
+
module Geoblacklight
|
2
|
+
module CatalogHelperOverride
|
3
|
+
|
4
|
+
##
|
5
|
+
# Removes spatial query from params
|
6
|
+
# @param [Symbol] symbol of field to be removed
|
7
|
+
# @param [Hash] request parameters
|
8
|
+
def remove_spatial_filter_group(field, source_params = params)
|
9
|
+
p = source_params.dup
|
10
|
+
p.delete(field.to_s)
|
11
|
+
p
|
12
|
+
end
|
13
|
+
end
|
14
|
+
end
|
@@ -7,8 +7,8 @@ module Geoblacklight
|
|
7
7
|
|
8
8
|
def add_spatial_params(solr_params, req_params)
|
9
9
|
if req_params[:bbox]
|
10
|
-
solr_params[:
|
11
|
-
solr_params[:
|
10
|
+
solr_params[:bq] ||= []
|
11
|
+
solr_params[:bq] = ["solr_bbox:\"IsWithin(#{req_params[:bbox]})\"^10"]
|
12
12
|
solr_params[:fq] ||= []
|
13
13
|
solr_params[:fq] << "solr_bbox:\"Intersects(#{req_params[:bbox]})\""
|
14
14
|
end
|
@@ -1,15 +1,17 @@
|
|
1
1
|
module Geoblacklight
|
2
2
|
module ViewHelperOverride
|
3
|
-
|
3
|
+
include CatalogHelperOverride
|
4
|
+
|
5
|
+
def spatial_parameters?
|
4
6
|
params[:bbox]
|
5
7
|
end
|
6
8
|
|
7
9
|
# Overrides BL method to enable results for spatial only params
|
8
10
|
def has_search_parameters?
|
9
|
-
|
11
|
+
spatial_parameters? || super
|
10
12
|
end
|
11
13
|
|
12
|
-
def
|
14
|
+
def query_has_constraints?(params = params)
|
13
15
|
has_search_parameters? || super
|
14
16
|
end
|
15
17
|
|
@@ -21,5 +23,17 @@ module Geoblacklight
|
|
21
23
|
return ''.html_safe if params['bbox'].blank?
|
22
24
|
render_search_to_s_element('Bounding box', render_filter_value(params['bbox']) )
|
23
25
|
end
|
26
|
+
|
27
|
+
def render_constraints_filters(params = params)
|
28
|
+
content = super(params)
|
29
|
+
|
30
|
+
if params[:bbox]
|
31
|
+
content << render_constraint_element('Bounding Box',
|
32
|
+
params[:bbox],
|
33
|
+
remove: catalog_index_path(remove_spatial_filter_group(:bbox, params)))
|
34
|
+
end
|
35
|
+
|
36
|
+
return content
|
37
|
+
end
|
24
38
|
end
|
25
39
|
end
|
@@ -2,6 +2,12 @@ require 'rails/generators'
|
|
2
2
|
require 'generators/geoblacklight/install_generator'
|
3
3
|
|
4
4
|
namespace :geoblacklight do
|
5
|
+
desc "Copies the default SOLR config for the included Solr"
|
6
|
+
task :configure_jetty do
|
7
|
+
system 'curl -o jetty/solr/blacklight-core/conf/schema.xml https://raw.githubusercontent.com/geoblacklight/geoblacklight-schema/master/conf/schema.xml'
|
8
|
+
system 'curl -o jetty/solr/blacklight-core/conf/solrconfig.xml https://raw.githubusercontent.com/geoblacklight/geoblacklight-schema/master/conf/solrconfig.xml'
|
9
|
+
end
|
10
|
+
|
5
11
|
namespace :solr do
|
6
12
|
desc "Put sample data into solr"
|
7
13
|
task :seed => :environment do
|
@@ -0,0 +1,12 @@
|
|
1
|
+
require 'spec_helper'
|
2
|
+
|
3
|
+
feature 'Metadata display on show page' do
|
4
|
+
scenario 'with default CatalogController specified fields' do
|
5
|
+
visit catalog_path 'stanford-dp018hs9766'
|
6
|
+
within '.geoblacklight-view-panel' do
|
7
|
+
expect(page).to have_css 'dt', count: 8
|
8
|
+
expect(page).to have_css 'dd', count: 8
|
9
|
+
expect(page).to have_css 'div.truncate-abstract', count: 1
|
10
|
+
end
|
11
|
+
end
|
12
|
+
end
|
@@ -4,20 +4,20 @@ describe Geoblacklight::ViewHelperOverride do
|
|
4
4
|
class GeoblacklightControllerTestClass
|
5
5
|
attr_accessor :params
|
6
6
|
end
|
7
|
-
|
7
|
+
|
8
8
|
before(:each) do
|
9
9
|
@fake_controller = GeoblacklightControllerTestClass.new
|
10
10
|
@fake_controller.extend(Geoblacklight::ViewHelperOverride)
|
11
11
|
end
|
12
|
-
|
13
|
-
describe '
|
12
|
+
|
13
|
+
describe 'spatial_parameters?' do
|
14
14
|
it 'should not have spatial parameters' do
|
15
15
|
@fake_controller.params = {}
|
16
|
-
expect(@fake_controller.
|
16
|
+
expect(@fake_controller.spatial_parameters?).to be_falsey
|
17
17
|
end
|
18
18
|
it 'should have spatial parameters' do
|
19
19
|
@fake_controller.params = { bbox: '123'}
|
20
|
-
expect(@fake_controller.
|
20
|
+
expect(@fake_controller.spatial_parameters?).to be_truthy
|
21
21
|
end
|
22
22
|
end
|
23
23
|
describe 'render_search_to_s_bbox' do
|
@@ -1,7 +1,7 @@
|
|
1
1
|
require 'rails/generators'
|
2
2
|
|
3
3
|
class TestAppGenerator < Rails::Generators::Base
|
4
|
-
source_root
|
4
|
+
source_root '../../spec/test_app_templates'
|
5
5
|
|
6
6
|
def add_gems
|
7
7
|
gem 'blacklight', "~> 5.8.2"
|
@@ -20,4 +20,8 @@ class TestAppGenerator < Rails::Generators::Base
|
|
20
20
|
generate 'geoblacklight:install'
|
21
21
|
end
|
22
22
|
|
23
|
+
def fixtures
|
24
|
+
FileUtils.mkdir_p 'spec/fixtures/solr_documents'
|
25
|
+
directory 'solr_documents', 'spec/fixtures/solr_documents'
|
26
|
+
end
|
23
27
|
end
|
data/template.rb
CHANGED
@@ -1,12 +1,12 @@
|
|
1
1
|
gem 'blacklight'
|
2
|
-
gem 'geoblacklight'
|
2
|
+
gem 'geoblacklight'
|
3
3
|
gem 'jettywrapper'
|
4
4
|
|
5
|
-
add_source
|
5
|
+
add_source 'https://rails-assets.org'
|
6
6
|
|
7
7
|
run 'bundle install'
|
8
8
|
|
9
9
|
generate 'blacklight:install', '--devise'
|
10
|
-
generate 'geoblacklight:install'
|
10
|
+
generate 'geoblacklight:install', '--jettywrapper'
|
11
11
|
|
12
12
|
rake 'db:migrate'
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: geoblacklight
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.
|
4
|
+
version: 0.6.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Mike Graves
|
@@ -11,7 +11,7 @@ authors:
|
|
11
11
|
autorequire:
|
12
12
|
bindir: bin
|
13
13
|
cert_chain: []
|
14
|
-
date: 2015-01-
|
14
|
+
date: 2015-01-29 00:00:00.000000000 Z
|
15
15
|
dependencies:
|
16
16
|
- !ruby/object:Gem::Dependency
|
17
17
|
name: blacklight
|
@@ -47,14 +47,14 @@ dependencies:
|
|
47
47
|
requirements:
|
48
48
|
- - "~>"
|
49
49
|
- !ruby/object:Gem::Version
|
50
|
-
version: 5.0.
|
50
|
+
version: 5.0.3
|
51
51
|
type: :runtime
|
52
52
|
prerelease: false
|
53
53
|
version_requirements: !ruby/object:Gem::Requirement
|
54
54
|
requirements:
|
55
55
|
- - "~>"
|
56
56
|
- !ruby/object:Gem::Version
|
57
|
-
version: 5.0.
|
57
|
+
version: 5.0.3
|
58
58
|
- !ruby/object:Gem::Dependency
|
59
59
|
name: font-awesome-rails
|
60
60
|
requirement: !ruby/object:Gem::Requirement
|
@@ -305,10 +305,12 @@ files:
|
|
305
305
|
- app/assets/stylesheets/geoblacklight/modules/layer_opacity.scss
|
306
306
|
- app/assets/stylesheets/geoblacklight/modules/mixins.scss
|
307
307
|
- app/assets/stylesheets/geoblacklight/modules/results.scss
|
308
|
+
- app/assets/stylesheets/geoblacklight/modules/search_widgets.scss
|
309
|
+
- app/assets/stylesheets/geoblacklight/modules/toolbar.scss
|
308
310
|
- app/controllers/download_controller.rb
|
309
311
|
- app/controllers/wms_controller.rb
|
310
312
|
- app/helpers/geoblacklight_helper.rb
|
311
|
-
- app/views/catalog/
|
313
|
+
- app/views/catalog/_document_action.html.erb
|
312
314
|
- app/views/catalog/_document_split.html.erb
|
313
315
|
- app/views/catalog/_facet_tag_item.html.erb
|
314
316
|
- app/views/catalog/_facet_tag_layout.html.erb
|
@@ -331,10 +333,12 @@ files:
|
|
331
333
|
- geoblacklight.gemspec
|
332
334
|
- lib/generators/geoblacklight/install_generator.rb
|
333
335
|
- lib/generators/geoblacklight/templates/catalog_controller.rb
|
336
|
+
- lib/generators/geoblacklight/templates/config/jetty.yml
|
334
337
|
- lib/generators/geoblacklight/templates/geoblacklight.css.scss
|
335
338
|
- lib/generators/geoblacklight/templates/geoblacklight.js
|
336
339
|
- lib/generators/geoblacklight/templates/settings.yml
|
337
340
|
- lib/geoblacklight.rb
|
341
|
+
- lib/geoblacklight/catalog_helper_override.rb
|
338
342
|
- lib/geoblacklight/config.rb
|
339
343
|
- lib/geoblacklight/constants.rb
|
340
344
|
- lib/geoblacklight/controller_override.rb
|
@@ -365,6 +369,7 @@ files:
|
|
365
369
|
- spec/features/layer_with_no_references_spec.rb
|
366
370
|
- spec/features/saved_searches_spec.rb
|
367
371
|
- spec/features/search_bar_spec.rb
|
372
|
+
- spec/features/show_page_metadata_spec.rb
|
368
373
|
- spec/features/split_view.html.erb_spec.rb
|
369
374
|
- spec/fixtures/solr_documents/actual-papermap1.json
|
370
375
|
- spec/fixtures/solr_documents/actual-point1.json
|
@@ -431,6 +436,7 @@ test_files:
|
|
431
436
|
- spec/features/layer_with_no_references_spec.rb
|
432
437
|
- spec/features/saved_searches_spec.rb
|
433
438
|
- spec/features/search_bar_spec.rb
|
439
|
+
- spec/features/show_page_metadata_spec.rb
|
434
440
|
- spec/features/split_view.html.erb_spec.rb
|
435
441
|
- spec/fixtures/solr_documents/actual-papermap1.json
|
436
442
|
- spec/fixtures/solr_documents/actual-point1.json
|