rqrcode-with-patches 0.5.5 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9837d6427a26ac797834219b246f4e9efd5e59a
-  data.tar.gz: dfa07d676b0084f75aac78ae13d51ab6b23cfdfa
+  metadata.gz: abc10cb5ee81f0afc70beb9f0e0cd9890bb02755
+  data.tar.gz: c16250d3b3d9d06007bd23158dd9038b16b6a41c
 SHA512:
-  metadata.gz: e2b433a5481255b1fc13f46194274af6d994969794b47860aa06aedc8f9a4918ffaccc5f68329636892d977b1004e48058bca50f36f2e5236e296fc1712f03e0
-  data.tar.gz: b5ac381cfc7e18301be81f86eeb446c1408fa97000c2c64da38bf9c2d2c1e5f6202027a644fbd0273256da4d9fbf1da3eaa450534ced13984e49b9a73b08d033
+  metadata.gz: 267298865c535f3e34cf1770829fd022f3db3378d29af1fbda2631b123024d73cebb0ccf34cf555258fdb684b5cd0ea773fb4b651930ad54d288c9d3d7d3c731
+  data.tar.gz: aff62020abe5b791b088b7d205a994bbba96bb3182fcfe8a3876053c288c0198bbce58411fba54daefd8b40d06d5b31c6bd412a7a099ea26d3e46ed7b0f7deb2

data/.travis.yml

@@ -0,0 +1,9 @@
+language: ruby
+rvm:
+  - 2.2.0
+  - 2.1.0
+  - 2.0.0
+  - 1.9.3
+  - 1.8.7
+  - jruby-18mode
+  - jruby-19mode

data/CHANGELOG

@@ -1,3 +1,8 @@
+*0.6.0* (Jun 2, 2015)
+
+- Improved png rendering. Previous png rendering could result in hard to scan qrcodes.
+  *Big thanks to Bart Jedrocha*
+
 *0.5.5* (Apr 25, 2015)
 
 - Fixed major bug. The rs block data was missing resulting in qr codes failing to be generated.

data/Gemfile

@@ -1,5 +1,9 @@
-source 'http://rubygems.org'
-gemspec
+source 'https://rubygems.org'
 
+gem "chunky_png"
 
-gem "chunky_png"
+group :test, :development do
+  gem 'rake'
+  gem 'test-unit'
+  gem 'minitest'
+end

data/README.md

@@ -1,10 +1,17 @@
-# rQRCode, Encode QRCodes
+# rQRCode, Encode QRCodes 
+
+[![Build Status](https://travis-ci.org/bjornblomqvist/rqrcode.svg?branch=master)](https://travis-ci.org/bjornblomqvist/rqrcode)
 
 I have republished this gem as rqrcode-with-patches as Duncan seams to have abandoned the project.
 You can find the original project here: http://github.com/whomwah/rqrcode
 
 ## Short changelog
 
+*0.6.0* (Jun 2, 2015)
+
+- Improved png rendering. Previous png rendering could result in hard to scan qrcodes.
+  *Big thanks to Bart Jedrocha*
+
 *0.5.5* (Apr 25, 2015)
 
 - Fixed major bug. The rs block data was missing resulting in qr codes failing to be generated.

data/lib/rqrcode/export/png.rb

@@ -8,10 +8,25 @@ module RQRCode
 
       # Render the PNG from the Qrcode.
       #
-      # Options:
-      # module_px_size  - Image size, in pixels.
+      # There are two sizing algoritams.
+      #
+      # - Original that can result in blurry and hard to scan images
+      # - Google's Chart API inspired sizing that risizes the module size to fit within the given image size.
+      # 
+      # The Googleis one will be used when no options are given or when the new size option is used.
+      #
+      # Options: 
       # fill  - Background ChunkyPNG::Color, defaults to 'white'
       # color - Foreground ChunkyPNG::Color, defaults to 'black'
+      #
+      # *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).
+      #
+      #  -- DONT USE border_modules OPTION UNLESS YOU KNOW ABOUT THE QUIET ZONE NEEDS OF QR CODES --
+      #
+      # *Original*
+      # module_px_size  - Image size, in pixels.
       # border - Border thickness, in pixels
       #
       # It first creates an image where 1px = 1 module, then resizes.
@@ -24,30 +39,53 @@ module RQRCode
           :resize_exactly_to => false,
           :fill => 'white',
           :color => 'black',
+          :size => 120,
           :border_modules => 4,
           :file => false,
           :module_px_size => 6
         }
+        
+        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]
-        border = options[:border_modules]
-        total_border = border * 2
-        module_px_size = if options[:resize_gte_to]
-          (options[:resize_gte_to].to_f / (self.module_count + total_border).to_f).ceil.to_i
+        
+        module_px_size = nil
+        border_px = nil
+        png = nil
+        
+        if googleis
+          total_image_size = options[:size]
+          border_modules = options[:border_modules]
+
+          module_px_size = (total_image_size.to_f / (self.module_count + 2 * border_modules).to_f).floor.to_i
+
+          img_size = module_px_size * self.module_count
+
+          remaining = total_image_size - img_size
+          border_px = (remaining / 2.0).floor.to_i
+
+          png = ChunkyPNG::Image.new(total_image_size, total_image_size, fill)
         else
-          options[:module_px_size]
-        end
-        border_px = border *  module_px_size
-        total_border_px = border_px * 2
-        resize_to = options[:resize_exactly_to]
+          border = options[:border_modules]
+          total_border = border * 2
+          module_px_size = if options[:resize_gte_to]
+            (options[:resize_gte_to].to_f / (self.module_count + total_border).to_f).ceil.to_i
+          else
+            options[:module_px_size]
+          end
+          border_px = border *  module_px_size
+          total_border_px = border_px * 2
+          resize_to = options[:resize_exactly_to]
 
-        img_size = module_px_size * self.module_count
-        total_img_size = img_size + total_border_px
+          img_size = module_px_size * self.module_count
+          total_img_size = img_size + total_border_px
 
-        png = ChunkyPNG::Image.new(total_img_size, total_img_size, fill)
+          png = ChunkyPNG::Image.new(total_img_size, total_img_size, fill)
+        end
 
         self.modules.each_index do |x|
           self.modules.each_index do |y|
@@ -60,8 +98,11 @@ module RQRCode
             end
           end
         end
+        
+        if !googleis && resize_to
+          png = png.resize(resize_to, resize_to)  
+        end
 
-        png = png.resize(resize_to, resize_to) if resize_to
 
         if output_file
           png.save(output_file,{ :color_mode => ChunkyPNG::COLOR_GRAYSCALE, :bit_depth =>1})

data/lib/rqrcode/version.rb

@@ -1,3 +1,3 @@
 module RQRCode
-  VERSION = "0.5.5"
+  VERSION = "0.6.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rqrcode-with-patches
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.6.0
 platform: ruby
 authors:
 - Bjorn Blomqvist and others
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-25 00:00:00.000000000 Z
+date: 2015-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chunky_png
@@ -67,6 +67,7 @@ extra_rdoc_files:
 - LICENSE
 files:
 - .gitignore
+- .travis.yml
 - CHANGELOG
 - Gemfile
 - LICENSE