qrest 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa479ca4948c34f366ab8c290b4f89f2cca17d0cbe642b1104c010b0e0c83570
-  data.tar.gz: 724aa39b76303cc0c965e0f322aacb263a0d9ec2d7f18017c522509774fbfedb
+  metadata.gz: 2490fb27884f2ab7c5172782a898c7b20f4c77709a3c1846a8af68c6d6133cb3
+  data.tar.gz: b80229455a23a9176cd0c4f0b34c0cc56fd95c5e91303f881d08b8310ae2495d
 SHA512:
-  metadata.gz: 1ede4940c060aeaa5dfc861b204b1b340999b645943e5505a9e8d04a7962d759a92feb19f09258b7f3667b556e3dfa3531a6ce9fde71b5333e8fa619a8ac8a9a
-  data.tar.gz: 38b9da529c02d8b9631f996cbaabc79df840eacf82077d71afdf4ef3e3da20d8223b5badc0a3cf635ccf054cb36e2039e7a14a14583d66dc531e3620c6108c12
+  metadata.gz: e803f95b2ca0fbb93f21b5f00e750dca32672ee4fd7f658cac78feebf178b839984f6fcf4483bef180e5f89650b0472faa0b5e174e78da3cc8fbdbdd5c9ee18e
+  data.tar.gz: 3c41ee417fbd90787886ee4f492f8737f06f63c71d7b6f0333133c5675313dcbb9d7d6f8773dd47ae50528564ab14eb3abd79fd51ac341800c7f1715fa13cfe4

data/lib/qrest/demerits.rb

@@ -16,7 +16,8 @@ module QRest
     def total **weigths
       weigths.inject 0 do |sum,(k,v)|
         e = ([*(send k)].zip [*v]).inject 0 do |s,(r,f)| s += r*f end
-        sum += e.round
+        puts [k, v, e.class, e, e.round].inspect
+        sum + e.round
       end
     end
 
@@ -107,6 +108,7 @@ module QRest
 
 
     def dark_ratio
+      puts @fields.inspect
       dark = @fields.sum do |col| col.count true end
       all  = @fields.size*@fields.size
       (dark.to_f / all - 0.5).abs * 100

data/lib/qrest/modules.rb

@@ -12,6 +12,8 @@ module QRest
 
   class Modules
 
+    VERSIONS = 1..40
+
     POSITIONPATTERNLENGTH = (7 + 1) * 2 + 1
 
     ERRORCORRECTLEVEL = { l: 1, m: 0, q: 3, h: 2 }
@@ -38,7 +40,7 @@ module QRest
       proc { |i,j| ((i * j) % 3 + (i + j) % 2) % 2 },
     ]
 
-    attr_reader :version, :count, :fields, :demerits
+    attr_reader :version, :count, :fields
 
     class <<self
 
@@ -49,31 +51,30 @@ module QRest
         dark_ratio:  2,
       }
 
-      def create_best data, version, error_correct_level
-        demerits, pattern = nil, 0
+      def create_best data
+        demerits, pattern = nil, nil
         MASK_PATTERNS.length.times { |i|
-          test = new data, version, error_correct_level, true, i
-          d = test.demerits.total **WEIGHTS
-          demerits, pattern = d, i if not demerits or demerits > d
+          t = ModulesTest.new data, i
+          d = t.demerits.total **WEIGHTS
+          demerits, pattern = d, i if not pattern or demerits > d
         }
-        new data, version, error_correct_level, false, pattern
+        new data, pattern
       end
 
     end
 
-    def initialize data, version, ecl, test, mask_pattern
-      count = version * 4 + POSITIONPATTERNLENGTH
+    def initialize data, mask_pattern
+      count = data.version * 4 + POSITIONPATTERNLENGTH
       @fields = Array.new count do Array.new count end
       place_position_probe_pattern 0, 0
       place_position_probe_pattern @fields.size - 7, 0
       place_position_probe_pattern 0, @fields.size - 7
-      place_position_adjust_pattern version
+      place_position_adjust_pattern @fields.size
       place_timing_pattern
-      place_format_info test, (ERRORCORRECTLEVEL[ecl]<<3) | mask_pattern
-      place_version_info version, test if version >= 7
-      bs = BitStream.new data
+      place_format_info (ERRORCORRECTLEVEL[data.error_correct_level]<<3) | mask_pattern
+      place_version_info data.version
+      bs = BitStream.new data.data
       walk_fields mask_pattern do bs.get end
-      @demerits = Demerits.new @fields if test
     end
 
     def inspect
@@ -165,58 +166,47 @@ module QRest
       end
     end
 
-    PATTERN_POSITION_TABLE = [
-      [],
-      [6, 18],
-      [6, 22],
-      [6, 26],
-      [6, 30],
-      [6, 34],
-      [6, 22, 38],
-      [6, 24, 42],
-      [6, 26, 46],
-      [6, 28, 50],
-      [6, 30, 54],
-      [6, 32, 58],
-      [6, 34, 62],
-      [6, 26, 46, 66],
-      [6, 26, 48, 70],
-      [6, 26, 50, 74],
-      [6, 30, 54, 78],
-      [6, 30, 56, 82],
-      [6, 30, 58, 86],
-      [6, 34, 62, 90],
-      [6, 28, 50, 72, 94],
-      [6, 26, 50, 74, 98],
-      [6, 30, 54, 78, 102],
-      [6, 28, 54, 80, 106],
-      [6, 32, 58, 84, 110],
-      [6, 30, 58, 86, 114],
-      [6, 34, 62, 90, 118],
-      [6, 26, 50, 74, 98, 122],
-      [6, 30, 54, 78, 102, 126],
-      [6, 26, 52, 78, 104, 130],
-      [6, 30, 56, 82, 108, 134],
-      [6, 34, 60, 86, 112, 138],
-      [6, 30, 58, 86, 114, 142],
-      [6, 34, 62, 90, 118, 146],
-      [6, 30, 54, 78, 102, 126, 150],
-      [6, 24, 50, 76, 102, 128, 154],
-      [6, 28, 54, 80, 106, 132, 158],
-      [6, 32, 58, 84, 110, 136, 162],
-      [6, 26, 54, 82, 110, 138, 166],
-      [6, 30, 58, 86, 114, 142, 170]
-    ]
 
-    MAX_VERSION = PATTERN_POSITION_TABLE.size
+    @adjust_pattern = {}
+
+    class <<self
+
+      ADJUST_FIRST = 6
+      def adjust_pattern_pos size
+        @adjust_pattern[ size] ||= begin
+          s = size - ADJUST_FIRST*2 - 1
+          if s < ADJUST_FIRST*2 then
+            []
+          else
+            kat = (s-1)/28
+            ds = [ 0]
+            case kat
+            when 0 then             ds.push s
+            when 1 then h = s / 2 ; ds.push h, h
+            else
+              28.step 20, -2 do |h|
+                m = s - kat*h
+                if m > h - [kat,3].max*2 then
+                  ds.push m, *([ h] * kat)
+                  break
+                end
+              end
+            end
+            p = ADJUST_FIRST
+            ds.map { |e| p += e }
+          end
+        end
+      end
+
+    end
 
     R_22 = -2..2
 
-    def place_position_adjust_pattern version
-      positions = PATTERN_POSITION_TABLE[ version - 1]
+    def place_position_adjust_pattern size
+      ps = Modules.adjust_pattern_pos size
       rd = R_22.minmax
-      positions.each do |row|
-        positions.each do |col|
+      ps.each do |row|
+        ps.each do |col|
           next unless @fields[ row][ col].nil?
           R_22.each do |r|
             pr = row + r
@@ -231,39 +221,45 @@ module QRest
 
     def place_timing_pattern
       (8...@fields.size-8).each do |i|
+        next unless @fields[ i][ 6].nil?
         @fields[ i][ 6] = @fields[ 6][ i] = i.even?
       end
     end
 
-    def place_format_info test, ecl
+    def set_bit n
+      n.odd?
+    end
+
+    def place_format_info ecl
       bits = Bch.format_info ecl
       15.times do |i|
-        mod = !test && bits.odd?
+        m = set_bit bits
         r =
           case i
           when ...6 then 0
           when ...8 then 1
           else           @fields.size - 15
           end
-        @fields[ r+i][ 8] = mod
+        @fields[ r + i][ 8] = m
         c =
           case i
           when ...8 then @fields.size
           when ...9 then 16
           else           15
           end
-        @fields[ 8][ c - i - 1] = mod
+        @fields[ 8][ c - i - 1] = m
         bits >>= 1
       end
-      @fields[ @fields.size - 8][ 8] = !test
+      @fields[ @fields.size - 8][ 8] = set_bit 1
     end
 
-    def place_version_info version, test
+    def place_version_info version
+      return if version < 7
       bits = Bch.version version
       18.times do |i|
         id, im = i.divmod 3
         im += @fields.size - 8 - 3
-        @fields[ id][ im] = @fields[ im][ id] = !test && (bits & 1) == 1
+        @fields[ id][ im] = @fields[ im][ id] = set_bit bits
         bits >>= 1
       end
     end
@@ -297,5 +293,18 @@ module QRest
 
   end
 
+  class ModulesTest < Modules
+
+    attr_reader :demerits
+
+    def initialize data, mask_pattern
+      super
+      @demerits = Demerits.new @fields
+    end
+
+    def set_bit _ ; false ; end
+
+  end
+
 end
 

data/lib/qrest/rsblocks.rb

@@ -9,135 +9,143 @@ require "qrest/polynomial"
 
 module QRest
 
-  class RSBlocks
+  class RSData
 
-    class Block
+    attr_reader :version, :error_correct_level, :data
 
-      attr_reader :data_count, :total_count
+    def initialize version, error_correct_level, input
+      @version, @error_correct_level = version, error_correct_level
+      b = Blocks.new @version, @error_correct_level
+      @data = b.create_data input, version
+    end
+
+    class Blocks
 
-      def initialize total_count, data_count
-        @total_count, @data_count = total_count, data_count
+      class Block
+        attr_reader :data_count, :total_count
+        def initialize total_count, data_count
+          @total_count, @data_count = total_count, data_count
+        end
+        def error_count ; total_count - data_count ; end
       end
 
-      def error_count ; total_count - data_count ; end
+      def initialize version, error_correct_level
+        @list = self.class.blocks[ version][ error_correct_level].map { |num,total,data|
+          [ num, (Block.new total, data)]
+        }
+      end
 
-    end
+      def each    ; @list.each { |(n,b)| n.times { yield b } }     ; end
+      def sum sym ; @list.map  { |(n,b)| n * (b.send sym)    }.sum ; end
+      def max sym ; @list.map  { |(_,b)| (b.send sym)        }.max ; end
 
-    def initialize version, bs
-      @version = version
-      @list = bs.map { |num,total,data| [ num, (Block.new total, data)] }
-    end
-
-    def each    ; @list.each { |(n,b)| n.times { yield b } }     ; end
-    def sum sym ; @list.map  { |(n,b)| n * (b.send sym)    }.sum ; end
-    def max sym ; @list.map  { |(_,b)| (b.send sym)        }.max ; end
+      def create_data input, version
+        dcdata, ecdata = create_blocks input, version
+        data = []
+        (max :data_count).times do |j|
+          dcdata.each do |dc|
+            data.push dc[j] if j < dc.size
+          end
+        end
+        (max :error_count).times do |j|
+          ecdata.each do |ec|
+            data.push ec[j] if j < ec.size
+          end
+        end
+        data.length == (sum :total_count) or
+          raise Error, "Internal error. Please consider a report."
+        data
+      end
 
-    def create_data data
-      l = sum :data_count
-      b = BitBuffer.build l do |buf| data.write buf, @version end
-      create_bytes b
-    end
+      private
 
-    private
-
-    def create_bytes buffer
-      dcdata, ecdata = [], []
-      i = 0
-      each do |rs|
-        p = Polynomial.new buffer[ i, rs.data_count]
-        i += rs.data_count
-        dcdata.push p.num.dup
-        p.error_mod! rs.error_count
-        ecdata.push p.num
+      def build_buffer input, version
+        l = sum :data_count
+        BitBuffer.build l do |buf| input.write_to buf, version end
       end
-      data = []
-      (max :data_count).times do |j|
-        dcdata.each do |dc|
-          data.push dc[j] if j < dc.size
+
+      def create_blocks input, version
+        buffer = build_buffer input, version
+        dcdata, ecdata = [], []
+        i = 0
+        each do |rs|
+          p = Polynomial.new buffer[ i, rs.data_count]
+          i += rs.data_count
+          dcdata.push p.num.dup
+          p.error_mod! rs.error_count
+          ecdata.push p.num
         end
+        [ dcdata, ecdata]
       end
-      (max :error_count).times do |j|
-        ecdata.each do |ec|
-          data.push ec[j] if j < ec.size
-        end
+
+      class <<self
+        attr_reader :blocks
       end
-      data.length == (sum :total_count) or
-        raise Error, "Internal error. Please consider a report."
-      data
-    end
 
-    @blocks = Hash.new { |h,k|
-      v = nil
-      RS_BLOCK_TABLE.each_line { |l|
-        n, l = l.split nil, 2
-        if n.to_i == k then
-          v = {}
-          while l =~ /([a-z])\b([ 0-9,]+)/ do
-            n, b, l = $1, $2, $'
-            b.rstrip!
-            v[ n.to_sym] = (b.split /,/).map { |t| t.split.map { |i| i.to_i } }
+      @blocks = Hash.new { |h,k|
+        v = nil
+        RS_BLOCK_TABLE.each_line { |l|
+          n, l = l.split nil, 2
+          if n.to_i == k then
+            v = {}
+            while l =~ /([a-z])\b([ 0-9,]+)/ do
+              n, b, l = $1, $2, $'
+              b.rstrip!
+              v[ n.to_sym] = (b.split /,/).map { |t| t.split.map { |i| i.to_i } }
+            end
+            break
           end
-          break
-        end
+        }
+        v or raise ArgumentError, "No RS block for version #{k}"
+        h[k] = v
       }
-      h[k] = v
-    }
-
-    class <<self
 
-      private :new
-
-      def get version, error_correct_level
-        v = @blocks[version] or raise ArgumentError, "No RS block for version #{version}"
-        new version, v[error_correct_level]
-      end
+      # http://www.thonky.com/qr-code-tutorial/error-correction-table/
+      RS_BLOCK_TABLE = <<~EOT
+        1  l  1  26  19,             m  1 26 16,           q  1 26 13,           h  1 26  9,
+        2  l  1  44  34,             m  1 44 28,           q  1 44 22,           h  1 44 16,
+        3  l  1  70  55,             m  1 70 44,           q  2 35 17,           h  2 35 13,
+        4  l  1 100  80,             m  2 50 32,           q  2 50 24,           h  4 25  9,
+        5  l  1 134 108,             m  2 67 43,           q  2 33 15,  2 34 16, h  2 33 11,  2 34 12,
+        6  l  2  86  68,             m  4 43 27,           q  4 43 19,           h  4 43 15,
+        7  l  2  98  78,             m  4 49 31,           q  2 32 14,  4 33 15, h  4 39 13,  1 40 14,
+        8  l  2 121  97,             m  2 60 38,  2 61 39, q  4 40 18,  2 41 19, h  4 40 14,  2 41 15,
+        9  l  2 146 116,             m  3 58 36,  2 59 37, q  4 36 16,  4 37 17, h  4 36 12,  4 37 13,
+        10 l  2  86  68,  2  87  69, m  4 69 43,  1 70 44, q  6 43 19,  2 44 20, h  6 43 15,  2 44 16,
+        11 l  4 101  81,             m  1 80 50,  4 81 51, q  4 50 22,  4 51 23, h  3 36 12,  8 37 13,
+        12 l  2 116  92,  2 117  93, m  6 58 36,  2 59 37, q  4 46 20,  6 47 21, h  7 42 14,  4 43 15,
+        13 l  4 133 107,             m  8 59 37,  1 60 38, q  8 44 20,  4 45 21, h 12 33 11,  4 34 12,
+        14 l  3 145 115,  1 146 116, m  4 64 40,  5 65 41, q 11 36 16,  5 37 17, h 11 36 12,  5 37 13,
+        15 l  5 109  87,  1 110  88, m  5 65 41,  5 66 42, q  5 54 24,  7 55 25, h 11 36 12,  7 37 13,
+        16 l  5 122  98,  1 123  99, m  7 73 45,  3 74 46, q 15 43 19,  2 44 20, h  3 45 15, 13 46 16,
+        17 l  1 135 107,  5 136 108, m 10 74 46,  1 75 47, q  1 50 22, 15 51 23, h  2 42 14, 17 43 15,
+        18 l  5 150 120,  1 151 121, m  9 69 43,  4 70 44, q 17 50 22,  1 51 23, h  2 42 14, 19 43 15,
+        19 l  3 141 113,  4 142 114, m  3 70 44, 11 71 45, q 17 47 21,  4 48 22, h  9 39 13, 16 40 14,
+        20 l  3 135 107,  5 136 108, m  3 67 41, 13 68 42, q 15 54 24,  5 55 25, h 15 43 15, 10 44 16,
+        21 l  4 144 116,  4 145 117, m 17 68 42,           q 17 50 22,  6 51 23, h 19 46 16,  6 47 17,
+        22 l  2 139 111,  7 140 112, m 17 74 46,           q  7 54 24, 16 55 25, h 34 37 13,
+        23 l  4 151 121,  5 152 122, m  4 75 47, 14 76 48, q 11 54 24, 14 55 25, h 16 45 15, 14 46 16,
+        24 l  6 147 117,  4 148 118, m  6 73 45, 14 74 46, q 11 54 24, 16 55 25, h 30 46 16,  2 47 17,
+        25 l  8 132 106,  4 133 107, m  8 75 47, 13 76 48, q  7 54 24, 22 55 25, h 22 45 15, 13 46 16,
+        26 l 10 142 114,  2 143 115, m 19 74 46,  4 75 47, q 28 50 22,  6 51 23, h 33 46 16,  4 47 17,
+        27 l  8 152 122,  4 153 123, m 22 73 45,  3 74 46, q  8 53 23, 26 54 24, h 12 45 15, 28 46 16,
+        28 l  3 147 117, 10 148 118, m  3 73 45, 23 74 46, q  4 54 24, 31 55 25, h 11 45 15, 31 46 16,
+        29 l  7 146 116,  7 147 117, m 21 73 45,  7 74 46, q  1 53 23, 37 54 24, h 19 45 15, 26 46 16,
+        30 l  5 145 115, 10 146 116, m 19 75 47, 10 76 48, q 15 54 24, 25 55 25, h 23 45 15, 25 46 16,
+        31 l 13 145 115,  3 146 116, m  2 74 46, 29 75 47, q 42 54 24,  1 55 25, h 23 45 15, 28 46 16,
+        32 l 17 145 115,             m 10 74 46, 23 75 47, q 10 54 24, 35 55 25, h 19 45 15, 35 46 16,
+        33 l 17 145 115,  1 146 116, m 14 74 46, 21 75 47, q 29 54 24, 19 55 25, h 11 45 15, 46 46 16,
+        34 l 13 145 115,  6 146 116, m 14 74 46, 23 75 47, q 44 54 24,  7 55 25, h 59 46 16,  1 47 17,
+        35 l 12 151 121,  7 152 122, m 12 75 47, 26 76 48, q 39 54 24, 14 55 25, h 22 45 15, 41 46 16,
+        36 l  6 151 121, 14 152 122, m  6 75 47, 34 76 48, q 46 54 24, 10 55 25, h  2 45 15, 64 46 16,
+        37 l 17 152 122,  4 153 123, m 29 74 46, 14 75 47, q 49 54 24, 10 55 25, h 24 45 15, 46 46 16,
+        38 l  4 152 122, 18 153 123, m 13 74 46, 32 75 47, q 48 54 24, 14 55 25, h 42 45 15, 32 46 16,
+        39 l 20 147 117,  4 148 118, m 40 75 47,  7 76 48, q 43 54 24, 22 55 25, h 10 45 15, 67 46 16,
+        40 l 19 148 118,  6 149 119, m 18 75 47, 31 76 48, q 34 54 24, 34 55 25, h 20 45 15, 61 46 16,
+      EOT
 
     end
 
-    # http://www.thonky.com/qr-code-tutorial/error-correction-table/
-    RS_BLOCK_TABLE = <<~EOT
-      1  l  1  26  19,             m  1 26 16,           q  1 26 13,           h  1 26  9,
-      2  l  1  44  34,             m  1 44 28,           q  1 44 22,           h  1 44 16,
-      3  l  1  70  55,             m  1 70 44,           q  2 35 17,           h  2 35 13,
-      4  l  1 100  80,             m  2 50 32,           q  2 50 24,           h  4 25  9,
-      5  l  1 134 108,             m  2 67 43,           q  2 33 15,  2 34 16, h  2 33 11,  2 34 12,
-      6  l  2  86  68,             m  4 43 27,           q  4 43 19,           h  4 43 15,
-      7  l  2  98  78,             m  4 49 31,           q  2 32 14,  4 33 15, h  4 39 13,  1 40 14,
-      8  l  2 121  97,             m  2 60 38,  2 61 39, q  4 40 18,  2 41 19, h  4 40 14,  2 41 15,
-      9  l  2 146 116,             m  3 58 36,  2 59 37, q  4 36 16,  4 37 17, h  4 36 12,  4 37 13,
-      10 l  2  86  68,  2  87  69, m  4 69 43,  1 70 44, q  6 43 19,  2 44 20, h  6 43 15,  2 44 16,
-      11 l  4 101  81,             m  1 80 50,  4 81 51, q  4 50 22,  4 51 23, h  3 36 12,  8 37 13,
-      12 l  2 116  92,  2 117  93, m  6 58 36,  2 59 37, q  4 46 20,  6 47 21, h  7 42 14,  4 43 15,
-      13 l  4 133 107,             m  8 59 37,  1 60 38, q  8 44 20,  4 45 21, h 12 33 11,  4 34 12,
-      14 l  3 145 115,  1 146 116, m  4 64 40,  5 65 41, q 11 36 16,  5 37 17, h 11 36 12,  5 37 13,
-      15 l  5 109  87,  1 110  88, m  5 65 41,  5 66 42, q  5 54 24,  7 55 25, h 11 36 12,  7 37 13,
-      16 l  5 122  98,  1 123  99, m  7 73 45,  3 74 46, q 15 43 19,  2 44 20, h  3 45 15, 13 46 16,
-      17 l  1 135 107,  5 136 108, m 10 74 46,  1 75 47, q  1 50 22, 15 51 23, h  2 42 14, 17 43 15,
-      18 l  5 150 120,  1 151 121, m  9 69 43,  4 70 44, q 17 50 22,  1 51 23, h  2 42 14, 19 43 15,
-      19 l  3 141 113,  4 142 114, m  3 70 44, 11 71 45, q 17 47 21,  4 48 22, h  9 39 13, 16 40 14,
-      20 l  3 135 107,  5 136 108, m  3 67 41, 13 68 42, q 15 54 24,  5 55 25, h 15 43 15, 10 44 16,
-      21 l  4 144 116,  4 145 117, m 17 68 42,           q 17 50 22,  6 51 23, h 19 46 16,  6 47 17,
-      22 l  2 139 111,  7 140 112, m 17 74 46,           q  7 54 24, 16 55 25, h 34 37 13,
-      23 l  4 151 121,  5 152 122, m  4 75 47, 14 76 48, q 11 54 24, 14 55 25, h 16 45 15, 14 46 16,
-      24 l  6 147 117,  4 148 118, m  6 73 45, 14 74 46, q 11 54 24, 16 55 25, h 30 46 16,  2 47 17,
-      25 l  8 132 106,  4 133 107, m  8 75 47, 13 76 48, q  7 54 24, 22 55 25, h 22 45 15, 13 46 16,
-      26 l 10 142 114,  2 143 115, m 19 74 46,  4 75 47, q 28 50 22,  6 51 23, h 33 46 16,  4 47 17,
-      27 l  8 152 122,  4 153 123, m 22 73 45,  3 74 46, q  8 53 23, 26 54 24, h 12 45 15, 28 46 16,
-      28 l  3 147 117, 10 148 118, m  3 73 45, 23 74 46, q  4 54 24, 31 55 25, h 11 45 15, 31 46 16,
-      29 l  7 146 116,  7 147 117, m 21 73 45,  7 74 46, q  1 53 23, 37 54 24, h 19 45 15, 26 46 16,
-      30 l  5 145 115, 10 146 116, m 19 75 47, 10 76 48, q 15 54 24, 25 55 25, h 23 45 15, 25 46 16,
-      31 l 13 145 115,  3 146 116, m  2 74 46, 29 75 47, q 42 54 24,  1 55 25, h 23 45 15, 28 46 16,
-      32 l 17 145 115,             m 10 74 46, 23 75 47, q 10 54 24, 35 55 25, h 19 45 15, 35 46 16,
-      33 l 17 145 115,  1 146 116, m 14 74 46, 21 75 47, q 29 54 24, 19 55 25, h 11 45 15, 46 46 16,
-      34 l 13 145 115,  6 146 116, m 14 74 46, 23 75 47, q 44 54 24,  7 55 25, h 59 46 16,  1 47 17,
-      35 l 12 151 121,  7 152 122, m 12 75 47, 26 76 48, q 39 54 24, 14 55 25, h 22 45 15, 41 46 16,
-      36 l  6 151 121, 14 152 122, m  6 75 47, 34 76 48, q 46 54 24, 10 55 25, h  2 45 15, 64 46 16,
-      37 l 17 152 122,  4 153 123, m 29 74 46, 14 75 47, q 49 54 24, 10 55 25, h 24 45 15, 46 46 16,
-      38 l  4 152 122, 18 153 123, m 13 74 46, 32 75 47, q 48 54 24, 14 55 25, h 42 45 15, 32 46 16,
-      39 l 20 147 117,  4 148 118, m 40 75 47,  7 76 48, q 43 54 24, 22 55 25, h 10 45 15, 67 46 16,
-      40 l 19 148 118,  6 149 119, m 18 75 47, 31 76 48, q 34 54 24, 34 55 25, h 20 45 15, 61 46 16,
-    EOT
-
   end
 
 end

data/lib/qrest/segment.rb

@@ -13,8 +13,8 @@ module QRest
       @data = data
     end
 
-    def write buffer, version
-      buffer.put 1<<self.class::ID, 4
+    def write_to buffer, version
+      buffer.put self.class::ID, 4
       buffer.put @data.bytesize, (get_length_in_bits version)
     end
 
@@ -62,10 +62,13 @@ module QRest
             type or raise ArgumentError, "Not a valid segment type: #{mode}"
             type.new data
           else
+            r = nil
             @sub.each do |t|
-              break t.new data
-            rescue ArgumentError, NotImplementedError
+              r = t.new data
+              break
+            rescue ArgumentError, NotImplementedError, EncodingError
             end
+            r or raise "No appropriate segment type possible."
           end
         when Array then
           Multi.new data
@@ -94,8 +97,8 @@ module QRest
       }
     end
 
-    def write buffer, version
-      @segs.each { |s| s.write buffer, version }
+    def write_to buffer, version
+      @segs.each { |s| s.write_to buffer, version }
     end
 
     def size version
@@ -108,7 +111,7 @@ module QRest
   class Numeric < Segment
 
     NAME          = "number"
-    ID            = 0
+    ID            = 1
     BITS_FOR_MODE = [10, 12, 14]
 
     def initialize data
@@ -118,7 +121,7 @@ module QRest
 
     NUMBER_LENGTH = { 3 => 10, 2 => 7, 1 => 4 }
 
-    def write buffer, version
+    def write_to buffer, version
       super
       @data.scan /\d{1,3}/ do |chars|
         buffer.put chars.to_i, NUMBER_LENGTH[ chars.length]
@@ -132,7 +135,7 @@ module QRest
   class Alphanumeric < Segment
 
     NAME          = "alphanumeric"
-    ID            = 1
+    ID            = 2
     BITS_FOR_MODE = [ 9, 11, 13]
 
     ALPHANUMERIC, = [
@@ -146,7 +149,7 @@ module QRest
       super
     end
 
-    def write buffer, version
+    def write_to buffer, version
       super
       @data.scan /(.)(.)?/ do |c,d|
         val = ALPHANUMERIC[ c]
@@ -166,7 +169,7 @@ module QRest
   class Kanji < Segment
 
     NAME          = "kanji"
-    ID            = nil  # ???
+    ID            = 8
     BITS_FOR_MODE = [ 8, 10, 12]
 
     def initialize data
@@ -174,7 +177,7 @@ module QRest
       not_implemented
     end
 
-    def write buffer, version
+    def write_to buffer, version
       super
       not_implemented
     end
@@ -192,10 +195,20 @@ module QRest
   class Bytes < Segment
 
     NAME          = "8bit"
-    ID            = 2
+    ID            = 4
     BITS_FOR_MODE = [ 8, 16, 16]
 
-    def write buffer, version
+    @strict = false
+    class <<self
+      attr_accessor :strict
+    end
+
+    def initialize data
+      data = data.encode Encoding::ISO8859_1 if self.class.strict
+      super
+    end
+
+    def write_to buffer, version
       super
       @data.each_byte do |b|
         buffer.put b, 8

data/lib/qrest/version.rb

@@ -6,7 +6,7 @@
 module QRest
 
   NAME    = "qrest"
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 
 end
 

data/lib/qrest.rb

@@ -27,26 +27,24 @@ module QRest
       Modules::ERRORCORRECTLEVEL[error_correct_level] or
         raise ArgumentError, "Unknown error correction level: #{level}"
       if version then
-        version <= Modules::MAX_VERSION or
-          raise ArgumentError, "Requested version exceeds maximum of #{Modules::MAX_VERSION}"
+        Modules::VERSIONS.include? version or
+          raise ArgumentError, "Requested version not in #{Modules::VERSIONS}"
       else
         if max_version then
-          max_version <= Modules::MAX_VERSION or
-            raise ArgumentError, "Maximum posible version is #{Modules::MAX_VERSION}"
+          Modules::VERSIONS.include? max_version or
+            raise ArgumentError, "Maximum version mot in #{Modules::VERSIONS}"
         else
-          max_version = Modules::MAX_VERSION
+          max_version = Modules::VERSIONS.end
         end
         mb = Modules::MAXBITS[error_correct_level]
-        version = 0
-        begin
-          version += 1
-          version <= max_version or
-            raise Error, "Data length exceeds maximum capacity of version #{max_version}"
-        end until (input.size version) <= mb[version - 1]
+        version = Modules::VERSIONS.find { |v|
+          v <= max_version or
+            raise Error, "Data length exceeds requested maximum version of #{max_version}"
+            (input.size v) <= mb[ v - 1]
+        }
       end
-
-      data = (RSBlocks.get version, error_correct_level).create_data input
-      @modules = Modules.create_best data, version, error_correct_level
+      data = RSData.new version, error_correct_level, input
+      @modules = Modules.create_best data
     end
 
     def to_s dark: nil, light: nil, quiet_size: nil

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: qrest
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Bertram Scharpf
 bindir: bin
 cert_chain: []
-date: 2025-03-26 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies: []
 description: |
   A Ruby library that generates QR Codes
@@ -50,7 +50,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.6
+rubygems_version: 3.7.1
 specification_version: 4
 summary: Generate QR Codes
 test_files: []