usps_flags 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d7ea83356a9fdf7e8b3ad5949e60462bcadbf2a98df05d270c2fc3875e5df7f
-  data.tar.gz: 932d568a57b257d6dbd2e4ed595f11211e46597c0602e755559899f1c5548795
+  metadata.gz: 00b32e5fbfbb5d0d90e1f3f449e96b89c5d3d52de7a9ea6ae6a042609bb69665
+  data.tar.gz: c35ad25ec8df45961cbf57829109ad05eacba524daf1674751f2649322ad5479
 SHA512:
-  metadata.gz: 1a320747b4cb6354667213bd5b5fef8a8f12b11d3fa6d406d8981381d6dfe2e08b622b83b52f4355cc27c88cf9117c85c88345a44baea78a5aedd92077713bc7
-  data.tar.gz: dec6e9cf1c2dcc7d887d774bfaacd3e8a0db017fca0ce71f2aa4911f905d6dc9b759bd0d440a410f7d6ac904d01a10eae83087f38104b0cdfef150409c8f53dc
+  metadata.gz: 451d050441eb4de435dc9f4463d8fcbe04b9b58d17264ce5fac69dc60d1578597f91069ba536e75fe7ed44faaca64dde43cc5c07175fb386776373e0cb5ec5d7
+  data.tar.gz: 16fd6eaf1886833465bb5a8e16a25a70b1ff381447d90fda55117d402247bb6552669b20d6d0792842bcdb4cbf473d409edc8d87dfad48091ff196c7c488a404

data/.rubocop.yml

@@ -1,6 +1,3 @@
-inherit_gem:
-  rubocop-rails_config:
-    - config/rails.yml
 require: rubocop-rspec
 AllCops:
   TargetRubyVersion: 2.5

data/.travis.yml

@@ -13,6 +13,7 @@ before_script:
   - chmod +x ./cc-test-reporter
   - ./cc-test-reporter before-build
 script:
+  - bundle exec rubocop
   - bundle exec rspec
 after_script:
   - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    usps_flags (0.4.1)
+    usps_flags (0.5.0)
       file_utils (~> 1.1, >= 1.1.2)
       mini_magick (~> 4.8, >= 4.8.0)
       rubyzip (~> 1.2, >= 1.2.1)
@@ -9,11 +9,17 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
+    ast (2.4.0)
     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.3)
+    parallel (1.17.0)
+    parser (2.6.3.0)
+      ast (~> 2.4.0)
+    rainbow (3.0.0)
     rake (12.3.0)
     rspec (3.7.0)
       rspec-core (~> 3.7.0)
@@ -28,12 +34,21 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.7.0)
     rspec-support (3.7.0)
+    rubocop (0.71.0)
+      jaro_winkler (~> 1.5.1)
+      parallel (~> 1.10)
+      parser (>= 2.6)
+      rainbow (>= 2.2.2, < 4.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 1.7)
+    ruby-progressbar (1.10.1)
     rubyzip (1.2.3)
     simplecov (0.15.1)
       docile (~> 1.1.0)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
+    unicode-display_width (1.6.0)
 
 PLATFORMS
   ruby
@@ -41,6 +56,7 @@ PLATFORMS
 DEPENDENCIES
   rake (~> 12.2, >= 12.2.1)
   rspec (~> 3.7, >= 3.7.0)
+  rubocop (~> 0.59, >= 0.59.2)
   simplecov (~> 0.15, >= 0.15.1)
   usps_flags!
 

data/lib/usps_flags/config.rb

@@ -30,40 +30,11 @@ class USPSFlags::Config
   #
   # @return [Hash] RThe configuration values for tridents.
   def trident
-    center_point_height = USPSFlags::Config::BASE_FLY / 48 * 23 / 8
-    side_point_height = USPSFlags::Config::BASE_FLY / 48 * 21 / 8
-    bar_width = USPSFlags::Config::BASE_FLY / 48 * 5 / 4
     {
-      height: trident_heights,
-
-      center_point: BASE_FLY / 2,
-
-      width: USPSFlags::Config::BASE_FLY * 5 / 32,
-
-      bar_width: bar_width,
-
-      center_point_height: center_point_height,
-      side_point_height: side_point_height,
-
-      main_point_barb: USPSFlags::Config::BASE_HOIST / 82,
-
-      crossbar_from_top: USPSFlags::Config::BASE_HOIST / 4 + bar_width / 5,
-
-      side_spike_height: USPSFlags::Config::BASE_HOIST / 4 - side_point_height - bar_width * 3 / 5,
-
-      hash_width: USPSFlags::Config::BASE_FLY * 47 / 528,
-
-      delta_height: USPSFlags::Config::BASE_FLY * 33 / 240,
-      delta_gap_height: USPSFlags::Config::BASE_FLY / 16,
-      delta_gap_width: bar_width * 5 / 4,
-      delta_width: USPSFlags::Config::BASE_FLY * 43 / 768,
-      delta_from_bottom: USPSFlags::Config::BASE_HOIST * 10 / 64,
-      delta_gap_scale: 0.40,
-      delta_gap_x: USPSFlags::Config::BASE_HOIST * 144 / 128,
-      delta_gap_y: USPSFlags::Config::BASE_HOIST * 221 / 256,
-
-      circle_height_adj: USPSFlags::Config::BASE_FLY / 800
-    }
+      height: trident_heights, center_point: BASE_FLY / 2,
+      width: USPSFlags::Config::BASE_FLY * 5 / 32, bar_width: bar_width,
+      hash_width: USPSFlags::Config::BASE_FLY * 47 / 528
+    }.merge(spikes_config).merge(delta_config).merge(circle_config)
   end
 
   # Height values for trident insignia.
@@ -100,4 +71,38 @@ private
     @use_larger_tridents = true
     @clear = false
   end
+
+  def center_point_height
+    USPSFlags::Config::BASE_FLY / 48 * 23 / 8
+  end
+
+  def side_point_height
+    USPSFlags::Config::BASE_FLY / 48 * 21 / 8
+  end
+
+  def bar_width
+    USPSFlags::Config::BASE_FLY / 48 * 5 / 4
+  end
+
+  def spikes_config
+    {
+      center_point_height: center_point_height, side_point_height: side_point_height,
+      main_point_barb: USPSFlags::Config::BASE_HOIST / 82,
+      crossbar_from_top: USPSFlags::Config::BASE_HOIST / 4 + bar_width / 5,
+      side_spike_height: USPSFlags::Config::BASE_HOIST / 4 - side_point_height - bar_width * 3 / 5
+    }
+  end
+
+  def delta_config
+    {
+      delta_height: USPSFlags::Config::BASE_FLY * 33 / 240, delta_gap_height: USPSFlags::Config::BASE_FLY / 16,
+      delta_gap_width: bar_width * 5 / 4, delta_width: USPSFlags::Config::BASE_FLY * 43 / 768,
+      delta_from_bottom: USPSFlags::Config::BASE_HOIST * 10 / 64, delta_gap_scale: 0.40,
+      delta_gap_x: USPSFlags::Config::BASE_HOIST * 144 / 128, delta_gap_y: USPSFlags::Config::BASE_HOIST * 221 / 256
+    }
+  end
+
+  def circle_config
+    { circle_height_adj: USPSFlags::Config::BASE_FLY / 800 }
+  end
 end

data/lib/usps_flags/core/ensign.rb

@@ -8,6 +8,7 @@ class USPSFlags::Core::Ensign
   def svg
     <<~SVG
       #{stripes}
+      #{canton}
       <g transform="scale(0.3675)">
         <g transform="translate(1200, 600)">
           <g transform="rotate(-45, 693, 1500)">
@@ -22,39 +23,46 @@ class USPSFlags::Core::Ensign
 private
 
   def stripes
+    (0..12).map do |index|
+      index.odd? ? white_stripe(index) : blue_stripe(index)
+    end.join
+  end
+
+  def canton
     <<~SVG
-      <rect x="0" y="0" width="#{USPSFlags::Config::BASE_FLY / 13}" height="#{USPSFlags::Config::BASE_HOIST}" fill="#{USPSFlags::Config::BLUE}" />
-      <rect x="#{USPSFlags::Config::BASE_FLY * 1 / 13}" y="0" width="#{USPSFlags::Config::BASE_FLY / 13}" height="#{USPSFlags::Config::BASE_HOIST}" fill="#FFFFFF" />
-      <rect x="#{USPSFlags::Config::BASE_FLY * 2 / 13}" y="0" width="#{USPSFlags::Config::BASE_FLY / 13}" height="#{USPSFlags::Config::BASE_HOIST}" fill="#{USPSFlags::Config::BLUE}" />
-      <rect x="#{USPSFlags::Config::BASE_FLY * 3 / 13}" y="0" width="#{USPSFlags::Config::BASE_FLY / 13}" height="#{USPSFlags::Config::BASE_HOIST}" fill="#FFFFFF" />
-      <rect x="#{USPSFlags::Config::BASE_FLY * 4 / 13}" y="0" width="#{USPSFlags::Config::BASE_FLY / 13}" height="#{USPSFlags::Config::BASE_HOIST}" fill="#{USPSFlags::Config::BLUE}" />
-      <rect x="#{USPSFlags::Config::BASE_FLY * 5 / 13}" y="0" width="#{USPSFlags::Config::BASE_FLY / 13}" height="#{USPSFlags::Config::BASE_HOIST}" fill="#FFFFFF" />
-      <rect x="#{USPSFlags::Config::BASE_FLY * 6 / 13}" y="0" width="#{USPSFlags::Config::BASE_FLY / 13}" height="#{USPSFlags::Config::BASE_HOIST}" fill="#{USPSFlags::Config::BLUE}" />
-      <rect x="#{USPSFlags::Config::BASE_FLY * 7 / 13}" y="0" width="#{USPSFlags::Config::BASE_FLY / 13}" height="#{USPSFlags::Config::BASE_HOIST}" fill="#FFFFFF" />
-      <rect x="#{USPSFlags::Config::BASE_FLY * 8 / 13}" y="0" width="#{USPSFlags::Config::BASE_FLY / 13}" height="#{USPSFlags::Config::BASE_HOIST}" fill="#{USPSFlags::Config::BLUE}" />
-      <rect x="#{USPSFlags::Config::BASE_FLY * 9 / 13}" y="0" width="#{USPSFlags::Config::BASE_FLY / 13}" height="#{USPSFlags::Config::BASE_HOIST}" fill="#FFFFFF" />
-      <rect x="#{USPSFlags::Config::BASE_FLY * 10 / 13}" y="0" width="#{USPSFlags::Config::BASE_FLY / 13}" height="#{USPSFlags::Config::BASE_HOIST}" fill="#{USPSFlags::Config::BLUE}" />
-      <rect x="#{USPSFlags::Config::BASE_FLY * 11 / 13}" y="0" width="#{USPSFlags::Config::BASE_FLY / 13}" height="#{USPSFlags::Config::BASE_HOIST}" fill="#FFFFFF" />
-      <rect x="#{USPSFlags::Config::BASE_FLY * 12 / 13}" y="0" width="#{USPSFlags::Config::BASE_FLY / 13}" height="#{USPSFlags::Config::BASE_HOIST}" fill="#{USPSFlags::Config::BLUE}" />
       <rect x="0" y="0" width="#{USPSFlags::Config::BASE_FLY * 6 / 13}" height="1000" fill="#{USPSFlags::Config::RED}" />
     SVG
-    # <circle cx="#{USPSFlags::Config::BASE_FLY*3/13}" cy="#{USPSFlags::Config::BASE_HOIST/4}" r="#{USPSFlags::Config::BASE_FLY*6/13*5/16}" fill="#FFFFFF" fill-opacity="0.6" />
+  end
+
+  def white_stripe(index)
+    <<~SVG
+      <rect x="#{USPSFlags::Config::BASE_FLY * index / 13}" y="0" width="#{USPSFlags::Config::BASE_FLY / 13}" height="#{USPSFlags::Config::BASE_HOIST}" fill="#FFFFFF" />
+    SVG
+  end
+
+  def blue_stripe(index)
+    <<~SVG
+      <rect x="#{USPSFlags::Config::BASE_FLY * index / 13}" y="0" width="#{USPSFlags::Config::BASE_FLY / 13}" height="#{USPSFlags::Config::BASE_HOIST}" fill="#{USPSFlags::Config::BLUE}" />
+    SVG
   end
 
   def star_circle
-    svg = ''
-    (0..13).each do |i|
-      rotation = i * (360.0 / 13)
-      svg << <<~SVG
-        <g transform="scale(0.375)">
-          <g transform="translate(1885, 465)">
-            <g transform="rotate(#{rotation}, 0, 900)">
-              #{USPSFlags::Core.star}
-            </g>
+    svg = +''
+
+    (0..13).each { |i| svg << rotated_star(i * (360.0 / 13)) }
+
+    svg
+  end
+
+  def rotated_star(rotation)
+    <<~SVG
+      <g transform="scale(0.375)">
+        <g transform="translate(1885, 465)">
+          <g transform="rotate(#{rotation}, 0, 900)">
+            #{USPSFlags::Core.star}
           </g>
         </g>
-      SVG
-    end
-    svg
+      </g>
+    SVG
   end
 end

data/lib/usps_flags/core/field.rb

@@ -8,24 +8,13 @@ class USPSFlags::Core::Field
   def initialize(style: :regular, color: :white, fly: USPSFlags::Config::BASE_FLY)
     @style = style
     @fly = fly
-    case color
-    when :white
-      border = true
-      @color_code = '#FFFFFF'
-      @past_mid_color = USPSFlags::Config::BLUE
-      @past_tail_color = USPSFlags::Config::RED
-    when :red
-      border = false
-      @color_code = USPSFlags::Config::RED
-      @past_mid_color = '#FFFFFF'
-      @past_tail_color = USPSFlags::Config::BLUE
-    when :blue
-      border = false
-      @color_code = USPSFlags::Config::BLUE
-      @past_mid_color = '#FFFFFF'
-      @past_tail_color = USPSFlags::Config::RED
+    border = color == :white
+    @color_code, @past_mid_color, @past_tail_color = send("#{color}_colors")
+    @border_svg = if border
+      "stroke=\"#000000\" stroke-width=\"#{USPSFlags::Config::BASE_FLY / 600}\" "
+    else
+      ''
     end
-    @border_svg = border ? "stroke=\"#000000\" stroke-width=\"#{USPSFlags::Config::BASE_FLY / 600}\" " : ''
 
     @hoist = (@fly * 2) / 3
   end
@@ -43,6 +32,18 @@ class USPSFlags::Core::Field
 
 private
 
+  def white_colors
+    ['#FFFFFF', USPSFlags::Config::BLUE, USPSFlags::Config::RED]
+  end
+
+  def red_colors
+    [USPSFlags::Config::RED, '#FFFFFF', USPSFlags::Config::BLUE]
+  end
+
+  def blue_colors
+    [USPSFlags::Config::BLUE, '#FFFFFF', USPSFlags::Config::RED]
+  end
+
   def regular_field
     <<~SVG
       <path d="M 0 0
@@ -68,29 +69,45 @@ private
   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}
-          l #{@fly / 2} #{@hoist / 12}
-          l 0 #{@hoist * 10 / 12}
-          l -#{@fly / 2} #{@hoist / 12}
-        " fill="#{@color_code}" />
-        <path d="M #{@fly / 2} #{@hoist / 12}
-          l #{@fly / 4} #{@hoist / 24}
-          l 0 #{@hoist * 9 / 12}
-          l -#{@fly / 4} #{@hoist / 24}
-        " fill="#{@past_mid_color}" />
-        <path d="M #{@fly * 3 / 4} #{@hoist * 3 / 24}
-          l #{@fly / 4} #{@hoist / 24}
-          l -#{@fly / 5} #{@hoist / 3}
-          l #{@fly / 5} #{@hoist / 3}
-          l -#{@fly / 4} #{@hoist / 24}
-        " fill="#{@past_tail_color}" />
-        <path d="M 0 0
-          l #{@fly} #{@hoist / 6}
-          l -#{@fly / 5} #{@hoist / 3}
-          l #{@fly / 5} #{@hoist / 3}
-          l -#{@fly} #{@hoist / 6} z
-        " fill="none" stroke="#000000" stroke-width="#{USPSFlags::Config::BASE_FLY / 600}" />
+        <path d="M 0 #{USPSFlags::Config::BASE_FLY / 600} #{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}" />
       </g>
     SVG
   end
+
+  def past_line_one
+    <<~SVG
+      l #{@fly / 2} #{@hoist / 12}
+      l 0 #{@hoist * 10 / 12}
+      l -#{@fly / 2} #{@hoist / 12}
+    SVG
+  end
+
+  def past_line_two
+    <<~SVG
+      l #{@fly / 4} #{@hoist / 24}
+      l 0 #{@hoist * 9 / 12}
+      l -#{@fly / 4} #{@hoist / 24}
+    SVG
+  end
+
+  def past_line_three
+    <<~SVG
+      l #{@fly / 4} #{@hoist / 24}
+      l -#{@fly / 5} #{@hoist / 3}
+      l #{@fly / 5} #{@hoist / 3}
+      l -#{@fly / 4} #{@hoist / 24}
+    SVG
+  end
+
+  def past_line_four
+    <<~SVG
+    l #{@fly} #{@hoist / 6}
+    l -#{@fly / 5} #{@hoist / 3}
+    l #{@fly / 5} #{@hoist / 3}
+    l -#{@fly} #{@hoist / 6}
+    SVG
+  end
 end

data/lib/usps_flags/core/headers.rb

@@ -12,21 +12,38 @@ class USPSFlags::Core::Headers
     scale ||= 3
     @generated_at = Time.now.strftime('%Y%m%d.%H%S%z')
 
-    if @width.nil? || @height.nil?
-      @width = USPSFlags::Config::BASE_FLY / scale
-      @height = (@width * Rational(2, 3)).to_i
-      @view_width = USPSFlags::Config::BASE_FLY
-      @view_height = USPSFlags::Config::BASE_HOIST
-      set_pennant_height(@height) if pennant
-    else
-      @view_width = width * scale
-      @view_height = height * scale
-    end
+    return no_sizes(scale, pennant) if @width.nil? || @height.nil?
+
+    @view_width = width * scale
+    @view_height = height * scale
   end
 
   def svg
-    svg = ''
-    svg << <<~SVG
+    svg = +''
+    svg << header_top
+    svg << trademark unless @title == 'US Ensign'
+    svg << '</metadata>'
+
+    svg
+  end
+
+private
+
+  def no_sizes(scale, pennant)
+    @width = USPSFlags::Config::BASE_FLY / scale
+    @height = (@width * Rational(2, 3)).to_i
+    @view_width = USPSFlags::Config::BASE_FLY
+    @view_height = USPSFlags::Config::BASE_HOIST
+    set_pennant_height(@height) if pennant
+  end
+
+  def set_pennant_height(height)
+    @height = height / 4
+    @view_height = USPSFlags::Config::BASE_HOIST / 4
+  end
+
+  def header_top
+    <<~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">
@@ -35,25 +52,12 @@ class USPSFlags::Core::Headers
       <desc id="created-by">Julian Fiander</desc>
       <desc id="generated-at">#{@generated_at}</desc>
     SVG
-
-    unless @title == 'US Ensign'
-      svg << <<~SVG
-        <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>
-      SVG
-    end
-
-    svg << <<~SVG
-      </metadata>
-    SVG
-
-    svg
   end
 
-private
-
-  def set_pennant_height(height)
-    @height = height / 4
-    @view_height = USPSFlags::Config::BASE_HOIST / 4
+  def trademark
+    <<~SVG
+      <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>
+    SVG
   end
 end

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

@@ -6,27 +6,21 @@
 # @private
 class USPSFlags::Core::Icons::Star
   def svg
-    points = [
-      [117.555,   81.805],
-      [-41.47,  -137.085],
-      [114.125,  -86.525],
-      [-143.185,  -2.915],
-      [-47.025, -135.28],
-      [-47.025,  135.28],
-      [-143.185,  2.915],
-      [114.125,  86.525],
-      [-41.47,  137.085],
-      [117.555, -81.805]
-    ]
-
     svg = "<path d=\"M 0 0\n"
-
-    points.each do |x, y|
-      svg << "l #{x} #{y}\n"
-    end
-
+    points.each { |x, y| svg << "l #{x} #{y}\n" }
     svg << "\" fill=\"#FFFFFF\" />\n"
 
     svg
   end
+
+private
+
+  def points
+    [
+      [117.555,   81.805], [-41.47,  -137.085], [114.125,  -86.525],
+      [-143.185,  -2.915], [-47.025, -135.28], [-47.025,  135.28],
+      [-143.185,  2.915], [114.125,  86.525], [-41.47,  137.085],
+      [117.555, -81.805]
+    ]
+  end
 end