usps_flags-grades 0.0.12 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f9ab5d165c202f4af2a99caa777e90a0f5df7a4b06fd8de58fa9d3d3a86079d
-  data.tar.gz: 5a54878338bdb11837dafa04550092da604b4f86ebdd5ae68a08410597f32c20
+  metadata.gz: 6bdf433909bdb2c4c11b00b4aa664f5ace40214bdb13f92445a81547c3564496
+  data.tar.gz: 1041c303c386e7fc4544f8f2697b1b58ef03be34dd8893f744b23a14fd7808cb
 SHA512:
-  metadata.gz: b7b2a9a9438a142a22991c594c9c36c11859cb4066f3f0995bcc31a2e9f5693b1298298b06fc72faf45135421cbb54fa3b37d081d356fc596d3c31e246877e0a
-  data.tar.gz: 1e210586ed6693d2708e17ca7dee3026de42e5afd9db08a0ef174957ba5a9d28dc61fdd65e039aecd19dcce09f82500f34b4a44fa5a3460ba229e477daace60b
+  metadata.gz: 37e5322d5e65fc660a997ae4d285a74209e449aacaae2a2932e2147bd3ec0144269b6c60d06f92880ea51e758612caaa463427df0c202c8748d514b6ac289fe5
+  data.tar.gz: f085c2a13816ca03bcba479121170fa995e0c6432193d456c5d8104b894eb1a5c37aac59c83dafbeea52d8582c540d5268eef7dab4b8791688dcdb392ec705bb

data/Gemfile

@@ -1,2 +1,4 @@
-source "https://rubygems.org"
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
 gemspec

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    usps_flags-grades (0.0.12)
-      usps_flags (~> 0.4, >= 0.4.0)
+    usps_flags-grades (0.1.0)
+      usps_flags (~> 0.5, >= 0.5.1)
 
 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.4.1)
+    usps_flags (0.5.1)
       file_utils (~> 1.1, >= 1.1.2)
       mini_magick (~> 4.8, >= 4.8.0)
       rubyzip (~> 1.2, >= 1.2.1)

data/Rakefile

@@ -1,7 +1,9 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+# frozen_string_literal: true
+
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new
 
 task default: :spec
-task test: :spec
+task test: :spec

data/lib/usps_flags/grades.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'usps_flags'
 require 'usps_flags/grades/config'
 require 'usps_flags/grades/errors'
@@ -27,12 +29,12 @@ class USPSFlags::Grades
   #
   #  insignia.svg #=> Generates SVG file at "/path/to/svg/output.svg"
   def initialize(options = {})
-    @grade = options[:grade] || nil
+    @grade = options[:grade]
     @edpro = options[:edpro] || false
-    @membership = options[:membership] || nil
+    @membership = options[:membership]
     @merit_marks = options[:merit_marks] || 0
-    @outfile = options[:outfile] || nil
-    @generated_at = Time.now.strftime("%Y%m%d.%H%S%z")
+    @outfile = options[:outfile]
+    @generated_at = Time.now.strftime('%Y%m%d.%H%S%z')
     yield self if block_given?
   end
 
@@ -68,12 +70,12 @@ class USPSFlags::Grades
   # @return [String] Returns the descriptive title.
   def title
     grade = @grade.to_s.upcase
-    edpro = " - EdPro" if @edpro && @grade != :sn
+    edpro = ' - EdPro' if @edpro && @grade != :sn
     membership = case @membership
-    when :senior
-      " - Senior Member"
-    when :life
-      " - Life Member"
+                 when :senior
+                   ' - Senior Member'
+                 when :life
+                   ' - Life Member'
     end
 
     "#{grade}#{edpro}#{membership}"
@@ -95,7 +97,7 @@ class USPSFlags::Grades
     end
   end
 
-  private
+private
 
   def validate
     validate_grade
@@ -112,7 +114,7 @@ class USPSFlags::Grades
   def validate_edpro
     return if [true, false].include?(@edpro)
 
-    raise USPSFlags::Errors::InvalidInsignia, "EdPro must be boolean"
+    raise USPSFlags::Errors::InvalidInsignia, 'EdPro must be boolean'
   end
 
   def validate_membership

data/lib/usps_flags/grades/config.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 # Extension of USPSFlags::Config to for insignia config.
 #
 # @private
 class USPSFlags::Config
-  GOLD ||= "#FFBF3F"
+  GOLD ||= '#FFBF3F'
   GRADE_SPACING ||= 125
 end

data/lib/usps_flags/grades/edpro.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Core SVG data for the Educational Proficiency insignia.
 #
 # This class should never need to be called directly.

data/lib/usps_flags/grades/errors.rb

@@ -1,10 +1,14 @@
+# frozen_string_literal: true
+
 # Custom errors.
 #
 # @private
-module USPSFlags::Errors
-  class USPSFlags::Errors::InvalidInsignia < StandardError
-    def initialize(msg = "You have specified invalid insignia.")
-      super(msg)
+class USPSFlags
+  class Errors
+    class InvalidInsignia < StandardError
+      def initialize(msg = 'You have specified invalid insignia.')
+        super(msg)
+      end
     end
   end
 end

data/lib/usps_flags/grades/grade.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Core SVG data for grade insignia.
 #
 # This class should never need to be called directly.
@@ -26,7 +28,7 @@ class USPSFlags::Grades::Grade
       end
     end
 
-    private
+  private
 
     def bar
       <<~SVG

data/lib/usps_flags/grades/membership.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Core SVG data for the membership level insignia.
 #
 # This class should never need to be called directly.
@@ -11,7 +13,7 @@ class USPSFlags::Grades::Membership
       SVG
     end
 
-    private
+  private
 
     def arrow
       <<~SVG

data/lib/usps_flags/grades/merit_marks.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Core SVG data for merit marks.
 #
 # This class should never need to be called directly.
@@ -7,27 +9,32 @@ class USPSFlags::Grades::MeritMarks
     def get(number)
       return if number < 1
 
-      svg = ""
+      svg = +''
       new_lines = 0
 
       top_row = number % 20
       svg << generate_top_row(top_row)
       number -= top_row
 
-      while number > 0
-        number -= 20
-        new_lines += 1
-        svg << <<~SVG
-          <g transform="translate(0,90)">
-          #{generate_full_row}
-        SVG
-      end
-      new_lines.times { svg << "</g>" }
+      number, new_lines, svg = add_row(number, new_lines, svg) while number > 0
+      new_lines.times { svg << '</g>' }
 
       svg
     end
 
-    private
+  private
+
+    def add_row(number, new_lines, svg)
+      number -= 20
+      new_lines += 1
+      svg << <<~SVG
+        <g transform="translate(0,90)">
+        #{generate_full_row}
+      SVG
+
+      [number, new_lines, svg]
+    end
+
     def bar(offset = 0)
       <<~SVG
         <rect x="#{offset}" y="0" width="35" height="80" fill="#{USPSFlags::Config::GOLD}" />
@@ -35,7 +42,7 @@ class USPSFlags::Grades::MeritMarks
     end
 
     def generate_top_row(number)
-      svg = ""
+      svg = +''
 
       number.times do |i|
         svg << bar(45 * i)
@@ -45,7 +52,7 @@ class USPSFlags::Grades::MeritMarks
     end
 
     def generate_full_row
-      svg = ""
+      svg = +''
 
       20.times do |i|
         svg << bar(45 * i)

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bundler/setup'
 Bundler.setup
 require 'simplecov'
@@ -12,7 +14,7 @@ RSpec::Expectations.configuration.on_potential_false_positives = :nothing
 
 RSpec.configure do |config|
   config.before(:suite) do
-    $tmp_flags_dir = "tmp/flags"
+    $tmp_flags_dir = 'tmp/flags'
 
     USPSFlags.configure do |c|
       c.flags_dir = $tmp_flags_dir
@@ -20,6 +22,6 @@ RSpec.configure do |config|
   end
 
   config.after(:suite) do
-    ::FileUtils.rm_rf("tmp") if ::Dir.exist?("tmp")
+    ::FileUtils.rm_rf('tmp') if ::Dir.exist?('tmp')
   end
 end

data/spec/usps_flags/grades_spec.rb

@@ -1,50 +1,52 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe USPSFlags::Grades do
-  describe "invalid insignia" do
-    it "should raise USPSFlags::Errors::InvalidInsignia if an invalid grade 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 = ""
+        b.outfile = ''
       end
 
       expect { @insignia.svg }.to raise_error(
-        USPSFlags::Errors::InvalidInsignia, "Unknown grade: not_a_grade"
+        USPSFlags::Errors::InvalidInsignia, 'Unknown grade: not_a_grade'
       )
     end
 
-    it "should raise USPSFlags::Errors::InvalidInsignia if an invalid edpro is specified" do
+    it 'should raise USPSFlags::Errors::InvalidInsignia if an invalid edpro is specified' do
       @insignia = USPSFlags::Grades.new do |b|
         b.edpro = nil
-        b.outfile = ""
+        b.outfile = ''
       end
 
       expect { @insignia.svg }.to raise_error(
-        USPSFlags::Errors::InvalidInsignia, "EdPro must be boolean"
+        USPSFlags::Errors::InvalidInsignia, 'EdPro must be boolean'
       )
     end
 
-    it "should raise USPSFlags::Errors::InvalidInsignia if an invalid membership is specified" do
+    it 'should raise USPSFlags::Errors::InvalidInsignia if an invalid membership is specified' do
       @insignia = USPSFlags::Grades.new do |b|
         b.membership = :normal
-        b.outfile = ""
+        b.outfile = ''
       end
 
       expect { @insignia.svg }.to raise_error(
-        USPSFlags::Errors::InvalidInsignia, "Unknown membership level: normal"
+        USPSFlags::Errors::InvalidInsignia, 'Unknown membership level: normal'
       )
     end
   end
 
-  context "S" do
+  context 'S' do
     before(:each) do
       @insignia = USPSFlags::Grades.new do |g|
         g.grade = :s
-        g.outfile = ""
+        g.outfile = ''
       end
     end
 
-    it "should have the S insignia" do
+    it 'should have the S insignia' do
       expect(@insignia.svg).to include(
         <<~SVG
           <g transform="translate(0, 50)">
@@ -54,15 +56,15 @@ describe USPSFlags::Grades do
     end
   end
 
-  context "P" do
+  context 'P' do
     before(:each) do
       @insignia = USPSFlags::Grades.new do |g|
         g.grade = :p
-        g.outfile = ""
+        g.outfile = ''
       end
     end
 
-    it "should have the P insignia" do
+    it 'should have the P insignia' do
       expect(@insignia.svg).to include(
         <<~SVG
           <g transform="translate(0, 50)">
@@ -75,16 +77,16 @@ describe USPSFlags::Grades do
     end
   end
 
-  context "AP - EdPro" do
+  context 'AP - EdPro' do
     before(:each) do
       @insignia = USPSFlags::Grades.new do |g|
         g.grade = :ap
         g.edpro = true
-        g.outfile = ""
+        g.outfile = ''
       end
     end
 
-    it "should have the AP insignia" do
+    it 'should have the AP insignia' do
       expect(@insignia.svg).to include(
         <<~SVG
           <g transform="translate(0, 50)">
@@ -112,26 +114,26 @@ describe USPSFlags::Grades do
       )
     end
 
-    it "should have the AP EdPro bar" do
+    it 'should have the AP EdPro bar' do
       expect(@insignia.svg).to include(
         <<~SVG
-          <rect x="0" y="100" width="381.25" height="15" fill="#FFBF3F" />
+          <rect x="0" y="100" width="381.25" height="20" fill="#FFBF3F" />
         SVG
       )
     end
   end
 
-  context "JN - 5MM" do
+  context 'JN - 5MM' do
     before(:each) do
       @insignia = USPSFlags::Grades.new do |g|
         g.grade = :jn
         g.merit_marks = 5
         g.edpro = true
-        g.outfile = ""
+        g.outfile = ''
       end
     end
 
-    it "should have the JN insignia" do
+    it 'should have the JN insignia' do
       expect(@insignia.svg).to include(
         <<~SVG
           <g transform="translate(0, 50)">
@@ -175,33 +177,33 @@ describe USPSFlags::Grades do
       )
     end
 
-    it "should have a 5th position merit mark" do
-      expect(@insignia.svg).to include("<rect x=\"180\" y=\"0\" width=\"35\" height=\"80\" fill=\"#FFBF3F\" />")
+    it 'should have a 5th position merit mark' do
+      expect(@insignia.svg).to include('<rect x="180" y="0" width="35" height="80" fill="#FFBF3F" />')
     end
 
-    it "should not have a 6th position merit mark" do
-      expect(@insignia.svg).to_not include("<rect x=\"225\" y=\"0\" width=\"35\" height=\"80\" fill=\"#FFBF3F\" />")
+    it 'should not have a 6th position merit mark' do
+      expect(@insignia.svg).to_not include('<rect x="225" y="0" width="35" height="80" fill="#FFBF3F" />')
     end
 
-    it "should have the JN EdPro bar" do
+    it 'should have the JN EdPro bar' do
       expect(@insignia.svg).to include(
         <<~SVG
-          <rect x="0" y="100" width="385" height="15" fill="#FFBF3F" />
+          <rect x="0" y="100" width="385" height="20" fill="#FFBF3F" />
         SVG
       )
     end
   end
 
-  context "N - Life Member" do
+  context 'N - Life Member' do
     before(:each) do
       @insignia = USPSFlags::Grades.new do |g|
         g.grade = :n
         g.membership = :life
-        g.outfile = ""
+        g.outfile = ''
       end
     end
 
-    it "should have the N insignia" do
+    it 'should have the N insignia' do
       expect(@insignia.svg).to include(
         <<~SVG
           <g transform="translate(0, 50)">
@@ -263,29 +265,31 @@ describe USPSFlags::Grades do
       )
     end
 
-    it "should have a life member arrow" do
+    it 'should have a life member arrow' do
       expect(@insignia.svg).to include(
-        "m 107.6,178.2 c -0.2,0.7 -1.2,4.7 -2.1,8.8 -0.9,4.1 -2.2,9.7 -3,12.5 -7.9,29.7 -8.9,51.9 -2.9,67.7 4.5,12.2 7,16.7 8.9,16.7 2.4,0.1 12.2,-15.8 16.2,-26.4 6.4,-16.5 6.7,-18 6.7,-33.6 0.1,-15.7 -0.1,-16.4 -6.7,-29.7 -2,-3.9 -5.4,-8.5 -8.9,-11.8 -5.7,-5.5 -7.6,-6.4 -8.2,-4.2 z"
+        'm 107.6,178.2 c -0.2,0.7 -1.2,4.7 -2.1,8.8 -0.9,4.1 -2.2,9.7 -3,12.5 -7.9,29.7 -8.9,51.9 -2.9,67.7 4.5,' \
+        '12.2 7,16.7 8.9,16.7 2.4,0.1 12.2,-15.8 16.2,-26.4 6.4,-16.5 6.7,-18 6.7,-33.6 0.1,-15.7 -0.1,-16.4 -6.7,' \
+        '-29.7 -2,-3.9 -5.4,-8.5 -8.9,-11.8 -5.7,-5.5 -7.6,-6.4 -8.2,-4.2 z'
       )
     end
   end
 
-  context "SN - Senior Member - 20 MM" do
+  context 'SN - Senior Member - 20 MM' do
     before(:each) do
       @insignia = USPSFlags::Grades.new do |g|
         g.grade = :sn
         g.membership = :senior
         g.merit_marks = 20
-        g.outfile = ""
+        g.outfile = ''
       end
     end
 
-    it "should have the SN insignia box" do
+    it 'should have the SN insignia box' do
       expect(@insignia.svg).to include('<rect x="20" y="-10" width="')
       expect(@insignia.svg).to include('" height="155" fill="none" stroke-width="20"')
     end
 
-    it "should have a senior member arrow" do
+    it 'should have a senior member arrow' do
       expect(@insignia.svg).to include(
         <<~SVG
           <polyline points="0,250 75,220 75,240 150,240 150,260 75,260 75,280 0,250" fill="#FFBF3F" />
@@ -299,12 +303,18 @@ describe USPSFlags::Grades do
       )
     end
 
-    it "should have a 20th position merit mark" do
-      expect(@insignia.svg).to include("<rect x=\"855\" y=\"0\" width=\"35\" height=\"80\" fill=\"#FFBF3F\" />")
+    it 'should have a 20th position merit mark' do
+      expect(@insignia.svg).to include('<rect x="855" y="0" width="35" height="80" fill="#FFBF3F" />')
     end
   end
 
   it 'should generate all without error' do
     expect(USPSFlags::Grades.all).to eql(USPSFlags::Grades::ALL_CONFIGS)
   end
+
+  it 'should raise the correct error with an invalid edpro request' do
+    expect { USPSFlags::Grades::EdPro.get(:s) }.to raise_error(
+      USPSFlags::Errors::InvalidInsignia, 'EdPro is only valid for grades AP, JN, N'
+    )
+  end
 end

data/usps_flags-grades.gemspec

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 Gem::Specification.new do |s|
   s.name          = 'usps_flags-grades'
-  s.version       = '0.0.12'
-  s.date          = '2019-06-04'
+  s.version       = '0.1.0'
+  s.date          = '2019-06-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'
@@ -14,7 +16,7 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '~> 2.4'
 
-  s.add_runtime_dependency 'usps_flags', '~> 0.4',  '>= 0.4.0'
+  s.add_runtime_dependency 'usps_flags', '~> 0.5',  '>= 0.5.1'
 
   s.add_development_dependency 'rake',      '~> 12.2', '>= 12.2.1'
   s.add_development_dependency 'rspec',     '~> 3.7',  '>= 3.7.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: usps_flags-grades
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.1.0
 platform: ruby
 authors:
 - Julian Fiander
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-04 00:00:00.000000000 Z
+date: 2019-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: usps_flags
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.5.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement