geoblacklight 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e127521d287ca59baf0fc20ca40ca809a94b3b7
-  data.tar.gz: 8a071536d30863fb3839b04813f6b33aaf43e4a3
+  metadata.gz: 5cbe25203c73d542b897ad3d556f55848632394c
+  data.tar.gz: 72c74184a3184e3307c32dd6abfe405f7790b3a4
 SHA512:
-  metadata.gz: 3ac53e717f08c5534bdd2dcc53fe16c24586775128a673862918965bb3da0efd61e7c9c7d9626f025efe9140fdef930c6835f6132a4fe58b7a50e3f18b97b0ee
-  data.tar.gz: c36c0aaad73b3baa21545033f462ba9ab3d16fc42b9f23c714b91960a1baff67428938cd8935c9dc452afb33fd2ee50b8cca2d342caa355c2d5e46b78434a00f
+  metadata.gz: a7edd50a9275357113347cf2965d590641254cbb36280dddc8bba6aee9ec41b609f0bc1bf68a26815dfafa9351eadf4cbe9a6f169c12d249757be25682a77053
+  data.tar.gz: 1b9b2064a3503c9a970fed6dd7f9c63ef1d82cc235da3e9a1bb115ab00202f7b8bd50fb2e0c195c491e1e3a7945591016d742feb9ca9731a53b62db422672e5f

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

@@ -1,7 +1,5 @@
 /*global GeoBlacklight */
 
-'use strict';
-
 // Leaflet opacity control.
 GeoBlacklight.Controls.Opacity = function() {
   this.map.addControl(new L.Control.LayerOpacity(this.overlay));

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

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

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

@@ -1,7 +1,5 @@
 /*global GeoBlacklight */
 
-'use strict';
-
 GeoBlacklight.Util = {
   // Regex taken from http://stackoverflow.com/questions/37684/how-to-replace-plain-urls-with-links
   linkify: function(str) {

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

@@ -1,7 +1,5 @@
 /*global GeoBlacklight */
 
-'use strict';
-
 // base viewer
 GeoBlacklight.Viewer = L.Class.extend({
   options: {},

data/app/assets/stylesheets/geoblacklight/modules/twitter-typeahead.scss

@@ -1,4 +1,7 @@
 .twitter-typeahead {
+  float: left;
+  width: 100%;
+  z-index: 1001;
 
   .tt-input.form-control {
     width: 100%;

data/app/helpers/geoblacklight_helper.rb

@@ -24,7 +24,7 @@ module GeoblacklightHelper
   # @param [SolrDocument] args
   # @return [String]
   def snippit(args)
-    truncate(Array(args[:value]).flatten.first, length: 150)
+    truncate(Array(args[:value]).flatten.join(' '), length: 150)
   end
 
   def render_facet_tags(facet)
@@ -90,7 +90,7 @@ module GeoblacklightHelper
   # @param [Hash] args from get_field_values
   def render_value_as_truncate_abstract(args)
     content_tag :div, class: 'truncate-abstract' do
-      args[:value]
+      Array(args[:value]).flatten.join(' ')
     end
   end
 

data/lib/geoblacklight/version.rb

@@ -1,3 +1,3 @@
 module Geoblacklight
-  VERSION = '1.0.0'.freeze
+  VERSION = '1.0.1'.freeze
 end

data/lib/tasks/geoblacklight.rake

@@ -21,7 +21,7 @@ namespace :geoblacklight do
 
     desc "Ingests a directory of geoblacklight.json files"
     task :ingest, [:directory] => :environment do |_t, args|
-      args.with_default(directory: 'data')
+      args.with_defaults(directory: 'data')
       Dir.glob(File.join(args[:directory], '**', 'geoblacklight.json')).each do |fn|
         puts "Ingesting #{fn}"
         begin

data/schema/solr/conf/lang/stopwords_en.txt

@@ -0,0 +1,34 @@
+# Standard english stop words taken from Lucene's StopAnalyzer
+a
+an
+and
+are
+as
+at
+be
+but
+by
+for
+if
+in
+into
+is
+it
+no
+not
+of
+on
+or
+such
+that
+the
+their
+then
+there
+these
+they
+this
+to
+was
+will
+with

data/schema/solr/conf/protwords.txt

@@ -0,0 +1,21 @@
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+#-----------------------------------------------------------------------
+# Use a protected word file to protect against the stemmer reducing two
+# unrelated words to the same base word.
+
+# Some non-words that normally won't be encountered,
+# just to test that they won't be stemmed.
+dontstems
+zwhacky
+

data/schema/solr/conf/stopwords_en.txt

@@ -0,0 +1,34 @@
+# Standard english stop words taken from Lucene's StopAnalyzer
+a
+an
+and
+are
+as
+at
+be
+but
+by
+for
+if
+in
+into
+is
+it
+no
+not
+of
+on
+or
+such
+that
+the
+their
+then
+there
+these
+they
+this
+to
+was
+will
+with

data/schema/solr/conf/synonyms.txt

@@ -0,0 +1,29 @@
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+#-----------------------------------------------------------------------
+#some test synonym mappings unlikely to appear in real input text
+aaafoo => aaabar
+bbbfoo => bbbfoo bbbbar
+cccfoo => cccbar cccbaz
+fooaaa,baraaa,bazaaa
+
+# Some synonym groups specific to this example
+GB,gib,gigabyte,gigabytes
+MB,mib,megabyte,megabytes
+Television, Televisions, TV, TVs
+#notice we use "gib" instead of "GiB" so any WordDelimiterFilter coming
+#after us won't split it into two words.
+
+# Synonym mappings can be used for spelling correction too
+pixima => pixma
+

data/spec/helpers/geoblacklight_helpers_spec.rb

@@ -96,6 +96,19 @@ describe GeoblacklightHelper, type: :helper do
         expect(helper.snippit(document)[-3..-1]).to eq '...'
       end
     end
+    context 'as a multivalued Array' do
+      let(:document_attributes) do
+        {
+          value: %w(short description)
+        }
+      end
+      it 'uses both values' do
+        expect(helper.snippit(document)).to eq 'short description'
+      end
+      it 'does not truncate' do
+        expect(helper.snippit(document)[-3..-1]).not_to eq '...'
+      end
+    end
   end
 
   describe '#cartodb_link' do
@@ -130,4 +143,13 @@ describe GeoblacklightHelper, type: :helper do
       expect(leaflet_options[:VIEWERS][:WMS][:CONTROLS]).to eq(['Opacity'])
     end
   end
+
+  describe '#render_value_as_truncate_abstract' do
+    context 'with multiple values' do
+      let(:document) { SolrDocument.new(value: %w(short description)) }
+      it 'wraps in correct DIV class' do
+        expect(helper.render_value_as_truncate_abstract(document)).to eq '<div class="truncate-abstract">short description</div>'
+      end
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geoblacklight
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Mike Graves
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-28 00:00:00.000000000 Z
+date: 2016-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blacklight
@@ -385,8 +385,12 @@ files:
 - lib/tasks/geoblacklight.rake
 - schema/geoblacklight-schema.json
 - schema/geoblacklight-schema.md
+- schema/solr/conf/lang/stopwords_en.txt
+- schema/solr/conf/protwords.txt
 - schema/solr/conf/schema.xml
 - schema/solr/conf/solrconfig.xml
+- schema/solr/conf/stopwords_en.txt
+- schema/solr/conf/synonyms.txt
 - spec/controllers/catalog_controller_spec.rb
 - spec/controllers/download_controller_spec.rb
 - spec/factories/user.rb