usps_flags 0.5.0 → 0.5.1

data/lib/usps_flags/core/icons/trident_parts/hashes.rb

@@ -4,66 +4,73 @@
 #
 # These methods should never need to be called directly.
 # @private
-module USPSFlags::Core::Icons::TridentParts
-  module Hashes
-    def delta_hash
-      <<~SVG
-        <polyline mask="url(#delta-mask)" fill="#{@color_code}" points="#{delta_mask_points(@trident_config[:center_point], @trident_config[:height][:d], @trident_config[:delta_from_bottom])}" />
-        <mask id="delta-mask">
-          <g>
-            <rect x="0" y="0" width="#{USPSFlags::Config::BASE_FLY}" height="#{USPSFlags::Config::BASE_FLY}" fill="#FFFFFF" />
-            <polyline transform="scale(#{@trident_config[:delta_gap_scale]}) translate(#{@trident_config[:delta_gap_x]},#{@trident_config[:delta_gap_y]})" fill="#000000" points="#{delta_points(@trident_config[:center_point], @trident_config[:height][:d], @trident_config[:delta_from_bottom])}" />
-          </g>
-        </mask>
-      SVG
-    end
+class USPSFlags
+  class Core
+    module Icons
+      class TridentParts
+        module Hashes
+          def delta_hash
+            <<~SVG
+              <polyline mask="url(#delta-mask)" fill="#{@color_code}" points="#{delta_mask_points(@trident_config[:center_point], @trident_config[:height][:d], @trident_config[:delta_from_bottom])}" />
+              <mask id="delta-mask">
+                <g>
+                  <rect x="0" y="0" width="#{USPSFlags::Config::BASE_FLY}" height="#{USPSFlags::Config::BASE_FLY}" fill="#FFFFFF" />
+                  <polyline transform="scale(#{@trident_config[:delta_gap_scale]}) translate(#{@trident_config[:delta_gap_x]},#{@trident_config[:delta_gap_y]})" fill="#000000" points="#{delta_points(@trident_config[:center_point], @trident_config[:height][:d], @trident_config[:delta_from_bottom])}" />
+                </g>
+              </mask>
+            SVG
+          end
 
-    def delta_mask_points(center, height, bottom)
-      top = @top_point + height - bottom
-      <<~SVG
-        #{center}, #{top - @trident_config[:delta_height]}
-        #{center + @trident_config[:width] / 2}, #{top}
-        #{center - @trident_config[:width] / 2}, #{top}
-        #{center}, #{top - @trident_config[:delta_height]}
-      SVG
-    end
+          def delta_mask_points(center, height, bottom)
+            top = @top_point + height - bottom
+            <<~SVG
+              #{center}, #{top - @trident_config[:delta_height]}
+              #{center + @trident_config[:width] / 2}, #{top}
+              #{center - @trident_config[:width] / 2}, #{top}
+              #{center}, #{top - @trident_config[:delta_height]}
+            SVG
+          end
 
-    def delta_points(center, height, bottom)
-      top = @top_point + height - bottom - @trident_config[:delta_height]
-      mid = @top_point + height - bottom * 17 / 20
-      <<~SVG
-        #{center}, #{top}
-        #{center + @trident_config[:width] / 2}, #{mid}
-        #{center - @trident_config[:width] / 2}, #{mid}
-        #{center}, #{top}
-      SVG
-    end
+          def delta_points(center, height, bottom)
+            top = @top_point + height - bottom - @trident_config[:delta_height]
+            mid = @top_point + height - bottom * 17 / 20
+            <<~SVG
+              #{center}, #{top}
+              #{center + @trident_config[:width] / 2}, #{mid}
+              #{center - @trident_config[:width] / 2}, #{mid}
+              #{center}, #{top}
+            SVG
+          end
 
-    def circle_hash
-      center = @trident_config[:center_point]
-      <<~SVG
-        <circle cx="#{center}" cy="#{@top_point + @circle_from_top}" r="#{@trident_config[:width] / 2}" fill="#{@color_code}" mask="url(#circle-mask)" />
-        <mask id="circle-mask">
-          <g>
-            <rect x="0" y="0" width="#{USPSFlags::Config::BASE_FLY}" height="#{USPSFlags::Config::BASE_FLY}" fill="#FFFFFF" />
-            <circle cx="#{center}" cy="#{@top_point + @circle_from_top}" r="#{@trident_config[:width] / 2 - @trident_config[:bar_width]}" fill="#000000" />
-          </g>
-        </mask>
-        <mask id="circle-mask-for-main-spike">
-          <g transform="scale(1.05) translate(-@trident_config[:br_width], -@trident_config[:br_width]/2)">
-            <rect x="0" y="0" width="#{USPSFlags::Config::BASE_FLY}" height="#{USPSFlags::Config::BASE_FLY}" fill="#FFFFFF" />
-            <circle cx="#{center}" cy="#{@top_point + @circle_from_top}" r="#{@trident_config[:width] / 2 - @trident_config[:bar_width]}" fill="#000000" />
-          </g>
-        </mask>
-      SVG
-    end
+          def circle_hash
+            center = @trident_config[:center_point]
+            <<~SVG
+              <circle cx="#{center}" cy="#{@top_point + @circle_from_top}" r="#{@trident_config[:width] / 2}" fill="#{@color_code}" mask="url(#circle-mask)" />
+              <mask id="circle-mask">
+                <g>
+                  <rect x="0" y="0" width="#{USPSFlags::Config::BASE_FLY}" height="#{USPSFlags::Config::BASE_FLY}" fill="#FFFFFF" />
+                  <circle cx="#{center}" cy="#{@top_point + @circle_from_top}" r="#{@trident_config[:width] / 2 - @trident_config[:bar_width]}" fill="#000000" />
+                </g>
+              </mask>
+              <mask id="circle-mask-for-main-spike">
+                <g transform="scale(1.05) translate(-@trident_config[:br_width], -@trident_config[:br_width]/2)">
+                  <rect x="0" y="0" width="#{USPSFlags::Config::BASE_FLY}" height="#{USPSFlags::Config::BASE_FLY}" fill="#FFFFFF" />
+                  <circle cx="#{center}" cy="#{@top_point + @circle_from_top}" r="#{@trident_config[:width] / 2 - @trident_config[:bar_width]}" fill="#000000" />
+                </g>
+              </mask>
+            SVG
+          end
 
-    def standard_hash
-      svg = "<path d=\"M #{(@trident_config[:center_point] - @trident_config[:hash_width] / 2)} #{(@top_point + @hash_from_top)}\n"
-      @lower_hash.each { |x, y| svg << "l #{x} #{y}\n" }
-      svg << "\" fill=\"#{@color_code}\" />\n"
+          def standard_hash
+            x_pos = (@trident_config[:center_point] - @trident_config[:hash_width] / 2)
+            svg = "<path d=\"M #{x_pos} #{(@top_point + @hash_from_top)}\n"
+            @lower_hash.each { |x, y| svg << "l #{x} #{y}\n" }
+            svg << "\" fill=\"#{@color_code}\" />\n"
 
-      svg
+            svg
+          end
+        end
+      end
     end
   end
 end

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

@@ -4,36 +4,42 @@
 #
 # This class should never need to be called directly.
 # @private
-class USPSFlags::Core::Icons::Trumpet
-  def initialize(type: :s)
-    @color = type == :n ? USPSFlags::Config::BLUE : USPSFlags::Config::RED
-    @count = type == :s ? 1 : 2
-  end
+class USPSFlags
+  class Core
+    module Icons
+      class Trumpet
+        def initialize(type: :s)
+          @color = type == :n ? USPSFlags::Config::BLUE : USPSFlags::Config::RED
+          @count = type == :s ? 1 : 2
+        end
 
-  def svg
-    if @count == 2
-      <<~SVG
-        <g transform="translate(1100,-600)"><g transform="rotate(45)">#{trumpet}</g></g>
-        <g transform="translate(-300,1100)"><g transform="rotate(-45)">#{trumpet}</g></g>
-      SVG
-    else
-      trumpet
-    end
-  end
+        def svg
+          if @count == 2
+            <<~SVG
+              <g transform="translate(1100,-600)"><g transform="rotate(45)">#{trumpet}</g></g>
+              <g transform="translate(-300,1100)"><g transform="rotate(-45)">#{trumpet}</g></g>
+            SVG
+          else
+            trumpet
+          end
+        end
 
-private
+      private
 
-  def trumpet
-    <<~SVG
-      <path d="M1139.9999958974363,480.00000000000006
-      c-44.15476410256406,-6.5910035897434796,-116.84910635897381,-20.41065056410247,-114.87185282051291,-47.179479230769175
-      c4.028547230769618,-65.74318056410249,367.85434817948703,-61.23149248717954,369.23087128205134,-2.051282051282101
-      c-4.777324897435847,30.46226187179502,-55.229016102563946,41.4042592820515,-114.87183128205106,49.230751282051415
-      c20.35720646153868,375.0059741538461,27.19074102564059,490.4570292564102,53.33331769230767,1003.0769130769231
-      c87.68105358974367,28.51730900000007,159.61708317948705,60.951568051282266,231.79492435897487,145.6410723076924
-      c-309.3606388717951,-1.4643622051280545,-403.6171671794875,0.35877820512882863,-709.7436194871801,-2.0512861538461493
-      c106.18124384615362,-96.7690410256414,99.88082358974339,-91.1716969230772,229.74356769230792,-141.53843102564088"
-      fill="#{@color}" />
-    SVG
+        def trumpet
+          <<~SVG
+            <path d="M1139.9999958974363,480.00000000000006
+            c-44.15476410256406,-6.5910035897434796,-116.84910635897381,-20.41065056410247,-114.87185282051291,-47.179479230769175
+            c4.028547230769618,-65.74318056410249,367.85434817948703,-61.23149248717954,369.23087128205134,-2.051282051282101
+            c-4.777324897435847,30.46226187179502,-55.229016102563946,41.4042592820515,-114.87183128205106,49.230751282051415
+            c20.35720646153868,375.0059741538461,27.19074102564059,490.4570292564102,53.33331769230767,1003.0769130769231
+            c87.68105358974367,28.51730900000007,159.61708317948705,60.951568051282266,231.79492435897487,145.6410723076924
+            c-309.3606388717951,-1.4643622051280545,-403.6171671794875,0.35877820512882863,-709.7436194871801,-2.0512861538461493
+            c106.18124384615362,-96.7690410256414,99.88082358974339,-91.1716969230772,229.74356769230792,-141.53843102564088"
+            fill="#{@color}" />
+          SVG
+        end
+      end
+    end
   end
 end

data/lib/usps_flags/core/pennant.rb

@@ -4,51 +4,55 @@
 #
 # This class should never need to be called directly.
 # @private
-class USPSFlags::Core::Pennant
-  def initialize(type: :cruise)
-    @type = type.to_s.upcase
-    @fly = USPSFlags::Config::BASE_FLY
-    @hoist = USPSFlags::Config::BASE_HOIST / 4
-  end
-
-  def svg
-    return oic if @type == 'OIC'
-    return cruise if @type == 'CRUISE'
-  end
-
-private
-
-  def oic
-    <<~SVG
-      <polyline fill="#{USPSFlags::Config::BLUE}" points="0 0 #{USPSFlags::Config::BASE_FLY} #{USPSFlags::Config::BASE_HOIST / 8} 0 #{USPSFlags::Config::BASE_HOIST / 4}" />
-    SVG
-  end
-
-  def cruise
-    <<~SVG
-      #{cruise_red}#{cruise_white}#{cruise_blue}
-      <path d="M 0 0 l #{@fly} #{@hoist / 2} l -#{@fly} #{@hoist / 2}" fill="none" stroke="#000000" stroke-width="2" />
-      <g transform=\"translate(385, 340)\">
-        #{USPSFlags::Core.star}
-      </g>"
-    SVG
-  end
-
-  def cruise_red
-    <<~SVG
-      <path d="M 0 0 l #{@fly * 10 / 36} #{@hoist * 5 / 36} l 0 #{@hoist * 26 / 36} l -#{@fly * 10 / 36} #{@hoist * 5 / 36}" fill="#{USPSFlags::Config::RED}" />
-    SVG
-  end
-
-  def cruise_white
-    <<~SVG
-      <path d="M #{@fly * 10 / 36} #{@hoist * 5 / 36} l #{@fly * 11 / 36} #{@hoist * 5.5 / 36} l 0 #{@hoist * 15 / 36} l -#{@fly * 11 / 36} #{@hoist * 5.5 / 36}" fill="#FFFFFF" />
-    SVG
-  end
-
-  def cruise_blue
-    <<~SVG
-      <path d="M #{@fly * 21 / 36} #{@hoist * 10.5 / 36} l #{@fly * 15 / 36} #{@hoist * 7.5 / 36} l -#{@fly * 15 / 36} #{@hoist * 7.5 / 36}" fill="#{USPSFlags::Config::BLUE}" />
-    SVG
+class USPSFlags
+  class Core
+    class Pennant
+      def initialize(type: :cruise)
+        @type = type.to_s.upcase
+        @fly = USPSFlags::Config::BASE_FLY
+        @hoist = USPSFlags::Config::BASE_HOIST / 4
+      end
+
+      def svg
+        return oic if @type == 'OIC'
+        return cruise if @type == 'CRUISE'
+      end
+
+    private
+
+      def oic
+        <<~SVG
+          <polyline fill="#{USPSFlags::Config::BLUE}" points="0 0 #{USPSFlags::Config::BASE_FLY} #{USPSFlags::Config::BASE_HOIST / 8} 0 #{USPSFlags::Config::BASE_HOIST / 4}" />
+        SVG
+      end
+
+      def cruise
+        <<~SVG
+          #{cruise_red}#{cruise_white}#{cruise_blue}
+          <path d="M 0 0 l #{@fly} #{@hoist / 2} l -#{@fly} #{@hoist / 2}" fill="none" stroke="#000000" stroke-width="2" />
+          <g transform=\"translate(385, 340)\">
+            #{USPSFlags::Core.star}
+          </g>"
+        SVG
+      end
+
+      def cruise_red
+        <<~SVG
+          <path d="M 0 0 l #{@fly * 10 / 36} #{@hoist * 5 / 36} l 0 #{@hoist * 26 / 36} l -#{@fly * 10 / 36} #{@hoist * 5 / 36}" fill="#{USPSFlags::Config::RED}" />
+        SVG
+      end
+
+      def cruise_white
+        <<~SVG
+          <path d="M #{@fly * 10 / 36} #{@hoist * 5 / 36} l #{@fly * 11 / 36} #{@hoist * 5.5 / 36} l 0 #{@hoist * 15 / 36} l -#{@fly * 11 / 36} #{@hoist * 5.5 / 36}" fill="#FFFFFF" />
+        SVG
+      end
+
+      def cruise_blue
+        <<~SVG
+          <path d="M #{@fly * 21 / 36} #{@hoist * 10.5 / 36} l #{@fly * 15 / 36} #{@hoist * 7.5 / 36} l -#{@fly * 15 / 36} #{@hoist * 7.5 / 36}" fill="#{USPSFlags::Config::BLUE}" />
+        SVG
+      end
+    end
   end
 end

data/lib/usps_flags/core/trident_spec.rb

@@ -4,137 +4,141 @@
 #
 # This class should never need to be called directly.
 # @private
-class USPSFlags::Core::TridentSpec
-  SA = USPSFlags::Helpers::SpecArrows
-  BF = USPSFlags::Config::BASE_FLY
-  BH = USPSFlags::Config::BASE_HOIST
-
-  def initialize(fly: 24, unit: 'in', scaled_border: false)
-    @config = USPSFlags.configuration.trident
-    @scaled_border = scaled_border
-    configure_sizes(fly)
-    configure_labels(unit)
-  end
-
-  def svg
-    svg = spec_header
-    svg << add_short_trident
-    svg << add_delta_trident
-    svg << add_national_tridents
-
-    svg
-  end
-
-private
-
-  def box_left
-    (BF * 27 / 32) / 2
-  end
-
-  def box_right
-    (BF * 37 / 32) / 2
-  end
-
-  def add_short_trident
-    box_top    = BH / 4
-    box_bottom = BH * 3 / 4
-    add_trident(:Short, box_top, box_bottom, box_left, box_right)
-  end
-
-  def add_delta_trident
-    box_top    = BH * 3 / 16
-    box_bottom = BH * 13 / 16
-    add_trident(:Delta, box_top, box_bottom, box_left, box_right)
-  end
-
-  def add_national_tridents
-    box_top    = BH / 8
-    box_bottom = BH * 7 / 8
-    add_trident(:Circle, box_top, box_bottom, box_left, box_right) +
-    add_trident(:Long, box_top, box_bottom, box_left, box_right)
-  end
-
-  def configure_sizes(fly)
-    @fly = Rational(fly)
-    get_hoist_from_fly(@fly)
-    configure_hoist_fraction
-    configure_fly_fraction
-  end
-
-  def get_hoist_from_fly(fly)
-    hoist = (fly * Rational(2, 3))
-    @hoist = if hoist == hoist.to_i
-      hoist.to_i
-    else
-      hoist
-    end
-  end
-
-  def configure_hoist_fraction
-    @hoist_fraction = ''
-    if @hoist == @hoist.to_i
-      @hoist = @hoist.to_i
-    else
-      @hoist, @hoist_fraction = @hoist.to_simplified_a
-    end
-  end
-
-  def configure_fly_fraction
-    @fly_fraction = ''
-    if @fly == @fly.to_i
-      @fly = @fly.to_i
-    else
-      @fly, @fly_fraction = @fly.to_simplified_a
-    end
-  end
-
-  def configure_labels(unit)
-    @label_font_size = if Math.sqrt(@fly) > 24
-      BF * Math.log(24, Math.sqrt(@fly)) / 60
-    else
-      BF / 60
-    end
-
-    @unit_text = unit.nil? ? '' : "#{unit}"
-    @unit = unit
-
-    configure_barb_label
-  end
-
-  def configure_barb_label
-    barb_label = Rational(@config[:main_point_barb]) * @fly / BF
-    @barb_label = if barb_label == barb_label.to_i
-      "#{barb_label.to_i}#{@unit_text}"
-    else
-      "#{barb_label.to_simplified_s}#{@unit_text}"
+class USPSFlags
+  class Core
+    class TridentSpec
+      SA = USPSFlags::Helpers::SpecArrows
+      BF = USPSFlags::Config::BASE_FLY
+      BH = USPSFlags::Config::BASE_HOIST
+
+      def initialize(fly: 24, unit: 'in', scaled_border: false)
+        @config = USPSFlags.configuration.trident
+        @scaled_border = scaled_border
+        configure_sizes(fly)
+        configure_labels(unit)
+      end
+
+      def svg
+        svg = spec_header
+        svg << add_short_trident
+        svg << add_delta_trident
+        svg << add_national_tridents
+
+        svg
+      end
+
+    private
+
+      def box_left
+        (BF * 27 / 32) / 2
+      end
+
+      def box_right
+        (BF * 37 / 32) / 2
+      end
+
+      def add_short_trident
+        box_top    = BH / 4
+        box_bottom = BH * 3 / 4
+        add_trident(:Short, box_top, box_bottom, box_left, box_right)
+      end
+
+      def add_delta_trident
+        box_top    = BH * 3 / 16
+        box_bottom = BH * 13 / 16
+        add_trident(:Delta, box_top, box_bottom, box_left, box_right)
+      end
+
+      def add_national_tridents
+        box_top    = BH / 8
+        box_bottom = BH * 7 / 8
+        add_trident(:Circle, box_top, box_bottom, box_left, box_right) +
+          add_trident(:Long, box_top, box_bottom, box_left, box_right)
+      end
+
+      def configure_sizes(fly)
+        @fly = Rational(fly)
+        get_hoist_from_fly(@fly)
+        configure_hoist_fraction
+        configure_fly_fraction
+      end
+
+      def get_hoist_from_fly(fly)
+        hoist = (fly * Rational(2, 3))
+        @hoist = if hoist == hoist.to_i
+          hoist.to_i
+        else
+          hoist
+        end
+      end
+
+      def configure_hoist_fraction
+        @hoist_fraction = ''
+        if @hoist == @hoist.to_i
+          @hoist = @hoist.to_i
+        else
+          @hoist, @hoist_fraction = USPSFlags::Rational.new(@hoist).to_simplified_a
+        end
+      end
+
+      def configure_fly_fraction
+        @fly_fraction = ''
+        if @fly == @fly.to_i
+          @fly = @fly.to_i
+        else
+          @fly, @fly_fraction = USPSFlags::Rational.new(@fly).to_simplified_a
+        end
+      end
+
+      def configure_labels(unit)
+        @label_font_size = if Math.sqrt(@fly) > 24
+          BF * Math.log(24, Math.sqrt(@fly)) / 60
+        else
+          BF / 60
+        end
+
+        @unit_text = unit.nil? ? '' : unit.to_s
+        @unit = unit
+
+        configure_barb_label
+      end
+
+      def configure_barb_label
+        barb_label = Rational(@config[:main_point_barb]) * @fly / BF
+        @barb_label = if barb_label == barb_label.to_i
+          "#{barb_label.to_i}#{@unit_text}"
+        else
+          "#{USPSFlags::Rational.new(barb_label).to_simplified_s}#{@unit_text}"
+        end
+      end
+
+      def spec_header
+        USPSFlags::Core::TridentSpecs::Header.new(
+          fly: @fly, fly_fraction: @fly_fraction, hoist: @hoist, hoist_fraction: @hoist_fraction,
+          unit_text: @unit_text, scaled_border: @scaled_border
+        ).p
+      end
+
+      def add_trident(type, box_top, box_bottom, box_left, box_right)
+        sym = { Short: :s, Delta: :d, Circle: :stf, Long: :n }[type]
+
+        Object.const_get("USPSFlags::Core::TridentSpecs::#{type}").new(
+          bt: box_top, bb: box_bottom, bl: box_left, br: box_right,
+          fly: @fly, unit: @unit, heading: heading(sym), config: @config
+        ).p
+      end
+
+      def heading(type_sym)
+        type, description = {
+          s: ['Short', 'Squadron Officers'], d: ['Delta', 'District Officers'],
+          stf: ['Circle', 'Staff Commanders Only'], n: ['Long', 'National Officers']
+        }[type_sym]
+
+        <<~SVG
+          <text x="#{BF / 2}" y="#{BH * 1 / 40}" font-family="sans-serif" font-size="#{BH / 30}px" font-weight="bold" fill="#BF0D3E" text-anchor="middle">#{type}</text>
+          <text x="#{BF / 2}" y="#{BH * 5 / 80}" font-family="sans-serif" font-size="#{BH / 40}px" fill="#BF0D3E" text-anchor="middle">#{description}</text>
+        SVG
+      end
     end
   end
-
-  def spec_header
-    USPSFlags::Core::TridentSpecs::Header.new(
-      fly: @fly, fly_fraction: @fly_fraction, hoist: @hoist, hoist_fraction: @hoist_fraction,
-      unit_text: @unit_text, scaled_border: @scaled_border
-    ).p
-  end
-
-  def add_trident(type, box_top, box_bottom, box_left, box_right)
-    sym = { Short: :s, Delta: :d, Circle: :stf, Long: :n }[type]
-
-    Object.const_get("USPSFlags::Core::TridentSpecs::#{type}").new(
-      bt: box_top, bb: box_bottom, bl: box_left, br: box_right,
-      fly: @fly, unit: @unit, heading: heading(sym), config: @config
-    ).p
-  end
-
-  def heading(type_sym)
-    type, description = {
-      s: ['Short', 'Squadron Officers'], d: ['Delta', 'District Officers'],
-      stf: ['Circle', 'Staff Commanders Only'], n: ['Long', 'National Officers']
-    }[type_sym]
-
-    <<~SVG
-      <text x="#{BF / 2}" y="#{BH * 1 / 40}" font-family="sans-serif" font-size="#{BH / 30}px" font-weight="bold" fill="#BF0D3E" text-anchor="middle">#{type}</text>
-      <text x="#{BF / 2}" y="#{BH * 5 / 80}" font-family="sans-serif" font-size="#{BH / 40}px" fill="#BF0D3E" text-anchor="middle">#{description}</text>
-    SVG
-  end
 end