libis-format 0.9.33 → 0.9.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a13d9df8f5e85ccc58758e46e556066d16935b0
-  data.tar.gz: 3a80e5cfc6d7ea70f4c0091420012446ec801b74
+  metadata.gz: da9fb9519c4c34acf71a1d337b38a575be668b59
+  data.tar.gz: 22f23bb3cc7f5772c95891b2fa2a356bbc881d43
 SHA512:
-  metadata.gz: c6a45a701e5ec6e07ebf763ee2fe3d97eb327fdccc85ca9aaca3e006e5dee3c1c058081c9a33c311aa72a7f2272661986799ab4a3f731f35e6ed5053ac1a25b3
-  data.tar.gz: 6f7b02f7ab9a9fad169920f7b2dc04fdbc63a33fb8d5e70e458de9055fa1427acf453f88ca3937883d721a15d636af53ce943a6feeb68e980e0d28a04970222d
+  metadata.gz: 2a6e12bd802a6f12b6367c07e08d1ad59d7c55ff53f0669ac82b11074c96930e3cb61b9dae44c0fc2590284e223efb27b2bb41b06978893620ae7abe3d5a5548
+  data.tar.gz: 21c025acb844ec485e65ca494b565cbc620024f77255c19f0eaf96e51739f44b57061740ecf497c532763eb9c745b5304eff56b08eed5d6bcc136ea3f5f6753f

data/lib/libis/format/identifier.rb

@@ -40,9 +40,9 @@ module Libis
 
       def get(file, options = {})
 
-        options[:droid] = true unless options[:tool] and options[:tool] != :droid
-        options[:fido] = true unless options[:tool] and options[:tool] != :fido
-        options[:file] = true unless options[:tool] and options[:tool] != :file
+        options[:droid] = true unless options.keys.include?(:droid) and options[:tool] and options[:tool] != :droid
+        options[:fido] = true unless options.keys.include?(:fido) and options[:tool] and options[:tool] != :fido
+        options[:file] = true unless options.keys.include?(:file) and options[:tool] and options[:tool] != :file
 
         result = {messages: [], output: {}, formats: {}}
 
@@ -72,10 +72,6 @@ module Libis
 
         process_results(result)
 
-        # result[:mimetype] ?
-        #     log_msg(result, :info, "Identification of '#{file}': '#{result}'") :
-        #     log_msg(result, :warn, "Could not identify MIME type of '#{file}'")
-
         result
 
       end
@@ -139,9 +135,11 @@ module Libis
       end
 
       def process_results(result)
-        result[:output].map do |file, output|
+        result[:output].keys.each do |file|
+          output = result[:output].delete(file)
           file_result = result[:formats][file] = {}
           if output.empty?
+            log_msg(result, :warn, "Could not identify format of '#{file}'.")
             file_result = {
                 mimetype: 'application/octet-stream',
                 puid: 'fmt/unknown',
@@ -164,6 +162,7 @@ module Libis
             end
           end
         end
+        result.delete(:output)
       end
 
       def process_multiple_formats(file_result, format_matches, output)

data/lib/libis/format/version.rb

@@ -1,5 +1,5 @@
 module Libis
   module Format
-    VERSION = '0.9.33'
+    VERSION = '0.9.35'
   end
 end

data/spec/converter_spec.rb

@@ -181,7 +181,6 @@ describe 'Converters' do
       src_file = File.join(file_dir, 'data', 'multipage.tif')
       ref_file = File.join(file_dir, 'data', 'multipage.tif.jp2')
       tgt_file = File.join('', 'tmp', 'test.jp2')
-      diff_file = File.join('', 'tmp', 'diff.jpg')
       FileUtils.mkdir_p File.dirname(tgt_file)
       converter.delete_date
       converter.quiet(true)
@@ -198,6 +197,50 @@ describe 'Converters' do
       FileUtils.rm tgt_file, force: true
     end
 
+    it 'converts TIFF to JP2' do
+      src_file = File.join(file_dir, 'data', 'test.tif')
+      tgt_file = File.join('', 'tmp', 'test.jp2')
+      FileUtils.mkdir_p File.dirname(tgt_file)
+      converter.delete_date
+      result = converter.convert(src_file, tgt_file, :JP2)
+      expect(result).to eq tgt_file
+      expect(File.exist?(tgt_file)).to be_truthy
+    end
+
+
+  end
+
+  context 'JP2 Converter' do
+
+    let(:converter) {Libis::Format::Converter::Jp2Converter.new}
+    let(:diff_file) {File.join('', 'tmp', 'diff.jpg')}
+
+    it 'converts TIFF to JP2' do
+      src_file = File.join(file_dir, 'data', 'test.tif')
+      tgt_file = File.join('', 'tmp', 'test.jp2')
+      FileUtils.mkdir_p File.dirname(tgt_file)
+      result = converter.convert(src_file, tgt_file, :JP2)
+      expect(result).to eq tgt_file
+      expect(File.exist?(tgt_file)).to be_truthy
+    end
+
+    it 'converts only first page of multipage TIFF to JP2' do
+      src_file = File.join(file_dir, 'data', 'multipage.tif')
+      ref_file = File.join(file_dir, 'data', 'multipage.tif.jp2')
+      tgt_file = File.join('', 'tmp', 'test.jp2')
+      FileUtils.mkdir_p File.dirname(tgt_file)
+      result = converter.convert(src_file, tgt_file, :JP2)
+      expect(result).to eq tgt_file
+      expect(File.exist?(tgt_file)).to be_truthy
+      compare = MiniMagick::Tool::Compare.new
+      compare << ref_file << tgt_file
+      compare.metric << 'MAE'
+      compare.fuzz << '10%'
+      compare << diff_file
+      compare.call {|_,_,status| expect(status).to be 0}
+      FileUtils.rm tgt_file, force: true
+    end
+
   end
 
   context 'Pdf Converter' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libis-format
 version: !ruby/object:Gem::Version
-  version: 0.9.33
+  version: 0.9.35
 platform: ruby
 authors:
 - Kris Dekeyser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-17 00:00:00.000000000 Z
+date: 2017-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -253,7 +253,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: LIBIS File format format services.