usps_flags 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 451c283ce311f5d823d989cddddce93a7b160239b472bd663d658c8b4e46be46
-  data.tar.gz: 25258a07e6a71f51a2d0826836b48e454643afd568b6f17d1010056460b4d963
+  metadata.gz: 3d7ea83356a9fdf7e8b3ad5949e60462bcadbf2a98df05d270c2fc3875e5df7f
+  data.tar.gz: 932d568a57b257d6dbd2e4ed595f11211e46597c0602e755559899f1c5548795
 SHA512:
-  metadata.gz: 9a019ca921c5b622c06e937f0b0e4dd047f60eed70a828775c14d22272eb44a798ee363aae4fd0ba079cedae03722289d1f3b10eb2329e68f2ed79f110886d35
-  data.tar.gz: 650f1793ee7f310f9877cf4017361ce95e5468a9e53d623bd5425e002f179037a8811c5c90bbed9f852420d9873e1751fb0d6a279b35d2d0de455f79cbb73e33
+  metadata.gz: 1a320747b4cb6354667213bd5b5fef8a8f12b11d3fa6d406d8981381d6dfe2e08b622b83b52f4355cc27c88cf9117c85c88345a44baea78a5aedd92077713bc7
+  data.tar.gz: dec6e9cf1c2dcc7d887d774bfaacd3e8a0db017fca0ce71f2aa4911f905d6dc9b759bd0d440a410f7d6ac904d01a10eae83087f38104b0cdfef150409c8f53dc

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    usps_flags (0.4.0)
+    usps_flags (0.4.1)
       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/trident_specs/base.rb

@@ -11,5 +11,29 @@ class USPSFlags::Core::TridentSpecs::Base
 
   def initialize(options = {})
     @config = options[:config]
+    @box_top = options[:bt]
+    @box_bottom = options[:bb]
+    @box_left = options[:bl]
+    @box_right = options[:br]
+    @fly = options[:fly]
+    @unit = options[:unit]
+    @heading = options[:heading]
+  end
+
+private
+
+  def output(name, x_offset, key)
+    body = block_given? ? yield : (boundary_box + right + left)
+
+    <<~SVG
+      <!-- #{name} Trident -->
+      <g transform="translate(#{BF * x_offset / 80},#{BH * 9 / 32})"><g transform="scale(0.7)">
+        #{@heading}
+
+        #{USPSFlags::Core::Icons::Trident.new(key).svg}
+
+        #{body}
+      </g></g>
+    SVG
   end
 end

data/lib/usps_flags/core/trident_specs/circle.rb

@@ -6,27 +6,20 @@
 # @private
 class USPSFlags::Core::TridentSpecs::Circle < USPSFlags::Core::TridentSpecs::Long
   def p
-    <<~SVG
-      <!-- Circle Trident -->
-      <g transform="translate(#{BF * 23 / 80},#{BH * 9 / 32})"><g transform="scale(0.7)">
-        #{@heading}
-
-        #{USPSFlags::Core::Icons::Trident.new(:stf).svg}
-
-        #{boundary_box}
+    output('Circle', 23, :stf)
+  end
 
-        <!-- Right -->
-          #{inner_diameter} <!-- Inner circle diameter -->
-          #{outer_diameter} <!-- Outer circle diameter -->
-          #{circle_to_bottom} <!-- Circle to bottom -->
+private
 
-        #{left_arrow}
-      </g></g>
+  def right
+    <<~SVG
+      <!-- Right -->
+        #{inner_diameter} <!-- Inner circle diameter -->
+        #{outer_diameter} <!-- Outer circle diameter -->
+        #{circle_to_bottom} <!-- Circle to bottom -->
     SVG
   end
 
-private
-
   def inner_diameter
     <<~SVG
       #{SA.vertical(@box_right + @config[:bar_width], @box_top + @config[:crossbar_from_top] + @config[:bar_width] * 2, @box_top + @config[:crossbar_from_top] + @config[:width], @config[:center_point], @config[:center_point], fly: @fly, unit: @unit)} <!-- Inner circle diameter -->

data/lib/usps_flags/core/trident_specs/delta.rb

@@ -5,32 +5,8 @@
 # This class should never need to be called directly.
 # @private
 class USPSFlags::Core::TridentSpecs::Delta < USPSFlags::Core::TridentSpecs::Base
-  def initialize(options = {})
-    super
-    @box_top = options[:bt]
-    @box_bottom = options[:bb]
-    @box_left = options[:bl]
-    @box_right = options[:br]
-    @fly = options[:fly]
-    @unit = options[:unit]
-    @heading = options[:heading]
-  end
-
   def p
-    <<~SVG
-      <!-- Delta Trident -->
-      <g transform="translate(#{BF * 5 / 80},#{BH * 9 / 32})"><g transform="scale(0.7)">
-        #{@heading}
-
-        #{USPSFlags::Core::Icons::Trident.new(:d).svg}
-
-        #{boundary_box}
-
-        #{right_arrow}
-
-        #{left_arrow}
-      </g></g>
-    SVG
+    output('Delta', 5, :d)
   end
 
 private
@@ -42,7 +18,7 @@ private
     SVG
   end
 
-  def right_arrow
+  def right
     <<~SVG
       <!-- Right -->
         #{gap_height} <!-- Delta gap height -->
@@ -59,7 +35,7 @@ private
     @box_bottom - @config[:delta_from_bottom] - @config[:bar_width] - @config[:delta_gap_height]
   end
 
-  def left_arrow
+  def left
     <<~SVG
       <!-- Left -->
         #{SA.vertical(@box_left - @config[:bar_width] * 1.5, @box_top, @box_bottom, @box_left, @box_left, label_offset: -BF / 30, label_offset_y: -BF * 2 / 11, label_align: "middle", fly: @fly, unit: @unit)} <!-- Boundary height -->

data/lib/usps_flags/core/trident_specs/long.rb

@@ -5,35 +5,12 @@
 # This class should never need to be called directly.
 # @private
 class USPSFlags::Core::TridentSpecs::Long < USPSFlags::Core::TridentSpecs::Base
-  def initialize(options = {})
-    super
-    @box_top = options[:bt]
-    @box_bottom = options[:bb]
-    @box_left = options[:bl]
-    @box_right = options[:br]
-    @fly = options[:fly]
-    @unit = options[:unit]
-    @heading = options[:heading]
-  end
-
   def p
-    <<~SVG
-      <!-- Long Trident -->
-      <g transform="translate(#{BF * 40 / 80},#{BH * 9 / 32})"><g transform="scale(0.7)">
-        #{@heading}
-
-        #{USPSFlags::Core::Icons::Trident.new(:n).svg}
-
-        #{boundary_box}
-
-        <!-- Right -->
-          #{hash_to_bottom} <!-- Hash to bottom -->
-
-        #{left_arrow}
-      </g></g>
-    SVG
+    output('Long', 40, :n)
   end
 
+private
+
   def boundary_box
     <<~SVG
       <!-- Boundary box -->
@@ -41,7 +18,14 @@ class USPSFlags::Core::TridentSpecs::Long < USPSFlags::Core::TridentSpecs::Base
     SVG
   end
 
-  def left_arrow
+  def right
+    <<~SVG
+      <!-- Right -->
+        #{hash_to_bottom} <!-- Hash to bottom -->
+    SVG
+  end
+
+  def left
     <<~SVG
       <!-- Left -->
         #{SA.vertical(@box_left - @config[:bar_width] * 1.5, @box_top, @box_bottom, @box_left, @box_left, label_offset: -BF / 30, label_offset_y: -BF / 4.5, label_align: "middle", fly: @fly, unit: @unit)} <!-- Boundary height -->

data/lib/usps_flags/core/trident_specs/short.rb

@@ -5,28 +5,17 @@
 # This class should never need to be called directly.
 # @private
 class USPSFlags::Core::TridentSpecs::Short < USPSFlags::Core::TridentSpecs::Base
-  def initialize(options = {})
-    super
-    @box_top = options[:bt]
-    @box_bottom = options[:bb]
-    @box_left = options[:bl]
-    @box_right = options[:br]
-    @fly = options[:fly]
-    @unit = options[:unit]
-    @heading = options[:heading]
-  end
-
   def p
-    <<~SVG
-      <!-- Short Trident -->
-      <g transform="translate(-#{BF * 14 / 80},#{BH * 9 / 32})"><g transform="scale(0.7)">
-        #{@heading}
-
-        #{USPSFlags::Core::Icons::Trident.new(:s).svg}
-
-        #{boundary_box}#{right}#{left}#{bottom}#{top}#{overlay}
-      </g></g>
-    SVG
+    output('Short', 14, :s) do
+      <<~SVG
+        #{boundary_box}
+        #{right}
+        #{left}
+        #{bottom}
+        #{top}
+        #{overlay}
+      SVG
+    end
   end
 
 private

data/usps_flags.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name          = 'usps_flags'
-  s.version       = '0.4.0'
+  s.version       = '0.4.1'
   s.date          = '2019-05-30'
   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.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Julian Fiander