usps_flags 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f005b5e851564f4b8496aa3489b678a47c8cf9f
-  data.tar.gz: a5f44daaac686d24673233b5f503fa3d3685eeb7
+  metadata.gz: 110a91c58d80cd70fd0afbf419ab79d11725cfb0
+  data.tar.gz: 7d1b828211cd366543c74afab5dd649cee0168ca
 SHA512:
-  metadata.gz: 8e3831a3046a633600d8388727461f160704229690fe4ec57ae747933c60059e09bdf3b950d1cfd4dbe6548814e8848a5d6e1fe0430b678e09b9b44f67c5ef15
-  data.tar.gz: 0f9387270b6fae9bc37a6a40961d75eb520f99e81dae1748f71dbeda3503d176a829c2efb14fc8a70350fad32568e5a7c9963af2774d27bcf6a8b254b69d9bbe
+  metadata.gz: bb1fc483ab32514e973fb070f57d538ccfbfb5a35ad6865d895563c1dfdf2bbf0825078ccc4f40c2ed577b3e18070f04a27d54f0bdca9009722a385b4882617f
+  data.tar.gz: '0283ab2c942b70f56848ad0fc78755b7196a6e964e297cdf28ba877e0ce0c76d67c1ce9b9fb5678dd0053e81c9022fb7283552ce493217de24d70b60f7eef41e'

data/Gemfile.lock

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

data/lib/usps_flags/core/trident_spec.rb

@@ -32,7 +32,7 @@ class USPSFlags::Core::TridentSpec
 
   private
   def configure_sizes(fly)
-    @fly = fly
+    @fly = Rational(fly)
     get_hoist_from_fly(@fly)
     configure_hoist_fraction
     configure_fly_fraction
@@ -119,26 +119,26 @@ class USPSFlags::Core::TridentSpec
         <rect x="#{box_left}" y="#{box_top}" width="#{box_right-box_left}" height="#{USPSFlags::Config::BASE_HOIST/2}" stroke="#666666" stroke-width="#{USPSFlags::Config::BASE_FLY/600}" stroke-dasharray="15, 15" fill="none" />
 
         <!-- Right -->
-          #{USPSFlags::Helpers::SpecArrows.vertical(box_right+@trident_config[:bar_width], box_top, box_top+@trident_config[:bar_width], box_right, box_right)} <!-- Side spike top gap -->
-          #{USPSFlags::Helpers::SpecArrows.vertical(box_right+@trident_config[:bar_width], box_top+@trident_config[:bar_width], box_top+@trident_config[:bar_width]*2+@trident_config[:point_height]+@trident_config[:side_spike_height], nil, box_right)} <!-- Top gap to hash gap -->
-          #{USPSFlags::Helpers::SpecArrows.vertical(box_right+@trident_config[:bar_width], box_top+@trident_config[:bar_width]*2+@trident_config[:point_height]+@trident_config[:side_spike_height], box_top+@trident_config[:bar_width]*3+@trident_config[:point_height]+@trident_config[:side_spike_height], nil, @trident_config[:center_point]+@trident_config[:hash_width]/2)} <!-- Crossbar to hash gap -->
+          #{USPSFlags::Helpers::SpecArrows.vertical(box_right+@trident_config[:bar_width], box_top, box_top+@trident_config[:bar_width], box_right, box_right, fly: @fly, unit: @unit)} <!-- Side spike top gap -->
+          #{USPSFlags::Helpers::SpecArrows.vertical(box_right+@trident_config[:bar_width], box_top+@trident_config[:bar_width], box_top+@trident_config[:bar_width]*2+@trident_config[:point_height]+@trident_config[:side_spike_height], nil, box_right, fly: @fly, unit: @unit)} <!-- Top gap to hash gap -->
+          #{USPSFlags::Helpers::SpecArrows.vertical(box_right+@trident_config[:bar_width], box_top+@trident_config[:bar_width]*2+@trident_config[:point_height]+@trident_config[:side_spike_height], box_top+@trident_config[:bar_width]*3+@trident_config[:point_height]+@trident_config[:side_spike_height], nil, @trident_config[:center_point]+@trident_config[:hash_width]/2, fly: @fly, unit: @unit)} <!-- Crossbar to hash gap -->
 
-          #{USPSFlags::Helpers::SpecArrows.vertical(box_right+@trident_config[:bar_width], box_top+@trident_config[:bar_width]*3+@trident_config[:point_height]+@trident_config[:side_spike_height], box_top+@trident_config[:bar_width]*4+@trident_config[:point_height]+@trident_config[:side_spike_height], nil, @trident_config[:center_point]+@trident_config[:hash_width]/2)} <!-- Hash -->
-          #{USPSFlags::Helpers::SpecArrows.vertical(box_right+@trident_config[:bar_width], box_top+@trident_config[:bar_width]*4+@trident_config[:point_height]+@trident_config[:side_spike_height], box_bottom, nil, box_right)} <!-- Hash to bottom -->
+          #{USPSFlags::Helpers::SpecArrows.vertical(box_right+@trident_config[:bar_width], box_top+@trident_config[:bar_width]*3+@trident_config[:point_height]+@trident_config[:side_spike_height], box_top+@trident_config[:bar_width]*4+@trident_config[:point_height]+@trident_config[:side_spike_height], nil, @trident_config[:center_point]+@trident_config[:hash_width]/2, fly: @fly, unit: @unit)} <!-- Hash -->
+          #{USPSFlags::Helpers::SpecArrows.vertical(box_right+@trident_config[:bar_width], box_top+@trident_config[:bar_width]*4+@trident_config[:point_height]+@trident_config[:side_spike_height], box_bottom, nil, box_right, fly: @fly, unit: @unit)} <!-- Hash to bottom -->
 
         <!-- Left -->
-          #{USPSFlags::Helpers::SpecArrows.vertical(box_left-@trident_config[:bar_width]*5.25, box_top, box_bottom, box_left, box_left)} <!-- Boundary height -->
-          #{USPSFlags::Helpers::SpecArrows.vertical(box_left-@trident_config[:bar_width]*0.75, box_top, box_top+@trident_config[:point_height], nil, @trident_config[:center_point]-@trident_config[:bar_width], label_offset: -USPSFlags::Config::BASE_FLY/26, label_offset_y: -USPSFlags::Config::BASE_FLY/100, label_align: "middle")} <!-- Main point height -->
-          #{USPSFlags::Helpers::SpecArrows.vertical(box_left-@trident_config[:bar_width]*1.5, box_top+@trident_config[:bar_width], box_top+@trident_config[:bar_width]+@trident_config[:point_height], box_left, box_left+@trident_config[:bar_width], label_offset: -USPSFlags::Config::BASE_FLY/24, label_align: "middle")} <!-- Side point height -->
+          #{USPSFlags::Helpers::SpecArrows.vertical(box_left-@trident_config[:bar_width]*5.25, box_top, box_bottom, box_left, box_left, fly: @fly, unit: @unit)} <!-- Boundary height -->
+          #{USPSFlags::Helpers::SpecArrows.vertical(box_left-@trident_config[:bar_width]*0.75, box_top, box_top+@trident_config[:point_height], nil, @trident_config[:center_point]-@trident_config[:bar_width], label_offset: -USPSFlags::Config::BASE_FLY/26, label_offset_y: -USPSFlags::Config::BASE_FLY/100, label_align: "middle", fly: @fly, unit: @unit)} <!-- Main point height -->
+          #{USPSFlags::Helpers::SpecArrows.vertical(box_left-@trident_config[:bar_width]*1.5, box_top+@trident_config[:bar_width], box_top+@trident_config[:bar_width]+@trident_config[:point_height], box_left, box_left+@trident_config[:bar_width], label_offset: -USPSFlags::Config::BASE_FLY/24, label_align: "middle", fly: @fly, unit: @unit)} <!-- Side point height -->
 
         <!-- Bottom -->
-          #{USPSFlags::Helpers::SpecArrows.horizontal(box_bottom+@trident_config[:bar_width], @trident_config[:center_point]-@trident_config[:bar_width]/2, @trident_config[:center_point]+@trident_config[:bar_width]/2, box_bottom, box_bottom)} <!-- Bar width -->
-          #{USPSFlags::Helpers::SpecArrows.horizontal(box_bottom+@trident_config[:bar_width]*2.5, @trident_config[:center_point]-@trident_config[:hash_width]/2, @trident_config[:center_point]+@trident_config[:hash_width]/2, box_top+@trident_config[:bar_width]*4+@trident_config[:point_height]+@trident_config[:side_spike_height], box_top+@trident_config[:bar_width]*4+@trident_config[:point_height]+@trident_config[:side_spike_height])} <!-- Hash width -->
-          #{USPSFlags::Helpers::SpecArrows.horizontal(box_bottom+@trident_config[:bar_width]*4, box_left, box_right, box_bottom, box_bottom)} <!-- Boundary width -->
+          #{USPSFlags::Helpers::SpecArrows.horizontal(box_bottom+@trident_config[:bar_width], @trident_config[:center_point]-@trident_config[:bar_width]/2, @trident_config[:center_point]+@trident_config[:bar_width]/2, box_bottom, box_bottom, fly: @fly, unit: @unit)} <!-- Bar width -->
+          #{USPSFlags::Helpers::SpecArrows.horizontal(box_bottom+@trident_config[:bar_width]*2.5, @trident_config[:center_point]-@trident_config[:hash_width]/2, @trident_config[:center_point]+@trident_config[:hash_width]/2, box_top+@trident_config[:bar_width]*4+@trident_config[:point_height]+@trident_config[:side_spike_height], box_top+@trident_config[:bar_width]*4+@trident_config[:point_height]+@trident_config[:side_spike_height], fly: @fly, unit: @unit)} <!-- Hash width -->
+          #{USPSFlags::Helpers::SpecArrows.horizontal(box_bottom+@trident_config[:bar_width]*4, box_left, box_right, box_bottom, box_bottom, fly: @fly, unit: @unit)} <!-- Boundary width -->
 
         <!-- Top -->
-          #{USPSFlags::Helpers::SpecArrows.horizontal(box_top-@trident_config[:bar_width], box_left, box_left+@trident_config[:bar_width]*3/2, box_top, box_top+@trident_config[:bar_width]+@trident_config[:point_height], label_offset: -USPSFlags::Config::BASE_FLY/60)} <!-- Side point width -->
-          #{USPSFlags::Helpers::SpecArrows.horizontal(box_top-@trident_config[:bar_width]*2.5, @trident_config[:center_point]-@trident_config[:bar_width], @trident_config[:center_point]+@trident_config[:bar_width], box_top+@trident_config[:point_height], box_top+@trident_config[:point_height], label_offset: -USPSFlags::Config::BASE_FLY/60)} <!-- Main point width -->
+          #{USPSFlags::Helpers::SpecArrows.horizontal(box_top-@trident_config[:bar_width], box_left, box_left+@trident_config[:bar_width]*3/2, box_top, box_top+@trident_config[:bar_width]+@trident_config[:point_height], label_offset: -USPSFlags::Config::BASE_FLY/60, fly: @fly, unit: @unit)} <!-- Side point width -->
+          #{USPSFlags::Helpers::SpecArrows.horizontal(box_top-@trident_config[:bar_width]*2.5, @trident_config[:center_point]-@trident_config[:bar_width], @trident_config[:center_point]+@trident_config[:bar_width], box_top+@trident_config[:point_height], box_top+@trident_config[:point_height], label_offset: -USPSFlags::Config::BASE_FLY/60, fly: @fly, unit: @unit)} <!-- Main point width -->
 
         <!-- Overlay -->
           <!-- Main point barb -->
@@ -161,12 +161,12 @@ class USPSFlags::Core::TridentSpec
         <rect x="#{box_left}" y="#{box_top}" width="#{box_right-box_left}" height="#{USPSFlags::Config::BASE_HOIST*5/8}" stroke="#666666" stroke-width="#{USPSFlags::Config::BASE_FLY/600}" stroke-dasharray="15, 15" fill="none" />
 
         <!-- Right -->
-          #{USPSFlags::Helpers::SpecArrows.vertical(box_right+@trident_config[:bar_width], box_bottom-@trident_config[:delta_from_bottom]-@trident_config[:bar_width]-@trident_config[:delta_gap_height], box_bottom-@trident_config[:delta_from_bottom]-@trident_config[:bar_width], @trident_config[:center_point], @trident_config[:center_point]+@trident_config[:delta_gap_width])} <!-- Delta gap height -->
-          #{USPSFlags::Helpers::SpecArrows.vertical(box_right+@trident_config[:bar_width], box_bottom-@trident_config[:delta_from_bottom]-@trident_config[:bar_width], box_bottom-@trident_config[:delta_from_bottom], nil, box_right)} <!-- Delta width -->
-          #{USPSFlags::Helpers::SpecArrows.vertical(box_right+@trident_config[:bar_width], box_bottom-@trident_config[:delta_from_bottom], box_bottom, nil, box_right)} <!-- Delta to bottom -->
+          #{USPSFlags::Helpers::SpecArrows.vertical(box_right+@trident_config[:bar_width], box_bottom-@trident_config[:delta_from_bottom]-@trident_config[:bar_width]-@trident_config[:delta_gap_height], box_bottom-@trident_config[:delta_from_bottom]-@trident_config[:bar_width], @trident_config[:center_point], @trident_config[:center_point]+@trident_config[:delta_gap_width], fly: @fly, unit: @unit)} <!-- Delta gap height -->
+          #{USPSFlags::Helpers::SpecArrows.vertical(box_right+@trident_config[:bar_width], box_bottom-@trident_config[:delta_from_bottom]-@trident_config[:bar_width], box_bottom-@trident_config[:delta_from_bottom], nil, box_right, fly: @fly, unit: @unit)} <!-- Delta width -->
+          #{USPSFlags::Helpers::SpecArrows.vertical(box_right+@trident_config[:bar_width], box_bottom-@trident_config[:delta_from_bottom], box_bottom, nil, box_right, fly: @fly, unit: @unit)} <!-- Delta to bottom -->
 
         <!-- Left -->
-          #{USPSFlags::Helpers::SpecArrows.vertical(box_left-@trident_config[:bar_width]*1.5, box_top, box_bottom, box_left, box_left, label_offset: -USPSFlags::Config::BASE_FLY/30, label_offset_y: -USPSFlags::Config::BASE_FLY*2/11, label_align: "middle")} <!-- Boundary height -->
+          #{USPSFlags::Helpers::SpecArrows.vertical(box_left-@trident_config[:bar_width]*1.5, box_top, box_bottom, box_left, box_left, label_offset: -USPSFlags::Config::BASE_FLY/30, label_offset_y: -USPSFlags::Config::BASE_FLY*2/11, label_align: "middle", fly: @fly, unit: @unit)} <!-- Boundary height -->
       </g></g>
     SVG
   end
@@ -182,9 +182,9 @@ class USPSFlags::Core::TridentSpec
         #{long_trident_boundary_box(box_top, box_left, box_right)}
 
         <!-- Right -->
-          #{USPSFlags::Helpers::SpecArrows.vertical(box_right+@trident_config[:bar_width], box_top+@trident_config[:crossbar_from_top]+@trident_config[:bar_width]*2, box_top+@trident_config[:crossbar_from_top]+@trident_config[:width], @trident_config[:center_point], @trident_config[:center_point])} <!-- Inner circle diameter -->
-          #{USPSFlags::Helpers::SpecArrows.vertical(box_right+@trident_config[:bar_width], box_top+@trident_config[:crossbar_from_top]+@trident_config[:width], box_top+@trident_config[:crossbar_from_top]+@trident_config[:bar_width]+@trident_config[:width], nil, @trident_config[:center_point]+@trident_config[:bar_width]/2)} <!-- Outer circle diameter -->
-          #{USPSFlags::Helpers::SpecArrows.vertical(box_right+@trident_config[:bar_width], box_top+@trident_config[:crossbar_from_top]+@trident_config[:bar_width]+@trident_config[:width], box_bottom, nil, box_right)} <!-- Circle to bottom -->
+          #{USPSFlags::Helpers::SpecArrows.vertical(box_right+@trident_config[:bar_width], box_top+@trident_config[:crossbar_from_top]+@trident_config[:bar_width]*2, box_top+@trident_config[:crossbar_from_top]+@trident_config[:width], @trident_config[:center_point], @trident_config[:center_point], fly: @fly, unit: @unit)} <!-- Inner circle diameter -->
+          #{USPSFlags::Helpers::SpecArrows.vertical(box_right+@trident_config[:bar_width], box_top+@trident_config[:crossbar_from_top]+@trident_config[:width], box_top+@trident_config[:crossbar_from_top]+@trident_config[:bar_width]+@trident_config[:width], nil, @trident_config[:center_point]+@trident_config[:bar_width]/2, fly: @fly, unit: @unit)} <!-- Outer circle diameter -->
+          #{USPSFlags::Helpers::SpecArrows.vertical(box_right+@trident_config[:bar_width], box_top+@trident_config[:crossbar_from_top]+@trident_config[:bar_width]+@trident_config[:width], box_bottom, nil, box_right, fly: @fly, unit: @unit)} <!-- Circle to bottom -->
 
         #{long_trident_left_arrow(box_top, box_bottom, box_left, box_right)}
       </g></g>
@@ -202,7 +202,7 @@ class USPSFlags::Core::TridentSpec
         #{long_trident_boundary_box(box_top, box_left, box_right)}
 
         <!-- Right -->
-          #{USPSFlags::Helpers::SpecArrows.vertical(box_right+@trident_config[:bar_width], box_top+@trident_config[:crossbar_from_top]+@trident_config[:bar_width]*3, box_bottom, @trident_config[:center_point]+@trident_config[:hash_width]/2, box_right)} <!-- Hash to bottom -->
+          #{USPSFlags::Helpers::SpecArrows.vertical(box_right+@trident_config[:bar_width], box_top+@trident_config[:crossbar_from_top]+@trident_config[:bar_width]*3, box_bottom, @trident_config[:center_point]+@trident_config[:hash_width]/2, box_right, fly: @fly, unit: @unit)} <!-- Hash to bottom -->
 
         #{long_trident_left_arrow(box_top, box_bottom, box_left, box_right)}
       </g></g>
@@ -236,7 +236,7 @@ class USPSFlags::Core::TridentSpec
   def long_trident_left_arrow(box_top, box_bottom, box_left, box_right)
     <<~SVG
       <!-- Left -->
-        #{USPSFlags::Helpers::SpecArrows.vertical(box_left-@trident_config[:bar_width]*1.5, box_top, box_bottom, box_left, box_left, label_offset: -USPSFlags::Config::BASE_FLY/30, label_offset_y: -USPSFlags::Config::BASE_FLY/4.5, label_align: "middle")} <!-- Boundary height -->
+        #{USPSFlags::Helpers::SpecArrows.vertical(box_left-@trident_config[:bar_width]*1.5, box_top, box_bottom, box_left, box_left, label_offset: -USPSFlags::Config::BASE_FLY/30, label_offset_y: -USPSFlags::Config::BASE_FLY/4.5, label_align: "middle", fly: @fly, unit: @unit)} <!-- Boundary height -->
     SVG
   end
 end

data/lib/usps_flags/errors.rb

@@ -1,3 +1,6 @@
+# Custom errors.
+#
+# @private
 module USPSFlags::Errors
   class PNGGenerationError < StandardError
     def initialize(msg = "There was an error generating the PNG file.", svg: "")

data/lib/usps_flags/generate/flag.rb

@@ -95,13 +95,13 @@ class USPSFlags::Generate::Flag
         USPSFlags::Core::Tridents.cc(@flag_details[:type], trident_color: @trident_color)
       elsif vc?
         USPSFlags::Core::Tridents.vc(@flag_details[:type], trident_color: @trident_color)
-      elsif cdr_or_dc?
+      elsif three?
         USPSFlags::Core::Tridents.three(@flag_details[:type], trident_color: @trident_color, field_color: @flag_details[:color])
-      elsif ltc_or_dltc?
+      elsif two?
         USPSFlags::Core::Tridents.two(@flag_details[:type], trident_color: @trident_color, field_color: @flag_details[:color])
-      elsif lt_or_dlt?
+      elsif offset?
         USPSFlags::Core::Tridents.offset(@flag_details[:type], field_color: @flag_details[:color], field: @field)
-      elsif special_officer?
+      elsif special?
         special(@flag_details[:type], level: @flag_details[:level], field: @field)
       else
         USPSFlags::Core.trident(@flag_details[:type], field_color: @flag_details[:color])
@@ -131,19 +131,19 @@ class USPSFlags::Generate::Flag
       @flag_details[:type] == :n && @flag_details[:count] == 2
     end
 
-    def cdr_or_dc?
+    def three?
       [:s, :d].include?(@flag_details[:type]) && @flag_details[:count] == 3
     end
 
-    def ltc_or_dltc?
+    def two?
       [:s, :d].include?(@flag_details[:type]) && @flag_details[:count] == 2
     end
 
-    def lt_or_dlt?
+    def offset?
       %w[LT DLT].include?(@rank)
     end
 
-    def special_officer?
+    def special?
       [:a, :f, :fc, :pc].include?(@flag_details[:type])
     end
   end

data/lib/usps_flags/generate.rb

@@ -54,14 +54,11 @@ class USPSFlags::Generate
     # @param [Boolean] zips Whether to create zip archives for all images created. Does not create a zip for skipped formats.
     # @param [Boolean] reset Whether to delete all previous files before generating new files.
     def all(svg: true, png: true, zips: true, reset: true)
-      raise USPSFlags::Errors::StaticFilesGenerationError, "At least one argument switch must be true out of [svg, png, zips]." unless svg || png || zips
+      raise USPSFlags::Errors::StaticFilesGenerationError, "At least one argument switch must be true out of [svg, png, zips, reset]." unless svg || png || zips || reset
 
-      remove_static_files if reset
-      static_generation_header
       overall_start_time = Time.now
-      USPSFlags::Helpers.valid_flags(:all).each do |flag|
-        generate_static_images_for(flag, svg: svg, png: png)
-      end
+      remove_static_files if reset
+      images(svg: svg, png: png) if svg || png
       zips(svg: svg, png: png) if zips
       USPSFlags::Helpers.log "\nTotal run time: #{Time.now - overall_start_time} s\n\n"
     end
@@ -76,6 +73,17 @@ class USPSFlags::Generate
       generate_zip("png") if png
     end
 
+    # Generate static image files.
+    #
+    # @param [Boolean] svg Generate static SVG images.
+    # @param [Boolean] png Generate static PNG images.
+    def images(svg: true, png: true)
+      static_generation_header
+      USPSFlags::Helpers.valid_flags(:all).each do |flag|
+        generate_static_images_for(flag, svg: svg, png: png)
+      end
+    end
+
     # Generate trident spec sheet as an SVG image.
     #
     # @param [String] outfile The path to save the SVG file to. If not set, prints to console.
@@ -83,8 +91,7 @@ class USPSFlags::Generate
     # @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 spec(outfile: nil, fly: nil, unit: nil, scale: nil)
-      fly = fly.nil? ? USPSFlags::Config::BASE_FLY : fly
+    def spec(outfile: nil, fly: USPSFlags::Config::BASE_FLY, unit: nil, scale: nil)
       svg = ""
       svg << USPSFlags::Core.headers(scale: scale, title: "USPS Trident Specifications")
       svg << USPSFlags::Core.trident_spec(fly: fly, unit: unit)
@@ -103,8 +110,8 @@ class USPSFlags::Generate
       USPSFlags::Helpers.log "\n - Cleared previous files.\n"
     end
 
-    def set_file_paths(flag)
-      @svg_file = "#{USPSFlags::Config.flags_dir}/SVG/#{flag}.svg"
+    def set_file_paths
+      @svg_file = "#{USPSFlags::Config.flags_dir}/SVG/#{@flag}.svg"
       @png_file = @svg_file.gsub("/SVG/", "/PNG/").gsub(".svg", ".png")
       @svg_ins_file = @svg_file.gsub("/SVG/", "/SVG/insignia/")
       @png_ins_file = @svg_file.gsub("/SVG/", "/PNG/insignia/").gsub(".svg", ".png")
@@ -144,80 +151,96 @@ class USPSFlags::Generate
     def generate_static_images_for(flag, svg: true, png: true)
       start_time = Time.now
       # USPSFlags::Helpers.log " |     |  _ _ _ _ _  |         \r".rjust(USPSFlags::Helpers.max_flag_name_length+31, " ")
-      flag = flag.upcase
-      USPSFlags::Helpers.log "#{flag.rjust(USPSFlags::Helpers.max_flag_name_length)} |"
+      @flag = flag.upcase
+      USPSFlags::Helpers.log "#{@flag.rjust(USPSFlags::Helpers.max_flag_name_length)} |"
 
-      set_file_paths(flag)
+      set_file_paths
 
-      svg ? generate_static_svg(flag) : USPSFlags::Helpers.log("-")
-      png ? generate_static_png(flag) : USPSFlags::Helpers.log("- ")
+      svg ? generate_static_svg : USPSFlags::Helpers.log("-")
+      png ? generate_static_png : USPSFlags::Helpers.log("- ")
 
       run_time = (Time.now - start_time).round(4).to_s[(0..5)].ljust(6, "0")
       USPSFlags::Helpers.log " | #{run_time} s\n"
     end
 
-    def generate_static_svg(flag)
+    def generate_static_svg
       USPSFlags::Helpers.log " "
-      svg flag, outfile: @svg_file, scale: 1
+      svg @flag, outfile: @svg_file, scale: 1
       USPSFlags::Helpers.log "S"
-      if USPSFlags::Helpers.valid_flags(:past).include?(flag) || !USPSFlags::Helpers.valid_flags(:insignia).include?(flag)
+      if USPSFlags::Helpers.valid_flags(:past).include?(@flag) || !USPSFlags::Helpers.valid_flags(:insignia).include?(@flag)
         USPSFlags::Helpers.log "-"
       else
-        svg flag, field: false, outfile: @svg_ins_file, scale: 1
+        svg @flag, field: false, outfile: @svg_ins_file, scale: 1
         USPSFlags::Helpers.log "I"
       end
     end
 
-    def generate_static_png(flag)
+    def generate_static_png
       USPSFlags::Helpers.log "  | "
       generate_fullsize_png
-      generate_fullsize_png_insignia(flag)
-      generate_reduced_size_pngs(flag)
+      generate_fullsize_png_insignia
+      generate_reduced_size_pngs
     end
 
     def generate_fullsize_png
-      png(File.read(@svg_file), outfile: @png_file) unless ::File.exist?(@png_file)
+      return if file_found?(@png_file)
+
+      png(File.read(@svg_file), outfile: @png_file)
       USPSFlags::Helpers.log "F"
     end
 
-    def generate_fullsize_png_insignia(flag)
-      if can_have_insignia?(flag)
-        USPSFlags::Helpers.log "-"
-      else
-        png(File.read(@svg_ins_file), outfile: @png_ins_file, trim: true) unless ::File.exist?(@png_ins_file)
-        USPSFlags::Helpers.log "I"
-      end
-    end
+    def generate_fullsize_png_insignia
+      return if no_insignia?
+      return if file_found?(@png_ins_file)
 
-    def can_have_insignia?(flag)
-      USPSFlags::Helpers.valid_flags(:past).include?(flag) || !USPSFlags::Helpers.valid_flags(:insignia).include?(flag)
+      png(File.read(@svg_ins_file), outfile: @png_ins_file, trim: true)
+      USPSFlags::Helpers.log "I"
     end
 
-    def generate_reduced_size_pngs(flag)
+    def generate_reduced_size_pngs
       USPSFlags::Helpers.png_sizes.keys.each do |size|
-        USPSFlags::Helpers.log(".") and next if ::File.exist?("#{USPSFlags::Config.flags_dir}/PNG/#{flag}.#{size}.png")
-        size, size_key = USPSFlags::Helpers.size_and_key(size: size, flag: flag)
-        generate_smaller_png(flag, size, size_key)
-        generate_smaller_png_insignia(flag, size, size_key)
+        size, size_key = USPSFlags::Helpers.size_and_key(size: size, flag: @flag)
+        @sized_png_file = "#{USPSFlags::Config.flags_dir}/PNG/#{@flag}.#{@size_key}.png"
+        @sized_png_ins_file = @sized_png_file.gsub("/PNG/", "/PNG/insignia/")
+
+        generate_smaller_png(size, size_key)
+        generate_smaller_png_insignia(size, size_key)
       end
     end
 
-    def generate_smaller_png(flag, size, size_key)
-      USPSFlags::Helpers.resize_png(@png_ins_file, flag: flag, size: size, size_key: size_key) if USPSFlags::Helpers.valid_flags(:insignia).include?(flag)
+    def generate_smaller_png(size, size_key)
+      return if file_found?(@sized_png_file)
+      return if too_big?(@png_file, size)
+
+      USPSFlags::Helpers.resize_png(@png_file, file: @flag, size: size, size_key: size_key)
       USPSFlags::Helpers.log USPSFlags::Helpers.png_sizes[size_key]
     end
 
-    def generate_smaller_png_insignia(flag, size, size_key)
-      if ::File.exist?(@png_ins_file) && ::File.exist?("#{USPSFlags::Config.flags_dir}/PNG/insignia/#{flag}.#{size}.png")
-        USPSFlags::Helpers.log "."
-      elsif ::File.exist?(@png_ins_file) && MiniMagick::Image.open(@png_ins_file)[:width] > size && USPSFlags::Helpers.valid_flags(:insignia).include?(flag)
-        USPSFlags::Helpers.resize_png(@png_ins_file, flag: flag, size: size, size_key: size_key)
-        USPSFlags::Helpers.log "i"
-      elsif ::File.exist?(@png_ins_file)
-        USPSFlags::Helpers.log "+"
-      else
-        USPSFlags::Helpers.log "-"
-      end
+    def generate_smaller_png_insignia(size, size_key)
+      return if no_insignia?
+      return if file_found?(@sized_png_ins_file)
+      return if too_big?(@png_ins_file, size)
+
+      USPSFlags::Helpers.resize_png(@png_ins_file, file: "insignia/#{@flag}", size: size, size_key: size_key)
+      USPSFlags::Helpers.log "i"
+    end
+
+    def no_insignia?
+      return false if USPSFlags::Helpers.valid_flags(:insignia).include?(@flag)
+      USPSFlags::Helpers.log "-"
+      true
+    end
+
+    def file_found?(file)
+      return false unless ::File.exist?(file)
+      USPSFlags::Helpers.log "."
+      true
+    end
+
+    def too_big?(file, size)
+      return false unless size > MiniMagick::Image.open(file)[:width]
+      USPSFlags::Helpers.log "+"
+      true
     end
   end
 end

data/lib/usps_flags/helpers/spec_arrows.rb

@@ -8,9 +8,9 @@ class USPSFlags::Helpers::SpecArrows
     #
     # This is used USPSFlags::Core.trident_spec, and should never need to be called directly.
     # @private
-    def vertical(x, top, bottom, pointer_top = nil, pointer_bottom = nil, label: nil, unit: nil, label_offset: (USPSFlags::Config::BASE_FLY/120), label_offset_y: 0, label_align: "left")
-      load_common_config
-      label, label_fraction = get_labels(bottom, top, label: label)
+    def vertical(x, top, bottom, pointer_top = nil, pointer_bottom = nil, fly: nil, unit: nil, label_offset: (USPSFlags::Config::BASE_FLY/120), label_offset_y: 0, label_align: "left")
+      load_common_config(fly)
+      label, label_fraction = get_labels(bottom, top)
       svg = ""
 
       svg << arrow_pointer(x, pointer_top, top, top) unless pointer_top.nil?
@@ -31,9 +31,9 @@ class USPSFlags::Helpers::SpecArrows
     #
     # This is used USPSFlags::Core.trident_spec, and should never need to be called directly.
     # @private
-    def horizontal(y, left, right, pointer_left = nil, pointer_right = nil, label: nil, unit: nil, label_offset: (USPSFlags::Config::BASE_FLY/45), label_offset_x: 0, label_align: "middle")
-      load_common_config
-      label, label_fraction = get_labels(right, left, label: label)
+    def horizontal(y, left, right, pointer_left = nil, pointer_right = nil, fly: nil, unit: nil, label_offset: (USPSFlags::Config::BASE_FLY/45), label_offset_x: 0, label_align: "middle")
+      load_common_config(fly)
+      label, label_fraction = get_labels(right, left)
       svg = ""
 
       svg << arrow_pointer(left, left, pointer_left, y) unless pointer_left.nil?
@@ -51,13 +51,13 @@ class USPSFlags::Helpers::SpecArrows
     end
 
     private
-    def load_common_config
+    def load_common_config(fly)
       @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
+      @fly = fly || USPSFlags::Config::BASE_FLY
     end
 
     def arrow_pointer(x1, x2, y1, y2)
@@ -66,10 +66,8 @@ class USPSFlags::Helpers::SpecArrows
       SVG
     end
 
-    def get_labels(a, b, label: nil)
-      label = a - b if label.nil?
-      label = label.to_i if label - label.to_i == 0
-      label = Rational(label) * @fly / USPSFlags::Config::BASE_FLY
+    def get_labels(a, b)
+      label = (a - b) * Rational(@fly, USPSFlags::Config::BASE_FLY)
       if label == label.to_i
         label = label.to_i
         label_fraction = ""

data/lib/usps_flags/helpers.rb

@@ -44,13 +44,13 @@ class USPSFlags::Helpers
     #
     # This is used USPSFlags::Generate, and should never need to be called directly.
     # @private
-    def resize_png(png_ins_file, flag:, size:, size_key:)
+    def resize_png(png_file, file:, size:, size_key:)
       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"
+        convert << png_file
+        convert << "#{USPSFlags::Config.flags_dir}/PNG/#{file}.#{size_key}.png"
       end
     end
 

data/lib/usps_flags.rb

@@ -107,9 +107,9 @@ class USPSFlags
   def png
     raise USPSFlags::Errors::PNGGenerationError, "A path must be set with png_file." if self.png_file.nil?
     svg_file_storage = self.svg_file
-    self.svg_file ""
+    self.svg_file = ""
     USPSFlags::Generate.png(self.svg, outfile: self.png_file, trim: self.trim)
-    self.svg_file svg_file_storage
+    self.svg_file = svg_file_storage
     self.png_file
   end
 end

data/spec/spec_helper.rb

@@ -1,5 +1,3 @@
-require 'coveralls'
-Coveralls.wear!
 require 'bundler/setup'
 Bundler.setup
 require 'codeclimate-test-reporter'

data/spec/usps_flags/config_spec.rb

@@ -37,4 +37,22 @@ describe USPSFlags::Config do
       expect(@config.use_larger_tridents).to eql(true)
     end
   end
+
+  describe "Rails configuration" do
+    before(:each) do
+      class Rails
+        def self.root
+          "tmp/rails_app"
+        end
+      end
+
+      @config = USPSFlags::Config.new do |config|
+        config.flags_dir = $tmp_flags_dir
+      end
+    end
+
+    it "should use the default Rails log directory" do
+      expect(USPSFlags::Config.log_path).to eql("tmp/rails_app/log")
+    end
+  end
 end

data/spec/usps_flags/generate_spec.rb

@@ -139,6 +139,10 @@ describe USPSFlags::Generate do
     it "should generate the trident specification sheet" do
       expect(USPSFlags::Generate.spec(outfile: "")).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>")
+    end
   end
 
   describe "png" do
@@ -151,25 +155,40 @@ describe USPSFlags::Generate do
     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")
+    end
+  end
+
   describe "static files" do
     it "should raise USPSFlags::Errors::StaticFilesGenerationError when not given any true arguments" do
-      expect { USPSFlags::Generate.all(svg: false, png: false, zips: false) }.to raise_error(
-        USPSFlags::Errors::StaticFilesGenerationError, "At least one argument switch must be true out of [svg, png, zips]."
+      expect { USPSFlags::Generate.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 not raise StaticFilesGenerationError while generating all static files" do
-      expect { USPSFlags::Generate.all }.to_not raise_error(USPSFlags::Errors::StaticFilesGenerationError)
-    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(
         USPSFlags::Errors::ZipGenerationError, "At least one argument switch must be true out of [svg, png]."
       )
     end
 
-    it "should not raise ZipGenerationError while generating zip files" do
-      expect { USPSFlags::Generate.zips }.to_not raise_error(USPSFlags::Errors::ZipGenerationError)
+    it "should not raise an error while generating all static files" do
+      png_dir = "#{USPSFlags::Config.flags_dir}/PNG"
+      ::FileUtils.cp("spec/assets/1LT.thumb.png", "#{png_dir}/insignia/1LT.thumb.png")
+      ::FileUtils.cp("spec/assets/LT.png", "#{png_dir}/insignia/LT.png")
+      ::FileUtils.cp("spec/assets/FLT.png", "#{png_dir}/FLT.png")
+      expect { USPSFlags::Generate.all(reset: false) }.to_not raise_error # (USPSFlags::Errors::StaticFilesGenerationError)
+    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 # (USPSFlags::Errors::StaticFilesGenerationError)
+    end
+
+    it "should not raise an error while generating zip files" do
+      expect { USPSFlags::Generate.zips }.to_not raise_error # (USPSFlags::Errors::ZipGenerationError)
     end
   end
 end

data/spec/usps_flags_spec.rb

@@ -144,9 +144,19 @@ describe USPSFlags do
           expect { @flag.png }.to raise_error(USPSFlags::Errors::PNGGenerationError, "A path must be set with png_file.")
         end
 
-        it "should not raise PNGGenerationError with png_file set" do
-          @flag.png_file = "#{$tmp_alt_flags_dir}/PNG/LtC.png"
-          expect { @flag.png }.to_not raise_error(USPSFlags::Errors::PNGGenerationError)
+        context "with png_file set" do
+          before(:each) do
+            @flag.png_file = "#{$tmp_alt_flags_dir}/PNG/LtC.png"
+            ::FileUtils.mkdir_p("#{$tmp_alt_flags_dir}/PNG/")
+          end
+
+          it "should not raise PNGGenerationError with png_file set" do
+            expect { @flag.png }.to_not raise_error(USPSFlags::Errors::PNGGenerationError)
+          end
+
+          it "should return the value of png_file" do
+            expect(@flag.png).to eql("#{$tmp_alt_flags_dir}/PNG/LtC.png")
+          end
         end
       end
     end

data/usps_flags.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name          = 'usps_flags'
-  s.version       = '0.3.5'
-  s.date          = '2017-11-06'
+  s.version       = '0.3.6'
+  s.date          = '2017-11-07'
   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.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - Julian Fiander
@@ -30,7 +30,7 @@ cert_chain:
   3YzYAc+kXfD7kkzA2NMvLT6Q1v03qQyIZ8BS8SNk5wLGAdLM+IravFDLEs448fjz
   lEAU0RHLFVbE+CXW6makIlWGHR0=
   -----END CERTIFICATE-----
-date: 2017-11-06 00:00:00.000000000 Z
+date: 2017-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: file_utils
@@ -219,6 +219,9 @@ files:
 - lib/usps_flags/helpers.rb
 - lib/usps_flags/helpers/builders.rb
 - lib/usps_flags/helpers/spec_arrows.rb
+- spec/assets/1LT.thumb.png
+- spec/assets/FLT.png
+- spec/assets/LT.png
 - spec/rational_spec.rb
 - spec/spec_helper.rb
 - spec/usps_flags/config_spec.rb
@@ -254,6 +257,9 @@ signing_key:
 specification_version: 4
 summary: Flag generator for United States Power Squadrons
 test_files:
+- spec/assets/1LT.thumb.png
+- spec/assets/FLT.png
+- spec/assets/LT.png
 - spec/rational_spec.rb
 - spec/spec_helper.rb
 - spec/usps_flags/config_spec.rb