zizia 2.1.0.alpha.06 → 2.1.0.alpha.07

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 03f0d7edfa32894dcbbbca57b5c6ecee005e57a41e90c81edaf7f012ea4769c4
-  data.tar.gz: 1c3a2332eb06a562f1954b598551a88f1b24bf1c45afe6e5a846738a0a537697
+  metadata.gz: c78e4790d57deee047c384436ceea43c4ff56dc93307adcd24bc0b34b0f6dcc5
+  data.tar.gz: 79a5c8be373e2e30093c15cc08c9e7661a9c5286b878341d44572227466b7288
 SHA512:
-  metadata.gz: 2c26abb5426d5db325f47dfe5b5399f6f9543b41f048b61d4d8e8ce641428cac6782c3f9f266ec8a0ee20f28c9abffc9cda7d674d42e55fc405b6666844d442e
-  data.tar.gz: 5586e21dc4c646af501a28ec0f96d8c11a2ab0dff1710d47b17865d9c9d10733b849de2c6308176ad1985d839a8cb988dd5ebfaf497df305f45e69275d856859
+  metadata.gz: c73583b3b12b5688e06ba3d305a4ce644761c279f1b8647965d35fc09086cfd8051756c930ee0b38469451ee2ff3d99217470ff4819fcb3911cb84ecaef3507a
+  data.tar.gz: 43882530f5ecdfc1c4e8a45c642436116a4fa81c537ba04d820f3ee46def8fc3d228f8cc446c0fd0b3800cab7e30b72f693696b3633e259b162b1e2459897b0b

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
-      configured_upload_path + "#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"
+      Rails.root.join('tmp', 'csv_uploads')
     end
 
     def cache_dir
-      configured_cache_path + "#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"
+      Rails.root.join('tmp', 'csv_uploads_cache')
     end
 
     # Add a white list of extensions which are allowed to be uploaded.
@@ -46,21 +46,5 @@ module Zizia
         @validator = CsvManifestValidator.new(self)
         @validator.validate
       end
-
-      def configured_upload_path
-        ENV['CSV_MANIFESTS_PATH'] || base_path_uploads + 'csv_uploads'
-      end
-
-      def configured_cache_path
-        ENV['CSV_MANIFESTS_CACHE_PATH'] || base_path_cache + 'csv_uploads/cache'
-      end
-
-      def base_path_uploads
-        ENV['TRAVIS'] ? Rails.root : Hyrax.config.upload_path.call
-      end
-
-      def base_path_cache
-        ENV['TRAVIS'] ? Rails.root : Hyrax.config.cache_path.call
-      end
   end
 end

data/lib/zizia/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Zizia
-  VERSION = '2.1.0.alpha.06'
+  VERSION = '2.1.0.alpha.07'
 end

data/spec/uploaders/csv_manifest_uploader_spec.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+require 'spec_helper'
+
+RSpec.describe Zizia::CsvManifestUploader, type: :model do
+  subject(:csv_uploader) { described_class.new }
+
+  it 'has a a store dir' do
+    expect(csv_uploader.store_dir.to_s).to match(/uploads/)
+  end
+
+  it 'has a cache dir' do
+    expect(csv_uploader.cache_dir.to_s).to match(/cache/)
+  end
+
+  it 'has an extension whitelist' do
+    expect(csv_uploader.extension_whitelist).to eq(%w[csv])
+  end
+
+  it 'returns an empty array if the validator has no errors' do
+    expect(csv_uploader.errors).to eq([])
+  end
+
+  it 'has warnings' do
+    expect(csv_uploader.warnings).to eq([])
+  end
+
+  it 'has records' do
+    expect(csv_uploader.records).to eq(0)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zizia
 version: !ruby/object:Gem::Version
-  version: 2.1.0.alpha.06
+  version: 2.1.0.alpha.07
 platform: ruby
 authors:
 - Data Curation Experts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-06 00:00:00.000000000 Z
+date: 2019-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active-fedora
@@ -456,6 +456,7 @@ files:
 - spec/support/hyrax/basic_metadata.rb
 - spec/support/hyrax/core_metadata.rb
 - spec/support/shared_contexts/with_work_type.rb
+- spec/uploaders/csv_manifest_uploader_spec.rb
 - spec/views/zizia/importer_documentation/guide.html.erb_spec.rb
 - spec/zizia/csv_format_validator_spec.rb
 - spec/zizia/csv_parser_spec.rb