generate.rb in usps_flags-0.3.6

- old
+ new

@@ -52,18 +52,15 @@
     # @param [Boolean] svg Whether to generate SVG images.
     # @param [Boolean] png Whether to generate PNG images.
     # @param [Boolean] zips Whether to create zip archives for all images created. Does not create a zip for skipped formats.
     # @param [Boolean] reset Whether to delete all previous files before generating new files.
     def all(svg: true, png: true, zips: true, reset: true)
-      raise USPSFlags::Errors::StaticFilesGenerationError, "At least one argument switch must be true out of [svg, png, zips]." unless svg || png || zips
+      raise USPSFlags::Errors::StaticFilesGenerationError, "At least one argument switch must be true out of [svg, png, zips, reset]." unless svg || png || zips || reset
 
-      remove_static_files if reset
-      static_generation_header
       overall_start_time = Time.now
-      USPSFlags::Helpers.valid_flags(:all).each do |flag|
-        generate_static_images_for(flag, svg: svg, png: png)
-      end
+      remove_static_files if reset
+      images(svg: svg, png: png) if svg || png
       zips(svg: svg, png: png) if zips
       USPSFlags::Helpers.log "\nTotal run time: #{Time.now - overall_start_time} s\n\n"
     end
 
     # Generate zip archives of current static image files.
@@ -74,19 +71,29 @@
       raise USPSFlags::Errors::ZipGenerationError, "At least one argument switch must be true out of [svg, png]." unless svg || png
       generate_zip("svg") if svg
       generate_zip("png") if png
     end
 
+    # Generate static image files.
+    #
+    # @param [Boolean] svg Generate static SVG images.
+    # @param [Boolean] png Generate static PNG images.
+    def images(svg: true, png: true)
+      static_generation_header
+      USPSFlags::Helpers.valid_flags(:all).each do |flag|
+        generate_static_images_for(flag, svg: svg, png: png)
+      end
+    end
+
     # Generate trident spec sheet as an SVG image.
     #
     # @param [String] outfile The path to save the SVG file to. If not set, prints to console.
     # @param [Integer] fly The nominal fly length of an appropriate flag field for the generated tridents. Size labels scale to this size.
     # @param [String] outfile The unit to append to all trident measurements.
     # @param [String] scale The image scale divisor factor.
     # @return [String] Returns the SVG data.
-    def spec(outfile: nil, fly: nil, unit: nil, scale: nil)
-      fly = fly.nil? ? USPSFlags::Config::BASE_FLY : fly
+    def spec(outfile: nil, fly: USPSFlags::Config::BASE_FLY, unit: nil, scale: nil)
       svg = ""
       svg << USPSFlags::Core.headers(scale: scale, title: "USPS Trident Specifications")
       svg << USPSFlags::Core.trident_spec(fly: fly, unit: unit)
       svg << USPSFlags::Core.footer
 
@@ -101,12 +108,12 @@
       end
       ["SVG/insignia", "PNG/insignia"].each { |dir| ::FileUtils.mkdir_p("#{USPSFlags::Config.flags_dir}/#{dir}") }
       USPSFlags::Helpers.log "\n - Cleared previous files.\n"
     end
 
-    def set_file_paths(flag)
-      @svg_file = "#{USPSFlags::Config.flags_dir}/SVG/#{flag}.svg"
+    def set_file_paths
+      @svg_file = "#{USPSFlags::Config.flags_dir}/SVG/#{@flag}.svg"
       @png_file = @svg_file.gsub("/SVG/", "/PNG/").gsub(".svg", ".png")
       @svg_ins_file = @svg_file.gsub("/SVG/", "/SVG/insignia/")
       @png_ins_file = @svg_file.gsub("/SVG/", "/PNG/insignia/").gsub(".svg", ".png")
       [@svg_file, @png_file, @svg_ins_file, @png_ins_file]
     end
@@ -142,82 +149,98 @@
     end
 
     def generate_static_images_for(flag, svg: true, png: true)
       start_time = Time.now
       # USPSFlags::Helpers.log " |     |  _ _ _ _ _  |         \r".rjust(USPSFlags::Helpers.max_flag_name_length+31, " ")
-      flag = flag.upcase
-      USPSFlags::Helpers.log "#{flag.rjust(USPSFlags::Helpers.max_flag_name_length)} |"
+      @flag = flag.upcase
+      USPSFlags::Helpers.log "#{@flag.rjust(USPSFlags::Helpers.max_flag_name_length)} |"
 
-      set_file_paths(flag)
+      set_file_paths
 
-      svg ? generate_static_svg(flag) : USPSFlags::Helpers.log("-")
-      png ? generate_static_png(flag) : USPSFlags::Helpers.log("- ")
+      svg ? generate_static_svg : USPSFlags::Helpers.log("-")
+      png ? generate_static_png : USPSFlags::Helpers.log("- ")
 
       run_time = (Time.now - start_time).round(4).to_s[(0..5)].ljust(6, "0")
       USPSFlags::Helpers.log " | #{run_time} s\n"
     end
 
-    def generate_static_svg(flag)
+    def generate_static_svg
       USPSFlags::Helpers.log " "
-      svg flag, outfile: @svg_file, scale: 1
+      svg @flag, outfile: @svg_file, scale: 1
       USPSFlags::Helpers.log "S"
-      if USPSFlags::Helpers.valid_flags(:past).include?(flag) || !USPSFlags::Helpers.valid_flags(:insignia).include?(flag)
+      if USPSFlags::Helpers.valid_flags(:past).include?(@flag) || !USPSFlags::Helpers.valid_flags(:insignia).include?(@flag)
         USPSFlags::Helpers.log "-"
       else
-        svg flag, field: false, outfile: @svg_ins_file, scale: 1
+        svg @flag, field: false, outfile: @svg_ins_file, scale: 1
         USPSFlags::Helpers.log "I"
       end
     end
 
-    def generate_static_png(flag)
+    def generate_static_png
       USPSFlags::Helpers.log "  | "
       generate_fullsize_png
-      generate_fullsize_png_insignia(flag)
-      generate_reduced_size_pngs(flag)
+      generate_fullsize_png_insignia
+      generate_reduced_size_pngs
     end
 
     def generate_fullsize_png
-      png(File.read(@svg_file), outfile: @png_file) unless ::File.exist?(@png_file)
+      return if file_found?(@png_file)
+
+      png(File.read(@svg_file), outfile: @png_file)
       USPSFlags::Helpers.log "F"
     end
 
-    def generate_fullsize_png_insignia(flag)
-      if can_have_insignia?(flag)
-        USPSFlags::Helpers.log "-"
-      else
-        png(File.read(@svg_ins_file), outfile: @png_ins_file, trim: true) unless ::File.exist?(@png_ins_file)
-        USPSFlags::Helpers.log "I"
-      end
-    end
+    def generate_fullsize_png_insignia
+      return if no_insignia?
+      return if file_found?(@png_ins_file)
 
-    def can_have_insignia?(flag)
-      USPSFlags::Helpers.valid_flags(:past).include?(flag) || !USPSFlags::Helpers.valid_flags(:insignia).include?(flag)
+      png(File.read(@svg_ins_file), outfile: @png_ins_file, trim: true)
+      USPSFlags::Helpers.log "I"
     end
 
-    def generate_reduced_size_pngs(flag)
+    def generate_reduced_size_pngs
       USPSFlags::Helpers.png_sizes.keys.each do |size|
-        USPSFlags::Helpers.log(".") and next if ::File.exist?("#{USPSFlags::Config.flags_dir}/PNG/#{flag}.#{size}.png")
-        size, size_key = USPSFlags::Helpers.size_and_key(size: size, flag: flag)
-        generate_smaller_png(flag, size, size_key)
-        generate_smaller_png_insignia(flag, size, size_key)
+        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_ins_file = @sized_png_file.gsub("/PNG/", "/PNG/insignia/")
+
+        generate_smaller_png(size, size_key)
+        generate_smaller_png_insignia(size, size_key)
       end
     end
 
-    def generate_smaller_png(flag, size, size_key)
-      USPSFlags::Helpers.resize_png(@png_ins_file, flag: flag, size: size, size_key: size_key) if USPSFlags::Helpers.valid_flags(:insignia).include?(flag)
+    def generate_smaller_png(size, size_key)
+      return if file_found?(@sized_png_file)
+      return if too_big?(@png_file, size)
+
+      USPSFlags::Helpers.resize_png(@png_file, file: @flag, size: size, size_key: size_key)
       USPSFlags::Helpers.log USPSFlags::Helpers.png_sizes[size_key]
     end
 
-    def generate_smaller_png_insignia(flag, size, size_key)
-      if ::File.exist?(@png_ins_file) && ::File.exist?("#{USPSFlags::Config.flags_dir}/PNG/insignia/#{flag}.#{size}.png")
-        USPSFlags::Helpers.log "."
-      elsif ::File.exist?(@png_ins_file) && MiniMagick::Image.open(@png_ins_file)[:width] > size && USPSFlags::Helpers.valid_flags(:insignia).include?(flag)
-        USPSFlags::Helpers.resize_png(@png_ins_file, flag: flag, size: size, size_key: size_key)
-        USPSFlags::Helpers.log "i"
-      elsif ::File.exist?(@png_ins_file)
-        USPSFlags::Helpers.log "+"
-      else
-        USPSFlags::Helpers.log "-"
-      end
+    def generate_smaller_png_insignia(size, size_key)
+      return if no_insignia?
+      return if file_found?(@sized_png_ins_file)
+      return if too_big?(@png_ins_file, size)
+
+      USPSFlags::Helpers.resize_png(@png_ins_file, file: "insignia/#{@flag}", size: size, size_key: size_key)
+      USPSFlags::Helpers.log "i"
+    end
+
+    def no_insignia?
+      return false if USPSFlags::Helpers.valid_flags(:insignia).include?(@flag)
+      USPSFlags::Helpers.log "-"
+      true
+    end
+
+    def file_found?(file)
+      return false unless ::File.exist?(file)
+      USPSFlags::Helpers.log "."
+      true
+    end
+
+    def too_big?(file, size)
+      return false unless size > MiniMagick::Image.open(file)[:width]
+      USPSFlags::Helpers.log "+"
+      true
     end
   end
 end