escpos-image 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3093ebac2fdbbf59507fc5c4a209f85941a90d03c0f0838a626b43401df38672
-  data.tar.gz: 9e52328a87653d53b3d4359010feccae312c93ef10ecbbc6d41db0944c52469d
+  metadata.gz: 494847e3b67b9e87fec165e48507d7050a779aa36ff440a22b874233cbfd72e8
+  data.tar.gz: 9aadde3e6581ebc836420220e0b33949e71fafe97328786d1d7819f9e8488d59
 SHA512:
-  metadata.gz: ef20ab54bffe996cb3ed65bcd5d6eff1c7a4cc581c63ccdcae982766e3616d8e6f13a02645f0921747923fe91971f399da5c15f9a164b34df44f7e877a284274
-  data.tar.gz: 18cfe1a217a0910f5644b198e5c32a4eeaf04f9d94e8a1a132bdb1af82f9124e7bc2d3c66c91610008e2b4f715b232848efa265acb4113b821705a2f58602b1d
+  metadata.gz: 462c890880ca0ecb3a870d99c90525996d70ba8b748bfe80a00bc3c37233deea5567716e90bc957d1048308108f12359d410f3b45528e6285769639756d054f1
+  data.tar.gz: c6f7c07aa8886ded1887859970de46b38c71f0c6df60e4f6b82f7c803a1133e9e672547a8700759645367245081c2b09b015f2430cb39a80257a205f26cea016

data/.gitlab-ci.yml

@@ -1,4 +1,4 @@
-image: ruby:2.5
+image: ruby:2.6
 
 cache:
   paths:
@@ -17,6 +17,6 @@ before_script:
 test:
   stage: test
   script:
-    - rake test
+    - bundle exec rake test
   environment:
     name: test

data/README.md

@@ -33,6 +33,8 @@ image = Escpos::Image.new 'path/to/image.png', {
   convert_to_monochrome: true,
   dither: true, # the default
   extent: true, # the default
+  compose_alpha: false, # the default
+  compose_alpha_bg: 255, # default, assume white background
 }
 
 @printer.write image.to_escpos

data/escpos-image.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake"
 
   spec.add_development_dependency "minitest", "~> 5.4"
+  spec.add_development_dependency "mini_magick"
 
   spec.add_dependency "escpos"
   spec.add_dependency "chunky_png"

data/lib/escpos/helpers.rb

@@ -1,8 +1,8 @@
 module Escpos
   module Helpers
 
-    def image(path, opts = {})
-      Image.new(path, opts).to_escpos
+    def image(path, options = {})
+      Image.new(path, options).to_escpos
     end
 
   end

data/lib/escpos/image.rb

@@ -1,15 +1,18 @@
 module Escpos
   class Image
 
-    VERSION = "0.0.4"
+    VERSION = "0.0.5"
 
-    def initialize(image_or_path, opts = {})
+    attr_reader :options
+
+    def initialize(image_or_path, options = {})
+      @options = options
       if image_or_path.is_a?(ChunkyPNG::Image)
         @image = image_or_path
       elsif image_or_path.is_a?(String)
-        if opts.fetch(:convert_to_monochrome, false)
+        if options.fetch(:convert_to_monochrome, false)
           require_mini_magick!
-          image = convert_to_monochrome(image_or_path, opts)
+          image = convert_to_monochrome(image_or_path)
           @image = ChunkyPNG::Image.from_file(image.path)
         else
           @image = ChunkyPNG::Image.from_file(image_or_path)
@@ -38,6 +41,11 @@ module Escpos
             ChunkyPNG::Color.b(px)
           px = (r + b + g) / 3
           # Alpha is flattened with convert_to_monochrome option
+          if options.fetch(:compose_alpha, false)
+            bg_color = options.fetch(:compose_alpha_bg, 255)
+            a_quot = a / 255.0
+            px = (((1 - a_quot) * bg_color) + (a_quot * px)).to_i
+          end
           value = px >= 128 ? 255 : 0
           value = (value << 8) | value
           temp |= mask if value == 0
@@ -79,7 +87,7 @@ module Escpos
       end
     end
 
-    def convert_to_monochrome(image_path, opts = {})
+    def convert_to_monochrome(image_path)
       image = MiniMagick::Image.open(image_path)
 
       # Flatten transparency
@@ -90,10 +98,10 @@ module Escpos
 
       # Optimise more actions to single call
       image.combine_options do |c|
-        c.rotate opts.fetch(:rotate) if opts.has_key?(:rotate)
-        c.resize opts.fetch(:resize) if opts.has_key?(:resize)
+        c.rotate options.fetch(:rotate) if options.has_key?(:rotate)
+        c.resize options.fetch(:resize) if options.has_key?(:resize)
         c.grayscale 'Rec709Luma'
-        if opts.fetch(:dither, true)
+        if options.fetch(:dither, true)
           c.monochrome '+dither'
           # dither the image with FloydSteinberg algoritm for better results
           c.dither 'FloydSteinberg'
@@ -103,7 +111,7 @@ module Escpos
       end
 
       # Limit the extent of the image to nice round numbers
-      if opts.fetch(:extent, true)
+      if options.fetch(:extent, true)
         image.extent "#{(image.width/8.0).round*8}x#{(image.height/8.0).round*8}"
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: escpos-image
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Jan Svoboda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-19 00:00:00.000000000 Z
+date: 2019-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.4'
+- !ruby/object:Gem::Dependency
+  name: mini_magick
+  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'
 - !ruby/object:Gem::Dependency
   name: escpos
   requirement: !ruby/object:Gem::Requirement