usps_flags 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66522ba47851bcb474d636cc17c8dcb62e25d32564893abfb93e9c3408b9b421
-  data.tar.gz: d9129013df7517b33e534bb6405ee20a2008e19b3236c04169e45278f46f8fdc
+  metadata.gz: e50d14a11c735b4f9f42cdf1e900ab1b30613e09316ce57c27ce6453b9d3d5ae
+  data.tar.gz: 59a5f3523c03d5ceb97d7596923ea53c322f8fe9701d23bd5bca1d1d4f7956ce
 SHA512:
-  metadata.gz: 4092e043b877705349f24a2fd0ee3733bb2e7b0e75ddbed6f7bf1f1bb3aa1ac6a147c9ff3f69baf779332f7db1e5fb96f8f2480079231d21df181de605856e62
-  data.tar.gz: 4654f83943621648bde190a5bce5e889729ad138fb445017ba20c401bc0f6b2d5790b5b232a3906784f1bfa4fec854334db3351c3a04b680db19f145cf1f226c
+  metadata.gz: e21147c8d7ce0d667d5a128a39552c1039508aeb58c1f5935a95269f108c15004509d0303234bdfd72373ecc348da6026a2af2cb0f2a6271c179629342e283e0
+  data.tar.gz: 2481de64b0dbe9c5e3d9b09f0f28a7ccd39f83d878dc8db5dbba17c12cc14f89c4e62ac9c3cc1767e20d540a05782bc93eca674c73a6a2b9462b1029146e629e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    usps_flags (0.6.1)
+    usps_flags (0.6.2)
       file_utils (~> 1.1, >= 1.1.2)
       mini_magick (~> 4.9, >= 4.9.4)
       rubyzip (~> 1.3, >= 1.3.0)

data/lib/usps_flags/core.rb

@@ -10,8 +10,8 @@ class USPSFlags
       USPSFlags::Core::TridentSpecs::Build.new(fly: fly, unit: unit, scaled_border: scaled_border).svg
     end
 
-    def self.intersection_spec(fly: 24, unit: 'in', scaled_border: false)
-      USPSFlags::Core::TridentSpecs::Build.new(fly: fly, unit: unit, scaled_border: scaled_border).intersections
+    def self.intersection_spec(scaled_border: false)
+      USPSFlags::Core::TridentSpecs::BuildIntersections.new(scaled_border: scaled_border).svg
     end
 
     def self.headers(width: nil, height: nil, pennant: false, scale: nil, title: 'USPS Flag')

data/lib/usps_flags/core/trident_specs.rb

@@ -18,6 +18,7 @@ class USPSFlags
       require 'usps_flags/core/trident_specs/long'
       require 'usps_flags/core/trident_specs/circle'
       require 'usps_flags/core/trident_specs/build'
+      require 'usps_flags/core/trident_specs/build_intersections'
     end
   end
 end

data/lib/usps_flags/core/trident_specs/build.rb

@@ -24,17 +24,6 @@ class USPSFlags
           svg
         end
 
-        def intersections
-          # Static labeling
-          @fly = Rational(2048, 5)
-          @unit = ''
-
-          svg = spec_header(no_measurements: true)
-          svg << add_intersections
-
-          svg
-        end
-
       private
 
         def box_left
@@ -64,71 +53,6 @@ class USPSFlags
             add_trident(:Long, box_top, box_bottom, box_left, box_right)
         end
 
-        def add_intersections
-          svg = +''
-
-          svg += "<g transform=\"translate(-#{BF * 1 / 16}, #{BH / 4}) scale(0.6)\">"
-          svg += USPSFlags::Core::Tridents.cc(trident_color: :blue)
-          svg += cc_label
-          svg += '</g>'
-
-          svg += "<g transform=\"translate(#{BF * 7 / 16}, #{BH / 4}) scale(0.6)\">"
-          svg += USPSFlags::Core::Tridents.vc(trident_color: :red)
-          svg += vc_label
-          svg += '</g>'
-
-          svg
-        end
-
-        def cc_label
-          offset = BF.to_f * 1 / 32
-          height = BF.to_f * 15 / 64
-
-          small_arrow = SA.vertical(
-            offset, -height / 3, 0,
-            pointer_top: height / 3, pointer_bottom: 0, label_offset: BF / 35,
-            label_offset_y: -BF / 50, label_align: 'middle', fly: @fly, unit: @unit
-          )
-
-          <<~SVG
-            <!-- CC Intersection -->
-              <g transform="translate(#{BF / 2}, #{BH - 200}) rotate(45)">
-                #{big_arrow}
-                #{small_arrow}
-              </g>
-          SVG
-        end
-
-        def vc_label
-          offset = BF.to_f * 1 / 32
-          height = BF.to_f * 15 / 64
-
-          small_arrow = SA.vertical(
-            offset, -height * 15 / 32, 0,
-            pointer_top: height * 15 / 32, pointer_bottom: 0, label_offset: BF / 35,
-            label_offset_y: -BF / 50, label_align: 'middle', fly: @fly, unit: @unit
-          )
-
-          <<~SVG
-            <!-- CC Intersection -->
-              <g transform="translate(#{BF / 2}, #{BH - 200}) rotate(45)">
-                #{big_arrow}
-                #{small_arrow}
-              </g>
-          SVG
-        end
-
-        def big_arrow
-          offset = BF * 1 / 32
-          height = BF * 15 / 64
-
-          SA.vertical(
-            offset * 3, -height, 0,
-            pointer_top: height, pointer_bottom: 0, label_offset: BF / 60,
-            label_offset_y: -BF / 10, label_align: 'left', fly: @fly, unit: @unit
-          )
-        end
-
         def configure_sizes(fly)
           @fly = Rational(fly)
           get_hoist_from_fly(@fly)
@@ -185,10 +109,10 @@ class USPSFlags
           end
         end
 
-        def spec_header(no_measurements: false)
+        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, no_measurements: no_measurements
+            unit_text: @unit_text, scaled_border: @scaled_border
           ).p
         end
 

data/lib/usps_flags/core/trident_specs/build_intersections.rb

@@ -0,0 +1,118 @@
+# frozen_string_literal: false
+
+# Core SVG data for the trident intersections specification sheet.
+#
+# This class should never need to be called directly.
+# @private
+class USPSFlags
+  class Core
+    module TridentSpecs
+      class BuildIntersections
+        def initialize(scaled_border: false)
+          @scaled_border = scaled_border
+          configure_sizes(Rational(2048, 5))
+          configure_labels('')
+        end
+
+        def svg
+          svg = spec_header
+          svg << add_cc_intersection
+          svg << add_vc_intersection
+          svg
+        end
+
+      private
+
+        def add_cc_intersection
+          svg = +''
+
+          svg += "<g transform=\"translate(-#{BF * 1 / 16}, #{BH / 4}) scale(0.6)\">"
+          svg += USPSFlags::Core::Tridents.cc(trident_color: :blue)
+          svg += label('CC', Rational(1, 3))
+          svg += '</g>'
+
+          svg
+        end
+
+        def add_vc_intersection
+          svg = +''
+
+          svg += "<g transform=\"translate(#{BF * 7 / 16}, #{BH / 4}) scale(0.6)\">"
+          svg += USPSFlags::Core::Tridents.vc(trident_color: :red)
+          svg += label('VC', Rational(15, 32))
+          svg += '</g>'
+
+          svg
+        end
+
+        def label_offset
+          BF.to_f * 1 / 32
+        end
+
+        def label_height
+          BF.to_f * 15 / 64
+        end
+
+        def label(type, fraction)
+          <<~SVG
+            <!-- #{type} Intersection -->
+              <g transform="translate(#{BF / 2}, #{BH - 200}) rotate(45)">
+                #{big_arrow}
+                #{small_arrow(fraction)}
+              </g>
+          SVG
+        end
+
+        def small_arrow(fraction)
+          SA.vertical(
+            label_offset, -label_height * fraction, 0,
+            pointer_top: label_height * fraction, pointer_bottom: 0, label_offset: BF / 35,
+            label_offset_y: -BF / 50, label_align: 'middle', fly: @fly, unit: @unit
+          )
+        end
+
+        def big_arrow
+          SA.vertical(
+            label_offset * 3, -label_height, 0,
+            pointer_top: label_height, pointer_bottom: 0, label_offset: BF / 60,
+            label_offset_y: -BF / 10, label_align: 'left', fly: @fly, unit: @unit
+          )
+        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 = hoist
+        end
+
+        def configure_hoist_fraction
+          @hoist, @hoist_fraction = USPSFlags::Rational.new(@hoist).to_simplified_a
+        end
+
+        def configure_fly_fraction
+          @fly, @fly_fraction = USPSFlags::Rational.new(@fly).to_simplified_a
+        end
+
+        def configure_labels(unit)
+          @label_font_size = BF / 60
+
+          @unit_text = unit.nil? ? '' : unit.to_s
+          @unit = unit
+        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, no_measurements: true
+          ).p
+        end
+      end
+    end
+  end
+end

data/lib/usps_flags/generate.rb

@@ -110,10 +110,10 @@ class USPSFlags
       # @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 intersection_spec(outfile: nil, fly: USPSFlags::Config::BASE_FLY, unit: nil, scale: nil, scaled_border: false)
+      def intersection_spec(outfile: nil, scale: nil, scaled_border: false)
         svg = +''
         svg << USPSFlags::Core.headers(scale: scale, title: 'USPS Trident Specifications')
-        svg << USPSFlags::Core.intersection_spec(fly: fly, unit: unit, scaled_border: scaled_border)
+        svg << USPSFlags::Core.intersection_spec(scaled_border: scaled_border)
         svg << USPSFlags::Core.footer
 
         USPSFlags::Helpers.output(svg, outfile: outfile)

data/usps_flags.gemspec

@@ -2,8 +2,8 @@
 
 Gem::Specification.new do |s|
   s.name          = 'usps_flags'
-  s.version       = '0.6.1'
-  s.date          = '2020-08-03'
+  s.version       = '0.6.2'
+  s.date          = '2020-08-04'
   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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: usps_flags
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Julian Fiander
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-03 00:00:00.000000000 Z
+date: 2020-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: file_utils
@@ -194,7 +194,6 @@ files:
 - lib/usps_flags/config.rb
 - lib/usps_flags/configuration.rb
 - lib/usps_flags/core.rb
-- lib/usps_flags/core/CC.svg
 - lib/usps_flags/core/ensign.rb
 - lib/usps_flags/core/field.rb
 - lib/usps_flags/core/footer.rb
@@ -211,6 +210,7 @@ files:
 - lib/usps_flags/core/trident_specs.rb
 - lib/usps_flags/core/trident_specs/base.rb
 - lib/usps_flags/core/trident_specs/build.rb
+- lib/usps_flags/core/trident_specs/build_intersections.rb
 - lib/usps_flags/core/trident_specs/circle.rb
 - lib/usps_flags/core/trident_specs/delta.rb
 - lib/usps_flags/core/trident_specs/header.rb
@@ -263,8 +263,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Flag generator for United States Power Squadrons

data/lib/usps_flags/core/CC.svg

@@ -1,125 +0,0 @@
-<?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="1024" height="682" viewBox="-3.072 -4.096 3084.288 2058.24" preserveAspectRatio="xMidYMid meet">
-<title>CC</title>
-<metadata>
-<desc id="created-by">Julian Fiander</desc>
-<desc id="generated-at">20200216.1756-0500</desc>
-<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>
-</metadata><path d="M 0 0
-  l 3072 0
-  l 0 2048
-  l -3072 0
-  l 0 -2048 z
-" fill="#012169" />
-<g transform="translate(-354, 236)">
-  <g transform="rotate(-45, 1536, 1024)">
-<path d="M 1536 256
-l 80 184
-l -40 -24
-l 0 1376
-l -80 0
-l 0 -1376
-l -40 24
-l 80 -184
-" fill="#FFFFFF" />
-<path d="M 1296 784
-l 480 0
-l 0 80
-l -480 0
-l 0 -80
-" fill="#FFFFFF" />
-<path d="M 1296 785
-l 0 -464
-l 120 168
-l -40 0
-l 0 296
-" fill="#FFFFFF" />
-<path d="M 1776 785
-l 0 -464
-l -120 168
-l 40 0
-l 0 296
-" fill="#FFFFFF" />
-<path d="M 1400 944
-l 273 0
-l 0 80
-l -273 0
-l 0 -80
-" fill="#FFFFFF" />
-</g>
-</g>
-
-<path d="M 1536 256
-l 80 184
-l -40 -24
-l 0 1376
-l -80 0
-l 0 -1376
-l -40 24
-l 80 -184
-" fill="#FFFFFF" />
-<path d="M 1296 784
-l 480 0
-l 0 80
-l -480 0
-l 0 -80
-" fill="#FFFFFF" />
-<path d="M 1296 785
-l 0 -464
-l 120 168
-l -40 0
-l 0 296
-" fill="#FFFFFF" />
-<path d="M 1776 785
-l 0 -464
-l -120 168
-l 40 0
-l 0 296
-" fill="#FFFFFF" />
-<path d="M 1400 944
-l 273 0
-l 0 80
-l -273 0
-l 0 -80
-" fill="#FFFFFF" />
-
-<g transform="translate(354, 236)">
-  <g transform="rotate(45, 1536, 1024)">
-<path d="M 1536 256
-l 80 184
-l -40 -24
-l 0 1376
-l -80 0
-l 0 -1376
-l -40 24
-l 80 -184
-" fill="#FFFFFF" />
-<path d="M 1296 784
-l 480 0
-l 0 80
-l -480 0
-l 0 -80
-" fill="#FFFFFF" />
-<path d="M 1296 785
-l 0 -464
-l 120 168
-l -40 0
-l 0 296
-" fill="#FFFFFF" />
-<path d="M 1776 785
-l 0 -464
-l -120 168
-l 40 0
-l 0 296
-" fill="#FFFFFF" />
-<path d="M 1400 944
-l 273 0
-l 0 80
-l -273 0
-l 0 -80
-" fill="#FFFFFF" />
-</g>
-</g>
-</svg>