ddr-ingesttools 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da2dcac7b528e65bc0bd8018a23b2e2c70ce8e2b
-  data.tar.gz: e7382f1dc99c8a3a0bff6c727b42873c8b6a9d0c
+  metadata.gz: fb22fa65d3323b243dcafc3b999f55d42894b130
+  data.tar.gz: f85324eb9f8efd80febb1de7c9d1a5f2f87898aa
 SHA512:
-  metadata.gz: 3bad7d1ad9f3c973226d050ca15270cdb8744af773cc73fa197558f6061032f3b1a520631bfcf7d34a1dff9ac1a5a245eaa162c280ea253160860b2cd0f53e5c
-  data.tar.gz: 79e1e6336eea8d0c0228d0cfc85aabde9e89838f738d0d343da3e2b801dafbd5bca38cf8c05917d7ff57f60730d931765a1979bdf9e00f2f9777fc2fbe66ddf5
+  metadata.gz: 88bbc9f8d76a0b11bc0dec289c9bba3fc54efc340b6bfe9a0d7855108b0d040e88c385facda2d5d892a8aad02a18e9f64dc4d243bc547cce4987e7e9dd71df4e
+  data.tar.gz: 5e475ae95b4d2ca9c5c8dd4b1d9fa85efc34956f4aac5b9778f62f837b495dd55a5d6d683785526b002a23d131f8caefc6170e46dd485867d5b22e099bbedbae

data/bin/convert_dpc_folder.rb

@@ -35,11 +35,16 @@ parser = OptionParser.new do |opts|
     options[:collection_title] = v
   end
 
+  opts.on('--admin_set [ADMIN_SET]', 'Admin set for collection',
+          'required if intending to create a collection-creating Standard Ingest') do |v|
+    options[:admin_set] = v
+  end
+
 end
 
 begin
   parser.parse!
-  mandatory = [ :source, :target, :item_id_length]
+  mandatory = [ :source, :target, :item_id_length ]
   missing = mandatory.select{ |param| options[param].nil? }
   unless missing.empty?
     raise OptionParser::MissingArgument.new(missing.join(', '))

data/lib/ddr/ingesttools/dpc_folder_converter/converter.rb

@@ -15,18 +15,21 @@ module Ddr::IngestTools::DpcFolderConverter
       Results = Struct.new(:file_map, :errors)
 
       attr_reader :source, :target, :data_dir, :item_id_length, :checksums, :copy_files, :collection_title,
-                  :metadata_headers
+                  :admin_set, :metadata_headers
       attr_accessor :errors, :file_map, :local_id_metadata, :results
 
-      def initialize(source:, target:, item_id_length:, checksums: nil, copy_files: false, collection_title: nil)
+      def initialize(source:, target:, item_id_length:, checksums: nil, copy_files: false, collection_title: nil,
+                      admin_set: nil)
         @source = source
         @target = target
         @item_id_length = item_id_length
         @checksums = checksums
         @copy_files = copy_files
         @collection_title = collection_title
+        @admin_set = admin_set
         @metadata_headers = [ 'path', 'local_id' ]
         @metadata_headers << 'title' unless collection_title.nil?
+        @metadata_headers << 'admin_set' unless admin_set.nil?
       end
 
       def call
@@ -104,12 +107,18 @@ module Ddr::IngestTools::DpcFolderConverter
 
       def output_metadata
         metadata_rows = []
-        if collection_title
-          metadata_rows << CSV::Row.new(metadata_headers, [ nil, nil, collection_title ])
+        case
+          when collection_title && admin_set
+            metadata_rows << CSV::Row.new(metadata_headers, [ nil, nil, collection_title, admin_set ])
+          when collection_title
+            metadata_rows << CSV::Row.new(metadata_headers, [ nil, nil, collection_title ])
+          when admin_set
+            metadata_rows << CSV::Row.new(metadata_headers, [ nil, nil, admin_set ])
         end
         local_id_metadata.each_pair do |k,v|
           row_elements = [ k, v ]
           row_elements << nil if collection_title
+          row_elements << nil if admin_set
           metadata_rows << CSV::Row.new(metadata_headers, row_elements)
         end
         File.open(File.join(data_dir, SIF_METADATA_FILENAME), 'w') do |file|

data/lib/ddr/ingesttools/version.rb

@@ -1,5 +1,5 @@
 module Ddr
   module IngestTools
-    VERSION = '0.2.1'
+    VERSION = '0.3.0'
   end
 end

data/spec/fixtures/files/{manifest-sha1-collection-title.txt → manifest-sha1-collection-title_admin_set.txt}

@@ -7,4 +7,4 @@ a08c4d5a76d1b8734487be6ffcba66a9baf475c4 data/dpc_targets/T001.tif
 40f9993d06945544fa57af88f7c3e9102ecc69e3 data/dpc_targets/T002.tif
 49d77d27bf82ec3dafa1967490594883f5e8b432 data/intermediate_files/abc001001.jpg
 260b3c2d20a7126de96671d29f73ba09d13b61ba data/intermediate_files/abc002001.jpg
-8a7878863fd183436f50060343d3757747772d9f data/metadata.txt
+21f041cdd694f7755ed84b8cd2668214a43bad6c data/metadata.txt

data/spec/integration/dpc_folder_converter_spec.rb

@@ -169,29 +169,33 @@ module Ddr::IngestTools::DpcFolderConverter
       end
     end
 
-    describe 'collection titles' do
+    describe 'collection titles and admin sets' do
       let(:checksum_errors) { [] }
-      describe 'collection title provided' do
+      describe 'collection title and admin set provided' do
         let(:expected_metadata) { [
-            "path\tlocal_id\ttitle",
-            "\t\tTest Collection",
-            "abc001\tabc001\t",
-            "abc002\tabc002\t",
-            "abc003\tabc003\t",
-            "abc001/abc001001.tif\tabc001001\t",
-            "abc001/abc001002.tif\tabc001002\t",
-            "abc002/abc002001.tif\tabc002001\t",
-            "abc003/abc003001.wav\tabc003001\t",
-            "abc003/abc003002.wav\tabc003002\t",
-            "dpc_targets/T001.tif\tT001\t",
-            "dpc_targets/T002.tif\tT002\t"
+            "path\tlocal_id\ttitle\tadmin_set",
+            "\t\tTest Collection\tfoo",
+            "abc001\tabc001\t\t",
+            "abc002\tabc002\t\t",
+            "abc003\tabc003\t\t",
+            "abc001/abc001001.tif\tabc001001\t\t",
+            "abc001/abc001002.tif\tabc001002\t\t",
+            "abc002/abc002001.tif\tabc002001\t\t",
+            "abc003/abc003001.wav\tabc003001\t\t",
+            "abc003/abc003002.wav\tabc003002\t\t",
+            "dpc_targets/T001.tif\tT001\t\t",
+            "dpc_targets/T002.tif\tT002\t\t"
         ] }
         let(:expected_manifest) do
-          File.readlines(File.join('spec', 'fixtures', 'files', 'manifest-sha1-collection-title.txt')).sort
+          File.readlines(File.join('spec', 'fixtures', 'files', 'manifest-sha1-collection-title_admin_set.txt')).sort
+        end
+        before do
+          converter_args[:collection_title] = 'Test Collection'
+          converter_args[:admin_set] = 'foo'
         end
-        before { converter_args[:collection_title] = 'Test Collection' }
         it_behaves_like 'a conversion to standard ingest format'
       end
     end
+
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ddr-ingesttools
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Jim Coble
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-23 00:00:00.000000000 Z
+date: 2017-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bagit
@@ -106,7 +106,7 @@ files:
 - lib/ddr/ingesttools/version.rb
 - spec/fixtures/files/bad-checksums-sha1.txt
 - spec/fixtures/files/good-checksums-sha1.txt
-- spec/fixtures/files/manifest-sha1-collection-title.txt
+- spec/fixtures/files/manifest-sha1-collection-title_admin_set.txt
 - spec/fixtures/files/manifest-sha1.txt
 - spec/integration/dpc_folder_converter_spec.rb
 - spec/spec_helper.rb
@@ -131,14 +131,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Ruby tools supporting ingest into the Duke Digital Repository.
 test_files:
 - spec/fixtures/files/bad-checksums-sha1.txt
 - spec/fixtures/files/good-checksums-sha1.txt
-- spec/fixtures/files/manifest-sha1-collection-title.txt
+- spec/fixtures/files/manifest-sha1-collection-title_admin_set.txt
 - spec/fixtures/files/manifest-sha1.txt
 - spec/integration/dpc_folder_converter_spec.rb
 - spec/spec_helper.rb