libis-format 1.0.5 → 2.0.3

data/lib/libis/format/tool/spreadsheet_to_ods.rb

@@ -1,3 +1,4 @@
+# noinspection RubyResolve
 require 'fileutils'
 
 require 'libis/tools/extend/string'

data/lib/libis/format/version.rb

@@ -1,5 +1,5 @@
 module Libis
   module Format
-    VERSION = '1.0.5'
+    VERSION = '2.0.3'
   end
 end

data/lib/libis/format/yaml_loader.rb

@@ -0,0 +1,71 @@
+# frozen_string_literal: true
+require 'yaml'
+require 'singleton'
+
+module Libis
+  module Format
+    class YamlLoader
+      # noinspection RubyResolve
+      include Singleton
+
+      def query(key, value)
+        case key.to_s.downcase.to_sym
+        when :name
+          return [database[value.to_s.upcase.to_sym]]
+        when :category
+          database.find_all { |_, info| info.category == value.to_s.upcase.to_sym }
+        when :puid
+          database.find_all { |_, info| info.puids.include?(value) }
+        when :mimetype
+          database.find_all { |_, info| info.mimetypes.include?(value) }
+        when :extension
+          database.find_all { |_, info| info.extensions.include?(value) }
+        else
+          return []
+        end.map(&:last)
+      end
+
+      def load_formats(file_or_hash)
+        hash = file_or_hash.is_a?(Hash) ? file_or_hash : YAML::load_file(file_or_hash)
+        hash.each do |category, format_list|
+          format_list.each do |format_name, format_info|
+            format_info.symbolize_keys!
+            format_name = format_name.to_sym
+            new_info = Libis::Format::Info.new(
+                name: format_name,
+                category: category.to_sym,
+                description: format_info[:NAME],
+                puids: format_info[:PUID]&.strip&.split(/[\s,]+/)&.map { |v| v.strip } || [],
+                mimetypes: format_info[:MIME]&.strip&.split(/[\s,]+/)&.map(&:strip) || [],
+                extensions: format_info[:EXTENSIONS]&.strip&.split(/[\s,]+/)&.map { |v| v.strip } || []
+            )
+            if (old_info = database[format_name])
+              new_info = Libis::Format::Info.new(
+                  name: format_name,
+                  category: category.to_sym,
+                  description: new_info.description.blank? ? old_info.description : new_info.description,
+                  puids: (old_info.puids + new_info.puids).uniq,
+                  mimetypes: (old_info.mimetypes + new_info.mimetypes).uniq,
+                  extensions: (old_info.extensions + new_info.extensions).uniq
+              )
+            end
+            database[format_name] = new_info
+          end
+        end
+
+      end
+
+      private
+
+      attr_reader :database
+
+      def initialize
+        @database = {}
+        format_database = Libis::Format::Config[:format_library_database]
+        load_formats(format_database)
+      end
+
+    end
+
+  end
+end

data/libis-format.gemspec

@@ -3,6 +3,7 @@
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
+require 'bundler'
 require 'libis/format/version'
 
 Gem::Specification.new do |spec|
@@ -32,10 +33,10 @@ Gem::Specification.new do |spec|
     spec.add_development_dependency 'nokogiri'
   end
 
-  spec.add_runtime_dependency 'libis-tools', '~> 1.0'
+  spec.add_runtime_dependency 'libis-tools', '>= 1.0.9'
   spec.add_runtime_dependency 'os', '= 0.9.6'
   spec.add_runtime_dependency 'mini_magick', '~> 4.3'
   spec.add_runtime_dependency 'deep_dive', '~> 0.3'
   spec.add_runtime_dependency 'chromaprint', '~> 0.0.2'
   spec.add_runtime_dependency 'naturally', '~> 2.1'
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libis-format
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 2.0.3
 platform: ruby
 authors:
 - Kris Dekeyser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-01 00:00:00.000000000 Z
+date: 2021-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -84,16 +84,16 @@ dependencies:
   name: libis-tools
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.0.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.0.9
 - !ruby/object:Gem::Dependency
   name: os
   requirement: !ruby/object:Gem::Requirement
@@ -185,6 +185,9 @@ files:
 - README.md
 - Rakefile
 - base/Dockerfile
+- base/Dockerfile.alpine
+- base/Dockerfile.rvm
+- base/rework_path
 - bin/droid
 - bin/fido
 - bin/formatinfo
@@ -197,6 +200,7 @@ files:
 - data/lias_formats.xml
 - data/types.yml
 - data/xlink.xsd
+- docker_cfg.yml
 - lib/libis-format.rb
 - lib/libis/format.rb
 - lib/libis/format/cli/convert.rb
@@ -210,15 +214,29 @@ files:
 - lib/libis/format/converter/base.rb
 - lib/libis/format/converter/chain.rb
 - lib/libis/format/converter/fop_pdf_converter.rb
+- lib/libis/format/converter/image_assembler.rb
 - lib/libis/format/converter/image_converter.rb
+- lib/libis/format/converter/image_splitter.rb
+- lib/libis/format/converter/image_watermarker.rb
 - lib/libis/format/converter/jp2_converter.rb
 - lib/libis/format/converter/office_converter.rb
+- lib/libis/format/converter/pdf_assembler.rb
 - lib/libis/format/converter/pdf_converter.rb
+- lib/libis/format/converter/pdf_metadata.rb
+- lib/libis/format/converter/pdf_optimizer.rb
+- lib/libis/format/converter/pdf_protecter.rb
+- lib/libis/format/converter/pdf_selecter.rb
+- lib/libis/format/converter/pdf_splitter.rb
+- lib/libis/format/converter/pdf_watermarker_header.rb
+- lib/libis/format/converter/pdf_watermarker_image.rb
+- lib/libis/format/converter/pdf_watermarker_text.rb
 - lib/libis/format/converter/repository.rb
 - lib/libis/format/converter/spreadsheet_converter.rb
 - lib/libis/format/converter/video_converter.rb
 - lib/libis/format/converter/xslt_converter.rb
 - lib/libis/format/identifier.rb
+- lib/libis/format/info.rb
+- lib/libis/format/library.rb
 - lib/libis/format/tool.rb
 - lib/libis/format/tool/droid.rb
 - lib/libis/format/tool/extension_identification.rb
@@ -228,20 +246,22 @@ files:
 - lib/libis/format/tool/fop_pdf.rb
 - lib/libis/format/tool/identification_tool.rb
 - lib/libis/format/tool/office_to_pdf.rb
-- lib/libis/format/tool/pdf_copy.rb
 - lib/libis/format/tool/pdf_merge.rb
+- lib/libis/format/tool/pdf_metadata.rb
 - lib/libis/format/tool/pdf_optimizer.rb
+- lib/libis/format/tool/pdf_protect.rb
+- lib/libis/format/tool/pdf_select.rb
 - lib/libis/format/tool/pdf_split.rb
 - lib/libis/format/tool/pdf_to_pdfa.rb
+- lib/libis/format/tool/pdf_watermark.rb
 - lib/libis/format/tool/pdfa_validator.rb
 - lib/libis/format/tool/spreadsheet_to_ods.rb
-- lib/libis/format/type_database.rb
-- lib/libis/format/type_database_impl.rb
 - lib/libis/format/version.rb
+- lib/libis/format/yaml_loader.rb
 - libis-format.gemspec
 - tools/PdfTool.jar
-- tools/bcpkix-jdk15on-1.49.jar
-- tools/bcprov-jdk15on-1.49.jar
+- tools/bcpkix-jdk15on-167.jar
+- tools/bcprov-jdk15on-167.jar
 - tools/fop/build/fop.jar
 - tools/fop/conf/fop.xconf
 - tools/fop/fop
@@ -313,8 +333,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: LIBIS File format format services.

data/lib/libis/format/type_database.rb

@@ -1,134 +0,0 @@
-# coding: utf-8
-
-require 'yaml'
-
-require 'backports/rails/hash'
-
-module Libis
-  module Format
-
-    # noinspection RubyClassVariableUsageInspection
-    class TypeDatabase
-      @implementation = Libis::Format::TypeDatabaseImpl.instance
-
-      def self.implementation(impl)
-        @implementation = impl
-      end
-
-      def self.enrich(info, map_keys = {})
-        return {} unless info.is_a? Hash
-        mapper = Hash.new {|hash,key| hash[key] = key}
-        mapper.merge! map_keys
-        unless (puid = info[mapper[:PUID]]).blank?
-          info[mapper[:TYPE]] ||= puid_infos(puid).first[:TYPE] rescue nil
-        end
-        unless (mime = info[mapper[:MIME]]).blank?
-          info[mapper[:TYPE]] ||= mime_infos(mime).first[:TYPE] rescue nil
-        end
-        unless (type_name = info[mapper[:TYPE]]).nil?
-          mapper.keys.each do |key|
-            info[mapper[key]] = get(type_name, key) || info[mapper[key]]
-          end
-          info[mapper[:GROUP]] = type_group(type_name)
-        end
-        info
-      end
-
-      def self.normalize(info, map_keys = {})
-        return {} unless info.is_a? Hash
-        mapper = Hash.new {|hash,key| hash[key] = key}
-        mapper.merge! map_keys
-        unless (puid = info[mapper[:PUID]]).blank?
-          info[mapper[:TYPE]] ||= puid_infos(puid).first[:TYPE] rescue nil
-        end
-        unless (mime = info[mapper[:MIME]]).blank?
-          info[mapper[:TYPE]] ||= mime_infos(mime).first[:TYPE] rescue nil
-        end
-        unless (type_name = info[mapper[:TYPE]]).nil?
-          info[mapper[:MIME]] = type_mimetypes(type_name).first if type_mimetypes(type_name).first
-          info[mapper[:GROUP]] = type_group(type_name)
-        end
-        info
-      end
-
-      def self.get(type_name, key)
-        case key
-          when :MIME
-            type_mimetypes(type_name).first
-          when :PUID
-            type_puids(type_name).first
-          when :EXTENSION
-            type_extentions(type_name).first
-          else
-            typeinfo(type_name)[key]
-        end
-      end
-
-      def self.type_group(t)
-        typeinfo(t)[:GROUP]
-      end
-
-      def self.type_mimetypes(t)
-        typeinfo(t)[:MIME] || []
-      end
-
-      def self.type_puids(t)
-        typeinfo(t)[:PUID] || []
-      end
-
-      def self.type_extentions(t)
-        typeinfo(t)[:EXTENSIONS] || []
-      end
-
-      def self.typeinfo(t)
-        @implementation.typeinfo(t)
-      end
-
-      def self.group_types(group)
-        @implementation.group_types(group)
-      end
-
-      def self.puid_infos(puid)
-        @implementation.puid_infos(puid)
-      end
-
-      def self.puid_types(puid)
-        @implementation.puid_types(puid)
-      end
-
-      def self.puid_groups(puid)
-        puid_types(puid).map(&method(:type_group))
-      end
-
-      def self.mime_infos(mime)
-        @implementation.mime_infos(mime)
-      end
-
-      def self.mime_types(mime)
-        @implementation.mime_types(mime)
-      end
-
-      def self.mime_groups(mime)
-        mime_types(mime).map(&method(:type_group))
-      end
-
-      def self.ext_infos(ext)
-        @implementation.ext_infos(ext)
-      end
-
-      def self.ext_types(ext)
-        @implementation.ext_types(ext)
-      end
-
-      def self.puid_typeinfo(puid)
-        @implementation.puid_typeinfo(puid)
-      end
-
-      def self.known_mime?(mime)
-        @implementation.known_mime?(mime)
-      end
-
-    end
-
-  end
-end

data/lib/libis/format/type_database_impl.rb

@@ -1,120 +0,0 @@
-# coding: utf-8
-
-require 'singleton'
-require 'yaml'
-
-require 'backports/rails/hash'
-require 'libis/tools/logger'
-require 'libis/tools/extend/string'
-
-module Libis
-  module Format
-
-    class TypeDatabaseImpl
-      include Singleton
-      include ::Libis::Tools::Logger
-
-      def typeinfo(t)
-        @types[t.to_sym] || {}
-      end
-
-      def group_types(group)
-        @types.select do |_, v|
-          v[:GROUP] == group.to_sym
-        end.keys
-      end
-
-      def puid_infos(puid)
-        @types.select do |_, v|
-          v[:PUID].include? puid rescue false
-        end.values
-      end
-
-      def puid_types(puid)
-        @types.select do |_, v|
-          v[:PUID].include? puid rescue false
-        end.keys
-      end
-
-      def mime_infos(mime)
-        @types.select do |_, v|
-          v[:MIME].include? mime rescue false
-        end.values
-      end
-
-      def mime_types(mime)
-        @types.select do |_, v|
-          v[:MIME].include? mime rescue false
-        end.keys
-      end
-
-      def ext_infos(ext)
-        ext = ext.gsub /^\./, ''
-        @types.select do |_, v|
-          v[:EXTENSIONS].include?(ext) rescue false
-        end.values
-      end
-
-      def ext_types(ext)
-        ext = ext.gsub /^\./, ''
-        @types.select do |_, v|
-          v[:EXTENSIONS].include?(ext) rescue false
-        end.keys
-      end
-
-      def puid_typeinfo(puid)
-        @types.each do |_, v|
-          return v if v[:PUID] and v[:PUID].include?(puid)
-        end
-        nil
-      end
-
-      def known_mime?(mime)
-        @types.each do |_, v|
-          return true if v[:MIME].include? mime
-        end
-        false
-      end
-
-      def load_types(file_or_hash = {}, append = true)
-        hash = file_or_hash.is_a?(Hash) ? file_or_hash : YAML::load_file(file_or_hash)
-        # noinspection RubyResolve
-        hash.each do |group, type_info|
-          type_info.each do |type_name, info|
-            type_key = type_name.to_sym
-            info.symbolize_keys!
-            info[:TYPE] = type_key
-            info[:GROUP] = group.to_sym
-            info[:MIME] = info[:MIME].strip.split(/[\s,]+/).map(&:strip) rescue []
-            info[:EXTENSIONS] = info[:EXTENSIONS].strip.split(/[\s,]+/).map { |v| v.strip } rescue []
-            info[:PUID] = info[:PUID].strip.split(/[\s,]+/).map { |v| v.strip } if info[:PUID]
-            if @types.has_key?(type_key)
-              warn 'Type %s already defined; merging with info from %s.', type_name.to_s, file_or_hash
-              info.merge!(@types[type_key]) do |_,v_new,v_old|
-                case v_old
-                when Array
-                  append ? v_old + v_new : v_new + v_old
-                when Hash
-                  append ? v_new.merge(v_old) : v_old.merge(v_new)
-                else
-                  append ? v_old : v_new
-                end
-              end
-            end
-            @types[type_key] = info
-          end
-        end
-      end
-
-      protected
-
-      def initialize
-        @types = Hash.new
-        type_database = Libis::Format::Config[:type_database]
-        load_types(type_database)
-      end
-
-    end
-
-  end
-end