asciiart 0.0.8 → 0.3.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YjRlMDdkZTRjMGQ0MzA0N2YzNDg4OGFjNGUyYTE5MDliOWRlNGEzNQ==
-  data.tar.gz: !binary |-
-    YjcwNzc4MGM2MTllN2ZlZjg5MmMxNWIwMTI1MDRjODQ2YzA0ZTk4ZA==
+SHA256:
+  metadata.gz: 73d1db9173b7bb415b28427400d74dc58873a17fb83c35f9680dc9dbfa957a93
+  data.tar.gz: bf4b64962e12bda8dae1b6d856f1bde6f6a6fec86710474dde911a71ab8ad53a
 SHA512:
-  metadata.gz: !binary |-
-    Njg3Zjk1MjcwOWNjODNjYWM3ZmJjYWJiYTI5MWJiYTc4M2YwNDkxZmRjMmM3
-    MDUzNGY5NGE1OWZlMmE2YWVlZjliMzhjMzc3MDk1Y2UwMDBiMGYxZDAzMWRk
-    MjI0Y2IzOTZmNWRmMWQ1NTYxY2VmODM5Mzk4NWRhOGQwNmJiMmY=
-  data.tar.gz: !binary |-
-    ZTk4NmQ5N2VmODU5OTBjOWQ3ZjNjMGMyMWRhYzcyNzE1MDA3YmRiMWMxODYx
-    YzI1ZGI3NTY2NWNkNWQ0NzIyNDg1NDlmMWJkNTlmYTc5NGY4ZTVjYTYyNjM2
-    MTUzZjNjMTI4ZWQwMzIwYjc1MzhhZjk1MjM4NDA3N2Q0MTdhMmM=
+  metadata.gz: 37d3cb9b57606e714126a9230d230f7d07036113f9776a45ee123ed043ad779962f906aa91951774a6b5a326ba05ec92c72c898643082ffbc489f9fda01f42ea
+  data.tar.gz: 6e56c2597382974c6d95d1ced2d8af757dd52f53d5349e236b633f4ca925250b6b5106757d226143e8b32e479411d51ae509db2240b4c4f67dec84c9419548bc

data/CHANGELOG.md

@@ -0,0 +1,41 @@
+# Asciiart changelog
+
+Asciiart follows [Semantic Versioning](https://semver.org/), please see the [README.md](README.md) for details.
+
+## 0.3.0
+
+### Fixed
+
+  * Ruby 3.1.x compatibility [#13](https://github.com/nodanaonlyzuul/asciiart/issues/13)  
+
+### (semi) Tested Ruby Versions
+
+I hope to have a better automated test matrix in the future but...
+
+  * ruby 3.1.0p0   (2021-12-25 revision fb4df44d16) [x86_64-darwin20]
+  * ruby 3.0.2p107 (2021-07-07 revision 0db68f0233) [x86_64-darwin20]
+  * ruby 2.7.5p203 (2021-11-24 revision f69aeb8314) [x86_64-darwin20]
+
+## 0.2.0
+
+### Notes
+
+#### Rehabilitation & being a better citizen
+
+This gem started as a fast-and-loose side project in 2014.
+It mostly worked for many years, with no need for major updates.
+In January 2022, I noticed a lot of the gem & its dependencies' syntax didn't play well in modern versions of Ruby.
+
+#### Tagging & Github Releases
+
+This is the version where I started caring about using tags & GH releases.
+
+### Fixed
+
+  * Fixing ability to open a URL via cli.[[#12](https://github.com/nodanaonlyzuul/asciiart/pull/12)]
+  * Fixing color output issues.[[#12](https://github.com/nodanaonlyzuul/asciiart/pull/12)]
+
+## < 0.2.0
+
+These were the dark ages.
+I'm sorry.

data/README.md

@@ -153,11 +153,11 @@ Remote Images
 
 Output it as HTML
 
-    $ be asciiart -c -f html ~/Ross/cppsource/secret/noopen/sillhere?/turnback/bea-arthur-birthdaysuit.jpg > ~/Desktop/ascii-as-html.html
+    $ asciiart -c -f html ~/Ross/cppsource/secret/noopen/sillhere?/turnback/bea-arthur-birthdaysuit.jpg > ~/Desktop/ascii-as-html.html
 
 _or smaller_
 
-    $ be asciiart -w 50 -c -f html ~/Stephen/boringSQLsnippets/nothingtoseehere/turnback/bea-arthur-with-ross's-head.jpg > ~/Desktop/saturdaynight.html
+    $ asciiart -w 50 -c -f html ~/Stephen/boringSQLsnippets/nothingtoseehere/turnback/bea-arthur-with-ross's-head.jpg > ~/Desktop/saturdaynight.html
 
 Get Help
 

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"]
+  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')
-  gem.add_dependency('rainbow', "2.0.0")
+  gem.add_dependency('rmagick', '4.2.4')
+  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.8"
+  VERSION = "0.3.0"
 end

data/lib/asciiart.rb

@@ -1,94 +1,27 @@
 require "asciiart/version"
-require 'RMagick'
+require 'rmagick'
 require 'uri'
 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)
-    (Magick::QuantumDepth == 16) ? (number / 256) : number
-  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,59 +1,61 @@
 --- !ruby/object:Gem::Specification
 name: asciiart
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.3.0
 platform: ruby
 authors:
 - nodanaonlyzuul
 - rosscooperman
-autorequire: 
+- caderaspindrift
+- wendy0402
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-07-15 00:00:00.000000000 Z
+date: 2022-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rmagick
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.2.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.2.4
 - !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
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - stephen@eastmedia.com
 executables:
@@ -61,7 +63,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -69,28 +72,29 @@ 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: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.2
-signing_key: 
+rubygems_version: 3.3.3
+signing_key:
 specification_version: 4
 summary: A command line tool to turn images into ASCII art
 test_files: []