rqrcode_core 1.2.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea3856aba6c1bc5602b3f7fa4126187fe26c47fdba56447b709871f96f432ff5
-  data.tar.gz: eab7166c0e00478bcdb12ab6a550a9a9b595401bf5f6c0271c6bac95b722564f
+  metadata.gz: 8ae36b5e8654fbcb84247c8c60287e33f2104efa558e5eef0cd085fed1e51394
+  data.tar.gz: 462b3b44d61bde0d1a9e50eb617a8bd06f61297450339399f6db6377c0b9f61e
 SHA512:
-  metadata.gz: b9d1977c291eaed204644f09d3900b2ea18bde93e1c242628bdf1c4cd30573c046328e3cdbfe294c6ae27370f5963cdfa8454f1f2e6af7bf185e32cd0fefe592
-  data.tar.gz: 56d9c31b3c056a47ffccc2848f43e0e44d3b3a984f0ef4c332505fae31dadda0ca6adac5ad0566443dbf46a86a2b81b419806cf71a9da6880d51eacd583cbb34
+  metadata.gz: ca381a1dab19720731900ee4610053959fce0d2ddaa5132df2bda496d7b1d3a183e4413343d3ca48cd64b383aba15516200557ea1ae4af1cbe947e66822623f7
+  data.tar.gz: 75f36956b5f61f6762be2cbdd63409fd3d7b9df243cab6b8d25c7e8e64241ad148d496a386e446637518a872f9e21ca563b9df1d51819140f99bb9767fbcfc57

data/CHANGELOG.md

@@ -7,6 +7,33 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+- Add comprehensive tests for QR code boundaries and encoding
+- Performance optimisations: 80-90% faster QR code generation across all sizes
+  - Optimised demerit calculation functions (`demerit_points_1_same_color`, `demerit_points_2_full_blocks`, `demerit_points_3_dangerous_patterns`)
+  - Eliminated nested Range objects and redundant array lookups in hot paths
+  - Pre-computed frequently accessed values to reduce calculation overhead
+  - Large QR codes (v20) now generate in ~85ms vs ~154ms previously
+- Memory optimisation: 70-76% reduction when using `RQRCODE_CORE_ARCH_BITS=32`
+  - Single large QR (v24): 8.53 MB → 2.92 MB
+  - Batch generation (100x v1): 37.91 MB → 9.10 MB
+  - Also provides 2-4% speed improvement due to better cache locality
+- Add comprehensive benchmarking infrastructure with memory and performance profiling tools
+
+## [2.0.1] - 2025-11-25
+
+- Update required_ruby_version to support >= rather than ~> ready for Ruby 4
+
+## [2.0.0] - 2025-04-24
+
+- Various README updates
+- Fix for issue #43
+- Fix for issue #42
+- Drop Ruby < 3 to keep up with dependency updates
+- Add option to use ENV `RQRCODE_CORE_ARCH_BITS` to override the bits value (32 or 64) used during the encoding process.
+  This has been shown to greatly reduce the memory usage but I can't prove it doesn't break anything for all people.
+  Use at your own risk.
+- Fixed the 'Do Your Own Rendering' example code to reflect the current interface.
+
 ## [1.2.0] - 2021-08-26
 
 - Added Multi Mode Support which allows for multi-segment encoding. Thanks to [@ssayer](https://github.com/ssayer)
@@ -29,7 +56,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Breaking Changes
 
-- Very niche but a breaking change never the less. The `to_s` method *no longer* accepts the `:true` and `:false` arguments, but prefers `:dark` and `:light`.
+- Very niche but a breaking change never the less. The `to_s` method _no longer_ accepts the `:true` and `:false` arguments, but prefers `:dark` and `:light`.
 
 ## [0.2.0] - 2020-12-26
 
@@ -37,7 +64,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - fix `required_ruby_version` for Ruby 3 support
 
-[unreleased]: https://github.com/whomwah/rqrcode_core/compare/v1.2.0...HEAD
+[unreleased]: https://github.com/whomwah/rqrcode_core/compare/v2.0.1...HEAD
+[2.0.1]: https://github.com/whomwah/rqrcode_core/compare/v2.0.0...v2.0.1
+[2.0.0]: https://github.com/whomwah/rqrcode_core/compare/v1.2.0...v2.0.0
 [1.2.0]: https://github.com/whomwah/rqrcode_core/compare/v1.1.0...v1.2.0
 [1.1.0]: https://github.com/whomwah/rqrcode_core/compare/v1.0.0...v1.1.0
 [1.0.0]: https://github.com/whomwah/rqrcode_core/compare/v0.2.0...v1.0.0

data/README.md

@@ -3,14 +3,15 @@
 
 # RQRCodeCore
 
-`rqrcode_core` is a library for encoding QR Codes in pure Ruby. It has a simple interface with all the standard qrcode options. It was originally adapted in 2008 from a Javascript library by [Kazuhiko Arase](https://github.com/kazuhikoarase).
+`rqrcode_core` is a library for encoding QR Codes in pure Ruby. It has a simple interface with all the standard QR Code options. It was originally adapted in 2008 from a Javascript library by [Kazuhiko Arase](https://github.com/kazuhikoarase).
 
 Features:
 
-* `rqrcode_core` 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, but also allows for encoding multiple segments.
-* QR Code is trademarked by Denso Wave inc.
+- `rqrcode_core` is a Ruby only library. It requires no 3rd party 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, but also allows for encoding multiple segments.
+- QR Code is trade marked by Denso Wave inc.
+- Minimum Ruby version is `>= 3.2.0`
 
 `rqrcode_core` is the basis of the popular `rqrcode` gem [https://github.com/whomwah/rqrcode]. This gem allows you to generate different renderings of your QR Code, including `png`, `svg` and `ansi`.
 
@@ -51,7 +52,11 @@ x xxx x  xxxxx x       xx x xxx x
 
 ```ruby
 $ require "rqrcode_core"
-$ qr = RQRCodeCore::QRCode.new([{data: "byteencoded", mode: :byte_8bit}, {data: "A1" * 100, mode: :alphanumeric}, {data: "1" * 500, mode: :number}])
+$ qr = RQRCodeCore::QRCode.new([
+  {data: "byteencoded", mode: :byte_8bit},
+  {data: "A1" * 100, mode: :alphanumeric},
+  {data: "1" * 500, mode: :number}
+])
 ```
 
 This will create a QR Code with byte encoded, alphanumeric and number segments. Any combination of encodings/segments will work provided it fits within size limits.
@@ -62,7 +67,7 @@ This will create a QR Code with byte encoded, alphanumeric and number segments.
 require "rqrcode_core"
 
 qr = RQRCodeCore::QRCode.new("https://kyan.com")
-qr.rows.each do |row|
+qr.modules.each do |row|
   row.each do |col|
     print col ? "#" : " "
   end
@@ -92,13 +97,12 @@ mode - the mode of the QR Code (defaults to alphanumeric or byte_8bit, depending
   * :number
   * :alphanumeric
   * :byte_8bit
-  * :kanji
 ```
 
 #### Example
 
 ```ruby
-RQRCodeCore::QRCode.new("http://kyan.com", size: 1, level: :m, mode: :alphanumeric)
+RQRCodeCore::QRCode.new("http://kyan.com", size: 2, level: :m, mode: :byte_8bit)
 ```
 
 ## Development
@@ -128,6 +132,49 @@ $ rake standard # check
 $ rake standard:fix # fix
 ```
 
+## Performance Optimisation
+
+### Reduce Memory Usage by 70-76%
+
+**If you're running on a 64-bit system, you can dramatically reduce memory consumption by setting:**
+
+```ruby
+ENV['RQRCODE_CORE_ARCH_BITS'] = '32'
+```
+
+Or from the command line:
+
+```bash
+RQRCODE_CORE_ARCH_BITS=32 ruby your_script.rb
+```
+
+#### Benchmark Results (64-bit vs 32-bit on 64-bit systems)
+
+**Memory Savings:**
+- Single small QR code: 0.38 MB → 0.10 MB (**74% reduction**)
+- Single large QR code: 8.53 MB → 2.92 MB (**66% reduction**)
+- 100 small QR codes: 37.91 MB → 9.10 MB (**76% reduction**)
+- 10 large QR codes: 85.32 MB → 29.19 MB (**66% reduction**)
+
+**Speed Improvement:**
+- 2-4% faster across all scenarios (better cache utilization, reduced GC pressure)
+
+**Object Allocation:**
+- 85-87% fewer objects allocated
+- Integer allocations nearly eliminated (from 70-76% to ~0%)
+
+#### Why This Works
+
+The QR code algorithm doesn't require 64-bit integers for its bit manipulation operations—32-bit is sufficient for all calculations. By default, Ruby on 64-bit systems uses 64-bit integers, which causes unnecessary memory allocation during the internal "right shift zero fill" operations.
+
+**Recommendation:** Use `RQRCODE_CORE_ARCH_BITS=32` for production workloads, especially when:
+- Generating QR codes in batch
+- Running in memory-constrained environments
+- Handling high-concurrency web requests
+- Processing large QR codes (version 10+)
+
+See `test/benchmarks/ARCH_BITS_ANALYSIS.md` for detailed benchmark data and analysis.
+
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/whomwah/rqrcode_core.

data/lib/rqrcode_core/qrcode/qr_bit_buffer.rb

@@ -15,12 +15,12 @@ module RQRCodeCore
 
     def get(index)
       buf_index = (index / 8).floor
-      ((QRUtil.rszf(@buffer[buf_index], 7 - index % 8)) & 1) == 1
+      (QRUtil.rszf(@buffer[buf_index], 7 - index % 8) & 1) == 1
     end
 
     def put(num, length)
       (0...length).each do |i|
-        put_bit(((QRUtil.rszf(num, length - i - 1)) & 1) == 1)
+        put_bit((QRUtil.rszf(num, length - i - 1) & 1) == 1)
       end
     end
 

data/lib/rqrcode_core/qrcode/qr_code.rb

@@ -2,9 +2,9 @@
 
 module RQRCodeCore
   QRMODE = {
-    mode_number: 1 << 0,
-    mode_alpha_numk: 1 << 1,
-    mode_8bit_byte: 1 << 2
+    mode_number: 1 << 0,      # 1 (binary: 0001)
+    mode_alpha_numk: 1 << 1,  # 2 (binary: 0010)
+    mode_8bit_byte: 1 << 2   # 4 (binary: 0100)
   }.freeze
 
   QRMODE_NAME = {
@@ -97,7 +97,6 @@ module RQRCodeCore
     #      * :number
     #      * :alphanumeric
     #      * :byte_8bit
-    #      * :kanji
     #
     #   qr = RQRCodeCore::QRCode.new('hello world', size: 1, level: :m, mode: :alphanumeric)
     #   segment_qr = QRCodeCore::QRCode.new({ data: 'foo', mode: :byte_8bit })
@@ -156,6 +155,7 @@ module RQRCodeCore
     end
     alias_method :dark?, :checked?
     extend Gem::Deprecate
+
     deprecate :dark?, :checked?, 2020, 1
 
     # This is a public method that returns the QR Code you have
@@ -233,14 +233,14 @@ module RQRCodeCore
 
     protected
 
-    def make #:nodoc:
+    def make # :nodoc:
       prepare_common_patterns
       make_impl(false, get_best_mask_pattern)
     end
 
     private
 
-    def prepare_common_patterns #:nodoc:
+    def prepare_common_patterns # :nodoc:
       @modules.map! { |row| Array.new(@module_count) }
 
       place_position_probe_pattern(0, 0)
@@ -252,7 +252,7 @@ module RQRCodeCore
       @common_patterns = @modules.map(&:clone)
     end
 
-    def make_impl(test, mask_pattern) #:nodoc:
+    def make_impl(test, mask_pattern) # :nodoc:
       @modules = @common_patterns.map(&:clone)
 
       place_format_info(test, mask_pattern)
@@ -267,15 +267,15 @@ module RQRCodeCore
       map_data(@data_cache, mask_pattern)
     end
 
-    def place_position_probe_pattern(row, col) #:nodoc:
+    def place_position_probe_pattern(row, col) # :nodoc:
       (-1..7).each do |r|
         next unless (row + r).between?(0, @module_count - 1)
 
         (-1..7).each do |c|
           next unless (col + c).between?(0, @module_count - 1)
 
-          is_vert_line = (r.between?(0, 6) && (c == 0 || c == 6))
-          is_horiz_line = (c.between?(0, 6) && (r == 0 || r == 6))
+          is_vert_line = r.between?(0, 6) && (c == 0 || c == 6)
+          is_horiz_line = c.between?(0, 6) && (r == 0 || r == 6)
           is_square = r.between?(2, 4) && c.between?(2, 4)
 
           is_part_of_probe = is_vert_line || is_horiz_line || is_square
@@ -284,11 +284,11 @@ module RQRCodeCore
       end
     end
 
-    def get_best_mask_pattern #:nodoc:
+    def get_best_mask_pattern # :nodoc:
       min_lost_point = 0
       pattern = 0
 
-      (0...8).each do |i|
+      8.times do |i|
         make_impl(true, i)
         lost_point = QRUtil.get_lost_points(modules)
 
@@ -300,13 +300,13 @@ module RQRCodeCore
       pattern
     end
 
-    def place_timing_pattern #:nodoc:
+    def place_timing_pattern # :nodoc:
       (8...@module_count - 8).each do |i|
         @modules[i][6] = @modules[6][i] = i % 2 == 0
       end
     end
 
-    def place_position_adjust_pattern #:nodoc:
+    def place_position_adjust_pattern # :nodoc:
       positions = QRUtil.get_pattern_positions(@version)
 
       positions.each do |row|
@@ -315,7 +315,7 @@ module RQRCodeCore
 
           (-2..2).each do |r|
             (-2..2).each do |c|
-              is_part_of_pattern = (r.abs == 2 || c.abs == 2 || (r == 0 && c == 0))
+              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
@@ -323,22 +323,22 @@ module RQRCodeCore
       end
     end
 
-    def place_version_info(test) #:nodoc:
+    def place_version_info(test) # :nodoc:
       bits = QRUtil.get_bch_version(@version)
 
-      (0...18).each do |i|
-        mod = (!test && ((bits >> i) & 1) == 1)
+      18.times do |i|
+        mod = !test && ((bits >> i) & 1) == 1
         @modules[(i / 3).floor][ i % 3 + @module_count - 8 - 3 ] = mod
         @modules[i % 3 + @module_count - 8 - 3][ (i / 3).floor ] = mod
       end
     end
 
-    def place_format_info(test, mask_pattern) #:nodoc:
+    def place_format_info(test, mask_pattern) # :nodoc:
       data = (@error_correct_level << 3 | mask_pattern)
       bits = QRUtil.get_bch_format_info(data)
 
       QRFORMATINFOLENGTH.times do |i|
-        mod = (!test && ((bits >> i) & 1) == 1)
+        mod = !test && ((bits >> i) & 1) == 1
 
         # vertical
         row = if i < 6
@@ -365,7 +365,7 @@ module RQRCodeCore
       @modules[@module_count - 8][8] = !test
     end
 
-    def map_data(data, mask_pattern) #:nodoc:
+    def map_data(data, mask_pattern) # :nodoc:
       inc = -1
       row = @module_count - 1
       bit_index = 7
@@ -375,7 +375,7 @@ module RQRCodeCore
         col -= 1 if col <= 6
 
         loop do
-          (0...2).each do |c|
+          2.times do |c|
             if @modules[row][col - c].nil?
               dark = false
               if byte_index < data.size && !data[byte_index].nil?
@@ -416,12 +416,12 @@ module RQRCodeCore
       minimum_version(limit: limit, version: version + 1)
     end
 
-    def extract_options!(arr) #:nodoc:
+    def extract_options!(arr) # :nodoc:
       arr.last.is_a?(::Hash) ? arr.pop : {}
     end
 
     class << self
-      def count_max_data_bits(rs_blocks) #:nodoc:
+      def count_max_data_bits(rs_blocks) # :nodoc:
         max_data_bytes = rs_blocks.reduce(0) do |sum, rs_block|
           sum + rs_block.data_count
         end
@@ -429,7 +429,7 @@ module RQRCodeCore
         max_data_bytes * 8
       end
 
-      def create_data(version, error_correct_level, data_list) #:nodoc:
+      def create_data(version, error_correct_level, data_list) # :nodoc:
         rs_blocks = QRRSBlock.get_rs_blocks(version, error_correct_level)
         max_data_bits = QRCode.count_max_data_bits(rs_blocks)
         buffer = QRBitBuffer.new(version)
@@ -446,7 +446,7 @@ module RQRCodeCore
         QRCode.create_bytes(buffer, rs_blocks)
       end
 
-      def create_bytes(buffer, rs_blocks) #:nodoc:
+      def create_bytes(buffer, rs_blocks) # :nodoc:
         offset = 0
         max_dc_count = 0
         max_ec_count = 0
@@ -473,7 +473,7 @@ module RQRCodeCore
           ecdata_block = Array.new(rs_poly.get_length - 1)
           ecdata_block.size.times do |i|
             mod_index = i + mod_poly.get_length - ecdata_block.size
-            ecdata_block[i] = mod_index >= 0 ? mod_poly.get(mod_index) : 0
+            ecdata_block[i] = (mod_index >= 0) ? mod_poly.get(mod_index) : 0
           end
           ecdata[r] = ecdata_block
         end

data/lib/rqrcode_core/qrcode/qr_math.rb

@@ -6,7 +6,7 @@ module RQRCodeCore
       exp_table = Array.new(256)
       log_table = Array.new(256)
 
-      (0...8).each do |i|
+      8.times do |i|
         exp_table[i] = 1 << i
       end
 
@@ -17,7 +17,7 @@ module RQRCodeCore
           ^ exp_table[i - 8]
       end
 
-      (0...255).each do |i|
+      255.times do |i|
         log_table[exp_table[i]] = i
       end
 

data/lib/rqrcode_core/qrcode/qr_segment.rb

@@ -8,7 +8,7 @@ module RQRCodeCore
       @data = data
       @mode = QRMODE_NAME.dig(mode&.to_sym)
 
-      # If mode is not explicitely found choose mode according to data type
+      # If mode is not explicitly found choose mode according to data type
       @mode ||= if RQRCodeCore::QRNumeric.valid_data?(@data)
         QRMODE_NAME[:number]
       elsif QRAlphanumeric.valid_data?(@data)
@@ -36,7 +36,7 @@ module RQRCodeCore
         [1, 8, 0]
       end
 
-      (data_length / chunk_size) * bit_length + ((data_length % chunk_size) == 0 ? 0 : extra)
+      (data_length / chunk_size) * bit_length + (((data_length % chunk_size) == 0) ? 0 : extra)
     end
 
     def writer

data/lib/rqrcode_core/qrcode/qr_util.rb

@@ -57,10 +57,25 @@ module RQRCodeCore
     BITS_FOR_MODE = {
       QRMODE[:mode_number] => [10, 12, 14],
       QRMODE[:mode_alpha_numk] => [9, 11, 13],
-      QRMODE[:mode_8bit_byte] => [8, 16, 16],
-      QRMODE[:mode_kanji] => [8, 10, 12]
+      QRMODE[:mode_8bit_byte] => [8, 16, 16]
     }.freeze
 
+    # This value is used during the right shift zero fill step (rszf method).
+    # Auto-set to 32 or 64 depending on system architecture (1.size * 8).
+    #
+    # PERFORMANCE IMPACT (64-bit vs 32-bit on 64-bit systems):
+    # - Memory: 70-76% reduction (e.g., 37.91 MB → 9.10 MB for 100 small QR codes)
+    # - Speed: 2-4% faster with 32-bit
+    # - Objects: 85-87% fewer allocations
+    # - All tests pass with ARCH_BITS=32
+    #
+    # RECOMMENDATION: Use RQRCODE_CORE_ARCH_BITS=32 even on 64-bit systems
+    # for dramatic memory savings with no downsides. The QR code algorithm
+    # doesn't require 64-bit integers—32-bit is sufficient for all operations.
+    #
+    # See test/benchmarks/ARCH_BITS_ANALYSIS.md for detailed benchmark data.
+    ARCH_BITS = ENV.fetch("RQRCODE_CORE_ARCH_BITS", nil)&.to_i || 1.size * 8
+
     def self.max_size
       PATTERN_POSITION_TABLE.count
     end
@@ -74,8 +89,8 @@ module RQRCodeCore
     end
 
     def self.rszf(num, count)
-      # zero fill right shift
-      (num >> count) & ((2**((num.size * 8) - count)) - 1)
+      # right shift zero fill
+      (num >> count) & ((1 << (ARCH_BITS - count)) - 1)
     end
 
     def self.get_bch_version(data)
@@ -102,9 +117,7 @@ module RQRCodeCore
     end
 
     def self.get_mask(mask_pattern, i, j)
-      if mask_pattern > QRMASKCOMPUTATIONS.size
-        raise QRCodeRunTimeError, "bad mask_pattern: #{mask_pattern}"
-      end
+      raise QRCodeRunTimeError, "bad mask_pattern: #{mask_pattern}" if mask_pattern > QRMASKCOMPUTATIONS.size
 
       QRMASKCOMPUTATIONS[mask_pattern].call(i, j)
     end
@@ -120,13 +133,9 @@ module RQRCodeCore
     end
 
     def self.get_length_in_bits(mode, version)
-      if !QRMODE.value?(mode)
-        raise QRCodeRunTimeError, "Unknown mode: #{mode}"
-      end
+      raise QRCodeRunTimeError, "Unknown mode: #{mode}" unless QRMODE.value?(mode)
 
-      if version > 40
-        raise QRCodeRunTimeError, "Unknown version: #{version}"
-      end
+      raise QRCodeRunTimeError, "Unknown version: #{version}" if version > 40
 
       if version.between?(1, 9)
         # 1 - 9
@@ -156,28 +165,40 @@ module RQRCodeCore
     def self.demerit_points_1_same_color(modules)
       demerit_points = 0
       module_count = modules.size
+      max_index = module_count - 1
 
       # level1
-      (0...module_count).each do |row|
-        (0...module_count).each do |col|
+      module_count.times do |row|
+        modules_row = modules[row]
+
+        module_count.times do |col|
           same_count = 0
-          dark = modules[row][col]
-
-          (-1..1).each do |r|
-            next if row + r < 0 || module_count <= row + r
-
-            (-1..1).each do |c|
-              next if col + c < 0 || module_count <= col + c
-              next if r == 0 && c == 0
-              if dark == modules[row + r][col + c]
-                same_count += 1
-              end
-            end
+          dark = modules_row[col]
+
+          # Check 3x3 neighborhood, but skip center cell
+          # Unroll loops and eliminate range objects for performance
+
+          # Row above (row - 1)
+          if row > 0
+            row_above = modules[row - 1]
+            same_count += 1 if col > 0 && dark == row_above[col - 1]
+            same_count += 1 if dark == row_above[col]
+            same_count += 1 if col < max_index && dark == row_above[col + 1]
           end
 
-          if same_count > 5
-            demerit_points += (DEMERIT_POINTS_1 + same_count - 5)
+          # Same row
+          same_count += 1 if col > 0 && dark == modules_row[col - 1]
+          same_count += 1 if col < max_index && dark == modules_row[col + 1]
+
+          # Row below (row + 1)
+          if row < max_index
+            row_below = modules[row + 1]
+            same_count += 1 if col > 0 && dark == row_below[col - 1]
+            same_count += 1 if dark == row_below[col]
+            same_count += 1 if col < max_index && dark == row_below[col + 1]
           end
+
+          demerit_points += (DEMERIT_POINTS_1 + same_count - 5) if same_count > 5
         end
       end
 
@@ -187,16 +208,19 @@ module RQRCodeCore
     def self.demerit_points_2_full_blocks(modules)
       demerit_points = 0
       module_count = modules.size
-
-      # level 2
-      (0...(module_count - 1)).each do |row|
-        (0...(module_count - 1)).each do |col|
-          count = 0
-          count += 1 if modules[row][col]
-          count += 1 if modules[row + 1][col]
-          count += 1 if modules[row][col + 1]
-          count += 1 if modules[row + 1][col + 1]
-          if count == 0 || count == 4
+      max_row = module_count - 1
+
+      # level 2: Check for 2x2 blocks of same color
+      # Only need to check (module_count - 1) x (module_count - 1) positions
+      max_row.times do |row|
+        row_curr = modules[row]
+        row_next = modules[row + 1]
+
+        max_row.times do |col|
+          # Check if all 4 modules in 2x2 block have same color
+          # (count == 0: all false, count == 4: all true)
+          val = row_curr[col]
+          if val == row_next[col] && val == row_curr[col + 1] && val == row_next[col + 1]
             demerit_points += DEMERIT_POINTS_2
           end
         end
@@ -208,31 +232,27 @@ module RQRCodeCore
     def self.demerit_points_3_dangerous_patterns(modules)
       demerit_points = 0
       module_count = modules.size
+      pattern_len = 7
+      max_start = module_count - pattern_len + 1
+
+      # level 3: Check for dangerous pattern [dark, light, dark, dark, dark, light, dark]
+      # Pattern: true, false, true, true, true, false, true (1:1:3:1:1 ratio)
 
-      # level 3
+      # Check rows
       modules.each do |row|
-        (module_count - 6).times do |col_idx|
-          if row[col_idx] &&
-              !row[col_idx + 1] &&
-              row[col_idx + 2] &&
-              row[col_idx + 3] &&
-              row[col_idx + 4] &&
-              !row[col_idx + 5] &&
-              row[col_idx + 6]
+        max_start.times do |col|
+          if row[col] && !row[col + 1] && row[col + 2] &&
+              row[col + 3] && row[col + 4] && !row[col + 5] && row[col + 6]
             demerit_points += DEMERIT_POINTS_3
           end
         end
       end
 
-      (0...module_count).each do |col|
-        (0...(module_count - 6)).each do |row|
-          if modules[row][col] &&
-              !modules[row + 1][col] &&
-              modules[row + 2][col] &&
-              modules[row + 3][col] &&
-              modules[row + 4][col] &&
-              !modules[row + 5][col] &&
-              modules[row + 6][col]
+      # Check columns
+      module_count.times do |col|
+        max_start.times do |row|
+          if modules[row][col] && !modules[row + 1][col] && modules[row + 2][col] &&
+              modules[row + 3][col] && modules[row + 4][col] && !modules[row + 5][col] && modules[row + 6][col]
             demerit_points += DEMERIT_POINTS_3
           end
         end
@@ -247,7 +267,8 @@ module RQRCodeCore
         sum + col.count(true)
       end
 
-      ratio = dark_count / (modules.size * modules.size)
+      # Convert to float to prevent integer division
+      ratio = dark_count.to_f / (modules.size * modules.size)
       ratio_delta = (100 * ratio - 50).abs / 5
 
       ratio_delta * DEMERIT_POINTS_4

data/lib/rqrcode_core/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RQRCodeCore
-  VERSION = "1.2.0"
+  VERSION = "2.1.0"
 end

metadata

@@ -1,17 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: rqrcode_core
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Duncan Robertson
-autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-08-26 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: benchmark-ips
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -25,47 +24,89 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: memory_profiler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
-  name: standardrb
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '13.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '13.3'
+- !ruby/object:Gem::Dependency
+  name: stackprof
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+- !ruby/object:Gem::Dependency
+  name: standard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.41'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.41'
 description: |
   rqrcode_core is a Ruby library for encoding QR Codes. The simple
   interface (with no runtime dependencies) allows you to create QR Code data structures.
@@ -75,16 +116,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/workflows/ruby.yml"
-- ".gitignore"
 - CHANGELOG.md
-- Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
-- Rakefile
-- bin/console
-- bin/setup
 - lib/rqrcode_core.rb
 - lib/rqrcode_core/qrcode.rb
 - lib/rqrcode_core/qrcode/qr_8bit_byte.rb
@@ -99,12 +133,12 @@ files:
 - lib/rqrcode_core/qrcode/qr_segment.rb
 - lib/rqrcode_core/qrcode/qr_util.rb
 - lib/rqrcode_core/version.rb
-- rqrcode_core.gemspec
 homepage: https://github.com/whomwah/rqrcode_core
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  bug_tracker_uri: https://github.com/whomwah/rqrcode_core/issues
+  changelog_uri: https://github.com/whomwah/rqrcode_core/blob/main/CHANGELOG.md
 rdoc_options: []
 require_paths:
 - lib
@@ -112,15 +146,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
-signing_key: 
+rubygems_version: 4.0.3
 specification_version: 4
 summary: A library to encode QR Codes
 test_files: []

data/.github/workflows/ruby.yml

@@ -1,29 +0,0 @@
-name: rqrcode_core
-
-on:
-  push:
-    branches:
-    - master
-    - release/*
-  pull_request:
-    branches:
-    - master
-
-jobs:
-  Build:
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu-latest, macos-latest]
-        ruby: [2.5, 2.6, 2.7, 3.0]
-    runs-on: ${{ matrix.os }}
-    steps:
-    - uses: actions/checkout@v1
-    - uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: ${{ matrix.ruby }}
-        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
-    - name: Run Tests
-      run: bundle exec rake test
-    - name: StandardRB Check
-      run: bundle exec standardrb --format progress

data/.gitignore

@@ -1,10 +0,0 @@
-/.bundle/
-/.yardoc
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/
-/.devcontainer/
-*.gem

data/Gemfile

@@ -1,4 +0,0 @@
-source "https://rubygems.org"
-
-# Specify your gem's dependencies in rqrcode-base.gemspec
-gemspec

data/Gemfile.lock

@@ -1,51 +0,0 @@
-PATH
-  remote: .
-  specs:
-    rqrcode_core (1.2.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    ast (2.4.2)
-    minitest (5.14.4)
-    parallel (1.20.1)
-    parser (3.0.2.0)
-      ast (~> 2.4.1)
-    rainbow (3.0.0)
-    rake (13.0.6)
-    regexp_parser (2.1.1)
-    rexml (3.2.5)
-    rubocop (1.18.4)
-      parallel (~> 1.10)
-      parser (>= 3.0.0.0)
-      rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.8.0, < 2.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.9.1)
-      parser (>= 3.0.1.1)
-    rubocop-performance (1.11.4)
-      rubocop (>= 1.7.0, < 2.0)
-      rubocop-ast (>= 0.4.0)
-    ruby-progressbar (1.11.0)
-    standard (1.1.7)
-      rubocop (= 1.18.4)
-      rubocop-performance (= 1.11.4)
-    standardrb (1.0.0)
-      standard
-    unicode-display_width (2.0.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 2.0)
-  minitest (~> 5.0)
-  rake (~> 13.0)
-  rqrcode_core!
-  standardrb (~> 1.0)
-
-BUNDLED WITH
-   2.2.22

data/Rakefile

@@ -1,19 +0,0 @@
-begin
-  require "rake/testtask"
-  require "standard/rake"
-
-  Rake::TestTask.new(:test) do |t|
-    t.libs << "test"
-    t.libs << "lib"
-    t.test_files = FileList["test/**/*_test.rb"]
-  end
-
-  task default: [:test, "standard:fix"]
-
-  desc "Run a simple benchmark (x1000)"
-  task :benchmark do
-    ruby "test/benchmark.rb"
-  end
-rescue LoadError
-  # no standard/rspec available
-end

data/bin/console

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-
-require "bundler/setup"
-require "rqrcode_core"
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require "irb"
-IRB.start(__FILE__)

data/bin/setup

@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-IFS=$'\n\t'
-set -vx
-
-bundle install
-
-# Do any other automated setup that you need to do here

data/rqrcode_core.gemspec

@@ -1,32 +0,0 @@
-lib = File.expand_path("../lib", __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "rqrcode_core/version"
-
-Gem::Specification.new do |spec|
-  spec.name = "rqrcode_core"
-  spec.version = RQRCodeCore::VERSION
-  spec.platform = Gem::Platform::RUBY
-  spec.authors = ["Duncan Robertson"]
-  spec.email = ["duncan@whomwah.com"]
-
-  spec.summary = "A library to encode QR Codes"
-  spec.description = <<~EOF
-    rqrcode_core is a Ruby library for encoding QR Codes. The simple
-    interface (with no runtime dependencies) allows you to create QR Code data structures.
-  EOF
-  spec.homepage = "https://github.com/whomwah/rqrcode_core"
-  spec.license = "MIT"
-
-  spec.files = Dir.chdir(File.expand_path("..", __FILE__)) do
-    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  end
-  spec.bindir = "exe"
-  spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
-
-  spec.required_ruby_version = ">= 2.3"
-  spec.add_development_dependency "bundler", "~> 2.0"
-  spec.add_development_dependency "rake", "~> 13.0"
-  spec.add_development_dependency "minitest", "~> 5.0"
-  spec.add_development_dependency "standardrb", "~> 1.0"
-end