geoblacklight 1.1.0 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b2b4e8cdd2abd133e663a53e4ffd289a4a3a985c
-  data.tar.gz: 5d78163437e30eb35a0ef6fa0a88ed8d8fe77a7c
+  metadata.gz: 3fbbd1cee6968a57c66c02b5feeecc88c1db0b40
+  data.tar.gz: 449649509ad18a912fcaa748a1b77fbe5e0fa1e8
 SHA512:
-  metadata.gz: 3516a9bcb20e42d49bad3ce0c4661a30a8b954da619f01372f36fe7e3ce8eb8b99bea0288a99fe2a13ddea48dad4cfa4cf5a42478589966e68b9f73fe093cc89
-  data.tar.gz: adf65bf73c7c7f56cfdca331beba85c47e71115e032177be4b8c7fe8858d468532778ecbe370f67095ed8aa573734f557c1eec7ebf2a53c65c67442a94176599
+  metadata.gz: 02e426d0152ffa9e06c4d2a55e2ac300ed40f6419ed068095b19d6acc0d8051963ed44d53722497598612a9a5fb11e540ac5ced525da7c0ff5f81f40a0753cb5
+  data.tar.gz: 434bc34f80ecd636a5e88ee72f8201b1660a80359c0f8a95ed38411347c8c3fe90296531a6be92bbb0a154a3f04a8daebcd6f5a8a9433a00146a45671df554cf

data/.travis.yml

@@ -15,6 +15,7 @@ matrix:
       env: "RAILS_VERSION=5.0.0"
 
 before_install:
+  - gem update --system
   - gem install bundler
 
 env:

data/Rakefile

@@ -1,8 +1,8 @@
 # encoding: UTF-8
-require 'rubygems'
 require 'rails'
 begin
   require 'bundler/setup'
+  require 'bundler/gem_tasks'
 rescue LoadError
   puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
 end
@@ -79,7 +79,14 @@ namespace :geoblacklight do
         Rake::Task['geoblacklight:internal:seed'].invoke
 
         within_test_app do
-          system "bundle exec rails s #{args[:rails_server_args]}"
+          puts "\nSolr server running: http://localhost:#{solr.port}/solr/#/blacklight-core"
+          puts "\n^C to stop"
+          puts ' '
+          begin
+            system "bundle exec rails s #{args[:rails_server_args]}"
+          rescue Interrupt
+            puts 'Shutting down...'
+          end
         end
       end
     end

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

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

data/app/controllers/wms_controller.rb

@@ -1,9 +1,15 @@
 class WmsController < ApplicationController
   def handle
-    response = Geoblacklight::WmsLayer.new(params).feature_info
+    response = Geoblacklight::WmsLayer.new(wms_params).feature_info
 
     respond_to do |format|
       format.json { render json: response }
     end
   end
+
+  private
+
+  def wms_params
+    params.permit('URL', 'LAYERS', 'BBOX', 'WIDTH', 'HEIGHT', 'QUERY_LAYERS', 'X', 'Y')
+  end
 end

data/geoblacklight.gemspec

@@ -17,6 +17,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
+  spec.required_rubygems_version = '>= 2.5.2'
 
   spec.add_dependency 'rails', '>= 4.2.0', '< 6'
   spec.add_dependency 'blacklight', '~> 6.3'

data/lib/geoblacklight/version.rb

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

data/lib/tasks/geoblacklight.rake

@@ -7,7 +7,15 @@ namespace :geoblacklight do
   task :server, [:rails_server_args] do |_t, args|
     SolrWrapper.wrap(port: '8983') do |solr|
       solr.with_collection(name: 'blacklight-core', dir: File.join(File.expand_path('../../', File.dirname(__FILE__)), 'solr', 'conf')) do
-        system "bundle exec rails s #{args[:rails_server_args]}"
+          puts "\nSolr server running: http://localhost:#{solr.port}/solr/#/blacklight-core"
+          puts "\n^C to stop"
+          puts ' '
+          begin
+            Rake::Task['geoblacklight:solr:seed'].invoke
+            system "bundle exec rails s #{args[:rails_server_args]}"
+          rescue Interrupt
+            puts 'Shutting down...'
+          end
       end
     end
   end

data/spec/controllers/wms_controller_spec.rb

@@ -0,0 +1,34 @@
+require 'spec_helper'
+
+describe Geoblacklight::WmsController, type: :controller do
+  let(:wms_layer) { instance_double('Geoblacklight::WmsLayer') }
+  let(:feature_info) { { values: ['fid', 'layer:example'] } }
+  let(:params) do
+    { format: 'json', 'URL' => 'http://www.example.com/', 'LAYERS' => 'layer:example',
+      'BBOX' => '-74, 40, -68, 43', 'WIDTH' => '500', 'HEIGHT' => '400',
+      'QUERY_LAYERS' => 'layer:example', 'X' => '277', 'Y' => '195' }
+  end
+
+  before do
+    allow(Geoblacklight::WmsLayer).to receive(:new).and_return(wms_layer)
+    allow(wms_layer).to receive(:feature_info).and_return(feature_info)
+  end
+
+  describe '#handle' do
+    it 'returns feature info as json' do
+      get :handle, params: params
+      expect(response.body).to eq(feature_info.to_json)
+    end
+  end
+
+  describe '#wms_params' do
+    let(:wms_params) { controller.instance_eval { wms_params } }
+
+    it 'returns only permitted params' do
+      get :handle, params: params
+      expect(wms_params.to_h).not_to eq(params)
+      params.delete(:format)
+      expect(wms_params.to_h).to eq(params)
+    end
+  end
+end

data/spec/lib/geoblacklight/wms_layer_spec.rb

@@ -1,28 +1,63 @@
 require 'spec_helper'
 
 describe Geoblacklight::WmsLayer do
-  let(:params) { { 'URL' => 'http://www.example.com/', 'X' => '277' } }
   let(:wms_layer) { described_class.new(params) }
+  let(:rails_4_params) { { 'URL' => 'http://www.example.com/', 'X' => '277' } }
+  let(:rails_5_params) { instance_double('ActionController::Parameters') }
+
+  before do
+    allow(rails_5_params).to receive(:to_h).and_return('URL' => 'http://www.example.com/', 'X' => '277')
+  end
+
   describe '#initialize' do
+    let(:params) { rails_4_params }
+
     it 'initializes as a WmsLayer object' do
       expect(wms_layer).to be_an described_class
     end
   end
 
   describe '#url' do
-    it 'returns only URL parameter' do
-      expect(wms_layer.url).to eq 'http://www.example.com/'
+    context 'when running on rails 4' do
+      let(:params) { rails_4_params }
+
+      it 'returns the correct URL parameter' do
+        expect(wms_layer.url).to eq('http://www.example.com/')
+      end
+    end
+
+    context 'when running on rails 5' do
+      let(:params) { rails_5_params }
+
+      it 'returns the correct URL parameter' do
+        expect(wms_layer.url).to eq('http://www.example.com/')
+      end
     end
   end
 
   describe '#search_params' do
-    it 'returns all params except URL plus default params' do
-      expect(wms_layer.search_params.length).to eq 8
-      expect(wms_layer.search_params).not_to include 'URL' => 'http://www.example.com'
+    context 'when running on rails 4' do
+      let(:params) { rails_4_params }
+
+      it 'returns all params except URL plus default params' do
+        expect(wms_layer.search_params.length).to eq 8
+        expect(wms_layer.search_params).not_to include 'URL' => 'http://www.example.com/'
+      end
+    end
+
+    context 'when running on rails 5' do
+      let(:params) { rails_5_params }
+
+      it 'returns all params except URL plus default params' do
+        expect(wms_layer.search_params.length).to eq 8
+        expect(wms_layer.search_params).not_to include 'URL' => 'http://www.example.com/'
+      end
     end
   end
 
   describe '#request_response' do
+    let(:params) { rails_4_params }
+
     it 'returns a Faraday object' do
       faraday = double('faraday')
       allow(faraday).to receive(:get)

data/template.rb

@@ -1,6 +1,5 @@
-gem 'blacklight'
-gem 'geoblacklight'
-gem 'jettywrapper'
+gem 'blacklight', '>= 6.3'
+gem 'geoblacklight', '>= 1.1.2'
 
 run 'bundle install'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geoblacklight
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.2
 platform: ruby
 authors:
 - Mike Graves
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-05 00:00:00.000000000 Z
+date: 2016-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -425,6 +425,7 @@ files:
 - solr/conf/xslt/luke.xsl
 - spec/controllers/catalog_controller_spec.rb
 - spec/controllers/download_controller_spec.rb
+- spec/controllers/wms_controller_spec.rb
 - spec/factories/user.rb
 - spec/features/bookmarks_spec.rb
 - spec/features/configurable_basemap_spec.rb
@@ -494,7 +495,6 @@ 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
@@ -520,16 +520,17 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.5.2
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: A discovery platform for geospatial holdings
 test_files:
 - spec/controllers/catalog_controller_spec.rb
 - spec/controllers/download_controller_spec.rb
+- spec/controllers/wms_controller_spec.rb
 - spec/factories/user.rb
 - spec/features/bookmarks_spec.rb
 - spec/features/configurable_basemap_spec.rb
@@ -599,7 +600,6 @@ 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

data/spec/test_app_templates/solr_documents

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