usps_flags 0.5.9 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7668f981b685971d9920b30cdc6fdac6bc7aa98df4b735e9d87deec582e05cb
-  data.tar.gz: 3c0101f8ad5aa5713fec0848040ab67bdf61a37fa8d571a9a612eada714b9aa4
+  metadata.gz: 834c5fd9b07cda04e1abbb43ce057be5bcb75a2338c4c9c9b30bf90e873c70a3
+  data.tar.gz: 2c1967a3acab412d00a70d2b7b529494128daf71c99c9484f8fd5dc51edade5d
 SHA512:
-  metadata.gz: 8f32f4ec49c1ecf428aa9fbea996196fa630472c57f2ab965447ebd2092c8fbd78873303f9a11ddeece882cf99b38167b9b786c557f766e727113f5e129665a3
-  data.tar.gz: 10da9cd1e199d2add0044816d4f902933cf04ecc9a05ae3f8abfdf3addd0876b35360ad9c07c17d92eba2b5f16053751ac69c66fb99e5de0e60b0c30bd3c50f5
+  metadata.gz: 79d043fc636b58a3bc1181716b9a21fb2fe64b552b6e376035b096ea97682aa2d36bb24896ae711b86baef52779c457dadabf17b364cc23500cb1edb1d802145
+  data.tar.gz: 3eef4c97b191637097e01444658635882cb1b4552c2705543b6c0c77e4c5923a211430d1026f9a202d6f637a101128df6224ef5f90e0be070d4b0efa64554ab4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    usps_flags (0.5.9)
+    usps_flags (0.6.0)
       file_utils (~> 1.1, >= 1.1.2)
       mini_magick (~> 4.9, >= 4.9.4)
       rubyzip (~> 1.3, >= 1.3.0)
@@ -15,7 +15,7 @@ GEM
     file_utils (1.1.2)
     jaro_winkler (1.5.4)
     json (2.1.0)
-    mini_magick (4.9.5)
+    mini_magick (4.10.1)
     parallel (1.19.1)
     parser (2.6.5.0)
       ast (~> 2.4.0)

data/lib/usps_flags/core/tridents.rb

@@ -8,30 +8,47 @@ class USPSFlags
   class Core
     class Tridents
       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:)
-          # The side C/C tridents are angled 45 degrees, and intersect the central one at 1/3 up from the bottom
           trident = USPSFlags::Core.trident(type, color: trident_color)
-          x_distance = USPSFlags::Config::BASE_FLY * 4 / 39
-          y_distance = USPSFlags::Config::BASE_FLY * 5 / 78
           <<~SVG
-            <g transform="translate(-#{x_distance}, #{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}, #{y_distance})"><g transform="rotate(45, #{USPSFlags::Config::BASE_FLY / 2}, #{USPSFlags::Config::BASE_HOIST / 2})">\n#{trident}</g></g>
+            <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>
+            #{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:)
-          # V/C tridents are angled 45 degrees, and intersect at 15/32 up from the bottom
           trident = USPSFlags::Core.trident(type, color: trident_color)
-          x_distance = USPSFlags::Config::BASE_FLY * 4 / 55
           <<~SVG
-            <g transform="translate(-#{x_distance})"><g transform="rotate(-45, #{USPSFlags::Config::BASE_FLY / 2}, #{USPSFlags::Config::BASE_HOIST / 2})">\n#{trident}</g></g>
-            <g transform="translate(#{x_distance})"><g transform="rotate(45, #{USPSFlags::Config::BASE_FLY / 2}, #{USPSFlags::Config::BASE_HOIST / 2})">\n#{trident}</g></g>
+            <g transform="translate(132, 50) rotate(-45, #{vc_center[:x]}, #{vc_center[:y]})">
+              #{trident}
+            </g>
+            <g transform="translate(132, 50) rotate(45, #{vc_center[:x]}, #{vc_center[:y]})">
+              #{trident}
+            </g>
           SVG
         end
 
+        # Cdr and D/C tridents are spaced 1/2 the fly apart with the central one 1/4 the fly above the sides
         def three(type, trident_color:, field_color:)
-          # Cdr and D/C tridents are spaced 1/2 the fly apart with the central one 1/4 the fly above the sides
           trident = USPSFlags::Core.trident(type, color: trident_color, field_color: field_color)
           x_distance = USPSFlags::Config::BASE_FLY / 4
           y_distance = USPSFlags::Config::BASE_FLY / 16
@@ -42,8 +59,8 @@ class USPSFlags
           SVG
         end
 
+        # Lt/C and D/Lt/C tridents are spaced 1/3 the fly apart
         def two(type, trident_color:, field_color:)
-          # Lt/C and D/Lt/C tridents are spaced 1/3 the fly apart
           trident = USPSFlags::Core.trident(type, color: trident_color, field_color: field_color)
           x_distance = USPSFlags::Config::BASE_FLY / 6
           <<~SVG
@@ -52,8 +69,8 @@ class USPSFlags
           SVG
         end
 
+        # Swallowtail tridents need to move towards the hoist due to the tails
         def offset(type, field_color:, field: true)
-          # Swallowtail tridents need to move towards the hoist due to the tails
           x_distance = USPSFlags::Config::BASE_FLY / 10 if field
           svg = +''
           svg << "<g transform=\"translate(-#{x_distance})\">" if field
@@ -61,6 +78,29 @@ class USPSFlags
           svg << '</g>' if field
           svg
         end
+
+      private
+
+        def rotation_center(height_fraction)
+          {
+            x: USPSFlags::Config::BASE_FLY / 2,
+            y: (USPSFlags::Config::BASE_HOIST * 7 / 8) - (n_staff_height * height_fraction)
+          }
+        end
+
+        def cc_center
+          rotation_center(Rational(1, 3))
+        end
+
+        def vc_center
+          rotation_center(Rational(15, 32))
+        end
+
+        def n_staff_height
+          top_height = USPSFlags.configuration.trident[:crossbar_from_top]
+          bars = (USPSFlags.configuration.trident[:bar_width] * 3)
+          USPSFlags.configuration.trident_heights[:n] - top_height - bars
+        end
       end
     end
   end

data/lib/usps_flags/helpers.rb

@@ -120,6 +120,7 @@ class USPSFlags
 
         dirs = path.split('/')
         dirs.pop
+        dirs = ['.'] if dirs.empty?
         ::FileUtils.mkdir_p(dirs.join('/')).first
       end
 

data/spec/usps_flags/core_spec.rb

@@ -42,7 +42,7 @@ describe USPSFlags::Core do
             l #{@fly} 0
             l 0 #{@hoist}
             l -#{@fly} 0
-            l 0 -#{@hoist}
+            l 0 -#{@hoist} z
           " fill="#FFFFFF" stroke="#000000" stroke-width="#{USPSFlags::Config::BASE_FLY / 600}" />
         SVG
       )
@@ -55,7 +55,7 @@ describe USPSFlags::Core do
             l #{@fly} 0
             l 0 #{@hoist}
             l -#{@fly} 0
-            l 0 -#{@hoist}
+            l 0 -#{@hoist} z
           " fill="#{@red}" />
         SVG
       )
@@ -78,7 +78,7 @@ describe USPSFlags::Core do
       expect(described_class.field(style: :past, color: :blue)).to eql(
         <<~SVG
           <g transform="translate(2, 1)">
-            <path d="M 0 5 l #{@fly / 2} #{@hoist * 1 / 12}
+            <path d="M 0 2 l #{@fly / 2} #{@hoist * 1 / 12}
           l 0 #{@hoist * 10 / 12}
           l -#{@fly / 2} #{@hoist * 1 / 12}
           " fill="#{@blue}" />

data/spec/usps_flags/generate_spec.rb

@@ -6,7 +6,7 @@ describe USPSFlags::Generate do
   describe 'general features' do
     it 'generates a flag with the correct size' do
       expect(described_class.svg('LtC', outfile: '')).to include(
-        'width="1024" height="682" viewBox="0 0 3072 2048"'
+        'width="1024" height="682" viewBox="-3.072 -4.096 3084.288 2058.24"'
       )
     end
 
@@ -17,7 +17,7 @@ describe USPSFlags::Generate do
             l 3072 0
             l 0 2048
             l -3072 0
-            l 0 -2048
+            l 0 -2048 z
           " fill="#E4002B" />
         SVG
       )
@@ -40,7 +40,7 @@ describe USPSFlags::Generate do
 
   describe 'officer flags' do
     %w[
-      PLTC PC PDLTC PDC PSTFC PRC PVC PCC
+      PLTC PC PDLTC PDC PNFLT PSTFC PRC PVC PCC
       PORTCAP FLEETCAP FLT DAIDE DFLT NAIDE NFLT
       LT 1LT LTC CDR DLT D1LT DLTC DC STFC RC VC CC
     ].each do |flag|

data/spec/usps_flags/helpers_spec.rb

@@ -11,7 +11,7 @@ describe USPSFlags::Helpers do
     it 'returns all officer flags but nothing else when given type :officer' do
       expect(described_class.valid_flags(:officer).sort).to eql(%w[
         PLTC PC PORTCAP FLEETCAP LT FLT 1LT LTC CDR PDLTC PDC DLT DAIDE
-        DFLT D1LT DLTC DC PSTFC PRC PVC PCC NAIDE NFLT STFC RC VC CC
+        DFLT D1LT DLTC DC PNFLT PSTFC PRC PVC PCC NAIDE NFLT STFC RC VC CC
       ].sort)
     end
 

data/spec/usps_flags_spec.rb

@@ -7,7 +7,7 @@ describe USPSFlags do
     @valid_header = <<~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="614" height="409" viewBox="0 0 3072 2048" preserveAspectRatio="xMidYMid meet">
+      <svg version="1.0" xmlns="http://www.w3.org/2000/svg" width="614" height="409" viewBox="-3.072 -4.096 3084.288 2058.24" preserveAspectRatio="xMidYMid meet">
       <title>LTC</title>
       <metadata>
       <desc id="created-by">Julian Fiander</desc>

data/usps_flags.gemspec

@@ -2,8 +2,8 @@
 
 Gem::Specification.new do |s|
   s.name          = 'usps_flags'
-  s.version       = '0.5.9'
-  s.date          = '2019-12-16'
+  s.version       = '0.6.0'
+  s.date          = '2020-02-17'
   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.5.9
+  version: 0.6.0
 platform: ruby
 authors:
 - Julian Fiander
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-16 00:00:00.000000000 Z
+date: 2020-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: file_utils