rqrcode 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1275547d28967654aa0f1ba1a450c5daa31c582a
-  data.tar.gz: c6ae31e4cdea2370f20a147cbc6f41f6d7d2fdc6
+  metadata.gz: 46c6e005cfad5a06130d1057cb3339a9536876d7
+  data.tar.gz: 43052e7598d0ca24b55ccdac80c112d110d6023f
 SHA512:
-  metadata.gz: 916f34ba9af9afffbfd8ba55116fc130b32a3ffb89db779da2af89df0c167fe49138fd625a33f1f48d648729ae488742921b2dfa10f6349743ff9ac7d865f7e3
-  data.tar.gz: 6ebffce16883fcf0951c6bd601915e1335a709b216cfa2255e1c56b45e496e42b301724f117d81134f403a93960d743b7eb3676239584562622eec216a33226e
+  metadata.gz: 4da648696490c9dea757030a8f1a33ec731532704bca8707dac941729791bb1f4c7d68a39dc83bbeab0df39becc719b3b70b383c1ae88a4600ec7a6742f36a10
+  data.tar.gz: ed6067dc3533be6f1ebdbd3eea7e34a4caca62d868a469ad09f7dbb963a72c13c1dc75ab3f29385f27317e9601a7e0e156d91cc95c9c757fe9719f7a595003fc

data/.gitignore

@@ -1,3 +1,5 @@
 /pkg/
 .rvmrc
-Gemfile.lock
+Gemfile.lock
+*.sublime-project
+*.sublime-workspace

data/.travis.yml

@@ -1,9 +1,7 @@
 language: ruby
 rvm:
-  - 2.2.2
+  - 2.2.3
   - 2.1.6
   - 2.0.0
   - 1.9.3
-  - 1.8.7
-  - jruby-18mode
   - jruby-19mode

data/CHANGELOG

@@ -1,3 +1,8 @@
+*0.8.0* (Dec 18, 2015)
+
+- Added numeric QR code support
+- Dropped Ruby v1.8 support
+
 *0.7.0* (Aug 15, 2015)
 
 - Added shape_rendering option for as_svg

data/README.md

@@ -4,6 +4,11 @@
 
 ## Short changelog
 
+*0.8.0* (Dec 18, 2015)
+
+- Added numeric QR code support
+- Dropped Ruby v1.8 support
+
 *0.7.0* (Aug 15, 2015)
 
 - Added shape_rendering option for as_svg
@@ -76,9 +81,8 @@ png = qrcode.as_png(
           color: 'black',
           size: 120,
           border_modules: 4,
-          file: false,
           module_px_size: 6,
-          output_file: nil # path to write
+          file: nil # path to write
           )
 ```
 
@@ -141,6 +145,17 @@ qr.modules.each do |row|
 end
 ```
 
+## Specifying QR code mode
+
+Sometimes you may want to specify the QR code mode explicitly. 
+
+It is done via the `mode` option. Allowed values are: `number`, `alphanumeric` and `byte_8bit`.
+
+```ruby
+qr = RQRCode::QRCode.new( '1234567890', :size => 2, :level => :m, :mode => :number )
+```
+
+
 ## API Documentation
 
 [http://www.rubydoc.info/gems/rqrcode](http://www.rubydoc.info/gems/rqrcode)

data/TODO.md

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

data/lib/rqrcode/qrcode/qr_bit_buffer.rb

@@ -68,6 +68,13 @@ module RQRCode
       put(length, QRUtil.get_length_in_bits(QRMODE[:mode_alpha_numk], @version))
       
     end
+
+    def numeric_encoding_start(length)
+      
+      put( QRMODE[:mode_number], 4 )
+      put(length, QRUtil.get_length_in_bits(QRMODE[:mode_number], @version))
+      
+    end
     
     def pad_until(prefered_size)
       # Align on byte

data/lib/rqrcode/qrcode/qr_code.rb

@@ -18,6 +18,12 @@ module RQRCode #:nodoc:
     :mode_kanji         => 1 << 3
   }
 
+  QRMODE_NAME = {
+    :number        => :mode_number,
+    :alphanumeric  => :mode_alpha_numk,
+    :byte_8bit     => :mode_8bit_byte
+  }
+
   QRERRORCORRECTLEVEL = {
     :l => 1,
     :m => 0,
@@ -84,7 +90,7 @@ module RQRCode #:nodoc:
   # 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, :mode => :alphanumeric )
   #
 
   class QRCode
@@ -99,8 +105,13 @@ module RQRCode #:nodoc:
     #      * 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)
+    #   # mode   - the mode of the qrcode (defaults to alphanumeric or byte_8bit, depending on the input data):
+    #      * :number
+    #      * :alphanumeric
+    #      * :byte_8bit
+    #      * :kanji
     #
-    #   qr = RQRCode::QRCode.new('hello world', :size => 1, :level => :m )
+    #   qr = RQRCode::QRCode.new('hello world', :size => 1, :level => :m, :mode => :alphanumeric )
     #
 
     def initialize( string, *args )
@@ -117,7 +128,8 @@ module RQRCode #:nodoc:
 
       @data                 = string
 
-      mode                  = QRAlphanumeric.valid_data?( @data ) ? :mode_alpha_numk : :mode_8bit_byte
+      mode                  = QRMODE_NAME[(options[:mode] || '').to_sym]
+      mode                  ||= QRAlphanumeric.valid_data?( @data ) ? :mode_alpha_numk : :mode_8bit_byte  # deprecate?
 
       max_size_array        = QRMAXDIGITS[level][mode]
       size                  = options[:size] || smallest_size_for(string, max_size_array)
@@ -130,7 +142,16 @@ module RQRCode #:nodoc:
       @version              = size
       @module_count         = @version * 4 + QRPOSITIONPATTERNLENGTH
       @modules              = Array.new( @module_count )
-      @data_list            = (mode == :mode_alpha_numk) ? QRAlphanumeric.new( @data ) : QR8bitByte.new( @data )
+      @data_list            =
+        case mode
+        when :mode_number
+          QRNumeric.new( @data )
+        when :mode_alpha_numk
+          QRAlphanumeric.new( @data )
+        else
+          QR8bitByte.new( @data )
+        end
+
       @data_cache           = nil
       self.make
     end

data/lib/rqrcode/qrcode/qr_numeric.rb

@@ -0,0 +1,66 @@
+module RQRCode
+
+  NUMERIC = ['0','1','2','3','4','5','6','7','8','9'].freeze
+
+  class QRNumeric
+    attr_reader :mode
+
+    def initialize( data )
+      @mode = QRMODE[:mode_number]
+
+      raise QRCodeArgumentError, "Not a numeric string `#{data}`" unless QRNumeric.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 NUMERIC.index(s).nil?
+      end
+      true
+    end
+
+
+    def write( buffer)
+      buffer.numeric_encoding_start(get_length)
+
+      (@data.size).times do |i|
+        if i % 3 == 0
+          chars = @data[i]
+
+          if @data[i + 1].present?
+            chars << @data[i + 1]
+          end
+
+          if @data[i + 2].present?
+            chars << @data[i + 2]
+          end
+
+          bit_length = get_bit_length(chars.length)
+          buffer.put( get_code(chars), bit_length )
+        end
+      end
+    end
+
+    private
+
+    NUMBER_LENGTH = {
+      3 => 10,
+      2 => 7,
+      1 => 4
+    }.freeze
+
+    def get_bit_length(length)
+      NUMBER_LENGTH[length]
+    end
+
+    def get_code(chars)
+      chars.to_i
+    end
+  end
+end

data/lib/rqrcode/version.rb

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

data/rqrcode.gemspec

@@ -18,7 +18,7 @@ EOF
 
   s.required_rubygems_version = Gem::Requirement.new('>= 1.3.6')
   
-  s.add_dependency 'chunky_png'
+  s.add_dependency 'chunky_png', "~> 1.0"
 
   s.add_development_dependency "rake"
   s.add_development_dependency("bundler", ">= 1.0.0")

data/test/test_rqrcode.rb

@@ -96,6 +96,13 @@ class QRCodeTest < Test::Unit::TestCase
     assert_equal "xxxxxxx xxx   xxxxxxx\n", qr.to_s[0..21]
   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
+
   def test_rszf_error_not_thrown
     assert RQRCode::QRCode.new('2 1058 657682')
     assert RQRCode::QRCode.new("40952", :size => 1, :level => :h)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rqrcode
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Björn Blomqvist
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-15 00:00:00.000000000 Z
+date: 2015-12-18 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'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -89,6 +89,7 @@ files:
 - lib/rqrcode/qrcode/qr_bit_buffer.rb
 - lib/rqrcode/qrcode/qr_code.rb
 - lib/rqrcode/qrcode/qr_math.rb
+- lib/rqrcode/qrcode/qr_numeric.rb
 - lib/rqrcode/qrcode/qr_polynomial.rb
 - lib/rqrcode/qrcode/qr_rs_block.rb
 - lib/rqrcode/qrcode/qr_util.rb