rqrcode 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 46c6e005cfad5a06130d1057cb3339a9536876d7
-  data.tar.gz: 43052e7598d0ca24b55ccdac80c112d110d6023f
+  metadata.gz: 1e8b487f591272b08e4fc7379f8ff16a7819459e
+  data.tar.gz: 5fc8e96a42d136b0cd76941d8a77316d207208e9
 SHA512:
-  metadata.gz: 4da648696490c9dea757030a8f1a33ec731532704bca8707dac941729791bb1f4c7d68a39dc83bbeab0df39becc719b3b70b383c1ae88a4600ec7a6742f36a10
-  data.tar.gz: ed6067dc3533be6f1ebdbd3eea7e34a4caca62d868a469ad09f7dbb963a72c13c1dc75ab3f29385f27317e9601a7e0e156d91cc95c9c757fe9719f7a595003fc
+  metadata.gz: e2c4d056dc95bca8bb1a268567a0f19a3d48eaaa96d6888874ee4abde3d85db7d6ae3197e840e2085651fb0ebd8ded890421174816a75d12052a29b41bfb3895
+  data.tar.gz: b435943576d8a4c458e7392f0d7a69ed27a7ec3a05bc449523f2141b87e5f8c03e2fca35ce8ba64887787667d65c854655e2ec8449b1e2565daa40a1ad6f94a5

data/CHANGELOG

@@ -1,3 +1,13 @@
+*0.9.0* (Jan 3, 2016)
+
+- Added support for auto selecting qrcode size up to level 40. (only worked up to level 10 before)
+- Added numeric support during auto selection of qrcode mode.
+
+*0.8.1* (Jan 3, 2016)
+
+- Remove active support specific `present?`.
+- Fix so that all tests are run.
+
 *0.8.0* (Dec 18, 2015)
 
 - Added numeric QR code support

data/README.md

@@ -2,26 +2,24 @@
 
 [![Build Status](https://travis-ci.org/whomwah/rqrcode.svg?branch=master)](https://travis-ci.org/whomwah/rqrcode)
 
-## Short changelog
-
-*0.8.0* (Dec 18, 2015)
+**All users of rqrcode are highly recomended to upgrade to version 0.5.5 ore later!**
 
-- Added numeric QR code support
-- Dropped Ruby v1.8 support
+## Short changelog
 
-*0.7.0* (Aug 15, 2015)
+*0.9.0* (Jan 3, 2016)
 
-- Added shape_rendering option for as_svg
+- Added support for auto selecting qrcode size up to level 40. (only worked up to level 10 before)
+- Added numeric support during auto selection of qrcode mode.
 
-*0.6.0* (Jun 2, 2015)
+*0.8.1* (Jan 3, 2016)
 
-- Improved png rendering. Previous png rendering could result in hard to scan qrcodes.
-  *Big thanks to Bart Jedrocha*
+- Remove active support specific `present?`.
+- Fix so that all tests are run.
 
-*0.5.5* (Apr 25, 2015)
+*0.8.0* (Dec 18, 2015)
 
-- Fixed major bug. The rs block data was missing resulting in qr codes failing to be generated.
-  *Upgrade highly recomended!!*
+- Added numeric QR code support
+- Dropped Ruby v1.8 support
 
 ## Overview
 
@@ -29,7 +27,7 @@ rQRCode is a library for encoding QR Codes in Ruby. It has a simple interface wi
 
 Let's clear up some rQRCode stuff.
 
-* rQRCode is a __standalone library__ It requires no other libraries. Just Ruby!
+* rQRCode is a __ruby only library__ It requires no native libraries. Just Ruby!
 * It is an encoding library. You can't decode QR codes with it.
 * 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

data/Rakefile

@@ -3,11 +3,11 @@ require 'bundler'
 
 Bundler::GemHelper.install_tasks
 
-desc "Run tests"
+desc 'Run tests'
 Rake::TestTask.new do |t|
-  t.libs << "lib"
-  t.libs << "test"
-  t.test_files = FileList['test/test_*.rb']
+  t.libs << 'lib'
+  t.libs << 'test'
+  t.pattern = 'test/**/test_*.rb'
   t.verbose = true
 end
 

data/lib/rqrcode/qrcode/qr_code.rb

@@ -15,7 +15,6 @@ module RQRCode #:nodoc:
     :mode_number        => 1 << 0,
     :mode_alpha_numk    => 1 << 1,
     :mode_8bit_byte     => 1 << 2,
-    :mode_kanji         => 1 << 3
   }
 
   QRMODE_NAME = {
@@ -59,23 +58,92 @@ module RQRCode #:nodoc:
   QRFORMATINFOLENGTH = 15
 
   #http://web.archive.org/web/20110710094955/http://www.denso-wave.com/qrcode/vertable1-e.html
+  #http://web.archive.org/web/20110710094955/http://www.denso-wave.com/qrcode/vertable2-e.html
+  #http://web.archive.org/web/20110710094955/http://www.denso-wave.com/qrcode/vertable3-e.html
+  #http://web.archive.org/web/20110710094955/http://www.denso-wave.com/qrcode/vertable4-e.html
+  # Each array contains levels max chars from level 1 to level 40
   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]},
+      l: {
+          mode_number: [
+              41, 77, 127, 187, 255, 322, 370, 461, 552, 652, 772,
+              883, 1022, 1101, 1250, 1408, 1548, 1725, 1903, 2061,
+              2232, 2409, 2620, 2812, 3057, 3283, 3514, 3669, 3909, 4158,
+              4417, 4686, 4965, 5253, 5529, 5836, 6153, 6479, 6743, 7089
+          ],
+          mode_alpha_numk: [
+              25, 47, 77, 114, 154, 195, 224, 279, 335, 395,
+              468, 535, 619, 667, 758, 854, 938, 1046, 1153, 1249,
+              1352, 1460, 1588, 1704, 1853, 1990, 2132, 2223, 2369, 2520,
+              2677, 2840, 3009, 3183, 3351, 3537, 3729, 3927, 4087, 4296
+          ],
+          mode_8bit_byte: [
+              17, 32, 53, 78, 106, 134, 154, 192, 230, 271,
+              321, 367, 425, 458, 520, 586, 644, 718, 792, 858,
+              929, 1003, 1091, 1171, 1273, 1367, 1465, 1528, 1628, 1732,
+              1840, 1952, 2068, 2188, 2303, 2431, 2563, 2699, 2809, 2953
+          ],
+      },
+      m: {
+          mode_number: [
+              34, 63, 101, 149, 202, 255, 293, 365, 432, 513,
+              604, 691, 796, 871, 991, 1082, 1212, 1346, 1500, 1600,
+              1708, 1872, 2059, 2188, 2395, 2544, 2701, 2857, 3035, 3289,
+              3486, 3693, 3909, 4134, 4343, 4588, 4775, 5039, 5313, 5596,
+          ],
+          mode_alpha_numk: [
+              20, 38, 61, 90, 122, 154, 178, 221, 262, 311,
+              366, 419, 483, 528, 600, 656, 734, 816, 909, 970,
+              1035, 1134, 1248, 1326, 1451, 1542, 1637, 1732, 1839, 1994,
+              2113, 2238, 2369, 2506, 2632, 2780, 2894, 3054, 3220, 3391
+          ],
+          mode_8bit_byte: [
+              14, 26, 42, 62, 84, 106, 122, 152, 180, 213,
+              251, 287, 331, 362, 412, 450, 504, 560, 624, 666,
+              711, 779, 857, 911, 997, 1059, 1125, 1190, 1264, 1370,
+              1452, 1538, 1628, 1722, 1809, 1911, 1989, 2099, 2213, 2331
+          ],
+      },
+      q: {
+          mode_number: [
+              27, 48, 77, 111, 144, 178, 207, 259, 312, 364,
+              427, 489, 580, 621, 703, 775, 876, 948, 1063, 1159,
+              1224, 1358, 1468, 1588, 1718, 1804, 1933, 2085, 2181, 2358,
+              2473, 2670, 2805, 2949, 3081, 3244, 3417, 3599, 3791, 3993
+          ],
+          mode_alpha_numk: [
+              16, 29, 47, 67, 87, 108, 125, 157, 189, 221,
+              259, 296, 352, 376, 426, 470, 531, 574, 644, 702,
+              742, 823, 890, 963, 1041, 1094, 1172, 1263, 1322, 1429,
+              1499, 1618, 1700, 1787, 1867, 1966, 2071, 2181, 2298, 2420
+          ],
+          mode_8bit_byte: [
+              11, 20, 32, 46, 60, 74, 86, 108, 130, 151,
+              177, 203, 241, 258, 292, 22, 364, 394, 442, 482,
+              509, 565, 611, 661, 715, 751, 805, 868, 908, 982,
+              1030, 1112, 1168, 1228, 1283, 1351, 1423, 1499, 1579, 1663
+          ],
+      },
+      h: {
+          mode_number: [
+              17, 34, 58, 82, 106, 139, 154, 202, 235, 288, 331, 374, 427, 468, 530, 602, 674,
+              331, 374, 427, 468, 530, 602, 674, 746, 813, 919,
+              969, 1056, 1108, 1228, 1286, 1425, 1501, 1581, 1677, 1782,
+              1897, 2022, 2157, 2301, 2361, 2524, 2625, 2735, 2927, 3057
+
+          ],
+          mode_alpha_numk: [
+              10, 20, 35, 50, 64, 84, 93, 122, 143, 174, 200,
+              200, 227, 259, 283, 321, 365, 408, 452, 493, 557,
+              587, 640, 672, 744, 779, 864, 910, 958, 1016, 1080,
+              1150, 1226, 1307, 1394, 1431, 1530, 1591, 1658, 1774, 1852
+          ],
+          mode_8bit_byte: [
+              7, 14, 24, 34, 44, 58, 64, 84, 98, 119,
+              137, 155, 177, 194, 220, 250, 280, 310, 338, 382,
+              403, 439, 461, 511, 535, 593, 625, 658, 698, 742,
+              790, 842, 898, 958, 983, 1051, 1093, 1139, 1219, 1273
+          ],
+      },
   }
 
 
@@ -94,7 +162,7 @@ module RQRCode #:nodoc:
   #
 
   class QRCode
-    attr_reader :modules, :module_count, :version, :error_correction_level
+    attr_reader :modules, :module_count, :version
 
     # Expects a string to be parsed in, other args are optional
     #
@@ -129,11 +197,19 @@ module RQRCode #:nodoc:
       @data                 = string
 
       mode                  = QRMODE_NAME[(options[:mode] || '').to_sym]
-      mode                  ||= QRAlphanumeric.valid_data?( @data ) ? :mode_alpha_numk : :mode_8bit_byte  # deprecate?
+      # If mode is not explicitely given choose mode according to data type
+      mode ||= case
+        when RQRCode::QRNumeric.valid_data?(@data)
+          QRMODE_NAME[:number]
+        when QRAlphanumeric.valid_data?(@data)
+          QRMODE_NAME[:alphanumeric]
+        else
+          QRMODE_NAME[:byte_8bit]
+      end
 
       max_size_array        = QRMAXDIGITS[level][mode]
       size                  = options[:size] || smallest_size_for(string, max_size_array)
-      
+
       if size > QRUtil.max_size
         raise QRCodeArgumentError, "Given size greater than maximum possible size of #{QRUtil.max_size}"
       end
@@ -205,14 +281,31 @@ module RQRCode #:nodoc:
         end
         rows << cols
       end
-      
+
       quiet_zone_size.times do
         rows.unshift(light * (rows.first.length / light.size))
         rows << light * (rows.first.length / light.size)
-      end 
+      end
       rows.join("\n")
     end
 
+    # Return a symbol for current error connection level
+    def error_correction_level
+      QRERRORCORRECTLEVEL.invert[@error_correct_level]
+    end
+
+    # Return a symbol in QRMODE.keys for current mode used
+    def mode
+      case @data_list
+      when QRNumeric
+        :mode_number
+      when QRAlphanumeric
+        :mode_alpha_numk
+      else
+        :mode_8bit_byte
+      end
+    end
+
     protected
 
     def make #:nodoc:

data/lib/rqrcode/qrcode/qr_numeric.rb

@@ -33,11 +33,11 @@ module RQRCode
         if i % 3 == 0
           chars = @data[i]
 
-          if @data[i + 1].present?
+          if @data[i + 1]
             chars << @data[i + 1]
           end
 
-          if @data[i + 2].present?
+          if @data[i + 2]
             chars << @data[i + 2]
           end
 

data/lib/rqrcode/version.rb

@@ -1,3 +1,3 @@
 module RQRCode
-  VERSION = "0.8.0"
+  VERSION = "0.9.0"
 end

data/test/test_helper.rb

@@ -0,0 +1,5 @@
+require 'rqrcode'
+
+require 'minitest/spec'
+require 'minitest/autorun'
+

data/test/test_regresions.rb

@@ -1,17 +1,6 @@
-# encoding: utf-8
-require "test/unit"
+require 'test_helper'
 
-# 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
+class RegresionTests < Minitest::Test
   
   # Rs block information was incomplete.
   def test_code_length_overflow_bug

data/test/test_rqrcode.rb

@@ -1,27 +1,16 @@
 # encoding: utf-8
-require "test/unit"
+require 'test_helper'
 
-# 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 QRCodeTest < Test::Unit::TestCase
+class QRCodeTest < Minitest::Test
   require_relative "data"
 
   def test_no_data_given
-    assert_raise(RQRCode::QRCodeArgumentError) {
+    assert_raises(RQRCode::QRCodeArgumentError) {
       RQRCode::QRCode.new( :size => 1, :level => :h )
       RQRCode::QRCode.new( :size => 1 )
       RQRCode::QRCode.new
     }
-    assert_raise(RQRCode::QRCodeRunTimeError) {
+    assert_raises(RQRCode::QRCodeRunTimeError) {
       qr = RQRCode::QRCode.new('duncan')
       qr.is_dark(0,999999)
     }
@@ -87,18 +76,36 @@ 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_auto_numeric
+    # When digit only automatically uses numeric mode, default ecc level is :h
+    digits = RQRCode::QRCode.new('1' * 17) # Version 1, numeric mode, ECC h
+    assert_equal 1, digits.version
+    assert_equal :mode_number, digits.mode
+    assert_equal :h, digits.error_correction_level
+    # When alpha automatically works
+    alpha = RQRCode::QRCode.new('X' * 10) # Version 1, alpha mode, ECC h
+    assert_equal 1, alpha.version
+    assert_equal :mode_alpha_numk, alpha.mode
+    assert_equal :h, alpha.error_correction_level
+    # Generic should use binary
+    binary = RQRCode::QRCode.new('x' * 7) # Version 1, 8bit mode, ECC h
+    assert_equal 1, binary.version
+    assert_equal :mode_8bit_byte, binary.mode
+    assert_equal :h, binary.error_correction_level
+  end
+
   def test_numeric_2_M
     data = '279042272585972554922067893753871413584876543211601021503002'
-    
+
     qr = RQRCode::QRCode.new(data, size: 2, level: :m, mode: :number)
     assert_equal "xxxxxxx   x x x   xxxxxxx\n", qr.to_s[0..25]
   end
@@ -108,13 +115,25 @@ class QRCodeTest < Test::Unit::TestCase
     assert RQRCode::QRCode.new("40952", :size => 1, :level => :h)
     assert RQRCode::QRCode.new("40932", :size => 1, :level => :h)
   end
-  
+
   def test_exceed_max_size
-    assert_raise RQRCode::QRCodeArgumentError do
+    assert_raises RQRCode::QRCodeArgumentError do
       RQRCode::QRCode.new( 'duncan', :size => 41 )
     end
   end
 
+  def test_error_correction_level
+    # attr_reader was wrong
+    assert_equal RQRCode::QRCode.new('a', level: :h).error_correction_level, :h
+  end
+
+  def test_version_table
+    # tables in RQRCode::QRCode::QRMAXDIGITS wasn't updated to support greater versions
+    assert_equal RQRCode::QRCode.new('1' * 289, level: :h, mode: :number).version, 11
+    assert_equal RQRCode::QRCode.new('A' * 175, level: :h, mode: :alphanumeric).version, 11
+    assert_equal RQRCode::QRCode.new('a' * 383, level: :h, mode: :byte_8bit).version, 21
+  end
+
   def test_levels
     assert RQRCode::QRCode.new("duncan", :level => :l)
     assert RQRCode::QRCode.new("duncan", :level => :m)
@@ -122,7 +141,7 @@ class QRCodeTest < Test::Unit::TestCase
     assert RQRCode::QRCode.new("duncan", :level => :h)
 
     %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) {
+      assert_raises(RQRCode::QRCodeArgumentError) {
         RQRCode::QRCode.new( "duncan", :level => ltr.to_sym )
       }
     end

data/test/test_rqrcode_export.rb

@@ -1,23 +1,6 @@
-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"
+require 'test_helper'
 
 describe :QRCodeExportTest do
-  # require_relative "data"
 
   [:svg, :png, :html].each do |ext|
     it "must respond_to #{ext}" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rqrcode
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Björn Blomqvist
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-18 00:00:00.000000000 Z
+date: 2016-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chunky_png
@@ -96,6 +96,7 @@ files:
 - lib/rqrcode/version.rb
 - rqrcode.gemspec
 - test/data.rb
+- test/test_helper.rb
 - test/test_regresions.rb
 - test/test_rqrcode.rb
 - test/test_rqrcode_export.rb
@@ -124,6 +125,7 @@ specification_version: 4
 summary: A library to encode QR Codes
 test_files:
 - test/data.rb
+- test/test_helper.rb
 - test/test_regresions.rb
 - test/test_rqrcode.rb
 - test/test_rqrcode_export.rb