rqrcode 1.0.1 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0db16b2bfb687e737b0059398da5727e95ded9567b62027639069c5b52b1924a
-  data.tar.gz: 29b82466d2dd00f773968b6d9219643e3801dadfae0dea062eb7c1a5de3c6295
+  metadata.gz: 818b3dab2ed7719eb45d3c4b02704258e92f4de8ec0fe4f7e9cbb62765aad507
+  data.tar.gz: 50efa7d1fe21cce41ea38d44b4864290110281fcfc6c575267550440acb7f41a
 SHA512:
-  metadata.gz: 90c75c5fc56d6d64be3b4896e40227a25394d7206c3afe3fe6940b7d91a2ecf1b7a158b9f096a0a7ab1e3d36ef6c65cd92fc9e77642e550dc53bc90c3452e711
-  data.tar.gz: 04f456be8601ea85f3fe79a4fb4f97a04dc23d93437719e5fceb24e4ba386572b33c87820c8a1f9102d6ad4f7c69cde25f9396da6e278bf50c629ad6f4eaa111
+  metadata.gz: fbda3d6822ef41ce25fed16754a921ea964c8a5fcfe629975146d1733de49f08dc337fc6b2f2213160289d623618961eb04a5531a22329ade90ac0ba777f57ed
+  data.tar.gz: 1834cab154c5819319ccd2cb22e7c8fddaa6dcd680648693e29e8ce98cb9f92a0d12c5f8072f9fa40ae09b0ffcecafa02ede7a7d26fef611397a3f693e4d9512

data/.github/workflows/ruby.yml

@@ -1,19 +1,30 @@
 name: rqrcode
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+    - master
+    - release/*
+  pull_request:
+    branches:
+    - master
 
 jobs:
   build:
-
-    runs-on: ubuntu-latest
+    name: Test Ruby ${{ matrix.ruby_version }} on ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        ruby_version: [2.5.x, 2.6.x]
+        os: [ubuntu-latest]
 
     steps:
     - uses: actions/checkout@v1
-    - name: Set up Ruby 2.6
+    - name: Use Ruby ${{ matrix.ruby_version }}
       uses: actions/setup-ruby@v1
       with:
-        ruby-version: 2.6.x
-    - name: Build and test with Rake
+        ruby-version: ${{ matrix.ruby_version }}
+    - name: Gem install and test
       run: |
         gem install bundler
         bundle install --jobs 4 --retry 3

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--require spec_helper

data/README.md

@@ -125,14 +125,16 @@ qrcode = RQRCode::QRCode.new("http://github.com/")
 
 # NOTE: showing with default options specified explicitly
 png = qrcode.as_png(
-  resize_gte_to: false,
-  resize_exactly_to: false,
-  fill: 'white',
-  color: 'black',
-  size: 120,
+  bit_depth: 1,
   border_modules: 4,
+  color_mode: ChunkyPNG::COLOR_GRAYSCALE,
+  color: 'black',
+  file: nil,
+  fill: 'white',
   module_px_size: 6,
-  file: nil # path to write
+  resize_exactly_to: false,
+  resize_gte_to: false,
+  size: 120
 )
 
 IO.write("/tmp/github-qrcode.png", png.to_s)

data/lib/rqrcode/export/png.rb

@@ -6,8 +6,7 @@ require 'chunky_png'
 module RQRCode
   module Export
     module PNG
-      #
-      # Render the PNG from the Qrcode.
+      # Render the PNG from the QR Code.
       #
       # There are two sizing algoritams.
       #
@@ -20,6 +19,12 @@ module RQRCode
       # 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. defaults to 'ChunkyPNG::COLOR_GRAYSCALE'
+      # bit_depth   - The bit depth to use. This option is only used for indexed images. defaults to '1' bit
+      # interlace   - Whether to use interlacing (true or false). defaults to ChunkyPNG default
+      # compression - The compression level for Zlib. This can be a value between 0 and 9, or a Zlib constant like Zlib::BEST_COMPRESSION, defaults to ChunkyPNG defaults
+      #
       # *Googleis*
       # size            - Total size of PNG in pixels. The module size is calculated so it fits. (defaults to 90)
       # border_modules  - Width of white border around in modules. (defaults to 4).
@@ -35,24 +40,23 @@ module RQRCode
       #
       def as_png(options = {})
         default_img_options = {
-          :resize_gte_to => false,
-          :resize_exactly_to => false,
-          :fill => 'white',
-          :color => 'black',
-          :size => 120,
-          :border_modules => 4,
-          :file => false,
-          :module_px_size => 6
+          bit_depth: 1,
+          border_modules: 4,
+          color_mode: ChunkyPNG::COLOR_GRAYSCALE,
+          color: 'black',
+          file: false,
+          fill: 'white',
+          module_px_size: 6,
+          resize_exactly_to: false,
+          resize_gte_to: false,
+          size: 120
         }
 
         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])
         output_file = options[:file]
-
         module_px_size = nil
         border_px = nil
         png = nil
@@ -103,10 +107,16 @@ module RQRCode
           png = png.resize(resize_to, resize_to)
         end
 
-
         if output_file
-          png.save(output_file,{ :color_mode => ChunkyPNG::COLOR_GRAYSCALE, :bit_depth =>1})
+          constraints = {
+            color_mode: options[:color_mode],
+            bit_depth: options[:bit_depth]
+          }
+          constraints[:interlace]   = options[:interlace]   if options.has_key?(:interlace)
+          constraints[:compression] = options[:compression] if options.has_key?(:compression)
+          png.save(output_file, constraints)
         end
+
         png
       end
     end

data/lib/rqrcode/version.rb

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

data/rqrcode.gemspec

@@ -29,8 +29,8 @@ EOF
 
   spec.required_ruby_version = '~> 2.3'
   spec.add_dependency 'rqrcode_core', '~> 0.1.0'
-  spec.add_dependency 'chunky_png', "~> 1.0"
-  spec.add_development_dependency "bundler", "~> 2.0"
-  spec.add_development_dependency "rake", "~> 12.0"
-  spec.add_development_dependency "minitest", "~> 5.0"
+  spec.add_dependency 'chunky_png', '~> 1.0'
+  spec.add_development_dependency 'bundler', '~> 2.0'
+  spec.add_development_dependency 'rake', '~> 12.0'
+  spec.add_development_dependency 'rspec', '~> 3.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rqrcode
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.1
 platform: ruby
 authors:
 - Duncan Robertson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-18 00:00:00.000000000 Z
+date: 2019-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rqrcode_core
@@ -67,19 +67,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '12.0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '3.5'
 description: |
   rqrcode is a library for encoding QR Codes. The simple
   interface allows you to create QR Code data structures
@@ -92,6 +92,7 @@ extra_rdoc_files: []
 files:
 - ".github/workflows/ruby.yml"
 - ".gitignore"
+- ".rspec"
 - Gemfile
 - LICENSE.txt
 - README.md