usps_flags 0.3.26 → 0.4.0

data/lib/usps_flags/core/tridents.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: false
+
 # SVG generators for multiple tridents.
 #
 # These methods should never need to be called directly.
@@ -7,33 +9,33 @@ class USPSFlags::Core::Tridents
     def cc(type, trident_color:)
       # The side C/C tridents are angled 45 degrees, and intersect the central one at 1/3 up from the bottom
       trident = USPSFlags::Core.trident(type, color: trident_color)
-      x_distance = USPSFlags::Config::BASE_FLY*4/39
-      y_distance = USPSFlags::Config::BASE_FLY*5/78
+      x_distance = USPSFlags::Config::BASE_FLY * 4 / 39
+      y_distance = USPSFlags::Config::BASE_FLY * 5 / 78
       <<~SVG
-        <g transform="translate(-#{x_distance}, #{y_distance})"><g transform="rotate(-45, #{USPSFlags::Config::BASE_FLY/2}, #{USPSFlags::Config::BASE_HOIST/2})">\n#{trident}</g></g>
+        <g transform="translate(-#{x_distance}, #{y_distance})"><g transform="rotate(-45, #{USPSFlags::Config::BASE_FLY / 2}, #{USPSFlags::Config::BASE_HOIST / 2})">\n#{trident}</g></g>
         \n#{trident}
-        <g transform="translate(#{x_distance}, #{y_distance})"><g transform="rotate(45, #{USPSFlags::Config::BASE_FLY/2}, #{USPSFlags::Config::BASE_HOIST/2})">\n#{trident}</g></g>
+        <g transform="translate(#{x_distance}, #{y_distance})"><g transform="rotate(45, #{USPSFlags::Config::BASE_FLY / 2}, #{USPSFlags::Config::BASE_HOIST / 2})">\n#{trident}</g></g>
       SVG
     end
 
     def vc(type, trident_color:)
       # V/C tridents are angled 45 degrees, and intersect at 15/32 up from the bottom
       trident = USPSFlags::Core.trident(type, color: trident_color)
-      x_distance = USPSFlags::Config::BASE_FLY*4/55
+      x_distance = USPSFlags::Config::BASE_FLY * 4 / 55
       <<~SVG
-        <g transform="translate(-#{x_distance})"><g transform="rotate(-45, #{USPSFlags::Config::BASE_FLY/2}, #{USPSFlags::Config::BASE_HOIST/2})">\n#{trident}</g></g>
-        <g transform="translate(#{x_distance})"><g transform="rotate(45, #{USPSFlags::Config::BASE_FLY/2}, #{USPSFlags::Config::BASE_HOIST/2})">\n#{trident}</g></g>
+        <g transform="translate(-#{x_distance})"><g transform="rotate(-45, #{USPSFlags::Config::BASE_FLY / 2}, #{USPSFlags::Config::BASE_HOIST / 2})">\n#{trident}</g></g>
+        <g transform="translate(#{x_distance})"><g transform="rotate(45, #{USPSFlags::Config::BASE_FLY / 2}, #{USPSFlags::Config::BASE_HOIST / 2})">\n#{trident}</g></g>
       SVG
     end
 
     def three(type, trident_color:, field_color:)
       # Cdr and D/C tridents are spaced 1/2 the fly apart with the central one 1/4 the fly above the sides
       trident = USPSFlags::Core.trident(type, color: trident_color, field_color: field_color)
-      x_distance = USPSFlags::Config::BASE_FLY/4
-      y_distance = USPSFlags::Config::BASE_FLY/16
+      x_distance = USPSFlags::Config::BASE_FLY / 4
+      y_distance = USPSFlags::Config::BASE_FLY / 16
       <<~SVG
         <g transform="translate(-#{x_distance}, #{y_distance})">\n#{trident}</g>
-        <g transform="translate(0, -#{y_distance+1})">\n#{trident}</g>
+        <g transform="translate(0, -#{y_distance + 1})">\n#{trident}</g>
         <g transform="translate(#{x_distance}, #{y_distance})">\n#{trident}</g>
       SVG
     end
@@ -41,7 +43,7 @@ class USPSFlags::Core::Tridents
     def two(type, trident_color:, field_color:)
       # Lt/C and D/Lt/C tridents are spaced 1/3 the fly apart
       trident = USPSFlags::Core.trident(type, color: trident_color, field_color: field_color)
-      x_distance = USPSFlags::Config::BASE_FLY/6
+      x_distance = USPSFlags::Config::BASE_FLY / 6
       <<~SVG
         <g transform="translate(-#{x_distance})">\n#{trident}</g>
         <g transform="translate(#{x_distance})">\n#{trident}</g>
@@ -50,11 +52,11 @@ class USPSFlags::Core::Tridents
 
     def offset(type, field_color:, field: true)
       # Swallowtail tridents need to move towards the hoist due to the tails
-      x_distance = USPSFlags::Config::BASE_FLY/10 if field
-      svg = ""
+      x_distance = USPSFlags::Config::BASE_FLY / 10 if field
+      svg = ''
       svg << "<g transform=\"translate(-#{x_distance})\">" if field
       svg << USPSFlags::Core.trident(type, field_color: field_color, color: :red)
-      svg << "</g>" if field
+      svg << '</g>' if field
       svg
     end
   end

data/lib/usps_flags/core/us.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: false
+
 # Core SVG data for the US Ensign.
 #
 # This class should never need to be called directly.
@@ -5,10 +7,10 @@
 class USPSFlags::Core::US
   def svg
     @base_hoist = 2000.to_f
-    @base_fly = @base_hoist*1.91
+    @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
 
@@ -24,7 +26,7 @@ class USPSFlags::Core::US
     svg
   end
 
-  private
+private
 
   def defs
     File.read("#{File.dirname(__dir__)}/core/us_defs.svg.partial").gsub('STAR', USPSFlags::Core.star)
@@ -40,12 +42,12 @@ class USPSFlags::Core::US
       even: (2..10).step(2).to_a
     }
 
-    svg = ""
+    svg = ''
     %i[odd even].each do |type|
       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>
+            <g transform="translate(#{@canton_fly * c / 12}, #{@star_offset + @canton_hoist * r / 10})"><g><use href="#star" /></g></g>
           SVG
         end
       end
@@ -56,7 +58,7 @@ class USPSFlags::Core::US
   def stripes
     s = (0..12).map do |i|
       color = i.even? ? 'red' : 'white'
-      "<use href=\"##{color}-stripe\" y=\"#{@base_hoist*i/13}\" />"
+      "<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"

data/lib/usps_flags/core/wheel.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: false
+
 # Core SVG data for the USPS Wheel logo.
 #
 # This class should never need to be called directly.

data/lib/usps_flags/errors.rb

@@ -1,28 +1,40 @@
+# frozen_string_literal: false
+
 # Custom errors.
 #
 # @private
 module USPSFlags::Errors
   class PNGGenerationError < StandardError
-    def initialize(msg = "There was an error generating the PNG file.", svg: "")
+    attr_reader :svg
+
+    def initialize(msg = 'There was an error generating the PNG file.', svg: '')
       super(msg)
+      @svg = svg
     end
   end
 
   class PNGConversionError < StandardError
-    def initialize(msg = "There was an error converting the PNG file.")
+    def initialize(msg = 'There was an error converting the PNG file.')
       super(msg)
     end
   end
 
   class StaticFilesGenerationError < StandardError
-    def initialize(msg = "There was an error generating the static files.", cause: nil)
+    attr_reader :cause
+
+    def initialize(msg = 'There was an error generating the static files.', cause: nil)
       super(msg)
+      @cause = cause
     end
   end
 
   class ZipGenerationError < StandardError
-    def initialize(msg = "There was an error generating the zip file.", type: nil, cause: nil)
+    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
     end
   end
 end

data/lib/usps_flags/generate.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: false
+
 # Controller class for generating files.
 class USPSFlags::Generate
   class << self
@@ -9,17 +11,17 @@ class USPSFlags::Generate
     # @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")
+      flag = flag.upcase.delete('/', '_', 'PENNANT')
 
       USPSFlags::Helpers.ensure_dir_for_file(outfile)
 
-      if ["CRUISE", "OIC"].include?(flag)
+      if ['CRUISE', 'OIC'].include?(flag)
         USPSFlags::Generate::Flag.pennant(type: flag, outfile: outfile, scale: scale)
-      elsif flag == "ENSIGN"
+      elsif flag == 'ENSIGN'
         USPSFlags::Generate::Flag.ensign(outfile: outfile, scale: scale)
-      elsif flag == "US"
+      elsif flag == 'US'
         USPSFlags::Generate::Flag.us(outfile: outfile, scale: scale)
-      elsif flag == "WHEEL"
+      elsif flag == 'WHEEL'
         USPSFlags::Generate::Flag.wheel(outfile: outfile, scale: scale)
       else
         USPSFlags::Generate::Flag.officer(rank: flag, outfile: outfile, scale: scale, field: field)
@@ -33,16 +35,16 @@ class USPSFlags::Generate
     # @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, svg: svg if outfile.nil? || outfile.empty?
+      raise USPSFlags::Errors::PNGGenerationError.new(svg: svg) if outfile.nil? || outfile.empty?
 
       set_temp_svg(svg)
 
       USPSFlags::Helpers.ensure_dir_for_file(outfile)
 
       MiniMagick::Tool::Convert.new do |convert|
-        convert << "-background" << background
-        convert << "-format" << "png"
-        convert << "-trim" if trim
+        convert << '-background' << background
+        convert << '-format' << 'png'
+        convert << '-trim' if trim
         convert << @temp_svg_path
         convert << outfile
       end
@@ -57,7 +59,7 @@ class USPSFlags::Generate
     # @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)
-      raise USPSFlags::Errors::StaticFilesGenerationError, "At least one argument switch must be true out of [svg, png, zips, reset]." unless svg || png || zips || reset
+      raise USPSFlags::Errors::StaticFilesGenerationError, 'At least one argument switch must be true out of [svg, png, zips, reset].' unless svg || png || zips || reset
 
       overall_start_time = Time.now
       remove_static_files if reset
@@ -71,9 +73,10 @@ class USPSFlags::Generate
     # @param [Boolean] svg Generate zip archive of SVG images.
     # @param [Boolean] png Generate zip archive of PNG images.
     def zips(svg: true, png: true)
-      raise USPSFlags::Errors::ZipGenerationError, "At least one argument switch must be true out of [svg, png]." unless svg || png
-      generate_zip("svg") if svg
-      generate_zip("png") if png
+      raise USPSFlags::Errors::ZipGenerationError, 'At least one argument switch must be true out of [svg, png].' unless svg || png
+
+      generate_zip('svg') if svg
+      generate_zip('png') if png
     end
 
     # Generate static image files.
@@ -95,44 +98,45 @@ class USPSFlags::Generate
     # @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 = ''
+      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
+  private
+
     def remove_static_files
-      ["SVG", "PNG", "ZIP"].each do |dir|
+      ['SVG', 'PNG', 'ZIP'].each do |dir|
         dir_path = "#{USPSFlags.configuration.flags_dir}/#{dir}"
         ::FileUtils.rm_rf(::Dir.glob("#{dir_path}/*")) if ::Dir.exist?(dir_path)
       end
-      ["SVG/insignia", "PNG/insignia"].each { |dir| ::FileUtils.mkdir_p("#{USPSFlags.configuration.flags_dir}/#{dir}") }
+      ['SVG/insignia', 'PNG/insignia'].each { |dir| ::FileUtils.mkdir_p("#{USPSFlags.configuration.flags_dir}/#{dir}") }
       USPSFlags::Helpers.log "\n - Cleared previous files.\n"
     end
 
     def set_file_paths
       @svg_file = "#{USPSFlags.configuration.flags_dir}/SVG/#{@flag}.svg"
-      @png_file = @svg_file.gsub("/SVG/", "/PNG/").gsub(".svg", ".png")
-      @svg_ins_file = @svg_file.gsub("/SVG/", "/SVG/insignia/")
-      @png_ins_file = @svg_file.gsub("/SVG/", "/PNG/insignia/").gsub(".svg", ".png")
+      @png_file = @svg_file.gsub('/SVG/', '/PNG/').gsub('.svg', '.png')
+      @svg_ins_file = @svg_file.gsub('/SVG/', '/SVG/insignia/')
+      @png_ins_file = @svg_file.gsub('/SVG/', '/PNG/insignia/').gsub('.svg', '.png')
       [@svg_file, @png_file, @svg_ins_file, @png_ins_file]
     end
 
     def static_generation_header
       puts "\nSVGs generate a single file.",
-        "PNGs generate full-res, 1500w, 1000w, 500w, and thumbnail files.",
-        "Corresponding rank insignia (including smaller sizes) are also generated, as appropriate."
+        'PNGs generate full-res, 1500w, 1000w, 500w, and thumbnail files.',
+        'Corresponding rank insignia (including smaller sizes) are also generated, as appropriate.'
       USPSFlags::Helpers.log "\nGeneration location: #{USPSFlags.configuration.flags_dir}\n"
       USPSFlags::Helpers.log "\n#{Time.now.strftime('%Y%m%d.%H%M%S%z')} – Generating static files...\n\n"
-      USPSFlags::Helpers.log "Flag | SVG | PNG        | Run time\n".rjust(USPSFlags::Helpers.max_flag_name_length+31),
-        "\n".rjust(USPSFlags::Helpers.max_flag_name_length+32, "-")
+      USPSFlags::Helpers.log "Flag | SVG | PNG        | Run time\n".rjust(USPSFlags::Helpers.max_flag_name_length + 31),
+        "\n".rjust(USPSFlags::Helpers.max_flag_name_length + 32, '-')
     end
 
     def generate_zip(type)
-      raise USPSFlags::Errors::ZipGenerationError, "Flags directory not found." unless ::Dir.exist?("#{USPSFlags.configuration.flags_dir}/ZIP")
+      raise USPSFlags::Errors::ZipGenerationError, 'Flags directory not found.' unless ::Dir.exist?("#{USPSFlags.configuration.flags_dir}/ZIP")
 
       zip = "#{USPSFlags.configuration.flags_dir}/ZIP/USPS_Flags.#{type}.zip"
       ::File.delete(zip) if ::File.exist?(zip)
@@ -146,8 +150,8 @@ class USPSFlags::Generate
     end
 
     def add_to_zip(z, f)
-      filename = f.split("/").last
-      filename = "insignia/#{filename}" if f.split("/").last(2).first == "insignia"
+      filename = f.split('/').last
+      filename = "insignia/#{filename}" if f.split('/').last(2).first == 'insignia'
       z.add(filename, f)
     end
 
@@ -158,16 +162,16 @@ class USPSFlags::Generate
 
       set_file_paths
 
-      svg ? generate_static_svg : USPSFlags::Helpers.log("-")
-      png ? generate_static_png : USPSFlags::Helpers.log("- ")
+      svg ? generate_static_svg : USPSFlags::Helpers.log('-')
+      png ? generate_static_png : USPSFlags::Helpers.log('- ')
 
-      run_time = (Time.now - start_time).round(4).to_s[(0..5)].ljust(6, "0")
+      run_time = (Time.now - start_time).round(4).to_s[(0..5)].ljust(6, '0')
       USPSFlags::Helpers.log " | #{run_time} s\n"
     end
 
     def generate_static_svg
-      USPSFlags::Helpers.log " "
- 
+      USPSFlags::Helpers.log ' '
+
       generate_regular_svg
       generate_insignia_svg
     end
@@ -176,19 +180,19 @@ class USPSFlags::Generate
       return if file_found?(@svg_file)
 
       svg @flag, outfile: @svg_file, scale: 1
-      USPSFlags::Helpers.log "S"
+      USPSFlags::Helpers.log 'S'
     end
 
     def generate_insignia_svg
       return if no_insignia?
 
       svg @flag, field: false, outfile: @svg_ins_file, scale: 1
-      USPSFlags::Helpers.log "I"
+      USPSFlags::Helpers.log 'I'
     end
 
     def set_temp_svg(svg)
       @temp_svg_path = "#{USPSFlags.configuration.flags_dir}/temp.svg"
-      temp_svg = ::File.new(@temp_svg_path, "w+")
+      temp_svg = ::File.new(@temp_svg_path, 'w+')
       temp_svg.write(svg)
       temp_svg.flush
       @temp_svg_path
@@ -199,7 +203,7 @@ class USPSFlags::Generate
     end
 
     def generate_static_png
-      USPSFlags::Helpers.log "  | "
+      USPSFlags::Helpers.log '  | '
       generate_fullsize_png
       generate_fullsize_png_insignia
       generate_reduced_size_pngs
@@ -209,7 +213,7 @@ class USPSFlags::Generate
       return if file_found?(@png_file)
 
       png(File.read(@svg_file), outfile: @png_file)
-      USPSFlags::Helpers.log "F"
+      USPSFlags::Helpers.log 'F'
     end
 
     def generate_fullsize_png_insignia
@@ -217,14 +221,14 @@ class USPSFlags::Generate
       return if file_found?(@png_ins_file)
 
       png(File.read(@svg_ins_file), outfile: @png_ins_file, trim: true)
-      USPSFlags::Helpers.log "I"
+      USPSFlags::Helpers.log 'I'
     end
 
     def generate_reduced_size_pngs
       USPSFlags::Helpers.png_sizes.keys.each do |size|
         size, size_key = USPSFlags::Helpers.size_and_key(size: size, flag: @flag)
         @sized_png_file = "#{USPSFlags.configuration.flags_dir}/PNG/#{@flag}.#{size_key}.png"
-        @sized_png_ins_file = @sized_png_file.gsub("/PNG/", "/PNG/insignia/")
+        @sized_png_ins_file = @sized_png_file.gsub('/PNG/', '/PNG/insignia/')
 
         generate_smaller_png(size, size_key)
         generate_smaller_png_insignia(size, size_key)
@@ -245,27 +249,27 @@ class USPSFlags::Generate
       return if too_big?(@png_ins_file, size)
 
       USPSFlags::Helpers.resize_png(@png_ins_file, file: "insignia/#{@flag}", size: size, size_key: size_key)
-      USPSFlags::Helpers.log "i"
+      USPSFlags::Helpers.log 'i'
     end
 
     def no_insignia?
       return false if USPSFlags::Helpers.valid_flags(:insignia).include?(@flag)
 
-      USPSFlags::Helpers.log "-"
+      USPSFlags::Helpers.log '-'
       true
     end
 
     def file_found?(file)
       return false unless ::File.exist?(file)
 
-      USPSFlags::Helpers.log "."
+      USPSFlags::Helpers.log '.'
       true
     end
 
     def too_big?(file, size)
       return false unless size > MiniMagick::Image.open(file)[:width]
 
-      USPSFlags::Helpers.log "+"
+      USPSFlags::Helpers.log '+'
       true
     end
   end

data/lib/usps_flags/generate/flag.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: false
+
 # SVG generators for special flags.
 #
 # These methods should never need to be called directly.
@@ -5,11 +7,12 @@
 class USPSFlags::Generate::Flag
   class << self
     def officer(rank: nil, width: USPSFlags::Config::BASE_FLY, outfile: nil, scale: nil, field: true)
-      raise ArgumentError, "No rank specified." if rank.nil?
+      raise ArgumentError, 'No rank specified.' if rank.nil?
+
       @rank = rank.to_s.upcase
       @field = field
 
-      svg = ""
+      svg = ''
       svg << USPSFlags::Core.headers(scale: scale, title: @rank)
       modify_rank_for_insignia
       @flag_details = USPSFlags::Helpers.flag_details(@rank)
@@ -21,29 +24,29 @@ class USPSFlags::Generate::Flag
 
     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 = ''
+      svg << "<g transform=\"translate(#{USPSFlags::Config::BASE_FLY / 10})\">" unless field
+      svg << "<g transform=\"scale(#{Rational(USPSFlags::Config::BASE_FLY, 3000).to_f})\">"
       svg << case type
-      when :a
-        USPSFlags::Core.binoculars(level)
-      when :f
-        USPSFlags::Core.trumpet(level)
-      when :fc
-        USPSFlags::Core.anchor
-      when :pc
-        USPSFlags::Core.lighthouse
+             when :a
+               USPSFlags::Core.binoculars(level)
+             when :f
+               USPSFlags::Core.trumpet(level)
+             when :fc
+               USPSFlags::Core.anchor
+             when :pc
+               USPSFlags::Core.lighthouse
       end
-      svg << "</g>"
-      svg << "</g>" unless field
+      svg << '</g>'
+      svg << '</g>' unless field
 
       svg
     end
 
-    def pennant(type: "CRUISE", outfile: nil, scale: nil)
+    def pennant(type: 'CRUISE', outfile: nil, scale: nil)
       type = type.upcase
-      svg = ""
-      title = { "CRUISE" => "Cruise Pennant", "OIC" => "Officer-in-Charge Pennant" }[type]
+      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
@@ -52,8 +55,8 @@ class USPSFlags::Generate::Flag
     end
 
     def ensign(outfile: nil, scale: nil)
-      svg = ""
-      svg << USPSFlags::Core.headers(scale: scale, title: "USPS Ensign")
+      svg = ''
+      svg << USPSFlags::Core.headers(scale: scale, title: 'USPS Ensign')
       svg << USPSFlags::Core.ensign
       svg << USPSFlags::Core.footer
 
@@ -63,8 +66,8 @@ class USPSFlags::Generate::Flag
     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 = ''
+      svg << USPSFlags::Core.headers(width: width, height: height, scale: scale, title: 'USPS Ensign Wheel')
       svg << USPSFlags::Core.wheel
       svg << USPSFlags::Core.footer
 
@@ -73,18 +76,18 @@ class USPSFlags::Generate::Flag
 
     def us(outfile: nil, scale: nil)
       base_hoist = 2000.to_f
-      base_fly = base_hoist * 1.91
       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 = ''
+      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
+  private
+
     def get_officer_flag
       if cc?
         USPSFlags::Core::Tridents.cc(@flag_details[:type], trident_color: @trident_color)
@@ -104,18 +107,18 @@ class USPSFlags::Generate::Flag
     end
 
     def officer_flag_body
-      svg = ""
+      svg = ''
       svg << USPSFlags::Core.field(style: @flag_details[:style], color: @flag_details[:color]) if @field
-      svg << "<g transform=\"translate(-150, 400)\"><g transform=\"scale(0.58333)\">" if @flag_details[:style] == :past
+      svg << '<g transform="translate(-150, 400)"><g transform="scale(0.58333)">' if @flag_details[:style] == :past
       svg << get_officer_flag
-      svg << "</g></g>" if @flag_details[:style] == :past
+      svg << '</g></g>' if @flag_details[: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"
+      @rank = 'CDR' if @rank == 'C'
     end
 
     def cc?