zizia 4.1.0.alpha.01 → 4.2.0.alpha.01

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc93aa24620735bbd5b60ec1f04b403b60c763104f8ff7822ee72b0040ea4512
-  data.tar.gz: 78a88f7d36ba063912fa55956c490336277381172ec09d24c71db5bbd2f1a85e
+  metadata.gz: c529a5323dbb1b929bfc010ef73a81d52f643da989c4a390a691afa881c730c6
+  data.tar.gz: d819c1c9b34ecee1d4ac22c77f53f7dfc7e9b2c99a81cbacbaa3f0bd2336d679
 SHA512:
-  metadata.gz: 7bda1b7bceed90ba1e226a149b37e8959cf5f7f34a6fed99d97aac929b30eaa79b25f4fe12fec4b7f246d2f2b6220e04cd94c6666902e886371e5e458b810554
-  data.tar.gz: 66caf55d975bde3648695878b5269f9eb08daa064acf84e763f6e2ce9571e9d9bb812d96580d03cdc93aeabc0042373c71bfca3e6110dbc4968b9e978ec0c3d4
+  metadata.gz: 5144300f68e907db6837c9112929eb436ca5b2072cbae740cab98cd3672b0085e0a12ca12d081c5da2cc63b7fc59a4f150430c04a911d95b95869bcdf10d66c2
+  data.tar.gz: da4bc0d67cbd3e756765ac30083f4c8ccfbed615f07dddefe6dc1701c84fb14d36aaf687490dae1f49000c5b2ba8792ee2ae33ef124a42b6c3d9b1737833623e

data/.rubocop.yml

@@ -25,6 +25,7 @@ Metrics/AbcSize:
     - lib/zizia/importer.rb
     - lib/zizia/hyrax/hyrax_metadata_only_updater.rb
     - 'app/importers/modular_importer.rb'
+    - 'app/lib/zizia/metadata_details.rb'
 
 Metrics/BlockLength:
   Exclude:
@@ -75,6 +76,6 @@ RSpec/MultipleExpectations:
     - 'spec/integration/import_hyrax_csv.rb'
     - 'spec/controllers/importer_documentation_controller_spec.rb'
     - 'spec/integration/csv_import_detail_spec.rb'
-
+    - 'spec/controllers/**/*'
 Style/StructInheritance:
   Enabled: false

data/app/config/usage.yml

@@ -0,0 +1,30 @@
+---
+# Metadata usage hints
+# attribute: usage
+
+arkivo_checksum:        "-- system field - not directly editable --"
+based_near: " A location that something is based near, for some broadly human notion of near."
+contributor:            "Identifies contributors to the material; can be used very broadly if exact contributions aren't known"
+creator:                "Identifies the primary Creator(s) of the material"
+date_created:           "The date the material was created"
+date_modified:          "-- system field - not directly editable --"
+date_uploaded:          "-- system field - not directly editable --"
+depositor:              "-- system field - not directly editable --"
+description:            "Free-text, summary description of the content, such as an abstract. Provides additional search terms in natural language; provides important summary information for non-textual resources such as images, audio, and video"
+has_model:              "-- system field - not directly editable --"
+head:                   "-- system field - not directly editable --"
+identifier: "An unambiguous reference to the resource within a given context."
+keywords:               "Uncontrolled keywords describing the material, often provided by content creators"
+language:       "The language of the source content being described: applies to textual or spoken word (linguistic) content"
+license: "A legal document giving official permission to do something with the resource."
+on_behalf_of:           "-- system field - not directly editable --"
+owner:                  "-- system field - not directly editable --"
+proxy_depositor:        "-- system field - not directly editable --"
+publisher:              "The name of the entity formally publishing the work"
+related_url: "The resource O may provide additional information about S. It may be possible to retrieve representations of O from the Web, but this is not required. When such representations may be retrieved, no constraints are placed on the format of those representations."
+resource_type: "The nature or genre of the resource."
+rights_statement:       "Standardized rights statement from rightsstatements.org that can be used to communicate the copyright and re-use status of digital objects to the end users  [DESCRIPTIVE/USER FACING]"
+source: "A related resource from which the described resource is derived."
+state:                  "-- system field - not directly editable --"
+tail:                    "-- system field - not directly editable --"
+title:                  "The name of the resource being described. The title may either be transcribed from the resource itself, or it may need to be created."

data/app/controllers/zizia/application_controller.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 module Zizia
-  class ApplicationController < ActionController::Base
+  class ApplicationController < ::ApplicationController
     protect_from_forgery with: :exception
   end
 end

data/app/controllers/zizia/metadata_details_controller.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+module Zizia
+  class MetadataDetailsController < ApplicationController
+    def show
+      @details = MetadataDetails.instance.details(work_attributes:
+                                                     WorkAttributes.instance)
+      respond_to do |format|
+        format.html
+        format.json { render json: @details.to_json }
+        format.any { redirect_to action: :show }
+      end
+    end
+
+    def profile
+      @csv = MetadataDetails.instance.to_csv(work_attributes:
+                                                WorkAttributes.instance)
+      send_data @csv, type: 'text/csv', filename: "metadata-profile-#{Date.current}.csv"
+    end
+  end
+end

data/app/helpers/zizia/metadata_details_helper.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+module Zizia
+  module MetadataDetailsHelper
+    def css_class(value)
+      return 'missing' if value == 'not configured'
+      return 'missing' if value.match?(/translation missing/)
+    end
+  end
+end

data/app/lib/zizia/metadata_details.rb

@@ -0,0 +1,68 @@
+# frozen_string_literal: true
+require 'csv'
+
+module Zizia
+  class MetadataDetails
+    include Singleton
+
+    def details(work_attributes:)
+      validators = work_attributes.validators
+      work_attributes.properties.sort.map do |p|
+        Hash[
+          attribute: p[0],
+          predicate: p[1].predicate.to_s,
+          multiple: p[1].try(:multiple?).to_s,
+          type: type_to_s(p[1].type),
+          validator: validator_to_string(validator: validators[p[0].to_sym][0]),
+          label: I18n.t("simple_form.labels.defaults.#{p[0]}"),
+          csv_header: csv_header(p[0]),
+          required_on_form: required_on_form_to_s(p[0]),
+          usage: MetadataUsage.instance.usage[p[0]]
+        ]
+      end
+    end
+
+    def to_csv(work_attributes:)
+      attribute_list = details(work_attributes: work_attributes)
+      headers = extract_headers(attribute_list[0])
+      csv_string = CSV.generate do |csv|
+        csv << headers
+        attribute_list.each do |attribute|
+          csv << headers.map { |h| attribute[h] }
+        end
+      end
+      csv_string
+    end
+
+    private
+
+      def csv_header(field)
+        Zizia.config.metadata_mapper_class.csv_header(field) || "not configured"
+      end
+
+      def extract_headers(attribute_hash)
+        headers = attribute_hash.keys.sort
+        headers = [:attribute] + (headers - [:attribute])     # force :attribute to the beginning of the list
+        headers = (headers - [:usage]) + [:usage]             # force :usage to the end of the list becuause it's so long
+        headers
+      end
+
+      def required_on_form_to_s(attribute)
+        Hyrax::Forms::WorkForm.required_fields.include?(attribute.to_sym).to_s
+      end
+
+      def type_to_s(type)
+        return 'Not specified' unless type.present?
+        type.to_s
+      end
+
+      def validator_to_string(validator:)
+        case validator
+        when ActiveModel::Validations::PresenceValidator
+          'required'
+        else
+          'No validation present in the model.'
+        end
+      end
+  end
+end

data/app/lib/zizia/metadata_usage.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Zizia
+  class MetadataUsage
+    include Singleton
+
+    def usage
+      YAML.load_file(config)
+    end
+
+    private
+
+      def default_location
+        File.join(File.dirname(__FILE__), '../../config/usage.yml')
+      end
+
+      def config
+        return default_location unless File.exist?(Rails.root.join("config", "usage.yml"))
+        Rails.root.join("config", "usage.yml")
+      end
+  end
+end

data/app/lib/zizia/work_attributes.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+# A singleton class to get the list of attributes
+# from a work.
+#
+# It is a Singleton so that there is only one of these
+# initialized and uses the ||= operator so that when you
+# read the attributes property it uses an already initialized
+# work.
+#
+# This is to ensure that we can get a list of the attributes
+# programmatically, but without using any unnecessary memory.
+module Zizia
+  class WorkAttributes
+    include Singleton
+    attr_reader :attributes, :properties, :validators, :local_attributes
+
+    def initialize
+      work ||= klass.new
+      @local_attributes || work.local_attributes
+      @attributes ||= work.local_attributes
+      @properties ||= work.send(:properties)
+      @validators ||= work.send(:_validators)
+    end
+
+    # Override to choose a different Work class
+    def klass
+      Work
+    end
+  end
+end

data/app/views/zizia/metadata_details/show.html.erb

@@ -0,0 +1,49 @@
+<% content_for :title, 'Importer Field Guide' %>
+<div class="guide-container">
+  <a class="btn btn-primary" href="/importer_documentation/profile">Download as CSV</a>
+  <dl>
+    <% @details.each do |detail| %>
+      <h2>
+        <dt>
+          <%= detail[:attribute] %>
+        </dt>
+      </h2>
+      <dd>
+        <div>
+          <b>Predicate:</b>
+          <a href="<%= detail[:predicate] %>"><%= detail[:predicate] %></a>
+        </div>
+        <div>
+          <b>Type:</b>
+          <%= detail[:type] %>
+        </div>
+        <div>
+          <b>Validation:</b>
+          <%= detail[:validator] %>
+        </div>
+        <div>
+          <b>Multiple:</b>
+          <%= detail[:multiple] %>
+        </div>
+        <div>
+          <b>Edit Form Label:</b>
+          <%= detail[:label] %>
+        </div>
+        <div>
+          <b>Import header:</b>
+          <span class=<%= css_class(detail[:csv_header])%>>
+            <%= detail[:csv_header] %>
+          </span>
+        </div>
+        <div>
+          <b>Required on Edit Form:</b>
+          <%= detail[:required_on_form] %>
+        </div>
+        <div class=metadata_usage>
+          <b>Usage:</b>
+          <%= detail[:usage] %>
+        </div>
+      </dd>
+    <% end  %>
+  </dl>
+</div>

data/config/routes.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 Zizia::Engine.routes.draw do
-  get 'importer_documentation/guide'
-  get 'importer_documentation/csv'
-
   post 'csv_imports/preview', as: 'preview_csv_import'
   get 'csv_imports/preview', to: redirect('csv_imports/new')
   resources :csv_imports, only: [:index, :show, :new, :create]
+
+  get 'importer_documentation/guide', to: 'metadata_details#show'
+  get 'importer_documentation/profile', to: 'metadata_details#profile'
 end

data/lib/zizia/engine.rb

@@ -3,7 +3,6 @@
 require 'rails/all'
 require 'carrierwave'
 require 'carrierwave/orm/activerecord'
-require 'redcarpet'
 require 'devise'
 require 'hyrax'
 require 'riiif'

data/lib/zizia/hyrax/hyrax_basic_metadata_mapper.rb

@@ -107,6 +107,10 @@ module Zizia
       Array(metadata[key]&.split(delimiter))
     end
 
+    def self.csv_header(field)
+      CSV_HEADERS[field.to_sym]
+    end
+
     protected
 
       # Some fields should have single values instead

data/lib/zizia/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Zizia
-  VERSION = '4.1.0.alpha.01'
+  VERSION = '4.2.0.alpha.01'
 end

data/spec/controllers/metadata_details_spec.rb

@@ -0,0 +1,73 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe Zizia::MetadataDetailsController, type: :controller do
+  routes { Zizia::Engine.routes }
+
+  describe 'GET show' do
+    it 'has 200 code for show' do
+      get :show
+      expect(response.status).to eq(200)
+    end
+
+    it 'responds with html when no format is specified' do
+      get :show
+      expect(response.content_type).to eq "text/html"
+    end
+
+    it 'responds to json requests' do
+      get :show, format: :json
+      expect(response.content_type).to eq "application/json"
+    end
+
+    it 'has details' do
+      get :show
+      details = assigns(:details)
+      title = details.find { |h| h[:attribute] == 'title' }
+      expect(title[:predicate]).to eq('http://purl.org/dc/terms/title')
+    end
+
+    it 'has details in json' do
+      get :show, format: :json
+      details = JSON[response.body, symbolize_names: true]
+      title = details.find { |h| h[:attribute] == 'title' }
+      expect(title[:predicate]).to eq('http://purl.org/dc/terms/title')
+    end
+
+    it 'redirects unknown formats to html' do
+      get :show, format: :something_else
+      expect(response).to redirect_to action: :show
+    end
+  end
+
+  describe 'GET profile' do
+    it 'has a downloadable csv' do
+      get :profile
+      expect(response.content_type).to eq('text/csv')
+    end
+
+    it 'includes expected headers' do
+      get :profile
+      first_row = response.body.lines.first
+      expect(first_row).to include('csv_header')
+      expect(first_row).to include('required_on_form')
+    end
+
+    it 'includes usage' do
+      get :profile
+      profile_table = CSV.parse(response.body, headers: :first_row)
+      title_definition = profile_table.find { |r| r.field('attribute') == 'title' }
+      expect(title_definition.field('usage')).to include 'name of the resource being described' # match text extracted from ./config/emory/usage.yml
+    end
+
+    it 'includes a date in the filename' do
+      todays_date = "Wed, 03 Jul 1985".to_date
+      allow(Date).to receive(:current) { todays_date }
+
+      get :profile
+      filename = response.headers['Content-Disposition']
+      expect(filename).to include "1985-07-03"
+    end
+  end
+end

data/spec/dummy/spec/system/metadata_details_page_spec.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+require 'rails_helper'
+include Warden::Test::Helpers
+
+RSpec.describe 'Viewing the field guide' do
+  it 'renders correctly' do
+    visit('/importer_documentation/guide')
+    expect(page).to have_content('title')
+    expect(page).to have_content('The name of the resource being described. The title may either be transcribed from the resource itself, or it may need to be created.')
+    expect(page).to have_content('-- system field - not directly editable --')
+  end
+end

data/spec/rails_helper.rb

@@ -10,6 +10,7 @@ require 'factory_bot'
 require 'ffaker'
 require 'hydra-role-management'
 require 'byebug'
+require 'rails-controller-testing'
 # Add additional requires below this line. Rails is not loaded until this point!
 
 # Requires supporting ruby files with custom matchers and macros, etc, in

data/spec/spec_helper.rb

@@ -19,6 +19,7 @@ require 'active_fedora/cleaner'
 require 'zizia'
 require 'zizia/spec'
 require 'byebug'
+require 'rails-controller-testing'
 
 RSpec.configure do |config|
   config.filter_run focus: true

data/zizia.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'active-fedora'
   gem.add_dependency 'rails', '~> 5.1.4'
   gem.add_dependency 'carrierwave'
-  gem.add_dependency 'redcarpet'
+  gem.add_dependency 'rails-controller-testing'
 
   gem.add_development_dependency 'bixby'
   gem.add_development_dependency 'bootstrap-sass', '~> 3.0'
@@ -43,6 +43,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'riiif', '~> 2.0'
   gem.add_development_dependency 'rsolr', '>= 1.0'
+  gem.add_development_dependency 'rails-controller-testing'
   gem.add_development_dependency 'rspec'
   gem.add_development_dependency 'rspec-rails'
   gem.add_development_dependency 'rspec_junit_formatter'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zizia
 version: !ruby/object:Gem::Version
-  version: 4.1.0.alpha.01
+  version: 4.2.0.alpha.01
 platform: ruby
 authors:
 - Data Curation Experts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-30 00:00:00.000000000 Z
+date: 2019-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active-fedora
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: redcarpet
+  name: rails-controller-testing
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -380,6 +380,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: rails-controller-testing
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -629,14 +643,18 @@ files:
 - app/assets/stylesheets/zizia/_file_upload.scss
 - app/assets/stylesheets/zizia/application.css
 - app/assets/stylesheets/zizia/zizia.scss
+- app/config/usage.yml
 - app/controllers/zizia/application_controller.rb
 - app/controllers/zizia/csv_imports_controller.rb
-- app/controllers/zizia/importer_documentation_controller.rb
-- app/helpers/importer_documentation_helper.rb
+- app/controllers/zizia/metadata_details_controller.rb
 - app/helpers/zizia/application_helper.rb
+- app/helpers/zizia/metadata_details_helper.rb
 - app/importers/modular_importer.rb
 - app/jobs/zizia/application_job.rb
 - app/jobs/zizia/start_csv_import_job.rb
+- app/lib/zizia/metadata_details.rb
+- app/lib/zizia/metadata_usage.rb
+- app/lib/zizia/work_attributes.rb
 - app/models/zizia/application_record.rb
 - app/models/zizia/csv_import.rb
 - app/models/zizia/csv_import_detail.rb
@@ -659,6 +677,7 @@ files:
 - app/views/zizia/csv_imports/preview.html.erb
 - app/views/zizia/csv_imports/show.html.erb
 - app/views/zizia/importer_documentation/guide.html.erb
+- app/views/zizia/metadata_details/show.html.erb
 - bin/rails
 - config/routes.rb
 - db/migrate/201901162141281_create_zizia_csv_imports.rb
@@ -724,7 +743,7 @@ files:
 - solr/config/xslt/example_atom.xsl
 - solr/config/xslt/example_rss.xsl
 - solr/config/xslt/luke.xsl
-- spec/controllers/importer_documentation_controller_spec.rb
+- spec/controllers/metadata_details_spec.rb
 - spec/dummy/.fcrepo_wrapper
 - spec/dummy/.gitignore
 - spec/dummy/.rspec
@@ -1423,7 +1442,7 @@ files:
 - spec/dummy/spec/system/import_from_csv_spec.rb
 - spec/dummy/spec/system/import_from_csv_with_errors_spec.rb
 - spec/dummy/spec/system/import_with_no_collection_spec.rb
-- spec/dummy/spec/system/importer_documentation_spec.rb
+- spec/dummy/spec/system/metadata_details_page_spec.rb
 - spec/dummy/spec/system/view_hyrax_home_page_spec.rb
 - spec/dummy/storage/.keep
 - spec/dummy/test/application_system_test_case.rb

data/app/controllers/zizia/importer_documentation_controller.rb

@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-module Zizia
-  class ImporterDocumentationController < ApplicationController
-    def guide; end
-
-    def csv
-      send_data Zizia::CsvTemplate.new.to_s, type: 'text/csv; charset=utf-8', disposition: 'attachment', filename: 'import_manifest.csv'
-    end
-  end
-end

data/app/helpers/importer_documentation_helper.rb

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-module ImporterDocumentationHelper
-  def render_guide
-    renderer = Redcarpet::Render::HTML.new(autolink: true, with_toc_data: true)
-    markdown = Redcarpet::Markdown.new(renderer)
-    if File.exist?(Rails.root.join('app', 'assets', 'markdown', 'importer_guide.md'))
-      markdown.render(File.open(Rails.root.join('app', 'assets', 'markdown', 'importer_guide.md')).read)
-    else
-      'There is currently no documentation.'
-    end
-  end
-end

data/spec/controllers/importer_documentation_controller_spec.rb

@@ -1,14 +0,0 @@
-# frozen_string_literal: true
-require 'rails_helper'
-
-RSpec.describe Zizia::ImporterDocumentationController, type: :controller do
-  routes { Zizia::Engine.routes }
-
-  describe "GET csv" do
-    it "provides a csv download" do
-      get :csv
-      expect(response.headers['Content-Type']).to eq('text/csv; charset=utf-8')
-      expect(response.headers['Content-Disposition']).to eq('attachment; filename="import_manifest.csv"')
-    end
-  end
-end

data/spec/dummy/spec/system/importer_documentation_spec.rb

@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-require 'rails_helper'
-include Warden::Test::Helpers
-
-RSpec.describe 'Importing records from a CSV file' do
-  context 'logged in as an admin user' do
-    let(:admin_user) { FactoryBot.create(:admin) }
-    before do
-      login_as admin_user
-    end
-
-    it 'shows that there is no documentation if the markdown is absent' do
-      visit '/importer_documentation/guide'
-      expect(page).to have_content 'There is currently no documentation.'
-    end
-  end
-end