usps_flags 0.3.19 → 0.3.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 24d9d86fd36ca806b8d47c4d409d813b2e77ef1d
-  data.tar.gz: 2a1bf6507c6d795471336e0501c5422afb3626c2
+  metadata.gz: 5538a747a32b8bd07984afe3742c35f64484408c
+  data.tar.gz: 33d223ed7afecad4a79874626dc8120340ee4a7c
 SHA512:
-  metadata.gz: 91e6bd78e902f7de7c0bd88d02293890771eeb80c867d44d05caf4a86eb5bea3d0638633e199923ef7fe4a9f9df5da46044336a46a1ea0864d3249a52fe88496
-  data.tar.gz: a710623205717e2c7280a320c1dbf5ad54f2d6e902ac3cb424f991c50856610596b741182eb4ecd6720bd66b8986c9697b1e40867c7640b6e9afcf59e1cdf6dd
+  metadata.gz: 8019ac806ce8f503290a329902c5015467a9b4d35114b44c7649e56cad387370c906f969e3e829ddcee675babd897a97d33cbbaf1a5e1defa8d9b19bb6bfb56f
+  data.tar.gz: 135bc1769b9aca1f9543abe2c84461984466bbcc30b005b8534fc7a72a79c718d8fd5c14dbabc8f145136dffbd98a11eadd488fa013d3ffd47b6853880bc31a6

checksums.yaml.gz.sig

@@ -1,2 +1,2 @@
-P_� 4��1���� ��rl�+��Q���L�Q@0e�y<��V-��ǁ�;\K�d��������|��p/��,C7}i_NU�Μ���$�{�
4}=�/�}${XW�ü�����w�֧R84�
-?��F��?in���na��>�)�6��p�����E�W��8\c
+$|t���k=Y{���2�4͐�����0큪���N�
+B�g�Ι�ԦƐ�LPd���ɋ�
9��j-7U��̴�M���`�5T���)�
���n���}:1v����e�U7�e4��ހ�q?>�ɧg.

data/lib/usps_flags/core/us.rb

@@ -12,9 +12,9 @@ class USPSFlags::Core::US
 
     @star_offset = 20 # Half of scaled star height
 
-    svg = stripes
-    svg << stars(:odd)
-    svg << stars(:even)
+    svg = defs
+    svg << stripes
+    svg << stars
 
     # star_diameter = base_hoist*4/5/13
     # svg << <<~SVG
@@ -25,7 +25,12 @@ class USPSFlags::Core::US
   end
 
   private
-  def stars(type = :odd)
+
+  def defs
+    File.read("#{File.dirname(__dir__)}/core/us_defs.svg.partial").gsub('STAR', USPSFlags::Core.star)
+  end
+
+  def stars
     rows = {
       odd: (1..9).step(2).to_a,
       even: (2..8).step(2).to_a
@@ -36,32 +41,24 @@ class USPSFlags::Core::US
     }
 
     svg = ""
-    rows[type].each do |r|
-      columns[type].each do |c|
-        svg << <<~SVG
-          <g transform="translate(#{@canton_fly*c/12}, #{@star_offset+@canton_hoist*r/10})"><g transform="scale(0.31)">#{USPSFlags::Core.star}</g></g>
-        SVG
+    %i[odd even].each do |type|
+      rows[type].each do |r|
+        columns[type].each do |c|
+          svg << <<~SVG
+            <g transform="translate(#{@canton_fly*c/12}, #{@star_offset+@canton_hoist*r/10})"><g transform="scale(0.31)"><use href="#star" /></g></g>
+          SVG
+        end
       end
     end
     svg
   end
 
   def stripes
-    <<~SVG
-      <rect x="0" y="0" width="#{@base_fly}" height="#{@base_hoist/13}" fill="#{USPSFlags::Config::OLD_GLORY_RED}" />
-      <rect x="0" y="#{@base_hoist*1/13}" width="#{@base_fly}" height="#{@base_hoist/13}" fill="#FFFFFF" />
-      <rect x="0" y="#{@base_hoist*2/13}" width="#{@base_fly}" height="#{@base_hoist/13}" fill="#{USPSFlags::Config::OLD_GLORY_RED}" />
-      <rect x="0" y="#{@base_hoist*3/13}" width="#{@base_fly}" height="#{@base_hoist/13}" fill="#FFFFFF" />
-      <rect x="0" y="#{@base_hoist*4/13}" width="#{@base_fly}" height="#{@base_hoist/13}" fill="#{USPSFlags::Config::OLD_GLORY_RED}" />
-      <rect x="0" y="#{@base_hoist*5/13}" width="#{@base_fly}" height="#{@base_hoist/13}" fill="#FFFFFF" />
-      <rect x="0" y="#{@base_hoist*6/13}" width="#{@base_fly}" height="#{@base_hoist/13}" fill="#{USPSFlags::Config::OLD_GLORY_RED}" />
-      <rect x="0" y="#{@base_hoist*7/13}" width="#{@base_fly}" height="#{@base_hoist/13}" fill="#FFFFFF" />
-      <rect x="0" y="#{@base_hoist*8/13}" width="#{@base_fly}" height="#{@base_hoist/13}" fill="#{USPSFlags::Config::OLD_GLORY_RED}" />
-      <rect x="0" y="#{@base_hoist*9/13}" width="#{@base_fly}" height="#{@base_hoist/13}" fill="#FFFFFF" />
-      <rect x="0" y="#{@base_hoist*10/13}" width="#{@base_fly}" height="#{@base_hoist/13}" fill="#{USPSFlags::Config::OLD_GLORY_RED}" />
-      <rect x="0" y="#{@base_hoist*11/13}" width="#{@base_fly}" height="#{@base_hoist/13}" fill="#FFFFFF" />
-      <rect x="0" y="#{@base_hoist*12/13}" width="#{@base_fly}" height="#{@base_hoist/13}" fill="#{USPSFlags::Config::OLD_GLORY_RED}" />
-      <rect x="0" y="0" width="#{@canton_fly}" height="#{@canton_hoist}" fill="#{USPSFlags::Config::OLD_GLORY_BLUE}" />
-    SVG
+    s = (0..12).map do |i|
+      color = i.even? ? 'red' : 'white'
+      "<use href=\"##{color}-stripe\" y=\"#{@base_hoist*i/13}\" />"
+    end
+
+    s.join("\n") + "\n<rect y=\"0\" width=\"#{@canton_fly}\" height=\"#{@canton_hoist}\" fill=\"#{USPSFlags::Config::OLD_GLORY_BLUE}\" />\n"
   end
 end

data/lib/usps_flags/core/us_defs.svg.partial

@@ -0,0 +1,13 @@
+<defs>
+  <g id="star" transform="scale(0.31)">
+    STAR
+  </g>
+
+  <g id="red-stripe">
+    <rect x="0" y="0" width="3820.0" height="153.84615384615384" fill="#BF0D3E" />
+  </g>
+
+  <g id="white-stripe">
+    <rect x="0" y="0" width="3820.0" height="153.84615384615384" fill="#FFFFFF" />
+  </g>
+</defs>

data/usps_flags.gemspec

@@ -1,19 +1,19 @@
 Gem::Specification.new do |s|
   s.name          = 'usps_flags'
-  s.version       = '0.3.19'
-  s.date          = '2018-02-10'
+  s.version       = '0.3.20'
+  s.date          = '2018-05-24'
   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'
   s.license       = 'GPL-3.0'
   s.authors       = ['Julian Fiander']
   s.email         = 'julian@fiander.one'
-  s.require_paths = ['lib', 'spec', 'doc']
+  s.require_paths = %w[lib spec doc]
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- spec/*`.split("\n")
 
   s.cert_chain    = ['certs/jfiander.pem']
-  s.signing_key   = File.expand_path("~/.ssh/usps_flags-private_key.pem") if $0 =~ /gem\z/
+  s.signing_key   = File.expand_path('~/.ssh/usps_flags-private_key.pem') if $0 =~ /gem\z/
 
   s.required_ruby_version = '~> 2.4'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: usps_flags
 version: !ruby/object:Gem::Version
-  version: 0.3.19
+  version: 0.3.20
 platform: ruby
 authors:
 - Julian Fiander
@@ -30,7 +30,7 @@ cert_chain:
   3YzYAc+kXfD7kkzA2NMvLT6Q1v03qQyIZ8BS8SNk5wLGAdLM+IravFDLEs448fjz
   lEAU0RHLFVbE+CXW6makIlWGHR0=
   -----END CERTIFICATE-----
-date: 2018-02-10 00:00:00.000000000 Z
+date: 2018-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: file_utils
@@ -187,6 +187,7 @@ files:
 - lib/usps_flags/core/tridents.rb
 - lib/usps_flags/core/trumpet.rb
 - lib/usps_flags/core/us.rb
+- lib/usps_flags/core/us_defs.svg.partial
 - lib/usps_flags/core/wheel.rb
 - lib/usps_flags/core/wheel.svg.partial
 - lib/usps_flags/errors.rb