rqrcode 0.3.2 → 0.3.3

data/CHANGELOG

@@ -1,3 +1,8 @@
+*0.3.3* (Feb 1st, 2011)
+
+* check to see if the level is valid
+* fix for 'rszf' bug by [Rob la Lau https://github.com/toretore]
+
 *0.3.2* (Mar 15th, 2009)
 
 * Ruby 1.9 fixes by [Tore Darell http://tore.darell.no] [Chris Mowforth http://blog.99th.st]

data/README

@@ -2,8 +2,6 @@
 
 rQRCode is a library for encoding QR Codes in Ruby. It has a simple interface with all the standard qrcode options. It was adapted from the Javascript library by Kazuhiko Arase.
 
-RubyForge Project Page  http://rubyforge.org/projects/rqrcode/
-
 == An Overview
 
 Let's clear up some rQRCode stuff.

data/lib/rqrcode/qrcode/qr_code.rb

@@ -69,18 +69,21 @@ module RQRCode #:nodoc:
     #   qr = RQRCode::QRCode.new('hello world', :size => 1, :level => :m ) 
     #
 
- 		def initialize( *args )
+    def initialize( *args )
       raise QRCodeArgumentError unless args.first.kind_of?( String )
 
       @data                 = args.shift
       options               = args.extract_options!
       level                 = options[:level] || :h 
+
+      raise QRCodeArgumentError unless %w(l m q h).include?(level.to_s) 
+
       @error_correct_level  = QRERRORCORRECTLEVEL[ level.to_sym ] 
       @type_number          = options[:size] || 4
       @module_count         = @type_number * 4 + 17
-      @modules              = nil
-      @data_cache           = nil
+      @modules              = Array.new( @module_count )
       @data_list            = QR8bitByte.new( @data )
+      @data_cache           = nil
 
       self.make
     end
@@ -149,7 +152,6 @@ module RQRCode #:nodoc:
 
 
     def make_impl( test, mask_pattern ) #:nodoc:
-      @modules = Array.new( @module_count )
 
       ( 0...@module_count ).each do |row|
         @modules[row] = Array.new( @module_count )
@@ -292,7 +294,7 @@ module RQRCode #:nodoc:
 
             if @modules[row][ col - c ].nil?
               dark = false
-              if byte_index < data.size
+              if byte_index < data.size && !data[byte_index].nil?
                 dark = (( (data[byte_index]).rszf( bit_index ) & 1) == 1 )
               end
               mask = QRUtil.get_mask( mask_pattern, row, col - c )

data/test/runtest.rb

@@ -72,7 +72,27 @@ class QRCodeTest < Test::Unit::TestCase
   def test_to_s
     qr = RQRCode::QRCode.new( 'duncan', :size => 1 )
     assert_equal qr.to_s[0..21], "xxxxxxx xx x  xxxxxxx\n"
-    assert_equal qr.to_s( :true => 'q', :false => 'n' )[0..21], "qqqqqqqnqqnqnnqqqqqqq\n"
+    assert_equal qr.to_s( :true => 'q', :false => 'n' )[0..21], 
+      "qqqqqqqnqqnqnnqqqqqqq\n"
     assert_equal qr.to_s( :true => '@' )[0..21], "@@@@@@@ @@ @  @@@@@@@\n"
   end
+
+  def test_rszf_error_not_thrown
+    assert RQRCode::QRCode.new('2 1058 657682')
+    assert RQRCode::QRCode.new("40952", :size => 1, :level => :h)
+    assert RQRCode::QRCode.new("40932", :size => 1, :level => :h)
+  end
+
+  def test_levels
+    assert RQRCode::QRCode.new("duncan", :level => :l)
+    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|
+        RQRCode::QRCode.new( "duncan", :level => ltr.to_sym )
+      end
+    }
+  end
+
 end

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rqrcode
 version: !ruby/object:Gem::Version 
-  version: 0.3.2
+  hash: 21
+  prerelease: 
+  segments: 
+  - 0
+  - 3
+  - 3
+  version: 0.3.3
 platform: ruby
 authors: 
 - Duncan Robertson
@@ -9,11 +15,15 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-15 00:00:00 +00:00
+date: 2011-02-01 00:00:00 +00:00
 default_executable: 
 dependencies: []
 
-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.
+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: []
 
@@ -24,16 +34,11 @@ extra_rdoc_files:
 - CHANGELOG
 - COPYING
 files: 
-- lib/rqrcode
-- lib/rqrcode/core_ext
-- lib/rqrcode/core_ext/array
 - lib/rqrcode/core_ext/array/behavior.rb
 - lib/rqrcode/core_ext/array.rb
-- lib/rqrcode/core_ext/integer
 - lib/rqrcode/core_ext/integer/bitwise.rb
 - lib/rqrcode/core_ext/integer.rb
 - lib/rqrcode/core_ext.rb
-- lib/rqrcode/qrcode
 - lib/rqrcode/qrcode/qr_8bit_byte.rb
 - lib/rqrcode/qrcode/qr_bit_buffer.rb
 - lib/rqrcode/qrcode/qr_code.rb
@@ -49,30 +54,38 @@ files:
 - CHANGELOG
 - COPYING
 has_rdoc: true
-homepage: http://rqrcode.rubyforge.org
+homepage: http://whomwah.github.com/rqrcode/
+licenses: []
+
 post_install_message: 
 rdoc_options: []
 
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: rqrcode
-rubygems_version: 1.3.1
+rubygems_version: 1.5.0
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: A library to encode QR Codes
 test_files: 
 - test/runtest.rb