usps_flags 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 834c5fd9b07cda04e1abbb43ce057be5bcb75a2338c4c9c9b30bf90e873c70a3
-  data.tar.gz: 2c1967a3acab412d00a70d2b7b529494128daf71c99c9484f8fd5dc51edade5d
+  metadata.gz: 66522ba47851bcb474d636cc17c8dcb62e25d32564893abfb93e9c3408b9b421
+  data.tar.gz: d9129013df7517b33e534bb6405ee20a2008e19b3236c04169e45278f46f8fdc
 SHA512:
-  metadata.gz: 79d043fc636b58a3bc1181716b9a21fb2fe64b552b6e376035b096ea97682aa2d36bb24896ae711b86baef52779c457dadabf17b364cc23500cb1edb1d802145
-  data.tar.gz: 3eef4c97b191637097e01444658635882cb1b4552c2705543b6c0c77e4c5923a211430d1026f9a202d6f637a101128df6224ef5f90e0be070d4b0efa64554ab4
+  metadata.gz: 4092e043b877705349f24a2fd0ee3733bb2e7b0e75ddbed6f7bf1f1bb3aa1ac6a147c9ff3f69baf779332f7db1e5fb96f8f2480079231d21df181de605856e62
+  data.tar.gz: 4654f83943621648bde190a5bce5e889729ad138fb445017ba20c401bc0f6b2d5790b5b232a3906784f1bfa4fec854334db3351c3a04b680db19f145cf1f226c

data/.ruby-version

@@ -0,0 +1 @@
+2.5.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    usps_flags (0.6.0)
+    usps_flags (0.6.1)
       file_utils (~> 1.1, >= 1.1.2)
       mini_magick (~> 4.9, >= 4.9.4)
       rubyzip (~> 1.3, >= 1.3.0)
@@ -14,13 +14,13 @@ GEM
     docile (1.1.5)
     file_utils (1.1.2)
     jaro_winkler (1.5.4)
-    json (2.1.0)
+    json (2.3.1)
     mini_magick (4.10.1)
     parallel (1.19.1)
     parser (2.6.5.0)
       ast (~> 2.4.0)
     rainbow (3.0.0)
-    rake (12.3.0)
+    rake (12.3.3)
     rspec (3.7.0)
       rspec-core (~> 3.7.0)
       rspec-expectations (~> 3.7.0)

data/README.md

@@ -1,7 +1,7 @@
 # United States Power Squadrons® Flag Generator
 
 [![Gem Version](https://img.shields.io/gem/v/usps_flags.svg)](https://rubygems.org/gems/usps_flags)
-[![Build Status](https://travis-ci.org/jfiander/usps-flags.svg)](https://travis-ci.org/jfiander/usps-flags)
+[![Build Status](https://img.shields.io/travis/jfiander/usps-flags/master.svg)](https://travis-ci.org/jfiander/usps-flags)
 [![Test Coverage](https://api.codeclimate.com/v1/badges/760b824f0edac3316a11/test_coverage)](https://codeclimate.com/github/jfiander/usps-flags/test_coverage)
 [![Maintainability](https://api.codeclimate.com/v1/badges/760b824f0edac3316a11/maintainability)](https://codeclimate.com/github/jfiander/usps-flags/maintainability)
 

data/lib/usps_flags/core.rb

@@ -10,6 +10,10 @@ 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
+    end
+
     def self.headers(width: nil, height: nil, pennant: false, scale: nil, title: 'USPS Flag')
       USPSFlags::Core::Headers.new(width: width, height: height, pennant: pennant, scale: scale, title: title).svg
     end

data/lib/usps_flags/core/CC.svg

@@ -0,0 +1,125 @@
+<?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>

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

@@ -24,6 +24,17 @@ 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
@@ -53,6 +64,71 @@ 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)
@@ -109,10 +185,10 @@ class USPSFlags
           end
         end
 
-        def spec_header
+        def spec_header(no_measurements: false)
           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
+            unit_text: @unit_text, scaled_border: @scaled_border, no_measurements: no_measurements
           ).p
         end
 

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

@@ -15,6 +15,7 @@ class USPSFlags
           @hoist_fraction = options[:hoist_fraction]
           @unit_text = options[:unit_text]
           @scaled_border = options[:scaled_border]
+          @no_measurements = options.key?(:no_measurements) && options[:no_measurements]
         end
 
         def p
@@ -43,11 +44,21 @@ class USPSFlags
               <text x="#{BF / 2}" y="#{BH * 3 / 40}" font-family="sans-serif" font-size="#{BH / 20}px" font-weight="bold" fill="#041E42" text-anchor="middle">United States Power Squadrons<tspan class="heading" dy ="-#{BH / 50}">®</tspan></text>
             </g>
             <text x="#{BF / 2}" y="#{BH / 8}" font-family="sans-serif" font-size="#{BH / 30}px" fill="#041E42" text-anchor="middle">Officer Flag Trident Specification</text>
+            #{measurements_are_relative}
+          SVG
+        end
+
+        def measurements_are_relative
+          return if @no_measurements
+
+          <<~SVG
             <text x="#{BF / 2}" y="#{BH * 2 / 11}" font-family="sans-serif" font-size="#{BH / 40}px" fill="#041E42" text-anchor="middle">All measurements are relative to a field with</text>
           SVG
         end
 
         def units
+          return angles if @no_measurements
+
           <<~SVG
             <g>
               <style><![CDATA[tspan.title{font-size: #{USPSFlags::Config::FRACTION_SCALE * 9 / 10}%;}]]></style>
@@ -58,6 +69,12 @@ class USPSFlags
           SVG
         end
 
+        def angles
+          <<~SVG
+            <text x="#{BF / 2}" y="#{BH * 4 / 19}" font-family="sans-serif" font-size="#{BH / 40}px" fill="#041E42" text-anchor="middle">Angled tridents are 45 degrees from vertical.</text>
+          SVG
+        end
+
         def scaled_border
           <<~SVG
             <!-- Flag border scaled to spec trident size -->

data/lib/usps_flags/core/tridents.rb

@@ -10,38 +10,32 @@ class USPSFlags
       class << self
         # The side C/C tridents are angled 45 degrees, and intersect the central one at 1/3 up from the bottom
         #
-        # Note: translate(132, 130) corrects the center of rotation for each angled trident due to the (transparent)
-        #   field size of the include trident SVG
-        #
         # Center of rotation:
         # # radius = USPSFlags.configuration.trident[:bar_width] / 2
         # <circle cx="#{cc_center[:x]}" cy="#{cc_center[:y]}" r="#{radius}" fill="red" />
-        def cc(type, trident_color:)
-          trident = USPSFlags::Core.trident(type, color: trident_color)
+        def cc(_ = nil, trident_color:)
+          trident = USPSFlags::Core.trident(:n, color: trident_color)
+          x_distance = USPSFlags::Config::BASE_FLY * 4 / 39 # 4/39 or 28/39
+          y_distance = USPSFlags::Config::BASE_FLY * 2 / 39 # 5/78 or 27/156
           <<~SVG
-            <g transform="translate(132, 130)">
-              <g transform="rotate(-45, #{cc_center[:x]}, #{cc_center[:y]})">
-                #{trident}
-              </g>
-              <g transform="rotate(45, #{cc_center[:x]}, #{cc_center[:y]})">
-                #{trident}
-              </g>
+            <g transform="translate(-#{x_distance * 1.25}, #{y_distance})">
+              <g transform="rotate(-45, #{USPSFlags::Config::BASE_FLY / 2}, #{USPSFlags::Config::BASE_HOIST / 2})">\n#{trident}</g>
+            </g>
+            \n#{trident}
+            <g transform="translate(#{x_distance * 1.25}, #{y_distance})">
+              <g transform="rotate(45)" transform-origin="center">\n#{trident}</g>
             </g>
-            #{trident}
           SVG
         end
 
         # V/C tridents are angled 45 degrees, and intersect at 15/32 up from the bottom
-        #
-        # Note: translate(132, 50) corrects the center of rotation for each angled trident due to the (transparent)
-        #   field size of the include trident SVG
-        def vc(type, trident_color:)
-          trident = USPSFlags::Core.trident(type, color: trident_color)
+        def vc(_ = nil, trident_color:)
+          trident = USPSFlags::Core.trident(:n, color: trident_color)
           <<~SVG
-            <g transform="translate(132, 50) rotate(-45, #{vc_center[:x]}, #{vc_center[:y]})">
+            <g transform="rotate(-45, #{vc_center[:x]}, #{vc_center[:y]})">
               #{trident}
             </g>
-            <g transform="translate(132, 50) rotate(45, #{vc_center[:x]}, #{vc_center[:y]})">
+            <g transform="rotate(45, #{vc_center[:x]}, #{vc_center[:y]})">
               #{trident}
             </g>
           SVG
@@ -84,14 +78,10 @@ class USPSFlags
         def rotation_center(height_fraction)
           {
             x: USPSFlags::Config::BASE_FLY / 2,
-            y: (USPSFlags::Config::BASE_HOIST * 7 / 8) - (n_staff_height * height_fraction)
+            y: (USPSFlags::Config::BASE_HOIST * 7 / 8) - (n_staff_height * height_fraction).to_f
           }
         end
 
-        def cc_center
-          rotation_center(Rational(1, 3))
-        end
-
         def vc_center
           rotation_center(Rational(15, 32))
         end

data/lib/usps_flags/generate.rb

@@ -103,6 +103,22 @@ class USPSFlags
         USPSFlags::Helpers.output(svg, outfile: outfile)
       end
 
+      # Generate trident spec sheet for National Bridge intersections as an SVG image.
+      #
+      # @param [String] outfile The path to save the SVG file to. If not set, prints to console.
+      # @param [Integer] fly The nominal fly length of an appropriate flag field for the generated tridents.
+      # @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)
+        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.footer
+
+        USPSFlags::Helpers.output(svg, outfile: outfile)
+      end
+
     private
 
       def special_flag(flag, outfile, scale)

data/spec/usps_flags/generate_spec.rb

@@ -88,6 +88,10 @@ describe USPSFlags::Generate do
     it 'generates the trident specification sheet with a fractional field size' do
       expect(described_class.spec(outfile: '', fly: 23.5)).to include('<title>USPS Trident Specifications</title>')
     end
+
+    it 'generates the intersection specification sheet' do
+      expect(described_class.intersection_spec(outfile: '')).to include('CC Intersection')
+    end
   end
 
   describe 'png' do

data/usps_flags.gemspec

@@ -2,8 +2,8 @@
 
 Gem::Specification.new do |s|
   s.name          = 'usps_flags'
-  s.version       = '0.6.0'
-  s.date          = '2020-02-17'
+  s.version       = '0.6.1'
+  s.date          = '2020-08-03'
   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.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Julian Fiander
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-17 00:00:00.000000000 Z
+date: 2020-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: file_utils
@@ -179,8 +179,10 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
+- ".ruby-version"
 - ".travis.yml"
 - ".yardopts"
+- CC.png
 - CONTRIBUTING.md
 - Gemfile
 - Gemfile.lock
@@ -192,6 +194,7 @@ 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