usps_flags 0.5.0 → 0.5.1

data/lib/usps_flags/core/us.rb

@@ -4,61 +4,57 @@
 #
 # This class should never need to be called directly.
 # @private
-class USPSFlags::Core::US
-  def svg
-    @base_hoist = 2000.to_f
-    @base_fly = @base_hoist * 1.91
+class USPSFlags
+  class Core
+    class US
+      def svg
+        @base_hoist = 2000.to_f
+        @base_fly = @base_hoist * 1.91
 
-    @canton_hoist = @base_hoist * 7 / 13
-    @canton_fly = @canton_hoist * Math.sqrt(2)
+        @canton_hoist = @base_hoist * 7 / 13
+        @canton_fly = @canton_hoist * Math.sqrt(2)
 
-    @star_offset = 20 # Half of scaled star height
+        @star_offset = 20 # Half of scaled star height
 
-    svg = defs
-    svg << stripes
-    svg << stars
+        defs + stripes + stars
+      end
 
-    # star_diameter = base_hoist*4/5/13
-    # svg << <<~SVG
-    #   <circle cx="#{@canton_fly*6/12}" cy="#{@canton_hoist*4/10-5}" r="#{star_diameter/2}" fill="#999999" fill-opacity="0.4" />
-    # SVG
+    private
 
-    svg
-  end
+      def defs
+        File.read("#{File.dirname(__dir__)}/core/us_defs.svg.partial").gsub('STAR', USPSFlags::Core.star)
+      end
 
-private
+      def stars
+        rows = { odd: (1..9).step(2).to_a, even: (2..8).step(2).to_a }
+        columns = { odd: (1..11).step(2).to_a, even: (2..10).step(2).to_a }
 
-  def defs
-    File.read("#{File.dirname(__dir__)}/core/us_defs.svg.partial").gsub('STAR', USPSFlags::Core.star)
-  end
+        svg = +''
+        %i[odd even].each { |type| svg << star_set(rows, columns, type) }
+        svg
+      end
 
-  def stars
-    rows = { odd: (1..9).step(2).to_a, even: (2..8).step(2).to_a }
-    columns = { odd: (1..11).step(2).to_a, even: (2..10).step(2).to_a }
+      def star_set(rows, columns, type)
+        svg = +''
+        rows[type].each do |r|
+          columns[type].each do |c|
+            svg << <<~SVG
+              <g transform="translate(#{@canton_fly * c / 12}, #{@star_offset + @canton_hoist * r / 10})"><g><use href="#star" /></g></g>
+            SVG
+          end
+        end
+        svg
+      end
 
-    svg = +''
-    %i[odd even].each { |type| svg << star_set(rows, columns, type) }
-    svg
-  end
+      def stripes
+        s = (0..12).map do |i|
+          color = i.even? ? 'red' : 'white'
+          "<use href=\"##{color}-stripe\" y=\"#{@base_hoist * i / 13}\" />"
+        end
 
-  def star_set(rows, columns, type)
-    svg = +''
-    rows[type].each do |r|
-      columns[type].each do |c|
-        svg << <<~SVG
-          <g transform="translate(#{@canton_fly * c / 12}, #{@star_offset + @canton_hoist * r / 10})"><g><use href="#star" /></g></g>
-        SVG
+        s.join("\n") + "\n<rect y=\"0\" width=\"#{@canton_fly}\" height=\"#{@canton_hoist}\" " \
+          "fill=\"#{USPSFlags::Config::OLD_GLORY_BLUE}\" />\n"
       end
     end
-    svg
-  end
-
-  def stripes
-    s = (0..12).map do |i|
-      color = i.even? ? 'red' : 'white'
-      "<use href=\"##{color}-stripe\" y=\"#{@base_hoist * i / 13}\" />"
-    end
-
-    s.join("\n") + "\n<rect y=\"0\" width=\"#{@canton_fly}\" height=\"#{@canton_hoist}\" fill=\"#{USPSFlags::Config::OLD_GLORY_BLUE}\" />\n"
   end
 end

data/lib/usps_flags/core/wheel.rb

@@ -4,8 +4,12 @@
 #
 # This class should never need to be called directly.
 # @private
-class USPSFlags::Core::Wheel
-  def svg
-    File.read("#{File.dirname(__dir__)}/core/wheel.svg.partial")
+class USPSFlags
+  class Core
+    class Wheel
+      def svg
+        File.read("#{File.dirname(__dir__)}/core/wheel.svg.partial")
+      end
+    end
   end
 end

data/lib/usps_flags/errors.rb

@@ -3,38 +3,40 @@
 # Custom errors.
 #
 # @private
-module USPSFlags::Errors
-  class PNGGenerationError < StandardError
-    attr_reader :svg
+class USPSFlags
+  class Errors
+    class PNGGenerationError < StandardError
+      attr_reader :svg
 
-    def initialize(msg = 'There was an error generating the PNG file.', svg: '')
-      super(msg)
-      @svg = svg
+      def initialize(msg = 'There was an error generating the PNG file.', svg: '')
+        super(msg)
+        @svg = svg
+      end
     end
-  end
 
-  class PNGConversionError < StandardError
-    def initialize(msg = 'There was an error converting the PNG file.')
-      super(msg)
+    class PNGConversionError < StandardError
+      def initialize(msg = 'There was an error converting the PNG file.')
+        super(msg)
+      end
     end
-  end
 
-  class StaticFilesGenerationError < StandardError
-    attr_reader :cause
+    class StaticFilesGenerationError < StandardError
+      attr_reader :cause
 
-    def initialize(msg = 'There was an error generating the static files.', cause: nil)
-      super(msg)
-      @cause = cause
+      def initialize(msg = 'There was an error generating the static files.', cause: nil)
+        super(msg)
+        @cause = cause
+      end
     end
-  end
 
-  class ZipGenerationError < StandardError
-    attr_reader :type, :cause
+    class ZipGenerationError < StandardError
+      attr_reader :type, :cause
 
-    def initialize(msg = 'There was an error generating the zip file.', type: nil, cause: nil)
-      super(msg)
-      @type = type
-      @cause = cause
+      def initialize(msg = 'There was an error generating the zip file.', type: nil, cause: nil)
+        super(msg)
+        @type = type
+        @cause = cause
+      end
     end
   end
 end

data/lib/usps_flags/generate.rb

@@ -1,127 +1,131 @@
 # frozen_string_literal: false
 
 # Controller class for generating files.
-class USPSFlags::Generate
-  require 'usps_flags/generate/private'
-
-  class << self
-    include USPSFlags::Generate::Private
-    # The primary controller method. Generates an SVG file or SVG data.
-    #
-    # @param [String] flag The flag type to generate.
-    # @param [String] outfile The path to save the SVG file to. If not set, prints to console.
-    # @param [Boolean] field Whether to generate the flag field (including any border).
-    # @param [String] scale The image scale divisor factor.
-    # @return [String] Returns the SVG data.
-    def svg(flag, outfile: nil, scale: nil, field: true)
-      flag = flag.upcase.delete('/', '_', 'PENNANT')
-
-      USPSFlags::Helpers.ensure_dir_for_file(outfile)
-
-      output = special_flag(flag, outfile, scale)
-      output ||= USPSFlags::Generate::Flag.officer(rank: flag, outfile: outfile, scale: scale, field: field)
-      output
-    end
-
-    # Convert SVG data into a PNG file.
-    #
-    # @param [String] svg The SVG data.
-    # @param [String] outfile The path to save the PNG file to. (Required because the file is not accessible if this is left blank.)
-    # @param [Boolean] trim Whether to trim the generated PNG file of excess transparency.
-    # @param [String] background Background color. Defaults to 'none' (transparent).
-    def png(svg, outfile: nil, trim: false, background: 'none')
-      raise USPSFlags::Errors::PNGGenerationError.new(svg: svg) if outfile.nil? || outfile.empty?
+class USPSFlags
+  class Generate
+    require 'usps_flags/generate/helper_methods'
+    require 'usps_flags/generate/generator_methods'
+
+    class << self
+      include USPSFlags::Generate::HelperMethods
+      include USPSFlags::Generate::GeneratorMethods
+      # The primary controller method. Generates an SVG file or SVG data.
+      #
+      # @param [String] flag The flag type to generate.
+      # @param [String] outfile The path to save the SVG file to. If not set, prints to console.
+      # @param [Boolean] field Whether to generate the flag field (including any border).
+      # @param [String] scale The image scale divisor factor.
+      # @return [String] Returns the SVG data.
+      def svg(flag, outfile: nil, scale: nil, field: true)
+        flag = flag.upcase.delete('/', '_', 'PENNANT')
+
+        USPSFlags::Helpers.ensure_dir_for_file(outfile)
+
+        output = special_flag(flag, outfile, scale)
+        output ||= USPSFlags::Generate::Flag.officer(rank: flag, outfile: outfile, scale: scale, field: field)
+        output
+      end
 
-      set_temp_svg(svg)
+      # Convert SVG data into a PNG file.
+      #
+      # @param [String] svg The SVG data.
+      # @param [String] outfile The path to save the PNG file to. (Required because the file isn't accessible if blank.)
+      # @param [Boolean] trim Whether to trim the generated PNG file of excess transparency.
+      # @param [String] background Background color. Defaults to 'none' (transparent).
+      def png(svg, outfile: nil, trim: false, background: 'none')
+        raise USPSFlags::Errors::PNGGenerationError.new(svg: svg) if outfile.nil? || outfile.empty?
 
-      USPSFlags::Helpers.ensure_dir_for_file(outfile)
+        set_temp_svg(svg)
 
-      generate_png(background, trim, outfile)
-    ensure
-      ::File.delete(@temp_svg_path) if delete_temp_svg?
-    end
+        USPSFlags::Helpers.ensure_dir_for_file(outfile)
 
-    # Generate all static SVG and PNG files, and automaticall generates zip archives for download.
-    #
-    # @param [Boolean] svg Whether to generate SVG images.
-    # @param [Boolean] png Whether to generate PNG images.
-    # @param [Boolean] zips Whether to create zip archives for all images created. Does not create a zip for skipped formats.
-    # @param [Boolean] reset Whether to delete all previous files before generating new files.
-    def all(svg: true, png: true, zips: true, reset: true)
-      all_arg_error unless any_all_arg?(svg, png, zips, reset)
-
-      track_time do
-        remove_static_files if reset
-        images(svg: svg, png: png) if svg || png
-        zips(svg: svg, png: png) if zips
+        generate_png(background, trim, outfile)
+      ensure
+        ::File.delete(@temp_svg_path) if delete_temp_svg?
       end
-    end
 
-    # Generate zip archives of current static image files.
-    #
-    # @param [Boolean] svg Generate zip archive of SVG images.
-    # @param [Boolean] png Generate zip archive of PNG images.
-    def zips(svg: true, png: true)
-      unless svg || png
-        raise(
-          USPSFlags::Errors::ZipGenerationError,
-          'At least one argument switch must be true out of [svg, png].'
-        )
+      # Generate all static SVG and PNG files, and automaticall generates zip archives for download.
+      #
+      # @param [Boolean] svg Whether to generate SVG images.
+      # @param [Boolean] png Whether to generate PNG images.
+      # @param [Boolean] zips Whether to create zip archives for all images created.
+      # @param [Boolean] reset Whether to delete all previous files before generating new files.
+      def all(svg: true, png: true, zips: true, reset: true)
+        all_arg_error unless any_all_arg?(svg, png, zips, reset)
+
+        track_time do
+          remove_static_files if reset
+          images(svg: svg, png: png) if svg || png
+          zips(svg: svg, png: png) if zips
+        end
       end
 
-      generate_zip('svg') if svg
-      generate_zip('png') if png
-    end
+      # Generate zip archives of current static image files.
+      #
+      # @param [Boolean] svg Generate zip archive of SVG images.
+      # @param [Boolean] png Generate zip archive of PNG images.
+      def zips(svg: true, png: true)
+        unless svg || png
+          raise(
+            USPSFlags::Errors::ZipGenerationError,
+            'At least one argument switch must be true out of [svg, png].'
+          )
+        end
+
+        generate_zip('svg') if svg
+        generate_zip('png') if png
+      end
 
-    # Generate static image files.
-    #
-    # @param [Boolean] svg Generate static SVG images.
-    # @param [Boolean] png Generate static PNG images.
-    def images(svg: true, png: true)
-      static_generation_header
-      USPSFlags::Helpers.valid_flags(:all).each do |flag|
-        generate_static_images_for(flag, svg: svg, png: png)
+      # Generate static image files.
+      #
+      # @param [Boolean] svg Generate static SVG images.
+      # @param [Boolean] png Generate static PNG images.
+      def images(svg: true, png: true)
+        static_generation_header
+        USPSFlags::Helpers.valid_flags(:all).each do |flag|
+          generate_static_images_for(flag, svg: svg, png: png)
+        end
       end
-    end
 
-    # Generate trident spec sheet as an SVG image.
-    #
-    # @param [String] outfile The path to save the SVG file to. If not set, prints to console.
-    # @param [Integer] fly The nominal fly length of an appropriate flag field for the generated tridents. Size labels scale to this size.
-    # @param [String] outfile The unit to append to all trident measurements.
-    # @param [String] scale The image scale divisor factor.
-    # @return [String] Returns the SVG data.
-    def spec(outfile: nil, fly: USPSFlags::Config::BASE_FLY, unit: nil, scale: nil, scaled_border: false)
-      svg = +''
-      svg << USPSFlags::Core.headers(scale: scale, title: 'USPS Trident Specifications')
-      svg << USPSFlags::Core.trident_spec(fly: fly, unit: unit, scaled_border: scaled_border)
-      svg << USPSFlags::Core.footer
-
-      USPSFlags::Helpers.output(svg, outfile: outfile)
-    end
+      # Generate trident spec sheet as an SVG image.
+      #
+      # @param [String] outfile The path to save the SVG file to. If not set, prints to console.
+      # @param [Integer] fly The nominal fly length of an appropriate flag field for the generated tridents.
+      # @param [String] outfile The unit to append to all trident measurements.
+      # @param [String] scale The image scale divisor factor.
+      # @return [String] Returns the SVG data.
+      def spec(outfile: nil, fly: USPSFlags::Config::BASE_FLY, unit: nil, scale: nil, scaled_border: false)
+        svg = +''
+        svg << USPSFlags::Core.headers(scale: scale, title: 'USPS Trident Specifications')
+        svg << USPSFlags::Core.trident_spec(fly: fly, unit: unit, scaled_border: scaled_border)
+        svg << USPSFlags::Core.footer
+
+        USPSFlags::Helpers.output(svg, outfile: outfile)
+      end
 
-  private
-
-    def special_flag(flag, outfile, scale)
-      case flag
-      when 'CRUISE', 'OIC'
-        USPSFlags::Generate::Flag.pennant(type: flag, outfile: outfile, scale: scale)
-      when 'ENSIGN'
-        USPSFlags::Generate::Flag.ensign(outfile: outfile, scale: scale)
-      when 'US'
-        USPSFlags::Generate::Flag.us(outfile: outfile, scale: scale)
-      when 'WHEEL'
-        USPSFlags::Generate::Flag.wheel(outfile: outfile, scale: scale)
+    private
+
+      def special_flag(flag, outfile, scale)
+        case flag
+        when 'CRUISE', 'OIC'
+          USPSFlags::Generate::Flag.pennant(type: flag, outfile: outfile, scale: scale)
+        when 'ENSIGN'
+          USPSFlags::Generate::Flag.ensign(outfile: outfile, scale: scale)
+        when 'US'
+          USPSFlags::Generate::Flag.us(outfile: outfile, scale: scale)
+        when 'WHEEL'
+          USPSFlags::Generate::Flag.wheel(outfile: outfile, scale: scale)
+        end
       end
-    end
 
-    def generate_png(background, trim, outfile)
-      MiniMagick::Tool::Convert.new do |convert|
-        convert << '-background' << background
-        convert << '-format' << 'png'
-        convert << '-trim' if trim
-        convert << @temp_svg_path
-        convert << outfile
+      def generate_png(background, trim, outfile)
+        MiniMagick::Tool::Convert.new do |convert|
+          convert << '-background' << background
+          convert << '-format' << 'png'
+          convert << '-trim' if trim
+          convert << @temp_svg_path
+          convert << outfile
+        end
       end
     end
   end

data/lib/usps_flags/generate/flag.rb

@@ -4,164 +4,167 @@
 #
 # These methods should never need to be called directly.
 # @private
-class USPSFlags::Generate::Flag
-  class << self
-    def officer(rank: nil, outfile: nil, scale: nil, field: true)
-      raise ArgumentError, 'No rank specified.' if rank.nil?
-
-      @rank = rank.to_s.upcase
-      @field = field
-
-      svg = +''
-      svg << USPSFlags::Core.headers(scale: scale, title: @rank)
-      modify_rank_for_insignia
-      @flag_details = USPSFlags::Helpers.flag_details(@rank)
-      @trident_color = @field ? :white : @flag_details[:color]
-      svg << officer_flag_body(@flag_details[:style])
-
-      USPSFlags::Helpers.output(svg, outfile: outfile)
-    end
-
-    def special(type, level:, field: true)
-      # Paths were designed for a base fly of 3000 pixels, but the base was changed for more useful fractions.
-      svg = +''
-      svg << "<g transform=\"translate(#{USPSFlags::Config::BASE_FLY / 10})\">" unless field
-      svg << "<g transform=\"scale(#{Rational(USPSFlags::Config::BASE_FLY, 3000).to_f})\">"
-      svg << special_icon(type, level)
-      svg << '</g>'
-      svg << '</g>' unless field
-
-      svg
-    end
-
-    def pennant(type: 'CRUISE', outfile: nil, scale: nil)
-      type = type.upcase
-      svg = +''
-      title = { 'CRUISE' => 'Cruise Pennant', 'OIC' => 'Officer-in-Charge Pennant' }[type]
-      svg << USPSFlags::Core.headers(pennant: true, scale: scale, title: title)
-      svg << USPSFlags::Core.pennant(type)
-      svg << USPSFlags::Core.footer
-
-      USPSFlags::Helpers.output(svg, outfile: outfile)
-    end
-
-    def ensign(outfile: nil, scale: nil)
-      svg = +''
-      svg << USPSFlags::Core.headers(scale: scale, title: 'USPS Ensign')
-      svg << USPSFlags::Core.ensign
-      svg << USPSFlags::Core.footer
-
-      USPSFlags::Helpers.output(svg, outfile: outfile)
-    end
-
-    def wheel(outfile: nil, scale: nil)
-      width = 4327.4667
-      height = 4286.9333
-      svg = +''
-      svg << USPSFlags::Core.headers(width: width, height: height, scale: scale, title: 'USPS Ensign Wheel')
-      svg << USPSFlags::Core.wheel
-      svg << USPSFlags::Core.footer
-
-      USPSFlags::Helpers.output(svg, outfile: outfile)
-    end
-
-    def us(outfile: nil, scale: nil)
-      base_hoist = 2000.to_f
-      hoist = scale.nil? ? base_hoist : (base_hoist / scale)
-      fly = hoist * 1.91
-      svg = +''
-      svg << USPSFlags::Core.headers(width: fly, height: hoist, scale: scale, title: 'US Ensign')
-      svg << USPSFlags::Core.us
-      svg << USPSFlags::Core.footer
-
-      USPSFlags::Helpers.output(svg, outfile: outfile)
-    end
-
-  private
-
-    def special_icon(type, level)
-      {
-        a: USPSFlags::Core.binoculars(level), f: USPSFlags::Core.trumpet(level),
-        fc: USPSFlags::Core.anchor, pc: USPSFlags::Core.lighthouse
-      }[type]
-    end
-
-    def get_officer_flag
-      [
-        get_national_bridge_flag, get_bridge_flag, get_offset_flag, get_special_flag
-      ].compact.first || get_trident_flag
-    end
-
-    def get_national_bridge_flag
-      return unless cc? || vc?
-
-      return USPSFlags::Core::Tridents.cc(@flag_details[:type], trident_color: @trident_color) if cc?
-      return USPSFlags::Core::Tridents.vc(@flag_details[:type], trident_color: @trident_color) if vc?
-    end
-
-    def get_bridge_flag
-      return unless three? || two?
-
-      if three?
-        USPSFlags::Core::Tridents.three(@flag_details[:type], trident_color: @trident_color, field_color: @flag_details[:color])
-      elsif two?
-        USPSFlags::Core::Tridents.two(@flag_details[:type], trident_color: @trident_color, field_color: @flag_details[:color])
+class USPSFlags
+  class Generate
+    class Flag
+      class << self
+        def officer(rank: nil, outfile: nil, scale: nil, field: true)
+          raise ArgumentError, 'No rank specified.' if rank.nil?
+
+          @rank = rank.to_s.upcase
+          @field = field
+
+          svg = USPSFlags::Core.headers(scale: scale, title: @rank)
+          modify_rank_for_insignia
+          @flag_details = USPSFlags::Helpers.flag_details(@rank)
+          @trident_color = @field ? :white : @flag_details[:color]
+          svg << officer_flag_body(@flag_details[:style])
+
+          USPSFlags::Helpers.output(svg, outfile: outfile)
+        end
+
+        def special(type, level:, field: true)
+          # Paths were designed for a base fly of 3000 pixels, but the base was changed for more useful fractions.
+          svg = +''
+          svg << "<g transform=\"translate(#{USPSFlags::Config::BASE_FLY / 10})\">" unless field
+          svg << "<g transform=\"scale(#{Rational(USPSFlags::Config::BASE_FLY, 3000).to_f})\">"
+          svg << special_icon(type, level)
+          svg << '</g>'
+          svg << '</g>' unless field
+
+          svg
+        end
+
+        def pennant(type: 'CRUISE', outfile: nil, scale: nil)
+          type = type.upcase
+          title = { 'CRUISE' => 'Cruise Pennant', 'OIC' => 'Officer-in-Charge Pennant' }[type]
+          svg = USPSFlags::Core.headers(pennant: true, scale: scale, title: title)
+          svg << USPSFlags::Core.pennant(type)
+          svg << USPSFlags::Core.footer
+
+          USPSFlags::Helpers.output(svg, outfile: outfile)
+        end
+
+        def ensign(outfile: nil, scale: nil)
+          svg = USPSFlags::Core.headers(scale: scale, title: 'USPS Ensign')
+          svg << USPSFlags::Core.ensign
+          svg << USPSFlags::Core.footer
+
+          USPSFlags::Helpers.output(svg, outfile: outfile)
+        end
+
+        def wheel(outfile: nil, scale: nil)
+          width = 4327.4667
+          height = 4286.9333
+          svg = USPSFlags::Core.headers(width: width, height: height, scale: scale, title: 'USPS Ensign Wheel')
+          svg << USPSFlags::Core.wheel
+          svg << USPSFlags::Core.footer
+
+          USPSFlags::Helpers.output(svg, outfile: outfile)
+        end
+
+        def us(outfile: nil, scale: nil)
+          base_hoist = 2000.to_f
+          hoist = scale.nil? ? base_hoist : (base_hoist / scale)
+          fly = hoist * 1.91
+          svg = USPSFlags::Core.headers(width: fly, height: hoist, scale: scale, title: 'US Ensign')
+          svg << USPSFlags::Core.us
+          svg << USPSFlags::Core.footer
+
+          USPSFlags::Helpers.output(svg, outfile: outfile)
+        end
+
+      private
+
+        def special_icon(type, level)
+          {
+            a: USPSFlags::Core.binoculars(level), f: USPSFlags::Core.trumpet(level),
+            fc: USPSFlags::Core.anchor, pc: USPSFlags::Core.lighthouse
+          }[type]
+        end
+
+        def get_officer_flag
+          [
+            get_national_bridge_flag, get_bridge_flag, get_offset_flag, get_special_flag
+          ].compact.first || get_trident_flag
+        end
+
+        def get_national_bridge_flag
+          return unless cc? || vc?
+
+          return USPSFlags::Core::Tridents.cc(@flag_details[:type], trident_color: @trident_color) if cc?
+          return USPSFlags::Core::Tridents.vc(@flag_details[:type], trident_color: @trident_color) if vc?
+        end
+
+        def get_bridge_flag
+          return unless three? || two?
+
+          if three?
+            USPSFlags::Core::Tridents.three(
+              @flag_details[:type], trident_color: @trident_color, field_color: @flag_details[:color]
+            )
+          elsif two?
+            USPSFlags::Core::Tridents.two(
+              @flag_details[:type], trident_color: @trident_color, field_color: @flag_details[:color]
+            )
+          end
+        end
+
+        def get_offset_flag
+          return unless offset?
+
+          USPSFlags::Core::Tridents.offset(@flag_details[:type], field_color: @flag_details[:color], field: @field)
+        end
+
+        def get_special_flag
+          return unless special?
+
+          special(@flag_details[:type], level: @flag_details[:level], field: @field)
+        end
+
+        def get_trident_flag
+          USPSFlags::Core.trident(@flag_details[:type], field_color: @flag_details[:color])
+        end
+
+        def officer_flag_body(style)
+          svg = +''
+          svg << USPSFlags::Core.field(style: style, color: @flag_details[:color]) if @field
+          svg << '<g transform="translate(-150, 400)"><g transform="scale(0.58333)">' if style == :past
+          svg << get_officer_flag
+          svg << '</g></g>' if style == :past
+          svg << USPSFlags::Core.footer
+          svg
+        end
+
+        def modify_rank_for_insignia
+          @rank.slice!(0) if !@field && USPSFlags::Helpers.valid_flags(:past).include?(@rank)
+          @rank = 'CDR' if @rank == 'C'
+        end
+
+        def cc?
+          @flag_details[:type] == :n && @flag_details[:count] == 3
+        end
+
+        def vc?
+          @flag_details[:type] == :n && @flag_details[:count] == 2
+        end
+
+        def three?
+          %i[s d].include?(@flag_details[:type]) && @flag_details[:count] == 3
+        end
+
+        def two?
+          %i[s d].include?(@flag_details[:type]) && @flag_details[:count] == 2
+        end
+
+        def offset?
+          %w[LT DLT].include?(@rank)
+        end
+
+        def special?
+          %i[a f fc pc].include?(@flag_details[:type])
+        end
       end
     end
-
-    def get_offset_flag
-      return unless offset?
-
-      USPSFlags::Core::Tridents.offset(@flag_details[:type], field_color: @flag_details[:color], field: @field)
-    end
-
-    def get_special_flag
-      return unless special?
-
-      special(@flag_details[:type], level: @flag_details[:level], field: @field)
-    end
-
-    def get_trident_flag
-      USPSFlags::Core.trident(@flag_details[:type], field_color: @flag_details[:color])
-    end
-
-    def officer_flag_body(style)
-      svg = +''
-      svg << USPSFlags::Core.field(style: style, color: @flag_details[:color]) if @field
-      svg << '<g transform="translate(-150, 400)"><g transform="scale(0.58333)">' if style == :past
-      svg << get_officer_flag
-      svg << '</g></g>' if style == :past
-      svg << USPSFlags::Core.footer
-      svg
-    end
-
-    def modify_rank_for_insignia
-      @rank.slice!(0) if !@field && USPSFlags::Helpers.valid_flags(:past).include?(@rank)
-      @rank = 'CDR' if @rank == 'C'
-    end
-
-    def cc?
-      @flag_details[:type] == :n && @flag_details[:count] == 3
-    end
-
-    def vc?
-      @flag_details[:type] == :n && @flag_details[:count] == 2
-    end
-
-    def three?
-      [:s, :d].include?(@flag_details[:type]) && @flag_details[:count] == 3
-    end
-
-    def two?
-      [:s, :d].include?(@flag_details[:type]) && @flag_details[:count] == 2
-    end
-
-    def offset?
-      %w[LT DLT].include?(@rank)
-    end
-
-    def special?
-      [:a, :f, :fc, :pc].include?(@flag_details[:type])
-    end
   end
 end