ascii_paint 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 !binary "U0hBMQ==":
-  metadata.gz: 07fb319a0666e394fce07cca879a6d3c16cf81c9
-  data.tar.gz: 07e594e70ac58ebd656b72dabcbda59f2ae3e03b
+  metadata.gz: aa0af97bf7c65f945f41cc0ea7afba9160fede60
+  data.tar.gz: f2c02fbf638f7c3452948466343aff4403d86c55
 !binary "U0hBNTEy":
-  metadata.gz: 5e952740658a8fec7f020877d6d2e66e5bdf4bd5d370a2cd2ce507fa4b3f97179b093bf24894e509a2206377614a384c3488f34e4b98e866ca2a0e53fbb3eb76
-  data.tar.gz: 4bef3c9a2cc135a6646c7ce6abd52fdee20cb568828b68ffee032f6ebb6ec4b28f71af91665c81e55b7f04b3b439e2b39b8cd61a003c529a3f4b20cd34bad8a0
+  metadata.gz: ba79db13cfa0f7bbd267e4c6c4c567a054733f286b9cb5ce3886c7f7664cf6d61644a0fc45ac174c6a332de6a4a3e45aae5c78a11ad1b422e30ac69e207d2f9b
+  data.tar.gz: add9b24a0997a21aac2ca0ce489926bed8a23292205b82ccfdbd01a5c7ed3fe86884a2027ce3146fffc6a678f0837d8f93729da3536951daaffaa03f01449f33

data/data/block_characters/100.txt

@@ -0,0 +1,5 @@
+   d 
+   d 
+ ddd 
+d  d 
+ ddd 

data/data/block_characters/101.txt

@@ -0,0 +1,5 @@
+     
+ eee 
+ eee 
+ e   
+ eee 

data/data/block_characters/102.txt

@@ -0,0 +1,5 @@
+  ff 
+ f   
+ fff 
+ f   
+ f   

data/data/block_characters/103.txt

@@ -0,0 +1,5 @@
+     
+ ggg 
+ ggg 
+   g 
+ ggg 

data/data/block_characters/104.txt

@@ -0,0 +1,5 @@
+ h   
+ h   
+ hhh 
+ h  h
+ h  h

data/data/block_characters/105.txt

@@ -0,0 +1,5 @@
+     
+  i  
+     
+  i  
+  i  

data/data/block_characters/106.txt

@@ -0,0 +1,5 @@
+     
+   j 
+     
+   j 
+ jj  

data/data/block_characters/107.txt

@@ -0,0 +1,5 @@
+ k   
+ k   
+ kkk 
+ kk  
+ k k 

data/data/block_characters/108.txt

@@ -0,0 +1,5 @@
+  l  
+  l  
+  l  
+  l  
+  ll 

data/data/block_characters/109.txt

@@ -0,0 +1,5 @@
+     
+     
+ mmm 
+m m m
+m m m

data/data/block_characters/110.txt

@@ -0,0 +1,5 @@
+     
+     
+ nnn 
+ n  n
+ n  n

data/data/block_characters/111.txt

@@ -0,0 +1,5 @@
+     
+     
+ ooo 
+ o o 
+ ooo 

data/data/block_characters/112.txt

@@ -0,0 +1,5 @@
+     
+ ppp 
+ p  p
+ ppp 
+ p   

data/data/block_characters/113.txt

@@ -0,0 +1,5 @@
+     
+  qqq
+ q  q
+  qqq
+    q

data/data/block_characters/114.txt

@@ -0,0 +1,5 @@
+     
+     
+ rrr 
+ r   
+ r   

data/data/block_characters/115.txt

@@ -0,0 +1,5 @@
+     
+ sss 
+ ss  
+   s 
+ sss 

data/data/block_characters/116.txt

@@ -0,0 +1,5 @@
+     
+ t   
+tttt 
+ t   
+  tt 

data/data/block_characters/117.txt

@@ -0,0 +1,5 @@
+     
+     
+ u  u
+ u  u
+  uuu

data/data/block_characters/118.txt

@@ -0,0 +1,5 @@
+     
+     
+v   v
+ v v 
+  v  

data/data/block_characters/119.txt

@@ -0,0 +1,5 @@
+     
+     
+w w w
+w w w
+ w w 

data/data/block_characters/120.txt

@@ -0,0 +1,5 @@
+     
+     
+ x x 
+  x  
+ x x 

data/data/block_characters/121.txt

@@ -0,0 +1,5 @@
+     
+y  y 
+ yy  
+ y   
+y    

data/data/block_characters/122.txt

@@ -0,0 +1,5 @@
+     
+ zzzz
+   z 
+  z  
+ zzzz

data/data/block_characters/123.txt

@@ -0,0 +1,5 @@
+  {{ 
+  {  
+ {   
+  {  
+  {{ 

data/data/block_characters/124.txt

@@ -0,0 +1,5 @@
+  |  
+  |  
+  |  
+  |  
+  |  

data/data/block_characters/125.txt

@@ -0,0 +1,5 @@
+ }}  
+  }  
+   } 
+  }  
+ }}  

data/data/block_characters/126.txt

@@ -0,0 +1,5 @@
+     
+ ~~ ~
+~ ~~ 
+     
+     

data/data/block_characters/32.txt

@@ -0,0 +1,5 @@
+     
+     
+     
+     
+     

data/data/block_characters/33.txt

@@ -0,0 +1,5 @@
+  !  
+  !  
+  !  
+     
+  !  

data/data/block_characters/34.txt

@@ -0,0 +1,5 @@
+ " " 
+ " " 
+     
+     
+     

data/data/block_characters/35.txt

@@ -0,0 +1,5 @@
+ # # 
+#####
+ # # 
+#####
+ # # 

data/data/block_characters/36.txt

@@ -0,0 +1,5 @@
+ $$$$
+$ $  
+ $$$ 
+  $ $
+$$$$ 

data/data/block_characters/37.txt

@@ -0,0 +1,5 @@
+%   %
+   % 
+  %  
+ %   
+%   %

data/data/block_characters/38.txt

@@ -0,0 +1,5 @@
+&&&  
+& &  
+ && &
+&  & 
+ && &

data/data/block_characters/39.txt

@@ -0,0 +1,5 @@
+  '  
+  '  
+     
+     
+     

data/data/block_characters/40.txt

@@ -0,0 +1,5 @@
+   ((
+  (  
+  (  
+  (  
+   ((

data/data/block_characters/41.txt

@@ -0,0 +1,5 @@
+))   
+  )  
+  )  
+  )  
+))   

data/data/block_characters/42.txt

@@ -0,0 +1,5 @@
+* * *
+ *** 
+* * *
+     
+     

data/data/block_characters/43.txt

@@ -0,0 +1,5 @@
+  +  
+  +  
++++++
+  +  
+  +  

data/data/block_characters/44.txt

@@ -0,0 +1,5 @@
+     
+     
+     
+  ,  
+ ,,  

data/data/block_characters/45.txt

@@ -0,0 +1,5 @@
+     
+     
+-----
+     
+     

data/data/block_characters/46.txt

@@ -0,0 +1,5 @@
+     
+     
+     
+     
+ .   

data/data/block_characters/47.txt

@@ -0,0 +1,5 @@
+    /
+   / 
+  /  
+ /   
+/    

data/data/block_characters/58.txt

@@ -0,0 +1,5 @@
+     
+  :  
+     
+  :  
+     

data/data/block_characters/59.txt

@@ -0,0 +1,5 @@
+     
+  ;  
+     
+  ;  
+ ;;  

data/data/block_characters/60.txt

@@ -0,0 +1,5 @@
+   < 
+  <  
+ <   
+  <  
+   < 

data/data/block_characters/61.txt

@@ -0,0 +1,5 @@
+     
+=====
+     
+=====
+     

data/data/block_characters/62.txt

@@ -0,0 +1,5 @@
+ >   
+  >  
+   > 
+  >  
+ >   

data/data/block_characters/63.txt

@@ -0,0 +1,5 @@
+ ??? 
+?   ?
+  ?? 
+     
+  ?  

data/data/block_characters/64.txt

@@ -0,0 +1,5 @@
+ @@@@
+@ @ @
+@ @@@
+@    
+ @@@@

data/data/block_characters/{Q.txt → 81.txt}

@@ -2,4 +2,4 @@ QQQQ
 Q  Q 
 Q  Q 
 QQQQ 
-  QQQ
+   QQ

data/data/block_characters/91.txt

@@ -0,0 +1,5 @@
+ [[[ 
+ [   
+ [   
+ [   
+ [[[ 

data/data/block_characters/92.txt

@@ -0,0 +1,5 @@
+\    
+ \   
+  \  
+   \ 
+    \

data/data/block_characters/93.txt

@@ -0,0 +1,5 @@
+ ]]] 
+   ] 
+   ] 
+   ] 
+ ]]] 

data/data/block_characters/94.txt

@@ -0,0 +1,5 @@
+  ^  
+ ^ ^ 
+^   ^
+     
+     

data/data/block_characters/95.txt

@@ -0,0 +1,5 @@
+     
+     
+     
+     
+_____

data/data/block_characters/96.txt

@@ -0,0 +1,5 @@
+  `  
+   ` 
+     
+     
+     

data/data/block_characters/97.txt

@@ -0,0 +1,5 @@
+     
+     
+  aa 
+ a  a
+  aaa

data/data/block_characters/98.txt

@@ -0,0 +1,5 @@
+b    
+b    
+bbbb 
+b   b
+bbbb 

data/data/block_characters/99.txt

@@ -0,0 +1,5 @@
+     
+     
+ ccc 
+c    
+ ccc 

data/lib/ascii_paint.rb

@@ -30,6 +30,7 @@ module AsciiPaint
   # @return [String]
   #   the name of the painted PNG file
   def self.paint(ascii_art, out_filename, configuration = {})
+    # TODO: full path return value
     global_configuration = self.config
     local_configuration = global_configuration.dup.set_options(configuration)
 
@@ -59,7 +60,7 @@ module AsciiPaint
     if ascii_art.size == 1
       ascii_art = File.open(ascii_art[0], 'r').to_a.map(&:chomp)
     end
-    ascii_art
+    rectangularize(ascii_art)
   end
 
   def self.ascii_to_image(ascii_array, configuration)
@@ -73,7 +74,7 @@ module AsciiPaint
     width = lines.map(&:size).max
 
     width_pixels, height_pixels = configuration.characters_to_pixels(width, height)
-    png = ChunkyPNG::Image.new(width_pixels, height_pixels, configuration.color_map[' '])
+    png = ChunkyPNG::Image.new(width_pixels, height_pixels, ChunkyPNG::Color::TRANSPARENT)
   end
 
   def self.ascii_to_colors(strings, configuration)
@@ -98,6 +99,14 @@ module AsciiPaint
     image
   end
 
+  def self.rectangularize(lines)
+    width = lines.map(&:size).max
+
+    lines.map do |line|
+      line.ljust(width, ' ')
+    end
+  end
+
   def self.save_image(image, filename, _)
     image.save(filename, :interlace => true)
   end

data/lib/ascii_paint/block_character.rb

@@ -20,7 +20,7 @@ module AsciiPaint
     end
 
     def newline?
-      !!@newline
+      @newline == true
     end
 
     def to_s
@@ -55,7 +55,7 @@ module AsciiPaint
 
     # TODO: filename escaping
     def load_ascii(character)
-      path = block_characters_dir.join("#{character}.txt")
+      path = path_for character
       if File.exists? path
         @ascii = File.open(path, 'r').to_a.map(&:chomp)
         @ascii = pad_ascii(@ascii)
@@ -64,6 +64,11 @@ module AsciiPaint
       end
     end
 
+    def path_for(character)
+      # Use ASCII codes!
+      block_characters_dir.join "#{character.ord}.txt"
+    end
+
     def pad_ascii(ascii)
       left = " " * self.class.left_padding
       right = " " * self.class.right_padding

data/lib/ascii_paint/block_string.rb

@@ -6,27 +6,19 @@ module AsciiPaint
       @block_characters = string.chars.map { |char| BlockCharacter.new(char) }
     end
 
-    def each_row
-      return to_enum(:each_row) unless block_given?
-
-      rows =
-        block_characters.chunk do |block_char|
-          if block_char.newline?
-            nil
-          else
-            :not_newline
-          end
-        end.map do |symbol, row|
-          row
+    def rows
+      block_characters.inject([[]]) do |rows, block_char|
+        if block_char.newline?
+          rows << []
+        else
+          rows.last << block_char
         end
-
-      rows.each do |row|
-        yield row
+        rows
       end
     end
 
     def to_a
-      each_row.flat_map do |block_row|
+      rows.flat_map do |block_row|
         (0...BlockCharacter.height).map do |h|
           block_row.inject('') do |string_row, block_char|
             string_row + block_char.ascii[h]

data/lib/ascii_paint/config.rb

@@ -131,45 +131,7 @@ module AsciiPaint
       COLOR_FOR_UNDEFINED_CHARACTER = :black
       COLOR_MAP =
         begin
-          map = {
-            ' ' => :transparent,
-
-            '!' => :red,
-            '@' => :orange,
-            '#' => :yellow,
-            '$' => :green,
-            '%' => :blue,
-            '^' => :purple,
-
-            '_' => :white,
-            '~' => :black,
-
-            '<' => :lightgrey,
-            '>' => :grey,
-            '?' => :darkgrey,
-            ',' => :lightslategrey,
-            '.' => :slategrey,
-            '/' => :darkslategrey,
-            '\\' => :dimgrey,
-
-            ':' => :chocolate,
-            ';' => :blanchedalmond,
-            '\'' => :coral,
-            '"' => :deepskyblue,
-            '{' => :indigo,
-            '}' => :ivory,
-            '[' => :khaki,
-            ']' => :lavender,
-            '|' => :hotpink,
-            '&' => :darksalmon,
-            '*' => :lime,
-            '(' => :lightyellow,
-            ')' => :honeydew,
-            '-' => :azure,
-            '+' => :crimson,
-            '=' => :antiquewhite,
-            '`' => :cornsilk
-          }
+          map = {}
 
           letters = ('a'..'z').zip('A'..'Z').flatten  # ['a', 'A', 'b', 'B', ...]
           map.merge! rainbow_mapping(letters)
@@ -177,6 +139,9 @@ module AsciiPaint
           numbers = ('0'..'9')
           map.merge! rainbow_mapping(numbers)
 
+          punctuation = '~!@#$%^&*()_+`-={}|[]\:;"\'<>?,./'.chars
+          map.merge! rainbow_mapping(punctuation)
+
           map
         end
     end

data/lib/ascii_paint/version.rb

@@ -1,3 +1,3 @@
 module AsciiPaint
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 end

data/spec/block_string_spec.rb

@@ -41,6 +41,26 @@ describe AsciiPaint::BlockString do
     File.should_not be_a_file OUTPUT_FILENAME
   end
 
+  it "renders adjacent newlines" do
+    ascii = "ASCII\n\npaint"
+    AsciiPaint.block_paint(ascii, OUTPUT_FILENAME, character_height: 10)
+    result = ChunkyPNG::Image.from_file(OUTPUT_FILENAME)
+
+    rows = 3
+    row_height = 10 * AsciiPaint::BlockCharacter.height
+    result.height.should eq(rows * row_height)
+  end
+
+  it "renders leading and trailing newlines" do
+    ascii = "\nASCII\npaint\n"
+    AsciiPaint.block_paint(ascii, OUTPUT_FILENAME, character_height: 10)
+    result = ChunkyPNG::Image.from_file(OUTPUT_FILENAME)
+
+    rows = 4
+    row_height = 10 * AsciiPaint::BlockCharacter.height
+    result.height.should eq(rows * row_height)
+  end
+
   context "data directory" do
     it "has character files of the correct width" do
       Helpers.each_block_character_path do |path|
@@ -60,16 +80,16 @@ describe AsciiPaint::BlockString do
       end
     end
 
-    it "has character files for all alphanumeric characters" do
-      desired_characters = ('A'..'Z').to_a + ('0'..'9').to_a
-      found_characters = []
+    it "has character files for all printing ASCII characters" do
+      printing_character_codes = (32..126).map { |code| code.to_s }
+      character_codes_present =
+        Helpers.each_block_character_path.map do |path|
+          path.to_s.match(/\/(\d+)\.txt/)[1]
+        end
 
-      Helpers.each_block_character_path do |path|
-        character = path.to_s.match(/\/(.)\.txt/)[1]
-        found_characters << character
-      end
+      missing_character_codes = printing_character_codes - character_codes_present
 
-      found_characters.should =~ desired_characters
+      missing_character_codes.should be_empty, missing_character_codes.to_s
     end
   end
 end

data/spec/spec_helper.rb

@@ -45,6 +45,7 @@ module Helpers
 
   # TODO: split into separate helper
   def self.each_block_character_path
+    return to_enum(:each_block_character_path) unless block_given?
     block_characters_dir = AsciiPaint.root.join('data', 'block_characters')
     block_characters_dir.each_child(false) do |path|
       full_path = block_characters_dir.join(path)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ascii_paint
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Nate Sullivan
@@ -63,42 +63,101 @@ files:
 - lib/ascii_paint/config.rb
 - lib/ascii_paint/version.rb
 - lib/ascii_paint.rb
-- data/block_characters/0.txt
-- data/block_characters/1.txt
-- data/block_characters/2.txt
-- data/block_characters/3.txt
-- data/block_characters/4.txt
-- data/block_characters/5.txt
-- data/block_characters/6.txt
-- data/block_characters/7.txt
-- data/block_characters/8.txt
-- data/block_characters/9.txt
-- data/block_characters/A.txt
-- data/block_characters/B.txt
-- data/block_characters/C.txt
-- data/block_characters/D.txt
-- data/block_characters/E.txt
-- data/block_characters/F.txt
-- data/block_characters/G.txt
-- data/block_characters/H.txt
-- data/block_characters/I.txt
-- data/block_characters/J.txt
-- data/block_characters/K.txt
-- data/block_characters/L.txt
-- data/block_characters/M.txt
-- data/block_characters/N.txt
-- data/block_characters/O.txt
-- data/block_characters/P.txt
-- data/block_characters/Q.txt
-- data/block_characters/R.txt
-- data/block_characters/S.txt
-- data/block_characters/T.txt
-- data/block_characters/U.txt
-- data/block_characters/V.txt
-- data/block_characters/W.txt
-- data/block_characters/X.txt
-- data/block_characters/Y.txt
-- data/block_characters/Z.txt
+- data/block_characters/100.txt
+- data/block_characters/101.txt
+- data/block_characters/102.txt
+- data/block_characters/103.txt
+- data/block_characters/104.txt
+- data/block_characters/105.txt
+- data/block_characters/106.txt
+- data/block_characters/107.txt
+- data/block_characters/108.txt
+- data/block_characters/109.txt
+- data/block_characters/110.txt
+- data/block_characters/111.txt
+- data/block_characters/112.txt
+- data/block_characters/113.txt
+- data/block_characters/114.txt
+- data/block_characters/115.txt
+- data/block_characters/116.txt
+- data/block_characters/117.txt
+- data/block_characters/118.txt
+- data/block_characters/119.txt
+- data/block_characters/120.txt
+- data/block_characters/121.txt
+- data/block_characters/122.txt
+- data/block_characters/123.txt
+- data/block_characters/124.txt
+- data/block_characters/125.txt
+- data/block_characters/126.txt
+- data/block_characters/32.txt
+- data/block_characters/33.txt
+- data/block_characters/34.txt
+- data/block_characters/35.txt
+- data/block_characters/36.txt
+- data/block_characters/37.txt
+- data/block_characters/38.txt
+- data/block_characters/39.txt
+- data/block_characters/40.txt
+- data/block_characters/41.txt
+- data/block_characters/42.txt
+- data/block_characters/43.txt
+- data/block_characters/44.txt
+- data/block_characters/45.txt
+- data/block_characters/46.txt
+- data/block_characters/47.txt
+- data/block_characters/48.txt
+- data/block_characters/49.txt
+- data/block_characters/50.txt
+- data/block_characters/51.txt
+- data/block_characters/52.txt
+- data/block_characters/53.txt
+- data/block_characters/54.txt
+- data/block_characters/55.txt
+- data/block_characters/56.txt
+- data/block_characters/57.txt
+- data/block_characters/58.txt
+- data/block_characters/59.txt
+- data/block_characters/60.txt
+- data/block_characters/61.txt
+- data/block_characters/62.txt
+- data/block_characters/63.txt
+- data/block_characters/64.txt
+- data/block_characters/65.txt
+- data/block_characters/66.txt
+- data/block_characters/67.txt
+- data/block_characters/68.txt
+- data/block_characters/69.txt
+- data/block_characters/70.txt
+- data/block_characters/71.txt
+- data/block_characters/72.txt
+- data/block_characters/73.txt
+- data/block_characters/74.txt
+- data/block_characters/75.txt
+- data/block_characters/76.txt
+- data/block_characters/77.txt
+- data/block_characters/78.txt
+- data/block_characters/79.txt
+- data/block_characters/80.txt
+- data/block_characters/81.txt
+- data/block_characters/82.txt
+- data/block_characters/83.txt
+- data/block_characters/84.txt
+- data/block_characters/85.txt
+- data/block_characters/86.txt
+- data/block_characters/87.txt
+- data/block_characters/88.txt
+- data/block_characters/89.txt
+- data/block_characters/90.txt
+- data/block_characters/91.txt
+- data/block_characters/92.txt
+- data/block_characters/93.txt
+- data/block_characters/94.txt
+- data/block_characters/95.txt
+- data/block_characters/96.txt
+- data/block_characters/97.txt
+- data/block_characters/98.txt
+- data/block_characters/99.txt
 - spec/ascii_paint_spec.rb
 - spec/block_string_spec.rb
 - spec/fixtures/ascii.txt