geoblacklight 1.0.3 → 1.1.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (60) hide show
  1. checksums.yaml +4 -4
  2. data/.gitignore +1 -1
  3. data/.solr_wrapper +6 -0
  4. data/.travis.yml +18 -4
  5. data/README.md +2 -4
  6. data/Rakefile +58 -35
  7. data/app/assets/javascripts/geoblacklight/geoblacklight.js +1 -1
  8. data/app/assets/stylesheets/geoblacklight/modules/icon-customization.scss +5 -1
  9. data/app/assets/stylesheets/geoblacklight/modules/toolbar.scss +6 -0
  10. data/app/helpers/carto_helper.rb +36 -0
  11. data/app/helpers/geoblacklight_helper.rb +10 -9
  12. data/app/models/concerns/geoblacklight/solr_document.rb +1 -1
  13. data/app/models/concerns/geoblacklight/solr_document/carto.rb +28 -0
  14. data/app/views/catalog/_exports.html.erb +3 -3
  15. data/config/initializers/rails_config.rb +1 -1
  16. data/config/locales/geoblacklight.en.yml +1 -0
  17. data/geoblacklight.gemspec +9 -8
  18. data/lib/generators/geoblacklight/install_generator.rb +8 -14
  19. data/lib/generators/geoblacklight/templates/settings.yml +2 -2
  20. data/lib/geoblacklight/engine.rb +2 -1
  21. data/lib/geoblacklight/version.rb +1 -1
  22. data/lib/geoblacklight/view_helper_override.rb +1 -0
  23. data/lib/geoblacklight/wms_layer.rb +1 -1
  24. data/lib/tasks/geoblacklight.rake +19 -1
  25. data/schema/geoblacklight-schema.json +21 -23
  26. data/schema/geoblacklight-schema.md +10 -8
  27. data/solr/conf/_rest_managed.json +3 -0
  28. data/solr/conf/admin-extra.html +31 -0
  29. data/solr/conf/elevate.xml +36 -0
  30. data/solr/conf/mapping-ISOLatin1Accent.txt +246 -0
  31. data/{schema/solr → solr}/conf/protwords.txt +0 -0
  32. data/{schema/solr → solr}/conf/schema.xml +2 -4
  33. data/solr/conf/scripts.conf +24 -0
  34. data/{schema/solr → solr}/conf/solrconfig.xml +17 -6
  35. data/solr/conf/spellings.txt +2 -0
  36. data/solr/conf/stopwords.txt +58 -0
  37. data/solr/conf/stopwords_en.txt +58 -0
  38. data/{schema/solr → solr}/conf/synonyms.txt +31 -29
  39. data/solr/conf/xslt/example.xsl +132 -0
  40. data/solr/conf/xslt/example_atom.xsl +67 -0
  41. data/solr/conf/xslt/example_rss.xsl +66 -0
  42. data/solr/conf/xslt/luke.xsl +337 -0
  43. data/spec/controllers/catalog_controller_spec.rb +1 -1
  44. data/spec/controllers/download_controller_spec.rb +14 -8
  45. data/spec/features/configurable_basemap_spec.rb +0 -1
  46. data/spec/features/exports_spec.rb +4 -4
  47. data/spec/fixtures/solr_documents/esri-image-map-layer.json +2 -2
  48. data/spec/helpers/carto_helper_spec.rb +11 -0
  49. data/spec/helpers/geoblacklight_helpers_spec.rb +0 -8
  50. data/spec/models/concerns/geoblacklight/solr_document/{carto_db_spec.rb → carto_spec.rb} +6 -6
  51. data/spec/spec_helper.rb +8 -1
  52. data/spec/support/backport_test_helpers.rb +45 -0
  53. data/spec/test_app_templates/solr_documents +1 -0
  54. data/template.rb +1 -1
  55. metadata +88 -52
  56. data/app/models/concerns/geoblacklight/solr_document/carto_db.rb +0 -15
  57. data/config/jetty.yml +0 -6
  58. data/lib/generators/geoblacklight/templates/config/jetty.yml +0 -10
  59. data/lib/tasks/configure_solr.rake +0 -14
  60. data/schema/solr/conf/stopwords_en.txt +0 -34
@@ -1,15 +0,0 @@
1
- module Geoblacklight
2
- module SolrDocument
3
- ##
4
- # Module for providing external CartoDB download references for a document
5
- module CartoDb
6
- ##
7
- # Returns a url to a file that should be used with CartoDB integration
8
- # @return [String]
9
- def cartodb_reference
10
- return unless public? && download_types.try(:[], :geojson).present?
11
- Geoblacklight::GeojsonDownload.new(self).url_with_params
12
- end
13
- end
14
- end
15
- end
@@ -1,6 +0,0 @@
1
- default:
2
- jetty_port: 8983
3
- test:
4
- jetty_port: <%= ENV['TEST_JETTY_PORT'] || 8983 %>
5
- jetty_home: <%= ENV['TEST_JETTY_PATH'] || File.expand_path(File.join('..', 'jetty'), __FILE__) %>
6
- startup_wait: 15
@@ -1,10 +0,0 @@
1
- development:
2
- startup_wait: 15
3
- jetty_port: 8983
4
- test:
5
- startup_wait: 60
6
- jetty_port: <%= ENV['TEST_JETTY_PORT'] || 8983 %>
7
- <%= ENV['TEST_JETTY_PATH'] ? "jetty_home: " + ENV['TEST_JETTY_PATH'] : '' %>
8
- production:
9
- startup_wait: 15
10
- jetty_port: 8983
@@ -1,14 +0,0 @@
1
- require 'rails/generators'
2
- require 'generators/geoblacklight/install_generator'
3
- require 'geoblacklight'
4
- require 'fileutils'
5
-
6
- namespace :geoblacklight do
7
- desc 'Configures Solr for local jetty instance'
8
- task :configure_solr do
9
- root = Gem::Specification.find_by_name('geoblacklight').gem_dir rescue '.'
10
- FileUtils.cp Dir.glob(File.join(root, 'schema', 'solr', 'conf', '*.*')),
11
- 'jetty/solr/blacklight-core/conf/',
12
- verbose: true
13
- end
14
- end
@@ -1,34 +0,0 @@
1
- # Standard english stop words taken from Lucene's StopAnalyzer
2
- a
3
- an
4
- and
5
- are
6
- as
7
- at
8
- be
9
- but
10
- by
11
- for
12
- if
13
- in
14
- into
15
- is
16
- it
17
- no
18
- not
19
- of
20
- on
21
- or
22
- such
23
- that
24
- the
25
- their
26
- then
27
- there
28
- these
29
- they
30
- this
31
- to
32
- was
33
- will
34
- with