cdm_migrator 3.2.0 → 3.3.1

data/app/views/cdm_migrator/csv/_error_list.html.erb

@@ -0,0 +1,21 @@
+<% if @error_list && @error_list.any? %>
+  <%#= @error_list.inspect %>
+  <table class="table table-striped">
+    <thead>
+    <tr>
+      <th scope="col" style="min-width: 100px;">Line No.</th>
+      <th scope="col" style="margin-right: 0.5em;">Column(s)</th>
+      <th scope="col">Issue</th>
+    </tr>
+    </thead>
+    <tbody>
+    <% @error_list.keys.each do |line_number| %>
+      <tr>
+        <td><%= line_number %></td>
+        <td><%= @error_list[line_number].keys.join("<br />").html_safe %></td>
+        <td><%= @error_list[line_number].values.join("<br />").html_safe %></td>
+      </tr>
+    <% end %>
+    </tbody>
+  </table>
+<% end %>

data/app/views/cdm_migrator/csv/_list_batches.html.erb

@@ -1,21 +1,21 @@
-<tr id="batch_<%= batch.id %>">
-
-  <td><%= batch.name %></td>
-
-  <td class="date"><%= batch.created_at %></td>
-
-  <td><%= batch.username %></td>
-
-
-  <td><%= batch.progress %></td>
-  <td><%= batch.message? ? "<button onclick=\"alert('#{batch.message.html_safe}');\">View Message</button>".html_safe : "No Message" %></td>
-
-  <td>
-    <%= link_to(
-            "Run Again",
-            main_app.csv_rerun_path(id: batch.id),
-            data: { 'create-type' => 'batch' },
-            class: 'btn btn-primary'
-        ) if batch.complete? && (current_ability.admin? || current_page?(main_app.csv_my_batches_path(locale: nil))) %>
-  </td>
-</tr>
+<tr id="batch_<%= batch.id %>">
+
+  <td><%= batch.name %></td>
+
+  <td class="date"><%= batch.created_at %></td>
+
+  <td><%= batch.username %></td>
+
+
+  <td><%= batch.progress %></td>
+  <td><%= batch.message? ? "<button onclick=\"alert('#{batch.message.html_safe}');\">View Message</button>".html_safe : "No Message" %></td>
+
+  <td>
+    <%= link_to(
+            "Run Again",
+            main_app.csv_rerun_path(id: batch.id),
+            data: { 'create-type' => 'batch' },
+            class: 'btn btn-primary'
+        ) if batch.complete? && (current_ability.admin? || current_page?(main_app.csv_my_batches_path(locale: nil))) %>
+  </td>
+</tr>

data/app/views/cdm_migrator/csv/_tabs.html.erb

@@ -1,8 +1,8 @@
-<ul class="nav nav-tabs" id="my_nav" role="navigation">
-  <li<%= ' class="active"'.html_safe if current_page?(main_app.csv_all_batches_path(locale: nil)) %>>
-    <%= link_to "All CSV Batches", main_app.csv_all_batches_path %>
-  </li>
-  <li<%= ' class="active"'.html_safe if current_page?(main_app.csv_my_batches_path(locale: nil)) %>>
-    <%= link_to "My CSV Batches", main_app.csv_my_batches_path %>
-  </li>
-</ul>
+<ul class="nav nav-tabs" id="my_nav" role="navigation">
+  <li<%= ' class="active"'.html_safe if current_page?(main_app.csv_all_batches_path(locale: nil)) %>>
+    <%= link_to "All CSV Batches", main_app.csv_all_batches_path %>
+  </li>
+  <li<%= ' class="active"'.html_safe if current_page?(main_app.csv_my_batches_path(locale: nil)) %>>
+    <%= link_to "My CSV Batches", main_app.csv_my_batches_path %>
+  </li>
+</ul>

data/app/views/cdm_migrator/csv/csv_checker.html.erb

@@ -1,46 +1,46 @@
-<% provide :page_title, "CSV Checker" %>
-
-<%#= flash[:alert].join("<br/>") if flash[:alert] %>
-
-<h1>CSV Checker</h1>
-
-<!-- <div class="row"> -->
-<p>This tool validates CSV data and creates a table listing any errors.</p>
-
-<a role="button" class="collapse-toggle collapsed csv-collapse-link" data-toggle="collapse" data-target="#errors-explanation" aria-expanded="false">
-  <span id="csv-collapse-link-text">Expand for more details</span>
-</a>
-<div class="collapse" id="errors-explanation">
-  <ul>
-    <li><strong>File paths: </strong>The url field contains a valid path to a file.</li>
-    <li><strong>Multi-value separator: </strong>Configured fields with URIs contain the right separator character (e.g. |).</li>
-    <% if @path_to_drive.present? %>
-      <li><strong>Mounted drive: </strong>A mounted directory (folder) exists and is not empty.</li>
-    <% end %>
-    <% if @edtf_fields.present? %>
-      <li><strong>EDTF dates: </strong>Configured fields contain valid <a href="https://www.loc.gov/standards/datetime/" target="_blank">EDTF</a> dates or "unknown."</li>
-    <% end %>
-    <% if @uri_fields.present? %>
-      <li><strong>Valid URIs ("page" vs "vocab"): </strong>Configured fields with URIs link to the "vocab" address rather than the "page" address. For example, rights_statement should be "http://rightsstatement.org/vocab/..." and not "https://rightsstatement.org/page/..."</li>
-    <% end %>
-  </ul>
-</div>
-
-
-
-<%= form_tag(check_csv_path, remote: true, method: :post, multipart: true, id: "csv-form") do %>
-  <div class="input-group">
-    <%= label_tag :multi_value_separator %>
-    <%= text_field_tag(:multi_value_separator, @separator, size: 1) %>
-    <%= file_field_tag(:file, class: "form-control-file") %>
-    <%= hidden_field_tag :authenticity_token, value: form_authenticity_token %>
-    <%= button_tag(type: :submit, class: "btn btn-large btn-primary", style: "margin-top: 1em;") do %>
-      Check CSV
-    <% end %>
-<% end %>
-</div>
-<!-- </div> -->
-
-<div id="error_list" class="col-md-10 offset-md-1">
-  <%= render 'error_list' %>
+<% provide :page_title, "CSV Checker" %>
+
+<%#= flash[:alert].join("<br/>") if flash[:alert] %>
+
+<h1>CSV Checker</h1>
+
+<!-- <div class="row"> -->
+<p>This tool validates CSV data and creates a table listing any errors.</p>
+
+<a role="button" class="collapse-toggle collapsed csv-collapse-link" data-toggle="collapse" data-target="#errors-explanation" aria-expanded="false">
+  <span id="csv-collapse-link-text">Expand for more details</span>
+</a>
+<div class="collapse" id="errors-explanation">
+  <ul>
+    <li><strong>File paths: </strong>The url field contains a valid path to a file.</li>
+    <li><strong>Multi-value separator: </strong>Configured fields with URIs contain the right separator character (e.g. |).</li>
+    <% if @path_to_drive.present? %>
+      <li><strong>Mounted drive: </strong>A mounted directory (folder) exists and is not empty.</li>
+    <% end %>
+    <% if @edtf_fields.present? %>
+      <li><strong>EDTF dates: </strong>Configured fields contain valid <a href="https://www.loc.gov/standards/datetime/" target="_blank">EDTF</a> dates or "unknown."</li>
+    <% end %>
+    <% if @uri_fields.present? %>
+      <li><strong>Valid URIs ("page" vs "vocab"): </strong>Configured fields with URIs link to the "vocab" address rather than the "page" address. For example, rights_statement should be "http://rightsstatement.org/vocab/..." and not "https://rightsstatement.org/page/..."</li>
+    <% end %>
+  </ul>
+</div>
+
+
+
+<%= form_tag(check_csv_path, remote: true, method: :post, multipart: true, id: "csv-form") do %>
+  <div class="input-group">
+    <%= label_tag :multi_value_separator %>
+    <%= text_field_tag(:multi_value_separator, @separator, size: 1) %>
+    <%= file_field_tag(:file, class: "form-control-file") %>
+    <%= hidden_field_tag :authenticity_token, value: form_authenticity_token %>
+    <%= button_tag(type: :submit, class: "btn btn-large btn-primary", style: "margin-top: 1em;") do %>
+      Check CSV
+    <% end %>
+<% end %>
+</div>
+<!-- </div> -->
+
+<div id="error_list" class="col-md-10 offset-md-1">
+  <%= render 'error_list' %>
 </div>

data/app/views/cdm_migrator/csv/edit.html.erb

@@ -1,18 +1,17 @@
-
-<h1><span class="fa fa-map"></span> Export </h1>
-
-<%= form_tag main_app.csv_export_path, method: :post do %>
-  <%= select_tag 'collection_id', options_for_select(@collections), include_blank: true %>
-  <%= submit_tag "Download CSV", class: 'btn btn-primary' %>
-<% end %>
-
-<h1><span class="fa fa-map"></span> Update </h1>
-
-<%= form_for :csv_update, url: csv_update_path do |f| %>
-  <%= f.label 'Multi-value Separator:' %>
-  <%= f.text_field 'mvs' %>
-  <br />
-  <%= f.file_field 'csv_file' %>
-  <br />
-  <%= f.submit 'Save' %>
-<% end %>
+
+<h1><span class="fa fa-map"></span> Export </h1>
+
+<%= form_tag main_app.csv_export_path, method: :post do %>
+  <%= select_tag 'collection_id', options_for_select(@collections.sort { |x,y| x[0].downcase <=> y[0].downcase }), include_blank: true %>
+  <%= submit_tag "Download CSV", class: 'btn btn-primary' %>
+<% end %>
+<h1><span class="fa fa-map"></span> Update </h1>
+
+<%= form_for :csv_update, url: csv_update_path do |f| %>
+  <%= f.label 'Multi-value Separator:' %>
+  <%= f.text_field 'mvs' %>
+  <br />
+  <%= f.file_field 'csv_file' %>
+  <br />
+  <%= f.submit 'Save' %>
+<% end %>

data/app/views/cdm_migrator/csv/index.html.erb

@@ -1,19 +1,19 @@
-<% provide :page_title, "Batches" %>
-
-
-<% provide :page_header do %>
-  <h1><span class="fa fa-database" aria-hidden="true"></span> <%= "Batches" %></h1>
-<% end %>
-
-<div class="row">
-  <div class="col-md-12">
-    <div class="panel panel-default tabs">
-      <%= render 'tabs' %>
-      <div class="panel-body">
-        <%= render 'batches_list' %>
-
-        <%#= render 'results_pagination' %>
-      </div>
-    </div>
-  </div>
-</div>
+<% provide :page_title, "Batches" %>
+
+
+<% provide :page_header do %>
+  <h1><span class="fa fa-database" aria-hidden="true"></span> <%= "Batches" %></h1>
+<% end %>
+
+<div class="row">
+  <div class="col-md-12">
+    <div class="panel panel-default tabs">
+      <%= render 'tabs' %>
+      <div class="panel-body">
+        <%= render 'batches_list' %>
+
+        <%#= render 'results_pagination' %>
+      </div>
+    </div>
+  </div>
+</div>

data/app/views/cdm_migrator/csv/upload.html.erb

@@ -1,18 +1,18 @@
-<h1><span class="fa fa-angle-double-up"></span> <%= default_page_title %></h1>
-
-<%= form_for :csv_import, url: csv_create_path do |f| %>
-	<%= f.label 'Multi-value Separator:' %>
-    <%= f.text_field 'mvs' %>
-    <br />
-    <%= f.file_field 'csv_file' %>
-    <br />
-    <%= f.label 'Admin Set:' %>
-    <%= select_tag "admin_set", options_for_select(@admin_sets), :include_blank => true %>
-    <br />
-    <%= f.label 'Collection:' %>
-    <%= select_tag "collection", options_for_select(@collections), :include_blank => true %>
-    <br />
-	<%= f.submit 'Save' %>
-<% end %>
-<br />
-<%= link_to "template", csv_generate_path %>
+<h1><span class="fa fa-angle-double-up"></span> <%= default_page_title %></h1>
+
+<%= form_for :csv_import, url: csv_create_path do |f| %>
+	<%= f.label 'Multi-value Separator:' %>
+    <%= f.text_field 'mvs' %>
+    <br />
+    <%= f.file_field 'csv_file' %>
+    <br />
+    <%= f.label 'Admin Set:' %>
+    <%= select_tag "admin_set", options_for_select(@admin_sets), :include_blank => true %>
+    <br />
+    <%= f.label 'Collection:' %>
+    <%= select_tag "collection", options_for_select(@collections.sort { |x,y| x[0].downcase <=> y[0].downcase }), :include_blank => true %>
+		<br />
+	<%= f.submit 'Save', data: { disable_with: 'Submitting CSV...' } %>
+<% end %>
+<br />
+<%= link_to "template", csv_generate_path %>

data/app/views/layouts/cdm_migrator/application.html.erb

@@ -1,14 +1,14 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <title>Cdm migrator</title>
-  <%= stylesheet_link_tag    "cdm_migrator/application", media: "all" %>
-  <%= javascript_include_tag "cdm_migrator/application" %>
-  <%= csrf_meta_tags %>
-</head>
-<body>
-
-<%= yield %>
-
-</body>
-</html>
+<!DOCTYPE html>
+<html>
+<head>
+  <title>Cdm migrator</title>
+  <%= stylesheet_link_tag    "cdm_migrator/application", media: "all" %>
+  <%= javascript_include_tag "cdm_migrator/application" %>
+  <%= csrf_meta_tags %>
+</head>
+<body>
+
+<%= yield %>
+
+</body>
+</html>

data/config/routes.rb

@@ -1,19 +1,19 @@
-Rails.application.routes.draw do
-  get '/cdm_migrator/upload', to: 'cdm_migrator/csv#upload', as: 'csv_upload'
-  post '/cdm_migrator/upload', to: 'cdm_migrator/csv#create', as: 'csv_create'
-  get '/cdm_migrator/generate', to: 'cdm_migrator/csv#generate', as: 'csv_generate'
-  get '/cdm_migrator/my/batches', to: 'cdm_migrator/csv#index', as: 'csv_my_batches'
-  get '/cdm_migrator/batches', to: 'cdm_migrator/csv#index', as: 'csv_all_batches'
-  get '/cdm_migrator/rerun/:id', to: 'cdm_migrator/csv#rerun', as: 'csv_rerun'
-  get '/cdm_migrator/edit', to: 'cdm_migrator/csv#edit', as: 'csv_edit'
-  post '/cdm_migrator/export', to: 'cdm_migrator/csv#export', as: 'csv_export'
-  post '/cdm_migrator/update', to: 'cdm_migrator/csv#update', as: 'csv_update'
-
-  get '/cdm_migrator/csv_checker', to: 'cdm_migrator/csv#csv_checker', as: 'csv_checker'
-  post '/cdm_migrator/csv_checker', to: 'cdm_migrator/csv#csv_checker', as: 'check_csv'
-
-  get '/cdm_migrator/collection', to: 'cdm_migrator/cdm#collection', as: 'cdm_start'
-  post '/cdm_migrator/mappings/', to: 'cdm_migrator/cdm#mappings', as: 'cdm_mappings'
-  post '/cdm_migrator/generate/', to: 'cdm_migrator/cdm#generate', as: 'cdm_generate'
-  post '/cdm_migrator/template', to: 'cdm_migrator/cdm#template', as: 'cdm_template'
-end
+Rails.application.routes.draw do
+  get '/cdm_migrator/upload', to: 'cdm_migrator/csv#upload', as: 'csv_upload'
+  post '/cdm_migrator/upload', to: 'cdm_migrator/csv#create', as: 'csv_create'
+  get '/cdm_migrator/generate', to: 'cdm_migrator/csv#generate', as: 'csv_generate'
+  get '/cdm_migrator/my/batches', to: 'cdm_migrator/csv#index', as: 'csv_my_batches'
+  get '/cdm_migrator/batches', to: 'cdm_migrator/csv#index', as: 'csv_all_batches'
+  get '/cdm_migrator/rerun/:id', to: 'cdm_migrator/csv#rerun', as: 'csv_rerun'
+  get '/cdm_migrator/edit', to: 'cdm_migrator/csv#edit', as: 'csv_edit'
+  post '/cdm_migrator/export', to: 'cdm_migrator/csv#export', as: 'csv_export'
+  post '/cdm_migrator/update', to: 'cdm_migrator/csv#update', as: 'csv_update'
+
+  get '/cdm_migrator/csv_checker', to: 'cdm_migrator/csv#csv_checker', as: 'csv_checker'
+  post '/cdm_migrator/csv_checker', to: 'cdm_migrator/csv#csv_checker', as: 'check_csv'
+
+  get '/cdm_migrator/collection', to: 'cdm_migrator/cdm#collection', as: 'cdm_start'
+  post '/cdm_migrator/mappings/', to: 'cdm_migrator/cdm#mappings', as: 'cdm_mappings'
+  post '/cdm_migrator/generate/', to: 'cdm_migrator/cdm#generate', as: 'cdm_generate'
+  post '/cdm_migrator/template', to: 'cdm_migrator/cdm#template', as: 'cdm_template'
+end

data/db/migrate/20191211193859_create_batch_ingests.rb

@@ -1,20 +1,20 @@
-class CreateBatchIngests < ActiveRecord::Migration[5.0]
-  def up
-    create_table :batch_ingests do |t|
-      t.text :data
-      t.string :admin_set_id
-      t.string :collection_id
-      t.text :message
-      t.integer :size
-      t.string :csv
-      t.references :user, foreign_key: true
-      t.boolean :complete, default: false
-
-      t.timestamps
-    end
-  end
-
-  def down
-    drop_table :batch_ingests
-  end
+class CreateBatchIngests < ActiveRecord::Migration[5.0]
+  def up
+    create_table :batch_ingests do |t|
+      t.text :data
+      t.string :admin_set_id
+      t.string :collection_id
+      t.text :message
+      t.integer :size
+      t.string :csv
+      t.references :user, foreign_key: true
+      t.boolean :complete, default: false
+
+      t.timestamps
+    end
+  end
+
+  def down
+    drop_table :batch_ingests
+  end
 end

data/db/migrate/20191212192315_create_ingest_works.rb

@@ -1,18 +1,18 @@
-class CreateIngestWorks < ActiveRecord::Migration[5.0]
-  def up
-    create_table :ingest_works do |t|
-      t.string :work_type
-      t.text :data
-      t.text :files
-      t.boolean :complete, :default => false
-
-      t.references :batch_ingest, foreign_key: true
-
-      t.timestamps
-    end
-  end
-
-  def down
-    drop_table :ingest_works
-  end
-end
+class CreateIngestWorks < ActiveRecord::Migration[5.0]
+  def up
+    create_table :ingest_works do |t|
+      t.string :work_type
+      t.text :data
+      t.text :files
+      t.boolean :complete, :default => false
+
+      t.references :batch_ingest, foreign_key: true
+
+      t.timestamps
+    end
+  end
+
+  def down
+    drop_table :ingest_works
+  end
+end

data/lib/cdm_migrator/engine.rb

@@ -1,29 +1,29 @@
-module CdmMigrator
-  class Engine < ::Rails::Engine
-
-    initializer :append_migrations do |app|
-      unless app.root.to_s.match root.to_s
-        config.paths["db/migrate"].expanded.each do |expanded_path|
-          app.config.paths["db/migrate"] << expanded_path
-        end
-      end
-    end
-
-    #isolate_namespace CdmMigrator
-    class << self
-
-      def config
-        file    = File.open(File.join(::Rails.root, "/config/cdm_migrator.yml"))
-        @config ||= YAML.safe_load(file)
-      end
-
-      # loads a yml file with the configuration options
-      #
-      # @param file [String] path to the yml file
-      #
-      def load_config(file)
-        @config = YAML.load_file(file)
-      end
-    end
-  end
-end
+module CdmMigrator
+  class Engine < ::Rails::Engine
+
+    initializer :append_migrations do |app|
+      unless app.root.to_s.match root.to_s
+        config.paths["db/migrate"].expanded.each do |expanded_path|
+          app.config.paths["db/migrate"] << expanded_path
+        end
+      end
+    end
+
+    #isolate_namespace CdmMigrator
+    class << self
+
+      def config
+        file    = File.open(File.join(::Rails.root, "/config/cdm_migrator.yml"))
+        @config ||= YAML.safe_load(file)
+      end
+
+      # loads a yml file with the configuration options
+      #
+      # @param file [String] path to the yml file
+      #
+      def load_config(file)
+        @config = YAML.load_file(file)
+      end
+    end
+  end
+end

data/lib/cdm_migrator/version.rb

@@ -1,3 +1,3 @@
-module CdmMigrator
-  VERSION = '3.2.0'
-end
+module CdmMigrator
+  VERSION = '3.3.1'
+end

data/lib/cdm_migrator.rb

@@ -1,5 +1,5 @@
-require "cdm_migrator/engine"
-
-module CdmMigrator
-  # Your code goes here...
-end
+require "cdm_migrator/engine"
+
+module CdmMigrator
+  # Your code goes here...
+end