honeybii 1.3.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 10bc5196f06fe471586df6e35a69c5fff47b2b16
-  data.tar.gz: 1719cb9b941e8dc857bb840c1c5643cc33f7ec48
+  metadata.gz: 763645911defbc1bc1a275a6a14f923e1cef9416
+  data.tar.gz: fd62c1511c3928eb8f08bfaa444a5dd5f0cf31df
 SHA512:
-  metadata.gz: a4c55d049c203be4b48ef84b45641ead8b6d582e5abf8631c99b0ed40075d39eb92ab90b670fe68be16b32769a79ef6af553623b93eb2e5066a47a6e3a531460
-  data.tar.gz: dbe37caa9cf0e4c572695ff72031d443eacc6468e09f6196194f18f27ccf883f8bdc661ad63abc1a764e4094f3fbbcc6de103d5767d7e80fa064df00fe78958c
+  metadata.gz: 851b901bdd0a4957fad14d666240c9a907dd6b09cc3b8e89d4fe36e1f6e84bc57e7bf9955d2312deb5536ca57dbb280e03bfac3999f85896d01eea76ecc2c964
+  data.tar.gz: b744ff4ba2cffa3edd324964f59f2e55a583c8855b8fac92ae976a65cc72187f391f55e7803aff2bf815172fcbd88b0a1436836daa719171b6bc5fb15dc6237f

data/bin/honeybii

@@ -1,46 +1,41 @@
 #!/usr/bin/env ruby
 require 'optparse'
-require 'rmagick'
-
 require 'honeybii'
 
 options = {}
 option_parser = OptionParser.new do |opts|
-  opts.banner = 'Usage: honeybii [options]'
-
-  opts.on('-i', '--image FILENAME', 'Name of image file to convert (png|gif|jpg)') do |i|
-    options[:image] = i
-  end
+  opts.banner = 'Usage: honeybii file.(png|gif|jpg) [options]'
 
-  opts.on('-s', '--pixel-size PIXELS', Integer, 'Size of image chunks to process into ascii (smaller => more detail) [default: 12]') do |s|
+  opts.on('-p', '--pixel-size PIXELS', Integer, 'Size of image chunks to process into ascii (smaller => more detail) [default: 12]') do |s|
     options[:pixel_size] = s
   end
 
   gradients = ShadedAscii.gradients.map.with_index { |g, i| {i => g.join} }
-  opts.on('-g', '--gradient N', Integer, "Gradient level (the lower the denser) [default: 0] #{gradients}") do |g|
+  opts.on('-g', '--gradient N', Integer, "Gradient characters [default: 0] #{gradients}") do |g|
     options[:gradient_level] = g
   end
+
+  opts.on('-o', '--one-to-one', "One-to-one shading, as opposed to relative") do |o|
+    options[:style] = 'one_to_one'
+  end
 end
 
 option_parser.parse!
 
-if options.empty?
-  puts option_parser.help 
-  exit
-end
-
 # required
-unless options[:image] && /.*\.(png|gif|jpg)$/i =~ options[:image]
+image = ARGV.pop
+unless image && /.*\.(png|gif|jpg)$/i =~ image
   raise ArgumentError, 'Please point to an image file (png|gif|jpg)'
 end
 
 # defaults
 options[:pixel_size] = 12 unless options[:pixel_size]
 options[:gradient_level] = 0 unless options[:gradient_level]
+options[:style] = 'relative' unless options[:style]
 
 # validations
 unless options[:gradient_level].between? 0, ShadedAscii.gradients.size - 1
   raise ArgumentError, "Please choose a gradient level between 0 and #{ShadedAscii.gradients.size - 1}"
 end
 
-puts ShadedAscii.new(options[:image], options[:pixel_size], gradient_level: options[:gradient_level])
+puts ShadedAscii.new(image, options[:pixel_size], gradient_level: options[:gradient_level], style: options[:style])

data/lib/honeybii/ascii_image.rb

@@ -1,4 +1,4 @@
-require 'rmagick'
+require 'RMagick'
 
 class AsciiImage
   attr_accessor :raw

data/lib/honeybii/shaded_ascii.rb

@@ -4,17 +4,15 @@ class ShadedAscii < AsciiImage
   end
 
   @gradients = [
-    ['M', 'N', 'H', 'K', 'b', 'X', '6', 'Y', 'j', 'i', '+', '!', ':', '\'', '.', ' '],
     ['@', '%', '8', '#', '$', 'V', 'Y', 'x', '*', '=', '+', ':', '~', '-', '.', ' '],
-    ['M', 'H', 'b', '6', 'j', '+', ':', ' '],
-    ['@', '8', 'O', 'o', ':', '.', ' '],
     ['8', 'O', 'o', ':', '.', ' '],
     ['#', '+', ':', ' '],
   ]
 
-  def initialize(image_filename, point_size = 12, gradient_level: 0)
+  def initialize(image_filename, point_size = 12, gradient_level: 0, style: 'one_to_one')
     super image_filename, point_size
     @gradient = ShadedAscii.gradients[gradient_level]
+    @style = style
     to_ascii!
   end
 
@@ -28,6 +26,18 @@ class ShadedAscii < AsciiImage
     @raw.resize!(columns, rows)
   end
 
+  def get_intensity_range
+    pixels = @raw.get_pixels 0, 0, @raw.columns, @raw.rows
+    intensities = pixels.map { |p| p.intensity }
+    lightest_intensity = intensities.inject do |lightest, obj|
+      obj > lightest ? lightest : obj
+    end
+    heaviest_intensity = intensities.inject do |heaviest, obj|
+      obj < heaviest ? heaviest : obj
+    end
+    return [lightest_intensity, heaviest_intensity]
+  end
+
   def to_ascii!
     grayscale!
     pixelate!
@@ -36,9 +46,21 @@ class ShadedAscii < AsciiImage
       Array.new(@raw.columns)
     end
     
-    @raw.each_pixel do |pixel, col, row|
-      index = (((@gradient.size - 1) * pixel.intensity).to_f / 65535.to_f).round
-      ascii_array[row][col] = @gradient[index]
+    gradient_size = (@gradient.size - 1).to_f
+
+    if @style == 'relative'
+      intensity_range = get_intensity_range
+      range_max = intensity_range[1] - intensity_range[0]
+      @raw.each_pixel do |pixel, col, row|
+        index = (gradient_size * (pixel.intensity - intensity_range[0]) / range_max).round
+        ascii_array[row][col] = @gradient[index]
+      end
+    elsif @style == 'one_to_one'
+      range_max = 65535.to_f
+      @raw.each_pixel do |pixel, col, row|
+        index = (gradient_size * pixel.intensity / range_max).round
+        ascii_array[row][col] = @gradient[index]
+      end
     end
 
     @ascii = ascii_array.map { |row| row.join }.join("\n")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: honeybii
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Jamey DeOrio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-04 00:00:00.000000000 Z
+date: 2014-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rmagick
@@ -16,15 +16,21 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.13'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.13.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
-description: A command-line image to ascii conversion tool
+        version: '2.13'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.13.2
+description: A command-line image-to-ascii conversion tool
 email: jamey@jameydeorio.com
 executables:
 - honeybii
@@ -58,5 +64,5 @@ rubyforge_project:
 rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
-summary: An image to ascii converter
+summary: An image-to-ascii converter
 test_files: []