usps_flags 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a401780854a7517c7b211d59ae8c64d99f2190ece54927c9db84fea2bf33957
-  data.tar.gz: cd332320e247bd219bf094a72ab6c31a57fb642fefdc3cab889a4fb26b32cfc4
+  metadata.gz: 81903e12eb16e794cf65e42f308bac5f1a31eafbec1bdb338de3cf162b3eaa7c
+  data.tar.gz: f05fd9c77801a80bb30e0c5e6b94727c1585a6bc2dff316adca65aad11a51eeb
 SHA512:
-  metadata.gz: a7d4c6dd949fb0402e768a3347610cf417c2926eddbb99fe319721bb4d09595d2f9886b52bcbb88728dfa6b1d556d839e992e01b4c70a62a0ceef997996f81e4
-  data.tar.gz: 0d4ab1879a6d9fc1616a8fd7b1532dd50900a824d39b958679fecbc05ab8966a64d8bb48aa5ff505d5a43ce5eb4dd764b030c0063f4fba9e4ced7ab3c1e27ece
+  metadata.gz: 3bb2c5d8072a94e5c34d4ab6f45755db623e81be902b6256d20767a6ad6dca3bf5eccccc9c2b2e63bf0f59a16a2726675f9befdc0b86e34192f731b12aefdc7d
+  data.tar.gz: a3450ce9bb0fa69b173c52feeb6344d06cee8a2bfb5ff27dfa3eadc955c2022b5387bac647f385bb145de3f7fae903bae52642805eb7b08a507988be958a11b2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    usps_flags (0.5.1)
+    usps_flags (0.5.2)
       file_utils (~> 1.1, >= 1.1.2)
       mini_magick (~> 4.8, >= 4.8.0)
       rubyzip (~> 1.2, >= 1.2.1)

data/lib/modules.yml

@@ -0,0 +1,24 @@
+usps_flags:
+  - rational
+  - config
+  - configuration
+  - helpers
+  - core
+  - generate
+  - errors
+usps_flags/helpers:
+  - builders
+  - spec_arrows
+usps_flags/core:
+  - icons
+  - ensign
+  - field
+  - footer
+  - headers
+  - pennant
+  - tridents
+  - trident_specs
+  - us
+  - wheel
+usps_flags/generate:
+  - flag

data/lib/usps_flags.rb

@@ -5,18 +5,12 @@
 # @author Julian Fiander
 # @since 0.1.5
 class USPSFlags
-  MODULES ||= {
-    'usps_flags' => %w[rational config helpers core generate errors],
-    'usps_flags/helpers' => %w[builders spec_arrows],
-    'usps_flags/core' => %w[
-      icons ensign field footer headers pennant tridents trident_specs trident_spec us wheel
-    ],
-    'usps_flags/generate' => %w[flag]
-  }.freeze
-
   require 'fileutils'
   require 'zip'
   require 'mini_magick'
+  require 'yaml'
+
+  MODULES ||= ::YAML.safe_load(File.read('lib/modules.yml')).freeze
 
   MODULES.each do |parent, bases|
     bases.each do |base|
@@ -25,54 +19,8 @@ class USPSFlags
     end
   end
 
-  # Configuration accessor.
-  def self.configuration
-    @configuration ||= USPSFlags::Config.new
-  end
-
-  # Configuration constructor.
-  def self.configure
-    yield(configuration) if block_given?
-    ensure_directories
-    @configuration
-  end
-
-  # Ensures the directory structure exists.
-  #
-  # @private
-  def self.ensure_directories
-    get_dir_configs
-    prepare_dir_configs
-    prepare_flags_dir
-    ::FileUtils.mkdir_p(USPSFlags.configuration.log_path)
-  end
-
-  # Gets all configuration variables that specify a dir.
-  #
-  # @private
-  def self.get_dir_configs
-    @dirs = USPSFlags.configuration.instance_variables.map(&:to_s)
-                     .map { |v| v.match(/.*?_dir/) }.compact.map(&:to_s)
-  end
-
-  # Ensures that directories exist (and are cleared, if configured).
-  #
-  # @private
-  def self.prepare_dir_configs
-    @dirs.each do |dir|
-      dir_path = @configuration.instance_variable_get(dir)
-      ::FileUtils.rm_rf(dir_path) if @configuration.clear
-      ::FileUtils.mkdir_p(dir_path)
-    end
-  end
-
-  # Ensures that the flags_dir subdirectories exist.
-  #
-  # @private
-  def self.prepare_flags_dir
-    ::FileUtils.mkdir_p("#{@configuration.flags_dir}/PNG/insignia")
-    ::FileUtils.mkdir_p("#{@configuration.flags_dir}/SVG/insignia")
-    ::FileUtils.mkdir_p("#{@configuration.flags_dir}/ZIP")
+  class << self
+    include USPSFlags::Configuration
   end
 
   # Constructor for individual flags.

data/lib/usps_flags/configuration.rb

@@ -0,0 +1,57 @@
+# frozen_string_literal: false
+
+# User input configuration module.
+class USPSFlags
+  module Configuration
+    # Configuration accessor.
+    def configuration
+      @configuration ||= USPSFlags::Config.new
+    end
+
+    # Configuration constructor.
+    def configure
+      yield(configuration) if block_given?
+      ensure_directories
+      @configuration
+    end
+
+    # Ensures the directory structure exists.
+    #
+    # @private
+    def ensure_directories
+      get_dir_configs
+      prepare_dir_configs
+      prepare_flags_dir
+      ::FileUtils.mkdir_p(USPSFlags.configuration.log_path)
+    end
+
+    # Gets all configuration variables that specify a dir.
+    #
+    # @private
+    def get_dir_configs
+      @dirs = USPSFlags.configuration.instance_variables.map(&:to_s).map do |v|
+        v.match(/.*?_dir/)
+      end.compact.map(&:to_s)
+    end
+
+    # Ensures that directories exist (and are cleared, if configured).
+    #
+    # @private
+    def prepare_dir_configs
+      @dirs.each do |dir|
+        dir_path = @configuration.instance_variable_get(dir)
+        ::FileUtils.rm_rf(dir_path) if @configuration.clear
+        ::FileUtils.mkdir_p(dir_path)
+      end
+    end
+
+    # Ensures that the flags_dir subdirectories exist.
+    #
+    # @private
+    def prepare_flags_dir
+      ::FileUtils.mkdir_p("#{@configuration.flags_dir}/PNG/insignia")
+      ::FileUtils.mkdir_p("#{@configuration.flags_dir}/SVG/insignia")
+      ::FileUtils.mkdir_p("#{@configuration.flags_dir}/ZIP")
+    end
+  end
+end

data/lib/usps_flags/core.rb

@@ -7,7 +7,7 @@
 class USPSFlags
   class Core
     def self.trident_spec(fly: 24, unit: 'in', scaled_border: false)
-      USPSFlags::Core::TridentSpec.new(fly: fly, unit: unit, scaled_border: scaled_border).svg
+      USPSFlags::Core::TridentSpecs::Build.new(fly: fly, unit: unit, scaled_border: scaled_border).svg
     end
 
     def self.headers(width: nil, height: nil, pennant: false, scale: nil, title: 'USPS Flag')

data/lib/usps_flags/core/trident_specs.rb

@@ -7,12 +7,17 @@
 class USPSFlags
   class Core
     module TridentSpecs
+      SA = USPSFlags::Helpers::SpecArrows
+      BF = USPSFlags::Config::BASE_FLY
+      BH = USPSFlags::Config::BASE_HOIST
+
       require 'usps_flags/core/trident_specs/base'
       require 'usps_flags/core/trident_specs/header'
       require 'usps_flags/core/trident_specs/short'
       require 'usps_flags/core/trident_specs/delta'
       require 'usps_flags/core/trident_specs/long'
       require 'usps_flags/core/trident_specs/circle'
+      require 'usps_flags/core/trident_specs/build'
     end
   end
 end

data/lib/usps_flags/core/trident_specs/base.rb

@@ -12,9 +12,9 @@ class USPSFlags
         require 'usps_flags/core/trident_specs/horizontal'
         require 'usps_flags/core/trident_specs/overlay'
 
-        SA = USPSFlags::Helpers::SpecArrows
-        BF = USPSFlags::Config::BASE_FLY
-        BH = USPSFlags::Config::BASE_HOIST
+        # SA = USPSFlags::Helpers::SpecArrows
+        # BF = USPSFlags::Config::BASE_FLY
+        # BH = USPSFlags::Config::BASE_HOIST
 
         def initialize(options = {})
           @config = options[:config]

data/lib/usps_flags/core/trident_specs/build.rb

@@ -0,0 +1,142 @@
+# frozen_string_literal: false
+
+# Core SVG data for the trident specification sheet.
+#
+# This class should never need to be called directly.
+# @private
+class USPSFlags
+  class Core
+    module TridentSpecs
+      class Build
+        def initialize(fly: 24, unit: 'in', scaled_border: false)
+          @config = USPSFlags.configuration.trident
+          @scaled_border = scaled_border
+          configure_sizes(fly)
+          configure_labels(unit)
+        end
+
+        def svg
+          svg = spec_header
+          svg << add_short_trident
+          svg << add_delta_trident
+          svg << add_national_tridents
+
+          svg
+        end
+
+      private
+
+        def box_left
+          (BF * 27 / 32) / 2
+        end
+
+        def box_right
+          (BF * 37 / 32) / 2
+        end
+
+        def add_short_trident
+          box_top    = BH / 4
+          box_bottom = BH * 3 / 4
+          add_trident(:Short, box_top, box_bottom, box_left, box_right)
+        end
+
+        def add_delta_trident
+          box_top    = BH * 3 / 16
+          box_bottom = BH * 13 / 16
+          add_trident(:Delta, box_top, box_bottom, box_left, box_right)
+        end
+
+        def add_national_tridents
+          box_top    = BH / 8
+          box_bottom = BH * 7 / 8
+          add_trident(:Circle, box_top, box_bottom, box_left, box_right) +
+            add_trident(:Long, box_top, box_bottom, box_left, box_right)
+        end
+
+        def configure_sizes(fly)
+          @fly = Rational(fly)
+          get_hoist_from_fly(@fly)
+          configure_hoist_fraction
+          configure_fly_fraction
+        end
+
+        def get_hoist_from_fly(fly)
+          hoist = (fly * Rational(2, 3))
+          @hoist = if hoist == hoist.to_i
+            hoist.to_i
+          else
+            hoist
+          end
+        end
+
+        def configure_hoist_fraction
+          @hoist_fraction = ''
+          if @hoist == @hoist.to_i
+            @hoist = @hoist.to_i
+          else
+            @hoist, @hoist_fraction = USPSFlags::Rational.new(@hoist).to_simplified_a
+          end
+        end
+
+        def configure_fly_fraction
+          @fly_fraction = ''
+          if @fly == @fly.to_i
+            @fly = @fly.to_i
+          else
+            @fly, @fly_fraction = USPSFlags::Rational.new(@fly).to_simplified_a
+          end
+        end
+
+        def configure_labels(unit)
+          @label_font_size = if Math.sqrt(@fly) > 24
+            BF * Math.log(24, Math.sqrt(@fly)) / 60
+          else
+            BF / 60
+          end
+
+          @unit_text = unit.nil? ? '' : unit.to_s
+          @unit = unit
+
+          configure_barb_label
+        end
+
+        def configure_barb_label
+          barb_label = Rational(@config[:main_point_barb]) * @fly / BF
+          @barb_label = if barb_label == barb_label.to_i
+            "#{barb_label.to_i}#{@unit_text}"
+          else
+            "#{USPSFlags::Rational.new(barb_label).to_simplified_s}#{@unit_text}"
+          end
+        end
+
+        def spec_header
+          USPSFlags::Core::TridentSpecs::Header.new(
+            fly: @fly, fly_fraction: @fly_fraction, hoist: @hoist, hoist_fraction: @hoist_fraction,
+            unit_text: @unit_text, scaled_border: @scaled_border
+          ).p
+        end
+
+        def add_trident(type, box_top, box_bottom, box_left, box_right)
+          sym = { Short: :s, Delta: :d, Circle: :stf, Long: :n }[type]
+
+          Object.const_get("USPSFlags::Core::TridentSpecs::#{type}").new(
+            bt: box_top, bb: box_bottom, bl: box_left, br: box_right,
+            fly: @fly, unit: @unit, heading: heading(sym), config: @config
+          ).p
+        end
+
+        def heading(type_sym)
+          type, description = {
+            s: ['Short', 'Squadron Officers'], d: ['Delta', 'District Officers'],
+            stf: ['Circle', 'Staff Commanders Only'], n: ['Long', 'National Officers']
+          }[type_sym]
+
+          <<~SVG
+            <text x="#{BF / 2}" y="#{BH * 1 / 40}" font-family="sans-serif" font-size="#{BH / 30}px" font-weight="bold" fill="#BF0D3E" text-anchor="middle">#{type}</text>
+            <text x="#{BF / 2}" y="#{BH * 5 / 80}" font-family="sans-serif" font-size="#{BH / 40}px" fill="#BF0D3E" text-anchor="middle">#{description}</text>
+          SVG
+        end
+      end
+    end
+  end
+end

data/lib/usps_flags/core/trident_specs/horizontal.rb

@@ -18,12 +18,12 @@ class USPSFlags
             <!-- Bottom -->
               #{bottom_bar_width} <!-- Bar width -->
               #{bottom_hash_width} <!-- Hash width -->
-              #{Base::SA.horizontal(@box_bottom + @config[:bar_width] * 4, @box_left, @box_right, pointer_left: @box_bottom, pointer_right: @box_bottom, fly: @fly, unit: @unit)} <!-- Boundary width -->
+              #{SA.horizontal(@box_bottom + @config[:bar_width] * 4, @box_left, @box_right, pointer_left: @box_bottom, pointer_right: @box_bottom, fly: @fly, unit: @unit)} <!-- Boundary width -->
           SVG
         end
 
         def bottom_bar_width
-          Base::SA.horizontal(
+          SA.horizontal(
             @box_bottom + @config[:bar_width], @config[:center_point] - @config[:bar_width] / 2,
             @config[:center_point] + @config[:bar_width] / 2,
             pointer_left: @box_bottom, pointer_right: @box_bottom, fly: @fly, unit: @unit
@@ -31,7 +31,7 @@ class USPSFlags
         end
 
         def bottom_hash_width
-          Base::SA.horizontal(
+          SA.horizontal(
             @box_bottom + @config[:bar_width] * 2.5, @config[:center_point] - @config[:hash_width] / 2,
             @config[:center_point] + @config[:hash_width] / 2,
             pointer_left: bottom_hash_width_pointer_left, pointer_right: bottom_hash_width_pointer_right,
@@ -56,18 +56,18 @@ class USPSFlags
         end
 
         def top_side_point_width
-          Base::SA.horizontal(
+          SA.horizontal(
             @box_top - @config[:bar_width], @box_left, @box_left + @config[:bar_width] * 3 / 2,
             pointer_left: @box_top, pointer_right: @box_top + @config[:bar_width] * 4 / 5 + @config[:side_point_height],
-            label_offset: -Base::BF / 60, fly: @fly, unit: @unit
+            label_offset: -BF / 60, fly: @fly, unit: @unit
           )
         end
 
         def top_main_point_width
-          Base::SA.horizontal(
+          SA.horizontal(
             @box_top - @config[:bar_width] * 2.5, top_main_point_top, @config[:center_point] + @config[:bar_width],
             pointer_left: @box_top + @config[:center_point_height], fly: @fly, unit: @unit,
-            pointer_right: @box_top + @config[:center_point_height], label_offset: -Base::BF / 60
+            pointer_right: @box_top + @config[:center_point_height], label_offset: -BF / 60
           )
         end
 

data/lib/usps_flags/core/trident_specs/overlay.rb

@@ -18,7 +18,7 @@ class USPSFlags
             <!-- Overlay -->
               <!-- Main point barb -->
                 #{overlay_lines}
-                <text x="#{@config[:center_point] + @config[:bar_width] * 9 / 8}" y="#{@box_top + @config[:center_point_height] - @config[:main_point_barb]}" font-family="sans-serif" font-size="#{Base::BF / 100}px" fill="#041E42" text-anchor="left">#{@barb_label}</text>
+                <text x="#{@config[:center_point] + @config[:bar_width] * 9 / 8}" y="#{@box_top + @config[:center_point_height] - @config[:main_point_barb]}" font-family="sans-serif" font-size="#{BF / 100}px" fill="#041E42" text-anchor="left">#{@barb_label}</text>
           SVG
         end
 

data/lib/usps_flags/core/trident_specs/vertical.rb

@@ -16,7 +16,7 @@ class USPSFlags
         def right
           <<~SVG
             <!-- Right -->
-              #{Base::SA.vertical(@box_right + @config[:bar_width], @box_top, @box_top + @config[:bar_width] * 4 / 5, pointer_top: @box_right, pointer_bottom: @box_right, fly: @fly, unit: @unit)} <!-- Side spike top gap -->
+              #{SA.vertical(@box_right + @config[:bar_width], @box_top, @box_top + @config[:bar_width] * 4 / 5, pointer_top: @box_right, pointer_bottom: @box_right, fly: @fly, unit: @unit)} <!-- Side spike top gap -->
               #{right_top_gap_to_hash_gap} <!-- Top gap to hash gap -->
               #{right_crossbar_to_hash_gap} <!-- Crossbar to hash gap -->
 
@@ -26,7 +26,7 @@ class USPSFlags
         end
 
         def right_top_gap_to_hash_gap
-          Base::SA.vertical(
+          SA.vertical(
             @box_right + @config[:bar_width], @box_top + @config[:bar_width] * 4 / 5, right_top_gap_bottom,
             pointer_bottom: @box_right, fly: @fly, unit: @unit
           )
@@ -37,7 +37,7 @@ class USPSFlags
         end
 
         def right_crossbar_to_hash_gap
-          Base::SA.vertical(
+          SA.vertical(
             @box_right + @config[:bar_width], right_crossbar_top, right_crossbar_bottom,
             pointer_bottom: @config[:center_point] + @config[:hash_width] / 2, fly: @fly, unit: @unit
           )
@@ -52,7 +52,7 @@ class USPSFlags
         end
 
         def right_hash
-          Base::SA.vertical(
+          SA.vertical(
             @box_right + @config[:bar_width], right_hash_top, right_hash_bottom,
             pointer_bottom: @config[:center_point] + @config[:hash_width] / 2, fly: @fly, unit: @unit
           )
@@ -67,7 +67,7 @@ class USPSFlags
         end
 
         def right_hash_to_bottom
-          Base::SA.vertical(
+          SA.vertical(
             @box_right + @config[:bar_width],
             @box_top + @config[:bar_width] * 38 / 10 + @config[:side_point_height] + @config[:side_spike_height],
             @box_bottom, pointer_bottom: @box_right, fly: @fly, unit: @unit
@@ -77,24 +77,24 @@ class USPSFlags
         def left
           <<~SVG
             <!-- Left -->
-              #{Base::SA.vertical(@box_left - @config[:bar_width] * 5.25, @box_top, @box_bottom, pointer_top: @box_left, pointer_bottom: @box_left, fly: @fly, unit: @unit)} <!-- Boundary height -->
+              #{SA.vertical(@box_left - @config[:bar_width] * 5.25, @box_top, @box_bottom, pointer_top: @box_left, pointer_bottom: @box_left, fly: @fly, unit: @unit)} <!-- Boundary height -->
               #{left_main_point_height} <!-- Main point height -->
               #{left_side_point_height} <!-- Side point height -->
           SVG
         end
 
         def left_main_point_height
-          Base::SA.vertical(
+          SA.vertical(
             @box_left - @config[:bar_width] * 0.75, @box_top, @box_top + @config[:center_point_height],
-            pointer_bottom: @config[:center_point] - @config[:bar_width], label_offset: -Base::BF / 24,
-            label_offset_y: -Base::BF / 60, label_align: 'middle', fly: @fly, unit: @unit
+            pointer_bottom: @config[:center_point] - @config[:bar_width], label_offset: -BF / 24,
+            label_offset_y: -BF / 60, label_align: 'middle', fly: @fly, unit: @unit
           )
         end
 
         def left_side_point_height
-          Base::SA.vertical(
+          SA.vertical(
             @box_left - @config[:bar_width] * 1.5, @box_top + @config[:bar_width] * 4 / 5, left_side_point_bottom,
-            pointer_top: @box_left, pointer_bottom: @box_left + @config[:bar_width], label_offset: -Base::BF / 24,
+            pointer_top: @box_left, pointer_bottom: @box_left + @config[:bar_width], label_offset: -BF / 24,
             label_align: 'middle', fly: @fly, unit: @unit
           )
         end

data/usps_flags.gemspec

@@ -2,8 +2,8 @@
 
 Gem::Specification.new do |s|
   s.name          = 'usps_flags'
-  s.version       = '0.5.1'
-  s.date          = '2019-06-07'
+  s.version       = '0.5.2'
+  s.date          = '2019-06-14'
   s.summary       = 'Flag generator for United States Power Squadrons'
   s.description   = 'A flag image (PNG, SVG) generator for United States Power Squadrons.'
   s.homepage      = 'http://rubygems.org/gems/usps_flags'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: usps_flags
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Julian Fiander
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-07 00:00:00.000000000 Z
+date: 2019-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: file_utils
@@ -187,8 +187,10 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- lib/modules.yml
 - lib/usps_flags.rb
 - lib/usps_flags/config.rb
+- lib/usps_flags/configuration.rb
 - lib/usps_flags/core.rb
 - lib/usps_flags/core/ensign.rb
 - lib/usps_flags/core/field.rb
@@ -203,9 +205,9 @@ files:
 - lib/usps_flags/core/icons/trident_parts/hashes.rb
 - lib/usps_flags/core/icons/trumpet.rb
 - lib/usps_flags/core/pennant.rb
-- lib/usps_flags/core/trident_spec.rb
 - lib/usps_flags/core/trident_specs.rb
 - lib/usps_flags/core/trident_specs/base.rb
+- lib/usps_flags/core/trident_specs/build.rb
 - lib/usps_flags/core/trident_specs/circle.rb
 - lib/usps_flags/core/trident_specs/delta.rb
 - lib/usps_flags/core/trident_specs/header.rb

data/lib/usps_flags/core/trident_spec.rb

@@ -1,144 +0,0 @@
-# frozen_string_literal: false
-
-# Core SVG data for the trident specification sheet.
-#
-# This class should never need to be called directly.
-# @private
-class USPSFlags
-  class Core
-    class TridentSpec
-      SA = USPSFlags::Helpers::SpecArrows
-      BF = USPSFlags::Config::BASE_FLY
-      BH = USPSFlags::Config::BASE_HOIST
-
-      def initialize(fly: 24, unit: 'in', scaled_border: false)
-        @config = USPSFlags.configuration.trident
-        @scaled_border = scaled_border
-        configure_sizes(fly)
-        configure_labels(unit)
-      end
-
-      def svg
-        svg = spec_header
-        svg << add_short_trident
-        svg << add_delta_trident
-        svg << add_national_tridents
-
-        svg
-      end
-
-    private
-
-      def box_left
-        (BF * 27 / 32) / 2
-      end
-
-      def box_right
-        (BF * 37 / 32) / 2
-      end
-
-      def add_short_trident
-        box_top    = BH / 4
-        box_bottom = BH * 3 / 4
-        add_trident(:Short, box_top, box_bottom, box_left, box_right)
-      end
-
-      def add_delta_trident
-        box_top    = BH * 3 / 16
-        box_bottom = BH * 13 / 16
-        add_trident(:Delta, box_top, box_bottom, box_left, box_right)
-      end
-
-      def add_national_tridents
-        box_top    = BH / 8
-        box_bottom = BH * 7 / 8
-        add_trident(:Circle, box_top, box_bottom, box_left, box_right) +
-          add_trident(:Long, box_top, box_bottom, box_left, box_right)
-      end
-
-      def configure_sizes(fly)
-        @fly = Rational(fly)
-        get_hoist_from_fly(@fly)
-        configure_hoist_fraction
-        configure_fly_fraction
-      end
-
-      def get_hoist_from_fly(fly)
-        hoist = (fly * Rational(2, 3))
-        @hoist = if hoist == hoist.to_i
-          hoist.to_i
-        else
-          hoist
-        end
-      end
-
-      def configure_hoist_fraction
-        @hoist_fraction = ''
-        if @hoist == @hoist.to_i
-          @hoist = @hoist.to_i
-        else
-          @hoist, @hoist_fraction = USPSFlags::Rational.new(@hoist).to_simplified_a
-        end
-      end
-
-      def configure_fly_fraction
-        @fly_fraction = ''
-        if @fly == @fly.to_i
-          @fly = @fly.to_i
-        else
-          @fly, @fly_fraction = USPSFlags::Rational.new(@fly).to_simplified_a
-        end
-      end
-
-      def configure_labels(unit)
-        @label_font_size = if Math.sqrt(@fly) > 24
-          BF * Math.log(24, Math.sqrt(@fly)) / 60
-        else
-          BF / 60
-        end
-
-        @unit_text = unit.nil? ? '' : unit.to_s
-        @unit = unit
-
-        configure_barb_label
-      end
-
-      def configure_barb_label
-        barb_label = Rational(@config[:main_point_barb]) * @fly / BF
-        @barb_label = if barb_label == barb_label.to_i
-          "#{barb_label.to_i}#{@unit_text}"
-        else
-          "#{USPSFlags::Rational.new(barb_label).to_simplified_s}#{@unit_text}"
-        end
-      end
-
-      def spec_header
-        USPSFlags::Core::TridentSpecs::Header.new(
-          fly: @fly, fly_fraction: @fly_fraction, hoist: @hoist, hoist_fraction: @hoist_fraction,
-          unit_text: @unit_text, scaled_border: @scaled_border
-        ).p
-      end
-
-      def add_trident(type, box_top, box_bottom, box_left, box_right)
-        sym = { Short: :s, Delta: :d, Circle: :stf, Long: :n }[type]
-
-        Object.const_get("USPSFlags::Core::TridentSpecs::#{type}").new(
-          bt: box_top, bb: box_bottom, bl: box_left, br: box_right,
-          fly: @fly, unit: @unit, heading: heading(sym), config: @config
-        ).p
-      end
-
-      def heading(type_sym)
-        type, description = {
-          s: ['Short', 'Squadron Officers'], d: ['Delta', 'District Officers'],
-          stf: ['Circle', 'Staff Commanders Only'], n: ['Long', 'National Officers']
-        }[type_sym]
-
-        <<~SVG
-          <text x="#{BF / 2}" y="#{BH * 1 / 40}" font-family="sans-serif" font-size="#{BH / 30}px" font-weight="bold" fill="#BF0D3E" text-anchor="middle">#{type}</text>
-          <text x="#{BF / 2}" y="#{BH * 5 / 80}" font-family="sans-serif" font-size="#{BH / 40}px" fill="#BF0D3E" text-anchor="middle">#{description}</text>
-        SVG
-      end
-    end
-  end
-end