geo_concerns 0.0.7 → 0.0.8

data/app/views/curation_concerns/image_works/show.html.erb

@@ -16,9 +16,5 @@
 
 <%= render 'geo_concerns/representative_media', presenter: @presenter %>
 <%= render 'geo_concerns/attributes', presenter: @presenter %>
-
-<%= render 'geo_concerns/related_geo_files', presenter: @presenter %>
-<%= render 'geo_concerns/related_external_metadata_files', presenter: @presenter %>
-<%= render 'geo_concerns/related_geo_works', presenter: @presenter %>
-
+<%= render 'geo_concerns/related', presenter: @presenter %>
 <%= render "show_actions", collector: collector, editor: editor%>

data/app/views/curation_concerns/raster_works/_show_actions.html.erb

@@ -6,20 +6,6 @@
     <% end %>
     <% if editor %>
       <%= link_to "Edit This #{@presenter.human_readable_type}", edit_polymorphic_path([main_app, @presenter]), class: 'btn btn-default' %>
-      <% if @presenter.valid_child_concerns.length > 0 %>
-        <div class="btn-group">
-          <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-            Attach Child <span class="caret"></span>
-          </button>
-          <ul class="dropdown-menu">
-            <% @presenter.valid_child_concerns.each do |concern| %>
-              <li>
-                <%= link_to "Attach #{concern.human_readable_type}", polymorphic_path([main_app, :new, :curation_concerns, :parent, concern.model_name.singular], parent_id: @presenter.id) %>
-              </li>
-            <% end %>
-          </ul>
-        </div>
-      <% end %>
       <%= render 'raster_actions', document: @presenter %>
       <%= link_to "Delete This #{@presenter.human_readable_type}", [main_app, @presenter], class: 'btn btn-danger pull-right', data: { confirm: "Delete this #{@presenter.human_readable_type}?" }, method: :delete %>
     <% end %>

data/app/views/curation_concerns/raster_works/show.html.erb

@@ -16,9 +16,5 @@
 
 <%= render 'geo_concerns/representative_media', presenter: @presenter %>
 <%= render 'geo_concerns/attributes', presenter: @presenter %>
-
-<%= render 'geo_concerns/related_geo_files', presenter: @presenter %>
-<%= render 'geo_concerns/related_external_metadata_files', presenter: @presenter %>
-<%= render 'geo_concerns/related_geo_works', presenter: @presenter %>
-
+<%= render 'geo_concerns/related', presenter: @presenter %>
 <%= render "show_actions", collector: collector, editor: editor%>

data/app/views/curation_concerns/vector_works/show.html.erb

@@ -16,9 +16,5 @@
 
 <%= render 'geo_concerns/representative_media', presenter: @presenter %>
 <%= render 'geo_concerns/attributes', presenter: @presenter %>
-
-<%= render 'geo_concerns/related_geo_files', presenter: @presenter %>
-<%= render 'geo_concerns/related_external_metadata_files', presenter: @presenter %>
-<%= render 'geo_concerns/related_geo_works', presenter: @presenter %>
-
+<%= render 'geo_concerns/related', presenter: @presenter %>
 <%= render "show_actions", collector: collector, editor: editor%>

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

@@ -1,11 +1,11 @@
 <fieldset class="optional prompt">
   <legend>Additional Information</legend>
-  <%= f.input :subject,   as: :multi_value, input_html: { class: 'form-control' } %>
-  <%= f.input :publisher, as: :multi_value, input_html: { class: 'form-control' } %>
-  <%= f.input :source,    as: :multi_value, input_html: { class: 'form-control' } %>
-  <%= f.input :language,  as: :multi_value, input_html: { class: 'form-control' } %>
-  <%= f.input :spatial,   as: :multi_value, input_html: { class: 'form-control' } %>
-  <%= f.input :temporal,  as: :multi_value, input_html: { class: 'form-control' } %>
-  <%= f.input :issued,     input_html: { class: 'form-control' } %>
-  <%= f.input :provenance, input_html: { class: 'form-control' } %>
+  <%= f.input :contributor, as: :multi_value, input_html: { class: 'form-control' } %>
+  <%= f.input :subject,     as: :multi_value, input_html: { class: 'form-control' } %>
+  <%= f.input :publisher,   as: :multi_value, input_html: { class: 'form-control' } %>
+  <%= f.input :source,      as: :multi_value, input_html: { class: 'form-control' } %>
+  <%= f.input :language,    as: :multi_value, input_html: { class: 'form-control' } %>
+  <%= f.input :spatial,     as: :multi_value, input_html: { class: 'form-control' } %>
+  <%= f.input :temporal,    as: :multi_value, input_html: { class: 'form-control' } %>
+  <%= f.input :issued,                        input_html: { class: 'form-control' } %>
 </fieldset>

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

@@ -2,7 +2,7 @@
   <div class="col-md-12">
     <fieldset id="set-populate-metadata">
       <legend>Automatically Populate Metadata</legend>
-      <%= f.input :should_populate_metadata, as: :select, input_html: { class: 'form-control' }, label: 'Populate Metadata from External Metadata File', selected: false %>
+      <%= f.input :should_populate_metadata, as: :select, input_html: { class: 'form-control' }, label: 'Populate Metadata from External Metadata File', selected: false, include_blank: true, label_method: lambda { |x| x.label }, collection: external_metadata_file_presenters %>
     </fieldset>
   </div>
 </div>

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

@@ -5,8 +5,6 @@
 
   <%= f.input :creator, as: :multi_value %>
 
-  <%= f.input :contributor, as: :multi_value, input_html: { class: 'form-control' } %>
-
   <%= f.input :description, as: :multi_value, input_html: { rows: '14', type: 'textarea'} %>
 
 </fieldset>

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

@@ -0,0 +1,4 @@
+<%= render 'geo_concerns/related/geo_files', presenter: @presenter %>
+<%= render 'geo_concerns/related/external_metadata_files', presenter: @presenter %>
+<%= render 'geo_concerns/related/child_works', presenter: @presenter %>
+<%= render 'geo_concerns/related/parent_works', presenter: @presenter %>

data/app/views/geo_concerns/file_sets/actions/_image_actions.html.erb

@@ -15,7 +15,7 @@
     <button class="btn btn-default btn-small dropdown-toggle" data-toggle="dropdown" href="#">   Download <span class="caret"></span></button>
     <ul class="dropdown-menu">
       <li>
-        <%= link_to "File", main_app.download_path(file_set) %>
+        <%= link_to "File", main_app.download_path(file_set), target: '_blank' %>
       </li>
     </ul>
   </div>

data/app/views/geo_concerns/file_sets/actions/_raster_actions.html.erb

@@ -15,10 +15,10 @@
     <button class="btn btn-default btn-small dropdown-toggle" data-toggle="dropdown" href="#">   Download <span class="caret"></span></button>
     <ul class="dropdown-menu">
       <li>
-        <%= link_to "File", main_app.download_path(file_set) %>
+        <%= link_to "File", main_app.download_path(file_set), target: '_blank' %>
       </li>
       <li>
-        <%= link_to "Display Raster",main_app.download_path(file_set, file: 'display_raster') %>
+        <%= link_to "Display Raster", main_app.download_path(file_set, file: 'display_raster'), target: '_blank' %>
       </li>
     </ul>
   </div>

data/app/views/geo_concerns/file_sets/actions/_vector_actions.html.erb

@@ -15,10 +15,10 @@
     <button class="btn btn-default btn-small dropdown-toggle" data-toggle="dropdown" href="#">   Download <span class="caret"></span></button>
     <ul class="dropdown-menu">
       <li>
-        <%= link_to "File", main_app.download_path(file_set) %>
+        <%= link_to "File", main_app.download_path(file_set), target: '_blank' %>
       </li>
       <li>
-        <%= link_to "Display Vector",main_app.download_path(file_set, file: 'display_vector') %>
+        <%= link_to "Display Vector",main_app.download_path(file_set, file: 'display_vector'), target: '_blank' %>
       </li>
     </ul>
   </div>

data/app/views/geo_concerns/related/_child_member.html.erb

@@ -0,0 +1,13 @@
+<tr class="attributes" data-work-id="<%= child_member.id %>">
+  <td class="thumbnail" style="margin-bottom: 0px">
+    <%= render_thumbnail_tag child_member %>
+  </td>
+  <td>
+    <%= link_to child_member.title.first, contextual_path(child_member, @presenter) %>
+  </td>
+   <td>
+    <% if can?(:edit, child_member.id) %>
+      <a class="btn btn-danger btn-remove-row">Remove</a>
+    <% end %>
+   </td>
+</tr>

data/app/views/geo_concerns/related/_child_works.html.erb

@@ -0,0 +1,24 @@
+<% if child_geo_works_type(presenter) %>
+  <div class="panel panel-default" id="child-works">
+    <div class="panel-heading">
+      <h2>Child Works</h2>
+    </div>
+    <table class="table table-striped" data-query-url="<%= polymorphic_path([main_app, :curation_concerns, presenter.model_name.singular], id: @presenter.id) %>" data-members="<%= @presenter.member_presenters.map(&:id) %>" data-param-key="<%= @presenter.model_name.param_key %>">
+      <thead>
+        <% if presenter.work_presenters.present? %>
+          <tr>
+            <th class="col-xs-3"></th>
+            <th>Work Name</th>
+            <th>Actions</th>
+          </tr>
+        <% end %>
+      </thead>
+      <tbody>
+        <% if presenter.work_presenters.present? %>
+          <%= render partial: 'geo_concerns/related/child_member', collection: @presenter.work_presenters %>
+        <% end %>
+      </tbody>
+    </table>
+    <%= render partial: 'geo_concerns/related/new_child_member' %>
+  </div>
+<% end %>

data/app/views/geo_concerns/related/_external_metadata_file_member.html.erb

@@ -0,0 +1,8 @@
+<tr class="<%= dom_class(external_metadata_file_member) %> attributes">
+  <td class="attribute filename"><%= link_to(external_metadata_file_member.link_name, main_app.curation_concerns_file_set_path(external_metadata_file_member)) %></td>
+  <td class="attribute date_uploaded"><%= external_metadata_file_member.date_uploaded %></td>
+  <td class="attribute permission"><%= external_metadata_file_member.permission_badge %></td>
+  <td>
+    <%= file_set_actions(external_metadata_file_member) %>
+  </td>
+</tr>

data/app/views/geo_concerns/{_related_external_metadata_files.html.erb → related/_external_metadata_files.html.erb}

@@ -6,7 +6,6 @@
   <table class="table table-striped">
     <thead>
       <tr>
-        <th>File</th>
         <th>Filename</th>
         <th>Date Uploaded</th>
         <th>Visibility</th>
@@ -14,7 +13,7 @@
       </tr>
     </thead>
     <tbody>
-      <%= render partial: 'geo_concerns/member', collection: presenter.external_metadata_file_set_presenters %>
+      <%= render partial: 'geo_concerns/related/external_metadata_file_member', collection: presenter.external_metadata_file_set_presenters %>
     </tbody>
   </table>
 </div>

data/app/views/geo_concerns/related/_new_child_member.html.erb

@@ -0,0 +1,22 @@
+<% if can? :edit, @presenter.id %>
+  <% if @presenter.valid_child_concerns.length > 0 %>
+    <div class="row member-actions">
+      <div class="col-sm-5">
+        <div class="input-group">
+          <input class="related_works_ids work_child_members_ids form-control" id="work_child_members_ids"  value="" aria-labelledby="work_child_members_ids_label" type="text" placeholder="Existing child id...">
+          <span class="input-group-btn">
+            <a class="btn btn-primary btn-add-row">Attach</a>
+          </span>
+        </div>
+        <div class="message has-warning hidden"></div>
+      </div>
+      <div class="col-sm-7">
+        <div class="btn-group">
+          <% @presenter.valid_child_concerns.each do |concern| %>
+            <%= link_to "Attach New #{concern.human_readable_type}", polymorphic_path([main_app, :new, :curation_concerns, :parent, concern.model_name.singular], parent_id: @presenter.id), class: 'btn btn-default' %>
+          <% end %>
+        </div>
+      </div>
+    </div>
+  <% end %>
+<% end %>

data/app/views/geo_concerns/related/_new_parent_member.html.erb

@@ -0,0 +1,13 @@
+<% if can? :edit, @presenter.id %>
+  <div class="row member-actions">
+    <div class="col-sm-5">
+      <div class="input-group">
+        <input class="related_works_ids work_parent_members_ids form-control" id="work_parent_members_ids"  value="" aria-labelledby="work_parent_members_ids_label" type="text" placeholder="Existing parent id...">
+        <span class="input-group-btn">
+          <a class="btn btn-primary btn-add-row">Attach</a>
+        </span>
+      </div>
+      <div class="message has-warning hidden"></div>
+    </div>
+  </div>
+<% end %>

data/app/views/geo_concerns/related/_parent_member.html.erb

@@ -0,0 +1,13 @@
+<tr class="attributes" data-work-id="<%= parent_member.id %>">
+  <td class="thumbnail" style="margin-bottom: 0px">
+    <%= render_thumbnail_tag parent_member.solr_document %>
+  </td>
+  <td>
+    <%= link_to parent_member.title.first, polymorphic_path([main_app, parent_member]) %>
+  </td>
+   <td>
+    <% if can?(:edit, parent_member.id) %>
+      <a class="btn btn-danger btn-remove-row">Remove</a>
+    <% end %>
+   </td>
+</tr>

data/app/views/geo_concerns/related/_parent_works.html.erb

@@ -0,0 +1,22 @@
+<div class="panel panel-default" id="parent-works">
+  <div class="panel-heading">
+    <h2>Parent Works</h2>
+  </div>
+  <table class="table table-striped" data-query-url="<%= polymorphic_path([main_app, :curation_concerns, presenter.model_name.singular], id: @presenter.id) %>" data-members="<%= @presenter.parent_work_presenters.map(&:id) %>" data-param-key="<%= @presenter.model_name.param_key %>">
+    <thead>
+      <% if presenter.parent_work_presenters.present? %>
+        <tr>
+          <th class="col-xs-3"></th>
+          <th>Work Name</th>
+          <th>Actions</th>
+        </tr>
+      <% end %>
+    </thead>
+    <tbody>
+      <% if presenter.parent_work_presenters.present? %>
+        <%= render partial: 'geo_concerns/related/parent_member', collection: @presenter.parent_work_presenters %>
+      <% end %>
+    </tbody>
+  </table>
+  <%= render partial: 'geo_concerns/related/new_parent_member' %>
+</div>

data/geo_concerns.gemspec

@@ -22,15 +22,18 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'curation_concerns', '1.5.0'
   spec.add_dependency 'leaflet-rails', '~> 0.7'
-  spec.add_dependency 'simple_mapnik', '0.1.0'
-  spec.add_dependency 'json-schema'
+  spec.add_dependency 'simple_mapnik', '0.1.2'
+  spec.add_dependency 'json-schema', '>= 2.6.2'
+  spec.add_dependency 'rgeoserver', '>= 0.9.1'
+
+  spec.add_dependency 'bundler', '~> 1.12.5' # TODO: 1.13 breaks our builds
 
   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.10'
-  spec.add_development_dependency 'solr_wrapper', '>= 0.13.1'
-  spec.add_development_dependency 'fcrepo_wrapper', '~> 0.1'
+  spec.add_development_dependency 'rspec-rails', '>= 3.5.2'
+  spec.add_development_dependency 'engine_cart', '~> 1.0', '>= 1.0.0'
+  spec.add_development_dependency 'solr_wrapper', '~> 0.18', '>= 0.18.0'
+  spec.add_development_dependency 'fcrepo_wrapper', '~> 0.6', '>= 0.6.0'
   spec.add_development_dependency 'pry-byebug'
   spec.add_development_dependency 'database_cleaner', '< 1.1.0'
   spec.add_development_dependency 'rubocop', '~> 0.39'

data/lib/generators/geo_concerns/install_generator.rb

@@ -84,16 +84,11 @@ module GeoConcerns
       copy_file file_path, file_path
     end
 
-    def install_discovery_config
-      file_path = "config/discovery/geoblacklight_schema.json"
+    def install_geoserver_config
+      file_path = 'config/geoserver.yml'
       copy_file file_path, file_path
     end
 
-    def override_characterize_job
-      file_path = 'app/jobs/characterize_job.rb'
-      copy_file 'jobs/characterize_job.rb', file_path
-    end
-
     def inject_into_file_set
       file_path = 'app/models/file_set.rb'
       if File.exist?(file_path)
@@ -136,10 +131,17 @@ module GeoConcerns
       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"
+        "//= require geo_concerns\n" \
+        "//= require curation_concerns\n" \
+        "// Require es6 modules after almond is loaded in curation concerns.\n" \
+        "//= require geo_concerns/es6-modules\n"
       end
     end
 
+    def install_locale_config
+      copy_file 'config/locales/geo_concerns.en.yml'
+    end
+
     private
 
       def install_work

data/lib/generators/geo_concerns/templates/config/geoserver.yml

@@ -0,0 +1,17 @@
+geoserver:
+  # Set to the REST API for the GeoServer
+  url: "http://localhost:8181/geoserver/rest"
+  # Optional user/password, set to false to disable
+  user: "admin"
+  password: "geoserver"
+  # Set to your GWC server, or "builtin" for the one bundled with GeoServer
+  geowebcache_url: "builtin"
+
+  # RestClient:
+  restclient:
+    # Set to false to disable or stdout/stderr or 'filename.out'
+    logfile: stderr
+    # Timeout (in seconds)
+    timeout: 300
+    # Open Timeout (in seconds)
+    open_timeout: 60

data/lib/generators/geo_concerns/templates/config/locales/geo_concerns.en.yml

@@ -0,0 +1,4 @@
+en:
+  geo_concerns:
+    institution:
+      uri: "https://your-institution"

data/lib/geo_concerns/version.rb

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

data/spec/factories/collections.rb

@@ -0,0 +1,17 @@
+FactoryGirl.define do
+  factory :collection do
+    transient do
+      user { FactoryGirl.create(:user) }
+    end
+
+    title ['Test collection title']
+
+    after(:build) do |collection, evaluator|
+      collection.apply_depositor_metadata(evaluator.user.user_key)
+    end
+
+    trait :public do
+      visibility Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC
+    end
+  end
+end

data/spec/features/create_raster_work_spec.rb

@@ -24,8 +24,11 @@ RSpec.feature 'RasterWorkController', type: :feature do
       expect(page).to have_text 'Open Access'
       expect(page).to have_link 'Attribution 3.0 United States', href: 'http://creativecommons.org/licenses/by/3.0/us/'
 
-      click_button 'Attach Child'
-      click_link 'Attach Vector Work'
+      expect(page).to have_css("input#work_child_members_ids")
+      expect(page).to have_css("input#work_parent_members_ids")
+      expect(page).to have_text 'Attach'
+
+      click_link 'Attach New Vector Work'
       expect(page).not_to have_text 'Add Your Content'
       fill_in 'vector_work_title', with: 'Vector Title'
       fill_in 'vector_work_temporal', with: '1990'

data/spec/forms/geo_concerns/image_work_form_spec.rb

@@ -5,7 +5,7 @@ describe GeoConcerns::ImageWorkForm do
   let(:raw_attributes) { ActionController::Parameters.new(coverage: coverage.to_s) }
 
   describe ".model_attributes" do
-    subject { described_class.model_attributes(raw_attributes) }
-    it { is_expected.to eq('coverage' => coverage.to_s) }
+    subject { described_class.model_attributes(raw_attributes).to_unsafe_h }
+    it { is_expected.to include('coverage' => coverage.to_s) }
   end
 end

data/spec/helpers/geo_concerns/populate_metadata_helper_spec.rb

@@ -0,0 +1,31 @@
+require 'spec_helper'
+
+describe GeoConcerns::GeoWorksHelper do
+  let(:helper) { TestingHelper.new }
+  let(:show_presenter) { instance_double('ShowPresenter', class: GeoConcerns::GeoConcernsShowPresenter) }
+  let(:file_presenter) { instance_double('FilePresenter', class: CurationConcerns::FileSetPresenter) }
+  let(:file_presenters) { [file_presenter] }
+  before do
+    class TestingHelper
+      include GeoConcerns::PopulateMetadataHelper
+
+      def curation_concern
+      end
+    end
+  end
+  after do
+    Object.send(:remove_const, :TestingHelper)
+  end
+
+  describe '#external_metadata_file_presenters' do
+    before do
+      allow(GeoConcerns::GeoConcernsShowPresenter).to receive(:new).and_return(show_presenter)
+    end
+
+    it 'returns an array of external_metadata_file_presenters' do
+      expect(show_presenter).to receive(:external_metadata_file_set_presenters).and_return(file_presenters)
+      expect(helper).to receive(:curation_concern)
+      expect(helper.external_metadata_file_presenters).to eq(file_presenters)
+    end
+  end
+end