honeybii 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6adb7f18fd1f8eee84534167a89a3ffb33f12c58
-  data.tar.gz: 95de630b2da78a75d7d0fe715ca1cc08ec724a4c
+  metadata.gz: f8253805c2d75c692318f162548602dc04b51cb4
+  data.tar.gz: 2a911a44cb10cf5ec4bdea7838812e26cc84ae17
 SHA512:
-  metadata.gz: 9cfc6a6059c163cf5c14e34cfa59764241ad5af0a85ffef79a371318e96108c2f537e5ab2b475e6ee228468984864f2872230eec542d3c7fc7d3f7f9ea7da78d
-  data.tar.gz: 390e101890b793dc0c208cc359f6ae7f169d4483c1af1d795c2c845f13741ce9b90f289db00576702b1cd05cc20a69e7355eee5e187080308a5f1a099653ae59
+  metadata.gz: fe123439446bdefc6d21bf076ca5df9a8ff378dcdfc3cd2d6f80c69c744d36380dfb03c5443291900752f0192b077510219c0d7ce0db0b317bb47749aeb7a59f
+  data.tar.gz: a7ea69fbe695a100f4a1f76a687d704db188778e6f0400588a9190c982afcf1649f1f963656e369f3079a09fb3895f48238edbbfde9632e943053a645aa7a359

data/lib/honeybii/ascii_image.rb

@@ -2,13 +2,12 @@ require 'rmagick'
 
 class AsciiImage
   attr_accessor :raw
-  attr_accessor :shades
   attr_accessor :ascii
 
   def initialize(image_filename, point_size)
-    @raw = Magick::ImageList.new(image_filename)[0]
+    @raw = Magick::ImageList.new(image_filename).first
     @point_size = point_size
-    @ascii = Array.new
+    @ascii = ''
   end
 
   def to_s

data/lib/honeybii/shaded_ascii.rb

@@ -1,8 +1,8 @@
+SHADES = ['@', '%', '8', '#', '$', 'V', 'Y', 'x', '*', '=', '+', ':', '~', '-', '.', ' ']
+
 class ShadedAscii < AsciiImage
   def initialize(image_filename, point_size = 12)
     super image_filename, point_size
-    @raw = Magick::ImageList.new(image_filename).first
-    @shades = ['@', '%', '8', '#', '$', 'V', 'Y', 'x', '*', '=', '+', ':', '~', '-', '.', ' ']
     to_ascii!
   end
 
@@ -12,23 +12,23 @@ class ShadedAscii < AsciiImage
 
   def pixelate!
     columns = @raw.columns / @point_size
-    rows = @raw.rows / @point_size
-    @raw = @raw.resize_to_fit(columns, rows)
+    rows = @raw.rows / (@point_size * 2)
+    @raw.resize!(columns, rows)
   end
 
   def to_ascii!
     grayscale!
     pixelate!
 
-    @ascii_array = Array.new(@raw.rows).collect do |row|
+    ascii_array = Array.new(@raw.rows).collect do |row|
       Array.new(@raw.columns)
     end
     
     @raw.each_pixel do |pixel, col, row|
-      index = (((@shades.size - 1) * pixel.intensity).to_f / 65535.to_f).round
-      @ascii_array[row][col] = @shades[index]
+      index = (((SHADES.size - 1) * pixel.intensity).to_f / 65535.to_f).round
+      ascii_array[row][col] = SHADES[index]
     end
 
-    @ascii = @ascii_array.map { |row| row.join }.join("\n")
+    @ascii = ascii_array.map { |row| row.join }.join("\n")
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: honeybii
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Jamey DeOrio