geo_concerns 0.0.3 → 0.0.4

data/spec/renderers/{coverage_renderer_spec.rb → geo_concerns/coverage_renderer_spec.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe CoverageRenderer do
+describe GeoConcerns::CoverageRenderer do
   let(:coverage) { 'northlimit=2.7; eastlimit=4.0; southlimit=1.3; westlimit=2.9; units=degrees; projection=EPSG:4326' }
   let(:renderer) { described_class.new(:coverage, [coverage]) }
   subject { renderer.render }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geo_concerns
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - James Griffin
@@ -12,22 +12,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-06 00:00:00.000000000 Z
+date: 2016-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curation_concerns
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.0.pre4
+        version: 1.0.0.beta3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.0.pre4
+        version: 1.0.0.beta3
 - !ruby/object:Gem::Dependency
   name: leaflet-rails
   requirement: !ruby/object:Gem::Requirement
@@ -214,8 +214,8 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- app/actors/geo_concerns/file_actor.rb
-- app/actors/geo_concerns/file_set_actor.rb
+- app/actors/geo_concerns/actors/file_actor.rb
+- app/actors/geo_concerns/actors/file_set_actor.rb
 - app/assets/images/geo_concerns/.keep
 - app/assets/images/geo_concerns/images/geocoder.png
 - app/assets/images/geo_concerns/images/throbber.gif
@@ -240,8 +240,9 @@ files:
 - app/forms/geo_concerns/image_work_form.rb
 - app/forms/geo_concerns/raster_work_form.rb
 - app/forms/geo_concerns/vector_work_form.rb
-- app/helpers/bounding_box_helper.rb
 - app/helpers/geo_concerns/application_helper.rb
+- app/helpers/geo_concerns/bounding_box_helper.rb
+- app/helpers/geo_concerns/geo_works_helper.rb
 - app/models/concerns/geo_concerns/basic_geo_metadata.rb
 - app/models/concerns/geo_concerns/external_metadata_file_behavior.rb
 - app/models/concerns/geo_concerns/extractors/fgdc_helper.rb
@@ -249,6 +250,7 @@ files:
 - app/models/concerns/geo_concerns/extractors/iso19139_helper.rb
 - app/models/concerns/geo_concerns/extractors/mods_helper.rb
 - app/models/concerns/geo_concerns/file_set/derivatives.rb
+- app/models/concerns/geo_concerns/file_set_metadata.rb
 - app/models/concerns/geo_concerns/file_set_presenter_behavior.rb
 - app/models/concerns/geo_concerns/geo_file_format_behavior.rb
 - app/models/concerns/geo_concerns/geo_file_set_behavior.rb
@@ -279,11 +281,12 @@ files:
 - app/processors/geo_concerns/processors/vector/processor.rb
 - app/processors/geo_concerns/processors/vector/shapefile.rb
 - app/processors/geo_concerns/processors/zip.rb
-- app/renderers/coverage_renderer.rb
+- app/renderers/geo_concerns/coverage_renderer.rb
 - app/runners/geo_concerns/runners/raster_derivatives.rb
 - app/runners/geo_concerns/runners/vector_derivatives.rb
 - app/schemas/geo_concerns/basic_geo_metadata_optional.rb
 - app/schemas/geo_concerns/basic_geo_metadata_required.rb
+- app/schemas/geo_concerns/file_set_metadata_required.rb
 - app/services/authority_service.rb
 - app/services/geo_concerns/derivative_path.rb
 - app/services/image_format_service.rb
@@ -295,18 +298,13 @@ files:
 - app/views/curation_concerns/file_sets/_form.html.erb
 - app/views/curation_concerns/image_works/_form.html.erb
 - app/views/curation_concerns/image_works/_image_work.html.erb
-- app/views/curation_concerns/image_works/_members.html.erb
-- app/views/curation_concerns/image_works/_related_image_files.html.erb
 - app/views/curation_concerns/image_works/_show_actions.html.erb
 - app/views/curation_concerns/image_works/show.html.erb
 - app/views/curation_concerns/raster_works/_form.html.erb
-- app/views/curation_concerns/raster_works/_members.html.erb
 - app/views/curation_concerns/raster_works/_raster_work.html.erb
-- app/views/curation_concerns/raster_works/_related_raster_files.html.erb
 - app/views/curation_concerns/raster_works/_show_actions.html.erb
 - app/views/curation_concerns/raster_works/show.html.erb
 - app/views/curation_concerns/vector_works/_form.html.erb
-- app/views/curation_concerns/vector_works/_related_vector_files.html.erb
 - app/views/curation_concerns/vector_works/_show_actions.html.erb
 - app/views/curation_concerns/vector_works/_vector_work.html.erb
 - app/views/curation_concerns/vector_works/show.html.erb
@@ -320,13 +318,15 @@ files:
 - app/views/geo_concerns/_form_required_information.html.erb
 - app/views/geo_concerns/_form_supplementary_fields.html.erb
 - app/views/geo_concerns/_related_external_metadata_files.html.erb
+- app/views/geo_concerns/_related_geo_files.html.erb
+- app/views/geo_concerns/_related_geo_works.html.erb
 - app/vocabs/geo_concerns/geo_terms.rb
 - config/routes.rb
 - geo_concerns.gemspec
 - lib/generators/geo_concerns/install_generator.rb
-- lib/generators/geo_concerns/templates/actors/curation_concerns/image_work_actor.rb
-- lib/generators/geo_concerns/templates/actors/curation_concerns/raster_work_actor.rb
-- lib/generators/geo_concerns/templates/actors/curation_concerns/vector_work_actor.rb
+- lib/generators/geo_concerns/templates/actors/curation_concerns/actors/image_work_actor.rb
+- lib/generators/geo_concerns/templates/actors/curation_concerns/actors/raster_work_actor.rb
+- lib/generators/geo_concerns/templates/actors/curation_concerns/actors/vector_work_actor.rb
 - lib/generators/geo_concerns/templates/config/authorities/image_formats.yml
 - lib/generators/geo_concerns/templates/config/authorities/metadata_formats.yml
 - lib/generators/geo_concerns/templates/config/authorities/raster_formats.yml
@@ -366,7 +366,7 @@ files:
 - solr/config/xslt/example_atom.xsl
 - solr/config/xslt/example_rss.xsl
 - solr/config/xslt/luke.xsl
-- spec/actors/geo_concerns/file_actor_spec.rb
+- spec/actors/geo_concerns/actors/file_actor_spec.rb
 - spec/controllers/image_works_controller_spec.rb
 - spec/controllers/raster_works_controller_spec.rb
 - spec/controllers/vector_works_controller_spec.rb
@@ -386,6 +386,7 @@ files:
 - spec/forms/geo_concerns/raster_work_form_spec.rb
 - spec/forms/geo_concerns/vector_work_form_spec.rb
 - spec/helpers/bounding_box_helper_spec.rb
+- spec/helpers/geo_works_helper_spec.rb
 - spec/models/concerns/basic_geo_metadata_spec.rb
 - spec/models/concerns/geo_concerns/file_set/derivatives_spec.rb
 - spec/models/concerns/geo_concerns/file_set/geo_file_format_behavior_spec.rb
@@ -415,7 +416,7 @@ files:
 - spec/processors/geo_concerns/processors/vector/processor_spec.rb
 - spec/processors/geo_concerns/processors/vector/shapefile_spec.rb
 - spec/processors/geo_concerns/processors/zip_spec.rb
-- spec/renderers/coverage_renderer_spec.rb
+- spec/renderers/geo_concerns/coverage_renderer_spec.rb
 - spec/services/derivative_path_spec.rb
 - spec/services/raster_format_service_spec.rb
 - spec/spec_helper.rb
@@ -456,7 +457,7 @@ signing_key:
 specification_version: 4
 summary: Rails engine for Hydra Geo models. Built around Curation Concerns engine.
 test_files:
-- spec/actors/geo_concerns/file_actor_spec.rb
+- spec/actors/geo_concerns/actors/file_actor_spec.rb
 - spec/controllers/image_works_controller_spec.rb
 - spec/controllers/raster_works_controller_spec.rb
 - spec/controllers/vector_works_controller_spec.rb
@@ -476,6 +477,7 @@ test_files:
 - spec/forms/geo_concerns/raster_work_form_spec.rb
 - spec/forms/geo_concerns/vector_work_form_spec.rb
 - spec/helpers/bounding_box_helper_spec.rb
+- spec/helpers/geo_works_helper_spec.rb
 - spec/models/concerns/basic_geo_metadata_spec.rb
 - spec/models/concerns/geo_concerns/file_set/derivatives_spec.rb
 - spec/models/concerns/geo_concerns/file_set/geo_file_format_behavior_spec.rb
@@ -505,7 +507,7 @@ test_files:
 - spec/processors/geo_concerns/processors/vector/processor_spec.rb
 - spec/processors/geo_concerns/processors/vector/shapefile_spec.rb
 - spec/processors/geo_concerns/processors/zip_spec.rb
-- spec/renderers/coverage_renderer_spec.rb
+- spec/renderers/geo_concerns/coverage_renderer_spec.rb
 - spec/services/derivative_path_spec.rb
 - spec/services/raster_format_service_spec.rb
 - spec/spec_helper.rb

data/app/actors/geo_concerns/file_actor.rb

@@ -1,20 +0,0 @@
-module GeoConcerns
-  class FileActor < CurationConcerns::FileActor
-    def ingest_file(file)
-      working_file = copy_file_to_working_directory(file, file_set.id)
-      IngestFileJob.perform_later(file_set, working_file, mime_type(file), user.user_key, relation)
-      make_derivative(file_set, working_file)
-      true
-    end
-
-    # Determines the correct mime type for a file. If the mime type is stored on
-    # the file_set (set in the view), then use that value. If not, use the file
-    # content type, if it exists.
-    # @param [File, ActionDigest::HTTP::UploadedFile] file to get mime type from
-    # @return [String] Mime type for the file
-    def mime_type(file)
-      return file_set.mime_type if file_set.mime_type
-      file.respond_to?(:content_type) ? file.content_type : nil || file_set.mime_type
-    end
-  end
-end

data/app/actors/geo_concerns/file_set_actor.rb

@@ -1,7 +0,0 @@
-module GeoConcerns
-  class FileSetActor < CurationConcerns::FileSetActor
-    def file_actor_class
-      ::GeoConcerns::FileActor
-    end
-  end
-end

data/app/helpers/bounding_box_helper.rb

@@ -1,24 +0,0 @@
-module BoundingBoxHelper
-  ##
-  # Builds HTML string for bounding box selector tool.
-  # Calls boundingBoxSelector javascript function and
-  # passes the id of the location input element that it binds to.
-  # @param [Symbol] name of property that holds bounding box string
-  # @return[String]
-  def bbox(property)
-    %(
-      <div id='bbox'></div>
-      <script>
-        boundingBoxSelector({inputId: #{bbox_input_id(property)}});
-      </script>
-    ).html_safe
-  end
-
-  ##
-  # Returns id of location input that is bound to bbox selector.
-  # @param [Symbol] name of property that holds bounding box string
-  # @return[String] id of location input element
-  def bbox_input_id(property)
-    "#{curation_concern.class.name.underscore}_#{property}"
-  end
-end

data/app/renderers/coverage_renderer.rb

@@ -1,34 +0,0 @@
-class CoverageRenderer < CurationConcerns::AttributeRenderer
-  def render
-    coverage = values.first if values
-    return '' unless coverage
-    markup(coverage).html_safe
-  end
-
-  private
-
-    def markup(coverage)
-      markup = ''
-      markup << %(<tr><th>#{label}</th>\n<td id='accordion'><ul class='tabular'>)
-      markup << value(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>)
-    end
-
-    def map(coverage)
-      %(<div id='bbox' class='collapse in'></div>
-        <script>boundingBoxSelector({coverage: '#{coverage}', readonly: true});</script>)
-    end
-end

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

@@ -1,30 +0,0 @@
-<% if presenter.vector_work_presenters.present? %>
-  <div class="panel panel-default raster_works">
-    <div class="panel-heading">
-      <h2>Vector Works</h2>
-    </div>
-    <table class="table">
-      <thead>
-        <tr>
-          <th class="col-xs-3"></th>
-          <th>Work Name</th>
-        </tr>
-      </thead>
-      <tbody>
-        <% presenter.vector_work_presenters.each do |res| %>
-          <tr class="file_set attributes">
-            <td class="thumbnail" style="margin-bottom: 0px">
-              <%= render_thumbnail_tag res %>
-            </td>
-            <td>
-              <%= link_to res.title, main_app.curation_concerns_vector_work_path(res.id) %>
-            </td>
-          </tr>
-        <% end %>
-      </tbody>
-    </table>
-  </div>
-<% elsif can? :edit, presenter.id %>
-  <h2>Vector Works</h2>
-  <p class="center"><em>This <%= @presenter.human_readable_type %> has no vector works associated with it. You can add one using the "Attach a Vector Work" button below.</em></p>
-<% end %>

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

@@ -1,24 +0,0 @@
-<% if presenter.raster_file_presenters.present? %>
-<div class="panel panel-default related_files">
-  <div class="panel-heading">
-    <h2>Raster File</h2>
-  </div>
-  <table class="table table-striped">
-    <thead>
-      <tr>
-        <th>File</th>
-        <th>Filename</th>
-        <th>Date Uploaded</th>
-        <th>Visibility</th>
-        <th>Actions</th>
-      </tr>
-    </thead>
-    <tbody>
-      <%= render partial: 'member', collection: @presenter.raster_file_presenters %>
-    </tbody>
-  </table>
-</div>
-<% elsif can? :edit, presenter.id %>
-  <h2>Raster File</h2>
-  <p class="center"><em>This <%= presenter.human_readable_type %> doesn't have a raster file associated with it. You can add one using the "Attach a File" button below.</em></p>
-<% end %>

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

@@ -1,24 +0,0 @@
-<% if @presenter.vector_file_presenters.present? %>
-<div class="panel panel-default related_files">
-  <div class="panel-heading">
-    <h2>Vector File</h2>
-  </div>
-  <table class="table table-striped">
-    <thead>
-      <tr>
-        <th>File</th>
-        <th>Filename</th>
-        <th>Date Uploaded</th>
-        <th>Visibility</th>
-        <th>Actions</th>
-      </tr>
-    </thead>
-    <tbody>
-      <%= render partial: 'member', collection: @presenter.vector_file_presenters %>
-    </tbody>
-  </table>
-</div>
-<% elsif can? :edit, @presenter.id %>
-  <h2>Vector Files</h2>
-  <p class="center"><em>This <%= @presenter.human_readable_type %> doesn't have a vector file associated with it. You can add one using the "Attach a File" button below.</em></p>
-<% end %>

data/lib/generators/geo_concerns/templates/actors/curation_concerns/image_work_actor.rb

@@ -1,4 +0,0 @@
-module CurationConcerns
-  class ImageWorkActor < CurationConcerns::BaseActor
-  end
-end

data/lib/generators/geo_concerns/templates/actors/curation_concerns/raster_work_actor.rb

@@ -1,4 +0,0 @@
-module CurationConcerns
-  class RasterWorkActor < CurationConcerns::BaseActor
-  end
-end

data/lib/generators/geo_concerns/templates/actors/curation_concerns/vector_work_actor.rb

@@ -1,4 +0,0 @@
-module CurationConcerns
-  class VectorWorkActor < CurationConcerns::BaseActor
-  end
-end