qr4r 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7aa78673d39ee4d055a6fb629f57748305e9465ae6448155b8b9c7c37c30450f
-  data.tar.gz: 27d52de34743e9d6d5e775b97d1bfd5c15cb8e9640d60621c242fba54fed3a2c
+  metadata.gz: a74426b25620e205b5ca9cca37692501ccec993672452e56d091a82a8b571355
+  data.tar.gz: 9d7c281ee19813164899e8e523f8e45a288e7a2a1c0fa4a954bf347c52b79d9c
 SHA512:
-  metadata.gz: b2a47b28faf09f801b787bbedafb01da0c997a57bf1d43be8895afcf654aa2f06a5d4400662088fbbb0373029b0f977813788ee1a5ba7fce98d521a9eccfc1ad
-  data.tar.gz: ae6d88740bb47720ba565b2413f3a1480f0dd6c10dfe34252e30d01311d70a6f2513024d09adc4c8b1f627d64b4dcc63ffcfdda222386db8615ed8b725af5113
+  metadata.gz: 2eef8e66397b8708b30fe7c26ec977fddec52e10932e28e458cc9d28c618a21d3d5d02af62e0056d0d0ad7c8e898c12bb210977532cad2162d6d7f47151eed3c
+  data.tar.gz: 12f0888de8bf13a4ed858e607c0d371210920229486d8410eca59dbb4a8640307ab5ed7f4d528d2c245fe141127650f5bcbe9a6fd557c86d65b177bdcfa235bd

data/.github/workflows/ruby.yml

@@ -0,0 +1,24 @@
+# This workflow uses actions that are not certified by GitHub.  They are
+# provided by a third-party and are governed by separate terms of service,
+# privacy policy, and support documentation.
+#
+# This workflow will install a prebuilt Ruby version, install dependencies, and
+# run tests and linters.
+name: "Ruby CI"
+on:
+  push:
+    branches: [ '**' ]
+jobs:
+  ruby-test:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+      - name: Ruby setup
+        uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true
+      - name: Lint
+        run: bundle exec rubocop
+      - name: Test
+        run: bundle exec rake test

data/Gemfile.lock

@@ -1,40 +1,42 @@
 PATH
   remote: .
   specs:
-    qr4r (0.6.1)
+    qr4r (0.6.2)
       mojo_magick (~> 0.6.5)
-      rqrcode_core (~> 0.1)
+      rqrcode_core (~> 1.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.2)
-    minitest (5.14.4)
-    mojo_magick (0.6.5)
-    parallel (1.20.1)
-    parser (3.0.1.0)
+    json (2.6.3)
+    minitest (5.18.0)
+    mojo_magick (0.6.7)
+    parallel (1.23.0)
+    parser (3.2.2.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.8.0)
     rexml (3.2.5)
-    rqrcode_core (0.2.0)
-    rubocop (0.93.1)
+    rqrcode_core (1.2.0)
+    rubocop (1.50.2)
+      json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 2.7.1.5)
+      parser (>= 3.2.0.0)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8)
-      rexml
-      rubocop-ast (>= 0.6.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.28.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (1.4.1)
-      parser (>= 2.7.1.5)
-    rubocop-performance (1.10.2)
-      rubocop (>= 0.90.0, < 2.0)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.28.0)
+      parser (>= 3.2.1.0)
+    rubocop-performance (1.17.1)
+      rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
-    ruby-progressbar (1.11.0)
-    unicode-display_width (1.7.0)
+    ruby-progressbar (1.13.0)
+    unicode-display_width (2.4.2)
 
 PLATFORMS
   ruby
@@ -43,8 +45,8 @@ DEPENDENCIES
   minitest (~> 5.14)
   qr4r!
   rake (~> 13.0)
-  rubocop (~> 0.93)
+  rubocop (~> 1.0)
   rubocop-performance (~> 1.8)
 
 BUNDLED WITH
-   2.1.4
+   2.2.33

data/examples/generate_qr4r.rb

@@ -1,8 +1,6 @@
 #!/usr/bin/env ruby
-
 require "qr4r"
 require "optparse"
-require "ostruct"
 
 class CmdlineOpts
   @opts = nil
@@ -11,8 +9,16 @@ class CmdlineOpts
 
   attr_reader :options
 
+  class Options
+    attr_accessor :format, :border, :pixel_size, :verbose
+
+    def to_h
+      { format: format, border: border, pixel_size: pixel_size, verbose: verbose }
+    end
+  end
+
   def initialize(args)
-    @options = OpenStruct.new
+    @options = Options.new
     @options.format = "gif"
     @options.border = 0
     @options.pixel_size = 10
@@ -46,8 +52,8 @@ class CmdlineOpts
               "Size for each qrcode pixel") do |px|
         @options.pixel_size = px.to_i
       end
-      opts.on("-v", "--[no-]verbose", "Be verbose") do |_v|
-        @options.verbose = V
+      opts.on("-v", "--[no-]verbose", "Be verbose") do |v|
+        @options.verbose = v
       end
 
       # No argument, shows at tail.  This will print an options summary.
@@ -82,5 +88,5 @@ else
     puts " and format #{options.format}"
   end
 
-  Qr4r.encode(to_encode, outfile, cmd_options.options.marshal_dump)
+  Qr4r.encode(to_encode, outfile, cmd_options.options.to_h)
 end

data/lib/qr4r/version.rb

@@ -1,3 +1,3 @@
 module Qr4r
-  VERSION = "0.6.1".freeze
+  VERSION = "0.6.2".freeze
 end

data/qr4r.gemspec

@@ -16,13 +16,13 @@ Gem::Specification.new do |s|
   s.rubyforge_project = "qr4r"
 
   s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   s.require_paths = ["lib"]
   s.add_dependency("mojo_magick", "~> 0.6.5")
-  s.add_dependency("rqrcode_core", "~> 0.1")
+  s.add_dependency("rqrcode_core", "~> 1.0")
   s.add_development_dependency("minitest", "~> 5.14")
   s.add_development_dependency("rake", "~> 13.0")
-  s.add_development_dependency("rubocop", "~> 0.93")
+  s.add_development_dependency("rubocop", "~> 1.0")
   s.add_development_dependency("rubocop-performance", "~> 1.8")
+  s.metadata["rubygems_mfa_required"] = "true"
 end

data/test/qr4r_test.rb

@@ -31,8 +31,8 @@ class Qr4rTest < MiniTest::Test
     # assert that it worked
     assert File.exist?(f)
     r = MojoMagick.get_image_size(f.path)
-    assert r[:height] == 33 * 3 + 20
-    assert r[:width] == 33 * 3 + 20
+    assert r[:height] == (33 * 3) + 20
+    assert r[:width] == (33 * 3) + 20
   end
 
   def test_encode_with_pixel_size

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qr4r
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Jon Rogers
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-01 00:00:00.000000000 Z
+date: 2023-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mojo_magick
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.93'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.93'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
@@ -101,7 +101,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".circleci/config.yml"
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rubocop-common.yml"
 - ".rubocop-performance.yml"
@@ -124,7 +124,8 @@ files:
 homepage: http://github.com/rcode5/qr4r
 licenses:
 - WTFPL
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -143,6 +144,5 @@ requirements: []
 rubygems_version: 3.0.3
 signing_key:
 specification_version: 4
-summary: qr4r-0.6.1
-test_files:
-- test/qr4r_test.rb
+summary: qr4r-0.6.2
+test_files: []

data/.circleci/config.yml

@@ -1,18 +0,0 @@
-version: 2.1
-orbs:
-  ruby: circleci/ruby@1.1.2 
-
-jobs:
-  build:
-    docker:
-      - image: circleci/ruby:2.6.3-stretch-node
-    executor: ruby/default
-    steps:
-      - checkout
-      - ruby/install-deps
-      - run:
-          name: Run unit tests using Rake
-          command: |
-            RAILS_ENV=test bundle exec rake test
-      - store_test_results:
-          path: test/reports