pdf-417 0.9.3 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: edeff481ba46d80c17fbafacd21012357501bee7
-  data.tar.gz: bc883efd77890727f27f9edb102cf458eabb8ea0
+  metadata.gz: 86b1f485fbbdc619f2ffd1b092c2f96229566265
+  data.tar.gz: 99b81ab01e2b8fbae68921347437dd4a9a9d4b2e
 SHA512:
-  metadata.gz: 3340691392c4f1b42bb7762e3c3dcd70d59b02844f10e2c5034edc951a415dcf3a460fb7e62f6a307829a3316c89d0183b06b9de6a4f4ea9f1cf95e2c6026e6e
-  data.tar.gz: f8ab45de6b68d7c0e7203277e6c25df7124fb73ffe7331c8faaf4ef6905244b22492730020e00d99c5d63e4fa7adf611289c46f80268a4553e982671507b428b
+  metadata.gz: 751c8ecdc7c66abb2e08073989070e9ba5781274201c450152a2c6154d46586fe5cb1cc6a28c46bf449de1b1f40e3e6b8f1d94d17d9954bf07cdca7edf2e5d1e
+  data.tar.gz: d7f28a5a25c8aced0747c9c7ebf0f412f51ca963cc98e0f71d45862d594371e2d4ea1b1e8384752eda0975cfbfbb2281862ac7e270673fa8d0cb81a351f600b1

data/.ruby-version

@@ -1 +1 @@
-2.4.0
+2.4

data/README.md

@@ -20,6 +20,11 @@ The above example produces:
 
 ![Sample PDF417 barcode](/sample.png?raw=true "Sample PDF417 barcode")
 
+## Inspiration
+
+* https://github.com/bkuzmic/pdf417-js
+* http://www.tcpdf.org/
+
 ## License
 
 This software is licensed under terms of the MIT License.

data/lib/pdf-417.rb

@@ -1,7 +1,7 @@
 require "constants"
 
 module Enumerable
-  def use
+  def probe
     out = nil
     each_with_index {|val, i| out = yield(val, i) and break}
     out
@@ -10,8 +10,8 @@ end
 
 class PDF417
   def initialize(str=nil)
-    @tall = 4 # row height in module units
-    @wbyh = 2 # barcode's width/height
+    @tall = 2 # row height in module units
+    @wbyh = 3 # barcode's width/height
     @pads = 2 # padding around barcode
 
     @str = str # string to encode
@@ -21,25 +21,24 @@ class PDF417
 
   def encode(str=nil)
     str = str ? (@str = str) : @str
-    all = str.split(//)
+    all = str.split('')
     max = all.size - 1
-    use = 0
-    ary = TEXT_MODE[use]
-
-    # map to the four text submodes
-    out = all.map.with_index.inject([]) do |out,(chr,pos)|
-      if val = ary.index(ord = chr.ord)
-        out << val
-      elsif now = TEXT_MODE.use {|chk, now| now if (now != use) && (val = chk.index(ord)) }
-        if (pos == max || ary.index(all[pos + 1].ord)) && (now == 3 || (now == 0 && use == 1))
-          out.push(now == 3 ? 29 : 27) # shift modes only for the next character
-        else
-          out.concat(TEXT_JUMP["#{use}#{now}"]) # jump to new mode
-          ary = TEXT_MODE[use = now]
+    ary = TEXT_MODE[cur = nxt = 0]
+    out = []
+
+    # map to text submodes
+    all.each_with_index do |chr, pos|
+      unless val = ary.index(ord = chr.ord)
+        if nxt = TEXT_MODE.probe {|row, nxt| nxt if (nxt != cur) && (val = row.index(ord)) }
+          if (nxt == 3 || (nxt == 0 && cur == 1)) && (pos == max || ary.index(all[pos + 1].ord))
+            out.push(nxt == 3 ? 29 : 27) # only shift modes for the next character
+          else
+            out.concat(TEXT_JUMP["#{cur}#{nxt}"]) # jump to new mode
+            ary = TEXT_MODE[cur = nxt]
+          end
         end
-        out << val
       end
-      out
+      out.push val
     end
     out.push(29) unless out.size.even?
 
@@ -135,14 +134,14 @@ class PDF417
       end]) + rbar
 
       # add a row
-      all = out.split(//); @tall.times { bar << all }
+      @tall.times { bar << out }
 
       # next cluster
       cid = (cid += 1) % 3
     end
 
     # top and bottom quiet zones
-    zone = ['0'] * (col * 17 + 69 + 2 * @pads) # pad, start, lri, cols, rri, stop, pad
+    zone = '0' * (col * 17 + 69 + 2 * @pads) # pad, start, lri, cols, rri, stop, pad
     @pads.times { bar.unshift zone } # top quiet zone
     @pads.times { bar.push    zone } # bottom quiet zone
 
@@ -166,7 +165,7 @@ class PDF417
     canvas = ChunkyPNG::Image.new(full_width, full_height, ChunkyPNG::Color::WHITE)
 
     x, y = opts[:margin], opts[:margin]
-    dots = ary.map {|l| l.map {|c| c == '1' }}
+    dots = ary.map {|l| l.split('').map {|c| c == '1' }}
     dots.each do |line|
       line.each do |bar|
         if bar

data/pdf-417.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = "pdf-417"
-  s.version     = "0.9.3"
+  s.version     = "0.9.4"
   s.author      = "Steve Shreeve"
   s.email       = "steve.shreeve@gmail.com"
   s.summary     = "Generate PDF-417 barcodes"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pdf-417
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors:
 - Steve Shreeve
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-06 00:00:00.000000000 Z
+date: 2017-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chunky_png
@@ -58,7 +58,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Generate PDF-417 barcodes