usps_flags 0.5.6 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd1924100e63785bd74beb28420e134605b9b1dc65d7cdb2fa4d81f3560e04d7
-  data.tar.gz: 250334abcb381cde875affe1952e39f8922c02b34d3992410146868155572027
+  metadata.gz: 66522ba47851bcb474d636cc17c8dcb62e25d32564893abfb93e9c3408b9b421
+  data.tar.gz: d9129013df7517b33e534bb6405ee20a2008e19b3236c04169e45278f46f8fdc
 SHA512:
-  metadata.gz: 36950b9153031c3164ecafd3d0154e4d6c9442cd044a8fdca5dce847b6a92924e4df4d59e35d6185cfc8b8517e2d880f14421f3ccb3323b9a10077cd33e75176
-  data.tar.gz: a243733ed9bc80bb510dd7864abfa9cfe8daae72b3e55bdc954ccd15d49d02c62bea493394da05082ef8d967ea315217ad18e5b7ff74c4007b011b6f907dd4d5
+  metadata.gz: 4092e043b877705349f24a2fd0ee3733bb2e7b0e75ddbed6f7bf1f1bb3aa1ac6a147c9ff3f69baf779332f7db1e5fb96f8f2480079231d21df181de605856e62
+  data.tar.gz: 4654f83943621648bde190a5bce5e889729ad138fb445017ba20c401bc0f6b2d5790b5b232a3906784f1bfa4fec854334db3351c3a04b680db19f145cf1f226c

data/.gitignore

@@ -2,3 +2,4 @@ doc/
 coverage/
 lib/output/
 tmp/
+*.gem

data/.ruby-version

@@ -0,0 +1 @@
+2.5.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    usps_flags (0.5.6)
+    usps_flags (0.6.1)
       file_utils (~> 1.1, >= 1.1.2)
       mini_magick (~> 4.9, >= 4.9.4)
       rubyzip (~> 1.3, >= 1.3.0)
@@ -13,14 +13,14 @@ GEM
     diff-lcs (1.3)
     docile (1.1.5)
     file_utils (1.1.2)
-    jaro_winkler (1.5.2)
-    json (2.1.0)
-    mini_magick (4.9.5)
-    parallel (1.17.0)
-    parser (2.6.3.0)
+    jaro_winkler (1.5.4)
+    json (2.3.1)
+    mini_magick (4.10.1)
+    parallel (1.19.1)
+    parser (2.6.5.0)
       ast (~> 2.4.0)
     rainbow (3.0.0)
-    rake (12.3.0)
+    rake (12.3.3)
     rspec (3.7.0)
       rspec-core (~> 3.7.0)
       rspec-expectations (~> 3.7.0)
@@ -34,7 +34,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.7.0)
     rspec-support (3.7.0)
-    rubocop (0.71.0)
+    rubocop (0.77.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.6)
@@ -58,7 +58,7 @@ PLATFORMS
 DEPENDENCIES
   rake (~> 12.2, >= 12.2.1)
   rspec (~> 3.7, >= 3.7.0)
-  rubocop (~> 0.71, >= 0.71.0)
+  rubocop (~> 0.77, >= 0.77.0)
   rubocop-rspec (~> 1.30, >= 1.30.0)
   simplecov (~> 0.15, >= 0.15.1)
   usps_flags!

data/README.md

@@ -1,7 +1,7 @@
 # United States Power Squadrons® Flag Generator
 
 [![Gem Version](https://img.shields.io/gem/v/usps_flags.svg)](https://rubygems.org/gems/usps_flags)
-[![Build Status](https://travis-ci.org/jfiander/usps-flags.svg)](https://travis-ci.org/jfiander/usps-flags)
+[![Build Status](https://img.shields.io/travis/jfiander/usps-flags/master.svg)](https://travis-ci.org/jfiander/usps-flags)
 [![Test Coverage](https://api.codeclimate.com/v1/badges/760b824f0edac3316a11/test_coverage)](https://codeclimate.com/github/jfiander/usps-flags/test_coverage)
 [![Maintainability](https://api.codeclimate.com/v1/badges/760b824f0edac3316a11/maintainability)](https://codeclimate.com/github/jfiander/usps-flags/maintainability)
 

data/lib/usps_flags/core.rb

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

data/lib/usps_flags/core/CC.svg

@@ -0,0 +1,125 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<svg version="1.0" xmlns="http://www.w3.org/2000/svg" width="1024" height="682" viewBox="-3.072 -4.096 3084.288 2058.24" preserveAspectRatio="xMidYMid meet">
+<title>CC</title>
+<metadata>
+<desc id="created-by">Julian Fiander</desc>
+<desc id="generated-at">20200216.1756-0500</desc>
+<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><path d="M 0 0
+  l 3072 0
+  l 0 2048
+  l -3072 0
+  l 0 -2048 z
+" fill="#012169" />
+<g transform="translate(-354, 236)">
+  <g transform="rotate(-45, 1536, 1024)">
+<path d="M 1536 256
+l 80 184
+l -40 -24
+l 0 1376
+l -80 0
+l 0 -1376
+l -40 24
+l 80 -184
+" fill="#FFFFFF" />
+<path d="M 1296 784
+l 480 0
+l 0 80
+l -480 0
+l 0 -80
+" fill="#FFFFFF" />
+<path d="M 1296 785
+l 0 -464
+l 120 168
+l -40 0
+l 0 296
+" fill="#FFFFFF" />
+<path d="M 1776 785
+l 0 -464
+l -120 168
+l 40 0
+l 0 296
+" fill="#FFFFFF" />
+<path d="M 1400 944
+l 273 0
+l 0 80
+l -273 0
+l 0 -80
+" fill="#FFFFFF" />
+</g>
+</g>
+
+<path d="M 1536 256
+l 80 184
+l -40 -24
+l 0 1376
+l -80 0
+l 0 -1376
+l -40 24
+l 80 -184
+" fill="#FFFFFF" />
+<path d="M 1296 784
+l 480 0
+l 0 80
+l -480 0
+l 0 -80
+" fill="#FFFFFF" />
+<path d="M 1296 785
+l 0 -464
+l 120 168
+l -40 0
+l 0 296
+" fill="#FFFFFF" />
+<path d="M 1776 785
+l 0 -464
+l -120 168
+l 40 0
+l 0 296
+" fill="#FFFFFF" />
+<path d="M 1400 944
+l 273 0
+l 0 80
+l -273 0
+l 0 -80
+" fill="#FFFFFF" />
+
+<g transform="translate(354, 236)">
+  <g transform="rotate(45, 1536, 1024)">
+<path d="M 1536 256
+l 80 184
+l -40 -24
+l 0 1376
+l -80 0
+l 0 -1376
+l -40 24
+l 80 -184
+" fill="#FFFFFF" />
+<path d="M 1296 784
+l 480 0
+l 0 80
+l -480 0
+l 0 -80
+" fill="#FFFFFF" />
+<path d="M 1296 785
+l 0 -464
+l 120 168
+l -40 0
+l 0 296
+" fill="#FFFFFF" />
+<path d="M 1776 785
+l 0 -464
+l -120 168
+l 40 0
+l 0 296
+" fill="#FFFFFF" />
+<path d="M 1400 944
+l 273 0
+l 0 80
+l -273 0
+l 0 -80
+" fill="#FFFFFF" />
+</g>
+</g>
+</svg>

data/lib/usps_flags/core/field.rb

@@ -52,7 +52,7 @@ class USPSFlags
             l #{@fly} 0
             l 0 #{@hoist}
             l -#{@fly} 0
-            l 0 -#{@hoist}
+            l 0 -#{@hoist} z
           " fill="#{@color_code}" #{@border_svg}/>
         SVG
       end
@@ -71,7 +71,7 @@ class USPSFlags
       def past_field
         <<~SVG
           <g transform="translate(#{USPSFlags::Config::BASE_FLY / 1200}, #{USPSFlags::Config::BASE_FLY / 1800})">
-            <path d="M 0 #{USPSFlags::Config::BASE_FLY / 600} #{past_line_one}" fill="#{@color_code}" />
+            <path d="M 0 #{USPSFlags::Config::BASE_FLY / 1200} #{past_line_one}" fill="#{@color_code}" />
             <path d="M #{@fly / 2} #{@hoist / 12} #{past_line_two}" fill="#{@past_mid_color}" />
             <path d="M #{@fly * 3 / 4} #{@hoist * 3 / 24} #{past_line_three}" fill="#{@past_tail_color}" />
             <path d="M 0 0 #{past_line_four} z" fill="none" stroke="#000000" stroke-width="#{USPSFlags::Config::BASE_FLY / 600}" />

data/lib/usps_flags/core/headers.rb

@@ -54,7 +54,7 @@ class USPSFlags
         <<~SVG
           <?xml version="1.0" standalone="no"?>
           <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
-          <svg version="1.0" xmlns="http://www.w3.org/2000/svg" width="#{@width}" height="#{@height}" viewBox="0 0 #{@view_width} #{@view_height}" preserveAspectRatio="xMidYMid meet">
+          <svg version="1.0" xmlns="http://www.w3.org/2000/svg" width="#{@width}" height="#{@height}" viewBox="-#{@view_width * 0.001} -#{@view_height * 0.002} #{@view_width * 1.004} #{@view_height * 1.005}" preserveAspectRatio="xMidYMid meet">
           <title>#{@title}</title>
           <metadata>
           <desc id="created-by">Julian Fiander</desc>

data/lib/usps_flags/core/icons/trident.rb

@@ -13,7 +13,7 @@ class USPSFlags
 
         def initialize(type, color: :blue, field_color: nil)
           valid_types = %i[s d stf n]
-          raise "Error: Invalid trident type. Options are #{valid_types}." unless valid_types.include?(type)
+          raise "Error: Invalid trident type: #{type}. Options are #{valid_types}." unless valid_types.include?(type)
 
           @type = type
 

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

@@ -24,6 +24,17 @@ class USPSFlags
           svg
         end
 
+        def intersections
+          # Static labeling
+          @fly = Rational(2048, 5)
+          @unit = ''
+
+          svg = spec_header(no_measurements: true)
+          svg << add_intersections
+
+          svg
+        end
+
       private
 
         def box_left
@@ -53,6 +64,71 @@ class USPSFlags
             add_trident(:Long, box_top, box_bottom, box_left, box_right)
         end
 
+        def add_intersections
+          svg = +''
+
+          svg += "<g transform=\"translate(-#{BF * 1 / 16}, #{BH / 4}) scale(0.6)\">"
+          svg += USPSFlags::Core::Tridents.cc(trident_color: :blue)
+          svg += cc_label
+          svg += '</g>'
+
+          svg += "<g transform=\"translate(#{BF * 7 / 16}, #{BH / 4}) scale(0.6)\">"
+          svg += USPSFlags::Core::Tridents.vc(trident_color: :red)
+          svg += vc_label
+          svg += '</g>'
+
+          svg
+        end
+
+        def cc_label
+          offset = BF.to_f * 1 / 32
+          height = BF.to_f * 15 / 64
+
+          small_arrow = SA.vertical(
+            offset, -height / 3, 0,
+            pointer_top: height / 3, pointer_bottom: 0, label_offset: BF / 35,
+            label_offset_y: -BF / 50, label_align: 'middle', fly: @fly, unit: @unit
+          )
+
+          <<~SVG
+            <!-- CC Intersection -->
+              <g transform="translate(#{BF / 2}, #{BH - 200}) rotate(45)">
+                #{big_arrow}
+                #{small_arrow}
+              </g>
+          SVG
+        end
+
+        def vc_label
+          offset = BF.to_f * 1 / 32
+          height = BF.to_f * 15 / 64
+
+          small_arrow = SA.vertical(
+            offset, -height * 15 / 32, 0,
+            pointer_top: height * 15 / 32, pointer_bottom: 0, label_offset: BF / 35,
+            label_offset_y: -BF / 50, label_align: 'middle', fly: @fly, unit: @unit
+          )
+
+          <<~SVG
+            <!-- CC Intersection -->
+              <g transform="translate(#{BF / 2}, #{BH - 200}) rotate(45)">
+                #{big_arrow}
+                #{small_arrow}
+              </g>
+          SVG
+        end
+
+        def big_arrow
+          offset = BF * 1 / 32
+          height = BF * 15 / 64
+
+          SA.vertical(
+            offset * 3, -height, 0,
+            pointer_top: height, pointer_bottom: 0, label_offset: BF / 60,
+            label_offset_y: -BF / 10, label_align: 'left', fly: @fly, unit: @unit
+          )
+        end
+
         def configure_sizes(fly)
           @fly = Rational(fly)
           get_hoist_from_fly(@fly)
@@ -109,10 +185,10 @@ class USPSFlags
           end
         end
 
-        def spec_header
+        def spec_header(no_measurements: false)
           USPSFlags::Core::TridentSpecs::Header.new(
             fly: @fly, fly_fraction: @fly_fraction, hoist: @hoist, hoist_fraction: @hoist_fraction,
-            unit_text: @unit_text, scaled_border: @scaled_border
+            unit_text: @unit_text, scaled_border: @scaled_border, no_measurements: no_measurements
           ).p
         end
 

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

@@ -15,6 +15,7 @@ class USPSFlags
           @hoist_fraction = options[:hoist_fraction]
           @unit_text = options[:unit_text]
           @scaled_border = options[:scaled_border]
+          @no_measurements = options.key?(:no_measurements) && options[:no_measurements]
         end
 
         def p
@@ -43,11 +44,21 @@ class USPSFlags
               <text x="#{BF / 2}" y="#{BH * 3 / 40}" font-family="sans-serif" font-size="#{BH / 20}px" font-weight="bold" fill="#041E42" text-anchor="middle">United States Power Squadrons<tspan class="heading" dy ="-#{BH / 50}">®</tspan></text>
             </g>
             <text x="#{BF / 2}" y="#{BH / 8}" font-family="sans-serif" font-size="#{BH / 30}px" fill="#041E42" text-anchor="middle">Officer Flag Trident Specification</text>
+            #{measurements_are_relative}
+          SVG
+        end
+
+        def measurements_are_relative
+          return if @no_measurements
+
+          <<~SVG
             <text x="#{BF / 2}" y="#{BH * 2 / 11}" font-family="sans-serif" font-size="#{BH / 40}px" fill="#041E42" text-anchor="middle">All measurements are relative to a field with</text>
           SVG
         end
 
         def units
+          return angles if @no_measurements
+
           <<~SVG
             <g>
               <style><![CDATA[tspan.title{font-size: #{USPSFlags::Config::FRACTION_SCALE * 9 / 10}%;}]]></style>
@@ -58,6 +69,12 @@ class USPSFlags
           SVG
         end
 
+        def angles
+          <<~SVG
+            <text x="#{BF / 2}" y="#{BH * 4 / 19}" font-family="sans-serif" font-size="#{BH / 40}px" fill="#041E42" text-anchor="middle">Angled tridents are 45 degrees from vertical.</text>
+          SVG
+        end
+
         def scaled_border
           <<~SVG
             <!-- Flag border scaled to spec trident size -->

data/lib/usps_flags/core/tridents.rb

@@ -8,30 +8,41 @@ class USPSFlags
   class Core
     class Tridents
       class << self
-        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
+        # The side C/C tridents are angled 45 degrees, and intersect the central one at 1/3 up from the bottom
+        #
+        # Center of rotation:
+        # # radius = USPSFlags.configuration.trident[:bar_width] / 2
+        # <circle cx="#{cc_center[:x]}" cy="#{cc_center[:y]}" r="#{radius}" fill="red" />
+        def cc(_ = nil, trident_color:)
+          trident = USPSFlags::Core.trident(:n, color: trident_color)
+          x_distance = USPSFlags::Config::BASE_FLY * 4 / 39 # 4/39 or 28/39
+          y_distance = USPSFlags::Config::BASE_FLY * 2 / 39 # 5/78 or 27/156
           <<~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 * 1.25}, #{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 * 1.25}, #{y_distance})">
+              <g transform="rotate(45)" transform-origin="center">\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
+        # V/C tridents are angled 45 degrees, and intersect at 15/32 up from the bottom
+        def vc(_ = nil, trident_color:)
+          trident = USPSFlags::Core.trident(:n, color: trident_color)
           <<~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="rotate(-45, #{vc_center[:x]}, #{vc_center[:y]})">
+              #{trident}
+            </g>
+            <g transform="rotate(45, #{vc_center[:x]}, #{vc_center[:y]})">
+              #{trident}
+            </g>
           SVG
         end
 
+        # Cdr and D/C tridents are spaced 1/2 the fly apart with the central one 1/4 the fly above the sides
         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
@@ -42,8 +53,8 @@ class USPSFlags
           SVG
         end
 
+        # Lt/C and D/Lt/C tridents are spaced 1/3 the fly apart
         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
           <<~SVG
@@ -52,8 +63,8 @@ class USPSFlags
           SVG
         end
 
+        # Swallowtail tridents need to move towards the hoist due to the tails
         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 = +''
           svg << "<g transform=\"translate(-#{x_distance})\">" if field
@@ -61,6 +72,25 @@ class USPSFlags
           svg << '</g>' if field
           svg
         end
+
+      private
+
+        def rotation_center(height_fraction)
+          {
+            x: USPSFlags::Config::BASE_FLY / 2,
+            y: (USPSFlags::Config::BASE_HOIST * 7 / 8) - (n_staff_height * height_fraction).to_f
+          }
+        end
+
+        def vc_center
+          rotation_center(Rational(15, 32))
+        end
+
+        def n_staff_height
+          top_height = USPSFlags.configuration.trident[:crossbar_from_top]
+          bars = (USPSFlags.configuration.trident[:bar_width] * 3)
+          USPSFlags.configuration.trident_heights[:n] - top_height - bars
+        end
       end
     end
   end

data/lib/usps_flags/generate.rb

@@ -103,6 +103,22 @@ class USPSFlags
         USPSFlags::Helpers.output(svg, outfile: outfile)
       end
 
+      # Generate trident spec sheet for National Bridge intersections 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 intersection_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.intersection_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)

data/lib/usps_flags/generate/flag.rb

@@ -24,13 +24,14 @@ class USPSFlags
         end
 
         def special(type, level:, field: true)
+          translate = (type == :f && level == :n) || !field
           # 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=\"translate(#{USPSFlags::Config::BASE_FLY / 10})\">" if translate
           svg << "<g transform=\"scale(#{Rational(USPSFlags::Config::BASE_FLY, 3000).to_f})\">"
           svg << special_icon(type, level)
           svg << '</g>'
-          svg << '</g>' unless field
+          svg << '</g>' if translate
 
           svg
         end

data/lib/usps_flags/helpers.rb

@@ -120,6 +120,7 @@ class USPSFlags
 
         dirs = path.split('/')
         dirs.pop
+        dirs = ['.'] if dirs.empty?
         ::FileUtils.mkdir_p(dirs.join('/')).first
       end
 
@@ -179,7 +180,7 @@ class USPSFlags
       end
 
       def flag_type(rank)
-        specifics = { 'PORTCAP' => :pc, 'FLEETCAP' => :fc, 'STFC' => :stf }
+        specifics = { 'PORTCAP' => :pc, 'FLEETCAP' => :fc, 'STFC' => :stf, 'PSTFC' => :stf }
         return specifics[rank] if specifics.key?(rank)
         return :a if rank.match?(/.AIDE/)
         return :f if rank.match?(/.?FLT/)

data/lib/usps_flags/helpers/valid_flags.rb

@@ -15,7 +15,7 @@ class USPSFlags
           @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_past = %w[PNFLT PSTFC PRC PVC PCC]
           @national_elected = %w[STFC RC VC CC]
           @national_swallowtail = %w[NAIDE NFLT]
         end

data/spec/usps_flags/core_spec.rb

@@ -42,7 +42,7 @@ describe USPSFlags::Core do
             l #{@fly} 0
             l 0 #{@hoist}
             l -#{@fly} 0
-            l 0 -#{@hoist}
+            l 0 -#{@hoist} z
           " fill="#FFFFFF" stroke="#000000" stroke-width="#{USPSFlags::Config::BASE_FLY / 600}" />
         SVG
       )
@@ -55,7 +55,7 @@ describe USPSFlags::Core do
             l #{@fly} 0
             l 0 #{@hoist}
             l -#{@fly} 0
-            l 0 -#{@hoist}
+            l 0 -#{@hoist} z
           " fill="#{@red}" />
         SVG
       )
@@ -78,7 +78,7 @@ describe USPSFlags::Core 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}
+            <path d="M 0 2 l #{@fly / 2} #{@hoist * 1 / 12}
           l 0 #{@hoist * 10 / 12}
           l -#{@fly / 2} #{@hoist * 1 / 12}
           " fill="#{@blue}" />

data/spec/usps_flags/generate_spec.rb

@@ -6,7 +6,7 @@ describe USPSFlags::Generate do
   describe 'general features' do
     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"'
+        'width="1024" height="682" viewBox="-3.072 -4.096 3084.288 2058.24"'
       )
     end
 
@@ -17,7 +17,7 @@ describe USPSFlags::Generate do
             l 3072 0
             l 0 2048
             l -3072 0
-            l 0 -2048
+            l 0 -2048 z
           " fill="#E4002B" />
         SVG
       )
@@ -40,7 +40,7 @@ describe USPSFlags::Generate do
 
   describe 'officer flags' do
     %w[
-      PLTC PC PDLTC PDC PSTFC PRC PVC PCC
+      PLTC PC PDLTC PDC PNFLT 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|
@@ -88,6 +88,10 @@ describe USPSFlags::Generate do
     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
+
+    it 'generates the intersection specification sheet' do
+      expect(described_class.intersection_spec(outfile: '')).to include('CC Intersection')
+    end
   end
 
   describe 'png' do

data/spec/usps_flags/helpers_spec.rb

@@ -11,7 +11,7 @@ describe USPSFlags::Helpers do
     it 'returns all officer flags but nothing else when given type :officer' do
       expect(described_class.valid_flags(:officer).sort).to eql(%w[
         PLTC PC PORTCAP FLEETCAP LT FLT 1LT LTC CDR PDLTC PDC DLT DAIDE
-        DFLT D1LT DLTC DC PSTFC PRC PVC PCC NAIDE NFLT STFC RC VC CC
+        DFLT D1LT DLTC DC PNFLT PSTFC PRC PVC PCC NAIDE NFLT STFC RC VC CC
       ].sort)
     end
 

data/spec/usps_flags_spec.rb

@@ -7,7 +7,7 @@ describe USPSFlags do
     @valid_header = <<~SVG
       <?xml version="1.0" standalone="no"?>
       <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
-      <svg version="1.0" xmlns="http://www.w3.org/2000/svg" width="614" height="409" viewBox="0 0 3072 2048" preserveAspectRatio="xMidYMid meet">
+      <svg version="1.0" xmlns="http://www.w3.org/2000/svg" width="614" height="409" viewBox="-3.072 -4.096 3084.288 2058.24" preserveAspectRatio="xMidYMid meet">
       <title>LTC</title>
       <metadata>
       <desc id="created-by">Julian Fiander</desc>

data/usps_flags.gemspec

@@ -2,8 +2,8 @@
 
 Gem::Specification.new do |s|
   s.name          = 'usps_flags'
-  s.version       = '0.5.6'
-  s.date          = '2019-12-12'
+  s.version       = '0.6.1'
+  s.date          = '2020-08-03'
   s.summary       = 'Flag generator for United States Power Squadrons'
   s.description   = 'A flag image (PNG, SVG) generator for United States Power Squadrons.'
   s.homepage      = 'http://rubygems.org/gems/usps_flags'
@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency 'rake',          '~> 12.2', '>= 12.2.1'
   s.add_development_dependency 'rspec',         '~> 3.7',  '>= 3.7.0'
-  s.add_development_dependency 'rubocop',       '~> 0.71', '>= 0.71.0'
+  s.add_development_dependency 'rubocop',       '~> 0.77', '>= 0.77.0'
   s.add_development_dependency 'rubocop-rspec', '~> 1.30', '>= 1.30.0'
   s.add_development_dependency 'simplecov',     '~> 0.15', '>= 0.15.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: usps_flags
 version: !ruby/object:Gem::Version
-  version: 0.5.6
+  version: 0.6.1
 platform: ruby
 authors:
 - Julian Fiander
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-12 00:00:00.000000000 Z
+date: 2020-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: file_utils
@@ -116,20 +116,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.71'
+        version: '0.77'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.71.0
+        version: 0.77.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.71'
+        version: '0.77'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.71.0
+        version: 0.77.0
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -179,8 +179,10 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
+- ".ruby-version"
 - ".travis.yml"
 - ".yardopts"
+- CC.png
 - CONTRIBUTING.md
 - Gemfile
 - Gemfile.lock
@@ -192,6 +194,7 @@ files:
 - lib/usps_flags/config.rb
 - lib/usps_flags/configuration.rb
 - lib/usps_flags/core.rb
+- lib/usps_flags/core/CC.svg
 - lib/usps_flags/core/ensign.rb
 - lib/usps_flags/core/field.rb
 - lib/usps_flags/core/footer.rb