darlingtonia 1.2.3 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b648dc20f3fd79b7493758ef5ca1437ffd265ca95a524d68c77fd1abf9d25ec2
-  data.tar.gz: bc36ab139735712e7e246d3de7f63515b032a97e87562bead36b8d7ad3af10fb
+  metadata.gz: ad3721dc07a3ded3cdd80bd95b0068f098e930a002b5f6e29eeb03a855d62731
+  data.tar.gz: c5b3895c77363da927d7952ff786fe6c63048054db96400cf809511ce5cba144
 SHA512:
-  metadata.gz: 7bcb501ddcf0edfcd6d8be12a001dcec40634a33cbb682763f5e8a13ec8c1dcc629a3f4742c0dfa6509c49d4edd18eda48537b829c1b8ed83a7b5f5e4d5e99f5
-  data.tar.gz: 1ffeb23915904770e92ba1119dcd1f796325ba9d1cf3a9b8bada2b37a7c5e772a6a500a6212a65061ae5f1e895dd4ee1cbe1de2545afa5fd83813a4aadfbbe84
+  metadata.gz: 0d02ffe72075c23e20aa4d9d222074aa50b669ef3cb7485739e5b9b5cb473b0ff94f9981d3896e2ce3c64b10218222fcd2b65083ec3fb6dafb823806f46492c0
+  data.tar.gz: 27451965e8f4d3493bb7083dc8e6f7f4ad0b189186812d50374b8a7627c4006551bf56c3586b70e62621d470a7b692bc824c2eacb7f6726acf4c3b7a951d3f49

data/.gitignore

@@ -1,3 +1,6 @@
 pkg
 tmp
-Gemfile.lock
+Gemfile.lock
+.byebug_history
+.fcrepo_wrapper_test.yml
+.solr_wrapper_test.yml

data/.rubocop.yml

@@ -12,6 +12,7 @@ Lint/HandleExceptions:
 Metrics/AbcSize:
   Exclude:
     - 'spec/support/hyrax/basic_metadata.rb'
+    - 'lib/darlingtonia/hyrax_record_importer.rb'
 
 Metrics/BlockLength:
   Exclude:
@@ -26,6 +27,11 @@ Metrics/MethodLength:
   Exclude:
     - 'spec/support/hyrax/basic_metadata.rb'
     - 'lib/darlingtonia/hyrax_basic_metadata_mapper.rb'
+    - lib/darlingtonia/hyrax_record_importer.rb
+
+Naming/AccessorMethodName:
+  Exclude:
+    - lib/darlingtonia/hyrax_record_importer.rb
 
 RSpec/DescribeClass:
   Exclude:

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+2.0.0 - Mon Feb 4, 2019
+
+Assume our base use case is to import into Hyrax.
+  * Use HyraxRecordImporter as default
+  * Use HyraxMapper as default
+  * Add a getting started guide to the docs directory 
+
 1.2.3 - Thu Jan 24, 2019
 ------------------------
 

data/README.md

@@ -1,36 +1,60 @@
-Darlingtonia
-============
-[![Build Status](https://travis-ci.org/curationexperts/darlingtonia.svg?branch=master)](https://travis-ci.org/curationexperts/darlingtonia)
-[![Yard Docs](http://img.shields.io/badge/yard-docs-blue.svg)](http://www.rubydoc.info/gems/darlingtonia)
+# Darlingtonia
 
-Object import for Hyrax. See the [API documentation](https://www.rubydoc.info/gems/darlingtonia) for more
-information.
+<table width="100%">
+<tr><td>
+<img alt="Darlingtonia californica image" src="https://upload.wikimedia.org/wikipedia/commons/2/20/Darlingtonia_californica_ne1.JPG" width="500px">
+</td><td>
+Object import for Hyrax. See the <a href="https://www.rubydoc.info/gems/darlingtonia">API documentation</a> for more
+information. See the <a href="https://curationexperts.github.io/darlingtonia/">Getting Started</a> guide for a gentle introduction.
+<br/><br/>
+<a href="https://en.wikipedia.org/wiki/Darlingtonia_californica"><em>Darlingtonia californica</em></a>,
+also called the California pitcher plant, cobra lily, or cobra plant, is a species of carnivorous plant, the sole member of the genus <i>Darlingtonia</i> in the family <i>Sarraceniaceae</i>. It is native to Northern California and Oregon growing in bogs and seeps with cold running water.
+<br/><br/>
 
-Usage
------
+[![Gem Version](https://badge.fury.io/rb/darlingtonia.svg)](https://badge.fury.io/rb/darlingtonia)
+[![Build Status](https://travis-ci.org/curationexperts/darlingtonia.svg?branch=master)](https://travis-ci.org/curationexperts/darlingtonia)
+[![Yard Docs](http://img.shields.io/badge/yard-docs-blue.svg)](http://www.rubydoc.info/gems/darlingtonia)
 
-In your project's `Gemfile`, add: `gem 'darlingtonia', '~> 0.1'`, then do `bundle install`.
+</td></tr>
+</table>
 
+## Usage
 
-This software is primarily intended for use in a [Hyrax](https://github.com/samvera/hyrax) project.
-However, its dependency on `hyrax` is kept strictly optional so most of its code can be reused to
-good effect elsewhere.
+In your project's `Gemfile`, add: `gem 'darlingtonia'`, then run `bundle install`.
 
 To do a basic Hyrax import, first ensure that a [work type is registered](http://www.rubydoc.info/github/samvera/hyrax/Hyrax/Configuration#register_curation_concern-instance_method)
-with your `Hyrax` application. You need to provide a `Parser` (out of the box, we support simple CSV
-import with `CsvParser`).
+with your `Hyrax` application. Then write a class like this:
 
 ```ruby
-file = File.open('path/to/import.csv')
-parser = Darlingtonia::CsvParser.new(file: file)
+require 'darlingtonia'
 
-Darlingtonia::Importer.new(parser: parser).import
+class MyImporter
+  def initialize(csv_file)
+    @csv_file = csv_file
+    raise "Cannot find expected input file #{csv_file}" unless File.exist?(csv_file)
+  end
 
-file.close # unless a block is passed to File.open, the file must be explicitly closed
+  def import
+    file = File.open(@csv_file)
+    Darlingtonia::Importer.new(parser: Darlingtonia::CsvParser.new(file: file), record_importer: Darlingtonia::HyraxRecordImporter.new).import
+    file.close # unless a block is passed to File.open, the file must be explicitly closed
+  end
+end
 ```
 
-Development
------------
+You can find [an example csv file for import to Hyrax](https://github.com/curationexperts/darlingtonia/blob/master/spec/fixtures/hyrax/example.csv) in the fixtures directory. Files for attachment should have the filename in a column
+with a heading of `files`, and the location of the files should be specified via an
+environment variables called `IMPORT_PATH`. If `IMPORT_PATH` is not set, `HyraxRecordImporter` will look in `/opt/data` by default.
+
+## Customizing
+To input any kind of file other than CSV, you need to provide a `Parser` (out of the box, we support simple CSV import with `CsvParser`). We will be writing guides about
+how to support custom mappers (for metadata outside of Hyrax's core and basic metadata fields).
+
+This software is primarily intended for use in a [Hyrax](https://github.com/samvera/hyrax) project.
+However, its dependency on `hyrax` is kept strictly optional so most of its code can be reused to
+good effect elsewhere. Note: As of release 2.0, `HyraxBasicMetadataMapper` will be the default mapper.
+
+## Development
 
 ```sh
 git clone https://github.com/curationexperts/darlingtonia

data/darlingtonia.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
 
   gem.required_ruby_version = '>= 2.3.4'
 
-  gem.add_dependency 'active-fedora', '>= 12.0.2', '<= 12.99'
+  gem.add_dependency 'active-fedora', '>= 11.5.2'
 
   gem.add_development_dependency 'yard',           '~> 0.9'
   gem.add_development_dependency 'bixby',          '~> 0.3'
@@ -26,6 +26,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'coveralls',      '~> 0.8'
   gem.add_development_dependency 'solr_wrapper',   '~> 2.1'
   gem.add_development_dependency 'fcrepo_wrapper', '~> 0.9'
+  gem.add_development_dependency 'byebug'
 
   gem.files         = `git ls-files`.split("\n")
   gem.test_files    = `git ls-files -- {spec}/*`.split("\n")

data/docs/_config.yml

@@ -0,0 +1 @@
+theme: jekyll-theme-minimal

data/docs/index.md

@@ -0,0 +1,98 @@
+# Importing to Hyrax with Darlingtonia
+
+## Getting Started
+The simplest use case is importing content that matches [Hyrax's core and basic metadata fields](http://samvera.github.io/metadata_application_profile.html), plus a few extra fields that let Hyrax know how to display the content properly. At a very high level we're going to:
+1. Write a simple import test first
+1. Get the test passing
+1. Write a rake task to run your import with real data
+
+**Note:** This guide assumes that you already have a working Hyrax instance with at least one work type. If you need help doing that, see [the Hyrax documentation](https://github.com/samvera/hyrax#creating-a-hyrax-based-app). This guide is going to assume we're using an `Image` work type and attaching image files, but should be applicable to any work type or kind of attachment.
+
+### 1. Write a simple import test
+1. Make a directory for your importer: `mkdir app/importers`
+1. Make a directory for your importer tests: `mkdir spec/importers`
+1. Make a directory for your fixture files: `mkdir spec/fixtures/images`
+1. Put three small images in `spec/fixtures/images` In this guide, we're using copyright free images from https://www.pexels.com/, `birds.jpg`, `cat.jpg`, and `dog.jpg`.
+1. Make a directory for your CSV fixture files: `mkdir spec/fixtures/csv_import`
+1. Put a file like this in `spec/fixtures/csv_import`:
+  ```
+  title,source,visibility
+  "A Cute Dog",https://www.pexels.com/photo/animal-blur-canine-close-up-551628/,open
+  "An Interesting Cat",https://www.pexels.com/photo/person-holding-white-cat-1383397/,open
+  "A Flock of Birds",https://www.pexels.com/photo/animal-avian-beak-birds-203088/,open
+  ```
+1. Make a file called `spec/importers/modular_importer_spec.rb` that contains this:
+  ```ruby
+    # frozen_string_literal: true
+
+    require 'rails_helper'
+    require 'active_fedora/cleaner'
+
+    RSpec.describe ModularImporter do
+      let(:modular_csv)     { 'spec/fixtures/csv_import/modular_input.csv' }
+      let(:user) { ::User.batch_user }
+
+      before do
+        DatabaseCleaner.clean
+        ActiveFedora::Cleaner.clean!
+      end
+
+      it "imports a csv" do
+        expect { ModularImporter.new(modular_csv).import }.to change { Work.count }.by 3
+      end
+    end
+  ```
+1. Make a file called `app/importers/modular_importer.rb` that contains just enough of an importer class that your test can run and give a meaningful error:
+  ```ruby
+    class ModularImporter
+      def initialize(csv_file)
+        @csv_file = csv_file
+        raise "Cannot find expected input file #{csv_file}" unless File.exist?(csv_file)
+      end
+
+      def import
+      end
+    end
+  ```
+1. Run your test:
+  ```
+  bundle exec rspec spec/importers/modular_importer_spec.rb
+  ```
+  It should fail with a message like
+  ```
+  expected `Work.count` to have changed by 3, but was changed by 0
+  ```
+
+So, at this point, your test is running, but the importer isn't yet creating any records.
+
+### 2. Get the test passing
+1. Add the darlingtonia gem to your `Gemfile` and run bundle update:
+  ```
+    gem `darlingtonia`
+  ```
+2. Edit `app/importer/modular_importer.rb` so it looks like this:
+  ```ruby
+    require 'darlingtonia'
+
+    class ModularImporter
+      def initialize(csv_file)
+        @csv_file = csv_file
+        raise "Cannot find expected input file #{csv_file}" unless File.exist?(csv_file)
+      end
+
+      def import
+        file = File.open(@csv_file)
+        Darlingtonia::Importer.new(parser: Darlingtonia::CsvParser.new(file: file), record_importer: Darlingtonia::HyraxRecordImporter.new).import
+        file.close # Note that we must close any files we open.
+      end
+    end
+  ```
+3. Now your test should pass with output something like this:
+
+  ```
+  ModularImporter
+  Creating record: ["A Cute Dog"].Record created at: jw827b648Record created at: jw827b648Creating record: ["An Interesting Cat"].Record created at: 3n203z084Record created at: 3n203z084Creating record: ["A Flock of Birds"].Record created at: wm117n96bRecord created at: wm117n96b  imports a csv
+
+  Finished in 7.56 seconds (files took 9.06 seconds to load)
+  1 example, 0 failures
+  ```

data/lib/darlingtonia.rb

@@ -58,6 +58,7 @@ module Darlingtonia
 
   require 'darlingtonia/importer'
   require 'darlingtonia/record_importer'
+  require 'darlingtonia/hyrax_record_importer'
 
   require 'darlingtonia/input_record'
 

data/lib/darlingtonia/hyrax_basic_metadata_mapper.rb

@@ -12,10 +12,25 @@ module Darlingtonia
   #
   # @see HashMapper Parent class for more info and examples.
   class HyraxBasicMetadataMapper < HashMapper
+    # If your CSV headers don't exactly match the
+    # the method name for the property's setter
+    # method, add a mapping here.
+    # Example: the method name is work.resource_type,
+    # but in the CSV file, the header is
+    # 'resource type' (without the underscore).
+    CSV_HEADERS = {
+      resource_type: 'resource type',
+      description: 'abstract or summary',
+      rights_statement: 'rights statement',
+      date_created: 'date created',
+      based_near: 'location',
+      related_url: 'related url'
+    }.freeze
+
     ##
     # @return [Enumerable<Symbol>] The fields the mapper can process.
     def fields
-      core_fields + basic_fields
+      core_fields + basic_fields + [:visibility]
     end
 
     # Properties defined with `multiple: false` in
@@ -45,6 +60,10 @@ module Darlingtonia
       metadata['import_url']
     end
 
+    def visibility
+      metadata['visibility']
+    end
+
     ##
     # @return [String] The delimiter that will be used to split a metadata field into separate values.
     # @example
@@ -60,7 +79,9 @@ module Darlingtonia
     ##
     # @see MetadataMapper#map_field
     def map_field(name)
-      Array(metadata[name.to_s]&.split(delimiter))
+      method_name = name
+      method_name = CSV_HEADERS[name] if CSV_HEADERS.keys.include?(name)
+      Array(metadata[method_name.to_s]&.split(delimiter))
     end
 
     protected

data/lib/darlingtonia/hyrax_record_importer.rb

@@ -0,0 +1,117 @@
+# frozen_string_literal: true
+module Darlingtonia
+  class HyraxRecordImporter < RecordImporter
+    # TODO: Get this from Hyrax config
+    DEFAULT_CREATOR_KEY = 'batchuser@example.com'
+
+    ##
+    # @!attribute [rw] creator
+    #   @return [User]
+    attr_accessor :creator
+    attr_accessor :collection_id
+
+    ##
+    # @param creator   [User]
+    def initialize(error_stream: Darlingtonia.config.default_error_stream,
+                   info_stream: Darlingtonia.config.default_info_stream,
+                   collection_id: nil)
+      self.creator = ::User.find_or_create_system_user(DEFAULT_CREATOR_KEY)
+      self.collection_id = collection_id
+
+      super(error_stream: error_stream, info_stream: info_stream)
+    end
+
+    ##
+    # @param record [ImportRecord]
+    #
+    # @return [void]
+    def import(record:)
+      create_for(record: record)
+    rescue Faraday::ConnectionFailed, Ldp::HttpError => e
+      error_stream << e
+    rescue RuntimeError => e
+      error_stream << e
+      raise e
+    end
+
+    # TODO: You should be able to specify the import type in the import
+    def import_type
+      raise 'No curation_concern found for import' unless
+        defined?(Hyrax) && Hyrax&.config&.curation_concerns&.any?
+
+      Hyrax.config.curation_concerns.first
+    end
+
+    # Depositor is a required field for Hyrax
+    # If it hasn't been set in the metadata, set it to the Hyrax default batch user
+    # Even if it has been set, for now, override that with the batch user.
+    # @param Darlingtonia::InputRecord
+    def set_depositor(record)
+      record.mapper.metadata["depositor"] = @creator.user_key
+    end
+
+    # The path on disk where file attachments can be found
+    def file_attachments_path
+      ENV['IMPORT_PATH'] || '/opt/data'
+    end
+
+    # Create a Hyrax::UploadedFile for each file attachment
+    # TODO: What if we can't find the file?
+    # TODO: How do we specify where the files can be found?
+    # @param [Darlingtonia::InputRecord]
+    # @return [Array] an array of Hyrax::UploadedFile ids
+    def create_upload_files(record)
+      file_attachment_filenames = record.mapper.metadata["files"]
+      return [] if file_attachment_filenames.nil? || file_attachment_filenames.empty?
+
+      files_to_attach = file_attachment_filenames.split(record.mapper.delimiter)
+
+      uploaded_file_ids = []
+      files_to_attach.each do |filename|
+        file = File.open(find_file_path(filename))
+        uploaded_file = Hyrax::UploadedFile.create(user: @creator, file: file)
+        uploaded_file_ids << uploaded_file.id
+        file.close
+      end
+      uploaded_file_ids
+    end
+
+    ##
+    # Within the directory specified by ENV['IMPORT_PATH'], find the first
+    # instance of a file matching the given filename.
+    # @param [String] filename
+    # @return [String] a full pathname to the found file
+    def find_file_path(filename)
+      Dir.glob("#{ENV['IMPORT_PATH']}/**/#{filename}").first
+    end
+
+    private
+
+      # Create an object using the Hyrax actor stack
+      # We assume the object was created as expected if the actor stack returns true.
+      def create_for(record:)
+        info_stream << 'Creating record: ' \
+                       "#{record.respond_to?(:title) ? record.title : record}."
+        set_depositor(record)
+        uploaded_files = { uploaded_files: create_upload_files(record) }
+        created    = import_type.new
+
+        attributes = record.attributes.merge(uploaded_files)
+        attributes = attributes.merge(member_of_collection_ids: [collection_id]) if collection_id
+
+        actor_env  = Hyrax::Actors::Environment.new(created,
+                                                    ::Ability.new(@creator),
+                                                    attributes)
+
+        if Hyrax::CurationConcern.actor.create(actor_env)
+          info_stream << "Record created at: #{created.id}"
+        else
+          created.errors.each do |attr, msg|
+            error_stream << "Validation failed: #{attr.capitalize}. #{msg}"
+          end
+        end
+
+        info_stream << "Record created at: #{created.id}"
+      end
+  end
+end

data/lib/darlingtonia/input_record.rb

@@ -14,7 +14,7 @@ module Darlingtonia
 
     ##
     # @param mapper [#map_fields]
-    def initialize(mapper: HashMapper.new)
+    def initialize(mapper: HyraxBasicMetadataMapper.new)
       self.mapper = mapper
     end
 
@@ -25,7 +25,7 @@ module Darlingtonia
       #
       # @return [InputRecord] an input record mapping metadata with the given
       #   mapper
-      def from(metadata:, mapper: HashMapper.new)
+      def from(metadata:, mapper: HyraxBasicMetadataMapper.new)
         mapper.metadata = metadata
         new(mapper: mapper)
       end

data/lib/darlingtonia/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Darlingtonia
-  VERSION = '1.2.3'
+  VERSION = '2.0.0'
 end

data/spec/darlingtonia/csv_parser_spec.rb

@@ -11,7 +11,7 @@ describe Darlingtonia::CsvParser do
   shared_context 'with content' do
     let(:csv_content) do
       <<-EOS
-title,description,date
+title,description,date created
 The Moomins and the Great Flood,"The Moomins and the Great Flood (Swedish: Småtrollen och den stora översvämningen, literally The Little Trolls and the Great Flood) is a book written by Finnish author Tove Jansson in 1945, during the end of World War II. It was the first book to star the Moomins, but is often seen as a prelude to the main Moomin books, as most of the main characters are introduced in the next book.",1945
 Comet in Moominland,"Comet in Moominland is the second in Tove Jansson's series of Moomin books. Published in 1946, it marks the first appearance of several main characters, like Snufkin and the Snork Maiden.",1946
 EOS
@@ -44,7 +44,7 @@ EOS
       end
 
       it 'has correct other fields' do
-        expect(parser.records.map(&:date)).to contain_exactly(['1945'], ['1946'])
+        expect(parser.records.map(&:date_created)).to contain_exactly(['1945'], ['1946'])
       end
     end
 

data/spec/darlingtonia/hyrax_basic_metadata_mapper_spec.rb

@@ -19,12 +19,16 @@ describe Darlingtonia::HyraxBasicMetadataMapper do
      :related_url, :bibliographic_citation, :source]
   end
 
+  let(:tenejo_fields) do
+    [:visibility]
+  end
+
   it_behaves_like 'a Darlingtonia::Mapper' do
     let(:metadata) do
       { title: ['A Title for a Record'],
         my_custom_field: ['This gets ignored'] }
     end
-    let(:expected_fields) { core_fields + basic_fields }
+    let(:expected_fields) { core_fields + basic_fields + tenejo_fields }
   end
 
   context 'with metadata, but some missing fields' do

data/spec/darlingtonia/hyrax_record_importer_spec.rb

@@ -0,0 +1,103 @@
+# frozen_string_literal: true
+require 'spec_helper'
+
+describe Darlingtonia::HyraxRecordImporter, :clean do
+  subject(:importer) do
+    described_class.new(error_stream: error_stream, info_stream: info_stream)
+  end
+
+  let(:error_stream) { [] }
+  let(:info_stream)  { [] }
+  let(:record)       { Darlingtonia::InputRecord.from(metadata: metadata) }
+
+  context 'collection id' do
+    subject(:importer) do
+      described_class.new(collection_id: collection_id)
+    end
+    let(:collection_id) { '123' }
+
+    load File.expand_path("../../support/shared_contexts/with_work_type.rb", __FILE__)
+    include_context 'with a work type'
+
+    it 'can have a collection id' do
+      expect(importer.collection_id).to eq collection_id
+    end
+  end
+
+  context 'with no attached files' do
+    let(:metadata) do
+      {
+        'title' => 'A Title',
+        'language' => 'English',
+        'visibility' => 'open'
+      }
+    end
+    load File.expand_path("../../support/shared_contexts/with_work_type.rb", __FILE__)
+    include_context 'with a work type'
+
+    it 'creates a work for record' do
+      expect { importer.import(record: record) }
+        .to change { Work.count }
+        .by 1
+    end
+  end
+
+  context 'with attached files' do
+    before do
+      ENV['IMPORT_PATH'] = File.expand_path('../fixtures/images', File.dirname(__FILE__))
+    end
+    let(:metadata) do
+      {
+        'title' => 'A Title',
+        'language' => 'English',
+        'visibility' => 'open',
+        'files' => 'darlingtonia.png|~|cat.png'
+      }
+    end
+    load File.expand_path("../../support/shared_contexts/with_work_type.rb", __FILE__)
+    include_context 'with a work type'
+    it 'finds a file even if it is in a subdirectory' do
+      expect(importer.find_file_path('cat.png')).to eq "#{ENV['IMPORT_PATH']}/animals/cat.png"
+    end
+    it 'creates a work for record' do
+      expect { importer.import(record: record) }
+        .to change { Work.count }
+        .by 1
+    end
+    it 'makes an uploaded file object for each file attachment' do
+      expect { importer.import(record: record) }
+        .to change { Hyrax::UploadedFile.count }
+        .by 2
+    end
+  end
+
+  context 'with and without a depositor value' do
+    context 'when there is no depositor set' do
+      let(:metadata) do
+        {
+          'title' => 'A Title',
+          'language' => 'English',
+          'visibility' => 'open'
+        }
+      end
+      it 'adds the batch user as the depositor' do
+        importer.set_depositor(record)
+        expect(record.mapper.metadata["depositor"]).to eq "batchuser@example.com"
+      end
+    end
+    context 'when there is a depositor set' do
+      let(:metadata) do
+        {
+          'title' => 'A Title',
+          'language' => 'English',
+          'visibility' => 'open',
+          'depositor' => 'my@custom.depositor'
+        }
+      end
+      it 'resets the batch user as the depositor' do
+        importer.set_depositor(record)
+        expect(record.mapper.metadata["depositor"]).to eq "batchuser@example.com"
+      end
+    end
+  end
+end

data/spec/darlingtonia/input_record_spec.rb

@@ -6,13 +6,17 @@ describe Darlingtonia::InputRecord do
   subject(:record) { described_class.from(metadata: metadata) }
 
   let(:metadata) do
-    { 'title'       => 'Comet in Moominland',
-      'description' => 'A book about moomins.' }
+    { 'title' => 'Comet in Moominland',
+      'abstract or summary' => 'A book about moomins.' }
+  end
+
+  it 'defaults to a Hyrax Mapper' do
+    expect(described_class.new).to have_attributes(mapper: an_instance_of(Darlingtonia::HyraxBasicMetadataMapper))
   end
 
   it 'has metadata and a mapper' do
     is_expected
-      .to have_attributes(mapper: an_instance_of(Darlingtonia::HashMapper))
+      .to have_attributes(mapper: an_instance_of(Darlingtonia::HyraxBasicMetadataMapper))
   end
 
   describe '#attributes' do
@@ -51,7 +55,7 @@ describe Darlingtonia::InputRecord do
     end
 
     it 'has methods for additional mapped metadata fields' do
-      expect(record.description).to contain_exactly metadata['description']
+      expect(record.description).to contain_exactly metadata['abstract or summary']
     end
 
     it 'knows it responds to methods for metadata fields' do

data/spec/darlingtonia/record_importer_spec.rb

@@ -9,7 +9,14 @@ describe Darlingtonia::RecordImporter, :clean do
 
   let(:error_stream) { [] }
   let(:info_stream)  { [] }
-  let(:record)       { Darlingtonia::InputRecord.new }
+  let(:record)       { Darlingtonia::InputRecord.from(metadata: metadata) }
+  let(:metadata) do
+    {
+      'title' => 'A Title',
+      'language' => 'English',
+      'visibility' => 'open'
+    }
+  end
 
   it 'raises an error when no work type exists' do
     expect { importer.import(record: record) }

data/spec/fixtures/hyrax/example.csv

@@ -1,3 +1,3 @@
-title,depositor,date_uploaded,date_modified,label,relative_path,import_url,resource_type,creator,contributor,description,keyword,license,rights_statement,publisher,date_created,subject,language,identifier,based_near,related_url,bibliographic_citation,source
+title,depositor,date_uploaded,date_modified,label,relative_path,import_url,resource type,creator,contributor,abstract or summary,keyword,license,rights statement,publisher,date created,subject,language,identifier,location,related url,bibliographic_citation,source
 Work 1 Title,user@example.com,2018-12-21,2018-01-01,Work 1 Label,tmp/files,https://example.com,Work 1 Type,Work 1 creator,Work 1 contrib,Desc 1,Key 1,Lic 1,RS 1,Pub 1,2018-06-06,Subj 1,English|~|Japanese,Ident 1,Based 1,https://example.com/related,Bib 1,Source 1
 Work 2 Title,,1970-12-21,,Work 2 Label,,,Work 2 Type,,,Desc 2,,,,Pub 2,,Subj 2

data/spec/spec_helper.rb

@@ -8,6 +8,7 @@ require 'active_fedora'
 require 'active_fedora/cleaner'
 require 'darlingtonia'
 require 'darlingtonia/spec'
+require 'byebug'
 
 RSpec.configure do |config|
   config.filter_run focus: true

data/spec/support/shared_contexts/with_work_type.rb

@@ -7,10 +7,25 @@ shared_context 'with a work type' do
     load './spec/support/hyrax/basic_metadata.rb'
 
     class Work < ActiveFedora::Base
+      attr_accessor :visibility
       include ::Hyrax::CoreMetadata
       include ::Hyrax::BasicMetadata
     end
 
+    class User
+      def self.find_or_create_system_user(_email)
+        User.new
+      end
+
+      def user_key
+        'batchuser@example.com'
+      end
+    end
+
+    class Ability
+      def initialize(user); end
+    end
+
     module Hyrax
       def self.config
         Config.new
@@ -21,6 +36,33 @@ shared_context 'with a work type' do
           [Work]
         end
       end
+
+      class UploadedFile < ActiveFedora::Base
+        def self.create(*)
+          h = Hyrax::UploadedFile.new
+          h.save
+          h
+        end
+      end
+
+      module Actors
+        class Environment
+          def initialize(new_object, ability, attributes); end
+        end
+      end
+
+      class Actor
+        def create(_actor_env)
+          Work.create
+          true
+        end
+      end
+
+      class CurationConcern
+        def self.actor
+          Hyrax::Actor.new
+        end
+      end
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: darlingtonia
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 2.0.0
 platform: ruby
 authors:
 - Data Curation Experts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-24 00:00:00.000000000 Z
+date: 2019-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active-fedora
@@ -16,20 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 12.0.2
-    - - "<="
-      - !ruby/object:Gem::Version
-        version: '12.99'
+        version: 11.5.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 12.0.2
-    - - "<="
-      - !ruby/object:Gem::Version
-        version: '12.99'
+        version: 11.5.2
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -128,6 +122,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: byebug
+  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'
 description: 
 email:
 - administrator@curationexperts.com
@@ -143,10 +151,13 @@ files:
 - README.md
 - Rakefile
 - darlingtonia.gemspec
+- docs/_config.yml
+- docs/index.md
 - lib/darlingtonia.rb
 - lib/darlingtonia/always_invalid_validator.rb
 - lib/darlingtonia/hash_mapper.rb
 - lib/darlingtonia/hyrax_basic_metadata_mapper.rb
+- lib/darlingtonia/hyrax_record_importer.rb
 - lib/darlingtonia/importer.rb
 - lib/darlingtonia/input_record.rb
 - lib/darlingtonia/metadata_mapper.rb
@@ -169,6 +180,7 @@ files:
 - spec/darlingtonia/formatted_message_stream_spec.rb
 - spec/darlingtonia/hash_mapper_spec.rb
 - spec/darlingtonia/hyrax_basic_metadata_mapper_spec.rb
+- spec/darlingtonia/hyrax_record_importer_spec.rb
 - spec/darlingtonia/importer_spec.rb
 - spec/darlingtonia/input_record_spec.rb
 - spec/darlingtonia/parser_spec.rb
@@ -180,6 +192,8 @@ files:
 - spec/fixtures/bad_example.csv
 - spec/fixtures/example.csv
 - spec/fixtures/hyrax/example.csv
+- spec/fixtures/images/animals/cat.png
+- spec/fixtures/images/darlingtonia.png
 - spec/integration/import_csv_spec.rb
 - spec/integration/import_hyrax_csv.rb
 - spec/spec_helper.rb