rqrcode 0.3.0 → 0.3.1

data/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/README

@@ -13,7 +13,7 @@ Let's clear up some rQRCode stuff.
  # The interface is simple and assumes you just want to encode a string into a QR code
  # QR code is trademarked by Denso Wave inc
 
-== Rescources
+== Resources
 
 wikipedia:: http://en.wikipedia.org/wiki/QR_Code
 Denso-Wave website:: http://www.denso-wave.com/qrcode/index-e.html
@@ -22,10 +22,15 @@ kaywa:: http://qrcode.kaywa.com
 
 == Installing
 
-You may get the latest stable version from Rubyforge. Source gems are also available.
+You may get the latest stable version from Rubyforge. 
 
   $ gem install rqrcode
 
+You can also get the source from http://github.com/whomwah/rqrcode/tree/master
+
+  $ git clone git://github.com/whomwah/rqrcode.git
+ 
+
 === Loading rQRCode Itself
 
 You have installed the gem already, yeah?

data/lib/rqrcode/qrcode/qr_code.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 #--
-# Copyright 2004 by Duncan Robertson (duncan@whomwah.com).
+# Copyright 2008 by Duncan Robertson (duncan@whomwah.com).
 # All rights reserved.
 
 # Permission is granted for use, copying, modification, distribution,
@@ -59,8 +59,13 @@ module RQRCode #:nodoc:
     # Expects a string to be parsed in, other args are optional 
     #
     #   # string - the string you wish to encode 
-    #   # size   - the size of the qrcode
-    #   # level  - the error correction level 
+    #   # size   - the size of the qrcode (default 4)
+    #   # level  - the error correction level, can be:
+    #      * Level :l 7%  of code can be restored
+    #      * Level :m 15% of code can be restored
+    #      * Level :q 25% of code can be restored
+    #      * Level :h 30% of code can be restored (default :h) 
+    #
     #   qr = RQRCode::QRCode.new('hello world', :size => 1, :level => :m ) 
     #
 
@@ -201,14 +206,8 @@ module RQRCode #:nodoc:
 
 
     def setup_timing_pattern #:nodoc:
-      ( 8...@module_count - 8 ).each do |r|
-        next unless @modules[r][6].nil?
-        @modules[r][6] = (r % 2 == 0)
-      end
-
-      ( 8...@module_count - 8 ).each do |c|
-        next unless @modules[6][c].nil?
-        @modules[6][c] = (c % 2 == 0)
+      ( 8...@module_count - 8 ).each do |i|
+        @modules[i][6] = @modules[6][i] = i % 2 == 0 
       end
     end
 
@@ -243,10 +242,6 @@ module RQRCode #:nodoc:
       ( 0...18 ).each do |i|
         mod = ( !test && ( (bits >> i) & 1) == 1 )
         @modules[ (i / 3).floor ][ i % 3 + @module_count - 8 - 3 ] = mod
-      end
-
-      ( 0...18 ).each do |i|
-        mod = ( !test && ( (bits >> i) & 1) == 1 )
         @modules[ i % 3 + @module_count - 8 - 3 ][ (i / 3).floor ] = mod
       end
     end
@@ -256,10 +251,10 @@ module RQRCode #:nodoc:
       data = (@error_correct_level << 3 | mask_pattern)
       bits = QRUtil.get_bch_type_info( data )
 
-      # vertical
       ( 0...15 ).each do |i|
         mod = (!test && ( (bits >> i) & 1) == 1)
 
+        # vertical
         if i < 6
           @modules[i][8] = mod
         elsif i < 8
@@ -268,12 +263,7 @@ module RQRCode #:nodoc:
           @modules[ @module_count - 15 + i ][8] = mod
         end
 
-      end
-
-      # horizontal
-      ( 0...15 ).each do |i|
-        mod = (!test && ( (bits >> i) & 1) == 1)
-
+        # horizontal
         if i < 8
           @modules[8][ @module_count - i - 1 ] = mod
         elsif i < 9

data/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 )

data/lib/rqrcode.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 #--
-# Copyright 2004 by Duncan Robertson (duncan@whomwah.com).
+# Copyright 2008 by Duncan Robertson (duncan@whomwah.com).
 # All rights reserved.
 
 # Permission is granted for use, copying, modification, distribution,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rqrcode
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors: 
 - Duncan Robertson
@@ -9,11 +9,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-02-28 00:00:00 +00:00
+date: 2008-11-24 00:00:00 +00:00
 default_executable: 
 dependencies: []
 
-description: rQRCode is a library for encoding QR Codes. The simple interface allows you to simply create QR Code data structures ready to be displayed in the way you choose.
+description: rQRCode is a library for encoding QR Codes. The simple interface allows you to create QR Code data structures  ready to be displayed in the way you choose.
 email: duncan@whomwah.com
 executables: []