barcode1dtools 0.9.9.0 → 0.9.9.1

data/lib/barcode1dtools/codabar.rb

@@ -22,7 +22,7 @@ module Barcode1DTools
   #
   # Additionally, the caller must present the start and stop
   # characters as part of the value.  When decoding, the start/stop
-  # cahracters will be presented as A, B, C, or D.  
+  # characters will be presented as A, B, C, or D.  
   #
   # val = "A29322930C"
   # bc = Barcode1DTools::Codabar.new(val)

data/lib/barcode1dtools/code128.rb

@@ -115,7 +115,7 @@ module Barcode1DTools
     # underscore, then has nul to \x1f.  Finally, it has FNC 1-4.
     CODE_A_TO_ASCII = ((32..95).to_a + (0..31).to_a).collect { |c| [c].pack('C') } + [ :fnc_3, :fnc_2, :shift_b, :code_c, :code_b, :fnc_4, :fnc_1, :start_a, :start_b, :start_c, :stop ]
     ASCII_TO_CODE_A = (0..(CODE_A_TO_ASCII.length-1)).inject({}) { |a,c| a[CODE_A_TO_ASCII[c]] = c; a }
-    CODE_A_TO_HIGH_ASCII = CODE_A_TO_ASCII.collect { |a| a.is_a?(Symbol) ? a : [a.unpack("C").first+128].pack("C") }
+    CODE_A_TO_HIGH_ASCII = CODE_A_TO_ASCII.collect { |a| a.is_a?(Symbol) ? a : [a.unpack("C").first+128].pack("C") }.collect { |c| RUBY_VERSION < "1.9" || c.is_a?(Symbol) ? c : c.force_encoding('ISO-8859-1') }
     HIGH_ASCII_TO_CODE_A = (0..(CODE_A_TO_HIGH_ASCII.length-1)).inject({}) { |a,c| a[CODE_A_TO_HIGH_ASCII[c]] = c; a }
 
     # Code B encodes ASCII space (\x20, dec. 32) to DEL (\x7f,
@@ -124,7 +124,7 @@ module Barcode1DTools
     # different position than in set A.
     CODE_B_TO_ASCII = (32..127).collect { |c| [c].pack('C') } + [ :fnc_3, :fnc_2, :shift_a, :code_c, :fnc_4, :code_a, :fnc_1, :start_a, :start_b, :start_c, :stop ]
     ASCII_TO_CODE_B = (0..(CODE_B_TO_ASCII.length-1)).inject({}) { |a,c| a[CODE_B_TO_ASCII[c]] = c; a }
-    CODE_B_TO_HIGH_ASCII = CODE_B_TO_ASCII.collect { |a| a.is_a?(Symbol) ? a : [a.unpack("C").first+128].pack("C") }
+    CODE_B_TO_HIGH_ASCII = CODE_B_TO_ASCII.collect { |a| a.is_a?(Symbol) ? a : [a.unpack("C").first+128].pack("C") }.collect { |c| RUBY_VERSION < "1.9" || c.is_a?(Symbol) ? c : c.force_encoding('ISO-8859-1') }
     HIGH_ASCII_TO_CODE_B = (0..(CODE_B_TO_HIGH_ASCII.length-1)).inject({}) { |a,c| a[CODE_B_TO_HIGH_ASCII[c]] = c; a }
 
     # Code C encodes digit pairs 00 to 99 as well as FNC 1.
@@ -255,7 +255,7 @@ module Barcode1DTools
         end
         # Make sure it's Latin-1 for Ruby 1.9+
         if RUBY_VERSION >= "1.9"
-          ret = ret.collect { |c| c.force_encoding('ISO-8859-1') }
+          ret = ret.collect { |c| c.is_a?(Symbol) ? c : c.force_encoding('ISO-8859-1') }
         end
         if options[:raw_array]
           ret.push(md[2].unpack('C').first)
@@ -325,6 +325,9 @@ module Barcode1DTools
         while x < map_a.length - 1 do
           map_a_len = map_a.index('-',x).to_i - x
           map_b_len = map_b.index('-',x).to_i - x
+          if map_a_len==0 && map_b_len==0
+            raise "Ack!  Bad mapping: #{map_a} & #{map_b}"
+          end
           if map_a_len >= map_b_len
             codepoints += map_a[x,map_a_len]
             x += map_a_len
@@ -439,7 +442,7 @@ module Barcode1DTools
 
         end
 
-        decoded_string = code128_to_latin1(points.pack('C*'))
+        decoded_string = code128_to_latin1(points.pack('C*'), options)
 
         Code128.new(decoded_string, options)
       end
@@ -456,11 +459,26 @@ module Barcode1DTools
         @encoded_string = value
         @value = self.class.code128_to_latin1(value, options)
       else
-        @value = value.to_s
+        if value.is_a?(Array)
+          @value = value
+        else
+          @value = [value.to_s]
+        end
         # In ruby 1.9, change to Latin-1 if it's in another encoding.
         # Really, the caller needs to handle this.
-        if RUBY_VERSION >= "1.9" && !['US-ASCII','ISO-8859-1'].include?(value.encoding)
-          value = value.encode('ISO-8859-1')
+        if RUBY_VERSION >= "1.9"
+          @value = @value.collect do |item|
+            if item.is_a?(Symbol)
+              item
+            else
+              item = item.to_s
+              if ['US-ASCII','ISO-8859-1'].include?(item.encoding)
+                item
+              else
+                item.encode('ISO-8859-1')
+              end
+            end
+          end
         end
         raise UnencodableCharactersError unless self.class.can_encode?(value)
         @encoded_string = self.class.latin1_to_code128(@value, options)

data/test/test_barcode1dcode128.rb

@@ -21,10 +21,10 @@ class Barcode1DToolsCode128Test < Test::Unit::TestCase
 
   def random_x_character_latin1_string(x)
     str=(1..x).collect { rand(256) }.pack('C*')
-    if RUBY_VERSION >= "1.9"
-      str.force_encoding('ISO-8859-1')
-    else
+    if RUBY_VERSION < "1.9"
       str
+    else
+      str.force_encoding('ISO-8859-1')
     end
   end
 
@@ -54,7 +54,7 @@ class Barcode1DToolsCode128Test < Test::Unit::TestCase
 
   def test_attr_readers
     c128 = Barcode1DTools::Code128.new('Hello!')
-    assert_equal 'Hello!', c128.value
+    assert_equal ['Hello!'], c128.value
   end
 
   def test_decode_error
@@ -73,4 +73,14 @@ class Barcode1DToolsCode128Test < Test::Unit::TestCase
     c1284 = Barcode1DTools::Code128.decode(c128.rle.reverse)
     assert_equal c128.value, c1284.value
   end
+
+  def test_serious_decoding
+    random_c128_str = random_crazy_code128_value(rand(5) + 10)
+    c128 = Barcode1DTools::Code128.new(random_c128_str, :no_latin1 => true)
+    c1282 = Barcode1DTools::Code128.decode(c128.rle, :no_latin1 => true)
+    assert_equal c128.value, c1282.value
+    # Should also work in reverse
+    c1284 = Barcode1DTools::Code128.decode(c128.rle.reverse, :no_latin1 => true)
+    assert_equal c128.value, c1284.value
+  end
 end

metadata

@@ -1,42 +1,29 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: barcode1dtools
-version: !ruby/object:Gem::Version 
-  hash: 35
+version: !ruby/object:Gem::Version
+  version: 0.9.9.1
   prerelease: 
-  segments: 
-  - 0
-  - 9
-  - 9
-  - 0
-  version: 0.9.9.0
 platform: ruby
-authors: 
+authors:
 - Michael Chaney
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-09-22 00:00:00 -05:00
-default_executable: 
+date: 2012-09-22 00:00:00.000000000Z
 dependencies: []
-
-description: "\t Barcode1D is a small library for handling many kinds of\n\
-  \t 1-dimensional barcodes.  Currently implemented are Code 128, Code 3\n\
-  \t of 9, Code 93, Code 11, Codabar, Interleaved 2 of 5, COOP 2 of 5,\n\
-  \t Matrix 2 of 5, Industrial 2 of 5, IATA 2 of 5, PostNet, Plessey, MSI\n\
-  \t (Modified Plessey), EAN-13, EAN-8, UPC-A, UPC-E, UPC Supplemental 2,\n\
-  \t and UPC Supplemental 5.  Patterns are created in either a simple\n\
-  \t format of bars and spaces or as a run-length encoded string.  This\n\
-  \t only generates and decodes the patterns; actual display or reading\n\
-  \t from a device must be implemented by the programmer.\n"
+description: ! "\t Barcode1D is a small library for handling many kinds of\n\t 1-dimensional
+  barcodes.  Currently implemented are Code 128, Code 3\n\t of 9, Code 93, Code 11,
+  Codabar, Interleaved 2 of 5, COOP 2 of 5,\n\t Matrix 2 of 5, Industrial 2 of 5,
+  IATA 2 of 5, PostNet, Plessey, MSI\n\t (Modified Plessey), EAN-13, EAN-8, UPC-A,
+  UPC-E, UPC Supplemental 2,\n\t and UPC Supplemental 5.  Patterns are created in
+  either a simple\n\t format of bars and spaces or as a run-length encoded string.
+  \ This\n\t only generates and decodes the patterns; actual display or reading\n\t
+  from a device must be implemented by the programmer.\n"
 email: mdchaney@michaelchaney.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/barcode1dtools/codabar.rb
 - lib/barcode1dtools/code11.rb
 - lib/barcode1dtools/code128.rb
@@ -78,44 +65,33 @@ files:
 - test/test_barcode1dupce.rb
 - test/test_barcode1dupcsupp2.rb
 - test/test_barcode1dupcsupp5.rb
-has_rdoc: true
 homepage: http://rubygems.org/gems/barcode1dtools
-licenses: 
+licenses:
 - MIT
 - GPL-2
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 59
-      segments: 
-      - 1
-      - 8
-      - 6
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.8.6
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.5.3
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Pattern generators for 1D barcodes
-test_files: 
+test_files:
 - test/test_barcode1d.rb
 - test/test_barcode1dcodabar.rb
 - test/test_barcode1dcode11.rb