usps_flags-grades 0.0.12 → 0.1.5

data/lib/usps_flags/grades/merit_marks.rb

@@ -1,57 +1,60 @@
+# frozen_string_literal: true
+
 # Core SVG data for merit marks.
 #
 # This class should never need to be called directly.
 # @private
-class USPSFlags::Grades::MeritMarks
-  class << self
-    def get(number)
-      return if number < 1
-
-      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>" }
-
-      svg
-    end
-
-    private
-    def bar(offset = 0)
-      <<~SVG
-        <rect x="#{offset}" y="0" width="35" height="80" fill="#{USPSFlags::Config::GOLD}" />
-      SVG
-    end
-
-    def generate_top_row(number)
-      svg = ""
-
-      number.times do |i|
-        svg << bar(45 * i)
+class USPSFlags
+  class Grades
+    class MeritMarks
+      class << self
+        def get(number)
+          return if number < 1
+
+          svg = +''
+          new_lines = 0
+
+          top_row = number % 20
+          svg << generate_top_row(top_row)
+          number -= top_row
+
+          number, new_lines, svg = add_row(number, new_lines, svg) while number.positive?
+          new_lines.times { svg << '</g>' }
+
+          svg
+        end
+
+      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}" />
+          SVG
+        end
+
+        def generate_top_row(number)
+          svg = +''
+          number.times { |i| svg << bar(45 * i) }
+          svg
+        end
+
+        def generate_full_row
+          svg = +''
+          20.times { |i| svg << bar(45 * i) }
+          svg
+        end
       end
-
-      svg
-    end
-
-    def generate_full_row
-      svg = ""
-
-      20.times do |i|
-        svg << bar(45 * i)
-      end
-
-      svg
     end
   end
 end

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
-      @insignia = USPSFlags::Grades.new do |b|
+  describe 'invalid insignia' do
+    it 'raises USPSFlags::Errors::InvalidInsignia if an invalid grade is specified' do
+      @insignia = described_class.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
-      @insignia = USPSFlags::Grades.new do |b|
+    it 'raises USPSFlags::Errors::InvalidInsignia if an invalid edpro is specified' do
+      @insignia = described_class.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
-      @insignia = USPSFlags::Grades.new do |b|
+    it 'raises USPSFlags::Errors::InvalidInsignia if an invalid membership is specified' do
+      @insignia = described_class.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
-    before(:each) do
-      @insignia = USPSFlags::Grades.new do |g|
+  context 'with S' do
+    before do
+      @insignia = described_class.new do |g|
         g.grade = :s
-        g.outfile = ""
+        g.outfile = ''
       end
     end
 
-    it "should have the S insignia" do
+    it 'has 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
-    before(:each) do
-      @insignia = USPSFlags::Grades.new do |g|
+  context 'with P' do
+    before do
+      @insignia = described_class.new do |g|
         g.grade = :p
-        g.outfile = ""
+        g.outfile = ''
       end
     end
 
-    it "should have the P insignia" do
+    it 'has 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
-    before(:each) do
-      @insignia = USPSFlags::Grades.new do |g|
+  context 'with AP - EdPro' do
+    before do
+      @insignia = described_class.new do |g|
         g.grade = :ap
         g.edpro = true
-        g.outfile = ""
+        g.outfile = ''
       end
     end
 
-    it "should have the AP insignia" do
+    it 'has 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 'has 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
-    before(:each) do
-      @insignia = USPSFlags::Grades.new do |g|
+  context 'with JN - 5MM' do
+    before do
+      @insignia = described_class.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 'has 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 'has 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 'does not have a 6th position merit mark' do
+      expect(@insignia.svg).not_to include('<rect x="225" y="0" width="35" height="80" fill="#FFBF3F" />')
     end
 
-    it "should have the JN EdPro bar" do
+    it 'has 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
-    before(:each) do
-      @insignia = USPSFlags::Grades.new do |g|
+  context 'with N - Life Member' do
+    before do
+      @insignia = described_class.new do |g|
         g.grade = :n
         g.membership = :life
-        g.outfile = ""
+        g.outfile = ''
       end
     end
 
-    it "should have the N insignia" do
+    it 'has the N insignia' do
       expect(@insignia.svg).to include(
         <<~SVG
           <g transform="translate(0, 50)">
@@ -263,29 +265,32 @@ describe USPSFlags::Grades do
       )
     end
 
-    it "should have a life member arrow" do
+    it 'has 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
-    before(:each) do
-      @insignia = USPSFlags::Grades.new do |g|
+  context 'with SN - Senior Member - 20 MM' do
+    before do
+      @insignia = described_class.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
-      expect(@insignia.svg).to include('<rect x="20" y="-10" width="')
-      expect(@insignia.svg).to include('" height="155" fill="none" stroke-width="20"')
+    it 'has the SN insignia box' do
+      expect(@insignia.svg).to include(
+        '<rect x="20" y="-10" width="730" height="155" fill="none" stroke-width="20"'
+      )
     end
 
-    it "should have a senior member arrow" do
+    it 'has 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 +304,24 @@ 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 'has 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)
+  it 'generates all without error' do
+    expect(described_class.all).to eql(USPSFlags::Grades::ALL_CONFIGS)
+  end
+
+  it 'raises 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
+
+  it 'does not raise an error from png' do
+    expect { described_class.new { |g| g.membership = :life }.png(outfile: './life.png') }.not_to(raise_error)
+  ensure
+    File.delete('./life.png')
   end
 end

data/usps_flags-grades.gemspec

@@ -1,9 +1,11 @@
+# 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.5'
+  s.date          = '2020-08-03'
   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.description   = 'An extension to the flag image generator for United States Power Squadrons to generate insignia.'
   s.homepage      = 'http://rubygems.org/gems/usps_flags-grades'
   s.license       = 'GPL-3.0'
   s.authors       = ['Julian Fiander']
@@ -12,11 +14,13 @@ Gem::Specification.new do |s|
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- spec/*`.split("\n")
 
-  s.required_ruby_version = '~> 2.4'
+  s.required_ruby_version = '~> 2.5'
 
-  s.add_runtime_dependency 'usps_flags', '~> 0.4',  '>= 0.4.0'
+  s.add_runtime_dependency 'usps_flags', '~> 0.5',  '>= 0.5.5'
 
-  s.add_development_dependency 'rake',      '~> 12.2', '>= 12.2.1'
-  s.add_development_dependency 'rspec',     '~> 3.7',  '>= 3.7.0'
-  s.add_development_dependency 'simplecov', '~> 0.15', '>= 0.15.1'
+  s.add_development_dependency 'rake',          '~> 12.2', '>= 12.2.1'
+  s.add_development_dependency 'rspec',         '~> 3.7',  '>= 3.7.0'
+  s.add_development_dependency 'rubocop',       '~> 0.71', '>= 0.71.0'
+  s.add_development_dependency 'rubocop-rspec', '~> 1.30', '>= 1.30.0'
+  s.add_development_dependency 'simplecov',     '~> 0.15', '>= 0.15.1'
 end

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.5
 platform: ruby
 authors:
 - Julian Fiander
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-04 00:00:00.000000000 Z
+date: 2020-08-03 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.5
   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.5
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -70,6 +70,46 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.7.0
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.71'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.71.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.71'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.71.0
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.30'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.30.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.30'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.30.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -90,8 +130,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.15.1
-description: An extension to the flag image (PNG, SVG) generator for United States
-  Power Squadrons to generate grade insignia.
+description: An extension to the flag image generator for United States Power Squadrons
+  to generate insignia.
 email: julian@fiander.one
 executables: []
 extensions: []
@@ -99,6 +139,8 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
+- ".ruby-version"
 - ".travis.yml"
 - ".yardopts"
 - CONTRIBUTING.md
@@ -130,15 +172,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Insignia generator for United States Power Squadrons