usps_flags 0.4.1 → 0.5.0

data/lib/usps_flags/helpers/builders.rb

@@ -11,41 +11,10 @@ class USPSFlags::Helpers::Builders
     # This is useful for adjusting or creating new SVG data generators, but should not otherwise need to be called.
     # @private
     def grid(width: USPSFlags::Config::BASE_FLY, height: USPSFlags::Config::BASE_HOIST)
-      <<~SVG
-        <circle cx="0" cy="0" r="#{width / 60}" fill="#000000" fill-opacity="0.4" />
-        <circle cx="#{width}" cy="0" r="#{width / 60}" fill="#000000" fill-opacity="0.4" />
-        <circle cx="#{width}" cy="#{height}" r="#{width / 60}" fill="#000000" fill-opacity="0.4" />
-        <circle cx="0" cy="#{height}" r="#{width / 60}" fill="#000000" fill-opacity="0.4" />
-
-        <circle cx="#{width * 1 / 4}" cy="#{height / 2}" r="#{width / 60}" fill="#999999" fill-opacity="0.4" />
-        <circle cx="#{width * 3 / 4}" cy="#{height / 2}" r="#{width / 60}" fill="#999999" fill-opacity="0.4" />
-
-        <circle cx="#{width / 2}" cy="#{height * 1 / 4}" r="#{width / 60}"  fill="#999999" fill-opacity="0.4" />
-        <circle cx="#{width / 2}" cy="#{height / 2}" r="#{width / 60}"  fill="#000000" fill-opacity="0.4" />
-        <circle cx="#{width / 2}" cy="#{height / 2}" r="#{width / 75}"  fill="#CCCCCC" fill-opacity="0.4" />
-        <circle cx="#{width / 2}" cy="#{height / 2}" r="#{width / 100}" fill="#000000" fill-opacity="0.4" />
-        <circle cx="#{width / 2}" cy="#{height * 3 / 4}" r="#{width / 60}"  fill="#999999" fill-opacity="0.4" />
-
-        <line x1="0" y1="0" x2="#{width}" y2="0" stroke="#333333" stroke-width="#{width / 600}" stroke-opacity="0.5" />
-        <line x1="0" y1="#{height * 1 / 4}" x2="#{width}" y2="#{height * 1 / 4}" stroke="#333333" stroke-width="#{width / 600}" stroke-opacity="0.5" />
-        <line x1="0" y1="#{height / 2}" x2="#{width}" y2="#{height / 2}" stroke="#333333" stroke-width="#{width / 600}" stroke-opacity="0.5" />
-        <line x1="0" y1="#{height * 3 / 4}" x2="#{width}" y2="#{height * 3 / 4}" stroke="#333333" stroke-width="#{width / 600}" stroke-opacity="0.5" />
-        <line x1="0" y1="#{height}" x2="#{width}" y2="#{height}" stroke="#333333" stroke-width="#{width / 600}" stroke-opacity="0.5" />
-
-        <line y1="0" x1="0" y2="#{height}" x2="0" stroke="#333333" stroke-width="#{width / 600}" stroke-opacity="0.5" />
-        <line y1="0" x1="#{width * 1 / 6}" y2="#{height}" x2="#{width * 1 / 6}" stroke="#333333" stroke-width="#{width / 600}" stroke-opacity="0.5" />
-        <line y1="0" x1="#{width * 2 / 6}" y2="#{height}" x2="#{width * 2 / 6}" stroke="#333333" stroke-width="#{width / 600}" stroke-opacity="0.5" />
-        <line y1="0" x1="#{width * 3 / 6}" y2="#{height}" x2="#{width * 3 / 6}" stroke="#333333" stroke-width="#{width / 600}" stroke-opacity="0.5" />
-        <line y1="0" x1="#{width * 4 / 6}" y2="#{height}" x2="#{width * 4 / 6}" stroke="#333333" stroke-width="#{width / 600}" stroke-opacity="0.5" />
-        <line y1="0" x1="#{width * 5 / 6}" y2="#{height}" x2="#{width * 5 / 6}" stroke="#333333" stroke-width="#{width / 600}" stroke-opacity="0.5" />
-        <line y1="0" x1="#{width}" y2="#{height}" x2="#{width}" stroke="#333333" stroke-width="#{width / 600}" stroke-opacity="0.5" />
-
-        <line x1="#{width / 2}" y1="#{height * 1 / 4}" x2="#{width * 3 / 4}" y2="#{height / 2}" stroke="#999999" stroke-width="#{width / 600}" stroke-opacity="0.5" />
-        <line x1="#{width * 3 / 4}" y1="#{height / 2}" x2="#{width / 2}" y2="#{height * 3 / 4}" stroke="#999999" stroke-width="#{width / 600}" stroke-opacity="0.5" />
-        <line x1="#{width / 2}" y1="#{height * 3 / 4}" x2="#{width * 1 / 4}" y2="#{height / 2}" stroke="#999999" stroke-width="#{width / 600}" stroke-opacity="0.5" />
-        <line x1="#{width * 1 / 4}" y1="#{height / 2}" x2="#{width / 2}" y2="#{height * 1 / 4}" stroke="#999999" stroke-width="#{width / 600}" stroke-opacity="0.5" />
-
-      SVG
+      @width = width
+      @height = height
+      @stroke_width = @width / 600
+      "#{circles}#{horizontal_lines}#{vertical_lines}#{diagonal_lines}"
     end
 
     # Displays an overlay indicator of concentric circles and radiating lines.
@@ -69,5 +38,71 @@ class USPSFlags::Helpers::Builders
         <rect x="0" y="0" width="#{USPSFlags::Config::BASE_FLY / 30}" height="#{USPSFlags::Config::BASE_FLY / 30}" fill="#333333" fill-opacity="0.6" />
       SVG
     end
+
+  private
+
+    def circles
+      <<~SVG
+        #{pos_circle(0, 0)}
+        #{pos_circle(@width, 0)}
+        #{pos_circle(@width, @height)}
+        #{pos_circle(0, @height)}
+        <circle cx="#{@width * 1 / 4}" cy="#{@height / 2}" r="#{@width / 60}" fill="#999999" fill-opacity="0.4" />
+        <circle cx="#{@width * 3 / 4}" cy="#{@height / 2}" r="#{@width / 60}" fill="#999999" fill-opacity="0.4" />
+        #{radial_circles}
+      SVG
+    end
+
+    def radial_circles
+      <<~SVG
+        #{radial_circle(1, @width / 60)}
+        #{radial_circle(2, @width / 60)}
+        #{radial_circle(2, @width / 75)}
+        #{radial_circle(2, @width / 100)}
+        #{radial_circle(3, @width / 60)}
+      SVG
+    end
+
+    def pos_circle(cx, cy)
+      <<~SVG
+        <circle cx="#{cx}" cy="#{cy}" r="#{@width / 60}" fill="#000000" fill-opacity="0.4" />
+      SVG
+    end
+
+    def radial_circle(index, radius)
+      <<~SVG
+        <circle cx="#{@width / 2}" cy="#{@height * index / 4}" r="#{radius}"  fill="#999999" fill-opacity="0.4" />
+      SVG
+    end
+
+    def horizontal_lines
+      (0..4).map { |index| horizontal_line(index) }.join
+    end
+
+    def horizontal_line(index)
+      <<~SVG
+        <line x1="0" y1="#{@height * index / 4}" x2="#{@width}" y2="#{@height * index / 4}" stroke="#333333" stroke-width="#{@stroke_width}" stroke-opacity="0.5" />
+      SVG
+    end
+
+    def vertical_lines
+      (0..6).map { |index| vertical_line(index) }.join
+    end
+
+    def vertical_line(index)
+      <<~SVG
+        <line y1="0" x1="#{@width * index / 6}" y2="#{@height}" x2="#{@width * index / 6}" stroke="#333333" stroke-width="#{@stroke_width}" stroke-opacity="0.5" />
+      SVG
+    end
+
+    def diagonal_lines
+      "#{diagonal_line(2, 1, 3, 2)}#{diagonal_line(3, 2, 2, 3)}#{diagonal_line(2, 3, 1, 2)}#{diagonal_line(1, 2, 2, 1)}"
+    end
+
+    def diagonal_line(a, b, c, d)
+      <<~SVG
+        <line x1="#{@width * a / 4}" y1="#{@height * b / 4}" x2="#{@width * c / 4}" y2="#{@height * d / 4}" stroke="#999999" stroke-width="#{@stroke_width}" stroke-opacity="0.5" />
+      SVG
+    end
   end
 end

data/lib/usps_flags/helpers/spec_arrows.rb

@@ -10,49 +10,99 @@ class USPSFlags::Helpers::SpecArrows
     #
     # This is used USPSFlags::Core.trident_spec, and should never need to be called directly.
     # @private
-    def vertical(x, top, bottom, pointer_top = nil, pointer_bottom = nil, fly: nil, unit: nil, label_offset: (USPSFlags::Config::BASE_FLY / 120), label_offset_y: 0, label_align: 'left')
-      load_common_config(fly)
-      label, label_fraction = get_labels(bottom, top)
-      svg = ''
-
-      svg << arrow_pointer(x, pointer_top, top, top) unless pointer_top.nil?
-      svg << arrow_pointer(x, pointer_bottom, bottom, bottom) unless pointer_bottom.nil?
+    def vertical(x, top, bottom, **options)
+      options = defaults.merge(options)
 
-      svg << <<~SVG
-        <path d="M#{x} #{top} l #{@arrow_size} #{@arrow_size} M#{x} #{top} l -#{@arrow_size} #{@arrow_size} M#{x} #{top} l 0 #{bottom - top} l #{@arrow_size} -#{@arrow_size} M#{x} #{bottom} l -#{@arrow_size} -#{@arrow_size}" stroke="#{@color}" stroke-width="#{@stroke_width}" fill="none" />
-        <g>
-          <style><![CDATA[tspan{font-size: #{USPSFlags::Config::FRACTION_SCALE}%;}]]></style>
-          <text x="#{x + label_offset}" y="#{(top + bottom) / 2 + (USPSFlags::Config::BASE_HOIST / 150) + label_offset_y}" font-family="sans-serif" font-size="#{@font_size}px" fill="#041E42" text-anchor="#{label_align}">#{label} <tspan>#{label_fraction}</tspan> #{unit}</text>
-        </g>
-      SVG
+      load_common_config(options[:fly])
+      label, label_fraction = get_labels(bottom, top)
+      options = options.merge(x: x, top: top, bottom: bottom, label: label, label_fraction: label_fraction)
 
-      svg
+      vertical_svg_group(options)
     end
 
     # Creates a horizontal arrow for the trident spec sheet.
     #
     # This is used USPSFlags::Core.trident_spec, and should never need to be called directly.
     # @private
-    def horizontal(y, left, right, pointer_left = nil, pointer_right = nil, fly: nil, unit: nil, label_offset: (USPSFlags::Config::BASE_FLY / 45), label_offset_x: 0, label_align: 'middle')
-      load_common_config(fly)
+    def horizontal(y, left, right, **options)
+      options = defaults(:h).merge(options)
+
+      load_common_config(options[:fly])
       label, label_fraction = get_labels(right, left)
-      svg = ''
+      options = options.merge(y: y, left: left, right: right, label: label, label_fraction: label_fraction)
 
-      svg << arrow_pointer(left, left, pointer_left, y) unless pointer_left.nil?
-      svg << arrow_pointer(right, right, y, pointer_right) unless pointer_right.nil?
+      horizontal_svg_group(options)
+    end
 
-      svg << <<~SVG
-        <path d="M#{left} #{y} l #{@arrow_size} #{@arrow_size} M#{left} #{y} l #{@arrow_size} -#{@arrow_size} M#{left} #{y} l #{right - left} 0 l -#{@arrow_size} -#{@arrow_size} M#{right} #{y} l -#{@arrow_size} #{@arrow_size}" stroke="#{@color}" stroke-width="#{@stroke_width}" fill="none" />
+  private
+
+    def defaults(mode = :v)
+      {
+        pointer_top: nil, pointer_bottom: nil, pointer_left: nil, pointer_right: nil, fly: nil,
+        unit: nil, label_offset: (USPSFlags::Config::BASE_FLY / (mode == :v ? 120 : 45)),
+        label_offset_x: 0, label_offset_y: 0, label_align: (mode == :v ? 'left' : 'middle')
+      }
+    end
+
+    def vertical_svg_group(options)
+      svg = +''
+      svg << arrow_pointer(options) unless options[:pointer_top].nil?
+      svg << arrow_pointer(options) unless options[:pointer_bottom].nil?
+      svg << vertical_svg(options)
+      svg
+    end
+
+    def vertical_svg(options)
+      <<~SVG
+        <path d="#{vertical_svg_path(options)}" fill="none" />
         <g>
           <style><![CDATA[tspan{font-size: #{USPSFlags::Config::FRACTION_SCALE}%;}]]></style>
-          <text x="#{(left + right) / 2 + label_offset_x}" y="#{y + label_offset}" font-family="sans-serif" font-size="#{@font_size}px" fill="#041E42" text-anchor="#{label_align}">#{label} <tspan>#{label_fraction}</tspan> #{unit}</text>
+          #{vertical_svg_text(options)}
         </g>
       SVG
+    end
+
+    def vertical_svg_path(options)
+      <<~SVG
+        M#{options[:x]} #{options[:top]} l #{@arrow_size} #{@arrow_size} M#{options[:x]} #{options[:top]} l -#{@arrow_size} #{@arrow_size} M#{options[:x]} #{options[:top]} l 0 #{options[:bottom] - options[:top]} l #{@arrow_size} -#{@arrow_size} M#{options[:x]} #{options[:bottom]} l -#{@arrow_size} -#{@arrow_size}" stroke="#{@color}" stroke-width="#{@stroke_width}
+      SVG
+    end
+
+    def vertical_svg_text(options)
+      <<~SVG
+        <text x="#{options[:x] + options[:label_offset]}" y="#{(options[:top] + options[:bottom]) / 2 + (USPSFlags::Config::BASE_HOIST / 150) + options[:label_offset_y]}" font-family="sans-serif" font-size="#{@font_size}px" fill="#041E42" text-anchor="#{options[:label_align]}">#{options[:label]} <tspan>#{options[:label_fraction]}</tspan> #{options[:unit]}</text>
+      SVG
+    end
 
+    def horizontal_svg_group(options)
+      svg = +''
+      svg << arrow_pointer(options) unless options[:pointer_left].nil?
+      svg << arrow_pointer(options) unless options[:pointer_right].nil?
+      svg << horizontal_svg(options)
       svg
     end
 
-  private
+    def horizontal_svg(options)
+      <<~SVG
+        <path d="#{horizontal_svg_path(options)}" stroke="#{@color}" stroke-width="#{@stroke_width}" fill="none" />
+        <g>
+          <style><![CDATA[tspan{font-size: #{USPSFlags::Config::FRACTION_SCALE}%;}]]></style>
+          #{horizontal_svg_text(options)}
+        </g>
+      SVG
+    end
+
+    def horizontal_svg_path(options)
+      <<~SVG
+        M#{options[:left]} #{options[:y]} l #{@arrow_size} #{@arrow_size} M#{options[:left]} #{options[:y]} l #{@arrow_size} -#{@arrow_size} M#{options[:left]} #{options[:y]} l #{options[:right] - options[:left]} 0 l -#{@arrow_size} -#{@arrow_size} M#{options[:right]} #{options[:y]} l -#{@arrow_size} #{@arrow_size}
+      SVG
+    end
+
+    def horizontal_svg_text(options)
+      <<~SVG
+        <text x="#{(options[:left] + options[:right]) / 2 + options[:label_offset_x]}" y="#{options[:y] + options[:label_offset]}" font-family="sans-serif" font-size="#{@font_size}px" fill="#041E42" text-anchor="#{options[:label_align]}">#{options[:label]} <tspan>#{options[:label_fraction]}</tspan> #{options[:unit]}</text>
+      SVG
+    end
 
     def load_common_config(fly)
       @color = '#CCCCCC'
@@ -63,9 +113,9 @@ class USPSFlags::Helpers::SpecArrows
       @fly = fly || USPSFlags::Config::BASE_FLY
     end
 
-    def arrow_pointer(x1, x2, y1, y2)
+    def arrow_pointer(options)
       <<~SVG
-        <line x1="#{x1}" y1="#{y1}" x2="#{x2}" y2="#{y2}" stroke="#{@color}" stroke-width="#{@stroke_width}" stroke-dasharray="#{@stroke_dash}" />
+        <line x1="#{options[:x1]}" y1="#{options[:y1]}" x2="#{options[:x2]}" y2="#{options[:y2]}" stroke="#{@color}" stroke-width="#{@stroke_width}" stroke-dasharray="#{@stroke_dash}" />
       SVG
     end
 

data/lib/usps_flags/helpers/valid_flags.rb

@@ -0,0 +1,55 @@
+# frozen_string_literal: false
+
+# Valid flag configuration for USPSFlags::Helpers.
+#
+# These methods should never need to be called directly.
+# @private
+module USPSFlags::Helpers::ValidFlags
+  class << self
+    def load_valid_flags
+      @squadron_past = %w[PLTC PC]
+      @squadron_elected = %w[1LT LTC CDR]
+      @squadron_swallowtail = %w[PORTCAP FLEETCAP LT FLT]
+      @district_past = %w[PDLTC PDC]
+      @district_elected = %w[D1LT DLTC DC]
+      @district_swallowtail = %w[DLT DAIDE DFLT]
+      @national_past = %w[PSTFC PRC PVC PCC]
+      @national_elected = %w[STFC RC VC CC]
+      @national_swallowtail = %w[NAIDE NFLT]
+    end
+
+    def load_special_flags
+      @special = %w[CRUISE OIC ENSIGN] # WHEEL
+      @us = %w[US]
+    end
+
+    def load_valid_flag_groups
+      @past = @squadron_past + @district_past + @national_past
+      @squadron = @squadron_past + @squadron_elected + @squadron_swallowtail
+      @district = @district_past + @district_elected + @district_swallowtail
+      @national = @national_past + @national_elected + @national_swallowtail
+      @officer = @squadron + @district + @national
+    end
+
+    def valid_flags_for(type)
+      {
+        special: @special, us: @us, bridge: bridge_flags, command: command_flags,
+        squadron: @squadron, district: @district, national: @national, past: @past,
+        all: @officer + @special + @us, officer: @officer, insignia: @officer - @past,
+        swallowtail: @past + @squadron_swallowtail + @district_swallowtail + @national_swallowtail
+      }[type]
+    end
+
+    def bridge_flags
+      @squadron_elected.last(2) + @district_elected.last(2) + @national_elected.last(2) +
+      @squadron_past.last(2) + @district_past.last(2) + @national_past.last(2)
+    end
+
+    def command_flags
+      [
+        @squadron_elected.last, @district_elected.last, @national_elected.last,
+        @squadron_past.last, @district_past.last, @national_past.last
+      ]
+    end
+  end
+end

data/lib/usps_flags/helpers.rb

@@ -2,6 +2,8 @@
 
 # Container class for helper methods.
 class USPSFlags::Helpers
+  require 'usps_flags/helpers/valid_flags'
+
   class << self
     # Valid options for flag generation.
     #
@@ -16,8 +18,10 @@ class USPSFlags::Helpers
     # @option type [Symbol] :us US flag
     # @return [Array] Valid options for flag generation (based on the provided type).
     def valid_flags(type = :all)
-      load_valid_flags
-      valid_flags_for(type)
+      USPSFlags::Helpers::ValidFlags.load_valid_flags
+      USPSFlags::Helpers::ValidFlags.load_special_flags
+      USPSFlags::Helpers::ValidFlags.load_valid_flag_groups
+      USPSFlags::Helpers::ValidFlags.valid_flags_for(type)
     end
 
     # Resizes and saves a PNG image.
@@ -34,13 +38,7 @@ class USPSFlags::Helpers
       raise USPSFlags::Errors::PNGConversionError if outfile.nil? && size_key.nil?
 
       output_file_name = outfile || "#{USPSFlags.configuration.flags_dir}/PNG/#{file}.#{size_key}.png"
-      MiniMagick::Tool::Convert.new do |convert|
-        convert << '-background' << 'none'
-        convert << '-format' << 'png'
-        convert << '-resize' << "#{size}"
-        convert << png_file
-        convert << output_file_name
-      end
+      resize_convert(size, png_file, output_file_name)
     end
 
     # Gets the maximum length among valid flags.
@@ -142,49 +140,14 @@ class USPSFlags::Helpers
 
   private
 
-    def load_valid_flags
-      @squadron_past = %w[PLTC PC]
-      @squadron_elected = %w[1LT LTC CDR]
-      @squadron_swallowtail = %w[PORTCAP FLEETCAP LT FLT]
-      @district_past = %w[PDLTC PDC]
-      @district_elected = %w[D1LT DLTC DC]
-      @district_swallowtail = %w[DLT DAIDE DFLT]
-      @national_past = %w[PSTFC PRC PVC PCC]
-      @national_elected = %w[STFC RC VC CC]
-      @national_swallowtail = %w[NAIDE NFLT]
-      @special = %w[CRUISE OIC ENSIGN] # WHEEL
-      @us = %w[US]
-
-      @past = @squadron_past + @district_past + @national_past
-      @squadron = @squadron_past + @squadron_elected + @squadron_swallowtail
-      @district = @district_past + @district_elected + @district_swallowtail
-      @national = @national_past + @national_elected + @national_swallowtail
-      @officer = @squadron + @district + @national
-    end
-
-    def valid_flags_for(type)
-      {
-        special: @special,
-        us: @us,
-
-        squadron: @squadron,
-        district: @district,
-        national: @national,
-        past: @past,
-
-        all: @officer + @special + @us,
-        officer: @officer,
-        insignia: @officer - @past,
-        swallowtail: @past + @squadron_swallowtail + @district_swallowtail + @national_swallowtail,
-
-        bridge: @squadron_elected.last(2) + @squadron_past.last(2) +
-          @district_elected.last(2) + @district_past.last(2) +
-          @national_elected.last(2) + @national_past.last(2),
-
-        command: [@squadron_elected.last, @squadron_past.last,
-                  @district_elected.last, @district_past.last,
-                  @national_elected.last, @national_past.last]
-      }[type]
+    def resize_convert(size, png_file, output_file_name)
+      MiniMagick::Tool::Convert.new do |convert|
+        convert << '-background' << 'none'
+        convert << '-format' << 'png'
+        convert << '-resize' << "#{size}"
+        convert << png_file
+        convert << output_file_name
+      end
     end
 
     def flag_style(rank)

data/spec/spec_helper.rb

@@ -4,12 +4,10 @@ require 'bundler/setup'
 Bundler.setup
 require 'simplecov'
 SimpleCov.start
+SimpleCov.minimum_coverage(100)
 
 require 'usps_flags'
 
-# Some specs contain examples that check for the custom examples from USPSFlags::Errors
-RSpec::Expectations.configuration.on_potential_false_positives = :nothing
-
 RSpec.configure do |config|
   config.before(:suite) do
     $tmp_flags_dir = 'tmp/flags'

data/spec/usps_flags/core_spec.rb

@@ -4,7 +4,9 @@ require 'spec_helper'
 
 describe USPSFlags::Core do
   describe 'trident_spec' do
-    ['Field', 'Specification Heading Information', 'Short Trident', 'Delta Trident', 'Circle Trident', 'Long Trident'].each do |section|
+    [
+      'Field', 'Specification Heading Information', 'Short Trident', 'Delta Trident', 'Circle Trident', 'Long Trident'
+    ].each do |section|
       it "should contain the #{section} section" do
         expect(USPSFlags::Core.trident_spec).to include("<!-- #{section} -->")
       end
@@ -76,28 +78,24 @@ describe USPSFlags::Core do
       expect(USPSFlags::Core.field(style: :past, color: :blue)).to eql(
         <<~SVG
           <g transform="translate(2, 1)">
-            <path d="M 0 5
-              l #{@fly / 2} #{@hoist * 1 / 12}
-              l 0 #{@hoist * 10 / 12}
-              l -#{@fly / 2} #{@hoist * 1 / 12}
-            " fill="#{@blue}" />
-            <path d="M #{@fly / 2} #{@hoist * 1 / 12}
-              l #{@fly / 4} #{@hoist * 1 / 24}
-              l 0 #{@hoist * 9 / 12}
-              l -#{@fly / 4} #{@hoist * 1 / 24}
-            " fill="#FFFFFF" />
-            <path d="M #{@fly * 3 / 4} #{@hoist * 3 / 24}
-              l #{@fly / 4} #{@hoist * 1 / 24}
-              l -#{@fly / 5} #{@hoist / 3}
-              l #{@fly / 5} #{@hoist / 3}
-              l -#{@fly / 4} #{@hoist * 1 / 24}
-            " fill="#{@red}" />
-            <path d="M 0 0
-              l #{@fly} #{@hoist / 6}
-              l -#{@fly / 5} #{@hoist / 3}
-              l #{@fly / 5} #{@hoist / 3}
-              l -#{@fly} #{@hoist / 6} z
-            " fill="none" stroke="#000000" stroke-width="#{USPSFlags::Config::BASE_FLY / 600}" />
+            <path d="M 0 5 l #{@fly / 2} #{@hoist * 1 / 12}
+          l 0 #{@hoist * 10 / 12}
+          l -#{@fly / 2} #{@hoist * 1 / 12}
+          " fill="#{@blue}" />
+            <path d="M #{@fly / 2} #{@hoist * 1 / 12} l #{@fly / 4} #{@hoist * 1 / 24}
+          l 0 #{@hoist * 9 / 12}
+          l -#{@fly / 4} #{@hoist * 1 / 24}
+          " fill="#FFFFFF" />
+            <path d="M #{@fly * 3 / 4} #{@hoist * 3 / 24} l #{@fly / 4} #{@hoist * 1 / 24}
+          l -#{@fly / 5} #{@hoist / 3}
+          l #{@fly / 5} #{@hoist / 3}
+          l -#{@fly / 4} #{@hoist * 1 / 24}
+          " fill="#{@red}" />
+            <path d="M 0 0 l #{@fly} #{@hoist / 6}
+          l -#{@fly / 5} #{@hoist / 3}
+          l #{@fly / 5} #{@hoist / 3}
+          l -#{@fly} #{@hoist / 6}
+           z" fill="none" stroke="#000000" stroke-width="#{USPSFlags::Config::BASE_FLY / 600}" />
           </g>
         SVG
       )
@@ -110,11 +108,15 @@ describe USPSFlags::Core do
     end
 
     it 'should correctly generate a delta trident' do
-      expect(USPSFlags::Core.trident(:d)).to include("<g mask=\"url(#delta-mask)\"><path d=\"M #{@fly / 2} #{@hoist * 3 / 16}\n")
+      expect(USPSFlags::Core.trident(:d)).to include(
+        "<g mask=\"url(#delta-mask)\"><path d=\"M #{@fly / 2} #{@hoist * 3 / 16}\n"
+      )
     end
 
     it 'should correctly generate a circle trident' do
-      expect(USPSFlags::Core.trident(:stf)).to include("<g mask=\"url(#circle-mask-for-main-spike)\"><path d=\"M #{@fly / 2} #{@hoist / 8}\n")
+      expect(USPSFlags::Core.trident(:stf)).to include(
+        "<g mask=\"url(#circle-mask-for-main-spike)\"><path d=\"M #{@fly / 2} #{@hoist / 8}\n"
+      )
     end
 
     it 'should correctly generate a long trident' do

data/spec/usps_flags/generate_spec.rb

@@ -75,7 +75,9 @@ describe USPSFlags::Generate do
     end
 
     it 'should generate the trident specification sheet with a scaled border' do
-      expect(USPSFlags::Generate.spec(outfile: '', scaled_border: true)).to include('<title>USPS Trident Specifications</title>')
+      expect(USPSFlags::Generate.spec(outfile: '', scaled_border: true)).to include(
+        '<title>USPS Trident Specifications</title>'
+      )
     end
 
     it 'should generate the trident specification sheet with a fractional field size' do
@@ -101,7 +103,7 @@ describe USPSFlags::Generate do
     end
 
     it 'should not raise PNGGenerationError when correctly configured' do
-      expect { USPSFlags::Generate.png(@svg, outfile: 'lib/output/PNG/LTC.png') }.to_not raise_error(USPSFlags::Errors::PNGGenerationError)
+      expect { USPSFlags::Generate.png(@svg, outfile: 'lib/output/PNG/LTC.png') }.to_not raise_error
     end
   end
 
@@ -115,7 +117,8 @@ describe USPSFlags::Generate do
   describe 'static files errors' do
     it 'should raise USPSFlags::Errors::StaticFilesGenerationError when not given any true arguments' do
       expect { USPSFlags::Generate.all(svg: false, png: false, zips: false, reset: false) }.to raise_error(
-        USPSFlags::Errors::StaticFilesGenerationError, 'At least one argument switch must be true out of [svg, png, zips, reset].'
+        USPSFlags::Errors::StaticFilesGenerationError,
+        'At least one argument switch must be true out of [svg, png, zips, reset].'
       )
     end
 
@@ -133,7 +136,10 @@ describe USPSFlags::Generate do
 
       @svg_flag, @png_flag = USPSFlags::Helpers.valid_flags(:officer).sample(2)
       @svg_ins_flag, @png_ins_flag, @thb_flag = USPSFlags::Helpers.valid_flags(:insignia).sample(3)
-      puts "\nSelected test flags: ", "  Sf: #{@svg_flag}", "  Si: #{@svg_ins_flag}", "  Pf: #{@png_flag}", "  Pi: #{@png_ins_flag}", "  Pt: #{@thb_flag}"
+      puts(
+        "\nSelected test flags: ", "  Sf: #{@svg_flag}", "  Si: #{@svg_ins_flag}", "  Pf: #{@png_flag}",
+        "  Pi: #{@png_ins_flag}", "  Pt: #{@thb_flag}"
+      )
 
       ::FileUtils.rm_rf(USPSFlags.configuration.flags_dir)
       USPSFlags.prepare_flags_dir
@@ -141,13 +147,21 @@ describe USPSFlags::Generate do
       USPSFlags::Generate.svg(@svg_flag, outfile: "#{svg_dir}/#{@svg_flag}.svg")
       USPSFlags::Generate.svg(@svg_ins_flag, field: false, outfile: "#{svg_dir}/insignia/#{@svg_ins_flag}.svg")
       USPSFlags::Generate.png(USPSFlags::Generate.svg(@png_flag, outfile: ''), outfile: "#{png_dir}/#{@png_flag}.png")
-      USPSFlags::Generate.png(USPSFlags::Generate.svg(@png_ins_flag, field: false, outfile: ''), trim: true, outfile: "#{png_dir}/insignia/#{@png_ins_flag}.png")
-      USPSFlags::Generate.png(USPSFlags::Generate.svg(@thb_flag, field: false, outfile: ''), trim: true, outfile: "#{png_dir}/insignia/#{@thb_flag}.png")
-      USPSFlags::Helpers.resize_png("#{png_dir}/insignia/#{@thb_flag}.png", file: "insignia/#{@thb_flag}", size: 150, size_key: 'thumb')
+      USPSFlags::Generate.png(
+        USPSFlags::Generate.svg(@png_ins_flag, field: false, outfile: ''),
+        trim: true, outfile: "#{png_dir}/insignia/#{@png_ins_flag}.png"
+      )
+      USPSFlags::Generate.png(
+        USPSFlags::Generate.svg(@thb_flag, field: false, outfile: ''),
+        trim: true, outfile: "#{png_dir}/insignia/#{@thb_flag}.png"
+      )
+      USPSFlags::Helpers.resize_png(
+        "#{png_dir}/insignia/#{@thb_flag}.png", file: "insignia/#{@thb_flag}", size: 150, size_key: 'thumb'
+      )
     end
 
     it 'should not raise an error while generating all static files' do
-      expect { USPSFlags::Generate.all(reset: false) }.to_not raise_error # (USPSFlags::Errors::StaticFilesGenerationError)
+      expect { USPSFlags::Generate.all(reset: false) }.to_not raise_error
     end
 
     describe 'generation logs' do
@@ -217,11 +231,11 @@ describe USPSFlags::Generate do
     end
 
     it 'should not raise an error while clearing all static files' do
-      expect { USPSFlags::Generate.all(svg: false, png: false, zips: false, reset: true) }.to_not raise_error # (USPSFlags::Errors::StaticFilesGenerationError)
+      expect { USPSFlags::Generate.all(svg: false, png: false, zips: false, reset: true) }.to_not raise_error
     end
 
     it 'should not raise an error while generating zip files' do
-      expect { USPSFlags::Generate.zips }.to_not raise_error # (USPSFlags::Errors::ZipGenerationError)
+      expect { USPSFlags::Generate.zips }.to_not raise_error
     end
   end
 end

data/spec/usps_flags/helpers_spec.rb

@@ -16,17 +16,24 @@ describe USPSFlags::Helpers do
     end
 
     it 'should correctly generate the grid helper' do
-      expect(USPSFlags::Helpers::Builders.grid).to include("<circle cx=\"0\" cy=\"0\" r=\"#{USPSFlags::Config::BASE_FLY / 60}\" fill=\"#000000\" fill-opacity=\"0.4\" />")
+      expect(USPSFlags::Helpers::Builders.grid).to include(
+        "<circle cx=\"0\" cy=\"0\" r=\"#{USPSFlags::Config::BASE_FLY / 60}\" fill=\"#000000\" fill-opacity=\"0.4\" />"
+      )
     end
 
     it 'should correctly generate the locator helper' do
-      expect(USPSFlags::Helpers::Builders.locator).to include("<rect x=\"0\" y=\"0\" width=\"#{USPSFlags::Config::BASE_FLY / 30}\" height=\"#{USPSFlags::Config::BASE_FLY / 30}\" fill=\"#333333\" fill-opacity=\"0.6\" />")
+      expect(USPSFlags::Helpers::Builders.locator).to include(
+        "<rect x=\"0\" y=\"0\" width=\"#{USPSFlags::Config::BASE_FLY / 30}\" " \
+        "height=\"#{USPSFlags::Config::BASE_FLY / 30}\" fill=\"#333333\" fill-opacity=\"0.6\" />"
+      )
     end
   end
 
   describe 'resize_png' do
     it 'should raise USPSFlags::Errors::PNGConversionError with invalid parameters' do
-      expect { USPSFlags::Helpers.resize_png('path/to/image.png', size: 100, size_key: 'thumb') }.to raise_error(USPSFlags::Errors::PNGConversionError)
+      expect do
+        USPSFlags::Helpers.resize_png('path/to/image.png', size: 100, size_key: 'thumb')
+      end.to raise_error(USPSFlags::Errors::PNGConversionError)
     end
   end
 end

data/spec/usps_flags_spec.rb

@@ -16,8 +16,7 @@ describe USPSFlags do
     @valid_body = <<~SVG
       <desc id="trademark-desc">This image is a registered trademark of United States Power Squadrons.</desc>
       <desc id="trademark-link">https://www.usps.org/images/secretary/itcom/trademark.pdf</desc>
-      </metadata>
-      <g transform="translate(-512)">
+      </metadata><g transform="translate(-512)">
       <path d="M 1536 512
       l 80 184
       l -40 -24
@@ -143,7 +142,9 @@ describe USPSFlags do
 
       describe 'png' do
         it 'should raise PNGGenerationError without png_file set' do
-          expect { @flag.png }.to raise_error(USPSFlags::Errors::PNGGenerationError, 'A path must be set with png_file.')
+          expect { @flag.png }.to raise_error(
+            USPSFlags::Errors::PNGGenerationError, 'A path must be set with png_file.'
+          )
         end
 
         context 'with png_file set' do
@@ -153,7 +154,7 @@ describe USPSFlags do
           end
 
           it 'should not raise PNGGenerationError with png_file set' do
-            expect { @flag.png }.to_not raise_error(USPSFlags::Errors::PNGGenerationError)
+            expect { @flag.png }.to_not raise_error
           end
 
           it 'should return the value of png_file' do