ruby_figlet 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 55b9eefe921ecda1f181254911dbacf22b658bae
-  data.tar.gz: 4599bcfea9c47f9d79ec41ac42bb93c061754500
+  metadata.gz: '0887a9805f5a671af2b41d61472b85b981714d79'
+  data.tar.gz: d23cdc8114c666e61d49dc991305e45643636f96
 SHA512:
-  metadata.gz: e4f80091efd9506b70c4f2a221668141d462ecd0657b685ebe929592f98ba067cc816fb4c2d59365c717407a8eedf348a12a9eb71c4ef3d03cda7409a39d883e
-  data.tar.gz: 25c72dcd7db1915ee2be14c4c2917152f595857dce45c822aebdfff54f1e535fbb2a5b2c92150c0161b5a014bffc6a352d5da952fba65eba422924954be478e2
+  metadata.gz: bffb5334ba880591ad285f8412b99e6d28c960d126f62daeddb04c695ddc58532a0aef58c41a3b9bb9bc15e322969b905cadee6e80d8e9d83cd543fed52fb675
+  data.tar.gz: 870dfd5aefdbf7dbb7a2b70a2d35b67e13c7c820e9e3f9a440eca4df03ea43d835f54fb1086d3418d0d58e4474b6dd75f48c611859f0d60511bf0a7627c6e8d3

data/lib/figlet_interpreter.rb

@@ -5,6 +5,14 @@ class String
     str = str.force_encoding("BINARY")
     str.encode("UTF-8", invalid: :replace, undef: :replace)
   end
+
+  def delete_at! n
+    slice! n
+    self
+  end
+  def delete_at n
+    dup.delete_at! n
+  end
 end
 
 module FigFont
@@ -35,12 +43,12 @@ module FigFont
       @commented = meta[5].to_i
       # defaults, currently not used
       @print_way = 0
-      full_lay  = 64
-      tag_count = 229
+      @full_lay  = 64
+      @tag_count = 229
       if meta.size > 6 # overide defaults
         @print_way = meta[6].to_i
-        full_lay  = meta[7].to_i
-        tag_count = meta[8].to_i
+        @full_lay  = meta[7].to_i
+        @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,
@@ -49,7 +57,6 @@ module FigFont
                                                 # the first line, embarrassing how long that took.
       endmark = lines[0][lines[0].length - 1]
       (0..lines.size - 1).each do |i|
-        lines[i].gsub!(@hardblank, " ")
         lines[i].gsub!(endmark, "")
       end
 
@@ -75,11 +82,42 @@ module FigFont
         lines.slice! 0..@height - 1
       end
 
+      smush! char_hash, lines
+      char_hash.each do |key, arr|
+        (0..@height - 1).each { |i| char_hash[key][i] = arr[i].gsub(@hardblank, " ") }
+      end
       return char_hash
     end
 
+    private def smush hash, lines
+      hash.each do |letter, letter_arr|
+        (0..lines.min_by(&:length).length - 1).each do |over| # from 0 to the length of the shortest line in the array
+          same_at_index = Array.new(@height - 1, false)
+          (0..@height - 2).each do |down|
+            same_at_index[down] = true if (letter_arr[over][down] == letter_arr[over][down + 1]) && (letter_arr[over][down] == ' ' && letter_arr[over][down + 1] == ' ')
+          end
+          if same_at_index.all?
+            (0..@height - 1).each do |down|
+              hash[letter][down].delete_at! over
+            end
+          end
+        end  # Pre-word smushing for each letter, when there is a consective vertical line of spaces, then smush them away
+      end
+      hash
+    end
+
+    private def smush! hash, lines
+      hash.replace smush hash, lines
+    end
+
     def font_data
-      {'lookup_table': scan, 'height': @height, 'direction': @print_way}
+      {
+        'lookup_table': scan,
+        'height': @height,
+        'direction': @print_way,
+        'old_layout': @old_lay,
+        'full_layout': @full_lay
+      }
     end
   end
 end

data/lib/ruby_figlet.rb

@@ -22,6 +22,7 @@ module RubyFiglet
       @lookup = data[:lookup_table]
       @height = data[:height]
       @direction = data[:direction]
+      @smushing = data[:old_layout]
       string = string.reverse if @direction == 1
       @string = string
       @font = font
@@ -35,14 +36,14 @@ module RubyFiglet
         end
         string << "\n"
       end
-      lines = string.split "\n"
       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, " "
           end
         end
-        return lines.join "\n"
+        string = lines.join "\n"
       end
       return string
     end

metadata

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