usps_flags 0.1.18 → 0.1.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ff1c062ab821a82996d4b73098d7b0a2378520ca
-  data.tar.gz: df060b9c6e0a9b1b41290f85de6c6466b14f2be8
+  metadata.gz: 334838e6f88c5f97f13d666ec09588632f6bd192
+  data.tar.gz: 705b3854cd1c94a072072475e64ab056e1a6d4ed
 SHA512:
-  metadata.gz: 14add4b6186e17a6198c36cc5f81bc4dfcf634ecadc2f6e1569c859f86c47e894565d9fbb151a21ed2b57554960d9d6ee208b88b81506ffa1cd647184cc2ea5c
-  data.tar.gz: ad717b0dfb3e1919767436c7ae7e4df502fa21bf5a1e56d75c102c10c840161fa561e30c41ad1af3d493f2b6e08674728a3ac28790b852c0da3b251cfa8971d4
+  metadata.gz: ad8ebeaceb5137f9ae20118e1e8f7213c226a87fc7d59b23e831cf595f0b6aacd53306b618b51d9627c4e8715812476dfc056b292d69ada4f3f8a9cc18803a88
+  data.tar.gz: fb6222886058c25b806e9691ce0f5694267ce6f325759397b0b03c2f108e350a42964d3686f5342a5c29e73eb720c8b8c7b7f5bd6bda604165b69da7168a756f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    usps_flags (0.1.17)
+    usps_flags (0.1.19)
       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.rb

@@ -171,7 +171,7 @@ class USPSFlags::Core
     svg
   end
 
-  def self.headers(width: nil, height: nil, pennant: false, scale: nil)
+  def self.headers(width: nil, height: nil, pennant: false, scale: nil, title: "USPS Flag")
     if width.nil? || height.nil?
       scale = 3 if scale.nil?
       width ||= USPSFlags::Config::BASE_FLY / scale
@@ -194,12 +194,31 @@ class USPSFlags::Core
       end
     end
 
-    <<~HEADERS
+    generated_at = Time.now.strftime("%Y%m%d.%H%S%z")
+
+    svg = ""
+    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">
-      <metadata>Created by Julian Fiander (2017)</metadata>
-    HEADERS
+      <title>#{title}</title>
+      <metadata>
+      <desc id="created-by">Julian Fiander</desc>
+      <desc id="generated-at">#{generated_at}</desc>
+    SVG
+
+    unless title == "US Ensign"
+      svg << <<~SVG
+        <desc id="trademark-desc">This image is a registered trademark of United States Power Squadrons.</desc>
+        <desc id="trademark-link">http://www.usps.org/national/itcom/trademark.html</desc>
+      SVG
+    end
+
+    svg << <<~SVG
+      </metadata>
+    SVG
+
+    svg
   end
 
   def self.footer

data/lib/usps_flags/generate.rb

@@ -8,7 +8,7 @@ class USPSFlags::Generate
   # @param [String] scale The image scale divisor factor.
   # @return [String] Returns the SVG data.
   def self.get(flag, outfile: nil, scale: nil, field: true)
-    flag = flag.upcase
+    flag = flag.upcase.gsub("/", "").gsub("_", "").gsub("PENNANT", "")
     if ["CRUISE", "OIC"].include?(flag)
       self.pennant(type: flag, outfile: outfile, scale: scale)
     elsif flag.upcase == "ENSIGN"
@@ -219,7 +219,7 @@ class USPSFlags::Generate
   def self.spec(outfile: nil, fly: nil, unit: nil, scale: nil)
     fly = fly.nil? ? USPSFlags::Config::BASE_FLY : fly
     final_svg = ""
-    final_svg << USPSFlags::Core.headers(scale: scale)
+    final_svg << USPSFlags::Core.headers(scale: scale, title: "USPS Trident Specifications")
     final_svg << USPSFlags::Core.trident_spec(fly: fly, unit: unit)
     final_svg << USPSFlags::Core.footer
 
@@ -238,7 +238,7 @@ class USPSFlags::Generate
     raise "Error: No rank specified." if rank.nil?
     final_svg = ""
 
-    final_svg << USPSFlags::Core.headers(scale: scale)
+    final_svg << USPSFlags::Core.headers(scale: scale, title: rank)
 
     rank.slice!(0) if !field && rank[0].upcase == "P" && rank != "PORTCAP"
     rank = "CDR" if rank == "C"
@@ -475,7 +475,13 @@ class USPSFlags::Generate
 
   def self.pennant(type: "cruise", outfile: nil, scale: nil)
     final_svg = ""
-    final_svg << USPSFlags::Core.headers(pennant: true, scale: scale)
+    title = case type.upcase
+    when "CRUISE"
+      "Cruise Pennant"
+    when "OIC"
+      "Officer-in-Charge Pennant"
+    end
+    final_svg << USPSFlags::Core.headers(pennant: true, scale: scale, title: title)
     final_svg << USPSFlags::Core.pennant(type)
     final_svg << USPSFlags::Core.footer
 
@@ -491,7 +497,7 @@ class USPSFlags::Generate
 
   def self.ensign(outfile: nil, scale: nil)
     final_svg = ""
-    final_svg << USPSFlags::Core.headers(scale: scale)
+    final_svg << USPSFlags::Core.headers(scale: scale, title: "USPS Ensign")
     final_svg << USPSFlags::Core.ensign
     final_svg << USPSFlags::Core.footer
 
@@ -509,7 +515,7 @@ class USPSFlags::Generate
     width = 4327.4667
     height = 4286.9333
     final_svg = ""
-    final_svg << USPSFlags::Core.headers(width: width, height: height, scale: scale)
+    final_svg << USPSFlags::Core.headers(width: width, height: height, scale: scale, title: "USPS Ensign Wheel")
     final_svg << USPSFlags::Core.wheel
     final_svg << USPSFlags::Core.footer
 
@@ -529,7 +535,7 @@ class USPSFlags::Generate
     hoist = scale.nil? ? base_hoist : (base_hoist / scale)
     fly = hoist * 1.91
     final_svg = ""
-    final_svg << USPSFlags::Core.headers(width: fly, height: hoist, scale: scale)
+    final_svg << USPSFlags::Core.headers(width: fly, height: hoist, scale: scale, title: "US Ensign")
     final_svg << USPSFlags::Core.us
     final_svg << USPSFlags::Core.footer
 

data/spec/usps_flags_spec.rb

@@ -41,12 +41,24 @@ describe USPSFlags do
       @flag.scale 5
       @flag.svg_file ""
 
-      expect(@flag.svg).to eql(
+      svg = @flag.svg
+
+      expect(svg).to include(
         <<~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="614pt" height="409pt" viewBox="0 0 3072 2048" preserveAspectRatio="xMidYMid meet">
-          <metadata>Created by Julian Fiander (2017)</metadata>
+          <title>CDR</title>
+          <metadata>
+          <desc id="created-by">Julian Fiander</desc>
+        SVG
+      )
+
+      expect(svg).to include(
+        <<~SVG
+          <desc id="trademark-desc">This image is a registered trademark of United States Power Squadrons.</desc>
+          <desc id="trademark-link">http://www.usps.org/national/itcom/trademark.html</desc>
+          </metadata>
           <g transform="translate(-768, 192)">
           <path d="M 1536 512
           l 80 136

data/usps_flags.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = 'usps_flags'
-  s.version       = '0.1.18'
+  s.version       = '0.1.19'
   s.date          = '2017-10-18'
   s.summary       = 'Flag generator for United States Power Squadrons'
   s.description   = 'A flag image (PNG, SVG) generator for United States Power Squadrons.'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: usps_flags
 version: !ruby/object:Gem::Version
-  version: 0.1.18
+  version: 0.1.19
 platform: ruby
 authors:
 - Julian Fiander