ruby_figlet 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b029b1a636cebee4b50ec4cc7aae07817f6aa474
-  data.tar.gz: 63126bc7878d1f3fb5c0c7b30f84debea0e0ac7b
+  metadata.gz: 581f31f99acc9ef55d8eea09a074b8254a578449
+  data.tar.gz: 6a9c6cd4545a14bd92c21ae571d436ff4b1b8394
 SHA512:
-  metadata.gz: f79bd8e2b7b7238c33a5b7190c1cbcfa59ee66f1a0941e9029bf8eac20964c2de7962947d810019cb64637936f15c8ca226909fc6cfbc76f53fe234529fbb73a
-  data.tar.gz: 75a5903063923d317a9bbe1922893045b45a4d6975fa6f9f02ad427748aed1ef06b1bb0a347d0cee2cbc2f3bef13fe8751d4d419a3fcdc2bb44351d51f1c0292
+  metadata.gz: 6905fef1aa55856518d5b12a91c36549d06b951b3b6a0e5c7bb5fb38a91c2aabbfc15dc1d683060dd06213ffaa4c00b646f7f04ccb238b2569ae59adfe837e5f
+  data.tar.gz: 18f9498fd39aa41140d7e253e0a2d19ec389073fb0a1d195ce7e2b0f32f18571b0fd115a2ef846db252389bb28c75869f4f405a9c7c1528939e2248f6c0812b7

data/README.md

@@ -27,8 +27,9 @@ puts moo # Default font is 'standard' when no arguments given
 
 # or just
 
-puts "meow...".art
-puts RubyFiglet::Figlet.new "meow..." # both work the same
+print "meow...".art
+print RubyFiglet::Figlet.new("meow...").stringify
+RubyFiglet::Figlet.new("meow...").show # all work the same
 
 # str.art(font)/str.art!(font) and RubyFiglet::Figlet.new(str, font) have a font parameter!
 
@@ -44,7 +45,7 @@ puts "Heizölrückstoßabdämpfung".art # =>
 # |_| |_| \___||_|/___| \___/ |_||_|    \__,_| \___||_|\_\|___/ \__| \___/ | ||_/ \__,_||_.__/  \__,_| \__,_||_| |_| |_|| .__/ |_|   \__,_||_| |_| \__, |
 #                                                                          |_|                                          |_|                        |___/
 
-puts RubyFiglet::Figlet.new("It's an abstract sort of font", 'weird')
+puts RubyFiglet::Figlet.new("It's an abstract sort of font", 'weird').stringify
 
 bowl = "Soup?"
 bowl.art! 'alphabet'

data/bin/ruby-figlet

@@ -22,4 +22,5 @@ if ARGV.include? '-f'
   ARGV.delete('-f')
   ARGV.delete(font)
 end
-puts ARGV[0].art font
+first_arg = ARGV[0].gsub("\\n", "\n")
+puts first_arg.art font

data/lib/figlet_interpreter.rb

@@ -51,14 +51,10 @@ module FigFont
         @tag_count = meta[8].to_i
       end
       # we've got the information, now delete it form the `lines`
-      (0..@commented).each { lines.delete_at 0 } # This bugger,
-                                                # since I delete the first line
-                                                # the next line has now become
-                                                # the first line, embarrassing how long that took.
+      (0..@commented).each { lines.delete_at 0 } # since I delete the first line, the next line has now become the first line,
+
       endmark = lines[0][lines[0].length - 1]
-      (0..lines.size - 1).each do |i|
-        lines[i].gsub!(endmark, "")
-      end
+      (0..lines.size - 1).each { |i| lines[i].gsub!(endmark, "") } #remove endmarks
 
       char_hash = Hash.new
       (32..126).each do |code|
@@ -73,19 +69,23 @@ module FigFont
         'ö' => Array.new(@height, String.new),
         'ü' => Array.new(@height, String.new),
         'ß' => Array.new(@height, String.new)
-      }) if lines.length > 95 * @height
+      }) if lines.length > 95 * @height # 95 is the range of the num. of  the default chars
 
       char_hash.each do |key, value|
-        (0..@height - 1).each do |line|
-          char_hash[key][line] = lines[line]
-        end
+        @height.times { |line| char_hash[key][line] = lines[line] }
         lines.slice! 0..@height - 1
       end
 
       smush! char_hash unless @old_lay == -1
       char_hash.each do |key, arr|
-        (0..@height - 1).each { |i| char_hash[key][i] = arr[i].gsub(@hardblank, " ") }
+        @height.times { |i| char_hash[key][i] = arr[i].gsub(@hardblank, " ") }
       end
+
+      # Add fake newline character
+      newline = Array.new(@height, String.new)
+      newline[-1] = 10.chr
+      char_hash[10.chr] = newline
+
       return char_hash
     end
 
@@ -97,9 +97,7 @@ module FigFont
             same_at_index[down] = true if (letter_arr[down][over] == letter_arr[down + 1][over]) && (letter_arr[down][over] == ' ' && letter_arr[down + 1][over] == ' ')
           end
           if same_at_index.all?
-            (0..@height - 1).each do |down|
-              hash[letter][down].delete_at! over
-            end
+            @height.times { |down| hash[letter][down].delete_at! over }
           end
         end  # Pre-word smushing for each letter, when there is a consective vertical line of spaces, then smush them away
       end

data/lib/ruby_figlet.rb

@@ -29,23 +29,33 @@ module RubyFiglet
     end
 
     def stringify
-      string = String.new
-      (0..@height - 1).each do |row|
-        @string.each do |char|
-          string << @lookup[char][row]
+      breaks = @string.split "\n"
+      breaks.each_with_index do |break_line, i|
+        string = String.new
+        @height.times do |row|
+          break_line.each { |char| string << @lookup[char][row] }
+          string << "\n"
         end
-        string << "\n"
-      end
-      if @direction == 1
-        lines = string.split "\n"
-        (0..(%x[tput cols].to_i - 1) - lines[0].length).each do # Holy Moly, from 0 to (terminal width minus 1) minus length of the ascii art word.
-          lines.each_with_index do |line, i|
-            lines[i].insert 0, " "
+        if @direction == 1
+          lines = string.split "\n"
+          (0..(%x[tput cols].to_i - 1) - lines[0].length).each do # Holy Moly, from 0 to (terminal width minus 1) minus length of the ascii art word.
+            lines.each_with_index { |line, j| lines[j].insert 0, " " }
           end
+          string = lines.join "\n"
+        end
+        breaks[i] = string
+      end
+      string = breaks.join ""
+
+      lines = string.split "\n"
+      offset = 0
+      (lines.size).times do |j|
+        if lines[j - offset].strip.empty? # when a line is deleted, there must be an offset as the new array is now shorter (after a delete) so we must climb back up it, so that whe don't dlete wrong lines and try to access non-existent indices
+          lines.delete_at(j - offset)  # Remove any empty lines
+          offset += 1
         end
-        string = lines.join "\n"
       end
-      return string
+      return lines.join "\n"
     end
 
     def show

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_figlet
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Demonstrandum