usps_flags-grades 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9fe2eb294805179bfd1e121d34e998206e4eb2ae279749698c89f68dfddaba6
-  data.tar.gz: cb891ffa5ba8192566fd810693d82731a1b4d3d1eba92a94648d72a7ee7a451f
+  metadata.gz: 5a5991abb508061d741c0e065757ecc32ddbd14e878d1203dd45785916f6e5f1
+  data.tar.gz: 6e53b7a1d08472ad0152747f96b236100c948142a995c845464e8125a3fe2ced
 SHA512:
-  metadata.gz: 0d2f9d2a15065686905311d594b51b7b2431be98baf5b9325e10f3045c9e667d1477ecc2a5c3b10be1a0ab6ef84abbdc4eec8104d366e527cea67cb36bb985fe
-  data.tar.gz: cb1f0b25caf8d67d22ed28d28742679e6fc17d029427f17112558e772852a91581528fb903e51f6ffd84e52eb0a6bf08809e3f0d215dc5093b62146ccfef6211
+  metadata.gz: 011e2f9724320cfb0fb8b07fc8d2c00b3b813226bedb5c94a7dea12b34fd8b9d3c86bd6bfcad507305c0fe6d5f2b0be54a3a23dfe6701f086b89aa88acdf88da
+  data.tar.gz: 2b3ac1f555c1728eaf7dfeb1bdda2b0309d3a90e439b23c83803eb329a2f058f78580e71ca8eee7d79f3e66048f874949b7060956492615c41a3cd263e574218

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    usps_flags-grades (0.0.6)
-      usps_flags (~> 0.3, >= 0.3.18)
+    usps_flags-grades (0.0.7)
+      usps_flags (~> 0.3, >= 0.3.21)
 
 GEM
   remote: https://rubygems.org/
@@ -32,7 +32,7 @@ GEM
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
-    usps_flags (0.3.20)
+    usps_flags (0.3.21)
       file_utils (~> 1.1, >= 1.1.2)
       mini_magick (~> 4.8, >= 4.8.0)
       rubyzip (~> 1.2, >= 1.2.1)

data/README.md

@@ -5,7 +5,8 @@
 [![Test Coverage](https://api.codeclimate.com/v1/badges/760b824f0edac3316a11/test_coverage)](https://codeclimate.com/github/jfiander/usps-flags_grades/test_coverage)
 [![Maintainability](https://api.codeclimate.com/v1/badges/760b824f0edac3316a11/maintainability)](https://codeclimate.com/github/jfiander/usps-flags_grades/maintainability)
 
-An extension for [USPSFlags](https://github.com/jfiander/usps-flags) to generate grade insignia.
+An extension for [USPSFlags](https://github.com/jfiander/usps-flags) to generate
+regrade insignia.
 
 ## Usage
 
@@ -20,27 +21,11 @@ end
 insignia.svg #=> Generates SVG file at "/path/to/svg/output.svg"
 ```
 
-## Security
-
-This gem is cryptographically signed. To be sure the gem code hasn’t been
-tampered with:
-
-Add my public key as a trusted certificate:
-
-```sh
-gem cert --add <(curl -Ls https://raw.github.com/jfiander/usps-flags_grades/master/certs/jfiander.pem)
-```
-
-Then install the gem securely:
-
-```sh
-gem install usps_flags-grades -P HighSecurity
-```
-
 ## License
 
-Actual images generated may be registered trademarks of their
-respective squadrons.
+Actual images generated are
+[registered trademarks](http://www.usps.org/national/itcom/trademark.html) of
+United States Power Squadrons.
 
 This project is released under the
 [GPLv3](https://raw.github.com/jfiander/usps-flags-grades/master/LICENSE).

data/lib/usps_flags/grades.rb

@@ -42,7 +42,7 @@ class USPSFlags::Grades
   def svg
     validate
     @svg = <<~SVG
-      #{USPSFlags::Core.headers(title: self.title)}
+      #{USPSFlags::Core.headers(title: title)}
       <g transform="translate(0, 50)">
         #{USPSFlags::Grades::Grade.get(@grade)}
         #{USPSFlags::Grades::EdPro.get(@grade) if @edpro && USPSFlags::Grades::EdPro.for_grade(@grade)}
@@ -57,6 +57,9 @@ class USPSFlags::Grades
     USPSFlags::Helpers.output(@svg, outfile: @outfile)
   end
 
+  # Generates the descriptive title for the SVG.
+  #
+  # @return [String] Returns the descriptive title.
   def title
     grade = @grade.to_s.upcase
     edpro = " - EdPro" if @edpro && @grade != :sn
@@ -71,9 +74,28 @@ class USPSFlags::Grades
   end
 
   private
+
   def validate
-    raise USPSFlags::Errors::InvalidInsignia, "Unknown grade: #{@grade}" unless @grade.nil? || USPSFlags::Grades::Grade.valid_grades.include?(@grade)
-    raise USPSFlags::Errors::InvalidInsignia, "EdPro must be boolean" unless [true, false].include?(@edpro)
-    raise USPSFlags::Errors::InvalidInsignia, "Unknown membership level: #{@membership}" unless [nil, :senior, :life].include?(@membership)
+    validate_grade
+    validate_edpro
+    validate_membership
+  end
+
+  def validate_grade
+    return if @grade.nil? || USPSFlags::Grades::Grade.valid_grades.include?(@grade)
+
+    raise USPSFlags::Errors::InvalidInsignia, "Unknown grade: #{@grade}"
+  end
+
+  def validate_edpro
+    return if [true, false].include?(@edpro)
+
+    raise USPSFlags::Errors::InvalidInsignia, "EdPro must be boolean"
+  end
+
+  def validate_membership
+    return if [nil, :senior, :life].include?(@membership)
+
+    raise USPSFlags::Errors::InvalidInsignia, "Unknown membership level: #{@membership}"
   end
 end

data/spec/usps_flags/grades_spec.rb

@@ -1,14 +1,38 @@
 require 'spec_helper'
 
 describe USPSFlags::Grades do
-  context "invalid grade" do
-    it "should raise USPSFlags::Errors::InvalidInsignia if an invalid insignia is specified" do
+  describe "invalid insignia" do
+    it "should raise USPSFlags::Errors::InvalidInsignia if an invalid grade is specified" do
       @insignia = USPSFlags::Grades.new do |b|
         b.grade = :not_a_grade
         b.outfile = ""
       end
 
-      expect { @insignia.svg }.to raise_error(USPSFlags::Errors::InvalidInsignia)
+      expect { @insignia.svg }.to raise_error(
+        USPSFlags::Errors::InvalidInsignia, "Unknown grade: not_a_grade"
+      )
+    end
+
+    it "should raise USPSFlags::Errors::InvalidInsignia if an invalid edpro is specified" do
+      @insignia = USPSFlags::Grades.new do |b|
+        b.edpro = nil
+        b.outfile = ""
+      end
+
+      expect { @insignia.svg }.to raise_error(
+        USPSFlags::Errors::InvalidInsignia, "EdPro must be boolean"
+      )
+    end
+
+    it "should raise USPSFlags::Errors::InvalidInsignia if an invalid membership is specified" do
+      @insignia = USPSFlags::Grades.new do |b|
+        b.membership = :normal
+        b.outfile = ""
+      end
+
+      expect { @insignia.svg }.to raise_error(
+        USPSFlags::Errors::InvalidInsignia, "Unknown membership level: normal"
+      )
     end
   end
 
@@ -257,11 +281,8 @@ describe USPSFlags::Grades do
     end
 
     it "should have the SN insignia box" do
-      expect(@insignia.svg).to include(
-        <<~SVG
-          <polyline points="20,-10 735,-10 735,150 20,150 20,-10" fill="none" stroke-width="15" stroke="#FFBF3F" />
-        SVG
-      )
+      expect(@insignia.svg).to include('<rect x="20" y="-10" width="')
+      expect(@insignia.svg).to include('" height="150" fill="none" stroke-width="15"')
     end
 
     it "should have a senior member arrow" do
@@ -270,6 +291,7 @@ describe USPSFlags::Grades do
           <polyline points="0,250 75,220 75,240 150,240 150,260 75,260 75,280 0,250" fill="#FFBF3F" />
           <polyline points="145,240 350,240 350,260 145,260 145,240" fill="#FFBF3F" />
           <polyline points="400,240 610,240 610,260 400,260 400,240" fill="#FFBF3F" />
+
           <polyline points="600,240 675,240 675,220 750,250 675,280 675,260 600,260 600,240" fill="#FFBF3F" />
 
           <polyline points="325,200 350,200 375,275 400,200 425,200 390,300 360,300 325,200" fill="#FFBF3F" />

data/usps_flags-grades.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name          = 'usps_flags-grades'
-  s.version       = '0.0.6'
-  s.date          = '2019-01-23'
+  s.version       = '0.0.7'
+  s.date          = '2019-02-08'
   s.summary       = 'Insignia generator for United States Power Squadrons'
   s.description   = 'An extension to the flag image (PNG, SVG) generator for United States Power Squadrons to generate grade insignia.'
   s.homepage      = 'http://rubygems.org/gems/usps_flags-grades'
@@ -12,12 +12,9 @@ Gem::Specification.new do |s|
   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-cert-2019.pem") if $0 =~ /gem\z/
-
   s.required_ruby_version = '~> 2.4'
 
-  s.add_runtime_dependency 'usps_flags', '~> 0.3',  '>= 0.3.18'
+  s.add_runtime_dependency 'usps_flags', '~> 0.3',  '>= 0.3.21'
 
   s.add_development_dependency 'rake',      '~> 12.2', '>= 12.2.1'
   s.add_development_dependency 'rspec',     '~> 3.7',  '>= 3.7.0'

metadata

@@ -1,41 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: usps_flags-grades
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Julian Fiander
 autorequire: 
 bindir: bin
-cert_chain:
-- |
-  -----BEGIN CERTIFICATE-----
-  MIIEdDCCAtygAwIBAgIBATANBgkqhkiG9w0BAQsFADBAMRIwEAYDVQQDDAlqc2Zp
-  YW5kZXIxFTATBgoJkiaJk/IsZAEZFgVnbWFpbDETMBEGCgmSJomT8ixkARkWA2Nv
-  bTAeFw0xOTAxMjMxNzM4MjVaFw0yMDAxMjMxNzM4MjVaMEAxEjAQBgNVBAMMCWpz
-  ZmlhbmRlcjEVMBMGCgmSJomT8ixkARkWBWdtYWlsMRMwEQYKCZImiZPyLGQBGRYD
-  Y29tMIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEA1wNuP8liL/6u1CPf
-  mDHh3pQVrmjhoXrahUnCYpFNuxLtLr5uguhHYGK2pnUXmaJ5yECuMkYyNpdw5Cr0
-  DQXyQU3xLbZRvxBSYqzADxVsH/QYoxUkpSJCIY24eOa/5ri5VripMyB05C9J6xdM
-  Useylp5mkEwpw/0yHaniE93Bh3NOpQfN3leW6ipffavcExEI6/YSv6biqO7ksz+J
-  wlY8N96vldmd5f/Ha+R/Gu4o/u/8XsrJ9wGZHixHOMJVSweXEhUg+wnYC/r6vAqy
-  C8kxqqT47phSiODnuWMdC9JAgIXseXEvRAMMvipMjtewgrIvPd98qBlR41nlQKby
-  9Do4tnrECb9qXqVNJ7RHC6/D4OZJtvgjCuEGLdJWMv4J7Wl+fKjXOqQXlNlGmwXh
-  CVlVuGw7dFGy3PjhAjyU81i5oXE3HzvizOrQBU+yby0pZlM4WEQdEfLnh4BUlGnm
-  sXV5BZxMSUaPwZvH4yaVSOtDBEGdqeFTy1SI/gVRMrBJdapdAgMBAAGjeTB3MAkG
-  A1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQWBBQMubWRr7n9KJE88qGhjrYJ
-  htcFcTAeBgNVHREEFzAVgRNqc2ZpYW5kZXJAZ21haWwuY29tMB4GA1UdEgQXMBWB
-  E2pzZmlhbmRlckBnbWFpbC5jb20wDQYJKoZIhvcNAQELBQADggGBACHlt/26Rb+4
-  bXNcA9/0ELXbFY5ABJfs2yI0RKTpi+8kQDxK7WnPzBS1k6DBsyEJpUoJ1O9DIjxB
-  in5veCTurZdykBtLsWWyAgCeP7rM9TktaUDQGux7rm3tOao2OSx6sDSKo6ndblvw
-  Pk1RPFH+9EjaW7fl2wdDgSKvFjywbrM75cQnaO0NXor7RjN6bga4VhwgraPmqaDR
-  oQc3hfDDcAKegakpIoyKj+X8Qe2p8u4bJAiFxEIG+tiyvDq5eDmHz+shCRidfZU2
-  bngpXAucsBOd0mkoPJDnRy0Tq+Bt3ABYpXRxiGSdU0IaiswaAJbS/gE8o3F6cFt+
-  rXsgsbyfuQ2qLMlerkty7GJ+pHsj4MEVXsBm2nydroGlrfM2iNTUozBYAmSgPNRB
-  B1FdUkmlEmKUkHPDdhxKep/O05CqDPBfXI+1e6NvmOveMz0Hqh4JFm0LL1Z8RrJ3
-  jLN773uenk91I/YgJu6f1X7E5nN6BJNgL+hI0JdZrclhFvsWMGu3EA==
-  -----END CERTIFICATE-----
-date: 2019-01-23 00:00:00.000000000 Z
+cert_chain: []
+date: 2019-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: usps_flags
@@ -46,7 +19,7 @@ dependencies:
         version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.18
+        version: 0.3.21
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -56,7 +29,7 @@ dependencies:
         version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.18
+        version: 0.3.21
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -134,7 +107,6 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- certs/jfiander.pem
 - lib/usps_flags/grades.rb
 - lib/usps_flags/grades/config.rb
 - lib/usps_flags/grades/edpro.rb

checksums.yaml.gz.sig

@@ -1,3 +0,0 @@
-0f�Tt^is�Fm�����"V��AjfoF���L�tЁmE�j��:�t_Wd{����R�c
-�1ѧ�%"@"��~��T��P�Ij�����dKQ�tL�W�mÑ1�;k�2K�Q5
�^��H�&�b�/��`�ယ�R���f$�����W&x�Һsh.�ZN�L����`B���
-U�;����m����.�*�b���j��C����	:?�Ѿ'��]LP(�Ρw��Џ*���k	W�	d@&CdRA,�

data/certs/jfiander.pem

@@ -1,26 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEdDCCAtygAwIBAgIBATANBgkqhkiG9w0BAQsFADBAMRIwEAYDVQQDDAlqc2Zp
-YW5kZXIxFTATBgoJkiaJk/IsZAEZFgVnbWFpbDETMBEGCgmSJomT8ixkARkWA2Nv
-bTAeFw0xOTAxMjMxNzM4MjVaFw0yMDAxMjMxNzM4MjVaMEAxEjAQBgNVBAMMCWpz
-ZmlhbmRlcjEVMBMGCgmSJomT8ixkARkWBWdtYWlsMRMwEQYKCZImiZPyLGQBGRYD
-Y29tMIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEA1wNuP8liL/6u1CPf
-mDHh3pQVrmjhoXrahUnCYpFNuxLtLr5uguhHYGK2pnUXmaJ5yECuMkYyNpdw5Cr0
-DQXyQU3xLbZRvxBSYqzADxVsH/QYoxUkpSJCIY24eOa/5ri5VripMyB05C9J6xdM
-Useylp5mkEwpw/0yHaniE93Bh3NOpQfN3leW6ipffavcExEI6/YSv6biqO7ksz+J
-wlY8N96vldmd5f/Ha+R/Gu4o/u/8XsrJ9wGZHixHOMJVSweXEhUg+wnYC/r6vAqy
-C8kxqqT47phSiODnuWMdC9JAgIXseXEvRAMMvipMjtewgrIvPd98qBlR41nlQKby
-9Do4tnrECb9qXqVNJ7RHC6/D4OZJtvgjCuEGLdJWMv4J7Wl+fKjXOqQXlNlGmwXh
-CVlVuGw7dFGy3PjhAjyU81i5oXE3HzvizOrQBU+yby0pZlM4WEQdEfLnh4BUlGnm
-sXV5BZxMSUaPwZvH4yaVSOtDBEGdqeFTy1SI/gVRMrBJdapdAgMBAAGjeTB3MAkG
-A1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQWBBQMubWRr7n9KJE88qGhjrYJ
-htcFcTAeBgNVHREEFzAVgRNqc2ZpYW5kZXJAZ21haWwuY29tMB4GA1UdEgQXMBWB
-E2pzZmlhbmRlckBnbWFpbC5jb20wDQYJKoZIhvcNAQELBQADggGBACHlt/26Rb+4
-bXNcA9/0ELXbFY5ABJfs2yI0RKTpi+8kQDxK7WnPzBS1k6DBsyEJpUoJ1O9DIjxB
-in5veCTurZdykBtLsWWyAgCeP7rM9TktaUDQGux7rm3tOao2OSx6sDSKo6ndblvw
-Pk1RPFH+9EjaW7fl2wdDgSKvFjywbrM75cQnaO0NXor7RjN6bga4VhwgraPmqaDR
-oQc3hfDDcAKegakpIoyKj+X8Qe2p8u4bJAiFxEIG+tiyvDq5eDmHz+shCRidfZU2
-bngpXAucsBOd0mkoPJDnRy0Tq+Bt3ABYpXRxiGSdU0IaiswaAJbS/gE8o3F6cFt+
-rXsgsbyfuQ2qLMlerkty7GJ+pHsj4MEVXsBm2nydroGlrfM2iNTUozBYAmSgPNRB
-B1FdUkmlEmKUkHPDdhxKep/O05CqDPBfXI+1e6NvmOveMz0Hqh4JFm0LL1Z8RrJ3
-jLN773uenk91I/YgJu6f1X7E5nN6BJNgL+hI0JdZrclhFvsWMGu3EA==
------END CERTIFICATE-----