img2zpl 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c8010c3b5133ed81279c44419a584d87ab6b54d1777efec3c9c7c52e556b23b
-  data.tar.gz: 17200af08ebff21cac5f15e0d09c89dc765e3d0487379ffd69958582095be77d
+  metadata.gz: eaa8a3061a652dea3c0987eb08f4bd7004e78272f01c8c84880c570efceab840
+  data.tar.gz: 2c2b9d1e9da61cc041ab9e9f8445b71d1cacc20109969e85a0b1c31a2b50038a
 SHA512:
-  metadata.gz: 7e0e621ec3a4dc11c2399d8808b02f750be6da3a9c2b67e9e909e186f2adc1d020e31690e51809b9e9d8740ee04bbeced89638b4b2eed361af654b98e25d8410
-  data.tar.gz: 3cda926725cc62f06e62da712fc56db9c98a179b1c1480871212aaceee872d918f622c45f8c0ec17000bd873f16ec11cca7617480d4e8816a726de65ef50c3ac
+  metadata.gz: 51b29f5fcb695da020a5586cfbeffc79c577396ecd7a37502e78f9a0b26003c604124a64a25bed8cbbe484da61e985f87d03064e3a1b496f472b2888959fcefd
+  data.tar.gz: de921a9431a6da01cc9dedf859810293373cddc5ab534ee0b7f30027222fbc66479da959f7bfa4d4f8f4c237ce2cbd2dd68cc10dd940dd19971f957b4da28b93

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 * Your contribution here.
 
+### v0.1.3 (2019/10/16)
+
+* Fixed module definition.
+
 ### v0.1.2 (2019/10/10)
 
 * [#3](https://github.com/mtking2/img2zpl/pull/3): Add ASCII compression to conversion - [@mtking2](https://github.com/mtking2).

data/CONTRIBUTING.md

@@ -12,7 +12,7 @@ bundle install
 Then check out a working branch:
 
 ```
-git checkout <my-working-branch>
+git checkout -b <my-working-branch>
 ```
 
 ### Write tests
@@ -30,14 +30,17 @@ Write your code to make your tests pass.
 
 Update the CHANGELOG with the description of your code changes and your name on the line after `"* Your contribution here"`.
 
-### Push your changes and open a pull request
+### Commit and push your changes
 
-Push you changes to your working branch.
+Commit and push your changes to your working branch.
 
 ```
+git commit -am 'Add some feature'
 git push origin <my-working-branch>
 ```
 
+### Open a pull request
+
 Open a pull request against upstream master and your working branch. Give a brief description of what your PR does and explain what the code changes do.
 
 Thank you!

data/README.md

@@ -24,7 +24,7 @@ gem install img2zpl
 require 'img2zpl'
 
 img = Img2Zpl::Image.open('foo.jpg')
-zpl = img.to_zpl #=> "^FO0,0^GFA, ... ^FS"
+zpl = img.to_zpl #=> "^GFA, ... ^FS"
 ```
 
 ### Contributing
@@ -35,6 +35,6 @@ See [CONTRIBUTING.md](CONTRIBUTING.md)
 
 ### Copyright
 
-Copyright © 2019, [Michael King](https://twitter.com/_mtking2) and [Contributors](CHANGELOG.md).
+© 2019, [Michael King](https://twitter.com/_mtking2) and [Contributors](CHANGELOG.md).
 
 MIT License, see [LICENSE](https://github.com/mtking2/img2zpl/blob/master/LICENSE)

data/lib/img2zpl/image.rb

@@ -1,61 +1,63 @@
-class Img2Zpl::Image < MiniMagick::Image
-
-  def to_zpl(black_threshold: 0.5, compress: true)
-    bytes_per_row = (width % 8).positive? ? (width / 8) + 1 : (width / 8)
-    byte_count = bytes_per_row * height
-    data, line, previous_line, byte = '', '', '', ''
-
-    get_pixels.each do |row|
-      row.each_with_index do |column, i|
-        r, g, b = column.map(&:to_i)
-        byte << ((r + g + b) > (black_threshold * 765) ? '0' : '1')
-        if (i % 8).zero?
-          line << byte.to_i(2).to_s(16).upcase.rjust(2, '0')
-          byte = ''
+module Img2Zpl
+  class Image < MiniMagick::Image
+
+    def to_zpl(black_threshold: 0.5, compress: true)
+      bytes_per_row = (width % 8).positive? ? (width / 8) + 1 : (width / 8)
+      byte_count = bytes_per_row * height
+      data, line, previous_line, byte = '', '', '', ''
+
+      get_pixels.each do |row|
+        row.each_with_index do |column, i|
+          r, g, b = column.map(&:to_i)
+          byte << ((r + g + b) > (black_threshold * 765) ? '0' : '1')
+          if (i % 8).zero?
+            line << byte.to_i(2).to_s(16).upcase.rjust(2, '0')
+            byte = ''
+          end
+        end
+
+        data << if compress
+          (line == previous_line ? ':' : line.gsub(/0+$/, ',').gsub(/F+$/, '!'))
+        else
+          line
         end
-      end
 
-      data << if compress
-        (line == previous_line ? ':' : line.gsub(/0+$/, ',').gsub(/F+$/, '!'))
-      else
-        line
+        previous_line = line
+        line = ''
       end
 
-      previous_line = line
-      line = ''
+      _compress(data) if compress
+      "^GFA,#{byte_count},#{byte_count},#{bytes_per_row},#{data}^FS"
     end
 
-    _compress(data) if compress
-    "^GFA,#{byte_count},#{byte_count},#{bytes_per_row},#{data}^FS"
-  end
-
-  private
+    private
 
-  def _compression_map
-    map = {}
-    start = 'G'.ord
-    19.times { |i| map[i + 1] = (start+i).chr }
-    start = 'g'.ord
-    (20..400).step(20).each_with_index { |i, j| map[i] = (start+j).chr }
-    map
-  end
+    def _compression_map
+      map = {}
+      start = 'G'.ord
+      19.times { |i| map[i + 1] = (start+i).chr }
+      start = 'g'.ord
+      (20..400).step(20).each_with_index { |i, j| map[i] = (start+j).chr }
+      map
+    end
 
-  def _reduce(n)
-    str = ''
-    counts = _compression_map.keys.sort.reverse
-    counts.each do |c|
-      if c <= n
-        str << (_compression_map[c])
-        n -= c
+    def _reduce(n)
+      str = ''
+      counts = _compression_map.keys.sort.reverse
+      counts.each do |c|
+        if c <= n
+          str << (_compression_map[c])
+          n -= c
+        end
       end
+      str
     end
-    str
-  end
 
-  def _compress(data)
-    data.gsub!(/([\da-zA-Z])(\1+)/) do |m|
-      "#{_reduce(m.length)}#{$1}"
+    def _compress(data)
+      data.gsub!(/([\da-zA-Z])(\1+)/) do |m|
+        "#{_reduce(m.length)}#{$1}"
+      end
     end
-  end
 
+  end
 end

data/lib/img2zpl/version.rb

@@ -1,3 +1,3 @@
 module Img2Zpl
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: img2zpl
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Michael King
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-11 00:00:00.000000000 Z
+date: 2019-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_magick