asciiart 0.0.10 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a8d99e878fcb702b5c8c0fa998f6d3b942f90d19b20e30f6f7f2eff8bce0f88
-  data.tar.gz: 7eef461cb0b54d2eefb6eac93ea8fc74b846251936b752b2ffcd557ad210e477
+  metadata.gz: 34e508f6e6ac680c5efa0b9c2d962017825ab9706f4c3f10449d411bce37c5d5
+  data.tar.gz: bfe96d2e79431f8f54a908040083c5f74c9fe45a6c2d221297c9803a16543dd2
 SHA512:
-  metadata.gz: 55ac4320bbe7724f765aa492971d890ccb87f079fd544e884df925c48f94df253dd6c2760ba1289bf595434feb9fea3ffbc9e7c6bfde931cc176b048c3a272c5
-  data.tar.gz: 65ad4c44c57a1d24cfff039a6b63457c7a9528d7c279e1c37710bdca7de7e41fe56f67d02fc555df95bf5759efa81b6100f2adda286501e06fd6ff2f16bd67ec
+  metadata.gz: 7c15cbdbc1aa10708815e59490e5ba9003e0484f742b2a0bddd319006db6355a426b84a06328bf5d0f4eb154da8d6695b33277c6b3bca65d30c679159a558dd4
+  data.tar.gz: 909ec83731b16b70a93404c975cefaea83ce411308d0f9a75d8afefaa6215f9664fe29e267ca5858d950a7d509c4dbfb31be071c3a1ff120a4fe1485dacd81b4

data/asciiart.gemspec

@@ -6,7 +6,7 @@ require 'asciiart/version'
 Gem::Specification.new do |gem|
   gem.name          = "asciiart"
   gem.version       = AsciiArt::VERSION
-  gem.authors       = ["nodanaonlyzuul", "rosscooperman", "caderaspindrift"]
+  gem.authors       = ["nodanaonlyzuul", "rosscooperman", "caderaspindrift", "wendy0402"]
   gem.email         = ["stephen@eastmedia.com"]
   # gem.description   = %q{A command line tool to turn images into ASCII art}
   gem.summary       = %q{A command line tool to turn images into ASCII art}
@@ -17,8 +17,8 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency('rmagick', '2.13.4')
-  gem.add_dependency('rainbow', '2.0.0')
+  gem.add_dependency('rmagick', '4.1.2')
+  gem.add_dependency('rainbow', '3.0.0')
 
   gem.add_development_dependency('pry')
 end

data/lib/asciiart/html.rb

@@ -0,0 +1,56 @@
+module AsciiRenderer
+  class Html
+    def initialize(img)
+      @img = img
+      @quantum_calc  = Magick::QuantumRange / Magick::QuantumPixel.to_i
+    end
+
+    def to_ascii_art(options = {})
+      width       = options[:width]
+      scale       = (width.to_f / @img.columns)
+      height      = ((@img.rows * scale) / 2).to_i
+      
+      img           = @img.resize(width, height)
+      @color_img    = img.dup if options[:color]
+      img           = img.quantize(image_chars.length, Magick::GRAYColorspace).normalize
+      border = "+#{'-' * width}+<br/>"
+      border = html_char(border)
+
+      output = border.dup
+
+      img.view(0, 0, width, height) do |view|
+        height.times do |i|
+          output << '|'
+          width.times { |j| output << pixel_to_char(view, j: j, i: i, color: options[:color]) }
+          output << "|<br/>"
+        end
+      end
+      output + border
+    end
+    
+    
+    def pixel_to_char(view, args = {})
+      pixel = view[args[:i]][args[:j]]
+      character = image_chars[pixel.red/@quantum_calc]
+
+      if (args[:color])
+
+        pix = @color_img.pixel_color(args[:j],args[:i])
+        color_string = "color: #{pix.to_color( Magick::AllCompliance,false,8, true)};"
+      else
+        color_string = ""
+      end
+
+      html_char(character, color_string)
+    end
+    
+    def image_chars
+      @image_chars ||= " .~:+=o*x^%\#@$WQ".chars.to_a.map{ |char| char == " " ? "&nbsp" : char}
+    end
+
+    private
+    def html_char(char, additional_style = "")
+      "<span style=\"font-family: 'Lucida Console', Monaco, monospace; #{additional_style}\">#{char}</span>"
+    end
+  end
+end

data/lib/asciiart/text.rb

@@ -0,0 +1,56 @@
+module AsciiRenderer
+  class Text
+    def initialize(img)
+      @img = img
+      @quantum_calc  = Magick::QuantumRange / Magick::QuantumPixel.to_i
+    end
+
+    def to_ascii_art(options = {})
+      width       = options[:width]
+      scale       = (width.to_f / @img.columns)
+      height      = ((@img.rows * scale) / 2).to_i
+      
+      img           = @img.resize(width, height)
+      @colored_img  = img.dup if options[:color]
+      img           = img.quantize(image_chars.length, Magick::GRAYColorspace).normalize
+
+      border = "+#{'-' * width}+\n"
+      output = border.dup
+
+      img.view(0, 0, width, height) do |view|
+        height.times do |i|
+          output << '|'
+          width.times { |j| output << pixel_to_char(view,j: j , i: i, color: options[:color] ) }
+          output << "|\n"
+        end
+      end
+      output + border
+    end
+    
+    def pixel_to_char(view, args = {})
+      pixel = view[args[:i]][args[:j]]
+      character = image_chars[pixel.red/@quantum_calc]
+
+      if args[:color]
+        pix       = @colored_img.pixel_color(args[:j],args[:i])
+        character = character.color(unified_rgb_value(pix.red), unified_rgb_value(pix.green), unified_rgb_value(pix.blue))
+      end
+      character
+    end
+
+    def image_chars
+      @image_chars ||= " .~:+=o*x^%\#@$WQ".chars.to_a
+    end
+
+    private
+    def unified_rgb_value(number)
+      if defined?(Magick::QuantumDepth)
+        num = (Magick::QuantumDepth == 16) ? (number / 256) : number
+      else
+        num = (Magick::QuantumRange == 65535) ? (number / 256) : number
+      end
+      (num > 255) ? 255 : num
+    end
+
+  end
+end

data/lib/asciiart/version.rb

@@ -1,3 +1,3 @@
 class AsciiArt
-  VERSION = "0.0.10"
+  VERSION = "0.2.0"
 end

data/lib/asciiart.rb

@@ -5,94 +5,23 @@ require 'open-uri'
 require 'rainbow'
 require 'rainbow/ext/string'
 
+require File.expand_path("../asciiart/html", __FILE__)
+require File.expand_path("../asciiart/text", __FILE__)
+
 class AsciiArt
 
   attr_writer   :image_chars
 
   def initialize(path_to_file)
     # open-uri open will fallback to IO open
-    open(path_to_file) { |file| @data = file.read }
+    URI.open(path_to_file) { |file| @data = file.read }
     self
   end
 
   def to_ascii_art(options = {})
     options = { width: 100, color: false, format: "text" }.merge(options)
-
     img = Magick::Image.from_blob(@data).first
-
-    width       = options[:width]
-    scale       = (width.to_f / img.columns)
-    height      = ((img.rows * scale) / 2).to_i
-
-    img.resize!(width, height)
-    color_image   = img.dup if options[:color]
-    img           = img.quantize(image_chars.length, Magick::GRAYColorspace).normalize
-    quantum_calc  = Magick::QuantumRange / Magick::QuantumPixel.to_i
-    image_chars.map! {|char| char == " " ? " " : char } if options[:format] == "html"
-
-    border = "+#{'-' * width}+#{line_break(options[:format])}"
-    border = html_char(border) if options[:format] == "html"
-
-    output = border.dup
-
-    img.view(0, 0, width, height) do |view|
-      height.times do |i|
-        output << '|'
-        width.times do |j|
-
-          character = image_chars[view[i][j].red/quantum_calc]
-
-          if options[:format] == "html"
-            if (options[:color])
-
-              pix = color_image.pixel_color(j,i)
-              color_string = "color: #{pix.to_color( Magick::AllCompliance,false,8, true)};"
-            else
-              color_string = ""
-            end
-            character = html_char(character, color_string)
-          else
-            # text-format
-            if options[:color]
-              pix       = color_image.pixel_color(j,i)
-              character = character.color(unified_rgb_value(pix.red), unified_rgb_value(pix.green), unified_rgb_value(pix.blue))
-            end
-          end
-
-          output << character
-        end
-
-        output << "|#{line_break(options[:format])}"
-      end
-    end
-
-    output + border
-  end
-
-  def image_chars
-    @image_chars ||= ' .~:+=o*x^%#@$MW'.chars.to_a
-  end
-
-  def inspect
-    "#<#{self.class.to_s}>"
-  end
-
-private
-
-  def line_break(format)
-    (format == "text") ? "\n" : "<br/>"
-  end
-
-  def unified_rgb_value(number)
-    if defined?(Magick::QuantumDepth)
-      return (Magick::QuantumDepth == 16) ? (number / 256) : number
-    else
-      return (Magick::QuantumRange == 65535) ? (number / 256) : number
-    end
-  end
-
-  def html_char(char, additional_style = "")
-    "<span style=\"font-family: 'Lucida Console', Monaco, monospace; #{additional_style}\">#{char}</span>"
+    renderer =  (options[:format] == "text" ? AsciiRenderer::Text.new(img) : AsciiRenderer::Html.new(img))
+    renderer.to_ascii_art(options)
   end
 end
-

metadata

@@ -1,16 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: asciiart
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.2.0
 platform: ruby
 authors:
 - nodanaonlyzuul
 - rosscooperman
 - caderaspindrift
+- wendy0402
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-02 00:00:00.000000000 Z
+date: 2022-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rmagick
@@ -18,28 +19,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.13.4
+        version: 4.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.13.4
+        version: 4.1.2
 - !ruby/object:Gem::Dependency
   name: rainbow
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -70,6 +71,8 @@ files:
 - asciiart.gemspec
 - bin/asciiart
 - lib/asciiart.rb
+- lib/asciiart/html.rb
+- lib/asciiart/text.rb
 - lib/asciiart/version.rb
 homepage: https://github.com/nodanaonlyzuul/asciiart
 licenses: []
@@ -89,7 +92,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: A command line tool to turn images into ASCII art