distorted 0.6.0 → 0.7.0

data/lib/distorted/monkey_business/hash.rb

@@ -15,19 +15,4 @@ class Hash
     end
   end
   
-  # https://github.com/dam13n/ruby-bury/blob/master/hash.rb
-  # This is not packaged as a Gem or I'd be using it instead of including my own.
-  def bury(*args)
-    if args.count < 2
-      raise ArgumentError.new('2 or more arguments required')
-    elsif args.count == 2
-      self[args[0]] = args[1]
-    else
-      arg = args.shift
-      self[arg] = {} unless self[arg]
-      self[arg].bury(*args) unless args.empty?
-    end
-    self
-  end
-
 end

data/lib/distorted/{modular_technology/triple_counter.rb → triple_counter.rb}

@@ -1,10 +1,17 @@
 TripleCounter = Struct.new(:major, :minor, :micro) do
   attr_reader :major, :minor, :micro
 
-  def initialize(major = 0, minor = 0, micro = 0)
+  # Include a catch-all so we can splat Array-generating functions
+  # into TripleCounter.new(), e.g. Ruby/GStreamer's library version:
+  #   irb> require 'gst'
+  #   => true
+  #   irb> Gst.version
+  #   => [1, 19, 0, 1]
+  def initialize(major = 0, minor = 0, micro = 0, *_)
     @major = major
     @minor = minor
     @micro = micro
+    super(major, minor, micro)  # Intentionally not passing our splat to `super`
   end
 
   def to_s

data/lib/distorted/version.rb

@@ -1,22 +1,22 @@
-#                                                                                                                        
-#            `.........-`                                                                      `:/:::://.`               
-#          `+/``+ssss:``-/:`                                                                 `:o+y. `::::-----``         
-#         -+- :hmNNmdhs- `o++`             `-:--/                            -/...         ./shhyoy. +mmmmds+:--...`     
-#       .//``odmNmmd+++` :+/h:-------------:+. ./...-..........---/--:.------//  -.--------//o//o+/+- :hhdmmmmmh/`-/-`   
-#     `:+- :ymNmmyy:...-:` /: ./////////////-  ::/:/- `++++++++` -y  /:.`.////+-  /////- `/+++++++. :- .::+sydmNm+ `/+.  
-#    -+:` /syyyo:--:+oso` /:  ---:::::::syys. -yoy+s` :mmmmmmmd- .h` ``:osshhyyy` /oshhs` -:::::::.  :: `-..-/dmo` `/yo: 
-#  `/o:--------:+syyy++``+s+++++++++/``:h+os``oshdos``odhhhddyy-`.h.`.ssyhmmdmoh/``o+mmho``:++++++++++y+``----::``-oyss. 
-#  +sssssssyyyyyhdmmsyo-+/----------.`.yooy-`-hodss/``---------.`.h-`.sohdhsymhsy.`:+yNmy/`.-----------:++ooooooo+sss+`  
-#  `+dmmmdddddmmNNddhsyosooooooooooooooysoysssyymssssssssssssssssshyssyoh:` .mhsyssssodddyooooooooooooooysoyyyyyyyyy/    
-#    /mNmdddhmdmmdy+-+mdhhhhhhhhhhhhhhhmhhyhhhmdmmdhhhhhhhhhhhhhhhdhhhsm+    ydddhhhhd-hdmdddddddddddddddyhdhdmmNms.     
-#     .---.......`    -yhNmmhddhhhdhmhmhddmNNmyyy+dmNdydhyyyhddhmmmmNmhh.    -hyhNNNh: .mNmdmdddhhhdddmmyssssssso:       
-#                       `/oooooooooooooo:`-+o+/.  `+oo+o++++ooo+oooooo-       `-+oo/`   :oooooooooooooo/                 
-#                                                                                                                        
+#                                                                                                                       
+#            `.........-`                                                                      `:/:::://.`              
+#          `+/``+ssss:``-/:`                                                                 `:o+y. `::::-----``        
+#         -+- :hmNNmdhs- `o++`             `-:--/                            -/...         ./shhyoy. +mmmmds+:--...`    
+#       .//``odmNmmd+++` :+/h:-------------:+. ./...-..........---/--:.------//  -.--------//o//o+/+- :hhdmmmmmh/`-/-`  
+#     `:+- :ymNmmyy:...-:` /: ./////////////-  ::/:/- `++++++++` -y  /:.`.////+-  /////- `/+++++++. :- .::+sydmNm+ `/+. 
+#    -+:` /syyyo:--:+oso` /:  ---:::::::syys. -yoy+s` :mmmmmmmd- .h` ``:osshhyyy` /oshhs` -:::::::.  :: `-..-/dmo` `/yo:
+#  `/o:--------:+syyy++``+s+++++++++/``:h+os``oshdos``odhhhddyy-`.h.`.ssyhmmdmoh/``o+mmho``:++++++++++y+``----::``-oyss.
+#  +sssssssyyyyyhdmmsyo-+/----------.`.yooy-`-hodss/``---------.`.h-`.sohdhsymhsy.`:+yNmy/`.-----------:++ooooooo+sss+` 
+#  `+dmmmdddddmmNNddhsyosooooooooooooooysoysssyymssssssssssssssssshyssyoh:` .mhsyssssodddyooooooooooooooysoyyyyyyyyy/   
+#    /mNmdddhmdmmdy+-+mdhhhhhhhhhhhhhhhmhhyhhhmdmmdhhhhhhhhhhhhhhhdhhhsm+    ydddhhhhd-hdmdddddddddddddddyhdhdmmNms.    
+#     .---.......`    -yhNmmhddhhhdhmhmhddmNNmyyy+dmNdydhyyyhddhmmmmNmhh.    -hyhNNNh: .mNmdmdddhhhdddmmyssssssso:      
+#                       `/oooooooooooooo:`-+o+/.  `+oo+o++++ooo+oooooo-       `-+oo/`   :oooooooooooooo/                
+#                                                                                                                       
 
-require_relative 'modular_technology/triple_counter'
+require_relative 'triple_counter'
 
 module Cooltrainer
   module DistorteD
-    VERSION = TripleCounter.new(0, 6, 0)
+    VERSION = TripleCounter.new(0, 7, 0)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: distorted
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - okeeblow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-19 00:00:00.000000000 Z
+date: 2021-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,70 +16,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
-- !ruby/object:Gem::Dependency
-  name: gstreamer
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.4'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '5.14'
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: ruby-filemagic
   requirement: !ruby/object:Gem::Requirement
@@ -123,33 +109,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.2.5
 - !ruby/object:Gem::Dependency
-  name: hexapdf
+  name: gstreamer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.9
+        version: '3.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.9
+        version: '3.4'
 - !ruby/object:Gem::Dependency
-  name: ttfunk
+  name: hexapdf
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0.13'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0.13'
 - !ruby/object:Gem::Dependency
   name: charlock_holmes
   requirement: !ruby/object:Gem::Requirement
@@ -164,15 +150,33 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
+- !ruby/object:Gem::Dependency
+  name: ttfunk
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
 description: Ruby implementation of core file-format operations used by DistorteD-Jekyll.
 email:
 - root@cooltrainer.org
-executables: []
+executables:
+- distorted
 extensions: []
 extra_rdoc_files: []
 files:
 - LICENSE
 - README.md
+- bin/console
+- bin/distorted
+- bin/setup
 - font/1252/LICENSE/MoreLessPerfectDOSVGA437/img/Less_Perfect_DOS_VGA.png
 - font/1252/LICENSE/MoreLessPerfectDOSVGA437/img/More_Perfect_DOS_VGA.png
 - font/1252/LICENSE/MoreLessPerfectDOSVGA437/img/Perfect_DOS_VGA.png
@@ -199,29 +203,38 @@ files:
 - font/850/Profont/readme.txt
 - font/932/LICENSE/README-ttf.txt
 - font/932/mona.ttf
+- lib/distorted.rb
 - lib/distorted/checking_you_out.rb
+- lib/distorted/checking_you_out/README
+- lib/distorted/checking_you_out/application.yaml
+- lib/distorted/checking_you_out/font.yaml
+- lib/distorted/checking_you_out/image.yaml
+- lib/distorted/click_again.rb
+- lib/distorted/element_of_media.rb
+- lib/distorted/element_of_media/change.rb
+- lib/distorted/element_of_media/compound.rb
 - lib/distorted/error_code.rb
-- lib/distorted/injection_of_love.rb
+- lib/distorted/floor.rb
+- lib/distorted/invoker.rb
+- lib/distorted/media_molecule.rb
+- lib/distorted/media_molecule/font.rb
+- lib/distorted/media_molecule/image.rb
+- lib/distorted/media_molecule/pdf.rb
+- lib/distorted/media_molecule/svg.rb
+- lib/distorted/media_molecule/text.rb
+- lib/distorted/media_molecule/video.rb
+- lib/distorted/modular_technology/gstreamer.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/modular_technology/vips/foreign.rb
+- lib/distorted/modular_technology/vips/load.rb
+- lib/distorted/modular_technology/vips/save.rb
+- lib/distorted/monkey_business/encoding.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/types/README
-- lib/distorted/types/application.yaml
-- lib/distorted/types/font.yaml
+- lib/distorted/triple_counter.rb
 - lib/distorted/version.rb
 - test/distorted_test.rb
 - test/test_helper.rb

data/lib/distorted/injection_of_love.rb

@@ -1,247 +0,0 @@
-require 'set'
-require 'distorted/monkey_business/set'
-
-
-# This Module supports Module "Piles"* in DistorteD by merging
-# an arbitrarily-deep nest of attribute-definition constants
-# into a single combined datastructure per constant at include-/
-# extend-/prepend-time.
-# [*] 'Monad' doesn't feel quite right, but http://www.geekculture.com/joyoftech/joyimages/469.gif
-#
-# The combined structures can be accessed in one shot and trusted as
-# a source of truth, versus inspecting Module::nesting or whatever
-# to iterate over the masked same-Symbol constants we'd get when
-# including/extending/prepending in Ruby normally:
-#   - https://ruby-doc.org/core/Module.html#method-c-nesting
-#   - http://valve.github.io/blog/2013/10/26/constant-resolution-in-ruby/
-
-# There's some general redundancy here with Bundler's const_get_safely:
-# https://ruby-doc.org/stdlib/libdoc/bundler/rdoc/Bundler/SharedHelpers.html#method-i-const_get_safely
-#
-# …but even though I use (and enjoy using) Bundler it feels Wrong™ to me to have
-# that method in stdlib and especially in Core but not as part of Module since
-# 'Bundler' still feels like a third-party namespace to me v(._. )v
-
-
-module Cooltrainer; end
-module Cooltrainer::DistorteD; end
-module Cooltrainer::DistorteD::InjectionOfLove
-
-  # These hold (possibly-runtime-generated) Sets of MIME::Types (from our loader)*
-  # describing any supported input media-types (:LOWER_WORLD)
-  # and any supported output media-types (:OUTER_LIMITS).
-  TYPE_CONSTANTS = Set[
-    :LOWER_WORLD,
-    :OUTER_LIMITS,
-  ]
-  # These hold Hashes or Sets describing supported attributes,
-  # supported attribute-values (otherwise freeform),
-  # attribute defaults if any, and mappings for any of those things
-  # to any aliased equivalents for normalization and localization.
-  ATTRIBUTE_CONSTANTS = Set[
-    :ATTRIBUTES,
-    :ATTRIBUTES_DEFAULT,
-    :ATTRIBUTES_VALUES,
-  ]
-  # 🄒  All of the above.
-  DISTORTED_CONSTANTS = Set[].merge(TYPE_CONSTANTS).merge(ATTRIBUTE_CONSTANTS)
-
-  # Name of our fully-merged-Hash's class variable.
-  AFTERPARTY = :@@DistorteD
-
-
-  # Activate this module when it's included.
-  # We will merge DistorteD attributes to the singleton class from
-  # our including context and from out including context's included_modules,
-  # then we will define methods in the including context to perpetuate
-  # the merging process when that context is included/extended/prepended.
-  def self.included(otra)
-    self::Injection_Of_Love.call(otra)
-    super
-  end
-
-  # "Attribute" fragments are processed in one additional step to support
-  # aliased/equivalent attribute names and values.
-  # This is a quality-of-life feature to help normalize/localize attributes
-  # defined in a wide range of places by multiple unrelated upstream devs.
-  #
-  # For example, libvips savers expect a single-character upper-case
-  # `Q` argument for their 1–100 integer quality factor,
-  # and my VipsSave module's `:ATTRIBUTES` additionally aliases it
-  # to the more typical `quality` to provide consistent UX
-  # with other attributes from VIPS and other sources.
-  # https://libvips.github.io/libvips/API/current/VipsForeignSave.html#vips-jpegsave
-  #
-  # VIPS also provides our example of the need for attribute-value equivalents,
-  # such as how it only accepts the spelling of "centre" and not "center"
-  # like myself and many millions of other people will reflexively enter :)
-  # https://libvips.github.io/libvips/API/current/libvips-conversion.html#VipsInteresting
-  def self.so_deep(fragment)
-    fragment.each_with_object(Array[]) { |(attribute, raw), to_merge|
-      # Each attribute's :raw may be an object (probably a Symbol),
-      # a Set (e.g. of aliases), or nil (for all values in a Set.to_hash)
-      case raw
-        when Set then raw.add(attribute)
-        when NilClass then [attribute]
-        else [attribute]
-      end.each{ |equivalent|
-        to_merge << [equivalent, attribute]
-      }
-    }.to_h
-  end
-
-  # Returns a block that will define methods in a given context
-  # such that when the given context is included/extended/prepended
-  # we will also merge our DD attributes into the new layer.
-  Injection_Of_Love = Proc.new { |otra|
-    # These are the methods that actively perform the include/extend/prepend process.
-    [:append_features, :prepend_features, :extend_object].each { |m|
-      otra.define_singleton_method(m) do |winter|
-        # Perform the normal include/extend/prepend that will mask our constants.
-        super(winter)
-
-        # Get new values to override masked constants.
-        pile = Cooltrainer::DistorteD::InjectionOfLove::trip_machine(winter)
-
-        # Record each constant individually as well as the entire pile.
-        # This doesn't currently get used, as this :class_variable_set call
-        # is broken in KRI:
-        #  - https://bugs.ruby-lang.org/issues/7475
-        #  - https://bugs.ruby-lang.org/issues/8297
-        #  - https://bugs.ruby-lang.org/issues/11022
-        winter.singleton_class.class_variable_set(AFTERPARTY, pile)
-        pile.each_pair{ |k, v|
-          if winter.singleton_class.const_defined?(k, false)
-            # Since we are setting constants in the singleton_class
-            # we must remove any old ones first to avoid a warning.
-            winter.singleton_class.send(:remove_const, k)
-          end
-          winter.singleton_class.const_set(k, v)
-        }
-      end
-    }
-    # These are the callback methods called after the above methods fire.
-    # Use them to perpetuate our merge by calling the thing that calls us :)
-    [:included, :prepended, :extended].each { |m|
-      otra.define_singleton_method(m) do |winter|
-        Cooltrainer::DistorteD::InjectionOfLove::Injection_Of_Love.call(winter)
-        super(winter)
-      end
-    }
-  }
-
-  # Returns an instance-level copy of the complete attribute pile.
-  def trip_machine
-    @DistorteD ||= Cooltrainer::DistorteD::InjectionOfLove::trip_machine(self.singleton_class)
-  end
-
-  # Builds the attribute pile (e.g. suported atrs, values, defaults, etc) for any given scope.
-  def self.trip_machine(scope)
-      attribute_aliases = Hash[]
-      alias_attributes = Hash[]
-      values = Hash[]
-      defaults = Hash[]
-
-      scope&.ancestors.each { |otra|
-        DISTORTED_CONSTANTS.each { |invitation|  # OUT OF CONTROL / MY WHEELS IN CONSTANT MOTION
-          if otra.const_defined?(invitation)
-            part = otra.const_get(invitation) rescue Hash[]
-
-            if invitation == :ATTRIBUTES
-              # Support both alias-to-attribute and attribute-to-aliases
-              attribute_aliases.merge!(part) { |invitation, old, new|
-                if old.nil?
-                  new.nil? ? Set[invitation] : Set[new]
-                elsif new.nil?
-                  old
-                elsif new.is_a?(Enumerable)
-                  old.merge(new)
-                else
-                  old << new
-                end
-              }
-              alias_attributes.merge!(Cooltrainer::DistorteD::InjectionOfLove::so_deep(part))
-            elsif invitation == :ATTRIBUTES_VALUES
-              # Regexes currently override Enumerables
-              to_merge = {}
-              part.each_pair { |attribute, values|
-                if values.is_a?(Regexp)
-                  to_merge.update(attribute => values)
-                else
-                  to_merge.update(attribute => Cooltrainer::DistorteD::InjectionOfLove::so_deep(values))
-                end
-              }
-              values.merge!(to_merge)
-            elsif invitation == :ATTRIBUTES_DEFAULT
-              defaults.merge!(part)
-            end
-
-          end
-        }
-      }
-
-      return {
-        :ATTRIBUTE_ALIASES => attribute_aliases,
-        :ALIAS_ATTRIBUTES => alias_attributes,
-        :ATTRIBUTES_VALUES => values,
-        :ATTRIBUTES_DEFAULT => defaults,
-      }
-  end
-
-  # Returns a value for any attribute.
-  # In order of priority, that means:
-  #  - A user-given value (Liquid, CLI, etc) iff it passes a validity check,
-  #  - the default value if the given value is not in the accepted Set,
-  #  - nil for unset attributes with no default defined.
-  def abstract(argument)
-    # Reject any unknown arguments.
-    if trip_machine.dig(:ATTRIBUTE_ALIASES)&.keys.include?(argument)
-      alias_possibilities = trip_machine.dig(:ATTRIBUTE_ALIASES)&.dig(argument) || Set[]
-      possibilities = user_arguments&.keys.to_set & alias_possibilities
-
-      # How many matching user-defined attributes are there for our aliases?
-      case possibilities.length
-      when 0
-        # None; take the default.
-        trip_machine.dig(:ATTRIBUTES_DEFAULT)&.dig(argument)
-      when 1
-        # One; does it look valid?
-        is_valid = false
-        user_value = user_arguments&.dig(argument)
-
-        # Supported values may be declared as:
-        #   - A Hash of values-and-their-aliases to values.
-        #   - A Regex.
-        #   - nil for freeform input.
-        valid_value = trip_machine.dig(:ATTRIBUTES_VALUES)&.dig(argument)
-        if valid_value.is_a?(Enumerable)
-          if valid_value.include?(user_value)
-            is_valid = true
-          end
-        elsif valid_value.is_a?(Regexp)
-          if valid_value.match(user_value.to_s)
-            is_valid = true
-          end
-        end
-
-        # Return a valid user value, a default, or nil if all else fails.
-        if is_valid
-          # TODO: boolean casting
-          user_value
-        else
-          trip_machine.dig(:ATTRIBUTES_DEFAULT)&.dig(argument)
-        end
-
-      else  # case user_values.length
-        # Two or more; what do??
-        raise RuntimeError("Can't have multiple settings for #{argument} and its aliases.")
-      end
-    else
-      # The programmer asked for the value of an attribute that is
-      # not supported by its MediaMolecule. This is most likely a bug.
-      raise RuntimeError("#{argument} is not supported for #{@name}")
-    end
-  end
-
-
-end