usps_flags 0.5.8 → 0.5.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d178e622dbc6370cd277324673a7f9ee15c0adcf7e3b0d59a34f6499b73ca98
-  data.tar.gz: c3eb0cf858463f11624f4474ce5e13cffe5f75698f2c80cf3ad0558df3028d4c
+  metadata.gz: f7668f981b685971d9920b30cdc6fdac6bc7aa98df4b735e9d87deec582e05cb
+  data.tar.gz: 3c0101f8ad5aa5713fec0848040ab67bdf61a37fa8d571a9a612eada714b9aa4
 SHA512:
-  metadata.gz: bf09d8306ee9bc6da4405a89e79f71866c8a36041b003033c7f40bf6e8070f3feb7f12c5b1dad473beb57b7a0d26a641b093aef5828962e6df5fe3a84943d6dd
-  data.tar.gz: 9f312f4248f69039910e6d04f879a0eb733044101b0d76511e66cef06a9ecc83857aea05503a98eddcd225b7997d5eba7955741a15837799883bf051b0c95986
+  metadata.gz: 8f32f4ec49c1ecf428aa9fbea996196fa630472c57f2ab965447ebd2092c8fbd78873303f9a11ddeece882cf99b38167b9b786c557f766e727113f5e129665a3
+  data.tar.gz: 10da9cd1e199d2add0044816d4f902933cf04ecc9a05ae3f8abfdf3addd0876b35360ad9c07c17d92eba2b5f16053751ac69c66fb99e5de0e60b0c30bd3c50f5

data/.gitignore

@@ -2,3 +2,4 @@ doc/
 coverage/
 lib/output/
 tmp/
+*.gem

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    usps_flags (0.5.8)
+    usps_flags (0.5.9)
       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/field.rb

@@ -52,7 +52,7 @@ class USPSFlags
             l #{@fly} 0
             l 0 #{@hoist}
             l -#{@fly} 0
-            l 0 -#{@hoist}
+            l 0 -#{@hoist} z
           " fill="#{@color_code}" #{@border_svg}/>
         SVG
       end
@@ -71,7 +71,7 @@ class USPSFlags
       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} #{past_line_one}" fill="#{@color_code}" />
+            <path d="M 0 #{USPSFlags::Config::BASE_FLY / 1200} #{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}" />

data/lib/usps_flags/core/headers.rb

@@ -54,7 +54,7 @@ class USPSFlags
         <<~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">
+          <svg version="1.0" xmlns="http://www.w3.org/2000/svg" width="#{@width}" height="#{@height}" viewBox="-#{@view_width * 0.001} -#{@view_height * 0.002} #{@view_width * 1.004} #{@view_height * 1.005}" preserveAspectRatio="xMidYMid meet">
           <title>#{@title}</title>
           <metadata>
           <desc id="created-by">Julian Fiander</desc>

data/lib/usps_flags/generate/flag.rb

@@ -24,13 +24,14 @@ class USPSFlags
         end
 
         def special(type, level:, field: true)
+          translate = (type == :f && level == :n) || !field
           # Paths were designed for a base fly of 3000 pixels, but the base was changed for more useful fractions.
           svg = +''
-          svg << "<g transform=\"translate(#{USPSFlags::Config::BASE_FLY / 10})\">" unless field
+          svg << "<g transform=\"translate(#{USPSFlags::Config::BASE_FLY / 10})\">" if translate
           svg << "<g transform=\"scale(#{Rational(USPSFlags::Config::BASE_FLY, 3000).to_f})\">"
           svg << special_icon(type, level)
           svg << '</g>'
-          svg << '</g>' unless field
+          svg << '</g>' if translate
 
           svg
         end

data/lib/usps_flags/helpers/valid_flags.rb

@@ -15,7 +15,7 @@ class USPSFlags
           @district_past = %w[PDLTC PDC]
           @district_elected = %w[D1LT DLTC DC]
           @district_swallowtail = %w[DLT DAIDE DFLT]
-          @national_past = %w[PSTFC PRC PVC PCC]
+          @national_past = %w[PNFLT PSTFC PRC PVC PCC]
           @national_elected = %w[STFC RC VC CC]
           @national_swallowtail = %w[NAIDE NFLT]
         end

data/usps_flags.gemspec

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