escpos-image 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d77f652d199f1562943324c9d167585d0dd8720d60907e9b35dd05f9e34b9c09
-  data.tar.gz: 9948efcabb7054074d5efa222013550a6c5f6d1f386ec9f1886a341159030f34
+  metadata.gz: 36d745212fbf5f8f6b32fe00942ca3e76a82ddd67d9e57135b77b7ae159debbe
+  data.tar.gz: 8cd8ce72f04f2c80c2057178088cc7eeb4468ebf16553918a2e54332aade82af
 SHA512:
-  metadata.gz: 5cfec52a3866a10b7edc431fc8c8e5da9e6bff791d9aabafe7843b9ea8d46753768f80e3bf4c4a3bb77f82d3b2b0969a190e111c7ff3306d85556efdc1df7b78
-  data.tar.gz: ace68af135955b30bb38c5951650391c28f0a64b9fcaf2b7e00f854def83a5e3017dd24ffd75b24b09ea6d13c04459127dab684c9c9047a5320c4473f4a01710
+  metadata.gz: cb264d2de0adba6dfa565c6cd441c509a459e28d0a408dacba9c2deabd9f2094f8aebf48f6d71957d0991e49da0fff0322aa6faecbb76e58cddd68af07e3c09e
+  data.tar.gz: c6fb9548e36938b6880eff29aa3da56ab25f57c51f0ced7e3b6d881eeb35bae2e51910f8573fd791b4d1f52d25899d3a9e05cff78c2176baa5b01b7899250e3a

data/.gitlab-ci.yml

@@ -13,6 +13,7 @@ before_script:
   - bundle install --jobs $(nproc) --path vendor
   - apt-get install -y imagemagick
   - gem install mini_magick
+  - gem install chunky_png
 
 test:
   stage: test

data/README.md

@@ -4,10 +4,15 @@ A ruby implementation of ESC/POS (thermal) printer image command specification.
 
 ## Installation
 
-Add this line to your application's Gemfile:
+Add this lines to your application's Gemfile:
 
 ```ruby
 gem 'escpos-image'
+
+# Depending on chosen image processor
+gem 'mini_magick'
+# or
+gem 'chunky_png'
 ```
 
 And then execute:
@@ -18,6 +23,13 @@ Or install it yourself as:
 
     $ gem install escpos-image
 
+And then depending on chosen image processor
+
+    $ gem install mini_magick
+
+or
+
+    $ gem install chunky_png
 ## Examples
 
 ![](https://github.com/escpos/escpos-image/blob/master/examples/IMG_20160610_232415_HDR.jpg)
@@ -29,13 +41,17 @@ Or install it yourself as:
 
 # Creating image from path
 image = Escpos::Image.new 'path/to/image.png', {
-  processor: "ChunkyPng" # default or MiniMagick
+  processor: "ChunkyPng" # or MiniMagick
   # ... other options, see following sections
 }
 
+# The ChunkyPng processor requires the chunky_png gem installed
 # The MiniMagick processor requires the mini_magick gem installed
 
-# The constructor also accepts an instance of ChunkyPNG::Image or MiniMagick::Image
+# The constructor accepts an instance of:
+# - String (path to image)
+# - ChunkyPNG::Image
+# - MiniMagick::Image
 
 @printer << image
 
@@ -53,7 +69,7 @@ image = Escpos::Image.new 'path/to/image.png', {
 | --- | --- |
 | PNG | PNG, JPG, BMP, ... (everything supported by MiniMagick) |
 
-When using MiniMagick processor, `mini_magick` gem has to be installed or added to the Gemfile, this makes the gem more lightweight by making this dependency optional.
+When using `ChunkyPng` processor, `chunky_png` gem has to be installed or added to the Gemfile and when using `MiniMagick` processor, `mini_magick` gem has to be installed or added to the Gemfile, this makes the gem more lightweight by making dependencies optional and based on chosen image processor.
 
 ## Image manipulation
 

data/escpos-image.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "minitest", "~> 5.4"
   spec.add_development_dependency "mini_magick"
+  spec.add_development_dependency "chunky_png"
 
   spec.add_dependency "escpos", ">= 0.0.9"
-  spec.add_dependency "chunky_png"
 end

data/lib/escpos/errors.rb

@@ -12,9 +12,13 @@ module Escpos
     end
   end
 
-  class MiniMagickNotInstalled < LoadError
+  class DependencyNotInstalled < LoadError
+    attr_reader :dependency_name
+    def initialize(dependency_name)
+      @dependency_name = dependency_name
+    end
     def message
-      "Required options need the mini_magick gem installed: #{e}."
+      "Required options need the \"#{@dependency_name}\" gem installed."
     end
   end
 

data/lib/escpos/image.rb

@@ -9,39 +9,29 @@ module Escpos
 
   class Image
 
-    VERSION = "0.0.9"
+    VERSION = "0.0.10"
 
     attr_reader :processor, :options
 
     def initialize(image_or_path, options = {})
       @options = options
 
-      processor_klass_name = options.fetch(:processor, "ChunkyPng")
+      processor_klass_name = options.fetch(:processor)
       processor_klass = ImageProcessors.const_get(processor_klass_name)
       @processor = processor_klass.new image_or_path, options
 
       @processor.process!
     end
 
-    def chunky_png_image
-      processor.chunky_png_image
-    end
-
     def to_escpos
       bits = []
       mask = 0x80
       i = 0
       temp = 0
 
-      0.upto(chunky_png_image.height - 1) do |y|
-        0.upto(chunky_png_image.width - 1) do |x|
-          px = chunky_png_image.get_pixel(x, y)
-          r, g, b =
-            ChunkyPNG::Color.r(px),
-            ChunkyPNG::Color.g(px),
-            ChunkyPNG::Color.b(px)
-
-          px = (r + b + g) / 3        
+      0.upto(processor.image.height - 1) do |y|
+        0.upto(processor.image.width - 1) do |x|
+          px = processor.get_pixel(x, y)
           value = px >= 128 ? 255 : 0
           value = (value << 8) | value
           temp |= mask if value == 0
@@ -58,7 +48,7 @@ module Escpos
 
       [
         Escpos.sequence(IMAGE),
-        [ chunky_png_image.width / 8, chunky_png_image.height ].pack("SS"),
+        [ processor.image.width / 8, processor.image.height ].pack("SS"),
         bits.pack("C*")
       ].join
     end

data/lib/escpos/image_processors/chunky_png.rb

@@ -5,6 +5,8 @@ module Escpos
     class ChunkyPng < Base
 
       def initialize(image_or_path, options = {})
+        require_chunky_png!
+
         @image = begin
           if image_or_path.is_a?(ChunkyPNG::Image)
             image_or_path
@@ -18,14 +20,30 @@ module Escpos
         super
       end
 
-      def chunky_png_image
-        @image
-      end
-
       def assert_options!
         assert_dimensions_multiple_of_8!
       end
 
+      # ChunkyPng gem is not required intentionally
+      # This makes the gem more lightweight by making dependencies
+      # optional and based on chosen image processor
+      def require_chunky_png!
+        return if defined?(::ChunkyPng)
+        require "chunky_png"
+        rescue LoadError => e
+          raise DependencyNotInstalled.new("chunky_png")
+      end
+
+      def get_pixel(x, y)
+        px = image.get_pixel x, y
+        r, g, b =
+          ChunkyPNG::Color.r(px),
+          ChunkyPNG::Color.g(px),
+          ChunkyPNG::Color.b(px)
+
+        (r + b + g) / 3
+      end
+
       def process!
         extent = options.fetch(:extent, false)
         compose_alpha = options.fetch(:compose_alpha, false)

data/lib/escpos/image_processors/mini_magick.rb

@@ -20,8 +20,15 @@ module Escpos
         super
       end
 
-      def chunky_png_image
-        @chunky_png_image ||= ChunkyPNG::Image.from_file @image.path
+      def get_pixel(x, y)
+        @pixels ||= image.get_pixels
+
+        r, g, b =
+          @pixels[y][x][0],
+          @pixels[y][x][1],
+          @pixels[y][x][2]
+
+        (r + b + g) / 3
       end
 
       def assert_options!
@@ -29,12 +36,13 @@ module Escpos
       end
 
       # MiniMagick gem is not required intentionally
-      # This makes the gem more lightweight by making this dependency optional
+      # This makes the gem more lightweight by making dependencies
+      # optional and based on chosen image processor
       def require_mini_magick!
         return if defined?(::MiniMagick)
         require "mini_magick"
         rescue LoadError => e
-          raise MiniMagickNotInstalled
+          raise DependencyNotInstalled.new("mini_magick")
       end
 
       def process!
@@ -70,9 +78,6 @@ module Escpos
         if options.fetch(:extent, false)
           image.extent "#{(image.width/8.0).round*8}x#{(image.height/8.0).round*8}"
         end
-
-        # Force PNG format so ChunkyPNG works
-        image.format 'png'
       end
 
     end

data/test/lib/escpos/image_test.rb

@@ -16,8 +16,7 @@ class ImageTest < Minitest::Test
     @printer << image
     @printer << "\n" * 10
     @printer.cut!
-    image.chunky_png_image.metadata = {}
-    image.chunky_png_image.save(File.join(__dir__, "../../results/#{__method__}.png"))
+    image.processor.image.write(File.join(__dir__, "../../results/#{__method__}.png"))
     file = File.join(__dir__, "../../results/#{__method__}.txt")
     #IO.binwrite file, @printer.to_escpos
     assert_equal IO.binread(file), @printer.to_escpos
@@ -26,13 +25,14 @@ class ImageTest < Minitest::Test
   def test_image_conversion
     image_path = File.join(__dir__, '../../fixtures/tux_alpha.png')
     image = Escpos::Image.new image_path, grayscale: true,
-      compose_alpha: true, extent: true
+      compose_alpha: true, extent: true,
+      processor: "ChunkyPng"
 
     @printer << image.to_escpos
     @printer << "\n" * 10
     @printer.cut!
-    image.chunky_png_image.metadata = {}
-    image.chunky_png_image.save(File.join(__dir__, "../../results/#{__method__}.png"))
+    image.processor.image.metadata = {}
+    image.processor.image.save(File.join(__dir__, "../../results/#{__method__}.png"))
     file = File.join(__dir__, "../../results/#{__method__}.txt")
     #IO.binwrite file, @printer.to_escpos
     assert_equal IO.binread(file), @printer.to_escpos

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: escpos-image
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Jan Svoboda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-23 00:00:00.000000000 Z
+date: 2019-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -67,33 +67,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: escpos
+  name: chunky_png
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.9
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.9
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: chunky_png
+  name: escpos
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.9
 description: A ruby implementation of ESC/POS (thermal) printer image command specification.
 email:
 - jan@mluv.cz