rqrcode 0.4.2 → 0.6.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 7559f2004d53b9642306d26b1b95926564216889
+  data.tar.gz: df2bbd25ba80e1975f52dfc0bc354cfff547d17f
+SHA512:
+  metadata.gz: 814b04bb242a2ee751eafdeb102ef95d8cf53be4c9d71fc7577b1a225fd5fccd702ca19b4f641f0bb3ca150213a7c9e8635e3e9ddb2e3808c8355689465a1a4a
+  data.tar.gz: fdf2cbd54b99a59c1085707799718c84c3f8d28ad0a11754914fa9cece4ecfd4659e23af8faaa8830580296a5e2dece5b32e128461679f5735db865f4aec8e46

data/.gitignore

@@ -1 +1,3 @@
 /pkg/
+.rvmrc
+Gemfile.lock

data/.travis.yml

@@ -0,0 +1,9 @@
+language: ruby
+rvm:
+  - 2.2.0
+  - 2.1.0
+  - 2.0.0
+  - 1.9.3
+  - 1.8.7
+  - jruby-18mode
+  - jruby-19mode

data/CHANGELOG

@@ -1,3 +1,17 @@
+*0.6.0* (Jun 2, 2015)
+
+- Improved png rendering. Previous png rendering could result in hard to scan qrcodes.
+  *Big thanks to Bart Jedrocha*
+
+*0.5.5* (Apr 25, 2015)
+
+- Fixed major bug. The rs block data was missing resulting in qr codes failing to be generated.
+  *Upgrade highly recomended!!*
+
+*0.5.4* (Nov 11th, 2013)
+  
+* Added as_html, Big thanks to Jon Evans!
+
 *0.4.2* (Sep 1st, 2011)
 
 * Proper namespace CoreExtensions and only extend when needed [https://github.com/metaskills]

data/Gemfile

@@ -1,2 +1,9 @@
-source 'http://rubygems.org'
-gemspec
+source 'https://rubygems.org'
+
+gem "chunky_png", ~> "1.0"
+
+group :test, :development do
+  gem 'rake'
+  gem 'test-unit'
+  gem 'minitest'
+end

data/README.md

@@ -1,4 +1,18 @@
-# rQRCode, Encode QRCodes
+# rQRCode, Encode QRCodes 
+
+[![Build Status](https://travis-ci.org/whomwah/rqrcode.svg?branch=master)](https://travis-ci.org/whomwah/rqrcode)
+
+## Short changelog
+
+*0.6.0* (Jun 2, 2015)
+
+- Improved png rendering. Previous png rendering could result in hard to scan qrcodes.
+  *Big thanks to Bart Jedrocha*
+
+*0.5.5* (Apr 25, 2015)
+
+- Fixed major bug. The rs block data was missing resulting in qr codes failing to be generated.
+  *Upgrade highly recomended!!*
 
 ## Overview
 
@@ -19,11 +33,11 @@ Let's clear up some rQRCode stuff.
 
 ## Installing
 
-You may get the latest stable version from Rubygems. 
+You may get the latest stable version from Rubygems.
 
     gem install rqrcode
 
-You can also get the latest source from http://github.com/whomwah/rqrcode
+You can also get the latest source from https://github.com/whomwah/rqrcode
 
     git clone git://github.com/whomwah/rqrcode.git
 
@@ -32,7 +46,7 @@ You can also get the latest source from http://github.com/whomwah/rqrcode
 To run the tests:
 
     $ rake
- 
+
 ## Loading rQRCode Itself
 
 You have installed the gem already, yeah?
@@ -54,12 +68,12 @@ puts qr.to_s
 ```
 
 ## Simple QRCode generation to template (RubyOnRails)
-
-```erb
-# Controller
+### Controller
+```ruby
 @qr = RQRCode::QRCode.new( 'my string to generate', :size => 4, :level => :h )
-
-# View: (minimal styling added)
+```
+### View: (minimal styling added)
+```erb
 <style type="text/css">
 table {
   border-width: 0;
@@ -68,22 +82,28 @@ table {
   border-collapse: collapse;
 }
 td {
-  border-width: 0; 
+  border-width: 0;
   border-style: none;
-  border-color: #0000ff; 
-  border-collapse: collapse; 
-  padding: 0; 
-  margin: 0; 
-  width: 10px; 
-  height: 10px; 
+  border-color: #0000ff;
+  border-collapse: collapse;
+  padding: 0;
+  margin: 0;
+  width: 10px;
+  height: 10px;
 }
 td.black { background-color: #000; }
 td.white { background-color: #fff; }
 </style>
 
+<%= raw @qr.as_html %>
+```
+
+If you want to generate the HTML manually for customization, you can start with the following:
+
+```erb
 <table>
 <% @qr.modules.each_index do |x| %>
-  <tr>  
+  <tr>
   <% @qr.modules.each_index do |y| %>
    <% if @qr.dark?(x,y) %>
     <td class="black"/>
@@ -96,17 +116,50 @@ td.white { background-color: #fff; }
 </table>
 ```
 
+## Exporting
+
+You can also require optional export features:
+
+* SVG -> no dependencies
+* PNG -> depends on 'chunky_png' gem
+* JPG -> depends on 'mini_magick' gem
+
+Example to render png:
+
+```ruby
+require 'rqrcode/export/png'
+image = RQRCode::QRCode.new("nice qr").as_png
+```
+
+Notice the 'as\_png'. Same goes for 'as\_svg', 'as\_xxx'.
+
+### Export Options
+
+Exporters support these options:
+
+* size  - Image size, in pixels.
+* fill  - Background color, defaults to 'white'
+* color - Foreground color, defaults to 'black'
+
+SVG Export supports the parameter `module_size` to generate smaller or larger QR Codes
+
+```ruby
+require 'rqrcode/export/svg'
+svg = RQRCode::QRCode.new("nice qr").as_svg(:module_size => 6)
+```
+
 ## Authors
 
 Original author: Duncan Robertson
 
 Special thanks to the following people for submitting patches:
 
-* [Gioele Barabucci](https://github.com/gioele) 
-* [Rob la Lau](https://github.com/ohreally)
 * [Chris Mowforth](http://blog.99th.st)
-* [Tore Darell](http://tore.darell.no)
 * [Daniel Schierbeck](https://github.com/dasch)
+* [Gioele Barabucci](https://github.com/gioele)
+* [Ken Collins](https://github.com/metaskills)
+* [Rob la Lau](https://github.com/ohreally)
+* [Tore Darell](http://tore.darell.no)
 * Vladislav Gorodetskiy
 
 ## Contributing
@@ -116,4 +169,4 @@ Special thanks to the following people for submitting patches:
 
 ## Copyright
 
-MIT Licence (http://www.opensource.org/licenses/mit-license.html)
+MIT License (http://www.opensource.org/licenses/mit-license.html)

data/TODO.md

@@ -0,0 +1,4 @@
+- Add Numeric mode
+- Add Kanji mode
+- Add ECI Mode
+- Improved performance for large QR codes

data/lib/rqrcode.rb

@@ -11,3 +11,6 @@
 
 require "rqrcode/core_ext"
 require "rqrcode/qrcode"
+require 'rqrcode/export/png'
+require 'rqrcode/export/svg'
+require 'rqrcode/export/html'

data/lib/rqrcode/export/html.rb

@@ -0,0 +1,53 @@
+# Use this module to HTML-ify the QR code if you just want the default HTML
+module RQRCode
+  module Export
+    module HTML
+
+      def as_html
+        ['<table>', rows.as_html, '</table>'].join
+      end
+
+      private
+
+      def rows
+        Rows.new(self)
+      end
+
+      class Rows < Struct.new(:qr)
+        def as_html
+          rows.map(&:as_html).join
+        end
+
+        def rows
+          qr.modules.each_with_index.map { |qr_module, row_index| Row.new(qr, qr_module, row_index) }
+        end
+      end
+
+      class Row < Struct.new(:qr, :qr_module, :row_index)
+        def as_html
+          ['<tr>', cells.map(&:as_html).join, '</tr>'].join
+        end
+
+        def cells
+          qr.modules.each_with_index.map { |qr_module, col_index| Cell.new(qr, col_index, row_index) }
+        end
+      end
+
+      class Cell < Struct.new(:qr, :col_index, :row_index)
+        def as_html
+          "<td class=\"#{html_class}\"></td>"
+        end
+
+        def html_class
+          dark? ? 'black' : 'white'
+        end
+
+        def dark?
+          qr.dark?(row_index, col_index)
+        end
+      end
+    end
+  end
+end
+
+RQRCode::QRCode.send :include, RQRCode::Export::HTML

data/lib/rqrcode/export/png.rb

@@ -0,0 +1,117 @@
+require 'chunky_png'
+
+# This class creates PNG files.
+# Code from: https://github.com/DCarper/rqrcode
+module RQRCode
+  module Export
+    module PNG
+
+      # Render the PNG from the Qrcode.
+      #
+      # There are two sizing algoritams.
+      #
+      # - Original that can result in blurry and hard to scan images
+      # - Google's Chart API inspired sizing that risizes the module size to fit within the given image size.
+      # 
+      # The Googleis one will be used when no options are given or when the new size option is used.
+      #
+      # Options: 
+      # fill  - Background ChunkyPNG::Color, defaults to 'white'
+      # color - Foreground ChunkyPNG::Color, defaults to 'black'
+      #
+      # *Googleis*    
+      # size            - Total size of PNG in pixels. The module size is calculated so it fits. (defaults to 90)
+      # border_modules  - Width of white border around in modules. (defaults to 4).
+      #
+      #  -- DONT USE border_modules OPTION UNLESS YOU KNOW ABOUT THE QUIET ZONE NEEDS OF QR CODES --
+      #
+      # *Original*
+      # module_px_size  - Image size, in pixels.
+      # border - Border thickness, in pixels
+      #
+      # It first creates an image where 1px = 1 module, then resizes.
+      # Defaults to 90x90 pixels, customizable by option.
+      #
+      def as_png(options = {})
+
+        default_img_options = {
+          :resize_gte_to => false,
+          :resize_exactly_to => false,
+          :fill => 'white',
+          :color => 'black',
+          :size => 120,
+          :border_modules => 4,
+          :file => false,
+          :module_px_size => 6
+        }
+        
+        googleis = options.length == 0 || (options[:size] != nil)
+        
+        options = default_img_options.merge(options) # reverse_merge
+
+        fill   = ChunkyPNG::Color(options[:fill])
+        color  = ChunkyPNG::Color(options[:color])
+        output_file = options[:file]
+        
+        module_px_size = nil
+        border_px = nil
+        png = nil
+        
+        if googleis
+          total_image_size = options[:size]
+          border_modules = options[:border_modules]
+
+          module_px_size = (total_image_size.to_f / (self.module_count + 2 * border_modules).to_f).floor.to_i
+
+          img_size = module_px_size * self.module_count
+
+          remaining = total_image_size - img_size
+          border_px = (remaining / 2.0).floor.to_i
+
+          png = ChunkyPNG::Image.new(total_image_size, total_image_size, fill)
+        else
+          border = options[:border_modules]
+          total_border = border * 2
+          module_px_size = if options[:resize_gte_to]
+            (options[:resize_gte_to].to_f / (self.module_count + total_border).to_f).ceil.to_i
+          else
+            options[:module_px_size]
+          end
+          border_px = border *  module_px_size
+          total_border_px = border_px * 2
+          resize_to = options[:resize_exactly_to]
+
+          img_size = module_px_size * self.module_count
+          total_img_size = img_size + total_border_px
+
+          png = ChunkyPNG::Image.new(total_img_size, total_img_size, fill)
+        end
+
+        self.modules.each_index do |x|
+          self.modules.each_index do |y|
+            if self.dark?(x, y)
+              (0...module_px_size).each do |i|
+                (0...module_px_size).each do |j|
+                  png[(y * module_px_size) + border_px + j , (x * module_px_size) + border_px + i] = color
+                end
+              end
+            end
+          end
+        end
+        
+        if !googleis && resize_to
+          png = png.resize(resize_to, resize_to)  
+        end
+
+
+        if output_file
+          png.save(output_file,{ :color_mode => ChunkyPNG::COLOR_GRAYSCALE, :bit_depth =>1})
+        end
+        png
+      end
+
+    end
+  end
+end
+
+RQRCode::QRCode.send :include, RQRCode::Export::PNG

data/lib/rqrcode/export/svg.rb

@@ -0,0 +1,49 @@
+# This class creates a SVG files.
+# Code from: https://github.com/samvincent/rqrcode-rails3
+module RQRCode
+  module Export
+
+    # Render the SVG from the Qrcode.
+    #
+    # Options:
+    # offset - Padding around the QR Code (e.g. 10)
+    # fill - Background color (e.g "ffffff" or :white)
+    # color - Foreground color for the code (e.g. "000000" or :black)
+    # module_size - The Pixel size of each module (e.g. 11)
+    module SVG
+      def as_svg(options={})
+        offset = options[:offset].to_i || 0
+        color = options[:color] || "000"
+        module_size = options[:module_size] || 11
+
+        # height and width dependent on offset and QR complexity
+        dimension = (self.module_count*module_size) + (2*offset)
+
+        xml_tag = %{<?xml version="1.0" standalone="yes"?>}
+        open_tag = %{<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events" width="#{dimension}" height="#{dimension}">}
+        close_tag = "</svg>"
+
+        result = []
+        self.modules.each_index do |c|
+          tmp = []
+          self.modules.each_index do |r|
+            y = c*module_size + offset
+            x = r*module_size + offset
+
+            next unless self.is_dark(c, r)
+            tmp << %{<rect width="#{module_size}" height="#{module_size}" x="#{x}" y="#{y}" style="fill:##{color}"/>}
+          end
+          result << tmp.join
+        end
+
+        if options[:fill]
+          result.unshift %{<rect width="#{dimension}" height="#{dimension}" x="0" y="0" style="fill:##{options[:fill]}"/>}
+        end
+
+        [xml_tag, open_tag, result, close_tag].flatten.join("\n")
+      end
+    end
+  end
+end
+
+RQRCode::QRCode.send :include, RQRCode::Export::SVG

data/lib/rqrcode/qrcode/qr_8bit_byte.rb

@@ -21,15 +21,14 @@ module RQRCode
 
 
     def get_length
-      @data.size
+      @data.bytesize
     end
 
 
-    def write( buffer )
-      ( 0...@data.size ).each do |i|
-        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 )
+    def write( buffer)
+      buffer.byte_encoding_start(get_length)
+      @data.each_byte do |b|
+        buffer.put(b, 8)
       end
     end
   end

data/lib/rqrcode/qrcode/qr_alphanumeric.rb

@@ -0,0 +1,47 @@
+module RQRCode
+
+  ALPHANUMERIC = ['0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z',' ','$','%','*','+','-','.','/',':']
+
+  class QRAlphanumeric
+    attr_reader :mode
+
+    def initialize( data )
+      @mode = QRMODE[:mode_alpha_numk]
+
+      raise QRCodeArgumentError, "Not a alpha numeric uppercase string `#{data}`" unless QRAlphanumeric.valid_data?(data)
+
+      @data = data;
+    end
+
+
+    def get_length
+      @data.size
+    end
+
+    def self.valid_data? data
+      data.each_char do |s|
+        return false if ALPHANUMERIC.index(s).nil?
+      end
+      true
+    end
+
+
+    def write( buffer)
+      buffer.alphanumeric_encoding_start(get_length)
+
+      (@data.size).times do |i|
+        if i % 2 == 0
+          if i == (@data.size - 1)
+            value = ALPHANUMERIC.index(@data[i])
+            buffer.put( value, 6 )
+          else
+            value = (ALPHANUMERIC.index(@data[i]) * 45) + ALPHANUMERIC.index(@data[i+1])
+            buffer.put( value, 11 )
+          end
+        end
+      end
+
+
+    end
+  end
+end

data/lib/rqrcode/qrcode/qr_bit_buffer.rb

@@ -14,7 +14,11 @@ module RQRCode
   class QRBitBuffer
     attr_reader :buffer
 
-    def initialize
+    PAD0 = 0xEC
+    PAD1 = 0x11
+
+    def initialize(version)
+      @version = version
       @buffer = []
       @length = 0
     end
@@ -50,6 +54,38 @@ module RQRCode
 
       @length += 1
     end 
+    
+    def byte_encoding_start(length)
+      
+      put( QRMODE[:mode_8bit_byte], 4 )
+      put(length, QRUtil.get_length_in_bits(QRMODE[:mode_8bit_byte], @version))
+      
+    end
+    
+    def alphanumeric_encoding_start(length)
+      
+      put( QRMODE[:mode_alpha_numk], 4 )
+      put(length, QRUtil.get_length_in_bits(QRMODE[:mode_alpha_numk], @version))
+      
+    end
+    
+    def pad_until(prefered_size)
+      # Align on byte
+      while get_length_in_bits % 8 != 0
+        put_bit( false )
+      end
+      
+      # Pad with padding code words
+      while get_length_in_bits < prefered_size
+        put( QRBitBuffer::PAD0, 8 )
+        put( QRBitBuffer::PAD1, 8 ) if get_length_in_bits < prefered_size
+      end
+    end
+    
+    def end_of_message(max_data_bits)
+      put( 0, 4 ) unless get_length_in_bits+4 > max_data_bits
+    end
+      
 
   end
 

data/lib/rqrcode/qrcode/qr_code.rb

@@ -47,9 +47,32 @@ module RQRCode #:nodoc:
         Proc.new { |i,j| ((i * j) % 3 + (i + j) % 2) % 2 == 0 },
   ]
 
+
+
   QRPOSITIONPATTERNLENGTH = (7 + 1) * 2 + 1
   QRFORMATINFOLENGTH = 15
 
+  #http://web.archive.org/web/20110710094955/http://www.denso-wave.com/qrcode/vertable1-e.html
+  QRMAXDIGITS = {
+    :l => {:mode_number     => [41, 77, 127, 187, 255, 322, 370, 461, 552, 652],
+           :mode_alpha_numk => [25, 47,  77, 114, 154, 195, 224, 279, 335, 395],
+           :mode_8bit_byte  => [17, 32,  53,  78, 106, 134, 154, 192, 230, 271, 321, 367, 425, 458, 520, 586, 644, 718, 792, 858],
+           :mode_kanji      => [10, 20,  32,  48,  65,  82,  95, 118, 141, 167]},
+    :m => {:mode_number     => [34, 63, 101, 149, 202, 255, 293, 365, 432, 513],
+           :mode_alpha_numk => [20, 38,  61,  90, 122, 154, 178, 221, 262, 311],
+           :mode_8bit_byte  => [14, 26,  42,  62,  84, 106, 122, 152, 180, 213, 251, 287, 331, 362, 412, 450, 504, 560, 624, 666],
+           :mode_kanji      => [ 8, 16,  26,  38,  54,  65,  75,  93, 111, 131]},
+    :q => {:mode_number     => [27, 48, 77, 111, 144, 178, 207, 259, 312, 364],
+           :mode_alpha_numk => [16, 29, 47,  67,  87, 108, 125, 157, 189, 221],
+           :mode_8bit_byte  => [11, 20, 32,  46,  60,  74,  86, 108, 130, 151, 177, 203, 241, 258, 292, 22, 364, 394, 442, 482],
+           :mode_kanji      => [ 7, 12, 20,  28,  37,  45,  53,  66,  80,  93]},
+    :h => {:mode_number     => [17, 34, 58, 82, 106, 139, 154, 202, 235, 288],
+           :mode_alpha_numk => [10, 20, 35, 50,  64,  84,  93, 122, 143, 174],
+           :mode_8bit_byte  => [ 7, 14, 24, 34,  44,  58,  64,  84,  98, 119, 137, 155, 177, 194, 220, 250, 280, 310, 338, 382],
+           :mode_kanji      => [ 4,  8, 15, 21,  27,  36,  39,  52,  60, 74]},
+  }
+
+
   # StandardErrors
 
   class QRCodeArgumentError < ArgumentError; end
@@ -58,29 +81,26 @@ module RQRCode #:nodoc:
   # == Creation
   #
   # QRCode objects expect only one required constructor parameter
-  # and an optional hash of any other. Here's a few examples: 
+  # and an optional hash of any other. Here's a few examples:
   #
   #  qr = RQRCode::QRCode.new('hello world')
-  #  qr = RQRCode::QRCode.new('hello world', :size => 1, :level => :m ) 
+  #  qr = RQRCode::QRCode.new('hello world', :size => 1, :level => :m )
   #
 
   class QRCode
-    attr_reader :modules, :module_count
-
-    PAD0 = 0xEC
-    PAD1 = 0x11  
+    attr_reader :modules, :module_count, :version, :error_correction_level
 
-    # Expects a string to be parsed in, other args are optional 
+    # Expects a string to be parsed in, other args are optional
     #
-    #   # string - the string you wish to encode 
+    #   # string - the string you wish to encode
     #   # 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) 
+    #      * Level :h 30% of code can be restored (default :h)
     #
-    #   qr = RQRCode::QRCode.new('hello world', :size => 1, :level => :m ) 
+    #   qr = RQRCode::QRCode.new('hello world', :size => 1, :level => :m )
     #
 
     def initialize( string, *args )
@@ -90,28 +110,32 @@ module RQRCode #:nodoc:
 
       options               = args.extract_options!
       level                 = (options[:level] || :h).to_sym
-      size                  = options[:size] || 4
 
       if !QRERRORCORRECTLEVEL.has_key?(level)
         raise QRCodeArgumentError, "Unknown error correction level `#{level.inspect}`"
       end
 
       @data                 = string
+
+      mode                  = QRAlphanumeric.valid_data?( @data ) ? :mode_alpha_numk : :mode_8bit_byte
+
+      max_size_array        = QRMAXDIGITS[level][mode]
+      size                  = options[:size] || smallest_size_for(string, max_size_array)
+
       @error_correct_level  = QRERRORCORRECTLEVEL[level]
       @version              = size
       @module_count         = @version * 4 + QRPOSITIONPATTERNLENGTH
       @modules              = Array.new( @module_count )
-      @data_list            = QR8bitByte.new( @data )
+      @data_list            = (mode == :mode_alpha_numk) ? QRAlphanumeric.new( @data ) : QR8bitByte.new( @data )
       @data_cache           = nil
-
       self.make
     end
 
     # <tt>is_dark</tt> is called with a +col+ and +row+ parameter. This will
-    # return true or false based on whether that coordinate exists in the 
+    # return true or false based on whether that coordinate exists in the
     # matrix returned. It would normally be called while iterating through
     # <tt>modules</tt>. A simple example would be:
-    #   
+    #
     #  instance.is_dark( 10, 10 ) => true
     #
 
@@ -144,8 +168,8 @@ module RQRCode #:nodoc:
 
     def to_s( *args )
       options                = args.extract_options!
-      row                    = options[:true] || 'x' 
-      col                    = options[:false] || ' ' 
+      row                    = options[:true] || 'x'
+      col                    = options[:false] || ' '
 
       res = []
 
@@ -153,11 +177,11 @@ module RQRCode #:nodoc:
         tmp = []
         @modules.each_index do |r|
           if is_dark(c,r)
-            tmp << row 
+            tmp << row
           else
-            tmp << col 
+            tmp << col
           end
-        end 
+        end
         res << tmp.join
      end
       res.join("\n")
@@ -191,9 +215,9 @@ module RQRCode #:nodoc:
       place_version_info(test) if @version >= 7
 
       if @data_cache.nil?
-        @data_cache = QRCode.create_data( 
+        @data_cache = QRCode.create_data(
           @version, @error_correct_level, @data_list
-        ) 
+        )
       end
 
       map_data( @data_cache, mask_pattern )
@@ -237,7 +261,7 @@ module RQRCode #:nodoc:
 
     def place_timing_pattern #:nodoc:
       ( 8...@module_count - 8 ).each do |i|
-        @modules[i][6] = @modules[6][i] = i % 2 == 0 
+        @modules[i][6] = @modules[6][i] = i % 2 == 0
       end
     end
 
@@ -254,7 +278,7 @@ module RQRCode #:nodoc:
               is_part_of_pattern = (r.abs == 2 || c.abs == 2 || ( r == 0 && c == 0 ))
               @modules[row + r][col + c] = is_part_of_pattern
             end
-          end  
+          end
         end
       end
     end
@@ -300,7 +324,7 @@ module RQRCode #:nodoc:
       end
 
       # fixed module
-      @modules[ @module_count - 8 ][8] = !test  
+      @modules[ @module_count - 8 ][8] = !test
     end
 
 
@@ -341,7 +365,14 @@ module RQRCode #:nodoc:
             break
           end
         end
-      end  
+      end
+    end
+
+    def smallest_size_for(string, max_size_array) #:nodoc:
+      l = string.bytesize
+      ver = max_size_array.index{|i| i >= l}
+      raise QRCodeRunTimeError,"code length overflow. (#{l} digits > any version capacity)" unless ver
+      ver + 1
     end
 
     def QRCode.count_max_data_bits(rs_blocks)
@@ -354,36 +385,17 @@ module RQRCode #:nodoc:
 
     def QRCode.create_data(version, error_correct_level, data_list) #:nodoc:
       rs_blocks = QRRSBlock.get_rs_blocks(version, error_correct_level)
-      buffer = QRBitBuffer.new
-
-      data = data_list
-      buffer.put( data.mode, 4 )
-      buffer.put( 
-        data.get_length, QRUtil.get_length_in_bits(data.mode, version)
-      )
-      data.write( buffer )  
-
       max_data_bits = QRCode.count_max_data_bits(rs_blocks)
+      buffer = QRBitBuffer.new(version)
 
-      if buffer.get_length_in_bits > max_data_bits
-        raise QRCodeRunTimeError, 
-          "code length overflow. (#{buffer.get_length_in_bits}>#{max_data_bits})"
-      end
+      data_list.write(buffer)
+      buffer.end_of_message(max_data_bits)
 
-      if buffer.get_length_in_bits + 4 <= max_data_bits
-        buffer.put( 0, 4 )
-      end
-
-      while buffer.get_length_in_bits % 8 != 0
-        buffer.put_bit( false )
+      if buffer.get_length_in_bits > max_data_bits
+        raise QRCodeRunTimeError, "code length overflow. (#{buffer.get_length_in_bits}>#{max_data_bits})"
       end
 
-      while true
-        break if buffer.get_length_in_bits >= max_data_bits
-        buffer.put( QRCode::PAD0, 8 )
-        break if buffer.get_length_in_bits >= max_data_bits
-        buffer.put( QRCode::PAD1, 8 )
-      end
+      buffer.pad_until(max_data_bits)
 
       QRCode.create_bytes( buffer, rs_blocks )
     end
@@ -433,7 +445,7 @@ module RQRCode #:nodoc:
           if i < dcdata[r].size
             data[index] = dcdata[r][i]
             index += 1
-          end  
+          end
         end
       end
 
@@ -442,12 +454,12 @@ module RQRCode #:nodoc:
           if i < ecdata[r].size
             data[index] = ecdata[r][i]
             index += 1
-          end  
+          end
         end
       end
 
       data
-    end 
+    end
 
   end
 

data/lib/rqrcode/qrcode/qr_rs_block.rb

@@ -19,6 +19,7 @@ module RQRCode #:nodoc:
       @data_count = data_count
     end
 
+# http://www.thonky.com/qr-code-tutorial/error-correction-table/
 RQRCode::QRRSBlock::RS_BLOCK_TABLE = [
 
       # L
@@ -114,7 +115,7 @@ RQRCode::QRRSBlock::RS_BLOCK_TABLE = [
       [5, 109, 87, 1, 110, 88],
       [5, 65, 41, 5, 66, 42],
       [5, 54, 24, 7, 55, 25],
-      [11, 36, 12],
+      [11, 36, 12, 7, 37, 13],
 
       # 16
       [5, 122, 98, 1, 123, 99],

data/lib/rqrcode/qrcode/qr_util.rb

@@ -68,7 +68,7 @@ module RQRCode #:nodoc:
 
     BITS_FOR_MODE = {
       QRMODE[:mode_number] => [10, 12, 14],
-      QRMODE[:mode_alpha_num] => [9, 11, 13],
+      QRMODE[:mode_alpha_numk] => [9, 11, 13],
       QRMODE[:mode_8bit_byte] => [8, 16, 16],
       QRMODE[:mode_kanji] => [8, 10, 12],
     }

data/lib/rqrcode/version.rb

@@ -1,3 +1,3 @@
 module RQRCode
-  VERSION = "0.4.2"
+  VERSION = "0.6.0"
 end

data/rqrcode.gemspec

@@ -6,23 +6,25 @@ Gem::Specification.new do |s|
   s.name        = "rqrcode"
   s.version     = RQRCode::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Duncan Robertson"]
-  s.email       = ["duncan@whomwah.com"]
-  s.homepage    = "http://whomwah.github.com/rqrcode/"
-  s.summary     = "A library to encode QR Codes" 
+  s.authors     = ["Björn Blomqvist","Duncan Robertson"]
+  s.email       = ["darwin@bits2life.com"]
+  s.homepage    = "https://github.com/whomwah/rqrcode"
+  s.summary     = "A library to encode QR Codes"
   s.description = <<EOF
 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. 
+interface allows you to create QR Code data structures
+ready to be displayed in the way you choose.
 EOF
-  
+
   s.required_rubygems_version = Gem::Requirement.new('>= 1.3.6')
+  
+  s.add_dependency 'chunky_png'
 
   s.add_development_dependency "rake"
   s.add_development_dependency("bundler", ">= 1.0.0")
 
   s.has_rdoc      = true
-  s.extra_rdoc_files = ["README.md", "CHANGELOG", "LICENSE"]  
+  s.extra_rdoc_files = ["README.md", "CHANGELOG", "LICENSE"]
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }

data/test/data.rb

@@ -19,3 +19,5 @@ MATRIX_4_L = [[true, true, true, true, true, true, true, false, true, true, true
 MATRIX_4_M = [[true, true, true, true, true, true, true, false, true, true, false, true, false, true, false, true, false, false, true, false, false, false, false, true, true, false, true, true, true, true, true, true, true], [true, false, false, false, false, false, true, false, false, true, false, false, true, true, true, false, true, false, true, true, false, false, false, false, false, false, true, false, false, false, false, false, true], [true, false, true, true, true, false, true, false, false, true, true, false, false, false, true, true, true, true, true, false, true, true, false, false, false, false, true, false, true, true, true, false, true], [true, false, true, true, true, false, true, false, true, true, true, false, false, false, false, false, true, true, false, true, false, true, true, false, false, false, true, false, true, true, true, false, true], [true, false, true, true, true, false, true, false, true, false, false, false, true, true, false, false, true, true, false, true, false, true, true, false, false, false, true, false, true, true, true, false, true], [true, false, false, false, false, false, true, false, true, true, false, false, true, true, true, true, false, false, false, false, true, true, true, true, true, false, true, false, false, false, false, false, true], [true, true, true, true, true, true, true, false, true, false, true, false, true, false, true, false, true, false, true, false, true, false, true, false, true, false, true, true, true, true, true, true, true], [false, false, false, false, false, false, false, false, true, false, true, false, false, false, false, false, false, true, true, true, true, true, false, false, true, false, false, false, false, false, false, false, false], [true, false, false, false, true, false, true, true, true, false, true, false, true, false, false, true, true, true, false, false, true, true, true, true, true, true, true, true, true, true, false, false, true], [true, true, false, true, false, false, false, true, false, true, true, false, true, false, true, true, false, true, true, false, false, true, true, true, false, true, false, false, false, true, true, true, true], [false, false, false, false, true, false, true, false, true, false, false, false, true, true, true, true, true, false, true, false, true, false, false, true, true, false, false, false, false, false, true, false, false], [true, false, true, true, true, true, false, true, true, false, true, true, true, true, false, true, true, false, false, false, false, false, true, true, true, true, false, true, true, false, false, true, true], [false, true, true, true, false, true, true, true, true, true, true, true, true, true, false, false, true, false, false, true, false, false, true, false, false, true, true, false, false, true, false, false, true], [true, false, true, true, false, true, false, true, true, false, false, false, true, true, true, false, false, false, true, true, true, false, false, false, true, false, true, true, true, true, false, false, false], [false, true, true, true, false, true, true, false, false, false, true, false, false, true, false, true, false, true, true, false, true, true, true, true, true, true, true, true, false, true, true, true, false], [true, true, false, false, true, false, false, false, false, false, true, true, true, true, false, true, true, true, true, false, false, true, true, true, false, false, true, false, false, false, true, true, true], [false, true, true, true, false, false, true, true, true, false, false, true, true, false, false, false, true, true, false, true, true, true, true, false, false, false, true, false, true, false, true, false, true], [false, false, true, true, true, false, false, true, true, true, true, true, true, true, true, true, false, false, false, false, false, false, true, true, false, true, false, true, false, true, true, false, false], [false, false, false, true, false, true, true, true, true, true, true, false, true, true, false, true, true, true, false, false, false, true, true, true, false, true, true, true, false, false, true, true, false], [true, true, false, true, false, false, false, true, false, true, false, false, true, true, true, true, true, true, true, true, false, true, false, false, true, false, true, true, true, true, false, false, false], [false, false, true, false, false, true, true, false, false, false, true, true, false, true, true, false, false, false, true, true, true, false, false, true, true, false, false, true, false, false, false, false, false], [true, true, true, true, false, false, false, false, true, true, true, true, true, false, true, false, true, false, false, true, false, false, true, false, false, true, true, false, false, false, true, false, false], [false, false, false, true, true, true, true, true, true, false, false, true, true, false, true, false, true, false, false, true, false, false, true, false, false, false, false, false, true, false, false, true, false], [false, false, false, false, false, true, false, false, false, true, true, true, false, false, true, false, false, true, true, true, true, true, true, false, true, true, true, true, true, true, false, true, false], [true, true, true, true, true, false, true, true, false, false, true, false, true, false, false, true, true, true, true, false, false, true, true, true, true, true, true, true, true, true, true, true, true], [false, false, false, false, false, false, false, false, true, true, false, false, false, true, false, true, false, true, true, false, false, true, false, false, true, false, false, false, true, true, false, true, false], [true, true, true, true, true, true, true, false, true, true, true, true, true, true, false, true, true, false, true, false, true, false, false, false, true, false, true, false, true, true, true, true, false], [true, false, false, false, false, false, true, false, false, false, true, true, true, false, false, false, true, false, false, true, true, false, true, true, true, false, false, false, true, false, false, false, true], [true, false, true, true, true, false, true, false, true, false, false, true, true, true, true, false, true, false, false, true, false, false, true, false, true, true, true, true, true, false, false, true, true], [true, false, true, true, true, false, true, false, false, false, true, true, true, true, true, false, false, true, true, true, true, true, false, true, false, false, true, false, true, true, false, true, false], [true, false, true, true, true, false, true, false, false, true, false, true, true, false, false, true, false, false, true, false, true, false, false, false, true, false, true, false, true, true, true, false, false], [true, false, false, false, false, false, true, false, false, true, true, false, false, false, false, true, true, true, true, false, false, true, false, false, false, false, false, true, false, false, true, false, false], [true, true, true, true, true, true, true, false, true, true, true, true, false, true, true, false, false, true, false, true, true, true, true, false, true, false, true, false, false, false, true, false, true]]
 
 MATRIX_4_Q = [[true, true, true, true, true, true, true, false, false, true, true, true, false, true, true, true, false, true, true, false, false, true, true, false, true, false, true, true, true, true, true, true, true], [true, false, false, false, false, false, true, false, true, false, false, true, false, false, false, true, true, false, true, true, false, false, false, false, false, false, true, false, false, false, false, false, true], [true, false, true, true, true, false, true, false, false, false, true, true, true, false, true, false, false, false, false, true, true, true, false, true, true, false, true, false, true, true, true, false, true], [true, false, true, true, true, false, true, false, true, false, false, false, true, true, true, false, true, false, true, true, true, false, true, true, true, false, true, false, true, true, true, false, true], [true, false, true, true, true, false, true, false, true, false, true, true, false, false, true, true, false, false, false, false, false, false, true, true, false, false, true, false, true, true, true, false, true], [true, false, false, false, false, false, true, false, false, true, true, false, true, true, false, true, false, true, false, true, false, true, false, false, true, false, true, false, false, false, false, false, true], [true, true, true, true, true, true, true, false, true, false, true, false, true, false, true, false, true, false, true, false, true, false, true, false, true, false, true, true, true, true, true, true, true], [false, false, false, false, false, false, false, false, true, true, false, true, true, true, true, false, false, false, false, false, false, false, true, true, false, false, false, false, false, false, false, false, false], [false, true, false, true, true, true, true, false, true, false, false, false, true, true, false, false, true, true, false, false, false, false, false, true, true, true, true, false, true, true, false, true, false], [false, false, false, true, true, true, false, false, true, true, false, false, true, false, false, true, false, true, true, true, false, true, false, true, false, false, false, false, true, true, true, false, false], [true, false, false, false, true, false, true, false, true, false, true, false, true, true, true, false, true, false, false, false, false, false, true, true, false, false, true, false, true, false, false, true, true], [false, false, false, true, true, false, false, false, false, true, false, false, true, false, true, false, false, false, true, false, false, true, true, true, false, false, true, false, true, false, true, true, true], [true, true, true, false, false, true, true, true, false, true, true, false, true, false, false, true, true, true, false, true, false, true, false, true, false, false, true, true, false, false, false, false, false], [true, false, false, false, true, false, false, false, true, false, false, true, true, false, false, true, false, false, true, true, true, false, false, false, true, true, false, true, false, false, true, false, false], [true, false, true, false, true, true, true, true, false, false, false, false, true, false, true, false, true, true, true, true, true, true, true, false, false, false, true, true, true, false, false, false, false], [true, false, true, true, false, false, false, false, false, true, true, true, true, false, false, false, true, false, false, false, true, false, true, false, true, false, false, false, true, false, true, true, false], [false, false, true, false, false, false, true, false, true, false, true, false, false, true, true, true, false, true, true, false, true, false, true, true, false, true, true, true, true, false, false, true, true], [true, true, false, false, true, false, false, true, false, true, true, false, false, true, false, true, false, true, false, true, true, false, false, false, false, false, true, true, true, false, true, false, true], [true, false, true, true, true, true, true, true, true, false, false, false, true, true, true, false, true, false, false, true, true, true, true, true, true, false, false, true, false, false, false, true, true], [true, false, false, false, true, true, false, false, true, true, false, true, false, false, false, true, true, true, true, false, true, false, true, true, false, true, true, false, false, false, true, false, false], [true, false, true, true, false, true, true, false, true, false, true, true, false, false, false, true, true, true, false, true, false, true, true, true, true, false, false, false, false, false, false, true, false], [true, false, true, false, true, true, false, false, false, true, false, false, false, true, false, false, true, false, true, false, false, false, false, false, false, true, false, false, true, false, true, true, false], [true, false, false, false, true, false, true, false, true, true, false, true, false, false, false, true, true, false, true, true, true, false, false, false, true, false, true, false, false, true, true, true, true], [true, false, false, false, false, false, false, false, true, false, false, false, false, true, true, false, false, true, true, true, true, false, true, false, false, true, true, false, false, true, true, true, false], [true, true, true, false, false, true, true, false, true, true, false, false, true, true, false, false, false, false, true, false, false, false, false, false, true, true, true, true, true, false, false, true, true], [false, false, false, false, false, false, false, false, true, true, false, false, true, false, true, true, true, false, false, false, false, true, false, false, true, false, false, false, true, true, false, false, false], [true, true, true, true, true, true, true, false, false, true, false, true, true, true, true, true, true, false, true, true, true, false, false, true, true, false, true, false, true, false, false, false, false], [true, false, false, false, false, false, true, false, true, true, false, true, true, true, false, false, true, false, false, true, false, true, true, false, true, false, false, false, true, true, true, true, true], [true, false, true, true, true, false, true, false, true, false, true, true, false, false, false, false, true, false, true, false, false, true, true, true, true, true, true, true, true, true, false, true, true], [true, false, true, true, true, false, true, false, true, true, false, false, true, true, true, false, true, false, true, false, false, true, true, false, false, true, false, false, false, true, true, false, true], [true, false, true, true, true, false, true, false, false, true, true, false, true, true, false, false, true, true, true, true, false, false, false, false, false, true, false, false, true, true, true, true, true], [true, false, false, false, false, false, true, false, true, true, false, false, true, false, false, true, false, true, false, true, true, false, true, false, true, false, true, false, true, false, true, true, true], [true, true, true, true, true, true, true, false, false, true, true, false, true, true, true, false, true, false, true, true, false, false, false, false, true, false, true, true, true, true, false, false, false]]
+
+MATRIX_UTF8_RU_test = [[true, true, true, true, true, true, true, false, true, false, true, true, true, true, true, false, false, false, true, true, true, true, true, true, true], [true, false, false, false, false, false, true, false, false, false, false, false, true, true, true, true, true, false, true, false, false, false, false, false, true], [true, false, true, true, true, false, true, false, true, false, false, true, false, true, true, true, true, false, true, false, true, true, true, false, true], [true, false, true, true, true, false, true, false, false, false, true, false, true, true, false, true, true, false, true, false, true, true, true, false, true], [true, false, true, true, true, false, true, false, true, false, false, true, true, true, false, true, false, false, true, false, true, true, true, false, true], [true, false, false, false, false, false, true, false, false, true, false, false, true, true, false, true, false, false, true, false, false, false, false, false, true], [true, true, true, true, true, true, true, false, true, false, true, false, true, false, true, false, true, false, true, true, true, true, true, true, true], [false, false, false, false, false, false, false, false, true, true, true, false, false, false, false, true, true, false, false, false, false, false, false, false, false], [false, false, false, false, false, true, true, false, false, false, true, false, true, true, false, true, false, false, true, false, true, false, true, false, true], [false, false, false, false, false, true, false, true, true, true, true, true, false, true, true, true, false, false, true, true, false, false, true, true, true], [false, true, true, false, true, true, true, false, false, false, false, false, false, true, false, false, false, false, true, false, true, true, false, true, false], [true, true, false, false, true, false, false, false, false, false, true, false, false, false, false, true, false, true, true, true, true, false, true, false, false], [false, false, false, false, false, false, true, true, false, false, false, false, true, true, false, false, false, true, true, true, true, false, false, true, true], [true, true, true, true, false, true, false, false, false, true, false, true, false, false, true, false, false, true, true, false, false, true, false, false, true], [true, false, false, true, true, false, true, true, true, false, false, true, true, true, false, true, true, true, false, false, true, false, false, false, false], [true, false, false, false, false, false, false, false, true, true, false, false, false, true, false, false, true, false, false, false, true, true, false, true, true], [true, false, true, true, true, true, true, true, false, false, true, false, false, true, true, true, true, true, true, true, true, false, false, false, true], [false, false, false, false, false, false, false, false, true, false, false, false, false, true, true, false, true, false, false, false, true, false, false, true, true], [true, true, true, true, true, true, true, false, false, true, true, true, false, true, false, true, true, false, true, false, true, false, true, false, false], [true, false, false, false, false, false, true, false, true, true, false, false, true, false, true, true, true, false, false, false, true, false, true, false, true], [true, false, true, true, true, false, true, false, false, true, false, true, true, false, false, false, true, true, true, true, true, true, false, false, false], [true, false, true, true, true, false, true, false, false, true, true, true, true, true, false, false, false, true, false, false, true, false, true, false, true], [true, false, true, true, true, false, true, false, false, true, false, false, false, true, false, false, true, false, true, false, true, false, false, false, true], [true, false, false, false, false, false, true, false, false, true, false, false, false, false, true, true, false, false, true, true, false, true, true, false, true], [true, true, true, true, true, true, true, false, false, true, false, true, false, false, false, true, true, false, true, true, true, false, true, false, true]]

data/test/test_regresions.rb

@@ -0,0 +1,21 @@
+# encoding: utf-8
+require "test/unit"
+
+# fix for require_relative in < 1.9
+unless Kernel.respond_to?(:require_relative)
+  module Kernel
+    def require_relative(path)
+      require File.join(File.dirname(caller[0]), path.to_str)
+    end
+  end
+end
+
+require_relative "../lib/rqrcode"
+class RegresionTests < Test::Unit::TestCase
+  
+  # Rs block information was incomplete.
+  def test_code_length_overflow_bug
+    RQRCode::QRCode.new('s' * 220)
+    RQRCode::QRCode.new('s' * 195)  
+  end
+end

data/test/test_rqrcode.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "test/unit"
 
 # fix for require_relative in < 1.9
@@ -13,7 +14,7 @@ require_relative "../lib/rqrcode"
 
 class QRCodeTest < Test::Unit::TestCase
   require_relative "data"
- 
+
   def test_no_data_given
     assert_raise(RQRCode::QRCodeArgumentError) {
       RQRCode::QRCode.new( :size => 1, :level => :h )
@@ -65,13 +66,13 @@ class QRCodeTest < Test::Unit::TestCase
 
   def test_4_H_
     qr = RQRCode::QRCode.new('www.bbc.co.uk/programmes/b0090blw',
-      :level => :l )
+      :level => :l, :size => 4 )
     assert_equal qr.modules, MATRIX_4_L
     qr = RQRCode::QRCode.new('www.bbc.co.uk/programmes/b0090blw',
-      :level => :m )
+      :level => :m, :size => 4 )
     assert_equal qr.modules, MATRIX_4_M
     qr = RQRCode::QRCode.new('www.bbc.co.uk/programmes/b0090blw',
-      :level => :q )
+      :level => :q, :size => 4 )
     assert_equal qr.modules, MATRIX_4_Q
 
     qr = RQRCode::QRCode.new('www.bbc.co.uk/programmes/b0090blw')
@@ -86,6 +87,14 @@ class QRCodeTest < Test::Unit::TestCase
                  qr.to_s( :true => 'q', :false => 'n' )[0..21]
     assert_equal "@@@@@@@ @@ @  @@@@@@@\n", qr.to_s( :true => '@' )[0..21]
   end
+  
+  def test_auto_alphanumeric
+    # Overflowws without the alpha version
+    assert RQRCode::QRCode.new( '1234567890', :size => 1, :level => :h )
+    
+    qr = RQRCode::QRCode.new( 'DUNCAN', :size => 1, :level => :h )
+    assert_equal "xxxxxxx xxx   xxxxxxx\n", qr.to_s[0..21]
+  end
 
   def test_rszf_error_not_thrown
     assert RQRCode::QRCode.new('2 1058 657682')
@@ -98,11 +107,17 @@ class QRCodeTest < Test::Unit::TestCase
     assert RQRCode::QRCode.new("duncan", :level => :m)
     assert RQRCode::QRCode.new("duncan", :level => :q)
     assert RQRCode::QRCode.new("duncan", :level => :h)
-    assert_raise(RQRCode::QRCodeArgumentError) {
-      %w(a b c d e f g i j k n o p r s t u v w x y z).each do |ltr|
+
+    %w(a b c d e f g i j k n o p r s t u v w x y z).each do |ltr|
+      assert_raise(RQRCode::QRCodeArgumentError) {
         RQRCode::QRCode.new( "duncan", :level => ltr.to_sym )
-      end
-    }
+      }
+    end
+  end
+
+  def test_utf8
+    qr = RQRCode::QRCode.new('тест')
+    assert_equal qr.modules, MATRIX_UTF8_RU_test
   end
 
 end

data/test/test_rqrcode_export.rb

@@ -0,0 +1,40 @@
+require 'minitest/spec'
+require 'minitest/autorun'
+
+require 'rqrcode/export/png'
+require 'rqrcode/export/svg'
+require 'rqrcode/export/html'
+
+# fix for require_relative in < 1.9
+unless Kernel.respond_to?(:require_relative)
+  module Kernel
+    def require_relative(path)
+      require File.join(File.dirname(caller[0]), path.to_str)
+    end
+  end
+end
+
+require_relative "../lib/rqrcode"
+
+describe :QRCodeExportTest do
+  # require_relative "data"
+
+  [:svg, :png, :html].each do |ext|
+    it "must respond_to #{ext}" do
+      RQRCode::QRCode.new('x').must_respond_to :"as_#{ext}"
+    end
+  end
+
+  it "must export to png file" do
+    RQRCode::QRCode.new('png').as_png.must_be_instance_of ChunkyPNG::Image
+  end
+
+  it "must export to svg file" do
+    RQRCode::QRCode.new('svg').as_svg.must_match(/<\/svg>/)
+  end
+
+  it "must export to html" do
+    RQRCode::QRCode.new('html').as_html.must_match(/<table>.+<\/table>/)
+  end
+
+end

metadata

@@ -1,69 +1,91 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rqrcode
-version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.4.2
+version: !ruby/object:Gem::Version
+  version: 0.6.0
 platform: ruby
-authors: 
+authors:
+- Björn Blomqvist
 - Duncan Robertson
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-09-01 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: rake
+date: 2015-06-03 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: chunky_png
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: bundler
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
-  version_requirements: *id002
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 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
+  interface allows you to create QR Code data structures
+  ready to be displayed in the way you choose.
+email:
+- darwin@bits2life.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.md
 - CHANGELOG
 - LICENSE
-files: 
+files:
 - .gitignore
+- .travis.yml
 - CHANGELOG
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
+- TODO.md
 - lib/rqrcode.rb
 - lib/rqrcode/core_ext.rb
 - lib/rqrcode/core_ext/array.rb
 - lib/rqrcode/core_ext/array/behavior.rb
 - lib/rqrcode/core_ext/integer.rb
 - lib/rqrcode/core_ext/integer/bitwise.rb
+- lib/rqrcode/export/html.rb
+- lib/rqrcode/export/png.rb
+- lib/rqrcode/export/svg.rb
 - lib/rqrcode/qrcode.rb
 - lib/rqrcode/qrcode/qr_8bit_byte.rb
+- lib/rqrcode/qrcode/qr_alphanumeric.rb
 - lib/rqrcode/qrcode/qr_bit_buffer.rb
 - lib/rqrcode/qrcode/qr_code.rb
 - lib/rqrcode/qrcode/qr_math.rb
@@ -73,34 +95,34 @@ files:
 - lib/rqrcode/version.rb
 - rqrcode.gemspec
 - test/data.rb
+- test/test_regresions.rb
 - test/test_rqrcode.rb
-homepage: http://whomwah.github.com/rqrcode/
+- test/test_rqrcode_export.rb
+homepage: https://github.com/whomwah/rqrcode
 licenses: []
-
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.5
+rubygems_version: 2.1.11
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A library to encode QR Codes
-test_files: 
+test_files:
 - test/data.rb
+- test/test_regresions.rb
 - test/test_rqrcode.rb
+- test/test_rqrcode_export.rb