distorted 0.5.7 → 0.6.0

data/lib/distorted/types/README

@@ -0,0 +1,4 @@
+# Some of these custom MIME::Types will be just for DD, but
+# I will submit some others of these to the mime-types-data project
+# if and when it makes sense to do so. Here's how:
+# https://github.com/mime-types/mime-types-data/blob/master/Contributing.md

data/lib/distorted/types/application.yaml

@@ -0,0 +1,8 @@
+# Define our own type to trigger Last Resort instead of abusing application/x-imagemap :)
+- !ruby/object:MIME::Type
+  content-type: application/x.distorted.last-resort
+  encoding: 8bit
+  xrefs:
+    person:
+      - okeeblow
+  registered: false

data/lib/distorted/types/font.yaml

@@ -0,0 +1,29 @@
+
+# RFC8081 defines the top-level `font` media-type and includes
+# definitions for font/ttf, font/otf, and font/collection,
+# but neglects to include the OpenType Collection (.otc)
+# file extension, meaning the IANA DB's font/collection
+# only covers TTC and not OTC:
+# 
+# https://tools.ietf.org/html/rfc8081#section-4.4.4
+# "Type name:  font
+#   Subtype name:  collection
+#   Required parameters:  None
+#   Optional parameters
+#      Name: outlines
+#      Values: a comma-separated subset of TTF, CFF, and SVG
+#
+# https://docs.microsoft.com/en-us/typography/opentype/spec/otff
+# "OpenType fonts may have the extension .OTF, .TTF, .OTC or .TTC.
+# The extensions .OTC and .TTC should only be used for font collection files."
+- !ruby/object:MIME::Type
+  content-type: font/collection
+  encoding: base64
+  extensions:
+  - otc
+  xrefs:
+    template:
+    - font/collection
+  xref_urls:
+    - "https://docs.microsoft.com/en-us/typography/opentype/spec/otff#filenames"
+  registered: false

data/lib/distorted/version.rb

@@ -13,8 +13,10 @@
 #                       `/oooooooooooooo:`-+o+/.  `+oo+o++++ooo+oooooo-       `-+oo/`   :oooooooooooooo/                 
 #                                                                                                                        
 
+require_relative 'modular_technology/triple_counter'
+
 module Cooltrainer
   module DistorteD
-    VERSION = '0.5.7'.freeze
+    VERSION = TripleCounter.new(0, 6, 0)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: distorted
 version: !ruby/object:Gem::Version
-  version: 0.5.7
+  version: 0.6.0
 platform: ruby
 authors:
 - okeeblow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-28 00:00:00.000000000 Z
+date: 2020-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: ruby-filemagic
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: ruby-vips
   requirement: !ruby/object:Gem::Requirement
@@ -185,19 +199,30 @@ files:
 - font/850/Profont/readme.txt
 - font/932/LICENSE/README-ttf.txt
 - font/932/mona.ttf
+- lib/distorted/checking_you_out.rb
 - lib/distorted/error_code.rb
-- lib/distorted/font.rb
-- lib/distorted/image.rb
+- lib/distorted/injection_of_love.rb
 - lib/distorted/modular_technology/pango.rb
+- lib/distorted/modular_technology/triple_counter.rb
+- lib/distorted/modular_technology/ttfunk.rb
+- lib/distorted/modular_technology/vips.rb
+- lib/distorted/modular_technology/vips_load.rb
+- lib/distorted/modular_technology/vips_save.rb
+- lib/distorted/molecule/C18H27NO3.rb
+- lib/distorted/molecule/font.rb
+- lib/distorted/molecule/image.rb
+- lib/distorted/molecule/pdf.rb
+- lib/distorted/molecule/svg.rb
+- lib/distorted/molecule/text.rb
+- lib/distorted/molecule/video.rb
 - lib/distorted/monkey_business/hash.rb
 - lib/distorted/monkey_business/mnemoniq.rb
 - lib/distorted/monkey_business/set.rb
 - lib/distorted/monkey_business/string.rb
-- lib/distorted/pdf.rb
-- lib/distorted/svg.rb
-- lib/distorted/text.rb
+- lib/distorted/types/README
+- lib/distorted/types/application.yaml
+- lib/distorted/types/font.yaml
 - lib/distorted/version.rb
-- lib/distorted/video.rb
 - test/distorted_test.rb
 - test/test_helper.rb
 homepage: https://cooltrainer.org

data/lib/distorted/image.rb

@@ -1,121 +0,0 @@
-# Requiring libvips 8.8 for HEIC/HEIF (moo) support, `justify` support in the
-# Vips::Image text operator, animated WebP support, and more:
-# https://libvips.github.io/libvips/2019/04/22/What's-new-in-8.8.html
-VIPS_MINIMUM_VER = [8, 8, 0]
-
-# Tell the user to install the shared library if it's missing.
-begin
-  require 'vips'
-
-  we_good = false
-  if Vips::version(0) >= VIPS_MINIMUM_VER[0]
-    if Vips::version(1) >= VIPS_MINIMUM_VER[1]
-      if Vips::version(2) >= VIPS_MINIMUM_VER[2]
-        we_good = true
-      end
-    end
-  end
-  unless we_good
-    raise LoadError.new("libvips is older than DistorteD's minimum requirement: needed #{VIPS_MINIMUM_VER.join('.'.freeze)} vs available '#{Vips::version_string}'")
-  end
-
-rescue LoadError => le
-  # Only match libvips.so load failure
-  raise unless le.message =~ /libvips.so/
-
-  # Multiple OS help
-  help = <<~INSTALL
-
-  Please install the libvips image processing library.
-
-  FreeBSD:
-    pkg install graphics/vips
-
-  macOS:
-    brew install vips
-
-  Debian/Ubuntu/Mint:
-    apt install libvips libvips-dev
-  INSTALL
-
-  # Re-raise with install message
-  raise $!, "#{help}\n#{$!}", $!.backtrace
-end
-
-require 'set'
-
-require 'mime/types'
-
-module Cooltrainer
-  module DistorteD
-    class Image
-
-      MEDIA_TYPE = 'image'.freeze
-
-      # SVG support is a sub-class and not directly supported here:
-      # `write_to_file': No known saver for '/home/okeeblow/Works/cooltrainer/_site/IIDX-turntable.svg'. (Vips::Error)
-      MIME_TYPES = MIME::Types[/^#{MEDIA_TYPE}\/(?!svg)/, :complete => true].to_set
-
-      # Attributes for our <picture>/<img>.
-      # Automatically enabled as attrs for DD Liquid Tag.
-      # https://developer.mozilla.org/en-US/docs/Web/HTML/Element/picture#Attributes
-      # https://developer.mozilla.org/en-US/docs/Web/HTML/Element/img#Attributes
-      # https://developer.mozilla.org/en-US/docs/Web/Performance/Lazy_loading
-      # :crop is a Vips-only attr
-      ATTRS = Set[:alt, :caption, :href, :crop, :loading]
-
-      # Defaults for HTML Element attributes.
-      # Not every attr has to be listed here.
-      # Many need no default and just won't render.
-      ATTRS_DEFAULT = {
-        :crop => :attention,
-        :loading => :eager,
-      }
-      ATTRS_VALUES = {
-        # https://www.rubydoc.info/gems/ruby-vips/Vips/Interesting
-        :crop => Set[:none, :centre, :entropy, :attention],
-        :loading => Set[:eager, :lazy],
-      }
-
-
-      def initialize(src)
-        @image = Vips::Image.new_from_file(src)
-        @src = src
-      end
-
-      def rotate(angle: nil)
-        if angle == :auto
-          @image = @image&.autorot
-        end
-      end
-
-      def clean
-        # Nuke the entire site from orbit. It's the only way to be sure.
-        @image.get_fields.grep(/exif-ifd/).each {|field| @image.remove field}
-      end
-
-      def save(dest, width: nil, crop: nil)
-        begin
-          if width.nil? or width == :full
-            return @image.write_to_file(dest)
-          elsif width.respond_to?(:to_i)
-            ver = @image.thumbnail_image(
-              width.to_i,
-              # Use `self` namespace for constants so subclasses can redefine
-              **{:crop => crop || self.singleton_class.const_get(:ATTRS_DEFAULT)[:crop]},
-            )
-            return ver.write_to_file(dest)
-          end
-        rescue Vips::Error => v
-          if v.message.include?('No known saver')
-            # TODO: Handle missing output formats. Replacements? Skip it? Die?
-            return nil
-          else
-            raise
-          end
-        end
-      end  # save
-
-    end  # Image
-  end  # DistorteD
-end  # Cooltrainer

data/lib/distorted/svg.rb

@@ -1,21 +0,0 @@
-require 'set'
-
-require 'mime/types'
-require 'svg_optimizer'
-
-module Cooltrainer
-  module DistorteD
-    class SVG < Image
-
-      SUB_TYPE = 'svg'.freeze
-
-      MIME_TYPES = MIME::Types[/^#{self::MEDIA_TYPE}\/#{self::SUB_TYPE}/, :complete => true].to_set
-
-      def self.optimize(src, dest)
-        # TODO: Make optimizations/plugins configurable
-        SvgOptimizer.optimize_file(src, dest, SvgOptimizer::DEFAULT_PLUGINS)
-      end
-
-    end
-  end
-end