barby 0.6.4 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c3ef6b7305d1618b7f76f9b6cc9e8a0857f2aa85
-  data.tar.gz: 531f6a94ab74935d1792e722725c83587c930ade
+  metadata.gz: bf63b4cabe71e145f367917c72ddd3a87b44655d
+  data.tar.gz: 978466b7b734651b5f9362b67136033bdcf572a7
 SHA512:
-  metadata.gz: 0e61425386a0f576bac8e1deb0da5ed38b7a4834c50dbce8c63c1dad2f68e6bac2cbcc55af9bc14b3ad5d423dc8f5b1c4cc5907f393e42177289544278eda5ef
-  data.tar.gz: 26a18619c3738f90a37026384c3b8703e91aa8692d052b0e24274ee98eff80788cffbc205a5b76b5ff56183d6c0f1964ab6316c512e6e95ad3ce9dbf30046a39
+  metadata.gz: 8152a2ea8b9b84264e904f5d50f61c6712fd238580041b5cc0852eacdce210b9e4d6a345ea753c3c4d58c62439d69ab7882006643caa31607eefedcc6226268d
+  data.tar.gz: 0b9e1005bc39a1ea0e8ecd6c57947be36f35e8d1a5529c48073f7d505bc82fa92a7ca1c67d987eb9f94507edd4f5b501cf58c4f994fd8339687fd1659f665404

data/lib/barby/barcode/code_128.rb

@@ -405,6 +405,9 @@ module Barby
     LOWR_RE = /[a-z]/
     DGTS_RE = /\d{4,}/
 
+    # pairs of digits and FNC1 characters
+    CODEC_CHARS_RE = /(?:\d{2}|#{FNC1}){2,}/
+
     class << self
 
 
@@ -424,7 +427,7 @@ module Barby
       #shortest encoding possible
       def apply_shortest_encoding_for_data(data)
         extract_codec(data).map do |block|
-          if possible_codec_segment?(block)
+          if codec_segment?(block)
             "#{CODEC}#{block}"
           else
             if control_before_lowercase?(block)
@@ -454,25 +457,15 @@ module Barby
       #  #                                        C       A or B  C         A or B
       #  extract_codec("12345abc678910DEF11") => ["1234", "5abc", "678910", "DEF11"]
       def extract_codec(data)
-        segments = data.split(/(\d{4,})/).reject(&:empty?)
-        segments.each_with_index do |s,i|
-          if possible_codec_segment?(s) && s.size.odd?
-            if i == 0
-              if segments[1]
-                segments[1].insert(0, s.slice!(-1))
-              else
-                segments[1] = s.slice!(-1)
-              end
-            else
-              segments[i-1].insert(-1, s.slice!(0)) if segments[i-1]
-            end
-          end
-        end
-        segments
+        data.split(/
+          (^(?:#{CODEC_CHARS_RE})) # matches digits that appear at the beginning of the barcode
+          |
+          ((?:#{CODEC_CHARS_RE})(?!\d)) # matches digits that appear later in the barcode
+        /x).reject(&:empty?)
       end
 
-      def possible_codec_segment?(data)
-        data =~ /\A\d{4,}\Z/
+      def codec_segment?(data)
+        data =~ /\A#{CODEC_CHARS_RE}\Z/
       end
 
       def control_character?(char)

data/lib/barby/version.rb

@@ -2,7 +2,7 @@ module Barby #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 6
-    TINY  = 4
+    TINY  = 5
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: barby
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.5
 platform: ruby
 authors:
 - Tore Darell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-14 00:00:00.000000000 Z
+date: 2016-11-30 00:00:00.000000000 Z
 dependencies: []
 description: Barby creates barcodes.
 email: toredarell@gmail.com