usps_flags 0.5.0 → 0.5.1

data/lib/usps_flags/helpers/valid_flags.rb

@@ -4,52 +4,56 @@
 #
 # 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
+class USPSFlags
+  class Helpers
+    class 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_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 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 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 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
-      ]
+        def command_flags
+          [
+            @squadron_elected.last, @district_elected.last, @national_elected.last,
+            @squadron_past.last, @district_past.last, @national_past.last
+          ]
+        end
+      end
     end
   end
 end

data/lib/usps_flags/rational.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: false
+
+# Monkey patch to add some formatting methods to Rational.
+#
+# @author Julian Fiander
+# @since 0.1.5
+class USPSFlags
+  class Rational
+    def initialize(rational)
+      @rational = rational
+    end
+
+    # Converts Rational to String
+    #
+    # If Rational is an improper fraction, removes the integer part to convert to a mixed fraction.
+    #
+    # @example Mixed fraction
+    #   Rational(4,3).to_simplified_s #=> "1 1/3"
+    # @return [String] If less than 1, fraction. If greater than 1, a mixed fraction.
+    def to_simplified_s
+      @rational < 1 ? @rational.to_s : [@rational.truncate.to_s, (@rational - @rational.truncate).to_s].join(' ')
+    end
+
+    # Converts Rational to Array
+    #
+    # If Rational is an improper fraction, removes the integer part to convert to a mixed fraction.
+    #
+    # @example Mixed fraction
+    #   Rational(4,3).to_simplified_a #=> [1, Rational(1,3)]
+    # @return [Array] If less than 1, fraction. If greater than 1, a mixed fraction.
+    def to_simplified_a
+      @rational < 1 ? @rational.to_s : [@rational.truncate, (@rational - @rational.truncate)]
+    end
+  end
+end

data/spec/usps_flags/config_spec.rb

@@ -4,51 +4,58 @@ require 'spec_helper'
 
 describe USPSFlags::Config do
   describe 'class variable accessors' do
-    it 'should return the current flags directory' do
+    it 'returns the current flags directory' do
       expect(USPSFlags.configuration.flags_dir).to eql($tmp_flags_dir)
     end
 
-    it 'should return the current flags directory' do
+    it 'returns the current log directory' do
       default_log_path = $tmp_flags_dir + '/log'
       expect(USPSFlags.configuration.log_path).to eql(default_log_path)
     end
 
-    it 'should return a Boolean from clear' do
-      expect([true, false]).to include(USPSFlags.configuration.clear)
+    it 'returns a Boolean from clear' do
+      expect(USPSFlags.configuration.clear).to be(true)
     end
   end
 
   describe 'trident' do
-    it 'should return a Hash from trident' do
+    it 'returns a Hash from trident' do
       expect(USPSFlags.configuration.trident).to be_a(Hash)
     end
   end
 
   describe 'configuration constructor' do
-    it 'should return a properly constructed configuration' do
+    it 'returns a properly constructed configuration' do
       USPSFlags.configure do |config|
         config.flags_dir = $tmp_flags_dir
       end
 
       expect(USPSFlags.configuration.flags_dir).to eql($tmp_flags_dir)
-      expect(USPSFlags.configuration.clear).to eql(true)
+    end
+
+    it 'returns a boolean on configuration clear' do
+      USPSFlags.configure do |config|
+        config.flags_dir = $tmp_flags_dir
+      end
+
+      expect(USPSFlags.configuration.clear).to be(true)
     end
   end
 
   describe 'Rails configuration' do
-    before(:each) do
+    before do
       class Rails
         def self.root
           'tmp/rails_app'
         end
       end
 
-      @config = USPSFlags::Config.new do |config|
+      @config = described_class.new do |config|
         config.flags_dir = $tmp_flags_dir
       end
     end
 
-    it 'should use the default Rails log directory' do
+    it 'uses the default Rails log directory' do
       expect(@config.log_path).to eql('tmp/rails_app/log')
     end
   end

data/spec/usps_flags/core_spec.rb

@@ -3,12 +3,19 @@
 require 'spec_helper'
 
 describe USPSFlags::Core do
+  before do
+    @fly = USPSFlags::Config::BASE_FLY
+    @hoist = USPSFlags::Config::BASE_HOIST
+    @red = USPSFlags::Config::RED
+    @blue = USPSFlags::Config::BLUE
+  end
+
   describe 'trident_spec' do
     [
       '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} -->")
+        expect(described_class.trident_spec).to include("<!-- #{section} -->")
       end
     end
   end
@@ -16,27 +23,20 @@ describe USPSFlags::Core do
   describe 'headers' do
     ['?xml ', '!DOCTYPE', 'svg ', 'metadata'].each do |tag|
       it "should contain the #{tag} tag" do
-        expect(USPSFlags::Core.headers).to include("<#{tag}")
+        expect(described_class.headers).to include("<#{tag}")
       end
     end
   end
 
   describe 'footer' do
-    it 'should contain the closing tag' do
-      expect(USPSFlags::Core.footer).to include('</svg>')
+    it 'contains the closing tag' do
+      expect(described_class.footer).to include('</svg>')
     end
   end
 
-  before(:all) do
-    @fly = USPSFlags::Config::BASE_FLY
-    @hoist = USPSFlags::Config::BASE_HOIST
-    @red = USPSFlags::Config::RED
-    @blue = USPSFlags::Config::BLUE
-  end
-
   describe 'field' do
-    it 'should correctly generate the basic field' do
-      expect(USPSFlags::Core.field).to eql(
+    it 'correctlies generate the basic field' do
+      expect(described_class.field).to eql(
         <<~SVG
           <path d="M 0 0
             l #{@fly} 0
@@ -48,8 +48,8 @@ describe USPSFlags::Core do
       )
     end
 
-    it 'should correctly generate the red field' do
-      expect(USPSFlags::Core.field(color: :red)).to eql(
+    it 'correctlies generate the red field' do
+      expect(described_class.field(color: :red)).to eql(
         <<~SVG
           <path d="M 0 0
             l #{@fly} 0
@@ -61,8 +61,8 @@ describe USPSFlags::Core do
       )
     end
 
-    it 'should correctly generate the swallowtail field' do
-      expect(USPSFlags::Core.field(style: :swallowtail)).to eql(
+    it 'correctlies generate the swallowtail field' do
+      expect(described_class.field(style: :swallowtail)).to eql(
         <<~SVG
           <path d="M 2 1
             l #{@fly} #{@hoist / 6}
@@ -74,8 +74,8 @@ describe USPSFlags::Core do
       )
     end
 
-    it 'should correctly generate the blue past field' do
-      expect(USPSFlags::Core.field(style: :past, color: :blue)).to eql(
+    it 'correctlies generate the blue past field' do
+      expect(described_class.field(style: :past, color: :blue)).to eql(
         <<~SVG
           <g transform="translate(2, 1)">
             <path d="M 0 5 l #{@fly / 2} #{@hoist * 1 / 12}
@@ -103,36 +103,36 @@ describe USPSFlags::Core do
   end
 
   describe 'trident' do
-    it 'should correctly generate a short trident' do
-      expect(USPSFlags::Core.trident(:s)).to include("<path d=\"M #{@fly / 2} #{@hoist / 4}\n")
+    it 'correctlies generate a short trident' do
+      expect(described_class.trident(:s)).to include("<path d=\"M #{@fly / 2} #{@hoist / 4}\n")
     end
 
-    it 'should correctly generate a delta trident' do
-      expect(USPSFlags::Core.trident(:d)).to include(
+    it 'correctlies generate a delta trident' do
+      expect(described_class.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(
+    it 'correctlies generate a circle trident' do
+      expect(described_class.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
-      expect(USPSFlags::Core.trident(:n)).to include("<path d=\"M #{@fly / 2} #{@hoist / 8}\n")
+    it 'correctlies generate a long trident' do
+      expect(described_class.trident(:n)).to include("<path d=\"M #{@fly / 2} #{@hoist / 8}\n")
     end
   end
 
   describe 'anchor' do
-    it 'should correctly generate an anchor' do
-      expect(USPSFlags::Core.anchor).to include('<mask id="anchor-mask">')
+    it 'correctlies generate an anchor' do
+      expect(described_class.anchor).to include('<mask id="anchor-mask">')
     end
   end
 
   describe 'lighthouse' do
-    it 'should correctly generate a lighthouse' do
-      expect(USPSFlags::Core.lighthouse).to include('<mask id="lighthouse-mask">')
+    it 'correctlies generate a lighthouse' do
+      expect(described_class.lighthouse).to include('<mask id="lighthouse-mask">')
     end
   end
 end

data/spec/usps_flags/generate_spec.rb

@@ -4,14 +4,14 @@ require 'spec_helper'
 
 describe USPSFlags::Generate do
   describe 'general features' do
-    it 'should generate a flag with the correct size' do
-      expect(USPSFlags::Generate.svg('LtC', outfile: '')).to include(
+    it 'generates a flag with the correct size' do
+      expect(described_class.svg('LtC', outfile: '')).to include(
         'width="1024" height="682" viewBox="0 0 3072 2048"'
       )
     end
 
-    it 'should generate a flag with the correct field' do
-      expect(USPSFlags::Generate.svg('LtC', outfile: '')).to include(
+    it 'generates a flag with the correct field' do
+      expect(described_class.svg('LtC', outfile: '')).to include(
         <<~SVG
           <path d="M 0 0
             l 3072 0
@@ -23,114 +23,117 @@ describe USPSFlags::Generate do
       )
     end
 
-    it 'should generate a flag with the correct starting position' do
-      expect(USPSFlags::Generate.svg('LtC', outfile: '')).to include('<path d="M 1536 512')
+    it 'generates a flag with the correct starting position' do
+      expect(described_class.svg('LtC', outfile: '')).to include('<path d="M 1536 512')
     end
 
-    it 'should generate a flag with the correct trident transformations' do
-      expect(USPSFlags::Generate.svg('LtC', outfile: '')).to include('<g transform="translate(-512)">')
-      expect(USPSFlags::Generate.svg('LtC', outfile: '')).to include('<g transform="translate(512)">')
+    describe 'lateral transformations' do
+      it 'has the correct left transformation' do
+        expect(described_class.svg('LtC', outfile: '')).to include('<g transform="translate(-512)">')
+      end
+
+      it 'has the correct right transformation' do
+        expect(described_class.svg('LtC', outfile: '')).to include('<g transform="translate(512)">')
+      end
     end
   end
 
   describe 'officer flags' do
-    [
-      'PLTC', 'PC', 'PDLTC', 'PDC', 'PSTFC', 'PRC', 'PVC', 'PCC',
-      'PORTCAP', 'FLEETCAP', 'FLT', 'DAIDE', 'DFLT', 'NAIDE', 'NFLT',
-      'LT', '1LT', 'LTC', 'CDR', 'DLT', 'D1LT', 'DLTC', 'DC', 'STFC', 'RC', 'VC', 'CC'
+    %w[
+      PLTC PC PDLTC PDC PSTFC PRC PVC PCC
+      PORTCAP FLEETCAP FLT DAIDE DFLT NAIDE NFLT
+      LT 1LT LTC CDR DLT D1LT DLTC DC STFC RC VC CC
     ].each do |flag|
       it "should generate #{flag}" do
-        expect(USPSFlags::Generate.svg(flag, outfile: '')).to include("<title>#{flag}</title>")
+        expect(described_class.svg(flag, outfile: '')).to include("<title>#{flag}</title>")
       end
     end
   end
 
   describe 'pennants' do
-    it 'should generate the cruise pennant' do
-      expect(USPSFlags::Generate.svg('Cruise', outfile: '')).to include('<title>Cruise Pennant</title>')
+    it 'generates the cruise pennant' do
+      expect(described_class.svg('Cruise', outfile: '')).to include('<title>Cruise Pennant</title>')
     end
 
-    it 'should generate the officer-in-charge pennant' do
-      expect(USPSFlags::Generate.svg('OIC', outfile: '')).to include('<title>Officer-in-Charge Pennant</title>')
+    it 'generates the officer-in-charge pennant' do
+      expect(described_class.svg('OIC', outfile: '')).to include('<title>Officer-in-Charge Pennant</title>')
     end
   end
 
   describe 'other flags' do
-    it 'should generate US' do
-      expect(USPSFlags::Generate.svg('US', outfile: '')).to include('<title>US Ensign</title>')
+    it 'generates US' do
+      expect(described_class.svg('US', outfile: '')).to include('<title>US Ensign</title>')
     end
 
-    it 'should generate USPS Ensign' do
-      expect(USPSFlags::Generate.svg('Ensign', outfile: '')).to include('<title>USPS Ensign</title>')
+    it 'generates USPS Ensign' do
+      expect(described_class.svg('Ensign', outfile: '')).to include('<title>USPS Ensign</title>')
     end
 
-    it 'should generate the USPS Wheel logo' do
-      expect(USPSFlags::Generate.svg('Wheel', outfile: '')).to include('<title>USPS Ensign Wheel</title>')
+    it 'generates the USPS Wheel logo' do
+      expect(described_class.svg('Wheel', outfile: '')).to include('<title>USPS Ensign Wheel</title>')
     end
   end
 
   describe 'trident specifications' do
-    it 'should generate the trident specification sheet' do
-      expect(USPSFlags::Generate.spec(outfile: '')).to include('<title>USPS Trident Specifications</title>')
+    it 'generates the trident specification sheet' do
+      expect(described_class.spec(outfile: '')).to include('<title>USPS Trident Specifications</title>')
     end
 
-    it 'should generate the trident specification sheet with a scaled border' do
-      expect(USPSFlags::Generate.spec(outfile: '', scaled_border: true)).to include(
+    it 'generates the trident specification sheet with a scaled border' do
+      expect(described_class.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
-      expect(USPSFlags::Generate.spec(outfile: '', fly: 23.5)).to include('<title>USPS Trident Specifications</title>')
+    it 'generates the trident specification sheet with a fractional field size' do
+      expect(described_class.spec(outfile: '', fly: 23.5)).to include('<title>USPS Trident Specifications</title>')
     end
   end
 
   describe 'png' do
-    before(:each) do
-      @svg = USPSFlags::Generate.svg('LtC', outfile: '')
+    before do
+      @svg = described_class.svg('LtC', outfile: '')
     end
 
-    it 'should raise PNGGenerationError without an outfile' do
-      expect { USPSFlags::Generate.png(@svg, outfile: '') }.to raise_error(USPSFlags::Errors::PNGGenerationError)
+    it 'raises PNGGenerationError without an outfile' do
+      expect { described_class.png(@svg, outfile: '') }.to raise_error(USPSFlags::Errors::PNGGenerationError)
     end
 
-    it 'should contain the SVG when raising PNGGenerationError without an outfile' do
-      begin
-        USPSFlags::Generate.png(@svg, outfile: '')
-      rescue => e
-        expect(e.svg).to eql(@svg)
-      end
+    it 'contains the SVG when raising PNGGenerationError without an outfile' do
+      described_class.png(@svg, outfile: '')
+    rescue StandardError => e
+      expect(e.svg).to eql(@svg)
     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
+    it 'does not raise PNGGenerationError when correctly configured' do
+      expect { described_class.png(@svg, outfile: 'lib/output/PNG/LTC.png') }.not_to raise_error
     end
   end
 
   describe 'without an outfile set' do
-    it 'should print SVG data to the console' do
-      expect(STDOUT).to receive(:puts).with(USPSFlags::Generate.svg('Lt', outfile: ''), "\n")
-      USPSFlags::Generate.svg('Lt')
+    it 'prints SVG data to the console' do
+      expect(STDOUT).to receive(:puts).with(described_class.svg('Lt', outfile: ''), "\n")
+      described_class.svg('Lt')
     end
   end
 
   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(
+    it 'raises USPSFlags::Errors::StaticFilesGenerationError when not given any true arguments' do
+      expect { described_class.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].'
       )
     end
 
-    it 'should raise USPSFlags::Errors::ZipGenerationError when not given any true arguments' do
-      expect { USPSFlags::Generate.zips(svg: false, png: false) }.to raise_error(
+    it 'raises USPSFlags::Errors::ZipGenerationError when not given any true arguments' do
+      expect { described_class.zips(svg: false, png: false) }.to raise_error(
         USPSFlags::Errors::ZipGenerationError, 'At least one argument switch must be true out of [svg, png].'
       )
     end
   end
 
   describe 'static files generation', slow: true do
-    before(:all) do
+    before do
       svg_dir = "#{USPSFlags.configuration.flags_dir}/SVG"
       png_dir = "#{USPSFlags.configuration.flags_dir}/PNG"
 
@@ -144,15 +147,15 @@ describe USPSFlags::Generate do
       ::FileUtils.rm_rf(USPSFlags.configuration.flags_dir)
       USPSFlags.prepare_flags_dir
 
-      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: ''),
+      described_class.svg(@svg_flag, outfile: "#{svg_dir}/#{@svg_flag}.svg")
+      described_class.svg(@svg_ins_flag, field: false, outfile: "#{svg_dir}/insignia/#{@svg_ins_flag}.svg")
+      described_class.png(described_class.svg(@png_flag, outfile: ''), outfile: "#{png_dir}/#{@png_flag}.png")
+      described_class.png(
+        described_class.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: ''),
+      described_class.png(
+        described_class.svg(@thb_flag, field: false, outfile: ''),
         trim: true, outfile: "#{png_dir}/insignia/#{@thb_flag}.png"
       )
       USPSFlags::Helpers.resize_png(
@@ -160,16 +163,16 @@ describe USPSFlags::Generate do
       )
     end
 
-    it 'should not raise an error while generating all static files' do
-      expect { USPSFlags::Generate.all(reset: false) }.to_not raise_error
+    it 'does not raise an error while generating all static files' do
+      expect { described_class.all(reset: false) }.not_to raise_error
     end
 
     describe 'generation logs' do
-      before(:each) do
+      before do
         @log_contents = ::File.read("#{USPSFlags.configuration.log_path}/flag.log")
       end
 
-      it 'should have generated the correct log output' do
+      it 'has generated the correct log output' do
         correct_log_pattern = <<~LOG
               Flag | SVG | PNG        | Run time
           ---------------------------------------
@@ -209,19 +212,19 @@ describe USPSFlags::Generate do
             Generated PNG Zip
         LOG
 
-        correct_log_pattern = correct_log_pattern.
-          gsub('+', '\+').gsub('|', '\|').
-          gsub(/#{@svg_flag} | S/, "#{@svg_flag} | \\.").
-          gsub(/#{@svg_ins_flag} | SI/, "#{@svg_ins_flag} | S\\.").
-          gsub(/#{@png_flag} | S(.)  | F/, "#{@png_flag} | S\1  | \\.").
-          gsub(/#{@png_ins_flag} | SI  | FI/, "#{@png_ins_flag} | SI  | F\\.").
-          gsub(/#{@thm_flag} | SI  | FIH(.)K(.)D(.)Ti/, "#{@thm_flag} | SI  | FIH\1K\2D\3T\\.")
+        correct_log_pattern = correct_log_pattern
+                              .gsub('+', '\+').gsub('|', '\|')
+                              .gsub(/#{@svg_flag} | S/, "#{@svg_flag} | \\.")
+                              .gsub(/#{@svg_ins_flag} | SI/, "#{@svg_ins_flag} | S\\.")
+                              .gsub(/#{@png_flag} | S(.)  | F/, "#{@png_flag} | S\1  | \\.")
+                              .gsub(/#{@png_ins_flag} | SI  | FI/, "#{@png_ins_flag} | SI  | F\\.")
+                              .gsub(/#{@thm_flag} | SI  | FIH(.)K(.)D(.)Ti/, "#{@thm_flag} | SI  | FIH\1K\2D\3T\\.")
         correct_log_regexp = Regexp.new(correct_log_pattern)
 
         expect(@log_contents).to match(correct_log_regexp)
       end
 
-      it 'should not match an incorrect log output' do
+      it 'does not match an incorrect log output' do
         incorrect_log_pattern = 'PLTC \| --  \| ---------- \| .*{3,6} s'
 
         incorrect_log_regexp = Regexp.new(incorrect_log_pattern)
@@ -230,12 +233,12 @@ describe USPSFlags::Generate do
       end
     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
+    it 'does not raise an error while clearing all static files' do
+      expect { described_class.all(svg: false, png: false, zips: false, reset: true) }.not_to raise_error
     end
 
-    it 'should not raise an error while generating zip files' do
-      expect { USPSFlags::Generate.zips }.to_not raise_error
+    it 'does not raise an error while generating zip files' do
+      expect { described_class.zips }.not_to raise_error
     end
   end
 end