usps_flags 0.1.24 → 0.1.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d7be3f498ef55ebeea23f8c4f4e3572143a8a91
-  data.tar.gz: d0a965e161b9d00615b97eeb57b070fcfcab03d3
+  metadata.gz: 143f1a8c230ced0a6083dc05b6f37f95e8069d7a
+  data.tar.gz: 6edb326954eb641bb49db42d949983f93f528d3e
 SHA512:
-  metadata.gz: b63188da58d8a31335b3f39270555f6932da81c57eb1ea4379e21f09f20e518be0aef44aa0d9c25fb65494224b1592554e95806e70f6e59eeb9e7d985bced9fb
-  data.tar.gz: 98197bffb245b5d4662cd203e53228268c5e41a16000da1a1319fdc83d3c36376be0b58acb9b1f67e335cdbe2c0c12b9d6c687bd2bdf4635d6b89e904bd8f62b
+  metadata.gz: 2ac2761bf82c24039358ae4b5eadb66cb7f92f8b5e5624594018ca7916fc969f990d0eed04474e987ea00b24a4e73d739d6ee33ba9a9a38751c4088996da7c1d
+  data.tar.gz: fb7c5156a9a3c07c0e14d87d4776c670099bd16d896eec6d1cf21907da200106de8688238e66dcea3b44b5414573625dbed923b40e541d8efa92170c440bfeba

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    usps_flags (0.1.24)
+    usps_flags (0.1.25)
       file_utils (~> 1.1, >= 1.1.2)
       mini_magick (~> 4.8, >= 4.8.0)
       rubyzip (~> 1.2, >= 1.2.1)

data/lib/usps_flags/generate.rb

@@ -52,19 +52,9 @@ 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 self.all(svg: true, png: true, zips: true, reset: true)
-    if reset
-      ::FileUtils.rm_rf(Dir.glob("#{USPSFlags::Config.flags_dir}/SVG/*"))
-      ::FileUtils.rm_rf(Dir.glob("#{USPSFlags::Config.flags_dir}/PNG/*"))
-      ::FileUtils.rm_rf(Dir.glob("#{USPSFlags::Config.flags_dir}/ZIP/*"))
-      ::FileUtils.mkdir_p("#{USPSFlags::Config.flags_dir}/SVG/insignia")
-      ::FileUtils.mkdir_p("#{USPSFlags::Config.flags_dir}/PNG/insignia")
-      puts "Cleared previous files."
-    end
-
-    flags = USPSFlags::Helpers.valid_flags(:all)
-    insignia_flags = USPSFlags::Helpers.valid_flags(:insignia)
+    self.remove_static_files if reset
 
-    max_length = flags.map(&:length).max
+    max_length = USPSFlags::Helpers.valid_flags(:all).map(&:length).max
     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."
@@ -74,108 +64,8 @@ class USPSFlags::Generate
 
     overall_start_time = Time.now
 
-    flags.each do |flag|
-      start_time = Time.now
-      USPSFlags::Helpers.log " |     |  _ _ _ _ _  |         \r".rjust(max_length+31, " ")
-      flag = flag.upcase
-      USPSFlags::Helpers.log "#{flag.rjust(max_length)} |"
-
-      svg_file = "#{USPSFlags::Config.flags_dir}/SVG/#{flag}.svg"
-      png_file = "#{USPSFlags::Config.flags_dir}/PNG/#{flag}.png"
-
-      svg_ins_file = "#{USPSFlags::Config.flags_dir}/SVG/insignia/#{flag}.svg"
-      png_ins_file = "#{USPSFlags::Config.flags_dir}/PNG/insignia/#{flag}.png"
-
-      past = (flag[0] == "P" && flag != "PORTCAP")
-
-      if svg
-        begin
-          USPSFlags::Helpers.log " "
-          self.get flag, outfile: svg_file, scale: 1
-          USPSFlags::Helpers.log "S"
-          if past || !insignia_flags.include?(flag)
-            USPSFlags::Helpers.log "-"
-          else
-            self.get flag, field: false, outfile: svg_ins_file, scale: 1
-            USPSFlags::Helpers.log "I"
-          end
-        rescue => e
-          USPSFlags::Helpers.log "x -> #{e.message}"
-        end
-      else
-        USPSFlags::Helpers.log "-"
-      end
-
-      if png
-        USPSFlags::Helpers.log "  | "
-        begin
-          USPSFlags::Helpers.log "…\b"
-          USPSFlags::Generate.png(File.read(svg_file), outfile: png_file) unless ::File.exists?(png_file)
-          USPSFlags::Helpers.log "F"
-          if past || !insignia_flags.include?(flag)
-            USPSFlags::Helpers.log "-"
-          else
-            USPSFlags::Helpers.log "…\b"
-            USPSFlags::Generate.png(File.read(svg_ins_file), outfile: png_ins_file, trim: true) unless ::File.exists?(png_ins_file)
-            USPSFlags::Helpers.log "I"
-          end
-          sizes = {1500 => "H", 1000 => "K", 500 => "D", "thumb" => "T"}
-          sizes.keys.each do |size|
-            if ::File.exists?("#{USPSFlags::Config.flags_dir}/PNG/#{flag}.#{size}.png")
-              USPSFlags::Helpers.log "."
-            else
-              USPSFlags::Helpers.log "…\b"
-              if size == "thumb"
-                size_key = size
-                size = case flag
-                when "ENSIGN"
-                  200
-                when "US"
-                  300
-                else
-                  150
-                end
-              else
-                size_key = size
-              end
-              MiniMagick::Tool::Convert.new do |convert|
-                convert << "-background" << "none"
-                convert << "-format" << "png"
-                convert << "-resize" << "#{size}"
-                convert << png_file
-                convert << "#{USPSFlags::Config.flags_dir}/PNG/#{flag}.#{size_key}.png"
-              end
-              USPSFlags::Helpers.log sizes[size_key]
-
-              if ::File.exists?(png_ins_file)
-                if ::File.exists?("#{USPSFlags::Config.flags_dir}/PNG/insignia/#{flag}.#{size}.png")
-                  USPSFlags::Helpers.log "."
-                elsif MiniMagick::Image.open(png_ins_file)[:width] > size
-                  USPSFlags::Helpers.log "…\b"
-                  MiniMagick::Tool::Convert.new do |convert|
-                    convert << "-background" << "none"
-                    convert << "-format" << "png"
-                    convert << "-resize" << "#{size}"
-                    convert << png_ins_file
-                    convert << "#{USPSFlags::Config.flags_dir}/PNG/insignia/#{flag}.#{size_key}.png"
-                  end
-                  USPSFlags::Helpers.log "i"
-                else
-                  USPSFlags::Helpers.log "+"
-                end
-              else
-                USPSFlags::Helpers.log "-"
-              end
-            end
-          end
-        rescue => e
-          USPSFlags::Helpers.log "x -> #{e.message}"
-        end
-      else
-        USPSFlags::Helpers.log "- "
-      end
-      run_time = (Time.now - start_time).round(4).to_s[(0..5)].ljust(6, "0")
-      USPSFlags::Helpers.log " | #{run_time} s\n"
+    USPSFlags::Helpers.valid_flags(:all).each do |flag|
+      self.generate_static_images_for(flag, svg: svg, png: png)
     end
 
     self.zips(svg: svg, png: png) if zips
@@ -241,151 +131,66 @@ class USPSFlags::Generate
   def self.flag(rank: nil, width: USPSFlags::Config::BASE_FLY, outfile: nil, scale: nil, field: true)
     raise "Error: No rank specified." if rank.nil?
     final_svg = ""
-
     final_svg << USPSFlags::Core.headers(scale: scale, title: rank)
 
-    rank.slice!(0) if !field && rank[0].upcase == "P" && rank != "PORTCAP"
+    rank = rank.to_s.upcase
+    rank.slice!(0) if !field && USPSFlags::Helpers.valid_flags(:past).include?(rank)
     rank = "CDR" if rank == "C"
 
-    case rank.upcase
-    when "PLTC"
-      style = :past
-      color = :red
-      type = :s
-      count = 2
-    when "PC"
-      style = :past
-      color = :blue
-      type = :s
-      count = 3
-    when "PORTCAP"
-      style = :swallowtail
-      color = :white
-      type = :pc
-      count = 1
-    when "FLEETCAP"
-      style = :swallowtail
-      color = :white
-      type = :fc
-      count = 1
-    when "LT"
-      style = :swallowtail
-      color = :white
-      type = :s
-      count = 1
-    when "FLT"
-      style = :swallowtail
-      color = :white
-      type = :f
-      count = 1
-    when "1LT"
-      style = :regular
-      color = :white
-      type = :s
-      count = 1
-    when "LTC"
-      style = :regular
-      color = :red
-      type = :s
-      count = 2
-    when "CDR"
-      style = :regular
-      color = :blue
-      type = :s
-      count = 3
+    style = if USPSFlags::Helpers.valid_flags(:past).include?(rank)
+      :past
+    elsif USPSFlags::Helpers.valid_flags(:swallowtail).include?(rank)
+      :swallowtail
+    else
+      :regular
+    end
 
-    when "PDLTC"
-      style = :past
-      color = :red
-      type = :d
-      count = 2
-    when "PDC"
-      style = :past
-      color = :blue
-      type = :d
+    color = if USPSFlags::Helpers.valid_flags(:command).include?(rank)
       count = 3
-    when "DLT"
-      style = :swallowtail
-      color = :white
-      type = :d
-      count = 1
-    when "DAIDE"
-      style = :swallowtail
-      color = :white
-      type = :a
-      count = 1
-    when "DFLT"
-      style = :swallowtail
-      color = :white
-      type = :f
-      count = 2
-    when "D1LT"
-      style = :regular
-      color = :white
-      type = :d
-      count = 1
-    when "DLTC"
-      style = :regular
-      color = :red
-      type = :d
+      :blue
+    elsif USPSFlags::Helpers.valid_flags(:bridge).include?(rank)
       count = 2
-    when "DC"
-      style = :regular
-      color = :blue
-      type = :d
-      count = 3
+      :red
+    else
+      :white
+    end
 
-    when "PSTFC"
-      style = :past
-      color = :white
-      type = :stf
+    trident_color = field ? :white : color
+
+    type = if USPSFlags::Helpers.valid_flags(:squadron).include?(rank)
+      :s
+    elsif USPSFlags::Helpers.valid_flags(:district).include?(rank)
+      :d
+    elsif rank == "STFC"
+      :stf
+    elsif USPSFlags::Helpers.valid_flags(:national).include?(rank)
+      :n
+    elsif rank == "PORTCAP"
+      :pc
+    elsif rank == "FLEETCAP"
+      :fc
+    elsif rank == "DAIDE"
       count = 1
-    when "PRC"
-      style = :past
-      color = :white
-      type = :n
-      count = 1
-    when "PVC"
-      style = :past
-      color = :red
-      type = :n
-      count = 2
-    when "PCC"
-      style = :past
-      color = :blue
-      type = :n
-      count = 3
-    when "NAIDE"
-      style = :swallowtail
-      color = :white
-      type = :a
+      level = :d
+      :a
+    elsif rank == "NAIDE"
       count = 2
-    when "NFLT"
-      style = :swallowtail
-      color = :white
-      type = :f
-      count = 3
-    when "STFC"
-      style = :regular
-      color = :white
-      type = :stf
+      level = :n
+      :a
+    elsif rank == "FLT"
       count = 1
-    when "RC"
-      style = :regular
-      color = :white
-      type = :n
-      count = 1
-    when "VC"
-      style = :regular
-      color = :red
-      type = :n
+      level = :s
+      :f
+    elsif rank == "DFLT"
       count = 2
-    when "CC"
-      style = :regular
-      color = :blue
-      type = :n
+      level = :d
+      :f
+    elsif rank == "NFLT"
       count = 3
+      level = :n
+      :f
     end
+    count ||= 1
 
     final_svg << USPSFlags::Core.field(style: style, color: color) if field
 
@@ -393,7 +198,7 @@ class USPSFlags::Generate
 
     if type == :n && count == 3
       # 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: (field ? :white : :blue))
+      trident = USPSFlags::Core.trident(type, color: trident_color)
       x_distance = USPSFlags::Config::BASE_FLY*4/39
       y_distance = USPSFlags::Config::BASE_FLY*5/78
       final_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>"
@@ -401,13 +206,13 @@ class USPSFlags::Generate
       final_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>"
     elsif type == :n && count == 2
       # V/C tridents are angled 45 degrees, and intersect at 15/32 up from the bottom
-      trident = USPSFlags::Core.trident(type, color: (field ? :white : :red))
+      trident = USPSFlags::Core.trident(type, color: trident_color)
       x_distance = USPSFlags::Config::BASE_FLY*4/55
       final_svg << "<g transform=\"translate(-#{x_distance})\"><g transform=\"rotate(-45, #{USPSFlags::Config::BASE_FLY/2}, #{USPSFlags::Config::BASE_HOIST/2})\">\n#{trident}</g></g>"
       final_svg << "<g transform=\"translate(#{x_distance})\"><g transform=\"rotate(45, #{USPSFlags::Config::BASE_FLY/2}, #{USPSFlags::Config::BASE_HOIST/2})\">\n#{trident}</g></g>"
     elsif [:s, :d].include?(type) && count == 3
       # 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: (field ? :white : :blue), field_color: color)
+      trident = USPSFlags::Core.trident(type, color: trident_color, field_color: color)
       x_distance = USPSFlags::Config::BASE_FLY/4
       y_distance = USPSFlags::Config::BASE_FLY/16
       final_svg << "<g transform=\"translate(-#{x_distance}, #{y_distance})\">\n#{trident}</g>"
@@ -415,7 +220,7 @@ class USPSFlags::Generate
       final_svg << "<g transform=\"translate(#{x_distance}, #{y_distance})\">\n#{trident}</g>"
     elsif [:s, :d].include?(type) && count == 2
       # Lt/C and D/Lt/C tridents are spaced 1/3 the fly apart
-      trident = USPSFlags::Core.trident(type, color: (field ? :white : :red), field_color: color)
+      trident = USPSFlags::Core.trident(type, color: trident_color, field_color: color)
       x_distance = USPSFlags::Config::BASE_FLY/6
       final_svg << "<g transform=\"translate(-#{x_distance})\">\n#{trident}</g>"
       final_svg << "<g transform=\"translate(#{x_distance})\">\n#{trident}</g>"
@@ -437,22 +242,8 @@ class USPSFlags::Generate
       final_svg << "<g transform=\"scale(#{Rational(USPSFlags::Config::BASE_FLY/3000).to_f})\">"
       case type
       when :a
-        level = case count
-        when 1
-          :d
-        when 2
-          :n
-        end
         final_svg << USPSFlags::Core.binoculars(level)
       when :f
-        level = case count
-        when 1
-          :s
-        when 2
-          :d
-        when 3
-          :n
-        end
         final_svg << USPSFlags::Core.trumpet(level)
       when :fc
         final_svg << USPSFlags::Core.anchor
@@ -552,4 +343,126 @@ class USPSFlags::Generate
     end
     final_svg
   end
+
+  private
+  def self.remove_static_files
+    ::FileUtils.rm_rf(Dir.glob("#{USPSFlags::Config.flags_dir}/SVG/*"))
+    ::FileUtils.rm_rf(Dir.glob("#{USPSFlags::Config.flags_dir}/PNG/*"))
+    ::FileUtils.rm_rf(Dir.glob("#{USPSFlags::Config.flags_dir}/ZIP/*"))
+    ::FileUtils.mkdir_p("#{USPSFlags::Config.flags_dir}/SVG/insignia")
+    ::FileUtils.mkdir_p("#{USPSFlags::Config.flags_dir}/PNG/insignia")
+    puts "Cleared previous files."
+  end
+
+  def self.generate_static_images_for(flag, svg: true, png: true)
+    start_time = Time.now
+    USPSFlags::Helpers.log " |     |  _ _ _ _ _  |         \r".rjust(max_length+31, " ")
+    flag = flag.upcase
+    USPSFlags::Helpers.log "#{flag.rjust(max_length)} |"
+
+    svg_file = "#{USPSFlags::Config.flags_dir}/SVG/#{flag}.svg"
+    png_file = "#{USPSFlags::Config.flags_dir}/PNG/#{flag}.png"
+
+    svg_ins_file = "#{USPSFlags::Config.flags_dir}/SVG/insignia/#{flag}.svg"
+    png_ins_file = "#{USPSFlags::Config.flags_dir}/PNG/insignia/#{flag}.png"
+
+    past = (flag[0] == "P" && flag != "PORTCAP")
+
+    if svg
+      self.generate_static_svg(flag, svg_file)
+    else
+      USPSFlags::Helpers.log "-"
+    end
+
+    if png
+      self.generate_static_png(flag, png_file)
+    else
+      USPSFlags::Helpers.log "- "
+    end
+    run_time = (Time.now - start_time).round(4).to_s[(0..5)].ljust(6, "0")
+    USPSFlags::Helpers.log " | #{run_time} s\n"
+  end
+
+  def self.generate_static_svg(flag, svg_file)
+    begin
+      USPSFlags::Helpers.log " "
+      self.get flag, outfile: svg_file, scale: 1
+      USPSFlags::Helpers.log "S"
+      if past || !USPSFlags::Helpers.valid_flags(:insignia).include?(flag)
+        USPSFlags::Helpers.log "-"
+      else
+        self.get flag, field: false, outfile: svg_ins_file, scale: 1
+        USPSFlags::Helpers.log "I"
+      end
+    rescue => e
+      USPSFlags::Helpers.log "x -> #{e.message}"
+    end
+  end
+
+  def self.generate_static_png(flag, png_file)
+    USPSFlags::Helpers.log "  | "
+    begin
+      USPSFlags::Helpers.log "…\b"
+      USPSFlags::Generate.png(File.read(svg_file), outfile: png_file) unless ::File.exists?(png_file)
+      USPSFlags::Helpers.log "F"
+      if past || !insignia_flags.include?(flag)
+        USPSFlags::Helpers.log "-"
+      else
+        USPSFlags::Helpers.log "…\b"
+        USPSFlags::Generate.png(File.read(svg_ins_file), outfile: png_ins_file, trim: true) unless ::File.exists?(png_ins_file)
+        USPSFlags::Helpers.log "I"
+      end
+      sizes = {1500 => "H", 1000 => "K", 500 => "D", "thumb" => "T"}
+      sizes.keys.each do |size|
+        if ::File.exists?("#{USPSFlags::Config.flags_dir}/PNG/#{flag}.#{size}.png")
+          USPSFlags::Helpers.log "."
+        else
+          USPSFlags::Helpers.log "…\b"
+          if size == "thumb"
+            size_key = size
+            size = case flag
+            when "ENSIGN"
+              200
+            when "US"
+              300
+            else
+              150
+            end
+          else
+            size_key = size
+          end
+          MiniMagick::Tool::Convert.new do |convert|
+            convert << "-background" << "none"
+            convert << "-format" << "png"
+            convert << "-resize" << "#{size}"
+            convert << png_file
+            convert << "#{USPSFlags::Config.flags_dir}/PNG/#{flag}.#{size_key}.png"
+          end
+          USPSFlags::Helpers.log sizes[size_key]
+
+          if ::File.exists?(png_ins_file)
+            if ::File.exists?("#{USPSFlags::Config.flags_dir}/PNG/insignia/#{flag}.#{size}.png")
+              USPSFlags::Helpers.log "."
+            elsif MiniMagick::Image.open(png_ins_file)[:width] > size
+              USPSFlags::Helpers.log "…\b"
+              MiniMagick::Tool::Convert.new do |convert|
+                convert << "-background" << "none"
+                convert << "-format" << "png"
+                convert << "-resize" << "#{size}"
+                convert << png_ins_file
+                convert << "#{USPSFlags::Config.flags_dir}/PNG/insignia/#{flag}.#{size_key}.png"
+              end
+              USPSFlags::Helpers.log "i"
+            else
+              USPSFlags::Helpers.log "+"
+            end
+          else
+            USPSFlags::Helpers.log "-"
+          end
+        end
+      end
+    rescue => e
+      USPSFlags::Helpers.log "x -> #{e.message}"
+    end
+  end
 end

data/lib/usps_flags/helpers.rb

@@ -13,34 +13,49 @@ class USPSFlags::Helpers
   # @option type [Symbol] :us US flag
   # @return [Array] Valid options for flag generation (based on the provided type).
   def self.valid_flags(type = :all)
-    squadron = %w[
+    squadron_past = %w[
       PLTC
       PC
+    ]
+
+    squadron_elected = %w[
+      1LT
+      LTC
+      CDR
+    ]
+
+    squadron_swallowtail = %w[
       PORTCAP
       FLEETCAP
       LT
       FLT
-      1LT
-      LTC
-      CDR
     ]
 
-    district = %w[
+    district_past = %w[
       PDLTC
       PDC
-      DLT
-      DAIDE
-      DFLT
+    ]
+
+    district_elected = %w[
       D1LT
       DLTC
       DC
     ]
 
-    national = %w[
+    district_swallowtail = %w[
+      DLT
+      DAIDE
+      DFLT
+    ]
+
+    national_past = %w[
       PSTFC
       PRC
       PVC
       PCC
+    ]
+
+    national_elected = %w[
       NAIDE
       NFLT
       STFC
@@ -49,17 +64,6 @@ class USPSFlags::Helpers
       CC
     ]
 
-    past = %w[
-      PLTC
-      PC
-      PDLTC
-      PDC
-      PSTFC
-      PRC
-      PVC
-      PCC
-    ]
-
     special = %w[
       CRUISE
       OIC
@@ -71,6 +75,11 @@ class USPSFlags::Helpers
       US
     ]
 
+    squadron = squadron_past + squadron_elected + squadron_swallowtail
+    district = district_past + district_elected + district_swallowtail
+    national = national_past + national_elected
+    past = squadron_past + district_past + national_past
+
     case type
     when :all
       squadron + district + national + special + us
@@ -88,6 +97,18 @@ class USPSFlags::Helpers
       special
     when :us
       us
+    when :past
+      past
+    when :swallowtail
+      past + squadron_swallowtail + district_swallowtail
+    when :bridge
+      squadron_elected.last(2) + squadron_past.last(2) + 
+      district_elected.last(2) + district_past.last(2) + 
+      national_elected.last(2) + national_past.last(2)
+    when :command
+      [squadron_elected.last, squadron_past.last,
+      district_elected.last, district_past.last,
+      national_elected.last, national_past.last]
     end
   end
 

data/spec/spec_helper.rb

@@ -3,14 +3,7 @@ Coveralls.wear!
 require 'bundler/setup'
 Bundler.setup
 
-require 'usps_flags' # Contains direct SVG matching
-# require 'fileutils'
-# require 'zip'
-# require 'mini_magick'
-require 'usps_flags/config'
-require 'usps_flags/helpers'
-require 'usps_flags/core' # Contains direct SVG matching
-require 'usps_flags/generate'
+require 'usps_flags'
 
 RSpec.configure do |config|
   # some (optional) config here

data/spec/usps_flags/generate_spec.rb

@@ -1,8 +1,11 @@
 require 'spec_helper'
 
 describe USPSFlags::Generate do
-  it "should get the correct flag" 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\"")
+  end
+
+  it "should generate a flag with the correct field" do
     expect(USPSFlags::Generate.get("LtC", outfile: "")).to include(
       <<~SVG
         <path d="M 0 0
@@ -13,7 +16,13 @@ describe USPSFlags::Generate do
         " fill="#BF0D3E" />
       SVG
     )
+  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")
+  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)\">")
   end

data/spec/usps_flags/helpers_spec.rb

@@ -7,7 +7,7 @@ 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)).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])
+      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/usps_flags.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = 'usps_flags'
-  s.version       = '0.1.24'
+  s.version       = '0.1.25'
   s.date          = '2017-10-31'
   s.summary       = 'Flag generator for United States Power Squadrons'
   s.description   = 'A flag image (PNG, SVG) generator for United States Power Squadrons.'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: usps_flags
 version: !ruby/object:Gem::Version
-  version: 0.1.24
+  version: 0.1.25
 platform: ruby
 authors:
 - Julian Fiander