rqrcode 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e194a5360a135a0ba06a0ea02e0ec9b6aa865e138e60a50176c45e148ed05178
-  data.tar.gz: bcc56e289e6f09f750409c5433d8edfb91808280c88880b99cee377743164f0b
+  metadata.gz: 46c752f56b2f26a71997009f105896a93874304e47b5453f6d399790ec5d67ee
+  data.tar.gz: 3a32e1b77c24d1118510084ad0b0f700ff54c8605c5e5cf77aca2c5efc782438
 SHA512:
-  metadata.gz: 3b1ae5e3d66ab5de484c0f70dfd21efc683d5708128516c0da28a7aefdbe6be585a2a2c1939e49591fc9a3478f7ef9dfb96da8938871f83ce97bae5077aa0e41
-  data.tar.gz: d5df60860ebe56dae982aad6f01c11cd06fea0e324d543430d6694c663200e3aa48523082cd21af7d48cf229119bc117625cd714f6104975b4e9d8d4eeb7beef
+  metadata.gz: 28ae604413d674f2c8fe6aac337aab7253874357d6d0e4e656c7e3cf743c8a65d102a5eeb8790601678d4c65172bbdd882cf1a51766d23df99b4253f0801a11d
+  data.tar.gz: 34fbe27e846970fe5b8571c446d6bee7327d46c3b645aaf07b141cf96d98c7beb918f6cc929408fd612940d260a0258c5656937f7283acbcf6cab0d00e09c082

data/.github/workflows/ruby.yml

@@ -14,10 +14,10 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest]
-        ruby: [2.5, 2.6, 2.7, 3.0]
+        ruby: ['2.6', '2.7', '3.0', '3.1', '3.2']
     runs-on: ${{ matrix.os }}
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v3
     - uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}

data/CHANGELOG.md

@@ -7,9 +7,36 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [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
+
+## [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]
+
+## [2.1.1] - 2022-02-11
+
+### Added
+
+- Added in a handler for when color arguments are passed in as symbols e.g `color: :yellow`. This also allows for the use of the `:currentColor` keyword. [#122]
+
 ## [2.1.0] - 2021-08-26
 
+### Changed
+
 - Sync Gemfile.lock with `rqrcode_core.1.2.0` [Adds Multimode Support](https://github.com/whomwah/rqrcode_core#multiple-encoding-support)
+
+### Added
+
 - Add badge for Standard linting
 
 ### Changed
@@ -43,7 +70,10 @@ 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.1.0...HEAD
+[unreleased]: https://github.com/whomwah/rqrcode/compare/v2.2.0...HEAD
+[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
 [2.1.0]: https://github.com/whomwah/rqrcode/compare/v2.0.0...v2.1.0
 [2.0.0]: https://github.com/whomwah/rqrcode/compare/v1.2.0...v2.0.0
 [1.2.0]: https://github.com/whomwah/rqrcode/compare/v1.1.1...v1.2.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rqrcode (2.1.0)
+    rqrcode (2.2.0)
       chunky_png (~> 1.0)
       rqrcode_core (~> 1.0)
 
@@ -10,49 +10,53 @@ GEM
   specs:
     ast (2.4.2)
     chunky_png (1.4.0)
-    diff-lcs (1.4.4)
-    parallel (1.20.1)
-    parser (3.0.1.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)
       ast (~> 2.4.1)
-    rainbow (3.0.0)
-    rake (13.0.3)
-    regexp_parser (2.1.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.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.1)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
+    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)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.2)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.2)
-    rubocop (1.12.1)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.0)
+    rubocop (1.40.0)
+      json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 3.0.0.0)
+      parser (>= 3.1.2.1)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.2.0, < 2.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.23.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.4.1)
-      parser (>= 2.7.1.5)
-    rubocop-performance (1.10.1)
-      rubocop (>= 0.90.0, < 2.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.0.5)
-      rubocop (= 1.12.1)
-      rubocop-performance (= 1.10.1)
-    standardrb (1.0.0)
+    standard (1.20.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.0.0)
+    unicode-display_width (2.3.0)
 
 PLATFORMS
   ruby
@@ -65,4 +69,4 @@ DEPENDENCIES
   standardrb (~> 1.0)
 
 BUNDLED WITH
-   2.2.22
+   2.3.26

data/README.md

@@ -7,7 +7,7 @@
 [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.3`
+* 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)
 
@@ -99,9 +99,9 @@ Options:
 
 offset          - Padding around the QR Code in pixels
                   (default 0)
-fill            - Background color e.g "ffffff" or :white
+fill            - Background color e.g "ffffff" or :white or :currentColor
                   (default none)
-color           - Foreground color e.g "000" or :black
+color           - Foreground color e.g "000" or :black or :currentColor
                   (default "000")
 module_size     - The Pixel size of each module
                   (defaults 11)
@@ -109,8 +109,8 @@ shape_rendering - SVG Attribute: auto | optimizeSpeed | crispEdges | geometricPr
                   (defaults crispEdges)
 standalone      - Whether to make this a full SVG file, or only an svg to embed in other svg
                   (default true)
-use_path        - Use <path> to render SVG rather than <rect> to significantly reduce size
-                  and quality. This will become the default in future versions.
+use_path        - Use <path> to render SVG rather than <rect> to significantly reduce size.
+                  This will become the default in future versions.
                   (default false)
 viewbox         - Replace the `svg.width` and `svg.height` attribute with `svg.viewBox` to
                   allow CSS scaling
@@ -143,8 +143,8 @@ The will produce a PNG using the [ChunkyPNG gem](https://github.com/wvanbergen/c
 ```
 Options:
 
-fill  - Background ChunkyPNG::Color, defaults to 'white'
-color - Foreground ChunkyPNG::Color, defaults to 'black'
+fill  - Background <ChunkyPNG::Color>, defaults to 'white'. Use [] for multi args
+color - Foreground <ChunkyPNG::Color>, defaults to 'black'. Use [] for multi args
 
 When option :file is supplied you can use the following ChunkyPNG constraints:
 
@@ -251,7 +251,7 @@ svg = qrcode.as_ansi(
 You can run the test suite using:
 
 ```
-$ ./bin/setup
+$ bundle install
 $ rake      # runs specs and standard:fix
 $ rake spec # just runs the specs
 ```
@@ -267,7 +267,7 @@ $ ./bin/console
 The project uses [standardrb](https://github.com/testdouble/standard) and can be used with:
 
 ```
-$ ./bin/setup
+$ bundle install
 $ rake standard # checks
 $ rake standard:fix # fixes
 ```

data/lib/rqrcode/export/png.rb

@@ -3,15 +3,14 @@
 require "chunky_png"
 
 # This class creates PNG files.
-# Code from: https://github.com/DCarper/rqrcode
 module RQRCode
   module Export
     module PNG
       # Render the PNG from the QR Code.
       #
       # Options:
-      # fill  - Background ChunkyPNG::Color, defaults to 'white'
-      # color - Foreground ChunkyPNG::Color, defaults to 'black'
+      # fill  - Background ChunkyPNG::Color, defaults to 'white'.
+      # color - Foreground ChunkyPNG::Color, defaults to 'black'.
       #
       # When option :file is supplied you can use the following ChunkyPNG constraints
       # color_mode  - The color mode to use. Use one of the ChunkyPNG::COLOR_* constants.
@@ -62,8 +61,8 @@ module RQRCode
 
         googleis = options.length == 0 || !options[:size].nil?
         options = default_img_options.merge(options) # reverse_merge
-        fill = ChunkyPNG::Color(options[:fill])
-        color = ChunkyPNG::Color(options[:color])
+        fill = ChunkyPNG::Color(*(options[:fill].is_a?(Array) ? options[:fill] : [options[:fill]]))
+        color = ChunkyPNG::Color(*(options[:color].is_a?(Array) ? options[:color] : [options[:color]]))
         output_file = options[:file]
         module_px_size = nil
         border_px = nil

data/lib/rqrcode/export/svg.rb

@@ -76,12 +76,18 @@ module RQRCode
             path << edge_loop_string
           end
 
-          @result << %{<path d="#{path.join}" style="fill:##{color}" transform="translate(#{offset},#{offset}) scale(#{module_size})"/>}
+          # 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})"/>}
         end
       end
 
       class Rect < BaseOutputSVG
         def build(module_size, offset, color)
+          # 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|
@@ -89,7 +95,7 @@ module RQRCode
               x = r * module_size + offset
 
               next unless @qrcode.checked?(c, r)
-              tmp << %(<rect width="#{module_size}" height="#{module_size}" x="#{x}" y="#{y}" style="fill:##{color}"/>)
+              tmp << %(<rect width="#{module_size}" height="#{module_size}" x="#{x}" y="#{y}" fill="#{color}"/>)
             end
 
             @result << tmp.join
@@ -184,7 +190,9 @@ module RQRCode
         output_tag.build(module_size, offset, color)
 
         if fill
-          output_tag.result.unshift %(<rect width="#{dimension}" height="#{dimension}" x="0" y="0" style="fill:##{fill}"/>)
+          # Prefix hexadecimal colors unless using a named color (symbol)
+          fill = "##{fill}" unless fill.is_a?(Symbol)
+          output_tag.result.unshift %(<rect width="#{dimension}" height="#{dimension}" x="0" y="0" fill="#{fill}"/>)
         end
 
         if standalone

data/lib/rqrcode/qrcode/qrcode.rb

@@ -2,7 +2,7 @@
 
 require "forwardable"
 
-module RQRCode #:nodoc:
+module RQRCode # :nodoc:
   class QRCode
     extend Forwardable
     def_delegators :@qrcode, :to_s

data/lib/rqrcode/version.rb

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

data/rqrcode.gemspec

@@ -29,7 +29,7 @@ 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.3"
+  spec.required_ruby_version = ">= 2.6"
   spec.add_dependency "rqrcode_core", "~> 1.0"
   spec.add_dependency "chunky_png", "~> 1.0"
   spec.add_development_dependency "bundler", "~> 2.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rqrcode
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Duncan Robertson
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-08-26 00:00:00.000000000 Z
+date: 2023-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rqrcode_core
@@ -115,7 +115,6 @@ files:
 - Rakefile
 - _config.yml
 - bin/console
-- bin/setup
 - images/ansi-screen-shot.png
 - images/github-qrcode.png
 - images/github-qrcode.svg
@@ -135,7 +134,7 @@ licenses:
 metadata:
   bug_tracker_uri: https://github.com/whomwah/rqrcode/issues
   changelog_uri: https://github.com/whomwah/rqrcode/blob/master/CHANGELOG.md
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -143,15 +142,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
-signing_key: 
+rubygems_version: 3.4.6
+signing_key:
 specification_version: 4
 summary: A library to encode QR Codes
 test_files: []

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