geo_concerns 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 255bdd173366bc1acb75b272d840a49da4880844
-  data.tar.gz: 785b290a3b6d94dd1d972b7c7e1e42cbd5e2f2ca
+  metadata.gz: 34af069d1dd402d1592d5e24933df3362ad4bd4d
+  data.tar.gz: c04fb982ce925417ebeddaedbcc5052eb5ea064d
 SHA512:
-  metadata.gz: 69859a3c2e3909cbefc8f48d6acf52c6a781d18163744f2d9d1bb81e688fcdb0fbb782f85b58fcca2c5a8a3edf0ce7afb9e05298b0b126b6228f07a56eda277e
-  data.tar.gz: f205a24f9e51d3dcbd47a1fe803d2d0a530b98f3cd370a9c878ddc5a8045ad723d1043c559037ab8ab83fea06dfbc53acaa5a0b6daf1a03646e1a215baf09e86
+  metadata.gz: 0dc13d96992a96f8d02ba4da85d00884c30e10e4d5c1f81fe507d235219f0d9d5556732212bfea956cc68696c412d9a17e0ca841bf14cc00e2ffab95b9591591
+  data.tar.gz: a33e2ed33523ebb633749a2bfe2056f9bbb8225b3d26c69580c3789044d2cacf332e693ee27a454b386fcbf7ab66c8a218fdfb75d24182803dce8b5fccddb497

data/.eslintrc

@@ -0,0 +1,8 @@
+// Use this file as a starting point for your project's .eslintrc.
+// Copy this file, and add rule overrides as needed.
+{
+  "extends": "airbnb",
+  "env": {
+    "jquery": true
+  }
+}

data/.gitignore

@@ -8,7 +8,6 @@ test/dummy/tmp/
 test/dummy/.sass-cache
 
 .internal_test_app
-fcrepo4-data
+fcrepo4*-data
 Gemfile.lock
 coverage
-fcrepo4-test-data/

data/.rubocop.yml

@@ -32,6 +32,7 @@ Metrics/LineLength:
     - 'app/models/concerns/georeferenced_behavior.rb'
     - 'app/models/solr_document.rb'
     - 'app/schemas/geo_concerns/basic_geo_metadata_required.rb'
+    - 'app/services/geo_concerns/discovery/geoblacklight_document.rb'
     - 'config/**/*.rb'
     - 'app/values/geo_concerns/coverage.rb'
     - 'app/values/geo_concerns/time_period.rb'

data/.travis.yml

@@ -1,27 +1,26 @@
 language: ruby
+cache: bundler
 sudo: true
 rvm:
-  - 2.2.2 # oldest version supported by Rails 5
   - 2.3.1 # latest release
+jdk:
+  - oraclejdk8
 env:
   global:
   - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
   - MAPNIK_VERSION="2.3"
   matrix:
-    - RAILS_VERSION=4.2.7
+    - RAILS_VERSION=4.2.7.1
       RDF_VERSION=1.99.1
-    - RAILS_VERSION=5.0.0
+    - RAILS_VERSION=5.0.0.1
       RDF_VERSION=2.1.0
 before_install:
  - sudo apt-add-repository --yes ppa:mapnik/nightly-${MAPNIK_VERSION}
  - sudo apt-get update -y
-install:
- - sudo apt-get -y install wget build-essential make libmapnik=${MAPNIK_VERSION}* mapnik-utils=${MAPNIK_VERSION}* libmapnik-dev=${MAPNIK_VERSION}* mapnik-input-plugin*=${MAPNIK_VERSION}*
+ - sudo apt-get -y install libmapnik=${MAPNIK_VERSION}* mapnik-utils=${MAPNIK_VERSION}* libmapnik-dev=${MAPNIK_VERSION}* mapnik-input-plugin*=${MAPNIK_VERSION}*
+install: bundle install --jobs=3 --retry=3
 before_script:
-  - jdk_switcher use oraclejdk8
   - gdalinfo --version
-  - gem install bundler -v 1.12.3
-  - bundle install
 services:
   - redis-server
 addons:

data/Gemfile

@@ -13,7 +13,7 @@ group :development, :test do
 end
 
 # BEGIN ENGINE_CART BLOCK
-# engine_cart: 0.10.0
+# engine_cart: 1.0.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__)))
@@ -46,5 +46,3 @@ else
   end
 end
 # END ENGINE_CART BLOCK
-
-gem 'rails-controller-testing' if !ENV['RAILS_VERSION'] || ENV['RAILS_VERSION'] =~ /^5\./

data/README.md

@@ -1,8 +1,9 @@
 # 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)
+[![Build Status](https://img.shields.io/travis/projecthydra-labs/geo_concerns/master.svg)](https://travis-ci.org/projecthydra-labs/geo_concerns)
+[![Coverage Status](https://img.shields.io/coveralls/projecthydra-labs/geo_concerns/master.svg)](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)
+[![Slack Status](http://slack.projecthydra.org/badge.svg)](https://project-hydra.slack.com/messages/geomodeling/)
 
 Rails application for developing Hydra Geo models. Built around Curation Concerns engine.
 

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

@@ -2,4 +2,3 @@
 //= require geo_concerns/leaflet-boundingbox
 //= require geo_concerns/Control.Geocoder
 //= require geo_concerns/bounding_box_selector
-//= require_tree .

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

@@ -8,6 +8,7 @@ function boundingBoxSelector(options) {
 
   if (coverage) {
     initialBounds = coverageToBounds(coverage);
+    updateBboxInputs(initialBounds);
   } else {
     initialBounds = L.latLngBounds([[-50, -100], [72, 100]]);
   };
@@ -18,8 +19,6 @@ function boundingBoxSelector(options) {
     scrollWheelZoom: false
   }).fitBounds(initialBounds);
 
-  updateBboxInputs(initialBounds);
-
   L.tileLayer('https://cartodb-basemaps-{s}.global.ssl.fastly.net/light_all/{z}/{x}/{y}.png', {
     maxZoom: 18
   }).addTo(map);

data/app/assets/javascripts/geo_concerns/es6-modules.js

@@ -0,0 +1,7 @@
+//= require geo_concerns/geo_concerns_boot
+//= require geo_concerns/relationships
+
+Blacklight.onLoad(function() {
+  Initializer = require('geo_concerns/geo_concerns_boot')
+  window.gc = new Initializer()
+})

data/app/assets/javascripts/geo_concerns/geo_concerns_boot.es6

@@ -0,0 +1,8 @@
+import ChildWorks from "geo_concerns/relationships/child_works"
+import ParentWorks from "geo_concerns/relationships/parent_works"
+export default class Initializer {
+  constructor() {
+    this.child_works = new ChildWorks('#child-works')
+    this.parent_works = new ParentWorks('#parent-works')
+  }
+}

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

@@ -0,0 +1,3 @@
+//= require geo_concerns/relationships/related_works
+//= require geo_concerns/relationships/child_works
+//= require geo_concerns/relationships/parent_works

data/app/assets/javascripts/geo_concerns/relationships/child_works.es6

@@ -0,0 +1,20 @@
+import RelatedWorks from 'geo_concerns/relationships/related_works';
+
+/**
+* Provides functionality to add and remove child works.
+*/
+export default class ChildWorks extends RelatedWorks {
+  /**
+  * Builds form data string for ordered_member_ids.
+  * @param {Array} array of ordered member ids
+  */
+  buildFormData(ids) {
+    let data;
+    if (ids.length === 0) {
+      data = `${this.paramKey}[ordered_member_ids][]=`;
+    } else {
+      data = ids.map((id) => `${this.paramKey}[ordered_member_ids][]=${id}`).join('&');
+    }
+    return data;
+  }
+}

data/app/assets/javascripts/geo_concerns/relationships/parent_works.es6

@@ -0,0 +1,20 @@
+import RelatedWorks from 'geo_concerns/relationships/related_works';
+
+/**
+* Provides functionality to add and remove parent works.
+*/
+export default class ParentWorks extends RelatedWorks {
+  /**
+  * Builds form data string for in_works_ids.
+  * @param {Array} array of parent member ids
+  */
+  buildFormData(ids) {
+    let data;
+    if (ids.length === 0) {
+      data = `${this.paramKey}[in_works_ids][]=`;
+    } else {
+      data = ids.map((id) => `${this.paramKey}[in_works_ids][]=${id}`).join('&');
+    }
+    return data;
+  }
+}

data/app/assets/javascripts/geo_concerns/relationships/related_works.es6

@@ -0,0 +1,187 @@
+/**
+* Provides basic functionality to add and remove member works.
+* Adapted from the table.es6 module in https://github.com/projecthydra/sufia
+*/
+export default class RelatedWorks {
+  constructor(element) {
+    this.element = $(element);
+    this.table = this.element.find('table');
+    this.query_url = this.table.data('query-url');
+    if (!this.query_url) {
+      return;
+    }
+    this.members = this.table.data('members');
+    this.works = this.table.find('tr');
+    this.workIds = Array.from(this.works.map((i) => this.works.eq(i).data('work-id')));
+    this.paramKey = this.table.data('param-key');
+    this.bindButtons();
+  }
+
+  /**
+  * Bind buttons to member works table.
+  */
+  bindButtons() {
+    const $this = this;
+    $this.bindAddButton();
+    $this.bindRemoveButton();
+  }
+
+  /**
+  * Handle click events by the "Add" button in the table, setting a warning
+  * message if the input is empty or calling the server to handle the request
+  */
+  bindAddButton() {
+    const $this = this;
+    $this.element.find('.btn-add-row').click(() => {
+      const $row = $this.element.find('.member-actions');
+      const memberId = $this.element.find('input').val();
+      const updatedMembers = $this.members.slice();
+      if (memberId === '') {
+        $this.setWarningMessage($row, 'ID cannot be empty.');
+      } else if ($.inArray(memberId, $this.workIds) > -1) {
+        $this.setWarningMessage($row, 'Work is already related.');
+      } else {
+        updatedMembers.push(memberId);
+        $this.hideWarningMessage($row);
+        $this.callAjax({
+          row: $row,
+          members: updatedMembers,
+          member: memberId,
+          url: $this.query_url,
+          data: $this.buildFormData(updatedMembers),
+          on_error: $this.handleError,
+          on_success: $this.handleAddRowSuccess,
+        });
+      }
+    });
+  }
+
+  /**
+  * Handle click events by the "Remove" buttons in the table, and calling the
+  * server to handle the request
+  */
+  bindRemoveButton() {
+    const $this = this;
+    $this.element.find('.btn-remove-row').click(function removeButton() {
+      const $row = $(this).parents('tr:first');
+      const memberId = $row.data('work-id');
+      const index = $this.members.indexOf(memberId);
+      const updatedMembers = $this.members.slice();
+      updatedMembers.splice(index, 1);
+      $this.callAjax({
+        row: $row,
+        members: updatedMembers,
+        member: memberId,
+        data: $this.buildFormData(updatedMembers),
+        url: $this.query_url,
+        on_error: $this.handleError,
+        on_success: $this.handleRemoveRowSuccess,
+      });
+    });
+  }
+
+  /**
+  * Builds form data strings.
+  * @param {Array} array of ids
+  */
+  buildFormData(ids) {
+    return ids;
+  }
+
+  /**
+   * Set the warning message related to the appropriate row in the table
+   * @param {jQuery} row the row containing the warning message to display
+   * @param {String} message the warning message text to set
+   */
+  setWarningMessage(row, message) {
+    const $this = this;
+    $this.element.find('.message.has-warning').text(message).removeClass('hidden');
+  }
+
+  /**
+   * Hide the warning message on the appropriate row
+   * @param {jQuery} row the row containing the warning message to hide
+   */
+  hideWarningMessage(row) {
+    const $this = this;
+    $this.element.find('.message.has-warning').addClass('hidden');
+  }
+
+  /**
+  * Call the server, then call the appropriate callbacks to handle success and errors
+  * @param {Object} args the table, row, input, url, and callbacks
+  */
+  callAjax(args) {
+    const $this = this;
+    $.ajax({
+      type: 'patch',
+      url: args.url,
+      dataType: 'json',
+      data: args.data,
+    })
+      .done(() => {
+        args.on_success.call($this, args);
+      })
+      .fail((jqxhr) => {
+        args.on_error.call($this, args, jqxhr);
+      });
+  }
+
+  /**
+  * Reloads the child works tables after ajax call for member work.
+  * Rebinds the add and remove buttons to the updated table.
+  */
+  reloadTable() {
+    const $this = this;
+    $this.element.load(`${$this.query_url} div#${this.element[0].id}`, () => {
+      $this.bindButtons();
+    });
+  }
+
+  /**
+  * Set a warning message to alert the user on an error
+  * @param {Object} args the table, row, input, url, and callbacks
+  * @param {Object} jqxhr the jQuery XHR response object
+  */
+  handleError(args, jqxhr) {
+    let message = jqxhr.statusText;
+    if (jqxhr.responseJSON) {
+      message = jqxhr.responseJSON.description;
+    }
+    this.setWarningMessage(args.row, message);
+  }
+
+  /**
+   * Update list of child work ids and list of members. Reload the
+   * table from the server.
+   * @param {Object} args the table, row, input, url, and callbacks
+   */
+  handleRemoveRowSuccess(args) {
+    // update list of child member works
+    const index = this.workIds.indexOf(args.member);
+    this.workIds.splice(index, 1);
+
+    // update master list of member works
+    this.members = args.members;
+
+    this.reloadTable();
+  }
+
+  /**
+   * Update list of child work ids and list of members.
+   * Clear the add row input and reload the table from the server.
+   * @param {Object} args the table, row, input, url, and callbacks
+   */
+  handleAddRowSuccess(args) {
+    // update list of child member works
+    this.workIds.push(args.member);
+
+    // update master list of member works
+    this.members = args.members;
+
+    // empty the "add" row input value
+    this.element.find('input').val('');
+
+    this.reloadTable();
+  }
+}

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

@@ -0,0 +1,29 @@
+#child-works, #parent-works {
+  table {
+    tbody {
+      td { border-top: none; }
+      tr { border-bottom: 1px solid #ddd; }
+    }
+  }
+  .panel { margin-bottom: 0px; }
+  .row { margin: 10px 0 10px 0; }
+  .message {
+    background-size: 40px 40px;
+    background-image: linear-gradient(135deg, rgba(255, 255, 255, .05) 25%, transparent 25%,
+    transparent 50%, rgba(255, 255, 255, .05) 50%, rgba(255, 255, 255, .05) 75%,
+    transparent 75%, transparent);
+    box-shadow: inset 0 -1px 0 rgba(255,255,255,.4);
+    width: 100%;
+    border: 1px solid;
+    color: #fff;
+    padding: 10px;
+    text-shadow: 0 1px 0 rgba(0,0,0,.5);
+    animation: animate-bg 5s linear infinite;
+    border-radius: 4px;
+    margin-top: 10px;
+  }
+  .has-warning{
+    background-color: #eaaf51;
+    border-color: #d99a36;
+  }
+}

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

@@ -1,7 +1,13 @@
-.thumbnail a > img {
-  display: block;
-  height: auto;
-  margin-right: 0px;
-  margin-left: 0px;
-  max-width: 250px;
+.thumbnail {
+  max-width: 200px;
+  border: none;
+  background-color: transparent;
+  a > img {
+    display: block;
+    height: auto;
+    margin-right: 0px;
+    margin-left: 0px;
+    max-height: 150px;
+    max-width: 200px;
+  }
 }

data/app/helpers/geo_concerns/populate_metadata_helper.rb

@@ -0,0 +1,7 @@
+module GeoConcerns
+  module PopulateMetadataHelper
+    def external_metadata_file_presenters
+      GeoConcernsShowPresenter.new(curation_concern, nil).external_metadata_file_set_presenters
+    end
+  end
+end