Update rqrcode dependency

aslakhellesoy · May 25, 2009 · 354565b · 354565b
1 parent 8384d71
commit 354565b
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 14 deletions.
diff --git a/vendor/rqrcode/CHANGELOG b/vendor/rqrcode/CHANGELOG
@@ -1,3 +1,7 @@
+*0.3.2* (Mar 15th, 2009)
+
+* Ruby 1.9 fixes by [Tore Darell http://tore.darell.no] [Chris Mowforth http://blog.99th.st]
+
 *0.3.1* (Nov 24th, 2008)
 
 * expanded RS block table to QRcode version 40  [Vladislav Gorodetskiy]

diff --git a/vendor/rqrcode/Rakefile b/vendor/rqrcode/Rakefile
@@ -6,7 +6,7 @@ require 'rake/rdoctask'
 require 'rake/testtask'
 
 NAME = "rqrcode"
-VERS = "0.3.1"
+VERS = "0.3.2"
 CLEAN.include ['pkg', 'rdoc']
 
 Gem::manage_gems

diff --git a/vendor/rqrcode/lib/rqrcode/qrcode/qr_8bit_byte.rb b/vendor/rqrcode/lib/rqrcode/qrcode/qr_8bit_byte.rb
@@ -27,7 +27,9 @@ def get_length
 
     def write( buffer )
       ( 0...@data.size ).each do |i|
-        buffer.put( @data[i], 8 )
+        c = @data[i]
+        c = c.ord if c.respond_to?(:ord)#String#[] returns single-char string in 1.9, .ord gets ASCII pos
+        buffer.put( c, 8 )
       end
     end
   end

diff --git a/vendor/rqrcode/lib/rqrcode/qrcode/qr_util.rb b/vendor/rqrcode/lib/rqrcode/qrcode/qr_util.rb
@@ -137,10 +137,10 @@ def QRUtil.get_length_in_bits( mode, type )
 
         # 1 - 9
         case mode
-        when QRMODE[:mode_number] :  10
-        when QRMODE[:mode_alpha_num] : 9
-        when QRMODE[:mode_8bit_byte] : 8
-        when QRMODE[:mode_kanji] : 8
+        when QRMODE[:mode_number] then  10
+        when QRMODE[:mode_alpha_num] then 9
+        when QRMODE[:mode_8bit_byte] then 8
+        when QRMODE[:mode_kanji] then 8
         else
           raise QRCodeRunTimeError, "mode: #{mode}"
         end
@@ -149,10 +149,10 @@ def QRUtil.get_length_in_bits( mode, type )
 
         # 10 -26
         case mode
-        when QRMODE[:mode_number] :  12
-        when QRMODE[:mode_alpha_num] : 11
-        when QRMODE[:mode_8bit_byte] : 16
-        when QRMODE[:mode_kanji] : 10
+        when QRMODE[:mode_number] then  12
+        when QRMODE[:mode_alpha_num] then 11
+        when QRMODE[:mode_8bit_byte] then 16
+        when QRMODE[:mode_kanji] then 10
         else
           raise QRCodeRunTimeError, "mode: #{mode}"
         end
@@ -161,10 +161,10 @@ def QRUtil.get_length_in_bits( mode, type )
 
         # 27 - 40
         case mode
-        when QRMODE[:mode_number] :  14
-        when QRMODE[:mode_alpha_num] : 13
-        when QRMODE[:mode_8bit_byte] : 16
-        when QRMODE[:mode_kanji] : 12
+        when QRMODE[:mode_number] then  14
+        when QRMODE[:mode_alpha_num] then 13
+        when QRMODE[:mode_8bit_byte] then 16
+        when QRMODE[:mode_kanji] then 12
         else
           raise QRCodeRunTimeError, "mode: #{mode}"
         end