usps_flags 0.3.23 → 0.3.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87d85b49b992a776e1c49e18e07b7eb6fdf039e4c884160e653f953f26575812
-  data.tar.gz: 2e94aa5c534e790f80178e9316ca6e5487d9e31073965e01471d008b454d6fdf
+  metadata.gz: 96b722d371478d5978e17bc5f174e8706178e69be7976dd56548620224994b59
+  data.tar.gz: 9d2e726c677dd5cc021d2a351425653811bc4cadb3dbeb35d3afc9be33c62d00
 SHA512:
-  metadata.gz: 56b20090bae18f5a08f1db836e7b7524302acb231a79c3872b6e7f15df7c3975b7a85651a4f3e2967c8fb17e26a0d5fcd5908127d4d2dc5b6028a9ea7f1798de
-  data.tar.gz: d70024c6e78257fdb2bc4ece5b8bbfb7f043d5174d660b6d38233295516f78944d1f965111ddc60531ae8a44d4980bc56cdbeaed7dc8e0466508cfa32ac6a4bf
+  metadata.gz: 66797f5b2f22a5c887351308d948efafea434211806b24c28663c1440daab5bb40f85c8742c36129f5af412a78602fbeb51c810aadd8eb32e2a0777f622a57f1
+  data.tar.gz: 91a60392d0ba0ff67f439280273627d518f04556215686c55fc63eb0278d6821aa8826a7a4a423738d9ddefeccc04ad213800e08f4d66937b032349733e1e191

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    usps_flags (0.3.23)
+    usps_flags (0.3.24)
       file_utils (~> 1.1, >= 1.1.2)
       mini_magick (~> 4.8, >= 4.8.0)
       rubyzip (~> 1.2, >= 1.2.1)

data/lib/usps_flags/core/field.rb

@@ -53,39 +53,41 @@ class USPSFlags::Core::Field
 
   def swallowtail_field
     <<~SVG
-      <path d="M 0 0
+      <path d="M #{USPSFlags::Config::BASE_FLY/1200} #{USPSFlags::Config::BASE_FLY/1800}
         l #{@fly} #{@hoist/6}
         l -#{@fly/5} #{@hoist/3}
         l #{@fly/5} #{@hoist/3}
-        l -#{@fly} #{@hoist/6}
+        l -#{@fly} #{@hoist/6} z
       " fill="#FFFFFF" stroke="#000000" stroke-width="#{USPSFlags::Config::BASE_FLY/600}" />
     SVG
   end
 
   def past_field
     <<~SVG
-      <path d="M 0 0
-        l #{@fly/2} #{@hoist*1/12}
-        l 0 #{@hoist*10/12}
-        l -#{@fly/2} #{@hoist*1/12}
-      " fill="#{@color_code}" />
-      <path d="M #{@fly/2} #{@hoist*1/12}
-        l #{@fly/4} #{@hoist*1/24}
-        l 0 #{@hoist*9/12}
-        l -#{@fly/4} #{@hoist*1/24}
-      " fill="#{@past_mid_color}" />
-      <path d="M #{@fly*3/4} #{@hoist*3/24}
-        l #{@fly/4} #{@hoist*1/24}
-        l -#{@fly/5} #{@hoist/3}
-        l #{@fly/5} #{@hoist/3}
-        l -#{@fly/4} #{@hoist*1/24}
-      " fill="#{@past_tail_color}" />
-      <path d="M 0 0
-        l #{@fly} #{@hoist/6}
-        l -#{@fly/5} #{@hoist/3}
-        l #{@fly/5} #{@hoist/3}
-        l -#{@fly} #{@hoist/6}
-      " fill="none" stroke="#000000" stroke-width="#{USPSFlags::Config::BASE_FLY/600}" />
+      <g transform="translate(#{USPSFlags::Config::BASE_FLY/1200}, #{USPSFlags::Config::BASE_FLY/1800})">
+        <path d="M 0 #{USPSFlags::Config::BASE_FLY/600}
+          l #{@fly/2} #{@hoist/12}
+          l 0 #{@hoist*10/12}
+          l -#{@fly/2} #{@hoist/12}
+        " fill="#{@color_code}" />
+        <path d="M #{@fly/2} #{@hoist/12}
+          l #{@fly/4} #{@hoist/24}
+          l 0 #{@hoist*9/12}
+          l -#{@fly/4} #{@hoist/24}
+        " fill="#{@past_mid_color}" />
+        <path d="M #{@fly*3/4} #{@hoist*3/24}
+          l #{@fly/4} #{@hoist/24}
+          l -#{@fly/5} #{@hoist/3}
+          l #{@fly/5} #{@hoist/3}
+          l -#{@fly/4} #{@hoist/24}
+        " fill="#{@past_tail_color}" />
+        <path d="M 0 0
+          l #{@fly} #{@hoist/6}
+          l -#{@fly/5} #{@hoist/3}
+          l #{@fly/5} #{@hoist/3}
+          l -#{@fly} #{@hoist/6} z
+        " fill="none" stroke="#000000" stroke-width="#{USPSFlags::Config::BASE_FLY/600}" />
+      </g>
     SVG
   end
 end

data/lib/usps_flags/core/headers.rb

@@ -27,7 +27,7 @@ class USPSFlags::Core::Headers
     svg << <<~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}pt" height="#{@height}pt" 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="0 0 #{@view_width} #{@view_height}" preserveAspectRatio="xMidYMid meet">
       <title>#{@title}</title>
       <metadata>
       <desc id="created-by">Julian Fiander</desc>

data/lib/usps_flags/generate/flag.rb

@@ -43,12 +43,7 @@ class USPSFlags::Generate::Flag
     def pennant(type: "CRUISE", outfile: nil, scale: nil)
       type = type.upcase
       svg = ""
-      title = case type
-      when "CRUISE"
-        "Cruise Pennant"
-      when "OIC"
-        "Officer-in-Charge Pennant"
-      end
+      title = { "CRUISE" => "Cruise Pennant", "OIC" => "Officer-in-Charge Pennant" }[type]
       svg << USPSFlags::Core.headers(pennant: true, scale: scale, title: title)
       svg << USPSFlags::Core.pennant(type)
       svg << USPSFlags::Core.footer

data/usps_flags.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name          = 'usps_flags'
-  s.version       = '0.3.23'
-  s.date          = '2019-03-14'
+  s.version       = '0.3.24'
+  s.date          = '2019-04-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.3.23
+  version: 0.3.24
 platform: ruby
 authors:
 - Julian Fiander
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-14 00:00:00.000000000 Z
+date: 2019-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: file_utils