geoblacklight 1.1.2 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3fbbd1cee6968a57c66c02b5feeecc88c1db0b40
-  data.tar.gz: 449649509ad18a912fcaa748a1b77fbe5e0fa1e8
+  metadata.gz: 2790f480cb5d55cf12f7cb2833a40fbd366d72c9
+  data.tar.gz: b72946fc1299ff88dcb829dde41b2060ca53195a
 SHA512:
-  metadata.gz: 02e426d0152ffa9e06c4d2a55e2ac300ed40f6419ed068095b19d6acc0d8051963ed44d53722497598612a9a5fb11e540ac5ced525da7c0ff5f81f40a0753cb5
-  data.tar.gz: 434bc34f80ecd636a5e88ee72f8201b1660a80359c0f8a95ed38411347c8c3fe90296531a6be92bbb0a154a3f04a8daebcd6f5a8a9433a00146a45671df554cf
+  metadata.gz: 08ef76ebafe288ba94d401d88af615b56f4dc531df078cc3308ff8e7952001aa49a00b7c437ef4570d860a6c7718b95bc83b8b6ff683190e393cf90171f92e66
+  data.tar.gz: bbd8456833a4c4bec1c978cdc3edaf82913cd6517e8c961795e8d1d3a7a6b8c308987d0312061b57be50677ba3f141a32b0ee4675b1c3857817ec93f34a2f091

data/app/assets/javascripts/geoblacklight/geoblacklight.js

@@ -20,7 +20,7 @@
 
   var GeoBlacklight = L.Class.extend({
     statics: {
-      __version__: '1.1.2',
+      __version__: '1.2.0',
 
       debounce: function(fn, delay) {
         var timeout = null;

data/app/helpers/geoblacklight_helper.rb

@@ -39,7 +39,7 @@ module GeoblacklightHelper
   def geoblacklight_icon(name)
     content_tag :span,
                 '',
-                class: "geoblacklight-icon geoblacklight-#{name.downcase.tr(' ', '-')}",
+                class: "geoblacklight-icon geoblacklight-#{name.parameterize}",
                 title: name
   end
 

data/lib/geoblacklight/version.rb

@@ -1,3 +1,3 @@
 module Geoblacklight
-  VERSION = '1.1.2'.freeze
+  VERSION = '1.2.0'.freeze
 end

data/lib/tasks/geoblacklight.rake

@@ -1,10 +1,10 @@
-require 'solr_wrapper'
 require 'rails/generators'
 require 'generators/geoblacklight/install_generator'
 
 namespace :geoblacklight do
   desc 'Run Solr and GeoBlacklight for interactive development'
   task :server, [:rails_server_args] do |_t, args|
+    require 'solr_wrapper'
     SolrWrapper.wrap(port: '8983') do |solr|
       solr.with_collection(name: 'blacklight-core', dir: File.join(File.expand_path('../../', File.dirname(__FILE__)), 'solr', 'conf')) do
           puts "\nSolr server running: http://localhost:#{solr.port}/solr/#/blacklight-core"

data/schema/geoblacklight-schema.json

@@ -3,8 +3,7 @@
   "description": "Schema for GeoBlacklight. See https://github.com/geoblacklight/geoblacklight/wiki/Schema for more details.",
   "id": "http://geoblacklight.org/v1.0/schema",
   "title": "GeoBlacklight Schema",
-  "type": "array",
-  "properties": {
+  "definitions": {
     "layer": {
       "title": "layer",
       "description": "A GIS data layer. See [this example](https://github.com/OpenGeoMetadata/edu.stanford.purl/blob/master/bb/099/zb/1450/geoblacklight.json) metadata layer.",
@@ -201,5 +200,15 @@
         }
       }
     }
-  }
+  },
+  "anyOf": [
+    {
+      "$ref": "#/definitions/layer"
+    }, {
+      "type": "array",
+      "items": {
+        "$ref": "#/definitions/layer"
+      }
+    }
+  ]
 }

data/spec/helpers/geoblacklight_helpers_spec.rb

@@ -16,10 +16,21 @@ describe GeoblacklightHelper, type: :helper do
   end
 
   describe '#geoblacklight_icon' do
-    it 'lowercases and subs spaces for hyphens' do
-      html = Capybara.string(geoblacklight_icon('TEst 123'))
+    it 'replaces special characters, lowercases, and subs spaces for hyphens' do
+      html = Capybara.string(geoblacklight_icon('TEst & 123'))
       expect(html).to have_css '.geoblacklight-test-123'
     end
+    it 'supports in use cases' do
+      {
+        'Paper map' => 'paper-map',
+        'Michigan State' => 'michigan-state',
+        'CD ROM' => 'cd-rom',
+        'Lewis & Clark' => 'lewis-clark'
+      }.each do |key, value|
+        html = Capybara.string(geoblacklight_icon(key))
+        expect(html).to have_css ".geoblacklight-#{value}"
+      end
+    end
   end
 
   describe '#proper_case_format' do

data/spec/test_app_templates/solr_documents

@@ -0,0 +1 @@
+../fixtures/solr_documents

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geoblacklight
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
 platform: ruby
 authors:
 - Mike Graves
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-12 00:00:00.000000000 Z
+date: 2016-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -495,6 +495,7 @@ files:
 - spec/support/features/session_helpers.rb
 - spec/teaspoon_env.rb
 - spec/test_app_templates/lib/generators/test_app_generator.rb
+- spec/test_app_templates/solr_documents
 - spec/views/catalog/_document_split.html.erb_spec.rb
 - spec/views/catalog/_downloads.html.erb_spec.rb
 - spec/views/catalog/_index_split.html.erb_spec.rb
@@ -523,7 +524,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 2.5.2
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A discovery platform for geospatial holdings
@@ -600,6 +601,7 @@ test_files:
 - spec/support/features/session_helpers.rb
 - spec/teaspoon_env.rb
 - spec/test_app_templates/lib/generators/test_app_generator.rb
+- spec/test_app_templates/solr_documents
 - spec/views/catalog/_document_split.html.erb_spec.rb
 - spec/views/catalog/_downloads.html.erb_spec.rb
 - spec/views/catalog/_index_split.html.erb_spec.rb