barby 0.2.0 → 0.2.1

data/bin/barby

@@ -7,7 +7,8 @@ require 'barby'
 
 options = {
   :outputter => 'Png',
-  :outputter_method => 'to_png'
+  :outputter_method => 'to_png',
+  :barcode => 'Code128B'
 }
 
 ARGV.options do |o|
@@ -18,9 +19,9 @@ ARGV.options do |o|
   o.separator '  EXPERIMENTAL'
   o.separator ''
 
-  o.on('-b', '--barcode=ClassName', String, 'Barcode type'){|v| options[:barcode] = v }
-  o.on('-o', '--outputter=ClassName', String, 'Outputter'){|v| options[:outputter] = v }
-  o.on('-m', '--method=method_name', String, 'Outputter method'){|v| options[:outputter_method] = v }
+  o.on('-b', '--barcode=ClassName', String, 'Barcode type (Code128B)'){|v| options[:barcode] = v }
+  o.on('-o', '--outputter=ClassName', String, 'Outputter (Png)'){|v| options[:outputter] = v }
+  o.on('-m', '--method=method_name', String, 'Outputter method (to_png)'){|v| options[:outputter_method] = v }
 
   o.on_tail("-h", "--help", "Show this help message.") { puts o; exit }
     

data/lib/barby/barcode.rb

@@ -24,12 +24,23 @@ module Barby
   # # ##  ###   ####    #
   # # ##  ###   ####    #
   # # ##  ###   ####    #
+  #
+  #2D implementation:
+  #
+  # class Static2DBarcode < Barby::Barcode2D
+  #   def encoding
+  #     ['1010101', '010101110', '0001010100']
+  #   end
+  # end
   class Barcode
   
     
     #Every barcode must have an encoding method. This method returns
     #a string containing a series of 1 and 0, representing bars and
     #spaces. One digit is the width of one "module" or X dimension.
+    #
+    #If the barcode is 2D, it returns an array of strings representing
+    #each line in the barcode
     def encoding
       raise NotImplementedError, 'Every barcode should implement this method'
     end
@@ -91,9 +102,8 @@ module Barby
   class Barcode1D < Barcode
   end
 
-  #There is currently only support for one-dimensional barcodes,
-  #but in the future it should also be possible to support barcodes
-  #with two dimensions.
+  #2D barcodes are 1D barcodes stacked on top of each other.
+  #Their encoding method must return an array of strings
   class Barcode2D < Barcode
   end
 

data/lib/barby/barcode/qr_code.rb

@@ -15,24 +15,22 @@ module Barby
       3  => [53, 42, 32, 24],         4  => [78, 62, 46, 34],
       5  => [106, 84, 60, 44],        6  => [134, 106, 74, 58],
       7  => [154, 122, 86, 64],       8  => [192, 152, 108, 84],
-      9  => [230, 180, 130, 98],      10 => [271, 213, 151, 119]#,
-
-    #I think RQRCode only supports sizes up to 10
-    #  11 => [321, 251, 177, 137],     12 => [367, 287, 203, 155],
-    #  13 => [425, 331, 241, 177],     14 => [458, 362, 258, 194],
-    #  15 => [520, 412, 292, 220],     16 => [586, 450, 322, 250],
-    #  17 => [644, 504, 364, 280],     18 => [718, 560, 394, 310],
-    #  19 => [792, 624, 442, 338],     20 => [858, 666, 482, 382],
-    #  21 => [929, 711, 509, 403],     22 => [1003, 779, 565, 439],
-    #  23 => [1091, 857, 611, 461],    24 => [1171, 911, 661, 511],
-    #  25 => [1273, 997, 715, 535],    26 => [1367, 1059, 751, 593],
-    #  27 => [1465, 1125, 805, 625],   28 => [1528, 1190, 868, 658],
-    #  29 => [1628, 1264, 908, 698],   30 => [1732, 1370, 982, 742],
-    #  31 => [1840, 1452, 1030, 790],  32 => [1952, 1538, 1112, 842],
-    #  33 => [2068, 1628, 1168, 898],  34 => [2188, 1722, 1228, 958],
-    #  35 => [2303, 1809, 1283, 983],  36 => [2431, 1911, 1351, 1051],
-    #  37 => [2563, 1989, 1423, 1093], 38 => [2699, 2099, 1499, 1139],
-    #  39 => [2809, 2213, 1579, 1219], 40 => [2953, 2331, 1663, 1273]
+      9  => [230, 180, 130, 98],      10 => [271, 213, 151, 119],
+      11 => [321, 251, 177, 137],     12 => [367, 287, 203, 155],
+      13 => [425, 331, 241, 177],     14 => [458, 362, 258, 194],
+      15 => [520, 412, 292, 220],     16 => [586, 450, 322, 250],
+      17 => [644, 504, 364, 280],     18 => [718, 560, 394, 310],
+      19 => [792, 624, 442, 338],     20 => [858, 666, 482, 382],
+      21 => [929, 711, 509, 403],     22 => [1003, 779, 565, 439],
+      23 => [1091, 857, 611, 461],    24 => [1171, 911, 661, 511],
+      25 => [1273, 997, 715, 535],    26 => [1367, 1059, 751, 593],
+      27 => [1465, 1125, 805, 625],   28 => [1528, 1190, 868, 658],
+      29 => [1628, 1264, 908, 698],   30 => [1732, 1370, 982, 742],
+      31 => [1840, 1452, 1030, 790],  32 => [1952, 1538, 1112, 842],
+      33 => [2068, 1628, 1168, 898],  34 => [2188, 1722, 1228, 958],
+      35 => [2303, 1809, 1283, 983],  36 => [2431, 1911, 1351, 1051],
+      37 => [2563, 1989, 1423, 1093], 38 => [2699, 2099, 1499, 1139],
+      39 => [2809, 2213, 1579, 1219], 40 => [2953, 2331, 1663, 1273]
     }.sort
 
     LEVELS = { :l => 0, :m => 1, :q => 2, :h => 3 }

data/lib/barby/outputter/prawn_outputter.rb

@@ -1,5 +1,4 @@
 require 'barby/outputter'
-$: << '/home/toretore/Projects/tmp/prawn/lib'
 require 'prawn'
 
 module Barby

data/lib/barby/version.rb

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

data/vendor/rqrcode/CHANGELOG

@@ -1,3 +1,7 @@
+*0.3.1* (Nov 24th, 2008)
+
+* expanded RS block table to QRcode version 40  [Vladislav Gorodetskiy]
+
 *0.3.0* (Feb 28th, 2008)
 
 * added more documentation

data/vendor/rqrcode/Rakefile

@@ -6,7 +6,7 @@ require 'rake/rdoctask'
 require 'rake/testtask'
 
 NAME = "rqrcode"
-VERS = "0.3.0"
+VERS = "0.3.1"
 CLEAN.include ['pkg', 'rdoc']
 
 Gem::manage_gems

data/vendor/rqrcode/lib/rqrcode/qrcode/qr_rs_block.rb

@@ -19,7 +19,7 @@ module RQRCode #:nodoc:
       @data_count = data_count
     end
 
-    RS_BLOCK_TABLE = [
+RQRCode::QRRSBlock::RS_BLOCK_TABLE = [
 
       # L
       # M
@@ -44,7 +44,7 @@ module RQRCode #:nodoc:
       [2, 35, 17],
       [2, 35, 13],
 
-      # 4    
+      # 4
       [1, 100, 80],
       [2, 50, 32],
       [2, 50, 24],
@@ -62,7 +62,7 @@ module RQRCode #:nodoc:
       [4, 43, 19],
       [4, 43, 15],
 
-      # 7    
+      # 7
       [2, 98, 78],
       [4, 49, 31],
       [2, 32, 14, 4, 33, 15],
@@ -80,14 +80,193 @@ module RQRCode #:nodoc:
       [4, 36, 16, 4, 37, 17],
       [4, 36, 12, 4, 37, 13],
 
-      # 10    
+      # 10
       [2, 86, 68, 2, 87, 69],
       [4, 69, 43, 1, 70, 44],
       [6, 43, 19, 2, 44, 20],
-      [6, 43, 15, 2, 44, 16]
+      [6, 43, 15, 2, 44, 16],
 
-    ]
+      # 11
+      [4, 101, 81],
+      [1, 80, 50, 4, 81, 51],
+      [4, 50, 22, 4, 51, 23],
+      [3, 36, 12, 8, 37, 13],
+
+      # 12
+      [2, 116, 92, 2, 117, 93],
+      [6, 58, 36, 2, 59, 37],
+      [4, 46, 20, 6, 47, 21],
+      [7, 42, 14, 4, 43, 15],
+
+      # 13
+      [4, 133, 107],
+      [8, 59, 37, 1, 60, 38],
+      [8, 44, 20, 4, 45, 21],
+      [12, 33, 11, 4, 34, 12],
+
+      # 14
+      [3, 145, 115, 1, 146, 116],
+      [4, 64, 40, 5, 65, 41],
+      [11, 36, 16, 5, 37, 17],
+      [11, 36, 12, 5, 37, 13],
+
+      # 15
+      [5, 109, 87, 1, 110, 88],
+      [5, 65, 41, 5, 66, 42],
+      [5, 54, 24, 7, 55, 25],
+      [11, 36, 12],
+
+      # 16
+      [5, 122, 98, 1, 123, 99],
+      [7, 73, 45, 3, 74, 46],
+      [15, 43, 19, 2, 44, 20],
+      [3, 45, 15, 13, 46, 16],
+
+      # 17
+      [1, 135, 107, 5, 136, 108],
+      [10, 74, 46, 1, 75, 47],
+      [1, 50, 22, 15, 51, 23],
+      [2, 42, 14, 17, 43, 15],
+
+      # 18
+      [5, 150, 120, 1, 151, 121],
+      [9, 69, 43, 4, 70, 44],
+      [17, 50, 22, 1, 51, 23],
+      [2, 42, 14, 19, 43, 15],
+
+      # 19
+      [3, 141, 113, 4, 142, 114],
+      [3, 70, 44, 11, 71, 45],
+      [17, 47, 21, 4, 48, 22],
+      [9, 39, 13, 16, 40, 14],
+
+      # 20
+      [3, 135, 107, 5, 136, 108],
+      [3, 67, 41, 13, 68, 42],
+      [15, 54, 24, 5, 55, 25],
+      [15, 43, 15, 10, 44, 16],
+
+      # 21
+      [4, 144, 116, 4, 145, 117],
+      [17, 68, 42],
+      [17, 50, 22, 6, 51, 23],
+      [19, 46, 16, 6, 47, 17],
+
+      # 22
+      [2, 139, 111, 7, 140, 112],
+      [17, 74, 46],
+      [7, 54, 24, 16, 55, 25],
+      [34, 37, 13],
+
+      # 23
+      [4, 151, 121, 5, 152, 122],
+      [4, 75, 47, 14, 76, 48],
+      [11, 54, 24, 14, 55, 25],
+      [16, 45, 15, 14, 46, 16],
+
+      # 24
+      [6, 147, 117, 4, 148, 118],
+      [6, 73, 45, 14, 74, 46],
+      [11, 54, 24, 16, 55, 25],
+      [30, 46, 16, 2, 47, 17],
+
+      # 25
+      [8, 132, 106, 4, 133, 107],
+      [8, 75, 47, 13, 76, 48],
+      [7, 54, 24, 22, 55, 25],
+      [22, 45, 15, 13, 46, 16],
+
+      # 26
+      [10, 142, 114, 2, 143, 115],
+      [19, 74, 46, 4, 75, 47],
+      [28, 50, 22, 6, 51, 23],
+      [33, 46, 16, 4, 47, 17],
 
+      # 27
+      [8, 152, 122, 4, 153, 123],
+      [22, 73, 45, 3, 74, 46],
+      [8, 53, 23, 26, 54, 24],
+      [12, 45, 15, 28, 46, 16],
+
+      # 28
+      [3, 147, 117, 10, 148, 118],
+      [3, 73, 45, 23, 74, 46],
+      [4, 54, 24, 31, 55, 25],
+      [11, 45, 15, 31, 46, 16],
+
+      # 29
+      [7, 146, 116, 7, 147, 117],
+      [21, 73, 45, 7, 74, 46],
+      [1, 53, 23, 37, 54, 24],
+      [19, 45, 15, 26, 46, 16],
+
+      # 30
+      [5, 145, 115, 10, 146, 116],
+      [19, 75, 47, 10, 76, 48],
+      [15, 54, 24, 25, 55, 25],
+      [23, 45, 15, 25, 46, 16],
+
+      # 31
+      [13, 145, 115, 3, 146, 116],
+      [2, 74, 46, 29, 75, 47],
+      [42, 54, 24, 1, 55, 25],
+      [23, 45, 15, 28, 46, 16],
+
+      # 32
+      [17, 145, 115],
+      [10, 74, 46, 23, 75, 47],
+      [10, 54, 24, 35, 55, 25],
+      [19, 45, 15, 35, 46, 16],
+
+      # 33
+      [17, 145, 115, 1, 146, 116],
+      [14, 74, 46, 21, 75, 47],
+      [29, 54, 24, 19, 55, 25],
+      [11, 45, 15, 46, 46, 16],
+
+      # 34
+      [13, 145, 115, 6, 146, 116],
+      [14, 74, 46, 23, 75, 47],
+      [44, 54, 24, 7, 55, 25],
+      [59, 46, 16, 1, 47, 17],
+
+      # 35
+      [12, 151, 121, 7, 152, 122],
+      [12, 75, 47, 26, 76, 48],
+      [39, 54, 24, 14, 55, 25],
+      [22, 45, 15, 41, 46, 16],
+
+      # 36
+      [6, 151, 121, 14, 152, 122],
+      [6, 75, 47, 34, 76, 48],
+      [46, 54, 24, 10, 55, 25],
+      [2, 45, 15, 64, 46, 16],
+
+      # 37
+      [17, 152, 122, 4, 153, 123],
+      [29, 74, 46, 14, 75, 47],
+      [49, 54, 24, 10, 55, 25],
+      [24, 45, 15, 46, 46, 16],
+
+      # 38
+      [4, 152, 122, 18, 153, 123],
+      [13, 74, 46, 32, 75, 47],
+      [48, 54, 24, 14, 55, 25],
+      [42, 45, 15, 32, 46, 16],
+
+      # 39
+      [20, 147, 117, 4, 148, 118],
+      [40, 75, 47, 7, 76, 48],
+      [43, 54, 24, 22, 55, 25],
+      [10, 45, 15, 67, 46, 16],
+
+      # 40
+      [19, 148, 118, 6, 149, 119],
+      [18, 75, 47, 31, 76, 48],
+      [34, 54, 24, 34, 55, 25],
+      [20, 45, 15, 61, 46, 16]
+
+    ]
 
     def QRRSBlock.get_rs_blocks( type_no, error_correct_level )
       rs_block = QRRSBlock.get_rs_block_table( type_no, error_correct_level )

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: barby
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Tore Darell
@@ -9,7 +9,7 @@ autorequire: barby
 bindir: bin
 cert_chain: []
 
-date: 2008-07-16 00:00:00 +02:00
+date: 2008-11-24 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -98,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: barby
-rubygems_version: 1.1.1
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: A pure-Ruby barcode generator