usps_flags 0.3.8 → 0.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c0c1f0bda8f7052219bda470fc994d22195eecf
-  data.tar.gz: f595f0370e6d6c2dd737d5ff445423851bb98f76
+  metadata.gz: 89aee583c2bef9f84f8e950a6964459f7e2f0588
+  data.tar.gz: 4e955787d40313d4f10f6b0e57fa1bc210a872a3
 SHA512:
-  metadata.gz: d5221d60c22cc8b72373262b3d77659745f3799cb96391869169398ee322db05121bfa17f76036b2f69db55730044dfbded1ebaae3352c4505fd90072e772692
-  data.tar.gz: a5335d9c8d8010514d736174a4aad8073c414d9bf007b6b1bf88fcc7ad251ac4646f8aa314ca60adee97f269050c6eab614f514117da302ac0d622104cc88e91
+  metadata.gz: 985b6074040f4664ba27a04ba0109739ca846adc701755d6ffb4e94f812ce623a3c67d38ea38db46afb4a88a2617f9ac226f017d20839de433ba1c15cbc27f9b
+  data.tar.gz: ab8dd0f944595a3c5bd36e75f19140cb5340f06ec6e9f4e25ba4ba586ddc8ca6c360391a0e32fd1a03680e1f9a12249db393479a64dfb3078e8834347f3881b1

data/.gitignore

@@ -1,2 +1,4 @@
 doc/
 coverage/
+lib/output/
+tmp/

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    usps_flags (0.3.8)
+    usps_flags (0.3.9)
       file_utils (~> 1.1, >= 1.1.2)
       mini_magick (~> 4.8, >= 4.8.0)
       rubyzip (~> 1.2, >= 1.2.1)

data/lib/usps_flags/config.rb

@@ -7,9 +7,9 @@ class USPSFlags::Config
   BASE_FLY ||= 3072
   BASE_HOIST ||= BASE_FLY*2/3
   FRACTION_SCALE ||= 85
-  
-  @@flags_dir ||= defined?(::Rails) ? "#{::Rails.root}/app/assets/images/usps_flags" : "#{File.dirname(__dir__)}/output"
-  @@use_larger_tridents ||= true
+
+  @@flags_dir = "#{File.dirname(__dir__)}/output"
+  @@use_larger_tridents = true
   
   # Configuration constructor
   #
@@ -19,8 +19,8 @@ class USPSFlags::Config
   def initialize
     load_init_variables
     yield self if block_given?
-    set_flags_dir(reset: @reset)
     set_class_variables
+    set_flags_dir(reset: @reset)
   end
 
   attr_accessor :flags_dir
@@ -84,7 +84,11 @@ class USPSFlags::Config
   #
   # @return [String] The current path to the flags directory.
   def self.flags_dir
-    @@flags_dir
+    @@flags_dir || if defined?(::Rails)
+      "#{::Rails.root}/app/assets/images/usps-flags"
+    else
+      "#{File.dirname(__dir__)}/output"
+    end
   end
 
   # Alias for the directory to store generated log files.
@@ -116,19 +120,20 @@ class USPSFlags::Config
     @reset = false
   end
 
+  def set_class_variables
+    @@flags_dir = @flags_dir
+    @@use_larger_tridents = @use_larger_tridents
+  end
+
   def set_flags_dir(reset: false)
-    ::FileUtils.rm_rf(@flags_dir) if reset
+    return false if @@flags_dir.nil? || @@flags_dir.empty?
+    ::FileUtils.rm_rf(@@flags_dir) if reset
     [
-      "#{@flags_dir}/SVG/insignia",
-      "#{@flags_dir}/PNG/insignia",
-      "#{@flags_dir}/ZIP"
+      "#{@@flags_dir}/SVG/insignia",
+      "#{@@flags_dir}/PNG/insignia",
+      "#{@@flags_dir}/ZIP"
     ].each do |dir|
       ::FileUtils.mkdir_p(dir)
     end
   end
-
-  def set_class_variables
-    @@flags_dir = @flags_dir
-    @@use_larger_tridents = @use_larger_tridents
-  end
 end

data/lib/usps_flags/generate.rb

@@ -200,7 +200,7 @@ class USPSFlags::Generate
     def generate_reduced_size_pngs
       USPSFlags::Helpers.png_sizes.keys.each do |size|
         size, size_key = USPSFlags::Helpers.size_and_key(size: size, flag: @flag)
-        @sized_png_file = "#{USPSFlags::Config.flags_dir}/PNG/#{@flag}.#{@size_key}.png"
+        @sized_png_file = "#{USPSFlags::Config.flags_dir}/PNG/#{@flag}.#{size_key}.png"
         @sized_png_ins_file = @sized_png_file.gsub("/PNG/", "/PNG/insignia/")
 
         generate_smaller_png(size, size_key)

data/spec/usps_flags/generate_spec.rb

@@ -183,6 +183,51 @@ describe USPSFlags::Generate do
       expect { USPSFlags::Generate.all(reset: false) }.to_not raise_error # (USPSFlags::Errors::StaticFilesGenerationError)
     end
 
+    it "should have generated the correct log output" do
+      correct_log_pattern = <<~LOG
+            Flag | SVG | PNG        | Run time
+        ---------------------------------------
+            PLTC | S-  | F-H-K-D-T- | .*? s
+              PC | S-  | F-H-K-D-T- | .*? s
+             1LT | SI  | FIH\\+K\\+DiT\\. | .*? s
+             LTC | SI  | FIHiKiDiTi | .*? s
+             CDR | SI  | FIHiKiDiTi | .*? s
+         PORTCAP | SI  | FIH\\+K\\+DiTi | .*? s
+        FLEETCAP | SI  | FIH\\+KiDiTi | .*? s
+              LT | SI  | F\\.H\\+K\\+DiTi | .*? s
+             FLT | SI  | \\.IH\\+K\\+DiTi | .*? s
+           PDLTC | S-  | F-H-K-D-T- | .*? s
+             PDC | S-  | F-H-K-D-T- | .*? s
+            D1LT | SI  | FIH\\+K\\+DiTi | .*? s
+            DLTC | SI  | FIHiKiDiTi | .*? s
+              DC | SI  | FIHiKiDiTi | .*? s
+             DLT | SI  | FIH\\+K\\+DiTi | .*? s
+           DAIDE | SI  | FIH\\+KiDiTi | .*? s
+            DFLT | SI  | FIHiKiDiTi | .*? s
+           PSTFC | S-  | F-H-K-D-T- | .*? s
+             PRC | S-  | F-H-K-D-T- | .*? s
+             PVC | S-  | F-H-K-D-T- | .*? s
+             PCC | S-  | F-H-K-D-T- | .*? s
+           NAIDE | SI  | FIH\\+KiDiTi | .*? s
+            NFLT | SI  | FIHiKiDiTi | .*? s
+            STFC | SI  | FIH\\+K\\+DiTi | .*? s
+              RC | SI  | FIH\\+K\\+DiTi | .*? s
+              VC | SI  | FIHiKiDiTi | .*? s
+              CC | SI  | FIHiKiDiTi | .*? s
+          CRUISE | S-  | F-H-K-D-T- | .*? s
+             OIC | S-  | F-H-K-D-T- | .*? s
+          ENSIGN | S-  | F-H-K-D-T- | .*? s
+           WHEEL | S-  | F-H-K-D-T- | .*? s
+              US | S-  | F-H-K-D-T- | .*? s
+          Generated SVG Zip
+          Generated PNG Zip
+      LOG
+
+      log_contents = ::File.read("#{USPSFlags::Config.log_path}/flag.log")
+
+      expect(log_contents).to match(Regexp.new(correct_log_pattern))
+    end
+
     it "should not raise an error while clearing all static files" do
       expect { USPSFlags::Generate.all(svg: false, png: false, zips: false, reset: true) }.to_not raise_error # (USPSFlags::Errors::StaticFilesGenerationError)
     end

data/usps_flags.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = 'usps_flags'
-  s.version       = '0.3.8'
+  s.version       = '0.3.9'
   s.date          = '2017-11-08'
   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.8
+  version: 0.3.9
 platform: ruby
 authors:
 - Julian Fiander