usps_flags 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a60a3e26bbd93155f9878c9104c847ed3105eae
-  data.tar.gz: c4be9514e8ee71ad53ced1a75c5d09bf17912f62
+  metadata.gz: 942e55ca17285fbdb9c4fe12e43228591bd8a8ab
+  data.tar.gz: 3bdfc5258b528ae4b69d759e18cadf42539cc18f
 SHA512:
-  metadata.gz: 8f99ce4d839b26ab46949df7099895231f975047cbb4cd24bc26e88f9992b1a1a184e3f3a0459e9e5e1fe0edd0c6ed9042fe417aee6e12d05e9d0172c38f0abe
-  data.tar.gz: 8bbb461aa04d65254d5ed582a3117b4dd1c4c3cbe9d45e388ec272cc00d7534ef50c984dcf0343908705995face90f9a15e9c388f1d19b3257b1476ffd4d64e8
+  metadata.gz: d55585eb11f710f9486a784f2867b31d1a78669baccf9f2c58cfbfbdbe5994c767c830b7ea03d7115e479c4fdd923193a6550df60a51bf0e3d2e09cd6ecb5c5c
+  data.tar.gz: ef662fc64315e1bb319cdbc8ef8a4745a222849f04f01d23a854fff098c042fefdf950c2f8bf17259b796b8265e9963c732427aa81d92e04ceeb2f1f7ae26a94

checksums.yaml.gz.sig

@@ -1 +1,3 @@
-0�>�O�	E으it��9��m����r|��9��N��Ix��ob���R��A(M���S�4��%�JB&V~u!`����Ze�eF��E�͉A��/G�Q3�ú��&U՝ծП��2�"7�yMux��L��9� ���̌�N�4��5Un��v��l�LCU�;Xoy������onƵʛ%����&�ڿˊ $`��7
�a�6B
+\����/�?���e��_^uU9�v��ʭ��UI��$5�V�p2>�;�w�*?��8��w/�21S�^�7��#�ni�[�֎���R�$H+�qb��vGa�}R$?`�.��
+�s��A��"F���xg��%Mw�?L�E.+m�p�"��R����d���
+��a]o�?�	,��'<�� ��?�B�px�űv=@#&�3�T�fs�{@{�A������n���鳰#2 ��S��x�~�c1����̎O�

data.tar.gz.sig

@@ -1 +1 @@
-Ҫ9�L��B-\�\\�1}��P��	U4�d?c\��B��Ƨj����)�U�
+o_&{	:U�����]�D�ʵAYm|!�Vj��'�J����؉���*6*NCٖ�2��$=����Ė�MG����J�����٫�w���Loĵ{Pl���|�0�wx6W�����S�%���@�V|��
�#8�*>F�Tߩ����t���X�=&��^��I�d޳�@�2�FC���u<8�".���>�Ax嫊�]���Kb�q^�B�H�5��[r�z��~�V�8��-?j_�Y�S1��8K�v��^�

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    usps_flags (0.3.0)
+    usps_flags (0.3.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/field.rb

@@ -31,48 +31,61 @@ class USPSFlags::Core::Field
   def svg
     case @style
     when :regular
-      <<~SVG
-        <path d="M 0 0
-          l #{@fly} 0
-          l 0 #{@hoist}
-          l -#{@fly} 0
-          l 0 -#{@hoist}
-        " fill="#{@color_code}" #{@border_svg}/>
-      SVG
+      regular_field
     when :swallowtail
-      <<~SVG
-        <path d="M 0 0
-          l #{@fly} #{@hoist/6}
-          l -#{@fly/5} #{@hoist/3}
-          l #{@fly/5} #{@hoist/3}
-          l -#{@fly} #{@hoist/6}
-        " fill="#FFFFFF" stroke="#000000" stroke-width="#{USPSFlags::Config::BASE_FLY/600}" />
-      SVG
+      swallowtail_field
     when :past
-      <<~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}" />
-      SVG
+      past_field
     end
   end
+
+  private
+  def regular_field
+    <<~SVG
+      <path d="M 0 0
+        l #{@fly} 0
+        l 0 #{@hoist}
+        l -#{@fly} 0
+        l 0 -#{@hoist}
+      " fill="#{@color_code}" #{@border_svg}/>
+    SVG
+  end
+
+  def swallowtail_field
+    <<~SVG
+      <path d="M 0 0
+        l #{@fly} #{@hoist/6}
+        l -#{@fly/5} #{@hoist/3}
+        l #{@fly/5} #{@hoist/3}
+        l -#{@fly} #{@hoist/6}
+      " 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}" />
+    SVG
+  end
 end

data/lib/usps_flags/generate.rb

@@ -88,17 +88,8 @@ class USPSFlags::Generate
     # @param [Boolean] png Generate zip archive of PNG images.
     def zips(svg: true, png: true)
       raise USPSFlags::Errors::ZipGenerationError, "At least one argument switch must be true out of [svg, png]." unless svg || png
-      begin
-        generate_zip("svg") if svg
-      rescue Errno::EACCES => e
-        raise USPSFlags::Errors::ZipGenerationError, type: :svg, cause: e
-      end
-
-      begin
-        generate_zip("png") if png
-      rescue Errno::EACCES => e
-        raise USPSFlags::Errors::ZipGenerationError, type: :png, cause: e
-      end
+      generate_zip("svg") if svg
+      generate_zip("png") if png
     rescue => e
       raise e if e.is_a?(USPSFlags::Errors::ZipGenerationError)
       raise USPSFlags::Errors::ZipGenerationError, cause: e

data/lib/usps_flags/generate/flag.rb

@@ -6,37 +6,20 @@ class USPSFlags::Generate::Flag
   class << self
     def officer(rank: nil, width: USPSFlags::Config::BASE_FLY, outfile: nil, scale: nil, field: true)
       raise "Error: No rank specified." if rank.nil?
-      rank = rank.to_s.upcase
+      @rank = rank.to_s.upcase
+      @field = field
 
       svg = ""
-      svg << USPSFlags::Core.headers(scale: scale, title: rank)
-
-      rank.slice!(0) if !field && USPSFlags::Helpers.valid_flags(:past).include?(rank)
-      rank = "CDR" if rank == "C"
-
-      flag_details = USPSFlags::Helpers.flag_details(rank)
-      trident_color = field ? :white : flag_details[:color]
-
-      svg << USPSFlags::Core.field(style: flag_details[:style], color: flag_details[:color]) if field
-      svg << "<g transform=\"translate(-150, 400)\"><g transform=\"scale(0.58333)\">" if flag_details[:style] == :past
-
-      if flag_details[:type] == :n && flag_details[:count] == 3
-        svg << USPSFlags::Core::Tridents.cc(flag_details[:type], trident_color: trident_color)
-      elsif flag_details[:type] == :n && flag_details[:count] == 2
-        svg << USPSFlags::Core::Tridents.vc(flag_details[:type], trident_color: trident_color)
-      elsif [:s, :d].include?(flag_details[:type]) && flag_details[:count] == 3
-        svg << USPSFlags::Core::Tridents.three(flag_details[:type], trident_color: trident_color, field_color: flag_details[:color])
-      elsif [:s, :d].include?(flag_details[:type]) && flag_details[:count] == 2
-        svg << USPSFlags::Core::Tridents.two(flag_details[:type], trident_color: trident_color, field_color: flag_details[:color])
-      elsif [:s, :d, :stf, :n].include?(flag_details[:type]) && %w[LT DLT].include?(rank)
-        svg << USPSFlags::Core::Tridents.offset(flag_details[:type], field_color: flag_details[:color], field: field)
-      elsif [:a, :f, :fc, :pc].include?(flag_details[:type])
-        svg << special(flag_details[:type], level: flag_details[:level], field: field)
-      else
-        svg << USPSFlags::Core.trident(flag_details[:type], field_color: flag_details[:color])
-      end
+      svg << USPSFlags::Core.headers(scale: scale, title: @rank)
+
+      modify_rank_for_insignia
+      @flag_details = USPSFlags::Helpers.flag_details(@rank)
+      @trident_color = @field ? :white : @flag_details[:color]
 
-      svg << "</g></g>" if flag_details[:style] == :past
+      svg << USPSFlags::Core.field(style: @flag_details[:style], color: @flag_details[:color]) if @field
+      svg << "<g transform=\"translate(-150, 400)\"><g transform=\"scale(0.58333)\">" if @flag_details[:style] == :past
+      svg << get_officer_flag
+      svg << "</g></g>" if @flag_details[:style] == :past
       svg << USPSFlags::Core.footer
 
       USPSFlags::Helpers.output(svg, outfile: outfile)
@@ -111,5 +94,29 @@ class USPSFlags::Generate::Flag
 
       USPSFlags::Helpers.output(svg, outfile: outfile)
     end
+
+    private
+    def get_officer_flag
+      if @flag_details[:type] == :n && @flag_details[:count] == 3
+        USPSFlags::Core::Tridents.cc(@flag_details[:type], trident_color: @trident_color)
+      elsif @flag_details[:type] == :n && @flag_details[:count] == 2
+        USPSFlags::Core::Tridents.vc(@flag_details[:type], trident_color: @trident_color)
+      elsif [:s, :d].include?(@flag_details[:type]) && @flag_details[:count] == 3
+        USPSFlags::Core::Tridents.three(@flag_details[:type], trident_color: @trident_color, field_color: @flag_details[:color])
+      elsif [:s, :d].include?(@flag_details[:type]) && @flag_details[:count] == 2
+        USPSFlags::Core::Tridents.two(@flag_details[:type], trident_color: @trident_color, field_color: @flag_details[:color])
+      elsif [:s, :d, :stf, :n].include?(@flag_details[:type]) && %w[LT DLT].include?(@rank)
+        USPSFlags::Core::Tridents.offset(@flag_details[:type], field_color: @flag_details[:color], field: @field)
+      elsif [:a, :f, :fc, :pc].include?(@flag_details[:type])
+        special(@flag_details[:type], level: @flag_details[:level], field: @field)
+      else
+        USPSFlags::Core.trident(@flag_details[:type], field_color: @flag_details[:color])
+      end
+    end
+
+    def modify_rank_for_insignia
+      @rank.slice!(0) if !@field && USPSFlags::Helpers.valid_flags(:past).include?(@rank)
+      @rank = "CDR" if @rank == "C"
+    end
   end
 end

data/lib/usps_flags/helpers.rb

@@ -14,52 +14,8 @@ class USPSFlags::Helpers
     # @option type [Symbol] :us US flag
     # @return [Array] Valid options for flag generation (based on the provided type).
     def valid_flags(type = :all)
-      squadron_past = %w[PLTC PC]
-      squadron_elected = %w[1LT LTC CDR]
-      squadron_swallowtail = %w[PORTCAP FLEETCAP LT FLT]
-      district_past = %w[PDLTC PDC]
-      district_elected = %w[D1LT DLTC DC]
-      district_swallowtail = %w[DLT DAIDE DFLT]
-      national_past = %w[PSTFC PRC PVC PCC]
-      national_elected = %w[NAIDE NFLT STFC RC VC CC]
-      special = %w[CRUISE OIC ENSIGN WHEEL]
-      us = %w[US]
-
-      squadron = squadron_past + squadron_elected + squadron_swallowtail
-      district = district_past + district_elected + district_swallowtail
-      national = national_past + national_elected
-      past = squadron_past + district_past + national_past
-
-      case type
-      when :all
-        squadron + district + national + special + us
-      when :officer
-        squadron + district + national
-      when :insignia
-        squadron + district + national - past
-      when :squadron
-        squadron
-      when :district
-        district
-      when :national
-        national
-      when :special
-        special
-      when :us
-        us
-      when :past
-        past
-      when :swallowtail
-        past + squadron_swallowtail + district_swallowtail
-      when :bridge
-        squadron_elected.last(2) + squadron_past.last(2) + 
-        district_elected.last(2) + district_past.last(2) + 
-        national_elected.last(2) + national_past.last(2)
-      when :command
-        [squadron_elected.last, squadron_past.last,
-        district_elected.last, district_past.last,
-        national_elected.last, national_past.last]
-      end
+      load_valid_flags
+      valid_flags_for(type)
     end
 
     # Gets the maximum length among valid flags.
@@ -165,6 +121,50 @@ class USPSFlags::Helpers
     end
 
     private
+    def load_valid_flags
+      @squadron_past = %w[PLTC PC]
+      @squadron_elected = %w[1LT LTC CDR]
+      @squadron_swallowtail = %w[PORTCAP FLEETCAP LT FLT]
+      @district_past = %w[PDLTC PDC]
+      @district_elected = %w[D1LT DLTC DC]
+      @district_swallowtail = %w[DLT DAIDE DFLT]
+      @national_past = %w[PSTFC PRC PVC PCC]
+      @national_elected = %w[NAIDE NFLT STFC RC VC CC]
+      @special = %w[CRUISE OIC ENSIGN WHEEL]
+      @us = %w[US]
+
+      @past = @squadron_past + @district_past + @national_past
+      @squadron = @squadron_past + @squadron_elected + @squadron_swallowtail
+      @district = @district_past + @district_elected + @district_swallowtail
+      @national = @national_past + @national_elected
+      @officer = @squadron + @district + @national
+    end
+
+    def valid_flags_for(type)
+      {
+        special: @special,
+        us: @us,
+
+        squadron: @squadron,
+        district: @district,
+        national: @national,
+        past: @past,
+
+        all: @officer + @special + @us,
+        officer: @officer,
+        insignia: @officer - @past,
+        swallowtail: @past + @squadron_swallowtail + @district_swallowtail,
+
+        bridge: @squadron_elected.last(2) + @squadron_past.last(2) + 
+          @district_elected.last(2) + @district_past.last(2) + 
+          @national_elected.last(2) + @national_past.last(2),
+
+        command: [@squadron_elected.last, @squadron_past.last,
+          @district_elected.last, @district_past.last,
+          @national_elected.last, @national_past.last]
+      }[type]
+    end
+
     def flag_style(rank)
       if valid_flags(:past).include?(rank)
         :past
@@ -188,18 +188,12 @@ class USPSFlags::Helpers
     end
 
     def flag_level(rank)
-      if rank == "DAIDE"
-        :d
-      elsif rank == "NAIDE"
+      if rank.match /N.*/
         :n
+      elsif rank.match /D.*/
+        :d
       elsif rank == "FLT"
         :s
-      elsif rank == "DFLT"
-        :d
-      elsif rank == "NFLT"
-        :n
-      else
-        nil
       end
     end
 
@@ -218,19 +212,19 @@ class USPSFlags::Helpers
         :pc
       elsif rank == "FLEETCAP"
         :fc
-      elsif rank == "DAIDE"
-        :a
-      elsif rank == "NAIDE"
-        :a
-      elsif rank == "FLT"
-        :f
-      elsif rank == "DFLT"
-        :f
-      elsif rank == "NFLT"
-        :f
       elsif rank == "STFC"
         :stf
-      elsif valid_flags(:squadron).include?(rank)
+      elsif rank.match /.AIDE/
+        :a
+      elsif rank.match /.?FLT/
+        :f
+      else
+        get_line_flag_level(rank)
+      end
+    end
+
+    def get_line_flag_level(rank)
+      if valid_flags(:squadron).include?(rank)
         :s
       elsif valid_flags(:district).include?(rank)
         :d

data/usps_flags.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = 'usps_flags'
-  s.version       = '0.3.1'
+  s.version       = '0.3.2'
   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.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Julian Fiander