zizia 3.0.0.alpha.01 → 3.1.0.alpha.01

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90b6fee12982a33482459065c8d486198ccacc9e98853e6a8654b57eee92334a
-  data.tar.gz: 9dc25fad947cfa77a960831b9e9a3307a6c8bbcc27adaecce762c4255a0da239
+  metadata.gz: a24728641684b8789177ad48a5a3053089f58b10258dc17d2ff580d09da8ca3a
+  data.tar.gz: 0eda7cd8f1446c5565bb4720ac8d633babc30653ef242fdf61e65fae1dd924ee
 SHA512:
-  metadata.gz: 25e92885a6e991097b1debec7c9f2c00a01bf0ad4ff58c94e01bdf86518ba62867233d72845959a51eebe2510e0f14f6bbb7e829e685462a23e0e6f4f8f1981b
-  data.tar.gz: 36717ea07f9f8cb2e363d267afd759fcce3d7b50e2629eb6631a0895e2916387d77e174b93a48e46fc8db0641cfb93d98e5559f583a209136c5bb170993f7006
+  metadata.gz: 2aa309d328946d8bf4bcaeeb46a0445388941105107ff5b9d079bd15138b8ad3785bc210a1b11f7ea24c52a7ba5817becf41b0897640e32ee95ddb8be4e69b31
+  data.tar.gz: 2166ccfb776ea3ffd52a63fca25e5066ea3d867698f29bf02be4a51f33b7f4c360acb2da9d9e1588e3774b35e3d30d900d2584a82ef0065b65718c194c6308d3

data/.rubocop.yml

@@ -64,6 +64,7 @@ RSpec/ExampleLength:
   Exclude:
     - 'spec/zizia/hyrax_basic_metadata_mapper_spec.rb'
     - 'spec/integration/import_hyrax_csv.rb'
+    - 'spec/integration/csv_import_detail_spec.rb'
 
 RSpec/MessageSpies:
   Exclude:
@@ -74,6 +75,7 @@ RSpec/MultipleExpectations:
     - 'spec/zizia/hyrax_basic_metadata_mapper_spec.rb'
     - 'spec/integration/import_hyrax_csv.rb'
     - 'spec/controllers/importer_documentation_controller_spec.rb'
+    - 'spec/integration/csv_import_detail_spec.rb'
 
 Style/StructInheritance:
   Enabled: false

data/app/models/zizia/csv_import_detail.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+module Zizia
+  class CsvImportDetail < ApplicationRecord
+    belongs_to :csv_import
+    has_many :pre_ingest_works
+    has_many :pre_ingest_files, through: :pre_ingest_works
+
+    def total_size
+      return 0 if pre_ingest_files.empty?
+      pre_ingest_files.map(&:size).sum
+    end
+  end
+end

data/app/models/zizia/pre_ingest_file.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+module Zizia
+  class PreIngestFile < ApplicationRecord
+    belongs_to :pre_ingest_work
+  end
+end

data/app/models/zizia/pre_ingest_work.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+module Zizia
+  class PreIngestWork < ApplicationRecord
+    has_many :pre_ingest_files
+  end
+end

data/app/uploaders/zizia/csv_manifest_uploader.rb

@@ -12,11 +12,11 @@ module Zizia
 
     # The directory where the csv manifest will be stored.
     def store_dir
-      Rails.root.join('tmp', 'csv_uploads')
+      manifests_path || Rails.root.join('tmp', 'csv_uploads')
     end
 
     def cache_dir
-      Rails.root.join('tmp', 'csv_uploads_cache')
+      manifests_cache_path || Rails.root.join('tmp', 'csv_uploads_cache')
     end
 
     # Add a white list of extensions which are allowed to be uploaded.
@@ -42,6 +42,18 @@ module Zizia
 
     private
 
+      def manifests_path
+        return false if ENV['CSV_MANIFESTS_PATH'].nil?
+        return false unless File.directory?(ENV['CSV_MANIFESTS_PATH'])
+        ENV['CSV_MANIFESTS_PATH']
+      end
+
+      def manifests_cache_path
+        return false if ENV['CSV_MANIFESTS_CACHE_PATH'].nil?
+        return false unless File.directory?(ENV['CSV_MANIFESTS_CACHE_PATH'])
+        ENV['CSV_MANIFESTS_CACHE_PATH']
+      end
+
       def validate_csv
         @validator = CsvManifestValidator.new(self)
         @validator.validate

data/db/migrate/20190911133657_create_zizia_pre_ingest_files.rb

@@ -0,0 +1,12 @@
+class CreateZiziaPreIngestFiles < ActiveRecord::Migration[5.1]
+  def change
+    create_table :zizia_pre_ingest_files do |t|
+      t.integer :size
+      t.text :row
+      t.integer :row_number
+      t.string :filename
+      t.belongs_to :pre_ingest_work
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20190911134002_create_zizia_pre_ingest_works.rb

@@ -0,0 +1,9 @@
+class CreateZiziaPreIngestWorks < ActiveRecord::Migration[5.1]
+  def change
+    create_table :zizia_pre_ingest_works do |t|
+      t.integer :parent_object
+      t.belongs_to :csv_import_detail
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20190911142616_create_zizia_csv_import_details.rb

@@ -0,0 +1,8 @@
+class CreateZiziaCsvImportDetails < ActiveRecord::Migration[5.1]
+  def change
+    create_table :zizia_csv_import_details do |t|
+      t.belongs_to :csv_import
+      t.timestamps
+    end
+  end
+end

data/lib/zizia/version.rb

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

data/spec/dummy/app/models/user.rb

@@ -0,0 +1,2 @@
+class User < ApplicationRecord
+end

data/spec/dummy/db/migrate/20190911165049_create_users.rb

@@ -0,0 +1,8 @@
+class CreateUsers < ActiveRecord::Migration[5.1]
+  def change
+    create_table :users do |t|
+
+      t.timestamps
+    end
+  end
+end

data/spec/dummy/db/schema.rb

@@ -10,7 +10,19 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20190124153654) do
+ActiveRecord::Schema.define(version: 201901241536541) do
+
+  create_table "users", force: :cascade do |t|
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+  end
+
+  create_table "zizia_csv_import_details", force: :cascade do |t|
+    t.integer "csv_import_id"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["csv_import_id"], name: "index_zizia_csv_import_details_on_csv_import_id"
+  end
 
   create_table "zizia_csv_imports", force: :cascade do |t|
     t.integer "user_id"
@@ -21,4 +33,23 @@ ActiveRecord::Schema.define(version: 20190124153654) do
     t.index ["user_id"], name: "index_zizia_csv_imports_on_user_id"
   end
 
+  create_table "zizia_pre_ingest_files", force: :cascade do |t|
+    t.integer "size"
+    t.text "row"
+    t.integer "row_number"
+    t.string "filename"
+    t.integer "pre_ingest_work_id"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["pre_ingest_work_id"], name: "index_zizia_pre_ingest_files_on_pre_ingest_work_id"
+  end
+
+  create_table "zizia_pre_ingest_works", force: :cascade do |t|
+    t.integer "parent_object"
+    t.integer "csv_import_detail_id"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["csv_import_detail_id"], name: "index_zizia_pre_ingest_works_on_csv_import_detail_id"
+  end
+
 end

data/spec/dummy/test/fixtures/users.yml

@@ -0,0 +1,11 @@
+# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
+
+# This model initially had no columns defined. If you add columns to the
+# model remove the '{}' from the fixture names and add the columns immediately
+# below each fixture, per the syntax in the comments below
+#
+one: {}
+# column: value
+#
+two: {}
+# column: value

data/spec/dummy/test/models/user_test.rb

@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class UserTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end

data/spec/integration/csv_import_detail_spec.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe 'Using the CsvImportDetail models' do
+  let(:user) { User.new }
+  let(:csv_import) { Zizia::CsvImport.new }
+  let(:csv_import_detail) { Zizia::CsvImportDetail.new }
+  let(:pre_ingest_work_one) { Zizia::PreIngestWork.new }
+  let(:pre_ingest_work_two) { Zizia::PreIngestWork.new }
+  let(:pre_ingest_file_one) do
+    Zizia::PreIngestFile.new(row: 'some,row',
+                             row_number: 1,
+                             size: 1000)
+  end
+  let(:pre_ingest_file_two) do
+    Zizia::PreIngestFile.new(row: 'another,row',
+                             row_number: 2,
+                             size: 2000)
+  end
+
+  it 'allows you to create PreIngestFiles that are associated with PreIngestWorks' do
+    pre_ingest_work_one.save
+
+    pre_ingest_work_one.pre_ingest_files << pre_ingest_file_one
+    pre_ingest_work_one.pre_ingest_files << pre_ingest_file_two
+
+    expect(pre_ingest_work_one.pre_ingest_files.length).to eq(2)
+  end
+
+  it 'allows you to associate PreIngestWorks & Files with a CsvImportDetail' do
+    user.save
+    csv_import.user = user
+    csv_import.save!
+    csv_import_detail.csv_import = csv_import
+    csv_import_detail.save!
+
+    pre_ingest_work_one.pre_ingest_files << pre_ingest_file_one
+    pre_ingest_work_one.pre_ingest_files << pre_ingest_file_two
+    csv_import_detail.pre_ingest_works << pre_ingest_work_one
+    csv_import_detail.pre_ingest_works << pre_ingest_work_two
+
+    expect(csv_import_detail.pre_ingest_files.length).to eq(2)
+    expect(csv_import_detail.pre_ingest_works.length).to eq(2)
+
+    expect(csv_import_detail.total_size).to eq(3000)
+  end
+end

data/spec/spec_helper.rb

@@ -6,11 +6,13 @@ require 'pry' unless ENV['CI']
 ENV['environment'] ||= 'test'
 # Configure Rails Envinronment
 ENV['RAILS_ENV'] = 'test'
-require File.expand_path('../../spec/dummy/config/environment', __FILE__)
-require 'rails/all'
-require 'rspec/rails'
 
+require File.expand_path("../dummy/config/environment", __FILE__)
 ENGINE_RAILS_ROOT = File.join(File.dirname(__FILE__), '../')
+Dir[File.join(ENGINE_RAILS_ROOT, "spec/support/**/*.rb")].each { |f| require f }
+
+require 'rails/all'
+require 'rspec/rails'
 
 ActiveJob::Base.queue_adapter = :test
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zizia
 version: !ruby/object:Gem::Version
-  version: 3.0.0.alpha.01
+  version: 3.1.0.alpha.01
 platform: ruby
 authors:
 - Data Curation Experts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-23 00:00:00.000000000 Z
+date: 2019-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active-fedora
@@ -296,6 +296,9 @@ files:
 - app/jobs/zizia/start_csv_import_job.rb
 - app/models/zizia/application_record.rb
 - app/models/zizia/csv_import.rb
+- app/models/zizia/csv_import_detail.rb
+- app/models/zizia/pre_ingest_file.rb
+- app/models/zizia/pre_ingest_work.rb
 - app/uploaders/zizia/csv_manifest_uploader.rb
 - app/uploaders/zizia/csv_manifest_validator.rb
 - app/views/layouts/zizia/application.html.erb
@@ -317,6 +320,9 @@ files:
 - db/migrate/201901162141281_create_zizia_csv_imports.rb
 - db/migrate/201901162203121_add_manifest_to_zizia_csv_imports.rb
 - db/migrate/201901241536541_add_fedora_collection_id_to_zizia_csv_imports.rb
+- db/migrate/20190911133657_create_zizia_pre_ingest_files.rb
+- db/migrate/20190911134002_create_zizia_pre_ingest_works.rb
+- db/migrate/20190911142616_create_zizia_csv_import_details.rb
 - docs/_config.yml
 - docs/customizing_metadata.md
 - docs/index.md
@@ -383,6 +389,7 @@ files:
 - spec/dummy/app/mailers/application_mailer.rb
 - spec/dummy/app/models/application_record.rb
 - spec/dummy/app/models/concerns/.keep
+- spec/dummy/app/models/user.rb
 - spec/dummy/app/views/layouts/application.html.erb
 - spec/dummy/app/views/layouts/mailer.html.erb
 - spec/dummy/app/views/layouts/mailer.text.erb
@@ -415,6 +422,7 @@ files:
 - spec/dummy/config/routes.rb
 - spec/dummy/config/secrets.yml
 - spec/dummy/config/spring.rb
+- spec/dummy/db/migrate/20190911165049_create_users.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/db/seeds.rb
 - spec/dummy/lib/assets/.keep
@@ -432,10 +440,12 @@ files:
 - spec/dummy/test/controllers/.keep
 - spec/dummy/test/fixtures/.keep
 - spec/dummy/test/fixtures/files/.keep
+- spec/dummy/test/fixtures/users.yml
 - spec/dummy/test/helpers/.keep
 - spec/dummy/test/integration/.keep
 - spec/dummy/test/mailers/.keep
 - spec/dummy/test/models/.keep
+- spec/dummy/test/models/user_test.rb
 - spec/dummy/test/system/.keep
 - spec/dummy/test/test_helper.rb
 - spec/dummy/vendor/.keep
@@ -446,6 +456,7 @@ files:
 - spec/fixtures/images/animals/cat.png
 - spec/fixtures/images/zizia.png
 - spec/fixtures/zizia.png
+- spec/integration/csv_import_detail_spec.rb
 - spec/integration/import_csv_spec.rb
 - spec/integration/import_hyrax_csv.rb
 - spec/models/csv_import_spec.rb
@@ -488,7 +499,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Hyrax importers.