honeybii 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5aeb2dec0785ed14c0020b648e35184db6dc0fd0
-  data.tar.gz: 8be980047f6b3f6467ade5ef60c07053d7923347
+  metadata.gz: dd4e80e8eadf36d9a88677631db5f7267b9729db
+  data.tar.gz: 8e965783c2a0be9a7e77279c8e6496ae6e0d11b7
 SHA512:
-  metadata.gz: 8371437aa6d89deff5ef712986969485031e5da558ed39971def1fead8ea6c26798986a6ca536b57e81dcc22ea5aa239846eea03d235c4cd92a1a606da544534
-  data.tar.gz: e003e5c01426712b341525f97c0066b7f87a9e2cf9d13d06a120c816a0604dee38bf946963bdd83415e4488752faa46f4ff281b3871a45382832fd61495c9750
+  metadata.gz: cc22542706dbb5d825a84430502ba8fc73fb1fff0fab26792bcd84e9cd00aabda122a39d07ba5cdb3024f6e03cb37287f05628bb0819e7f9f924d48532b75d4c
+  data.tar.gz: eb1a1003b964f9d24b454567afa0d765c520eb5d7271aaf1afdb41768ee67e0dc49a4bfb790db2762365b411b7e89d6fe404565e266f5c7a82fe4a569fe2e3c8

data/bin/honeybii

@@ -6,7 +6,7 @@ require 'honeybii'
 
 options = {}
 option_parser = OptionParser.new do |opts|
-  opts.banner = 'Usage: honeybii.rb [options]'
+  opts.banner = 'Usage: honeybii [options]'
 
   opts.on('-i', '--image FILENAME', 'Name of image file to convert (png|gif|jpg)') do |i|
     options[:image] = i
@@ -32,4 +32,4 @@ end
 # defaults
 options[:pixel_size] = 12 unless options[:pixel_size]
 
-puts ShadedImage.new(options[:image], options[:pixel_size]).to_ascii
+puts ShadedAscii.new(options[:image], options[:pixel_size])

data/lib/honeybii/ascii_image.rb

@@ -13,7 +13,7 @@ class AsciiImage
 
   def to_s
     unless @ascii.empty?
-      @ascii.map { |row| row.join }.join("\n")
+      @ascii
     else
       super
     end

data/lib/honeybii/shaded_ascii.rb

@@ -0,0 +1,34 @@
+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
+
+  def grayscale!
+    @raw = @raw.quantize(256, Magick::GRAYColorspace)
+  end
+
+  def pixelate!
+    columns = @raw.columns / @point_size
+    rows = @raw.rows / @point_size
+    @raw = @raw.resize_to_fit(columns, rows)
+  end
+
+  def to_ascii!
+    grayscale!
+    pixelate!
+
+    @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]
+    end
+
+    @ascii = @ascii_array.map { |row| row.join }.join("\n")
+  end
+end

data/lib/honeybii.rb

@@ -1,2 +1,2 @@
 require 'honeybii/ascii_image'
-require 'honeybii/shaded_image'
+require 'honeybii/shaded_ascii'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: honeybii
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Jamey DeOrio
@@ -34,7 +34,7 @@ files:
 - bin/honeybii
 - lib/honeybii.rb
 - lib/honeybii/ascii_image.rb
-- lib/honeybii/shaded_image.rb
+- lib/honeybii/shaded_ascii.rb
 homepage: http://honeybii.com
 licenses:
 - MIT

data/lib/honeybii/shaded_image.rb

@@ -1,49 +0,0 @@
-class ShadedImage < 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', '*', '=', '+', ':', '~', '-', '.', ' ']
-  end
-
-  def grayscale
-    clone = self.clone
-    clone.raw = clone.raw.quantize(256, Magick::GRAYColorspace)
-    return clone
-  end
-
-  def grayscale!
-    @raw = @raw.quantize(256, Magick::GRAYColorspace)
-  end
-
-  def pixelate
-    columns = @raw.columns / @point_size
-    rows = @raw.rows / @point_size
-    clone = self.clone
-    clone.raw = clone.raw.resize_to_fit(columns, rows)
-    return clone
-  end
-
-  def pixelate!
-    columns = @raw.columns / @point_size
-    rows = @raw.rows / @point_size
-    @raw = @raw.resize_to_fit(columns, rows)
-  end
-
-  def to_ascii
-    clone = self.clone
-    clone.grayscale!
-    clone.pixelate!
-
-    clone.ascii = Array.new(clone.raw.rows).collect do |row|
-      Array.new(clone.raw.columns)
-    end
-    
-    clone.raw.each_pixel do |pixel, col, row|
-      index = (((clone.shades.size - 1) * pixel.intensity).to_f / 65535.to_f).round
-      char = clone.shades[index]
-      clone.ascii[row][col] = char
-    end
-
-    return clone
-  end
-end