libis-tools 0.9.62 → 0.9.63

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a2464bf3e02e56791cd56ff6c266ab875fec58b5
-  data.tar.gz: cbef32af7fde215e0b7cf2b3e8f1ca4d0c5609b9
+  metadata.gz: 2420c110c403a832c83cd93342782f4fc792de78
+  data.tar.gz: 2311ad5757cfbb2179a14c811586c90d5e6fe4f5
 SHA512:
-  metadata.gz: 94c9e9154bfdb7b56ef646dded3b31031f8011c01a1cfd9e6f15e23349a680bcecb984734da1a383663993e0ae69c36b066f9b71364d4b39842645cd33e65e47
-  data.tar.gz: d67f4c5487a564cf9d24a55fd500017706d669caa3b7d7667ddf2767e3f4430d99051993073531cbad57a053f52be0860097cd94b2ed66947f90d58d18f8c1ea
+  metadata.gz: 83f2a52b70d446da36dfd38d63dbf75dd4a8662ad9fa168d373af1efdebd4f02cd1cc64572eac8ea296f5db1bb93b55275d5d9ba32bc0382f86463e9d4ad510c
+  data.tar.gz: b05ff83e1522007fec1aa9641bcf588cc13a365cd632375e99c5b11d555422b06dfe9fe4121db0b31e07f863a5fc14ac5d0d0a52d0c992d21c20a0531e72475a

data/lib/libis/tools/mets_objects.rb

@@ -1,5 +1,5 @@
 require 'libis/tools/thread_safe'
-require 'uri'
+require 'cgi'
 
 module Libis
   module Tools
@@ -267,6 +267,14 @@ module Libis
           target_location
         end
 
+        def target_name
+          ::File.basename(target)
+        end
+
+        def target_path
+          ::File.dirname(target)
+        end
+
         # This method creates the appropriate {DnxSection}s based on what attributes are filled in.
         def amd
           dnx = {}
@@ -280,14 +288,14 @@ module Libis
               FileEntityType: entity_type,
               compositionLevel: composition_level,
               # fileLocationType: 'FILE',
-              # fileLocation: '',
-              fileOriginalName: URI.encode(orig_name),
-              fileOriginalPath: URI.encode(orig_path),
-              fileOriginalID: URI.encode(location),
-              fileExtension: ::File.extname(orig_name),
+              fileLocation: location,
+              fileOriginalName: CGI.encode(target_name).gsub('+', '%20'),
+              fileOriginalPath: target_path,
+              # fileOriginalID: URI.encode(location),
+              # fileExtension: ::File.extname(orig_name),
               fileMIMEType: mimetype,
               fileSizeBytes: size,
-              formatLibraryId: puid
+              # formatLibraryId: puid
           }.cleanup
           tech_data << GeneralFileCharacteristics.new(data) unless data.empty?
           # Fixity

data/lib/libis/tools/version.rb

@@ -1,5 +1,5 @@
 module Libis
   module Tools
-    VERSION = '0.9.62'
+    VERSION = '0.9.63'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libis-tools
 version: !ruby/object:Gem::Version
-  version: 0.9.62
+  version: 0.9.63
 platform: ruby
 authors:
 - Kris Dekeyser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-19 00:00:00.000000000 Z
+date: 2018-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler