geoblacklight 1.4.0 → 1.5.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (10) hide show
  1. checksums.yaml +4 -4
  2. data/.travis.yml +6 -6
  3. data/README.md +1 -1
  4. data/geoblacklight.gemspec +2 -2
  5. data/lib/geoblacklight/version.rb +1 -1
  6. data/lib/geoblacklight/wms_layer/feature_info_response.rb +1 -1
  7. data/spec/lib/geoblacklight/wms_layer/feature_info_response_spec.rb +7 -0
  8. data/spec/test_app_templates/lib/generators/test_app_generator.rb +1 -1
  9. data/spec/test_app_templates/solr_documents +1 -1
  10. metadata +11 -5
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: d3613611043482bea42f602542263eb3e456cb0c
4
- data.tar.gz: fa5d462b4d20b22ccc816f20e535e2dbda992668
3
+ metadata.gz: e10dd6d136a3f3ba6cd333d076db7c0ee8a49340
4
+ data.tar.gz: aa3f3cbdbf4bfeaaa422f8ec8a882d261b9fe0a9
5
5
  SHA512:
6
- metadata.gz: b61a694e23f908f987682b1bef1d2f88ac3d034162343647d388c37c3a42f8405d2c9ca363218b08fc0467ce98adedf35c7a447e49e18c71540594279dd86bc4
7
- data.tar.gz: 988a8942c3109c0244325bfee8db67be4a05a0e422eeb7c5ae2f0fa22d1fef5d4680fea982a084639237d60b352bd6efb7486a1b3056d5788c0811957fac9d6e
6
+ metadata.gz: 7be3015337bf7254bf2722ac456f19739801b1a562aedb4b71917b0adc339c47e48ec4f0afafd0501f62715b5ebf7206503f172f2b7fbbffe6659e508a0eecc2
7
+ data.tar.gz: ab5dc97ebc3ff07ec86e690715c6e03c2d2fe415b01da9ad28c1c6a498fe1317df7dc164a977bdf339f827e194f3ab94c4a62689be0e7125d197a9e4142c44c7
data/.travis.yml CHANGED
@@ -5,21 +5,21 @@ notifications:
5
5
  email: false
6
6
 
7
7
  rvm:
8
- - 2.3.1
8
+ - 2.3.4
9
9
 
10
10
  matrix:
11
11
  include:
12
- - rvm: 2.3.1
13
- env: "RAILS_VERSION=4.2.7.1"
14
- - rvm: 2.2.5
15
- env: "RAILS_VERSION=5.0.0.1"
12
+ - rvm: 2.3.4
13
+ env: "RAILS_VERSION=4.2.8"
14
+ - rvm: 2.3.4
15
+ env: "RAILS_VERSION=5.0.3"
16
16
 
17
17
  before_install:
18
18
  - gem update --system
19
19
  - gem install bundler
20
20
 
21
21
  env:
22
- - "RAILS_VERSION=5.0.0.1"
22
+ - "RAILS_VERSION=5.0.3"
23
23
 
24
24
  global_env:
25
25
  - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
data/README.md CHANGED
@@ -1,4 +1,4 @@
1
- # Geoblacklight
1
+ # GeoBlacklight
2
2
 
3
3
  [![Build Status](https://travis-ci.org/geoblacklight/geoblacklight.svg?branch=master)](https://travis-ci.org/geoblacklight/geoblacklight) | [![Coverage Status](https://img.shields.io/coveralls/geoblacklight/geoblacklight.svg)](https://coveralls.io/r/geoblacklight/geoblacklight?branch=coveralls) | [![Gem Version](https://img.shields.io/gem/v/geoblacklight.svg)](https://github.com/geoblacklight/geoblacklight/releases)
4
4
  [![Stories in Ready](https://badge.waffle.io/geoblacklight/geoblacklight.png?label=ready&title=Ready)](https://waffle.io/geoblacklight/geoblacklight)
data/geoblacklight.gemspec CHANGED
@@ -19,8 +19,8 @@ Gem::Specification.new do |spec|
19
19
  spec.require_paths = ['lib']
20
20
  spec.required_rubygems_version = '>= 2.5.2'
21
21
 
22
- spec.add_dependency 'rails', '>= 4.2.0', '< 6'
23
- spec.add_dependency 'blacklight', '~> 6.3'
22
+ spec.add_dependency 'rails', '>= 4.2.0', '< 5.1'
23
+ spec.add_dependency 'blacklight', '~> 6.3', '< 6.10'
24
24
  spec.add_dependency 'leaflet-rails', '~> 0.7.3'
25
25
  spec.add_dependency 'font-awesome-rails'
26
26
  spec.add_dependency 'config'
data/lib/geoblacklight/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Geoblacklight
2
- VERSION = '1.4.0'.freeze
2
+ VERSION = '1.5.0'.freeze
3
3
  end
data/lib/geoblacklight/wms_layer/feature_info_response.rb CHANGED
@@ -19,7 +19,7 @@ module Geoblacklight
19
19
  table_values[:values].push([th.text])
20
20
  end
21
21
  page.css('td').each_with_index do |td, index|
22
- table_values[:values][index].push(td.text)
22
+ table_values[:values][index].push(td.text) unless index >= table_values[:values].count
23
23
  end
24
24
  table_values
25
25
  end
data/spec/lib/geoblacklight/wms_layer/feature_info_response_spec.rb CHANGED
@@ -2,6 +2,7 @@ require 'spec_helper'
2
2
 
3
3
  describe Geoblacklight::FeatureInfoResponse do
4
4
  let(:response) { described_class.new(OpenStruct.new(body: '<html><body><table><th>Header1</th><th>Header2</th><td>value1</td><td>value2</td></body></html>', headers: { 'content-type' => 'all good' })) }
5
+ let(:response_multiple_features) { described_class.new(OpenStruct.new(body: '<html><body><table><th>Header1</th><th>Header2</th><tr><td>value1</td><td>value2</td></tr><tr><td>value3</td><td>value4</td></tr></body></html>', headers: { 'content-type' => 'all good' })) }
5
6
  let(:error_response) { described_class.new(error: 'bad stuff') }
6
7
  let(:content_response) { described_class.new(OpenStruct.new(headers: { 'content-type' => 'text/xml' })) }
7
8
 
@@ -30,6 +31,12 @@ describe Geoblacklight::FeatureInfoResponse do
30
31
  expect(response.format[:values][0]).to eq %w(Header1 value1)
31
32
  expect(response.format[:values][1]).to eq %w(Header2 value2)
32
33
  end
34
+ it 'returns a formated response when multiple features are retrieved' do
35
+ expect(response_multiple_features.format).not_to be_nil
36
+ expect(response_multiple_features.format[:values].length).to eq 2
37
+ expect(response_multiple_features.format[:values][0]).to eq %w(Header1 value1)
38
+ expect(response_multiple_features.format[:values][1]).to eq %w(Header2 value2)
39
+ end
33
40
  end
34
41
 
35
42
  describe '#check' do
data/spec/test_app_templates/lib/generators/test_app_generator.rb CHANGED
@@ -4,7 +4,7 @@ class TestAppGenerator < Rails::Generators::Base
4
4
  source_root File.expand_path('../../../../spec/test_app_templates', __FILE__)
5
5
 
6
6
  def add_gems
7
- gem 'blacklight', '~> 6.3'
7
+ gem 'blacklight'
8
8
  gem 'teaspoon'
9
9
  gem 'teaspoon-jasmine'
10
10
  Bundler.with_clean_env do
data/spec/test_app_templates/solr_documents CHANGED
@@ -1 +1 @@
1
- spec/test_app_templates/../fixtures/solr_documents
1
+ ../fixtures/solr_documents
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: 1.4.0
4
+ version: 1.5.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: 2017-04-11 00:00:00.000000000 Z
14
+ date: 2017-06-03 00:00:00.000000000 Z
15
15
  dependencies:
16
16
  - !ruby/object:Gem::Dependency
17
17
  name: rails
@@ -22,7 +22,7 @@ dependencies:
22
22
  version: 4.2.0
23
23
  - - "<"
24
24
  - !ruby/object:Gem::Version
25
- version: '6'
25
+ version: '5.1'
26
26
  type: :runtime
27
27
  prerelease: false
28
28
  version_requirements: !ruby/object:Gem::Requirement
@@ -32,7 +32,7 @@ dependencies:
32
32
  version: 4.2.0
33
33
  - - "<"
34
34
  - !ruby/object:Gem::Version
35
- version: '6'
35
+ version: '5.1'
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: blacklight
38
38
  requirement: !ruby/object:Gem::Requirement
@@ -40,6 +40,9 @@ dependencies:
40
40
  - - "~>"
41
41
  - !ruby/object:Gem::Version
42
42
  version: '6.3'
43
+ - - "<"
44
+ - !ruby/object:Gem::Version
45
+ version: '6.10'
43
46
  type: :runtime
44
47
  prerelease: false
45
48
  version_requirements: !ruby/object:Gem::Requirement
@@ -47,6 +50,9 @@ dependencies:
47
50
  - - "~>"
48
51
  - !ruby/object:Gem::Version
49
52
  version: '6.3'
53
+ - - "<"
54
+ - !ruby/object:Gem::Version
55
+ version: '6.10'
50
56
  - !ruby/object:Gem::Dependency
51
57
  name: leaflet-rails
52
58
  requirement: !ruby/object:Gem::Requirement
@@ -545,7 +551,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
545
551
  version: 2.5.2
546
552
  requirements: []
547
553
  rubyforge_project:
548
- rubygems_version: 2.6.10
554
+ rubygems_version: 2.5.2
549
555
  signing_key:
550
556
  specification_version: 4
551
557
  summary: A discovery platform for geospatial holdings