geoblacklight 0.11.1 → 0.12.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.gitignore +1 -1
- data/.rubocop.yml +45 -0
- data/CONTRIBUTING.md +38 -0
- data/Gemfile +27 -6
- data/README.md +2 -9
- data/Rakefile +20 -11
- data/app/assets/javascripts/geoblacklight/basemaps.js +6 -3
- data/app/assets/javascripts/geoblacklight/modules/layer_opacity.js +13 -5
- data/app/assets/javascripts/geoblacklight/viewers/map.js +7 -0
- data/app/assets/javascripts/geoblacklight/viewers/wms.js +2 -5
- data/app/assets/stylesheets/geoblacklight/modules/item.scss +1 -1
- data/app/controllers/download_controller.rb +18 -14
- data/app/controllers/wms_controller.rb +1 -1
- data/app/helpers/geoblacklight_helper.rb +17 -11
- data/{lib → app/models/concerns}/geoblacklight/solr_document.rb +13 -8
- data/{lib → app/models/concerns}/geoblacklight/solr_document/carto_db.rb +0 -0
- data/{lib → app/models/concerns}/geoblacklight/solr_document/finder.rb +1 -2
- data/app/models/concerns/geoblacklight/solr_document/inspection.rb +15 -0
- data/{lib → app/presenters}/geoblacklight/document_presenter.rb +0 -0
- data/app/views/catalog/_show_default_viewer_container.html.erb +1 -1
- data/config/initializers/rails_config.rb +2 -2
- data/geoblacklight.gemspec +3 -4
- data/lib/generators/geoblacklight/install_generator.rb +17 -16
- data/lib/generators/geoblacklight/templates/catalog_controller.rb +1 -5
- data/lib/generators/geoblacklight/templates/geoblacklight.css.scss +0 -1
- data/lib/generators/geoblacklight/templates/geoblacklight.js +0 -1
- data/lib/geoblacklight.rb +1 -6
- data/lib/geoblacklight/bounding_box.rb +2 -1
- data/lib/geoblacklight/catalog_helper_override.rb +0 -1
- data/lib/geoblacklight/download.rb +12 -7
- data/lib/geoblacklight/download/hgl_download.rb +2 -3
- data/lib/geoblacklight/download/kmz_download.rb +9 -3
- data/lib/geoblacklight/download/shapefile_download.rb +5 -1
- data/lib/geoblacklight/engine.rb +1 -3
- data/lib/geoblacklight/exceptions.rb +1 -1
- data/lib/geoblacklight/metadata.rb +0 -1
- data/lib/geoblacklight/references.rb +3 -4
- data/lib/geoblacklight/routes.rb +5 -3
- data/lib/geoblacklight/search_builder.rb +3 -2
- data/lib/geoblacklight/version.rb +1 -1
- data/lib/geoblacklight/view_helper_override.rb +9 -10
- data/lib/geoblacklight/wms_layer.rb +12 -15
- data/lib/geoblacklight/wms_layer/feature_info_response.rb +1 -1
- data/spec/controllers/catalog_controller_spec.rb +1 -1
- data/spec/controllers/download_controller_spec.rb +7 -7
- data/spec/features/home_page_spec.rb +1 -1
- data/spec/features/layer_opacity_spec.rb +9 -0
- data/spec/features/metadata_panel_spec.rb +6 -4
- data/spec/features/saved_searches_spec.rb +1 -1
- data/spec/features/split_view.html.erb_spec.rb +3 -3
- data/spec/helpers/geoblacklight_helpers_spec.rb +3 -4
- data/spec/lib/geoblacklight/bounding_box_spec.rb +7 -7
- data/spec/lib/geoblacklight/controller_override_spec.rb +1 -1
- data/spec/lib/geoblacklight/document_presenter_spec.rb +1 -1
- data/spec/lib/geoblacklight/download/geojson_download_spec.rb +5 -5
- data/spec/lib/geoblacklight/download/geotiff_download_spec.rb +5 -5
- data/spec/lib/geoblacklight/download/hgl_download_spec.rb +6 -6
- data/spec/lib/geoblacklight/download/kmz_download_spec.rb +5 -5
- data/spec/lib/geoblacklight/download/shapefile_download_spec.rb +5 -5
- data/spec/lib/geoblacklight/download_spec.rb +14 -14
- data/spec/lib/geoblacklight/geoblacklight_helper_behavior_spec.rb +2 -1
- data/spec/lib/geoblacklight/item_viewer_spec.rb +5 -5
- data/spec/lib/geoblacklight/metadata_spec.rb +3 -3
- data/spec/lib/geoblacklight/reference_spec.rb +3 -3
- data/spec/lib/geoblacklight/references_spec.rb +34 -34
- data/spec/lib/geoblacklight/search_builder_spec.rb +7 -15
- data/spec/lib/geoblacklight/view_helper_override_spec.rb +15 -15
- data/spec/lib/geoblacklight/wms_layer/feature_info_response_spec.rb +10 -10
- data/spec/lib/geoblacklight/wms_layer_spec.rb +7 -7
- data/spec/{lib → models/concerns}/geoblacklight/solr_document/carto_db_spec.rb +0 -0
- data/spec/{lib → models/concerns}/geoblacklight/solr_document/finder_spec.rb +2 -2
- data/spec/models/concerns/geoblacklight/solr_document/inspection_spec.rb +16 -0
- data/spec/{lib → models/concerns}/geoblacklight/solr_document_spec.rb +24 -24
- data/spec/spec_helper.rb +6 -7
- data/spec/support/features.rb +1 -1
- data/spec/support/features/session_helpers.rb +1 -1
- data/spec/teaspoon_env.rb +38 -33
- data/spec/test_app_templates/lib/generators/test_app_generator.rb +4 -4
- data/spec/views/catalog/_document_split.html.erb_spec.rb +1 -1
- data/spec/views/catalog/_index_split.html.erb_spec.rb +1 -1
- metadata +31 -33
- data/lib/geoblacklight/config.rb +0 -0
@@ -5,14 +5,14 @@ describe Geoblacklight::SolrDocument do
|
|
5
5
|
describe '#available?' do
|
6
6
|
let(:document_attributes) { {} }
|
7
7
|
describe 'a public document' do
|
8
|
-
it '
|
8
|
+
it 'alwayses be available' do
|
9
9
|
allow(document).to receive('same_institution?').and_return(false)
|
10
10
|
allow(document).to receive('public?').and_return(true)
|
11
11
|
expect(document.available?).to be_truthy
|
12
12
|
end
|
13
13
|
end
|
14
14
|
describe 'a restricted document' do
|
15
|
-
it '
|
15
|
+
it 'onlies be available if from same institution' do
|
16
16
|
allow(document).to receive('same_institution?').and_return(true)
|
17
17
|
allow(document).to receive('public?').and_return(false)
|
18
18
|
expect(document.available?).to be_truthy
|
@@ -22,27 +22,27 @@ describe Geoblacklight::SolrDocument do
|
|
22
22
|
describe '#public?' do
|
23
23
|
describe 'a public document' do
|
24
24
|
let(:document_attributes) { { dc_rights_s: 'PUBLIC' } }
|
25
|
-
it '
|
25
|
+
it 'is public' do
|
26
26
|
expect(document.public?).to be_truthy
|
27
27
|
end
|
28
28
|
end
|
29
29
|
describe 'a restricted resource' do
|
30
30
|
let(:document_attributes) { { dc_rights_s: 'RESTRICTED' } }
|
31
|
-
it '
|
31
|
+
it 'does not be public' do
|
32
32
|
expect(document.public?).to be_falsey
|
33
33
|
end
|
34
34
|
end
|
35
35
|
end
|
36
36
|
describe '#downloadable?' do
|
37
37
|
describe 'available direct download' do
|
38
|
-
let(:document_attributes)
|
38
|
+
let(:document_attributes) do
|
39
39
|
{
|
40
40
|
dc_rights_s: 'Public',
|
41
41
|
dct_references_s: {
|
42
42
|
'http://schema.org/downloadUrl' => 'http://example.com/direct/data.zip'
|
43
43
|
}.to_json
|
44
44
|
}
|
45
|
-
|
45
|
+
end
|
46
46
|
it 'will be downloadable' do
|
47
47
|
expect(document.downloadable?).to be_truthy
|
48
48
|
end
|
@@ -51,18 +51,18 @@ describe Geoblacklight::SolrDocument do
|
|
51
51
|
describe '#same_institution?' do
|
52
52
|
describe 'within the same institution' do
|
53
53
|
let(:document_attributes) { { dct_provenance_s: 'STANFORD' } }
|
54
|
-
it '
|
54
|
+
it 'is true' do
|
55
55
|
allow(Settings).to receive('Institution').and_return('Stanford')
|
56
56
|
expect(document.same_institution?).to be_truthy
|
57
57
|
end
|
58
|
-
it '
|
58
|
+
it 'matches case inconsistencies' do
|
59
59
|
allow(Settings).to receive('Institution').and_return('StAnFord')
|
60
60
|
expect(document.same_institution?).to be_truthy
|
61
61
|
end
|
62
62
|
end
|
63
63
|
describe 'within a different institution' do
|
64
64
|
let(:document_attributes) { { dct_provenance_s: 'MIT' } }
|
65
|
-
it '
|
65
|
+
it 'is false' do
|
66
66
|
allow(Settings).to receive('Institution').and_return('Stanford')
|
67
67
|
expect(document.same_institution?).to be_falsey
|
68
68
|
end
|
@@ -70,13 +70,13 @@ describe Geoblacklight::SolrDocument do
|
|
70
70
|
end
|
71
71
|
describe 'references' do
|
72
72
|
let(:document_attributes) { {} }
|
73
|
-
it '
|
73
|
+
it 'generates a new references object' do
|
74
74
|
expect(document.references).to be_an Geoblacklight::References
|
75
75
|
end
|
76
76
|
end
|
77
77
|
describe 'download_types' do
|
78
78
|
let(:document_attributes) { {} }
|
79
|
-
it '
|
79
|
+
it 'calls download_types' do
|
80
80
|
expect_any_instance_of(Geoblacklight::References).to receive(:download_types)
|
81
81
|
document.download_types
|
82
82
|
end
|
@@ -84,39 +84,39 @@ describe Geoblacklight::SolrDocument do
|
|
84
84
|
describe 'direct_download' do
|
85
85
|
let(:document_attributes) { {} }
|
86
86
|
describe 'with a direct download' do
|
87
|
-
let(:document_attributes)
|
87
|
+
let(:document_attributes) do
|
88
88
|
{
|
89
89
|
dct_references_s: {
|
90
90
|
'http://schema.org/downloadUrl' => 'http://example.com/urn:hul.harvard.edu:HARVARD.SDE2.TG10USAIANNH/data.zip'
|
91
91
|
}.to_json
|
92
92
|
}
|
93
|
-
|
94
|
-
it '
|
93
|
+
end
|
94
|
+
it 'returns a direct download hash' do
|
95
95
|
expect_any_instance_of(Geoblacklight::Reference).to receive(:to_hash)
|
96
96
|
document.direct_download
|
97
97
|
end
|
98
98
|
end
|
99
|
-
it '
|
99
|
+
it 'returns nil if no direct download' do
|
100
100
|
expect_any_instance_of(Geoblacklight::Reference).to_not receive(:to_hash)
|
101
101
|
expect(document.direct_download).to be_nil
|
102
102
|
end
|
103
103
|
end
|
104
104
|
describe 'hgl_download' do
|
105
105
|
describe 'with an hgl download' do
|
106
|
-
let(:document_attributes)
|
106
|
+
let(:document_attributes) do
|
107
107
|
{
|
108
108
|
dct_references_s: {
|
109
109
|
'http://schema.org/DownloadAction' => 'http://example.com/harvard'
|
110
110
|
}.to_json
|
111
111
|
}
|
112
|
-
|
113
|
-
it '
|
112
|
+
end
|
113
|
+
it 'returns an hgl download hash' do
|
114
114
|
expect(document.hgl_download[:hgl]).to eq('http://example.com/harvard')
|
115
115
|
end
|
116
116
|
end
|
117
117
|
describe 'without an hgl download' do
|
118
|
-
let(:document_attributes) {{}}
|
119
|
-
it '
|
118
|
+
let(:document_attributes) { {} }
|
119
|
+
it 'returns nil' do
|
120
120
|
expect(document.direct_download).to be_nil
|
121
121
|
end
|
122
122
|
end
|
@@ -129,13 +129,13 @@ describe Geoblacklight::SolrDocument do
|
|
129
129
|
end
|
130
130
|
describe 'viewer_protocol' do
|
131
131
|
describe 'with a wms reference' do
|
132
|
-
let(:document_attributes)
|
132
|
+
let(:document_attributes) do
|
133
133
|
{
|
134
134
|
dct_references_s: {
|
135
135
|
'http://www.opengis.net/def/serviceType/ogc/wms' => 'http://www.example.com/wms'
|
136
136
|
}.to_json
|
137
137
|
}
|
138
|
-
|
138
|
+
end
|
139
139
|
it 'returns wms protocol' do
|
140
140
|
expect(document.viewer_protocol).to eq 'wms'
|
141
141
|
end
|
@@ -147,13 +147,13 @@ describe Geoblacklight::SolrDocument do
|
|
147
147
|
end
|
148
148
|
describe 'viewer_endpoint' do
|
149
149
|
describe 'with a wms reference' do
|
150
|
-
let(:document_attributes)
|
150
|
+
let(:document_attributes) do
|
151
151
|
{
|
152
152
|
dct_references_s: {
|
153
153
|
'http://www.opengis.net/def/serviceType/ogc/wms' => 'http://www.example.com/wms'
|
154
154
|
}.to_json
|
155
155
|
}
|
156
|
-
|
156
|
+
end
|
157
157
|
it 'returns wms endpoint' do
|
158
158
|
expect(document.viewer_endpoint).to eq 'http://www.example.com/wms'
|
159
159
|
end
|
data/spec/spec_helper.rb
CHANGED
@@ -1,4 +1,4 @@
|
|
1
|
-
ENV[
|
1
|
+
ENV['RAILS_ENV'] ||= 'test'
|
2
2
|
|
3
3
|
require 'factory_girl'
|
4
4
|
require 'database_cleaner'
|
@@ -15,25 +15,24 @@ Capybara.javascript_driver = :poltergeist
|
|
15
15
|
Capybara.register_driver :poltergeist do |app|
|
16
16
|
options = {}
|
17
17
|
|
18
|
-
options[:timeout] = 120 if RUBY_PLATFORM ==
|
18
|
+
options[:timeout] = 120 if RUBY_PLATFORM == 'java'
|
19
19
|
|
20
20
|
Capybara::Poltergeist::Driver.new(app, options)
|
21
21
|
end
|
22
22
|
|
23
|
-
if ENV[
|
23
|
+
if ENV['COVERAGE'] || ENV['CI']
|
24
24
|
require 'simplecov'
|
25
25
|
SimpleCov.formatter = Coveralls::SimpleCov::Formatter
|
26
26
|
SimpleCov.start do
|
27
|
-
add_filter
|
27
|
+
add_filter '/spec/'
|
28
28
|
end
|
29
29
|
end
|
30
30
|
|
31
|
-
|
32
31
|
require 'geoblacklight'
|
33
32
|
|
34
|
-
Dir[
|
33
|
+
Dir['./spec/support/**/*.rb'].sort.each { |f| require f }
|
35
34
|
|
36
|
-
FactoryGirl.definition_file_paths = [File.expand_path(
|
35
|
+
FactoryGirl.definition_file_paths = [File.expand_path('../factories', __FILE__)]
|
37
36
|
FactoryGirl.find_definitions
|
38
37
|
|
39
38
|
RSpec.configure do |config|
|
data/spec/support/features.rb
CHANGED
data/spec/teaspoon_env.rb
CHANGED
@@ -1,7 +1,12 @@
|
|
1
|
+
unless defined?(Rails)
|
2
|
+
ENV['RAILS_ROOT'] = File.expand_path('../../', __FILE__)
|
3
|
+
require File.expand_path('../../config/environment', __FILE__)
|
4
|
+
end
|
5
|
+
|
1
6
|
Teaspoon.configure do |config|
|
2
7
|
# Determines where the Teaspoon routes will be mounted. Changing this to "/jasmine" would allow you to browse to
|
3
8
|
# `http://localhost:3000/jasmine` to run your tests.
|
4
|
-
config.mount_at =
|
9
|
+
config.mount_at = '/teaspoon'
|
5
10
|
|
6
11
|
# Specifies the root where Teaspoon will look for files. If you're testing an engine using a dummy application it can
|
7
12
|
# be useful to set this to your engines root (e.g. `Teaspoon::Engine.root`).
|
@@ -10,11 +15,11 @@ Teaspoon.configure do |config|
|
|
10
15
|
|
11
16
|
# Paths that will be appended to the Rails assets paths
|
12
17
|
# Note: Relative to `config.root`.
|
13
|
-
config.asset_paths = [
|
18
|
+
config.asset_paths = ['spec/javascripts', 'spec/javascripts/stylesheets']
|
14
19
|
|
15
20
|
# Fixtures are rendered through a controller, which allows using HAML, RABL/JBuilder, etc. Files in these paths will
|
16
21
|
# be rendered as fixtures.
|
17
|
-
config.fixture_paths = [
|
22
|
+
config.fixture_paths = ['spec/javascripts/fixtures']
|
18
23
|
|
19
24
|
# SUITES
|
20
25
|
#
|
@@ -34,47 +39,47 @@ Teaspoon.configure do |config|
|
|
34
39
|
# Note: If no version is specified, the latest is assumed.
|
35
40
|
#
|
36
41
|
# Versions: 1.3.1, 2.0.3, 2.1.3, 2.2.0
|
37
|
-
suite.use_framework :jasmine,
|
42
|
+
suite.use_framework :jasmine, '2.2.0'
|
38
43
|
|
39
44
|
# Specify a file matcher as a regular expression and all matching files will be loaded when the suite is run. These
|
40
45
|
# files need to be within an asset path. You can add asset paths using the `config.asset_paths`.
|
41
|
-
suite.matcher =
|
46
|
+
suite.matcher = '{spec/javascripts,app/assets}/**/*_spec.{js,js.coffee,coffee}'
|
42
47
|
|
43
48
|
# Load additional JS files, but requiring them in your spec helper is the preferred way to do this.
|
44
|
-
#suite.javascripts = []
|
49
|
+
# suite.javascripts = []
|
45
50
|
|
46
51
|
# You can include your own stylesheets if you want to change how Teaspoon looks.
|
47
52
|
# Note: Spec related CSS can and should be loaded using fixtures.
|
48
|
-
#suite.stylesheets = ["teaspoon"]
|
53
|
+
# suite.stylesheets = ["teaspoon"]
|
49
54
|
|
50
55
|
# This suites spec helper, which can require additional support files. This file is loaded before any of your test
|
51
56
|
# files are loaded.
|
52
|
-
suite.helper =
|
57
|
+
suite.helper = 'spec_helper'
|
53
58
|
|
54
59
|
# Partial to be rendered in the head tag of the runner. You can use the provided ones or define your own by creating
|
55
60
|
# a `_boot.html.erb` in your fixtures path, and adjust the config to `"/boot"` for instance.
|
56
61
|
#
|
57
62
|
# Available: boot, boot_require_js
|
58
|
-
suite.boot_partial =
|
63
|
+
suite.boot_partial = 'boot'
|
59
64
|
|
60
65
|
# Partial to be rendered in the body tag of the runner. You can define your own to create a custom body structure.
|
61
|
-
suite.body_partial =
|
66
|
+
suite.body_partial = 'body'
|
62
67
|
|
63
68
|
# Hooks allow you to use `Teaspoon.hook("fixtures")` before, after, or during your spec run. This will make a
|
64
69
|
# synchronous Ajax request to the server that will call all of the blocks you've defined for that hook name.
|
65
|
-
#suite.hook :fixtures, &proc{}
|
70
|
+
# suite.hook :fixtures, &proc{}
|
66
71
|
|
67
72
|
# Determine whether specs loaded into the test harness should be embedded as individual script tags or concatenated
|
68
|
-
# into a single file. Similar to Rails' asset `debug: true` and `config.assets.debug = true` options. By default,
|
73
|
+
# into a single file. Similar to Rails' asset `debug: true` and `config.assets.debug = true` options. By default,
|
69
74
|
# Teaspoon expands all assets to provide more valuable stack traces that reference individual source files.
|
70
|
-
#suite.expand_assets = true
|
75
|
+
# suite.expand_assets = true
|
71
76
|
end
|
72
77
|
|
73
78
|
# Example suite. Since we're just filtering to files already within the root test/javascripts, these files will also
|
74
79
|
# be run in the default suite -- but can be focused into a more specific suite.
|
75
|
-
#config.suite :targeted do |suite|
|
80
|
+
# config.suite :targeted do |suite|
|
76
81
|
# suite.matcher = "spec/javascripts/targeted/*_spec.{js,js.coffee,coffee}"
|
77
|
-
#end
|
82
|
+
# end
|
78
83
|
|
79
84
|
# CONSOLE RUNNER SPECIFIC
|
80
85
|
#
|
@@ -94,45 +99,45 @@ Teaspoon.configure do |config|
|
|
94
99
|
# PhantomJS: https://github.com/modeset/teaspoon/wiki/Using-PhantomJS
|
95
100
|
# Selenium Webdriver: https://github.com/modeset/teaspoon/wiki/Using-Selenium-WebDriver
|
96
101
|
# Capybara Webkit: https://github.com/modeset/teaspoon/wiki/Using-Capybara-Webkit
|
97
|
-
#config.driver = :phantomjs
|
102
|
+
# config.driver = :phantomjs
|
98
103
|
|
99
104
|
# Specify additional options for the driver.
|
100
105
|
#
|
101
106
|
# PhantomJS: https://github.com/modeset/teaspoon/wiki/Using-PhantomJS
|
102
107
|
# Selenium Webdriver: https://github.com/modeset/teaspoon/wiki/Using-Selenium-WebDriver
|
103
108
|
# Capybara Webkit: https://github.com/modeset/teaspoon/wiki/Using-Capybara-Webkit
|
104
|
-
#config.driver_options = nil
|
109
|
+
# config.driver_options = nil
|
105
110
|
|
106
111
|
# Specify the timeout for the driver. Specs are expected to complete within this time frame or the run will be
|
107
112
|
# considered a failure. This is to avoid issues that can arise where tests stall.
|
108
|
-
#config.driver_timeout = 180
|
113
|
+
# config.driver_timeout = 180
|
109
114
|
|
110
115
|
# Specify a server to use with Rack (e.g. thin, mongrel). If nil is provided Rack::Server is used.
|
111
|
-
#config.server = nil
|
116
|
+
# config.server = nil
|
112
117
|
|
113
118
|
# Specify a port to run on a specific port, otherwise Teaspoon will use a random available port.
|
114
|
-
#config.server_port = nil
|
119
|
+
# config.server_port = nil
|
115
120
|
|
116
121
|
# Timeout for starting the server in seconds. If your server is slow to start you may have to bump this, or you may
|
117
122
|
# want to lower this if you know it shouldn't take long to start.
|
118
|
-
#config.server_timeout = 20
|
123
|
+
# config.server_timeout = 20
|
119
124
|
|
120
125
|
# Force Teaspoon to fail immediately after a failing suite. Can be useful to make Teaspoon fail early if you have
|
121
126
|
# several suites, but in environments like CI this may not be desirable.
|
122
|
-
#config.fail_fast = true
|
127
|
+
# config.fail_fast = true
|
123
128
|
|
124
129
|
# Specify the formatters to use when outputting the results.
|
125
130
|
# Note: Output files can be specified by using `"junit>/path/to/output.xml"`.
|
126
131
|
#
|
127
132
|
# Available: :dot, :clean, :documentation, :json, :junit, :pride, :rspec_html, :snowday, :swayze_or_oprah, :tap, :tap_y, :teamcity
|
128
|
-
#config.formatters = [:dot]
|
133
|
+
# config.formatters = [:dot]
|
129
134
|
|
130
135
|
# Specify if you want color output from the formatters.
|
131
|
-
#config.color = true
|
136
|
+
# config.color = true
|
132
137
|
|
133
138
|
# Teaspoon pipes all console[log/debug/error] to $stdout. This is useful to catch places where you've forgotten to
|
134
139
|
# remove them, but in verbose applications this may not be desirable.
|
135
|
-
#config.suppress_log = false
|
140
|
+
# config.suppress_log = false
|
136
141
|
|
137
142
|
# COVERAGE REPORTS / THRESHOLD ASSERTIONS
|
138
143
|
#
|
@@ -149,7 +154,7 @@ Teaspoon.configure do |config|
|
|
149
154
|
# Specify that you always want a coverage configuration to be used. Otherwise, specify that you want coverage
|
150
155
|
# on the CLI.
|
151
156
|
# Set this to "true" or the name of your coverage config.
|
152
|
-
#config.use_coverage = nil
|
157
|
+
# config.use_coverage = nil
|
153
158
|
|
154
159
|
# You can have multiple coverage configs by passing a name to config.coverage.
|
155
160
|
# e.g. config.coverage :ci do |coverage|
|
@@ -158,21 +163,21 @@ Teaspoon.configure do |config|
|
|
158
163
|
# Which coverage reports Istanbul should generate. Correlates directly to what Istanbul supports.
|
159
164
|
#
|
160
165
|
# Available: text-summary, text, html, lcov, lcovonly, cobertura, teamcity
|
161
|
-
#coverage.reports = ["text-summary", "html"]
|
166
|
+
# coverage.reports = ["text-summary", "html"]
|
162
167
|
|
163
168
|
# The path that the coverage should be written to - when there's an artifact to write to disk.
|
164
169
|
# Note: Relative to `config.root`.
|
165
|
-
#coverage.output_path = "coverage"
|
170
|
+
# coverage.output_path = "coverage"
|
166
171
|
|
167
172
|
# Assets to be ignored when generating coverage reports. Accepts an array of filenames or regular expressions. The
|
168
173
|
# default excludes assets from vendor, gems and support libraries.
|
169
|
-
#coverage.ignore = [%r{/lib/ruby/gems/}, %r{/vendor/assets/}, %r{/support/}, %r{/(.+)_helper.}]
|
174
|
+
# coverage.ignore = [%r{/lib/ruby/gems/}, %r{/vendor/assets/}, %r{/support/}, %r{/(.+)_helper.}]
|
170
175
|
|
171
176
|
# Various thresholds requirements can be defined, and those thresholds will be checked at the end of a run. If any
|
172
177
|
# aren't met the run will fail with a message. Thresholds can be defined as a percentage (0-100), or nil.
|
173
|
-
#coverage.statements = nil
|
174
|
-
#coverage.functions = nil
|
175
|
-
#coverage.branches = nil
|
176
|
-
#coverage.lines = nil
|
178
|
+
# coverage.statements = nil
|
179
|
+
# coverage.functions = nil
|
180
|
+
# coverage.branches = nil
|
181
|
+
# coverage.lines = nil
|
177
182
|
end
|
178
183
|
end
|
@@ -1,19 +1,19 @@
|
|
1
1
|
require 'rails/generators'
|
2
2
|
|
3
3
|
class TestAppGenerator < Rails::Generators::Base
|
4
|
-
source_root '
|
4
|
+
source_root File.expand_path('../../../../spec/test_app_templates', __FILE__)
|
5
5
|
|
6
6
|
def add_gems
|
7
|
-
gem 'blacklight',
|
7
|
+
gem 'blacklight', '~> 5.9'
|
8
8
|
gem 'teaspoon'
|
9
9
|
gem 'teaspoon-jasmine'
|
10
10
|
Bundler.with_clean_env do
|
11
|
-
run
|
11
|
+
run 'bundle install'
|
12
12
|
end
|
13
13
|
end
|
14
14
|
|
15
15
|
def run_blacklight_generator
|
16
|
-
say_status(
|
16
|
+
say_status('warning', 'GENERATING BL', :yellow)
|
17
17
|
|
18
18
|
generate 'blacklight:install', '--devise'
|
19
19
|
end
|
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.12.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: 2016-01-
|
14
|
+
date: 2016-01-27 00:00:00.000000000 Z
|
15
15
|
dependencies:
|
16
16
|
- !ruby/object:Gem::Dependency
|
17
17
|
name: blacklight
|
@@ -19,14 +19,20 @@ dependencies:
|
|
19
19
|
requirements:
|
20
20
|
- - "~>"
|
21
21
|
- !ruby/object:Gem::Version
|
22
|
-
version: 5.12
|
22
|
+
version: '5.12'
|
23
|
+
- - "<"
|
24
|
+
- !ruby/object:Gem::Version
|
25
|
+
version: '6'
|
23
26
|
type: :runtime
|
24
27
|
prerelease: false
|
25
28
|
version_requirements: !ruby/object:Gem::Requirement
|
26
29
|
requirements:
|
27
30
|
- - "~>"
|
28
31
|
- !ruby/object:Gem::Version
|
29
|
-
version: 5.12
|
32
|
+
version: '5.12'
|
33
|
+
- - "<"
|
34
|
+
- !ruby/object:Gem::Version
|
35
|
+
version: '6'
|
30
36
|
- !ruby/object:Gem::Dependency
|
31
37
|
name: leaflet-rails
|
32
38
|
requirement: !ruby/object:Gem::Requirement
|
@@ -41,20 +47,6 @@ dependencies:
|
|
41
47
|
- - "~>"
|
42
48
|
- !ruby/object:Gem::Version
|
43
49
|
version: 0.7.3
|
44
|
-
- !ruby/object:Gem::Dependency
|
45
|
-
name: blacklight_range_limit
|
46
|
-
requirement: !ruby/object:Gem::Requirement
|
47
|
-
requirements:
|
48
|
-
- - "~>"
|
49
|
-
- !ruby/object:Gem::Version
|
50
|
-
version: 5.0.3
|
51
|
-
type: :runtime
|
52
|
-
prerelease: false
|
53
|
-
version_requirements: !ruby/object:Gem::Requirement
|
54
|
-
requirements:
|
55
|
-
- - "~>"
|
56
|
-
- !ruby/object:Gem::Version
|
57
|
-
version: 5.0.3
|
58
50
|
- !ruby/object:Gem::Dependency
|
59
51
|
name: font-awesome-rails
|
60
52
|
requirement: !ruby/object:Gem::Requirement
|
@@ -187,14 +179,14 @@ dependencies:
|
|
187
179
|
requirements:
|
188
180
|
- - "~>"
|
189
181
|
- !ruby/object:Gem::Version
|
190
|
-
version: 0.
|
182
|
+
version: '0.8'
|
191
183
|
type: :development
|
192
184
|
prerelease: false
|
193
185
|
version_requirements: !ruby/object:Gem::Requirement
|
194
186
|
requirements:
|
195
187
|
- - "~>"
|
196
188
|
- !ruby/object:Gem::Version
|
197
|
-
version: 0.
|
189
|
+
version: '0.8'
|
198
190
|
- !ruby/object:Gem::Dependency
|
199
191
|
name: capybara
|
200
192
|
requirement: !ruby/object:Gem::Requirement
|
@@ -215,14 +207,14 @@ dependencies:
|
|
215
207
|
requirements:
|
216
208
|
- - "~>"
|
217
209
|
- !ruby/object:Gem::Version
|
218
|
-
version: 1.5
|
210
|
+
version: '1.5'
|
219
211
|
type: :development
|
220
212
|
prerelease: false
|
221
213
|
version_requirements: !ruby/object:Gem::Requirement
|
222
214
|
requirements:
|
223
215
|
- - "~>"
|
224
216
|
- !ruby/object:Gem::Version
|
225
|
-
version: 1.5
|
217
|
+
version: '1.5'
|
226
218
|
- !ruby/object:Gem::Dependency
|
227
219
|
name: factory_girl_rails
|
228
220
|
requirement: !ruby/object:Gem::Requirement
|
@@ -267,7 +259,9 @@ files:
|
|
267
259
|
- ".coveralls.yml"
|
268
260
|
- ".gitignore"
|
269
261
|
- ".gitmodules"
|
262
|
+
- ".rubocop.yml"
|
270
263
|
- ".travis.yml"
|
264
|
+
- CONTRIBUTING.md
|
271
265
|
- Gemfile
|
272
266
|
- LICENSE.txt
|
273
267
|
- README.md
|
@@ -310,6 +304,11 @@ files:
|
|
310
304
|
- app/controllers/wms_controller.rb
|
311
305
|
- app/helpers/blacklight_helper.rb
|
312
306
|
- app/helpers/geoblacklight_helper.rb
|
307
|
+
- app/models/concerns/geoblacklight/solr_document.rb
|
308
|
+
- app/models/concerns/geoblacklight/solr_document/carto_db.rb
|
309
|
+
- app/models/concerns/geoblacklight/solr_document/finder.rb
|
310
|
+
- app/models/concerns/geoblacklight/solr_document/inspection.rb
|
311
|
+
- app/presenters/geoblacklight/document_presenter.rb
|
313
312
|
- app/views/catalog/_document_action.html.erb
|
314
313
|
- app/views/catalog/_document_split.html.erb
|
315
314
|
- app/views/catalog/_downloads.html.erb
|
@@ -350,10 +349,8 @@ files:
|
|
350
349
|
- lib/geoblacklight.rb
|
351
350
|
- lib/geoblacklight/bounding_box.rb
|
352
351
|
- lib/geoblacklight/catalog_helper_override.rb
|
353
|
-
- lib/geoblacklight/config.rb
|
354
352
|
- lib/geoblacklight/constants.rb
|
355
353
|
- lib/geoblacklight/controller_override.rb
|
356
|
-
- lib/geoblacklight/document_presenter.rb
|
357
354
|
- lib/geoblacklight/download.rb
|
358
355
|
- lib/geoblacklight/download/geojson_download.rb
|
359
356
|
- lib/geoblacklight/download/geotiff_download.rb
|
@@ -369,9 +366,6 @@ files:
|
|
369
366
|
- lib/geoblacklight/references.rb
|
370
367
|
- lib/geoblacklight/routes.rb
|
371
368
|
- lib/geoblacklight/search_builder.rb
|
372
|
-
- lib/geoblacklight/solr_document.rb
|
373
|
-
- lib/geoblacklight/solr_document/carto_db.rb
|
374
|
-
- lib/geoblacklight/solr_document/finder.rb
|
375
369
|
- lib/geoblacklight/version.rb
|
376
370
|
- lib/geoblacklight/view_helper_override.rb
|
377
371
|
- lib/geoblacklight/wms_layer.rb
|
@@ -388,6 +382,7 @@ files:
|
|
388
382
|
- spec/features/home_page_spec.rb
|
389
383
|
- spec/features/iiif_viewer_spec.rb
|
390
384
|
- spec/features/layer_inspection_spec.rb
|
385
|
+
- spec/features/layer_opacity_spec.rb
|
391
386
|
- spec/features/layer_preview_spec.rb
|
392
387
|
- spec/features/layer_with_no_references_spec.rb
|
393
388
|
- spec/features/metadata_panel_spec.rb
|
@@ -423,12 +418,13 @@ files:
|
|
423
418
|
- spec/lib/geoblacklight/reference_spec.rb
|
424
419
|
- spec/lib/geoblacklight/references_spec.rb
|
425
420
|
- spec/lib/geoblacklight/search_builder_spec.rb
|
426
|
-
- spec/lib/geoblacklight/solr_document/carto_db_spec.rb
|
427
|
-
- spec/lib/geoblacklight/solr_document/finder_spec.rb
|
428
|
-
- spec/lib/geoblacklight/solr_document_spec.rb
|
429
421
|
- spec/lib/geoblacklight/view_helper_override_spec.rb
|
430
422
|
- spec/lib/geoblacklight/wms_layer/feature_info_response_spec.rb
|
431
423
|
- spec/lib/geoblacklight/wms_layer_spec.rb
|
424
|
+
- spec/models/concerns/geoblacklight/solr_document/carto_db_spec.rb
|
425
|
+
- spec/models/concerns/geoblacklight/solr_document/finder_spec.rb
|
426
|
+
- spec/models/concerns/geoblacklight/solr_document/inspection_spec.rb
|
427
|
+
- spec/models/concerns/geoblacklight/solr_document_spec.rb
|
432
428
|
- spec/spec_helper.rb
|
433
429
|
- spec/support/features.rb
|
434
430
|
- spec/support/features/session_helpers.rb
|
@@ -475,6 +471,7 @@ test_files:
|
|
475
471
|
- spec/features/home_page_spec.rb
|
476
472
|
- spec/features/iiif_viewer_spec.rb
|
477
473
|
- spec/features/layer_inspection_spec.rb
|
474
|
+
- spec/features/layer_opacity_spec.rb
|
478
475
|
- spec/features/layer_preview_spec.rb
|
479
476
|
- spec/features/layer_with_no_references_spec.rb
|
480
477
|
- spec/features/metadata_panel_spec.rb
|
@@ -510,12 +507,13 @@ test_files:
|
|
510
507
|
- spec/lib/geoblacklight/reference_spec.rb
|
511
508
|
- spec/lib/geoblacklight/references_spec.rb
|
512
509
|
- spec/lib/geoblacklight/search_builder_spec.rb
|
513
|
-
- spec/lib/geoblacklight/solr_document/carto_db_spec.rb
|
514
|
-
- spec/lib/geoblacklight/solr_document/finder_spec.rb
|
515
|
-
- spec/lib/geoblacklight/solr_document_spec.rb
|
516
510
|
- spec/lib/geoblacklight/view_helper_override_spec.rb
|
517
511
|
- spec/lib/geoblacklight/wms_layer/feature_info_response_spec.rb
|
518
512
|
- spec/lib/geoblacklight/wms_layer_spec.rb
|
513
|
+
- spec/models/concerns/geoblacklight/solr_document/carto_db_spec.rb
|
514
|
+
- spec/models/concerns/geoblacklight/solr_document/finder_spec.rb
|
515
|
+
- spec/models/concerns/geoblacklight/solr_document/inspection_spec.rb
|
516
|
+
- spec/models/concerns/geoblacklight/solr_document_spec.rb
|
519
517
|
- spec/spec_helper.rb
|
520
518
|
- spec/support/features.rb
|
521
519
|
- spec/support/features/session_helpers.rb
|