geo_concerns 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3cf1d76ece3afbe31d08c30a02dd05876fad50e1
-  data.tar.gz: ffd2bd3a01ea694c65df13ff3bc2f2055b0d0430
+  metadata.gz: 255bdd173366bc1acb75b272d840a49da4880844
+  data.tar.gz: 785b290a3b6d94dd1d972b7c7e1e42cbd5e2f2ca
 SHA512:
-  metadata.gz: a7a89521739103364461925d683859f226b03f495be20c98dfc803d4fe1e584cea3b0ac084b550c19cb8d509dd693078a942deb5c6ca741ebd9a63e58f661a24
-  data.tar.gz: c08799ec54e6448954be8b61b57dfb729074d6930f30f3088786762b528b2b1443b3ba1498c66ec1f59c09ae1120fdd3768dc15bb396e50831e0a46ae42f7c40
+  metadata.gz: 69859a3c2e3909cbefc8f48d6acf52c6a781d18163744f2d9d1bb81e688fcdb0fbb782f85b58fcca2c5a8a3edf0ce7afb9e05298b0b126b6228f07a56eda277e
+  data.tar.gz: f205a24f9e51d3dcbd47a1fe803d2d0a530b98f3cd370a9c878ddc5a8045ad723d1043c559037ab8ab83fea06dfbc53acaa5a0b6daf1a03646e1a215baf09e86

data/.fcrepo_wrapper

@@ -0,0 +1,3 @@
+# Place any default configuration for fcrepo_wrapper here
+port: 8984
+enable_jms: false

data/.gitignore

@@ -11,3 +11,4 @@ test/dummy/.sass-cache
 fcrepo4-data
 Gemfile.lock
 coverage
+fcrepo4-test-data/

data/.solr_wrapper

@@ -0,0 +1,7 @@
+# Place any default configuration for solr_wrapper here
+version: 6.2.0
+port: 8983
+collection:
+  persist: true
+  dir: solr/config/
+  name: hydra-development

data/.travis.yml

@@ -1,11 +1,17 @@
 language: ruby
 sudo: true
 rvm:
-  - 2.3.0
+  - 2.2.2 # oldest version supported by Rails 5
+  - 2.3.1 # latest release
 env:
   global:
   - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
   - MAPNIK_VERSION="2.3"
+  matrix:
+    - RAILS_VERSION=4.2.7
+      RDF_VERSION=1.99.1
+    - RAILS_VERSION=5.0.0
+      RDF_VERSION=2.1.0
 before_install:
  - sudo apt-add-repository --yes ppa:mapnik/nightly-${MAPNIK_VERSION}
  - sudo apt-get update -y

data/Gemfile

@@ -6,15 +6,17 @@ source 'https://rubygems.org'
 gemspec
 
 group :development, :test do
+  # Peg simplecov to < 0.8 until this is resolved:
+  # https://github.com/colszowka/simplecov/issues/281
   gem 'simplecov', '~> 0.9', require: false
   gem 'coveralls', require: false
 end
 
 # BEGIN ENGINE_CART BLOCK
-# engine_cart: 0.8.2
-# engine_cart stanza: 0.8.0
+# engine_cart: 0.10.0
+# engine_cart stanza: 0.10.0
 # the below comes from engine_cart, a gem used to test this Rails engine gem in the context of a Rails app.
-file = File.expand_path("Gemfile", ENV['ENGINE_CART_DESTINATION'] || ENV['RAILS_ROOT'] || File.expand_path(".internal_test_app", File.dirname(__FILE__)))
+file = File.expand_path('Gemfile', ENV['ENGINE_CART_DESTINATION'] || ENV['RAILS_ROOT'] || File.expand_path('.internal_test_app', File.dirname(__FILE__)))
 if File.exist?(file)
   begin
     eval_gemfile file
@@ -28,19 +30,21 @@ else
   if ENV['RAILS_VERSION']
     if ENV['RAILS_VERSION'] == 'edge'
       gem 'rails', github: 'rails/rails'
-      ENV['ENGINE_CART_RAILS_OPTIONS']= "--edge --skip-turbolinks"
+      ENV['ENGINE_CART_RAILS_OPTIONS'] = '--edge --skip-turbolinks'
     else
       gem 'rails', ENV['RAILS_VERSION']
     end
   end
 
-  if ENV['RAILS_VERSION'].nil? || ENV['RAILS_VERSION'] =~ /^4.2/
-    gem 'responders', "~> 2.0"
-    gem 'sass-rails', ">= 5.0"
-  elsif ENV['RAILS_VERSION'] =~ /^5.0/ || ENV['RAILS_VERSION'] == 'edge'
-    # nop
-  else
-    gem 'sass-rails', "< 5.0"
+  case ENV['RAILS_VERSION']
+  when /^4.2/
+    gem 'responders', '~> 2.0'
+    gem 'sass-rails', '>= 5.0'
+    gem 'coffee-rails', '~> 4.1.0'
+  when /^4.[01]/
+    gem 'sass-rails', '< 5.0'
   end
 end
 # END ENGINE_CART BLOCK
+
+gem 'rails-controller-testing' if !ENV['RAILS_VERSION'] || ENV['RAILS_VERSION'] =~ /^5\./

data/README.md

@@ -1,5 +1,5 @@
 # Geo Concerns
-[![Build Status](https://travis-ci.org/projecthydra-labs/geo_concerns.svg)](https://travis-ci.org/projecthydra-labs/geo_concerns)
+[![Build Status](https://travis-ci.org/projecthydra-labs/geo_concerns.svg?branch=master)](https://travis-ci.org/projecthydra-labs/geo_concerns)
 [![Coverage Status](https://coveralls.io/repos/github/projecthydra-labs/geo_concerns/badge.svg?branch=master)](https://coveralls.io/github/projecthydra-labs/geo_concerns?branch=master)
 [![API Docs](http://img.shields.io/badge/API-docs-blue.svg)](http://www.rubydoc.info/github/projecthydra-labs/geo_concerns)
 [![Gem Version](https://img.shields.io/gem/v/geo_concerns.svg)](https://github.com/projecthydra-labs/geo_concerns/releases)
@@ -7,7 +7,7 @@
 Rails application for developing Hydra Geo models. Built around Curation Concerns engine.
 
 * [Poster from Hydra Connect 2015](https://drive.google.com/file/d/0B5fLh2mc4FCbOUpWaTFOVmI4Nkk/view?pli=1)
-* [Current GeoConcerns diagram](https://github.com/projecthydra-labs/geo_concerns/raw/master/docs/pcdm-geo-model.pdf)
+* [Current GeoConcerns diagram](https://wiki.duraspace.org/download/attachments/69012114/pcdm-geo-model.pdf?version=1&modificationDate=1463590066822&api=v2)
 
 
 ## Dependencies

data/Rakefile

@@ -6,16 +6,19 @@ end
 require 'engine_cart/rake_task'
 require 'rspec/core/rake_task'
 require 'rubocop/rake_task'
-RuboCop::RakeTask.new(:rubocop) do |task|
-  task.requires << 'rubocop-rspec'
-  task.fail_on_error = true
-end
-task spec: :rubocop do
-  RSpec::Core::RakeTask.new(:spec)
-end
+require 'active_fedora/rake_support'
+
 Dir.glob('tasks/*.rake').each { |r| import r }
 
 Bundler::GemHelper.install_tasks
 
+desc 'Run test suite and style checker'
+task spec: ['geo_concerns:spec']
+
+desc 'Spin up Solr & Fedora and run the test suite'
+task ci: ['geo_concerns:rubocop', 'engine_cart:generate'] do
+  Rake::Task['spec'].invoke
+end
+
 task clean: 'engine_cart:clean'
 task default: :ci

data/app/assets/javascripts/geo_concerns/bounding_box_selector.js

@@ -18,7 +18,9 @@ function boundingBoxSelector(options) {
     scrollWheelZoom: false
   }).fitBounds(initialBounds);
 
-  L.tileLayer('https://otile1-s.mqcdn.com/tiles/1.0.0/map/{z}/{x}/{y}.png', {
+  updateBboxInputs(initialBounds);
+
+  L.tileLayer('https://cartodb-basemaps-{s}.global.ssl.fastly.net/light_all/{z}/{x}/{y}.png', {
     maxZoom: 18
   }).addTo(map);
   L.Control.geocoder({ position: 'topleft' }).addTo(map);
@@ -28,12 +30,10 @@ function boundingBoxSelector(options) {
   } else {
     boundingBox = new L.BoundingBox({ bounds: initialBounds,
                                    buttonPosition: 'topright', }).addTo(map);
-  boundingBox.on('change', function() {
-    $(inputId).val(boundsToCoverage(this.getBounds()));
-  });
 
     boundingBox.on('change', function() {
       $(inputId).val(boundsToCoverage(this.getBounds()));
+      updateBboxInputs(this.getBounds())
     });
 
     boundingBox.enable();
@@ -98,3 +98,11 @@ function boundsToCoverage(bounds) {
     return '';
   }
 };
+
+function updateBboxInputs(bounds) {
+  bounds = clampBounds(bounds);
+  $('#bbox-north').val(bounds.getNorth().toFixed(6));
+  $('#bbox-east').val(bounds.getEast().toFixed(6));
+  $('#bbox-south').val(bounds.getSouth().toFixed(6));
+  $('#bbox-west').val(bounds.getWest().toFixed(6));
+};

data/app/assets/stylesheets/geo_concerns/bounding_box.scss

@@ -5,3 +5,8 @@
 .leaflet-control-attribution {
   display: none;
 }
+
+.bbox-inputs {
+  margin-top: 10px;
+  margin-bottom: 10px;
+}

data/app/controllers/concerns/geo_concerns/download_behavior.rb

@@ -12,7 +12,8 @@ module GeoConcerns
     def load_file
       file_reference = params[:file]
       return default_file unless file_reference
-      file_path = GeoConcerns::DerivativePath.derivative_path_for_reference(asset, file_reference)
+      file_path = GeoConcerns::DerivativePath.derivative_path_for_reference(params[asset_param_key],
+                                                                            file_reference)
       File.exist?(file_path) ? file_path : nil
     end
   end

data/app/helpers/geo_concerns/bounding_box_helper.rb

@@ -7,12 +7,59 @@ module GeoConcerns
     # @param [Symbol] name of property that holds bounding box string
     # @return[String]
     def bbox(property)
+      markup = ''
+      markup << %(<div id='bbox'></div>)
+      markup << bbox_display_inputs
+      markup << bbox_script_tag(property)
+      markup.html_safe
+    end
+
+    ##
+    # Returns markup for a row of read only bounding box inputs.
+    # @return[String]
+    # rubocop:disable MethodLength
+    def bbox_display_inputs
+      %(
+        <div class="row bbox-inputs">
+          <div class="col-lg-3">
+            <div class="input-group">
+              <span class="input-group-addon">North</span>
+              <input readonly id="bbox-north" type="text" class="form-control bbox-input">
+            </div>
+          </div>
+          <div class="col-lg-3">
+            <div class="input-group">
+              <span class="input-group-addon">East</span>
+              <input readonly id="bbox-east" type="text" class="form-control bbox-input">
+            </div>
+          </div>
+          <div class="col-lg-3">
+            <div class="input-group">
+              <span class="input-group-addon">South</span>
+              <input readonly id="bbox-south" type="text" class="form-control bbox-input">
+            </div>
+          </div>
+          <div class="col-lg-3">
+            <div class="input-group">
+              <span class="input-group-addon">West</span>
+              <input readonly id="bbox-west" type="text" class="form-control bbox-input">
+            </div>
+          </div>
+        </div>
+      )
+    end
+    # rubocop:enable MethodLength
+
+    ##
+    # Returns script tag markup for loading the bounding box selector.
+    # @param[Symbol] name of property that holds bounding box string
+    # @return[String] script tag
+    def bbox_script_tag(property)
       %(
-        <div id='bbox'></div>
         <script>
           boundingBoxSelector({inputId: #{bbox_input_id(property)}});
         </script>
-      ).html_safe
+      )
     end
 
     ##

data/app/processors/geo_concerns/processors/ogr.rb

@@ -11,7 +11,7 @@ module GeoConcerns
         # @param out_path [String] processor output file path
         def self.reproject(in_path, out_path, options)
           execute "env SHAPE_ENCODING= ogr2ogr -q -nln #{options[:basename]} -f 'ESRI Shapefile'"\
-                    " -t_srs #{options[:output_srid]} '#{out_path}' '#{in_path}'"
+                    " -t_srs #{options[:output_srid]} -preserve_fid '#{out_path}' '#{in_path}'"
         end
       end
     end

data/app/renderers/geo_concerns/coverage_renderer.rb

@@ -1,5 +1,7 @@
 module GeoConcerns
   class CoverageRenderer < CurationConcerns::Renderers::AttributeRenderer
+    include BoundingBoxHelper
+
     def render
       coverage = values.first if values
       return '' unless coverage
@@ -11,26 +13,27 @@ module GeoConcerns
       def markup(coverage)
         markup = ''
         markup << %(<tr><th>#{label}</th>\n<td id='accordion'><ul class='tabular'>)
-        markup << value(coverage)
+        markup << %(<div id='bbox' class='collapse in'></div>)
+        markup << bbox_display_inputs
+        markup << bbox_script_tag(coverage)
         markup << toggle_button
-        markup << map(coverage)
         markup << %(</ul></td></tr>)
         markup
       end
 
-      def value(coverage)
-        attributes = microdata_object_attributes(field).merge(class: "attribute #{field}")
-        %(<li#{html_attributes(attributes)}>#{attribute_value_to_html(coverage.to_s)})
-      end
-
       def toggle_button
-        %( <a data-toggle='collapse' data-parent='accordion' href='#bbox' class='btn btn-default'>
-           Toggle Map</a>)
+        %(
+          <a data-toggle='collapse' data-parent='accordion' href='#bbox' class='btn btn-default'>
+           Toggle Map</a>
+          )
       end
 
-      def map(coverage)
-        %(<div id='bbox' class='collapse in'></div>
-          <script>boundingBoxSelector({coverage: '#{coverage}', readonly: true});</script>)
+      def bbox_script_tag(coverage)
+        %(
+          <script>
+            boundingBoxSelector({coverage: '#{coverage}', readonly: true});
+          </script>
+        )
       end
   end
 end

data/app/schemas/geo_concerns/basic_geo_metadata_optional.rb

@@ -3,7 +3,7 @@ module GeoConcerns
     #
     # The following properties are inherited from Curation Concerns' metadata
     #
-    # @see https://github.com/projecthydra-labs/curation_concerns/blob/master/curation_concerns-models/app/models/concerns/curation_concerns/basic_metadata.rb
+    # @see https://github.com/projecthydra/curation_concerns/blob/v1.5.0/app/models/concerns/curation_concerns/basic_metadata.rb
     # Optional:
     #   :contributor
     #   :creator

data/app/schemas/geo_concerns/basic_geo_metadata_required.rb

@@ -3,7 +3,7 @@ module GeoConcerns
     #
     # The following properties are inherited from Curation Concerns' metadata
     #
-    # @see https://github.com/projecthydra-labs/curation_concerns/blob/master/curation_concerns-models/app/models/concerns/curation_concerns/required_metadata.rb
+    # @see https://github.com/projecthydra/curation_concerns/blob/v1.5.0/app/models/concerns/curation_concerns/required_metadata.rb
     # Required:
     #   :title
     #   :date_uploaded (DC.dateSubmitted)

data/app/services/geo_concerns/derivative_path.rb

@@ -1,6 +1,6 @@
 module GeoConcerns
   class DerivativePath < CurationConcerns::DerivativePath
-    def self.extension_for(destination_name)
+    def self.extension(destination_name)
       case destination_name
       when 'thumbnail'
         ".#{MIME::Types.type_for('jpg').first.extensions.first}"

data/app/views/geo_concerns/_attributes.html.erb

@@ -6,8 +6,8 @@
   <tbody>
     <%= render 'geo_concerns/attribute_rows', presenter: presenter %>
     <%= presenter.attribute_to_html(:permission_badge, label: 'Visibility') %>
-    <%= presenter.attribute_to_html(:embargo_release_date) %>
-    <%= presenter.attribute_to_html(:lease_expiration_date) %>
+    <%= presenter.attribute_to_html(:embargo_release_date, render_as: :date) %>
+    <%= presenter.attribute_to_html(:lease_expiration_date, render_as: :date) %>
     <%= presenter.attribute_to_html(:rights, render_as: :rights) %>
   </tbody>
 </table>

data/app/views/geo_concerns/file_sets/media_display/_geo.html.erb

@@ -1,16 +1,21 @@
 <% if CurationConcerns.config.display_media_download_link %>
-    <%= link_to main_app.download_path(file_set), target: "_new", title: "Download the data" do %>
-        <figure>
-            <%= image_tag main_app.download_path(file_set, file: 'thumbnail'),
-                          class: "img-responsive",
-                          alt: "Download the data for #{file_set.to_s}" %>
-            <figcaption>Download the data</figcaption>
-        </figure>
-    <% end %>
+    <div>
+      <h2 class="sr-only"><%= t('curation_concerns.show.downloadable_content.heading') %></h2>
+      <%= image_tag thumbnail_url(file_set),
+                    class: "representative-media",
+                    alt: "",
+                    role: "presentation" %>
+      <%= link_to main_app.download_path(file_set),
+                  target: "_new",
+                  class: "btn btn-default" do %>
+          <%= 'Download data' %>
+      <% end %>
+    </div>
 <% else %>
-    <figure>
-        <%= image_tag main_app.download_path(file_set, file: 'thumbnail'),
-                      class: "img-responsive",
-                      alt: "Thumbnail of #{file_set.to_s}" %>
-    </figure>
+    <div>
+      <%= image_tag thumbnail_url(file_set),
+                    class: "representative-media",
+                    alt: "",
+                    role: "presentation" %>
+    </div>
 <% end %>

data/geo_concerns.gemspec

@@ -18,15 +18,18 @@ Gem::Specification.new do |spec|
   spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'curation_concerns', '1.0.0.beta7'
+  spec.required_ruby_version = '>= 2.2.2' # same as Rails 5
+
+  spec.add_dependency 'curation_concerns', '1.5.0'
   spec.add_dependency 'leaflet-rails', '~> 0.7'
-  spec.add_dependency 'simple_mapnik', '0.0.9'
+  spec.add_dependency 'simple_mapnik', '0.1.0'
   spec.add_dependency 'json-schema'
 
   spec.add_development_dependency 'sqlite3'
+  spec.add_development_dependency 'devise', '>= 3.0', '< 5'
   spec.add_development_dependency 'rspec-rails'
-  spec.add_development_dependency 'engine_cart', '~> 0.8'
-  spec.add_development_dependency 'solr_wrapper', '~> 0.10'
+  spec.add_development_dependency 'engine_cart', '~> 0.10'
+  spec.add_development_dependency 'solr_wrapper', '>= 0.13.1'
   spec.add_development_dependency 'fcrepo_wrapper', '~> 0.1'
   spec.add_development_dependency 'pry-byebug'
   spec.add_development_dependency 'database_cleaner', '< 1.1.0'

data/lib/generators/geo_concerns/install_generator.rb

@@ -134,6 +134,10 @@ module GeoConcerns
     def install_assets
       copy_file 'geo_concerns.js', 'app/assets/javascripts/geo_concerns.js'
       copy_file 'geo_concerns.scss', 'app/assets/stylesheets/geo_concerns.scss'
+      file_path = 'app/assets/javascripts/application.js'
+      inject_into_file file_path, before: %r{\/\/= require_tree \..*$} do
+        "//= require geo_concerns\n"
+      end
     end
 
     private

data/lib/geo_concerns/version.rb

@@ -1,3 +1,3 @@
 module GeoConcerns
-  VERSION = "0.0.6".freeze
+  VERSION = "0.0.7".freeze
 end

data/solr/config/solrconfig.xml

@@ -102,7 +102,6 @@
        -->
         <str name="qf">
           id
-          active_fedora_model_ssi
           title_tesim
           author_tesim
           subject_tesim
@@ -188,6 +187,17 @@
     </lst>
   </requestHandler>
 
+  <searchComponent name="termsComponent" class="solr.TermsComponent" />
+
+  <requestHandler name="/terms" class="solr.SearchHandler">
+    <lst name="defaults">
+      <bool name="terms">true</bool>
+    </lst>
+    <arr name="components">
+      <str>termsComponent</str>
+    </arr>
+  </requestHandler>
+
 <!-- Spell Check
 
         The spell check component can return a list of alternative spelling
@@ -309,4 +319,3 @@
     <!-- </lst> -->
   </requestHandler>
 </config>
-

data/spec/controllers/image_works_controller_spec.rb

@@ -17,7 +17,7 @@ describe CurationConcerns::ImageWorksController, type: :controller do
       it "is a success" do
         image = FactoryGirl.create(:image_work, user: user)
 
-        get :show, id: image.id
+        get :show, params: { id: image.id }
         expect(response).to be_success
       end
     end
@@ -33,7 +33,7 @@ describe CurationConcerns::ImageWorksController, type: :controller do
       let(:work) { FactoryGirl.create(:image_work, user: user) }
       it 'creates an image work' do
         allow(controller).to receive(:curation_concern).and_return(work)
-        post :create, image_work: { title: ['a title'] }
+        post :create, params: { image_work: { title: ['a title'] } }
         expect(response).to redirect_to main_app.curation_concerns_image_work_path(work)
       end
     end

data/spec/controllers/raster_works_controller_spec.rb

@@ -17,7 +17,7 @@ describe CurationConcerns::RasterWorksController, type: :controller do
         image.save
         raster.update_index
 
-        get :show, id: raster.id
+        get :show, params: { id: raster.id }
         expect(response).to be_success
       end
     end

data/spec/controllers/vector_works_controller_spec.rb

@@ -17,7 +17,7 @@ describe CurationConcerns::VectorWorksController, type: :controller do
         raster.save
         vector.update_index
 
-        get :show, id: vector.id
+        get :show, params: { id: vector.id }
         expect(response).to be_success
       end
     end
@@ -44,7 +44,7 @@ describe CurationConcerns::VectorWorksController, type: :controller do
       end
 
       it 'renders the document' do
-        get :geoblacklight, id: vector_work.id, format: :json
+        get :geoblacklight, params: { id: vector_work.id, format: :json }
         expect(response).to be_success
       end
     end
@@ -55,7 +55,7 @@ describe CurationConcerns::VectorWorksController, type: :controller do
       end
 
       it 'returns an error message with a 404 status' do
-        get :geoblacklight, id: vector_work.id, format: :json
+        get :geoblacklight, params: { id: vector_work.id, format: :json }
         expect(response.body).to include('problem')
         expect(response.status).to eq(404)
       end

data/spec/features/create_raster_work_spec.rb

@@ -6,7 +6,7 @@ RSpec.feature 'RasterWorkController', type: :feature do
 
   context "an authorized user" do
     before do
-      expect(CharacterizeJob).to receive(:perform_later)
+      allow(CharacterizeJob).to receive(:perform_later)
       sign_in user
     end
 
@@ -46,9 +46,7 @@ RSpec.feature 'RasterWorkController', type: :feature do
       click_button 'Attach to Vector Work'
 
       expect(page).to have_text 'zipcodes_fgdc.xml'
-
-      click_link 'Download'
-      expect(page).to have_text '7F6FAACA-6BBB-4199-BDC5-51D038E4431C'
+      expect(page).to have_selector(:link_or_button, 'Download')
     end
   end
 end

data/spec/forms/geo_concerns/raster_work_form_spec.rb

@@ -9,7 +9,9 @@ describe GeoConcerns::RasterWorkForm do
 
   describe '.model_attributes' do
     subject { described_class.model_attributes(raw_attributes) }
-    it { is_expected.to include('coverage' => coverage.to_s) }
-    it { is_expected.to include('cartographic_projection' => 'urn:ogc:def:crs:EPSG:6.3:26986') }
+    it 'has the correct attributes' do
+      expect(subject['coverage']).to eq coverage.to_s
+      expect(subject['cartographic_projection']).to eq 'urn:ogc:def:crs:EPSG:6.3:26986'
+    end
   end
 end

data/spec/forms/geo_concerns/vector_work_form_spec.rb

@@ -9,7 +9,9 @@ describe GeoConcerns::VectorWorkForm do
 
   describe '.model_attributes' do
     subject { described_class.model_attributes(raw_attributes) }
-    it { is_expected.to include('coverage' => coverage.to_s) }
-    it { is_expected.to include('cartographic_projection' => 'urn:ogc:def:crs:EPSG:6.3:26986') }
+    it 'has the correct attributes' do
+      expect(subject['coverage']).to eq coverage.to_s
+      expect(subject['cartographic_projection']).to eq 'urn:ogc:def:crs:EPSG:6.3:26986'
+    end
   end
 end

data/spec/helpers/bounding_box_helper_spec.rb

@@ -26,6 +26,11 @@ describe GeoConcerns::BoundingBoxHelper do
     end
   end
 
+  describe '#bbox_display_inputs' do
+    subject { helper.bbox_display_inputs }
+    it { is_expected.to include('North', 'East', 'South', 'West') }
+  end
+
   describe '#base_input_id' do
     it 'returns the id of the bounding box input element' do
       expect(helper.bbox_input_id(property)).to eq('vector_work_coverage')

data/spec/models/image_file_spec.rb

@@ -21,7 +21,7 @@ describe FileSet do
     let(:work) { FactoryGirl.create(:image_work_with_one_file) }
     subject { work.file_sets.first.reload }
     it 'belongs to image work' do
-      expect(subject.image_work).to eq [work]
+      expect(subject.image_work).to match_array [work]
     end
   end
 

data/spec/models/image_work_spec.rb

@@ -29,8 +29,8 @@ describe ImageWork do
       subject.members << raster1
       subject.members << raster2
       expect(subject.image_file).to eq image_file1
-      expect(subject.metadata_files).to eq [ext_metadata_file1, ext_metadata_file2]
-      expect(subject.raster_works).to eq [raster1, raster2]
+      expect(subject.metadata_files).to match_array [ext_metadata_file1, ext_metadata_file2]
+      expect(subject.raster_works).to match_array [raster1, raster2]
     end
     it 'defines what type of object it is' do
       expect(subject.image_work?).to be_truthy

data/spec/models/raster_file_spec.rb

@@ -17,7 +17,7 @@ describe FileSet do
     let(:work) { FactoryGirl.create(:raster_work_with_one_file) }
     subject { work.file_sets.first.reload }
     it 'belongs to raster work' do
-      expect(subject.raster_work).to eq [work]
+      expect(subject.raster_work).to match_array [work]
     end
   end
 

data/spec/models/raster_work_spec.rb

@@ -39,9 +39,9 @@ describe RasterWork do
       subject.members << ext_metadata_file2
       subject.members << vector1
       subject.members << vector2
-      expect(subject.raster_files).to eq [raster_file1, raster_file2]
-      expect(subject.metadata_files).to eq [ext_metadata_file1, ext_metadata_file2]
-      expect(subject.vector_works).to eq [vector1, vector2]
+      expect(subject.raster_files).to match_array [raster_file1, raster_file2]
+      expect(subject.metadata_files).to match_array [ext_metadata_file1, ext_metadata_file2]
+      expect(subject.vector_works).to match_array [vector1, vector2]
     end
     it 'defines what type of object it is' do
       expect(subject.raster_work?).to be_truthy

data/spec/models/solr_document_spec.rb

@@ -6,13 +6,13 @@ describe SolrDocument do
   describe "spatial" do
     let(:attributes) { { Solrizer.solr_name('spatial') => ['one', 'two'] } }
     subject { document.spatial }
-    it { is_expected.to eq ['one', 'two'] }
+    it { is_expected.to match_array ['one', 'two'] }
   end
 
   describe "temporal" do
     let(:attributes) { { Solrizer.solr_name('temporal') => ['one', 'two'] } }
     subject { document.temporal }
-    it { is_expected.to eq ['one', 'two'] }
+    it { is_expected.to match_array ['one', 'two'] }
   end
 
   describe "issued" do

data/spec/models/vector_file_spec.rb

@@ -17,7 +17,7 @@ describe FileSet do
     let(:work) { FactoryGirl.create(:vector_work_with_one_file) }
     subject { work.file_sets.first.reload }
     it 'belongs to vector work' do
-      expect(subject.vector_work).to eq [work]
+      expect(subject.vector_work).to match_array [work]
     end
   end
 

data/spec/models/vector_work_spec.rb

@@ -15,8 +15,8 @@ describe VectorWork do
       subject.members << vector_file2
       subject.members << ext_metadata_file1
       subject.members << ext_metadata_file2
-      expect(subject.vector_files).to eq [vector_file1, vector_file2]
-      expect(subject.metadata_files).to eq [ext_metadata_file1, ext_metadata_file2]
+      expect(subject.vector_files).to match_array [vector_file1, vector_file2]
+      expect(subject.metadata_files).to match_array [ext_metadata_file1, ext_metadata_file2]
     end
 
     it 'defines what type of object it is' do

data/spec/processors/geo_concerns/processors/ogr_spec.rb

@@ -28,7 +28,7 @@ describe GeoConcerns::Processors::BaseGeoProcessor do
   describe '#reproject' do
     it 'executes a reproject command' do
       command = "env SHAPE_ENCODING= ogr2ogr -q -nln  -f 'ESRI Shapefile' "\
-                  "-t_srs EPSG:4326 'output/geo.png' 'files/geo.zip'"
+                  "-t_srs EPSG:4326 -preserve_fid 'output/geo.png' 'files/geo.zip'"
       expect(subject.class).to receive(:execute).with command
       subject.class.reproject(file_name, output_file, options)
     end

data/spec/renderers/geo_concerns/coverage_renderer_spec.rb

@@ -11,7 +11,7 @@ describe GeoConcerns::CoverageRenderer do
 
   it 'includes a map' do
     expect(subject).to include "<div id='bbox'"
-    expect(subject).to include "<script>boundingBoxSelector"
+    expect(subject).to include "boundingBoxSelector"
   end
 
   it 'includes a toggle button' do

data/spec/services/derivative_path_spec.rb

@@ -1,12 +1,12 @@
 require 'spec_helper'
 
 describe GeoConcerns::DerivativePath do
-  describe '#extension_for' do
+  describe '#extension' do
     it 'returns the appropriate file extension for a geo derivative' do
-      expect(described_class.extension_for('thumbnail')).to eq('.jpeg')
-      expect(described_class.extension_for('display_raster')).to eq('.tif')
-      expect(described_class.extension_for('display_vector')).to eq('.zip')
-      expect(described_class.extension_for('simplified')).to eq('.simplified')
+      expect(described_class.extension('thumbnail')).to eq('.jpeg')
+      expect(described_class.extension('display_raster')).to eq('.tif')
+      expect(described_class.extension('display_vector')).to eq('.zip')
+      expect(described_class.extension('simplified')).to eq('.simplified')
     end
   end
 end

data/spec/spec_helper.rb

@@ -31,4 +31,26 @@ RSpec.configure do |config|
     mocks.verify_partial_doubles = true
   end
   config.fixture_path = File.expand_path("../fixtures", __FILE__)
+
+  config.include FactoryGirl::Syntax::Methods
+  if defined? Devise::Test::ControllerHelpers
+    config.include Devise::Test::ControllerHelpers, type: :controller
+    config.include Devise::Test::ControllerHelpers, type: :view
+  else
+    config.include Devise::TestHelpers, type: :controller
+    config.include Devise::TestHelpers, type: :view
+  end
+
+  config.include TestViewHelpers, type: :view
+
+  config.include(ControllerLevelHelpers, type: :helper)
+  config.before(:each, type: :helper) { initialize_controller_helpers(helper) }
+
+  config.include(ControllerLevelHelpers, type: :view)
+  config.before(:each, type: :view) { initialize_controller_helpers(view) }
+
+  config.include BackportTest, type: :controller unless Rails.version > '5'
+  config.include Controllers::EngineHelpers, type: :controller
+  config.include Controllers::EngineHelpers, type: :helper
+  config.include ::Rails.application.routes.url_helpers
 end

data/spec/support/backport_test.rb

@@ -0,0 +1,14 @@
+# Backport the Rails 5 controller test methods to Rails 4
+module BackportTest
+  [:delete, :get, :post, :put, :patch].each do |http_action|
+    define_method(http_action) do |*args|
+      (action, rest) = *args
+      rest ||= {}
+      if rest[:xhr]
+        @request.env['HTTP_X_REQUESTED_WITH'] = 'XMLHttpRequest'
+        @request.env['HTTP_ACCEPT'] ||= [Mime::JS, Mime::HTML, Mime::XML, 'text/xml', Mime::ALL].join(', ')
+      end
+      super(action, rest[:params])
+    end
+  end
+end

data/spec/support/helpers/controller_level_helpers.rb

@@ -0,0 +1,27 @@
+module ControllerLevelHelpers
+  extend ActiveSupport::Concern
+  # def search_state
+  #   @search_state ||= Blacklight::SearchState.new(params, blacklight_config)
+  # end
+
+  # def blacklight_configuration_context
+  #   @blacklight_configuration_context ||= Blacklight::Configuration::Context.new(controller)
+  # end
+  #
+  included do
+    # fix for anonymous controllers (https://github.com/rspec/rspec-rails/issues/1321#issuecomment-239157093)
+    before { allow(controller).to receive(:_routes).and_return(Rails.application.routes) }
+  end
+
+  def initialize_controller_helpers(helper)
+    helper.extend ControllerLevelHelpers
+    initialize_routing_helpers(helper)
+  end
+
+  def initialize_routing_helpers(helper)
+    return unless Rails::VERSION::MAJOR >= 5
+
+    helper.class.include ::Rails.application.routes.url_helpers
+    helper.class.include ::Rails.application.routes.mounted_helpers if ::Rails.application.routes.respond_to?(:mounted_helpers)
+  end
+end

data/spec/support/views/test_view_helpers.rb

@@ -0,0 +1,10 @@
+module TestViewHelpers
+  extend ActiveSupport::Concern
+
+  included do
+    before do
+      view.send(:extend, CurationConcerns::MainAppHelpers)
+      view.send(:extend, CatalogHelper)
+    end
+  end
+end

data/tasks/geo_concerns.rake

@@ -0,0 +1,39 @@
+require 'solr_wrapper'
+require 'fcrepo_wrapper'
+
+namespace :geo_concerns do
+  desc 'Run style checker'
+  RuboCop::RakeTask.new(:rubocop) do |task|
+    task.requires << 'rubocop-rspec'
+    task.fail_on_error = true
+  end
+
+  RSpec::Core::RakeTask.new(:rspec)
+
+  desc 'Run test suite'
+  task :spec do
+    with_server 'test' do
+      Rake::Task['geo_concerns:rspec'].invoke
+    end
+  end
+  desc "Run development servers for Geo Concerns"
+  task :dev_servers do
+    with_server 'development' do
+      begin
+        sleep
+      rescue Interrupt
+        puts "Shutting down..."
+      end
+    end
+  end
+  desc "Run test servers for Geo Concerns"
+  task :test_servers do
+    with_server 'test' do
+      begin
+        sleep
+      rescue Interrupt
+        puts "Shutting down..."
+      end
+    end
+  end
+end

data/template.rb

@@ -1,5 +1,5 @@
-gem 'curation_concerns', '1.0.0.beta7'
-gem 'geo_concerns', '0.0.6'
+gem 'curation_concerns', '1.5.0'
+gem 'geo_concerns', '0.0.7'
 
 run 'bundle install'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geo_concerns
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - James Griffin
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-06 00:00:00.000000000 Z
+date: 2016-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curation_concerns
@@ -20,14 +20,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta7
+        version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta7
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: leaflet-rails
   requirement: !ruby/object:Gem::Requirement
@@ -48,14 +48,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.9
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.9
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: json-schema
   requirement: !ruby/object:Gem::Requirement
@@ -84,6 +84,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: devise
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -104,28 +124,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: solr_wrapper
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: 0.13.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: 0.13.1
 - !ruby/object:Gem::Dependency
   name: fcrepo_wrapper
   requirement: !ruby/object:Gem::Requirement
@@ -235,8 +255,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".fcrepo_wrapper"
 - ".gitignore"
 - ".rubocop.yml"
+- ".solr_wrapper"
 - ".travis.yml"
 - Gemfile
 - LICENSE
@@ -490,17 +512,18 @@ files:
 - spec/services/geo_concerns/discovery/geoblacklight_document_spec.rb
 - spec/services/raster_format_service_spec.rb
 - spec/spec_helper.rb
+- spec/support/backport_test.rb
 - spec/support/controllers/engine_helpers.rb
 - spec/support/database_cleaner.rb
-- spec/support/devise.rb
-- spec/support/devise_helpers.rb
 - spec/support/factory_girl.rb
 - spec/support/features.rb
 - spec/support/features/session_helpers.rb
 - spec/support/fixture_reader.rb
+- spec/support/helpers/controller_level_helpers.rb
+- spec/support/views/test_view_helpers.rb
 - spec/test_app_templates/lib/generators/test_app_generator.rb
 - spec/values/coverage_spec.rb
-- tasks/ci.rake
+- tasks/geo_concerns.rake
 - template.rb
 homepage: https://github.com/projecthydra-labs/geo_concerns
 licenses:
@@ -514,7 +537,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -522,7 +545,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: Rails engine for Hydra Geo models. Built around Curation Concerns engine.
@@ -589,13 +612,14 @@ test_files:
 - spec/services/geo_concerns/discovery/geoblacklight_document_spec.rb
 - spec/services/raster_format_service_spec.rb
 - spec/spec_helper.rb
+- spec/support/backport_test.rb
 - spec/support/controllers/engine_helpers.rb
 - spec/support/database_cleaner.rb
-- spec/support/devise.rb
-- spec/support/devise_helpers.rb
 - spec/support/factory_girl.rb
 - spec/support/features.rb
 - spec/support/features/session_helpers.rb
 - spec/support/fixture_reader.rb
+- spec/support/helpers/controller_level_helpers.rb
+- spec/support/views/test_view_helpers.rb
 - spec/test_app_templates/lib/generators/test_app_generator.rb
 - spec/values/coverage_spec.rb

data/spec/support/devise.rb

@@ -1,10 +0,0 @@
-require 'devise'
-
-RSpec.configure do |config|
-  config.include Devise::TestHelpers, type: :controller
-  config.include Devise::TestHelpers, type: :controller
-  config.include Devise::TestHelpers, type: :view
-  config.include Warden::Test::Helpers, type: :feature
-  config.include Controllers::EngineHelpers, type: :controller
-  config.include Rails.application.routes.url_helpers, type: :routing
-end

data/spec/support/devise_helpers.rb

@@ -1,6 +0,0 @@
-RSpec.configure do |config|
-  config.include Devise::TestHelpers, type: :controller
-  config.include Devise::TestHelpers, type: :view
-  config.include Warden::Test::Helpers, type: :feature
-  config.after(:each, type: :feature) { Warden.test_reset! }
-end

data/tasks/ci.rake

@@ -1,49 +0,0 @@
-require 'solr_wrapper'
-require 'fcrepo_wrapper'
-task ci: ['engine_cart:generate'] do
-  # TODO: set port to nil (random port)
-  solr_params = { port: '8985', verbose: true, managed: true }
-  fcrepo_params = { port: '8986', verbose: true, managed: true }
-  SolrWrapper.wrap(solr_params) do |solr|
-    ENV['SOLR_TEST_PORT'] = solr.port
-    solr.with_collection(name: 'hydra-test', dir: File.join(File.expand_path('.', File.dirname(__FILE__)), '..', 'solr', 'config')) do
-      FcrepoWrapper.wrap(fcrepo_params) do |fcrepo|
-        ENV['FCREPO_TEST_PORT'] = fcrepo.port
-        Rake::Task['spec'].invoke
-      end
-    end
-  end
-end
-
-namespace :geo_concerns do
-  desc "Run development servers for Geo Concerns"
-  task :dev_servers do
-    solr_params = { port: '8983', verbose: true, managed: true }
-    fcrepo_params = { port: '8984', verbose: true, managed: true }
-    SolrWrapper.wrap(solr_params) do |solr|
-      ENV['SOLR_TEST_PORT'] = solr.port
-      solr.with_collection(name: 'hydra-development', dir: File.join(File.expand_path('.', File.dirname(__FILE__)), '..', 'solr', 'config')) do
-        FcrepoWrapper.wrap(fcrepo_params) do |fcrepo|
-          ENV['FCREPO_TEST_PORT'] = fcrepo.port
-          while true do
-          end
-        end
-      end
-    end
-  end
-  desc "Run test servers for Geo Concerns"
-  task :test_servers do
-    solr_params = { port: '8985', verbose: true, managed: true }
-    fcrepo_params = { port: '8986', verbose: true, managed: true }
-    SolrWrapper.wrap(solr_params) do |solr|
-      ENV['SOLR_TEST_PORT'] = solr.port
-      solr.with_collection(name: 'hydra-test', dir: File.join(File.expand_path('.', File.dirname(__FILE__)), '..', 'solr', 'config')) do
-        FcrepoWrapper.wrap(fcrepo_params) do |fcrepo|
-          ENV['FCREPO_TEST_PORT'] = fcrepo.port
-          while true do
-          end
-        end
-      end
-    end
-  end
-end