usps_flags 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ffd7af5feab5e3c542c9593a56fba66daeee999b
-  data.tar.gz: 07aeee695c11a2ec1c9d586531192a842d7a49f1
+  metadata.gz: 438531004f5629248e5cd73008ef140e8c9ad9fc
+  data.tar.gz: b2b586e3f878b8ea82d130e070b5ba5772b3587c
 SHA512:
-  metadata.gz: 0210cd18bc48da7d8ec1760e6334b5fd27c1599435db6d27403a515e0553e493eba653ce7b29dc43b9348467d7cba7efd35199ad24a0a9d488a84a0b9283ae41
-  data.tar.gz: 25ffd187580ea85831a9cb188bc3e7eaaae6efd1528c7c8986392bce905b35c4313241708e2ee700e230ddf1b442fe6d18a590e18ce069be0d2e895f434292a0
+  metadata.gz: b0d615902c4d3d28025abc36256bc45b778079fb4b8abec0e610c5acf57342a07db934eb52d840854f43d4bc0afaeba45dd597e5de5408ad9c2f2e3ed119b98c
+  data.tar.gz: ed64a81542097c27df2b1a33b8548a06884be94ff9987368704820b73c56391aafe1c48ea59cccd0f503937c04d9ec82b8bf1f877a7e11e8d313b9fdf9860f09

data/Gemfile.lock

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

data/lib/usps_flags/config.rb

@@ -34,7 +34,7 @@ class USPSFlags::Config
   #
   # All other values are derived from these, or directly from the constant sizes.
   #
-  # @return [Hash] Returns the configuration values for tridents.
+  # @return [Hash] RThe configuration values for tridents.
   def self.trident
     point_height = USPSFlags::Config::BASE_FLY/48*17/8
     bar_width = USPSFlags::Config::BASE_FLY/48
@@ -71,6 +71,18 @@ class USPSFlags::Config
     }
   end
 
+  # Height values for trident insignia.
+  #
+  # @return [Hash] The height values for tridents.
+  def self.trident_heights
+    {
+      s:   USPSFlags::Config::BASE_HOIST/2,
+      d:   USPSFlags::Config::BASE_HOIST*5/8,
+      stf: USPSFlags::Config::BASE_HOIST*3/4,
+      n:   USPSFlags::Config::BASE_HOIST*3/4
+    }
+  end
+
   # Accessor for the directory for storing generated flags.
   #
   # @return [String] The current path to the flags directory.
@@ -131,13 +143,4 @@ class USPSFlags::Config
     @@use_larger_tridents = @use_larger_tridents
     @@log_fail_quietly = @log_fail_quietly
   end
-
-  def trident_heights
-    {
-      s:   USPSFlags::Config::BASE_HOIST/2,
-      d:   USPSFlags::Config::BASE_HOIST*5/8,
-      stf: USPSFlags::Config::BASE_HOIST*3/4,
-      n:   USPSFlags::Config::BASE_HOIST*3/4
-    }
-  end
 end

data/lib/usps_flags/core/pennant.rb

@@ -11,9 +11,9 @@ class USPSFlags::Core::Pennant
 
   def svg
     if @type == "OIC"
-      svg = oic
+      oic
     elsif @type == "CRUISE"
-      svg << <<~SVG
+      <<~SVG
         #{cruise}
         <g transform=\"translate(385, 340)\">
           #{USPSFlags::Core::Star.new.svg}
@@ -22,6 +22,7 @@ class USPSFlags::Core::Pennant
     end
   end
 
+  private
   def oic
     <<~SVG
       <polyline fill="#{USPSFlags::Config::BLUE}" points="0 0 #{USPSFlags::Config::BASE_FLY} #{USPSFlags::Config::BASE_HOIST/8} 0 #{USPSFlags::Config::BASE_HOIST/4}" />

data/lib/usps_flags/core/us.rb

@@ -4,57 +4,64 @@
 # @private
 class USPSFlags::Core::US
   def svg
-    base_hoist = 2000.to_f
-    base_fly = base_hoist*1.91
+    @base_hoist = 2000.to_f
+    @base_fly = @base_hoist*1.91
 
-    canton_hoist = base_hoist*7/13
-    canton_fly = canton_hoist*Math.sqrt(2)
+    @canton_hoist = @base_hoist*7/13
+    @canton_fly = @canton_hoist*Math.sqrt(2)
 
-    star_offset = 20 # Half of scaled star height
+    @star_offset = 20 # Half of scaled star height
 
     svg = stripes
-
-    [1,3,5,7,9].each do |r|
-      [1,3,5,7,9,11].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.new.svg}</g></g>
-        SVG
-      end
-    end
-
-    [2,4,6,8].each do |r|
-      [2,4,6,8,10].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.new.svg}</g></g>
-        SVG
-      end
-    end
+    svg << stars(:odd)
+    svg << stars(:even)
 
     # star_diameter = base_hoist*4/5/13
     # svg << <<~SVG
-    #   <circle cx="#{canton_fly*6/12}" cy="#{canton_hoist*4/10-5}" r="#{star_diameter/2}" fill="#999999" fill-opacity="0.4" />
+    #   <circle cx="#{@canton_fly*6/12}" cy="#{@canton_hoist*4/10-5}" r="#{star_diameter/2}" fill="#999999" fill-opacity="0.4" />
     # SVG
 
     svg
   end
 
   private
+  def stars(type = :odd)
+    rows = {
+      odd: (1..9).step(2).to_a,
+      even: (2..8).step(2).to_a
+    }
+    columns = {
+      odd: (1..11).step(2).to_a,
+      even: (2..10).step(2).to_a
+    }
+
+    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.new.svg}</g></g>
+        SVG
+      end
+    end
+    svg
+  end
+
   def stripes
     <<~SVG
-      <rect x="0" y="0" width="#{base_fly}" height="#{base_hoist/13}" fill="#{USPSFlags::Config::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::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::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::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::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::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::RED}" />
-      <rect x="0" y="0" width="#{canton_fly}" height="#{canton_hoist}" fill="#{USPSFlags::Config::BLUE}" />
+      <rect x="0" y="0" width="#{@base_fly}" height="#{@base_hoist/13}" fill="#{USPSFlags::Config::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::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::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::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::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::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::RED}" />
+      <rect x="0" y="0" width="#{@canton_fly}" height="#{@canton_hoist}" fill="#{USPSFlags::Config::BLUE}" />
     SVG
   end
 end

data/usps_flags.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = 'usps_flags'
-  s.version       = '0.3.3'
+  s.version       = '0.3.4'
   s.date          = '2017-11-06'
   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.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Julian Fiander

metadata.gz.sig

@@ -1,3 +1,2 @@
-V���I��.MN�����j��	GL��y�y��O�9�ԳR���ɓB�?'����)�)��] ���(
-�k&Wh40�օ5��0ź��;<�;%�|a��m�<�47�9���_��
-�^���c9
+'
+�}����~�R�0�*y,dQ���)�c�oH
�8�p>���]����>ʗ��`'�h�h�E��D& ;�.ڲ82��H���*��u��>���zW_��