rqrcode 2.2.0 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46c752f56b2f26a71997009f105896a93874304e47b5453f6d399790ec5d67ee
-  data.tar.gz: 3a32e1b77c24d1118510084ad0b0f700ff54c8605c5e5cf77aca2c5efc782438
+  metadata.gz: 43ab1903362d8d91be0e90db63e5fd1f1fe7ab68f217954cad099ba50244c070
+  data.tar.gz: 102e00189844e32950e07ca15afafd6e75c2288ea5af0df181c2daeb1ec02a2c
 SHA512:
-  metadata.gz: 28ae604413d674f2c8fe6aac337aab7253874357d6d0e4e656c7e3cf743c8a65d102a5eeb8790601678d4c65172bbdd882cf1a51766d23df99b4253f0801a11d
-  data.tar.gz: 34fbe27e846970fe5b8571c446d6bee7327d46c3b645aaf07b141cf96d98c7beb918f6cc929408fd612940d260a0258c5656937f7283acbcf6cab0d00e09c082
+  metadata.gz: 1d939b8bf154cc50957f321023c01f065d163b8ba4d046184d0dbe99fa426c81a48454026f98f45a93c13a882990bdb0864e15c4bec4496c2e8005be78add4bb
+  data.tar.gz: e8c05cb0311ff4c93bec2afed05adde2797ab8669caa3d505055b536aac0b3b984524389442f238e7a12d4eaf175d83af508ba63218a8c963f7f0e600fe6e9a6

data/.github/FUNDING.yml

@@ -0,0 +1,4 @@
+# These are supported funding model platforms
+
+github: whomwah
+buy_me_a_coffee: duncanrobertson

data/.github/workflows/ruby.yml

@@ -3,10 +3,9 @@ name: rqrcode
 on:
   push:
     branches:
-    - master
-  pull_request:
-    branches:
-    - master
+      - main
+      - release
+  pull_request: # Runs on any PR regardless of target branch
 
 jobs:
   Build:
@@ -14,15 +13,15 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest]
-        ruby: ['2.6', '2.7', '3.0', '3.1', '3.2']
+        ruby: ["3.0", "3.1", "3.2", "3.3", "3.4"]
     runs-on: ${{ matrix.os }}
     steps:
-    - uses: actions/checkout@v3
-    - uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: ${{ matrix.ruby }}
-        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
-    - name: Run Tests for Ruby ${{ matrix.ruby }} on ${{ matrix.os }}
-      run: bundle exec rake spec
-    - name: StandardRB check for Ruby ${{ matrix.ruby }} on ${{ matrix.os }}
-      run: bundle exec standardrb --format progress
+      - uses: actions/checkout@v3
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+      - name: Run Tests for Ruby ${{ matrix.ruby }} on ${{ matrix.os }}
+        run: bundle exec rake spec
+      - name: StandardRB check for Ruby ${{ matrix.ruby }} on ${{ matrix.os }}
+        run: bundle exec standardrb --format progress

data/.standard.yml

@@ -0,0 +1 @@
+ruby_version: 2.7

data/CHANGELOG.md

@@ -7,21 +7,30 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [3.1.0] - 2025-04-28
+
+- Added support for `offset_x` and `offset_y` options in the `as_svg` method for independent x and y padding around QR codes [#153]
+
+## [3.0.0] - 2025-04-24
+
+- Drop support for Ruby <3.0 in order to keep up with dev dependencies.
+- **Breaking Change**: The `rqrcode_core` gem has been updated to version 2.0.0, which includes breaking changes. Please refer to the [rqrcode_core changelog](https://github.com/whomwah/rqrcode_core/blob/main/CHANGELOG.md)
+
 ## [2.2.0] - 2023-06-17
 
 ### Changed
 
-* Allow all ChunkyPNG::Color options to be passed into `fill` and `color` on `as_png` [#135]
-* Add 3.2 to CI [@petergoldstein](https://github.com/petergoldstein) [#133]
-* Development dependency upgrades. Minimum Ruby change [#130]
-* README updates
+- Allow all ChunkyPNG::Color options to be passed into `fill` and `color` on `as_png` [#135]
+- Add 3.2 to CI [@petergoldstein](https://github.com/petergoldstein) [#133]
+- Development dependency upgrades. Minimum Ruby change [#130]
+- README updates
 
 ## [2.1.2] - 2022-07-26
 
 ### Changed
 
-* Remove setup script as it just calls bundle install [#128]
-* Change inline styles to the fill property to allow for strict CSP style-src directive [#127]
+- Remove setup script as it just calls bundle install [#128]
+- Change inline styles to the fill property to allow for strict CSP style-src directive [#127]
 
 ## [2.1.1] - 2022-02-11
 
@@ -60,7 +69,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Breaking Change
 
-- The dependency `rqrcode_core-1.0.0` has a tiny breaking change to the `to_s` public method. https://github.com/whomwah/rqrcode_core/blob/master/CHANGELOG.md#breaking-changes
+- The dependency `rqrcode_core-1.0.0` has a tiny breaking change to the `to_s` public method. https://github.com/whomwah/rqrcode_core/blob/main/CHANGELOG.md#breaking-changes
 
 ## [1.2.0] - 2020-12-26
 
@@ -70,7 +79,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - bump dependencies
 - fix `required_ruby_version` for Ruby 3 support
 
-[unreleased]: https://github.com/whomwah/rqrcode/compare/v2.2.0...HEAD
+[unreleased]: https://github.com/whomwah/rqrcode/compare/v3.1.0...HEAD
+[3.1.0]: https://github.com/whomwah/rqrcode/compare/v3.0.0...v3.1.0
+[3.0.0]: https://github.com/whomwah/rqrcode/compare/v2.2.0...v3.0.0
 [2.2.0]: https://github.com/whomwah/rqrcode/compare/v2.1.2...v2.2.0
 [2.1.2]: https://github.com/whomwah/rqrcode/compare/v2.1.1...v2.1.2
 [2.1.1]: https://github.com/whomwah/rqrcode/compare/v2.1.0...v2.1.1

data/Gemfile.lock

@@ -1,72 +1,82 @@
 PATH
   remote: .
   specs:
-    rqrcode (2.2.0)
+    rqrcode (3.1.0)
       chunky_png (~> 1.0)
-      rqrcode_core (~> 1.0)
+      rqrcode_core (~> 2.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.2)
     chunky_png (1.4.0)
-    diff-lcs (1.5.0)
-    json (2.6.3)
-    language_server-protocol (3.17.0.2)
-    parallel (1.22.1)
-    parser (3.1.3.0)
+    diff-lcs (1.5.1)
+    json (2.7.2)
+    language_server-protocol (3.17.0.3)
+    lint_roller (1.1.0)
+    parallel (1.26.3)
+    parser (3.3.5.0)
       ast (~> 2.4.1)
+      racc
+    racc (1.8.1)
     rainbow (3.1.1)
-    rake (13.0.6)
-    regexp_parser (2.6.1)
-    rexml (3.2.5)
-    rqrcode_core (1.2.0)
-    rspec (3.12.0)
-      rspec-core (~> 3.12.0)
-      rspec-expectations (~> 3.12.0)
-      rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.0)
-      rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.1)
+    rake (13.2.1)
+    regexp_parser (2.9.2)
+    rqrcode_core (2.0.0)
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.1)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.1)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-support (3.12.0)
-    rubocop (1.40.0)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.1)
+    rubocop (1.66.1)
       json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.1.2.1)
+      parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
-      rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.23.0, < 2.0)
+      regexp_parser (>= 2.4, < 3.0)
+      rubocop-ast (>= 1.32.2, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.24.0)
-      parser (>= 3.1.1.0)
-    rubocop-performance (1.15.1)
-      rubocop (>= 1.7.0, < 2.0)
-      rubocop-ast (>= 0.4.0)
-    ruby-progressbar (1.11.0)
-    standard (1.20.0)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.32.3)
+      parser (>= 3.3.1.0)
+    rubocop-performance (1.22.1)
+      rubocop (>= 1.48.1, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
+    ruby-progressbar (1.13.0)
+    standard (1.41.0)
       language_server-protocol (~> 3.17.0.2)
-      rubocop (= 1.40.0)
-      rubocop-performance (= 1.15.1)
-    standardrb (1.0.1)
-      standard
-    unicode-display_width (2.3.0)
+      lint_roller (~> 1.0)
+      rubocop (~> 1.66.0)
+      standard-custom (~> 1.0.0)
+      standard-performance (~> 1.5)
+    standard-custom (1.0.2)
+      lint_roller (~> 1.0)
+      rubocop (~> 1.50)
+    standard-performance (1.5.0)
+      lint_roller (~> 1.1)
+      rubocop-performance (~> 1.22.0)
+    unicode-display_width (2.6.0)
 
 PLATFORMS
+  aarch64-linux
   ruby
+  x86_64-linux
 
 DEPENDENCIES
   bundler (~> 2.0)
   rake (~> 13.0)
   rqrcode!
   rspec (~> 3.5)
-  standardrb (~> 1.0)
+  standard (~> 1.41)
 
 BUNDLED WITH
-   2.3.26
+   2.4.10

data/README.md

@@ -3,20 +3,17 @@
 ![](https://github.com/whomwah/rqrcode/actions/workflows/ruby.yml/badge.svg)
 [![Ruby Style Guide](https://img.shields.io/badge/code_style-standard-brightgreen.svg)](https://github.com/testdouble/standard)
 
-
 [RQRCode](https://github.com/whomwah/rqrcode) is a library for creating and rendering QR codes into various formats. It has a simple interface with all the standard QR code options. It was adapted from the Javascript library by Kazuhiko Arase.
 
-* QR code is trademarked by Denso Wave inc
-* Minimum Ruby version is `>= 2.6`
-* For `rqrcode` releases `< 2.0.0` please use [this README](https://github.com/whomwah/rqrcode/blob/v1.2.0/README.md)
-* For `rqrcode` releases `< 1.0.0` please use [this README](https://github.com/whomwah/rqrcode/blob/v0.9.0/README.md)
+- QR code is trademarked by Denso Wave inc
+- Minimum Ruby version is `>= 3.0.0`
 
 ## Installing
 
 Add this line to your application's `Gemfile`:
 
 ```ruby
-gem "rqrcode", "~> 2.0"
+gem "rqrcode", "~> 3.0"
 ```
 
 or install manually:
@@ -70,19 +67,18 @@ Expects a string or array (for multi-segment encoding) to be parsed in, other ar
     * :number
     * :alphanumeric
     * :byte_8bit
-    * :kanji
 ```
 
 Example
 
 ```ruby
-simple_qrcode = RQRCodeCore::QRCode.new("https://kyan.com", size: 1, level: :m, mode: :alphanumeric)
+simple_qrcode = RQRCodeCore::QRCode.new("https://kyan.com", size: 2, level: :m, mode: :byte_8bit)
 
-segment_qrcode = QRCodeCore::QRCode.new({ data: "foo", mode: :byte_8bit })
+segment_qrcode = RQRCodeCore::QRCode.new([{ data: "foo", mode: :byte_8bit }])
 
 multi_qrcode = RQRCodeCore::QRCode.new([
   { data: 'foo', mode: :byte_8bit },
-  { data: 'bar1', mode: :alphanumeric }
+  { data: 'BAR1', mode: :alphanumeric }
 ])
 ```
 
@@ -99,6 +95,10 @@ Options:
 
 offset          - Padding around the QR Code in pixels
                   (default 0)
+offset_x        - X Padding around the QR Code in pixels
+                  (default offset)
+offset_y        - Y Padding around the QR Code in pixels
+                  (default offset)
 fill            - Background color e.g "ffffff" or :white or :currentColor
                   (default none)
 color           - Foreground color e.g "000" or :black or :currentColor
@@ -118,7 +118,9 @@ viewbox         - Replace the `svg.width` and `svg.height` attribute with `svg.v
 svg_attributes  - A optional hash of custom <svg> attributes. Existing attributes will remain.
                   (default {})
 ```
+
 Example
+
 ```ruby
 require "rqrcode"
 
@@ -209,7 +211,6 @@ IO.binwrite("/tmp/github-qrcode.png", png.to_s)
 
 ![QR code with github url](./images/github-qrcode.png)
 
-
 ### `as_ansi`
 
 The ANSI renderer will produce as a string with ANSI color codes.
@@ -226,7 +227,9 @@ fill_character  - The written character
 quiet_zone_size - Padding around the edge
                   (default 4)
 ```
+
 Example
+
 ```ruby
 require "rqrcode"
 
@@ -280,9 +283,9 @@ The motivation for the above is because the rendering side of this gem takes up
 
 Any contribution PR's will be greatly accepted. It's important that they are well tested and backwards compatible.
 
-* Fork the project
-* Send a pull request
-* Don't touch the .gemspec, I'll do that when I release a new version
+- Fork the project
+- Send a pull request
+- Don't touch the .gemspec, I'll do that when I release a new version
 
 Thanks D.
 
@@ -296,9 +299,9 @@ Oh, and thanks to my bosses at https://kyan.com for giving me time to maintain t
 
 ## Resources
 
-* wikipedia:: http://en.wikipedia.org/wiki/QR_Code
-* Denso-Wave website:: http://www.denso-wave.com/qrcode/index-e.html
-* kaywa:: http://qrcode.kaywa.com
+- wikipedia:: http://en.wikipedia.org/wiki/QR_Code
+- Denso-Wave website:: http://www.denso-wave.com/qrcode/index-e.html
+- kaywa:: http://qrcode.kaywa.com
 
 ## Copyright
 

data/lib/rqrcode/export/svg.rb

@@ -15,7 +15,15 @@ module RQRCode
       end
 
       class Path < BaseOutputSVG
-        def build(module_size, offset, color)
+        def build(module_size, options = {})
+          # Extract values from options
+          color = options[:color]
+          offset_x = options[:offset_x].to_i
+          offset_y = options[:offset_y].to_i
+
+          # Prefix hexadecimal colors unless using a named color (symbol)
+          color = "##{color}" unless color.is_a?(Symbol)
+
           modules_array = @qrcode.modules
           matrix_width = matrix_height = modules_array.length + 1
           empty_row = [Array.new(matrix_width - 1, false)]
@@ -76,23 +84,25 @@ module RQRCode
             path << edge_loop_string
           end
 
-          # Prefix hexadecimal colors unless using a named color (symbol)
-          color = "##{color}" unless color.is_a?(Symbol)
-
-          @result << %{<path d="#{path.join}" fill="#{color}" transform="translate(#{offset},#{offset}) scale(#{module_size})"/>}
+          @result << %{<path d="#{path.join}" fill="#{color}" transform="translate(#{offset_x},#{offset_y}) scale(#{module_size})"/>}
         end
       end
 
       class Rect < BaseOutputSVG
-        def build(module_size, offset, color)
+        def build(module_size, options = {})
+          # Extract values from options
+          color = options[:color]
+          offset_x = options[:offset_x].to_i
+          offset_y = options[:offset_y].to_i
+
           # Prefix hexadecimal colors unless using a named color (symbol)
           color = "##{color}" unless color.is_a?(Symbol)
 
           @qrcode.modules.each_index do |c|
             tmp = []
             @qrcode.modules.each_index do |r|
-              y = c * module_size + offset
-              x = r * module_size + offset
+              x = r * module_size + offset_x
+              y = c * module_size + offset_y
 
               next unless @qrcode.checked?(c, r)
               tmp << %(<rect width="#{module_size}" height="#{module_size}" x="#{x}" y="#{y}" fill="#{color}"/>)
@@ -143,6 +153,10 @@ module RQRCode
       # Options:
       # offset          - Padding around the QR Code in pixels
       #                   (default 0)
+      # offset_x        - X Padding around the QR Code in pixels
+      #                   (default offset)
+      # offset_y        - Y Padding around the QR Code in pixels
+      #                   (default offset)
       # fill            - Background color e.g "ffffff"
       #                   (default none)
       # color           - Foreground color e.g "000"
@@ -164,7 +178,9 @@ module RQRCode
       def as_svg(options = {})
         fill = options[:fill]
         use_path = options[:use_path]
-        offset = options[:offset].to_i || 0
+        offset = options[:offset].to_i
+        offset_x = options.key?(:offset_x) ? options[:offset_x].to_i : offset
+        offset_y = options.key?(:offset_y) ? options[:offset_y].to_i : offset
         color = options[:color] || "000"
         shape_rendering = options[:shape_rendering] || "crispEdges"
         module_size = options[:module_size] || 11
@@ -173,9 +189,11 @@ module RQRCode
         svg_attributes = options[:svg_attributes] || {}
 
         # height and width dependent on offset and QR complexity
-        dimension = (@qrcode.module_count * module_size) + (2 * offset)
+        width = (@qrcode.module_count * module_size) + (2 * offset_x)
+        height = (@qrcode.module_count * module_size) + (2 * offset_y)
+        dimension = [width, height].max
         # use dimensions differently if we are using a viewBox
-        dimensions_attr = viewbox ? %(viewBox="0 0 #{dimension} #{dimension}") : %(width="#{dimension}" height="#{dimension}")
+        dimensions_attr = viewbox ? %(viewBox="0 0 #{width} #{height}") : %(width="#{width}" height="#{height}")
 
         svg_tag_attributes = (DEFAULT_SVG_ATTRIBUTES + [
           dimensions_attr,
@@ -187,7 +205,7 @@ module RQRCode
         close_tag = "</svg>"
 
         output_tag = (use_path ? Path : Rect).new(@qrcode)
-        output_tag.build(module_size, offset, color)
+        output_tag.build(module_size, offset_x: offset_x, offset_y: offset_y, color: color)
 
         if fill
           # Prefix hexadecimal colors unless using a named color (symbol)

data/lib/rqrcode/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RQRCode
-  VERSION = "2.2.0"
+  VERSION = "3.1.0"
 end

data/rqrcode.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.license = "MIT"
   spec.metadata = {
     "bug_tracker_uri" => "https://github.com/whomwah/rqrcode/issues",
-    "changelog_uri" => "https://github.com/whomwah/rqrcode/blob/master/CHANGELOG.md"
+    "changelog_uri" => "https://github.com/whomwah/rqrcode/blob/main/CHANGELOG.md"
   }
 
   spec.files = Dir.chdir(File.expand_path("..", __FILE__)) do
@@ -29,11 +29,11 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = ">= 2.6"
-  spec.add_dependency "rqrcode_core", "~> 1.0"
+  spec.required_ruby_version = "~> 3.0"
+  spec.add_dependency "rqrcode_core", "~> 2.0"
   spec.add_dependency "chunky_png", "~> 1.0"
   spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.5"
-  spec.add_development_dependency "standardrb", "~> 1.0"
+  spec.add_development_dependency "standard", "~> 1.41"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rqrcode
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 3.1.0
 platform: ruby
 authors:
 - Duncan Robertson
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-05-17 00:00:00.000000000 Z
+date: 2025-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rqrcode_core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: chunky_png
   requirement: !ruby/object:Gem::Requirement
@@ -81,19 +81,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.5'
 - !ruby/object:Gem::Dependency
-  name: standardrb
+  name: standard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.41'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.41'
 description: |
   rqrcode is a library for encoding QR Codes. The simple
   interface allows you to create QR Code data structures
@@ -104,9 +104,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/FUNDING.yml"
 - ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rspec"
+- ".standard.yml"
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
@@ -133,23 +135,23 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/whomwah/rqrcode/issues
-  changelog_uri: https://github.com/whomwah/rqrcode/blob/master/CHANGELOG.md
+  changelog_uri: https://github.com/whomwah/rqrcode/blob/main/CHANGELOG.md
 post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.6
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: A library to encode QR Codes