brother_escp 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61a11c65fb3b3a8b52c80e597cdca3e5a0d422fd
-  data.tar.gz: 2aee66767228566915faf782710bce5673a6e39d
+  metadata.gz: 9d8f1c2289adb405f2657967cd33f5949a144b52
+  data.tar.gz: 35cf9202fe9882c89b69c329f8cb2cc41b1e1af7
 SHA512:
-  metadata.gz: 8dcff64a46a6e61586b3229a9bd11370884854c8daaa51f8993036a5f223c53e9bc457f691eb15f88457914b8907c5e543bf67a416907632ddbedd009a6b0892
-  data.tar.gz: 0612d490fbcdedc6b05441af62838423018c7d4e003d8337d73cdc6441e60baa5b8e7749814c15bfb20ff8e41165b630a634b0cef6e5c57a61d49e03da0e0d49
+  metadata.gz: 7b7fbd2cdc9d0a38ed3a052f8442ed8e665ca656fba7be7172db05d5cd541d931157a584975d0bc3ba7b3986579e46022233841780c737e3fff0f471db75fc9c
+  data.tar.gz: f49972c117511694e02e9b7fbc20b9aad472101a459daf3b224be6ece55402486dca57abf59e42660f8da7bfd0fdd6698804dd518e6bacc97cb7485772b05ce5

data/README.md

@@ -1,4 +1,5 @@
 [![Build Status](https://travis-ci.org/butterware/brother_escp.svg?branch=master)](https://travis-ci.org/butterware/brother_escp)
+[![Gem Version](https://badge.fury.io/rb/brother_escp.svg)](https://badge.fury.io/rb/brother_escp)
 
 # BrotherEscp
 

data/brother_escp.gemspec

@@ -34,7 +34,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 1.13'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
-  # spec.add_development_dependency 'simplecov', '~> 3.0'
+  spec.add_development_dependency 'simplecov'
 
   spec.add_dependency 'chunky_png'
 end

data/lib/brother_escp/image_converter.rb

@@ -34,13 +34,13 @@ module BrotherEscp
     # @param image [ChunkyPNG::Image] Image to convert
     # @return [Array] return an array of array, one array for each line, with one element for each byte
     def convert(image:)
-      check_image(image: image)
-      lines = []
-      line_count = (image.height / line_height_in_pixels)
-      # BrotherEscp.logger.debug "convert, line_count = #{line_count}"
+      lines      = []
+      line_count = line_count(image: image)
+      BrotherEscp.logger.debug "convert, line_count = #{line_count}"
       0.upto(line_count - 1) do |line_index|
         lines << create_line(image: image, line_index: line_index)
       end
+      BrotherEscp.logger.debug "convert, size by line: #{lines.map(&:size)}, total: #{lines.map(&:size).inject(:+)}"
       lines
     end
 
@@ -57,12 +57,14 @@ module BrotherEscp
 
     private
 
-    def check_image(image:)
-      remain = image.height % line_height_in_pixels
-      BrotherEscp.logger.warn { "the height (#{image.height}) is not a multiple if #{line_height_in_pixels}, the last #{remain} lines will be ignored." } if remain.positive?
+    def line_count(image:)
+      line_count = (image.height / line_height_in_pixels)
+      line_count += 1 if (image.height % line_height_in_pixels).nonzero?
+      line_count
     end
 
     def create_line(image:, line_index:)
+      BrotherEscp.logger.debug "create_line: #{line_index}"
       line = []
       0.upto(image.width - 1) do |x|
         0.upto(line_height_in_bytes - 1) do |byte_offset|
@@ -76,13 +78,21 @@ module BrotherEscp
       bits = String.new('')
       0.upto(7) do |y_offset|
         y = (line_index * line_height_in_pixels) + (byte_offset * 8) + y_offset
-        bit = convert_pixel_to_bw(image[x, y])
+        bit = convert_point(image: image, x: x, y: y)
         # BrotherEscp.logger.debug "convert, line = #{line_index}, byte_offset = #{byte_offset}, x = #{x}, y = #{y}, bit: #{bit}"
         bits << bit
       end
       bits.to_i(2)
     end
 
+    def convert_point(image:, x:, y:)
+      if y >= image.height
+        '0'
+      else
+        convert_pixel_to_bw(image[x, y])
+      end
+    end
+
     def convert_pixel_to_bw(pixel)
       r = ChunkyPNG::Color.r(pixel)
       g = ChunkyPNG::Color.g(pixel)
@@ -92,7 +102,7 @@ module BrotherEscp
       # BrotherEscp.logger.debug "convert_pixel_to_bw: #{[r, g, b, a]}, px = #{px}"
       BrotherEscp.logger.warn 'PNG images with alpha are not supported.' unless a == 255
 
-      px > 128 ? '0' : '1'
+      px > 230 ? '0' : '1'
     end
   end
 end

data/lib/brother_escp/version.rb

@@ -2,5 +2,5 @@
 # Main module
 module BrotherEscp
   # Current version
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brother_escp
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - David Bourguignon
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-25 00:00:00.000000000 Z
+date: 2016-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  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: chunky_png
   requirement: !ruby/object:Gem::Requirement