usps_flags 0.1.26 → 0.2.0

data/lib/usps_flags/helpers.rb

@@ -62,6 +62,14 @@ class USPSFlags::Helpers
       end
     end
 
+    # Gets the maximum length among valid flags.
+    #
+    # This is used USPSFlags::Generate, and should never need to be called directly.
+    # @private
+    def max_flag_name_length
+      valid_flags(:all).map(&:length).max
+    end
+
     # Gets the generation details for the given rank.
     #
     # This is used USPSFlags::Generate, and should never need to be called directly.
@@ -76,144 +84,6 @@ class USPSFlags::Helpers
       }
     end
 
-    # Displays an overlay grid with regularly spaced locator markers.
-    #
-    # This is useful for adjusting or creating new SVG data generators, but should not otherwise need to be called.
-    # @private
-    def grid(width: USPSFlags::Config::BASE_FLY, height: USPSFlags::Config::BASE_HOIST)
-      <<~SVG
-        <circle cx="0" cy="0" r="#{width/60}" fill="#000000" fill-opacity="0.4" />
-        <circle cx="#{width}" cy="0" r="#{width/60}" fill="#000000" fill-opacity="0.4" />
-        <circle cx="#{width}" cy="#{height}" r="#{width/60}" fill="#000000" fill-opacity="0.4" />
-        <circle cx="0" cy="#{height}" r="#{width/60}" fill="#000000" fill-opacity="0.4" />
-
-        <circle cx="#{width*1/4}" cy="#{height/2}" r="#{width/60}" fill="#999999" fill-opacity="0.4" />
-        <circle cx="#{width*3/4}" cy="#{height/2}" r="#{width/60}" fill="#999999" fill-opacity="0.4" />
-
-        <circle cx="#{width/2}" cy="#{height*1/4}" r="#{width/60}"  fill="#999999" fill-opacity="0.4" />
-        <circle cx="#{width/2}" cy="#{height/2}" r="#{width/60}"  fill="#000000" fill-opacity="0.4" />
-        <circle cx="#{width/2}" cy="#{height/2}" r="#{width/75}"  fill="#CCCCCC" fill-opacity="0.4" />
-        <circle cx="#{width/2}" cy="#{height/2}" r="#{width/100}" fill="#000000" fill-opacity="0.4" />
-        <circle cx="#{width/2}" cy="#{height*3/4}" r="#{width/60}"  fill="#999999" fill-opacity="0.4" />
-
-        <line x1="0" y1="0" x2="#{width}" y2="0" stroke="#333333" stroke-width="#{width/600}" stroke-opacity="0.5" />
-        <line x1="0" y1="#{height*1/4}" x2="#{width}" y2="#{height*1/4}" stroke="#333333" stroke-width="#{width/600}" stroke-opacity="0.5" />
-        <line x1="0" y1="#{height/2}" x2="#{width}" y2="#{height/2}" stroke="#333333" stroke-width="#{width/600}" stroke-opacity="0.5" />
-        <line x1="0" y1="#{height*3/4}" x2="#{width}" y2="#{height*3/4}" stroke="#333333" stroke-width="#{width/600}" stroke-opacity="0.5" />
-        <line x1="0" y1="#{height}" x2="#{width}" y2="#{height}" stroke="#333333" stroke-width="#{width/600}" stroke-opacity="0.5" />
-
-        <line y1="0" x1="0" y2="#{height}" x2="0" stroke="#333333" stroke-width="#{width/600}" stroke-opacity="0.5" />
-        <line y1="0" x1="#{width*1/6}" y2="#{height}" x2="#{width*1/6}" stroke="#333333" stroke-width="#{width/600}" stroke-opacity="0.5" />
-        <line y1="0" x1="#{width*2/6}" y2="#{height}" x2="#{width*2/6}" stroke="#333333" stroke-width="#{width/600}" stroke-opacity="0.5" />
-        <line y1="0" x1="#{width*3/6}" y2="#{height}" x2="#{width*3/6}" stroke="#333333" stroke-width="#{width/600}" stroke-opacity="0.5" />
-        <line y1="0" x1="#{width*4/6}" y2="#{height}" x2="#{width*4/6}" stroke="#333333" stroke-width="#{width/600}" stroke-opacity="0.5" />
-        <line y1="0" x1="#{width*5/6}" y2="#{height}" x2="#{width*5/6}" stroke="#333333" stroke-width="#{width/600}" stroke-opacity="0.5" />
-        <line y1="0" x1="#{width}" y2="#{height}" x2="#{width}" stroke="#333333" stroke-width="#{width/600}" stroke-opacity="0.5" />
-
-        <line x1="#{width/2}" y1="#{height*1/4}" x2="#{width*3/4}" y2="#{height/2}" stroke="#999999" stroke-width="#{width/600}" stroke-opacity="0.5" />
-        <line x1="#{width*3/4}" y1="#{height/2}" x2="#{width/2}" y2="#{height*3/4}" stroke="#999999" stroke-width="#{width/600}" stroke-opacity="0.5" />
-        <line x1="#{width/2}" y1="#{height*3/4}" x2="#{width*1/4}" y2="#{height/2}" stroke="#999999" stroke-width="#{width/600}" stroke-opacity="0.5" />
-        <line x1="#{width*1/4}" y1="#{height/2}" x2="#{width/2}" y2="#{height*1/4}" stroke="#999999" stroke-width="#{width/600}" stroke-opacity="0.5" />
-
-      SVG
-    end
-
-    # Displays an overlay indicator of concentric circles and radiating lines.
-    #
-    # This is useful for adjusting or creating new SVG data generators, but should not otherwise need to be called.
-    # @private
-    def locator
-      <<~SVG
-        <circle cx="0" cy="0" r="#{USPSFlags::Config::BASE_FLY*2}" fill="#000000" fill-opacity="0.4" />
-        <circle cx="0" cy="0" r="#{USPSFlags::Config::BASE_FLY}" fill="#333333" fill-opacity="0.4" />
-        <circle cx="0" cy="0" r="#{USPSFlags::Config::BASE_FLY/2}" fill="#666666" fill-opacity="0.4" />
-        <circle cx="0" cy="0" r="#{USPSFlags::Config::BASE_FLY/4}" fill="#999999" fill-opacity="0.4" />
-        <circle cx="0" cy="0" r="#{USPSFlags::Config::BASE_FLY/8}" fill="#CCCCCC" fill-opacity="0.4" />
-        <circle cx="0" cy="0" r="#{USPSFlags::Config::BASE_FLY/16}" fill="#FFFFFF" fill-opacity="0.4" />
-
-        <line x1="-#{USPSFlags::Config::BASE_FLY}" y1="-#{USPSFlags::Config::BASE_HOIST}" x2="#{USPSFlags::Config::BASE_FLY}" y2="#{USPSFlags::Config::BASE_HOIST}"  stroke="#FFFFFF" stroke-width="#{USPSFlags::Config::BASE_FLY/600}" />
-        <line x1="-#{USPSFlags::Config::BASE_FLY}" y1="#{USPSFlags::Config::BASE_HOIST}" x2="#{USPSFlags::Config::BASE_FLY}" y2="-#{USPSFlags::Config::BASE_HOIST}" stroke="#FFFFFF" stroke-width="#{USPSFlags::Config::BASE_FLY/600}" />
-        <line x1="0" y1="#{USPSFlags::Config::BASE_HOIST}" x2="0" y2="-#{USPSFlags::Config::BASE_HOIST}" stroke="#FFFFFF" stroke-width="#{USPSFlags::Config::BASE_FLY/600}" />
-        <line x1="-#{USPSFlags::Config::BASE_FLY}" y1="0" x2="#{USPSFlags::Config::BASE_FLY}" y2="0" stroke="#FFFFFF" stroke-width="#{USPSFlags::Config::BASE_FLY/600}" />
-
-        <rect x="0" y="0" width="#{USPSFlags::Config::BASE_FLY/30}" height="#{USPSFlags::Config::BASE_FLY/30}" fill="#333333" fill-opacity="0.6" />
-      SVG
-    end
-
-    # Creates a vertical arrow for the trident spec sheet.
-    #
-    # This is used USPSFlags::Core.trident_spec, and should never need to be called directly.
-    # @private
-    def v_arrow(x, top, bottom, pointer_top = nil, pointer_bottom = nil, label: nil, label_offset: (USPSFlags::Config::BASE_FLY/120), label_offset_y: 0, label_align: "left", color: "#CCCCCC", stroke_width: (USPSFlags::Config::BASE_FLY/600), stroke_dash: "10, 10", font_size: (USPSFlags::Config::BASE_FLY/60), arrow_size: (USPSFlags::Config::BASE_FLY/120), fly: USPSFlags::Config::BASE_FLY, unit: nil)
-      label = bottom - top if label.nil?
-      label = label.to_i if label - label.to_i == 0
-      label = Rational(label) * fly / USPSFlags::Config::BASE_FLY
-      if label == label.to_i
-        label = label.to_i
-        label_fraction = ""
-      else
-        label, label_fraction = label.to_simplified_a
-      end
-      svg = ""
-      unless pointer_top.nil?
-        svg << <<~SVG
-          <line x1="#{x}" y1="#{top}" x2="#{pointer_top}" y2="#{top}" stroke="#{color}" stroke-width="#{stroke_width}" stroke-dasharray="#{stroke_dash}" />
-        SVG
-      end
-      unless pointer_bottom.nil?
-        svg << <<~SVG
-          <line x1="#{x}" y1="#{bottom}" x2="#{pointer_bottom}" y2="#{bottom}" stroke="#{color}" stroke-width="#{stroke_width}" stroke-dasharray="#{stroke_dash}" />
-        SVG
-      end
-
-      svg << <<~SVG
-        <path d="M#{x} #{top} l #{arrow_size} #{arrow_size} M#{x} #{top} l -#{arrow_size} #{arrow_size} M#{x} #{top} l 0 #{bottom - top} l #{arrow_size} -#{arrow_size} M#{x} #{bottom} l -#{arrow_size} -#{arrow_size}" stroke="#{color}" stroke-width="#{stroke_width}" fill="none" />
-        <g>
-          <style><![CDATA[tspan{font-size: #{USPSFlags::Config::FRACTION_SCALE}%;}]]></style>
-          <text x="#{x + label_offset}" y="#{(top+bottom)/2+(USPSFlags::Config::BASE_HOIST/150)+label_offset_y}" font-family="sans-serif" font-size="#{font_size}px" fill="#041E42" text-anchor="#{label_align}">#{label} <tspan>#{label_fraction}</tspan> #{unit}</text>
-        </g>
-      SVG
-
-      svg
-    end
-
-    # Creates a horizontal arrow for the trident spec sheet.
-    #
-    # This is used USPSFlags::Core.trident_spec, and should never need to be called directly.
-    # @private
-    def h_arrow(y, left, right, pointer_left = nil, pointer_right = nil, label: nil, label_offset: (USPSFlags::Config::BASE_FLY/45), label_offset_x: 0, label_align: "middle", color: "#CCCCCC", stroke_width: (USPSFlags::Config::BASE_FLY/600), stroke_dash: "10, 10", font_size: (USPSFlags::Config::BASE_FLY/60), arrow_size: (USPSFlags::Config::BASE_FLY/120), fly: USPSFlags::Config::BASE_FLY, unit: nil)
-      label = right - left if label.nil?
-      label = label.to_i if label - label.to_i == 0
-      label = Rational(label) * fly / USPSFlags::Config::BASE_FLY
-      if label == label.to_i
-        label = label.to_i
-        label_fraction = ""
-      else
-        label, label_fraction = label.to_simplified_a
-      end
-      svg = ""
-      unless pointer_left.nil?
-        svg << <<~SVG
-          <line x1="#{left}" y1="#{y}" x2="#{left}" y2="#{pointer_left}" stroke="#{color}" stroke-width="#{stroke_width}" stroke-dasharray="#{stroke_dash}" />
-        SVG
-      end
-      unless pointer_right.nil?
-        svg << <<~SVG
-          <line x1="#{right}" y1="#{y}" x2="#{right}" y2="#{pointer_right}" stroke="#{color}" stroke-width="#{stroke_width}" stroke-dasharray="#{stroke_dash}" />
-        SVG
-      end
-
-      svg << <<~SVG
-        <path d="M#{left} #{y} l #{arrow_size} #{arrow_size} M#{left} #{y} l #{arrow_size} -#{arrow_size} M#{left} #{y} l #{right - left} 0 l -#{arrow_size} -#{arrow_size} M#{right} #{y} l -#{arrow_size} #{arrow_size}" stroke="#{color}" stroke-width="#{stroke_width}" fill="none" />
-        <g>
-          <style><![CDATA[tspan{font-size: #{USPSFlags::Config::FRACTION_SCALE}%;}]]></style>
-          <text x="#{(left+right)/2+label_offset_x}" y="#{y + label_offset}" font-family="sans-serif" font-size="#{font_size}px" fill="#041E42" text-anchor="#{label_align}">#{label} <tspan>#{label_fraction}</tspan> #{unit}</text>
-        </g>
-      SVG
-
-      svg
-    end
-
     # Resizes and saves a PNG image.
     #
     # This is used USPSFlags::Generate, and should never need to be called directly.
@@ -279,6 +149,21 @@ class USPSFlags::Helpers
       log_file.close if log_file.is_a?(File)
     end
 
+    # Prints output to the console or saves to a file, then returns the generated data.
+    #
+    # This should never need to be called directly.
+    # @private
+    def output(svg, outfile: nil)
+      if outfile.nil?
+        puts svg, "\n"
+      elsif outfile != ""
+        f = ::File.new(outfile, "w+")
+        f.write(svg)
+        f.close
+      end
+      svg
+    end
+
     private
     def flag_style(rank)
       if valid_flags(:past).include?(rank)
@@ -329,15 +214,7 @@ class USPSFlags::Helpers
     end
 
     def flag_type(rank)
-      if valid_flags(:squadron).include?(rank)
-        :s
-      elsif valid_flags(:district).include?(rank)
-        :d
-      elsif rank == "STFC"
-        :stf
-      elsif valid_flags(:national).include?(rank)
-        :n
-      elsif rank == "PORTCAP"
+      if rank == "PORTCAP"
         :pc
       elsif rank == "FLEETCAP"
         :fc
@@ -351,6 +228,14 @@ class USPSFlags::Helpers
         :f
       elsif rank == "NFLT"
         :f
+      elsif rank == "STFC"
+        :stf
+      elsif valid_flags(:squadron).include?(rank)
+        :s
+      elsif valid_flags(:district).include?(rank)
+        :d
+      elsif valid_flags(:national).include?(rank)
+        :n
       end
     end
   end

data/lib/usps_flags.rb

@@ -14,10 +14,20 @@ class USPSFlags
   require 'usps_flags/generate'
 
   # Dir['./lib/usps_flags/core/**'].map { |d| d.split("/").last.split(".rb").first }
-  %w[anchor binoculars ensign field footer headers lighthouse pennant star trident trident_spec trumpet us wheel].each do |d|
+  %w[anchor binoculars ensign field footer headers lighthouse pennant star trident tridents trident_spec trumpet us wheel].each do |d|
     require "usps_flags/core/#{d}"
   end
 
+  # Dir['./lib/usps_flags/generate/**'].map { |d| d.split("/").last.split(".rb").first }
+  %w[flag].each do |d|
+    require "usps_flags/generate/#{d}"
+  end
+
+  # Dir['./lib/usps_flags/helpers/**'].map { |d| d.split("/").last.split(".rb").first }
+  %w[builders spec_arrows].each do |d|
+    require "usps_flags/helpers/#{d}"
+  end
+
   # Constructor for individual flags.
   #
   # @example Generate insignia at default scale for Lt/C
@@ -126,7 +136,7 @@ class USPSFlags
   #
   # @return [String] Returns the SVG file output path, or the svg data if no path was specified.
   def svg
-    svg = USPSFlags::Generate.get(self.type, outfile: self.svg_file, scale: self.scale, field: self.field)
+    svg = USPSFlags::Generate.svg(self.type, outfile: self.svg_file, scale: self.scale, field: self.field)
     (self.svg_file.nil? || self.svg_file == "") ? svg : self.svg_file
   end
 

data/spec/usps_flags/generate_spec.rb

@@ -2,11 +2,13 @@ require 'spec_helper'
 
 describe USPSFlags::Generate do
   it "should generate a flag with the correct size" do
-    expect(USPSFlags::Generate.get("LtC", outfile: "")).to include("width=\"1024pt\" height=\"682pt\" viewBox=\"0 0 3072 2048\"")
+    expect(USPSFlags::Generate.svg("LtC", outfile: "")).to include(
+      "width=\"1024pt\" height=\"682pt\" viewBox=\"0 0 3072 2048\""
+    )
   end
 
   it "should generate a flag with the correct field" do
-    expect(USPSFlags::Generate.get("LtC", outfile: "")).to include(
+    expect(USPSFlags::Generate.svg("LtC", outfile: "")).to include(
       <<~SVG
         <path d="M 0 0
           l 3072 0
@@ -19,11 +21,41 @@ describe USPSFlags::Generate do
   end
 
   it "should generate a flag with the correct starting position" do
-    expect(USPSFlags::Generate.get("LtC", outfile: "")).to include("<path d=\"M 1536 512")
+    expect(USPSFlags::Generate.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.get("LtC", outfile: "")).to include("<g transform=\"translate(-512)\">")
-    expect(USPSFlags::Generate.get("LtC", outfile: "")).to include("<g transform=\"translate(512)\">")
+    expect(USPSFlags::Generate.svg("LtC", outfile: "")).to include("<g transform=\"translate(-512)\">")
+    expect(USPSFlags::Generate.svg("LtC", outfile: "")).to include("<g transform=\"translate(512)\">")
+  end
+
+  describe "special flags" do
+    it "should generate PortCap" do
+      expect(USPSFlags::Generate.svg("PortCap", outfile: "")).to include("<title>PORTCAP</title>")
+    end
+
+    it "should generate FleetCap" do
+      expect(USPSFlags::Generate.svg("FleetCap", outfile: "")).to include("<title>FLEETCAP</title>")
+    end
+
+    it "should generate DAide" do
+      expect(USPSFlags::Generate.svg("DAide", outfile: "")).to include("<title>DAIDE</title>")
+    end
+
+    it "should generate NAide" do
+      expect(USPSFlags::Generate.svg("NAide", outfile: "")).to include("<title>NAIDE</title>")
+    end
+
+    it "should generate FLt" do
+      expect(USPSFlags::Generate.svg("FLt", outfile: "")).to include("<title>FLT</title>")
+    end
+
+    it "should generate DFLt" do
+      expect(USPSFlags::Generate.svg("DFLt", outfile: "")).to include("<title>DFLT</title>")
+    end
+
+    it "should generate NFLt" do
+      expect(USPSFlags::Generate.svg("NFLt", outfile: "")).to include("<title>NFLT</title>")
+    end
   end
 end

data/spec/usps_flags/helpers_spec.rb

@@ -7,7 +7,10 @@ describe USPSFlags::Helpers do
     end
 
     it "should return all officer flags but nothing else when given type :officer" do
-      expect(USPSFlags::Helpers.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].sort)
+      expect(USPSFlags::Helpers.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
+      ].sort)
     end
   end
 end

data/spec/usps_flags_spec.rb

@@ -1,6 +1,94 @@
 require 'spec_helper'
 
 describe USPSFlags do
+  before(:all) 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="614pt" height="409pt" viewBox="0 0 3072 2048" preserveAspectRatio="xMidYMid meet">
+      <title>LTC</title>
+      <metadata>
+      <desc id="created-by">Julian Fiander</desc>
+    SVG
+
+    @valid_body = <<~SVG
+      <desc id="trademark-desc">This image is a registered trademark of United States Power Squadrons.</desc>
+      <desc id="trademark-link">http://www.usps.org/national/itcom/trademark.html</desc>
+      </metadata>
+      <g transform="translate(-512)">
+      <path d="M 1536 512
+      l 80 136
+      l -40 -8
+      l 0 896
+      l -80 0
+      l 0 -896
+      l -40 8
+      l 80 -136
+      " fill="#BF0D3E" />
+      <path d="M 1296 1024
+      l 480 0
+      l 0 80
+      l -480 0
+      l 0 -80
+      " fill="#BF0D3E" />
+      <path d="M 1296 1025
+      l 0 -432
+      l 120 136
+      l -40 0
+      l 0 296
+      " fill="#BF0D3E" />
+      <path d="M 1776 1025
+      l 0 -432
+      l -120 136
+      l 40 0
+      l 0 296
+      " fill="#BF0D3E" />
+      <path d="M 1392 1184
+      l 288 0
+      l 0 80
+      l -288 0
+      l 0 -80
+      " fill="#BF0D3E" />
+      </g>
+      <g transform="translate(512)">
+      <path d="M 1536 512
+      l 80 136
+      l -40 -8
+      l 0 896
+      l -80 0
+      l 0 -896
+      l -40 8
+      l 80 -136
+      " fill="#BF0D3E" />
+      <path d="M 1296 1024
+      l 480 0
+      l 0 80
+      l -480 0
+      l 0 -80
+      " fill="#BF0D3E" />
+      <path d="M 1296 1025
+      l 0 -432
+      l 120 136
+      l -40 0
+      l 0 296
+      " fill="#BF0D3E" />
+      <path d="M 1776 1025
+      l 0 -432
+      l -120 136
+      l 40 0
+      l 0 296
+      " fill="#BF0D3E" />
+      <path d="M 1392 1184
+      l 288 0
+      l 0 80
+      l -288 0
+      l 0 -80
+      " fill="#BF0D3E" />
+      </g>
+      </svg>
+    SVG
+  end
+
   before(:each) do
     @flag = USPSFlags.new
   end
@@ -36,134 +124,21 @@ describe USPSFlags do
       expect(@flag.png_file).to eql("/path/to/png/output.png")
     end
 
-    it "should construct and generate a flag" do
-      @flag.type "Cdr"
-      @flag.scale 5
-      @flag.svg_file ""
-
-      svg = @flag.svg
+    describe "as configured" do
+      before(:each) do
+        @flag.type "LtC"
+        @flag.scale 5
+        @flag.svg_file ""
+        @flag.svg
+      end
 
-      expect(svg).to include(
-        <<~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="614pt" height="409pt" viewBox="0 0 3072 2048" preserveAspectRatio="xMidYMid meet">
-          <title>CDR</title>
-          <metadata>
-          <desc id="created-by">Julian Fiander</desc>
-        SVG
-      )
+      it "should construct and generate a flag with a valid header" do
+        expect(@flag.svg).to include(@valid_header)
+      end
 
-      expect(svg).to include(
-        <<~SVG
-          <desc id="trademark-desc">This image is a registered trademark of United States Power Squadrons.</desc>
-          <desc id="trademark-link">http://www.usps.org/national/itcom/trademark.html</desc>
-          </metadata>
-          <g transform="translate(-768, 192)">
-          <path d="M 1536 512
-          l 80 136
-          l -40 -8
-          l 0 896
-          l -80 0
-          l 0 -896
-          l -40 8
-          l 80 -136
-          " fill="#041E42" />
-          <path d="M 1296 1024
-          l 480 0
-          l 0 80
-          l -480 0
-          l 0 -80
-          " fill="#041E42" />
-          <path d="M 1296 1025
-          l 0 -432
-          l 120 136
-          l -40 0
-          l 0 296
-          " fill="#041E42" />
-          <path d="M 1776 1025
-          l 0 -432
-          l -120 136
-          l 40 0
-          l 0 296
-          " fill="#041E42" />
-          <path d="M 1392 1184
-          l 288 0
-          l 0 80
-          l -288 0
-          l 0 -80
-          " fill="#041E42" />
-          </g><g transform="translate(0, -193)">
-          <path d="M 1536 512
-          l 80 136
-          l -40 -8
-          l 0 896
-          l -80 0
-          l 0 -896
-          l -40 8
-          l 80 -136
-          " fill="#041E42" />
-          <path d="M 1296 1024
-          l 480 0
-          l 0 80
-          l -480 0
-          l 0 -80
-          " fill="#041E42" />
-          <path d="M 1296 1025
-          l 0 -432
-          l 120 136
-          l -40 0
-          l 0 296
-          " fill="#041E42" />
-          <path d="M 1776 1025
-          l 0 -432
-          l -120 136
-          l 40 0
-          l 0 296
-          " fill="#041E42" />
-          <path d="M 1392 1184
-          l 288 0
-          l 0 80
-          l -288 0
-          l 0 -80
-          " fill="#041E42" />
-          </g><g transform="translate(768, 192)">
-          <path d="M 1536 512
-          l 80 136
-          l -40 -8
-          l 0 896
-          l -80 0
-          l 0 -896
-          l -40 8
-          l 80 -136
-          " fill="#041E42" />
-          <path d="M 1296 1024
-          l 480 0
-          l 0 80
-          l -480 0
-          l 0 -80
-          " fill="#041E42" />
-          <path d="M 1296 1025
-          l 0 -432
-          l 120 136
-          l -40 0
-          l 0 296
-          " fill="#041E42" />
-          <path d="M 1776 1025
-          l 0 -432
-          l -120 136
-          l 40 0
-          l 0 296
-          " fill="#041E42" />
-          <path d="M 1392 1184
-          l 288 0
-          l 0 80
-          l -288 0
-          l 0 -80
-          " fill="#041E42" />
-          </g></svg>
-        SVG
-      )
+      it "should construct and generate a flag with a valid body" do
+        expect(@flag.svg).to include(@valid_body)
+      end
     end
   end
 end

data/usps_flags.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name          = 'usps_flags'
-  s.version       = '0.1.26'
-  s.date          = '2017-11-02'
+  s.version       = '0.2.0'
+  s.date          = '2017-11-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'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: usps_flags
 version: !ruby/object:Gem::Version
-  version: 0.1.26
+  version: 0.2.0
 platform: ruby
 authors:
 - Julian Fiander
@@ -30,7 +30,7 @@ cert_chain:
   3YzYAc+kXfD7kkzA2NMvLT6Q1v03qQyIZ8BS8SNk5wLGAdLM+IravFDLEs448fjz
   lEAU0RHLFVbE+CXW6makIlWGHR0=
   -----END CERTIFICATE-----
-date: 2017-11-02 00:00:00.000000000 Z
+date: 2017-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: file_utils
@@ -189,11 +189,15 @@ files:
 - lib/usps_flags/core/star.rb
 - lib/usps_flags/core/trident.rb
 - lib/usps_flags/core/trident_spec.rb
+- lib/usps_flags/core/tridents.rb
 - lib/usps_flags/core/trumpet.rb
 - lib/usps_flags/core/us.rb
 - lib/usps_flags/core/wheel.rb
 - lib/usps_flags/generate.rb
+- lib/usps_flags/generate/flag.rb
 - lib/usps_flags/helpers.rb
+- lib/usps_flags/helpers/builders.rb
+- lib/usps_flags/helpers/spec_arrows.rb
 - spec/rational_spec.rb
 - spec/spec_helper.rb
 - spec/usps_flags/config_spec.rb