pngqr 0.3 → 0.4

data/CHANGELOG

@@ -1,3 +1,5 @@
+v0.4. Auto-sizing output, border support
+
 v0.3. fix default scale=1.0 bug
 
 v0.2. Add output file and scaling support

data/README

@@ -16,12 +16,17 @@ Example:
   Pngqr.encode 'https://github.com/andys', :file => 'output.png'
 
 The parameters for encode() are the same as the rqrcode gem's new(), except:
+
 1. we add :file if you want to output to a file instead of returning the PNG as
 a blob, and
+
 2. you can :scale with an integer parameter and it will scale up the output
 image by that many times.
-See: http://whomwah.github.com/rqrcode/
 
+3. if you don't supply a :size, we auto-size by testing each size until we
+find the one that worked.  It seems quick enough.
+
+4. :border=>n lets you add an n pixel white border to the PNG
 
 
 Dependencies
@@ -29,6 +34,8 @@ Dependencies
 
 Gems: rqrcode and chunky_png (both pure ruby gems)
 
+See: http://whomwah.github.com/rqrcode/
+
 
 
 

data/lib/pngqr.rb

@@ -6,20 +6,38 @@ class Pngqr
   class << self
 
     def encode(*opts)
+      opthash = {}
       if Hash===opts.last
-        @filename = opts.last.delete(:file) 
-        @scale = opts.last.delete(:scale)
+        opthash = opts.pop
+        @filename = opthash.delete(:file) 
+        @scale = opthash.delete(:scale)
+        @border = opthash.delete(:border)
       end
       @scale ||= 1
+      @border ||= 0
 
-      qr = RQRCode::QRCode.new(*opts)
+      qr = nil
+      if(opthash[:size]) # user supplied size
+        qr = RQRCode::QRCode.new(*opts, opthash)
+      else
+        # autosize algorithm: start at size=1 and increment until it worked
+        opthash[:size] = 1
+        while qr.nil?
+          qr = begin
+            RQRCode::QRCode.new(*opts, opthash)
+          rescue RQRCode::QRCodeRunTimeError => e
+            opthash[:size] += 1
+            raise unless e.to_s =~ /overflow/ && opthash[:size] <= 40
+          end
+        end
+      end
       len = qr.module_count
-      png = ChunkyPNG::Image.new(len*@scale, len*@scale, ChunkyPNG::Color::WHITE)
+      png = ChunkyPNG::Image.new(len*@scale + 2*@border, len*@scale + 2*@border, ChunkyPNG::Color::WHITE)
       
       for_each_pixel(len) do |x,y|
         if qr.modules[y][x]
           for_each_scale(x, y, @scale) do |scaled_x, scaled_y|
-            png[scaled_x, scaled_y] = ChunkyPNG::Color::BLACK
+            png[scaled_x + @border, scaled_y + @border] = ChunkyPNG::Color::BLACK
           end
         end
       end

data/pngqr.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{pngqr}
-  s.version = "0.3"
+  s.version = "0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andrew Snow"]
-  s.date = %q{2011-03-08}
+  s.date = %q{2011-03-17}
   s.description = %q{Ruby Gem to generate PNG files with QR codes in them}
   s.email = %q{andrew@modulus.org}
   s.extra_rdoc_files = ["CHANGELOG", "README", "lib/pngqr.rb"]
@@ -15,11 +15,10 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Pngqr", "--main", "README"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{pngqr}
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{Ruby Gem to generate PNG files with QR codes in them}
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

metadata

@@ -1,11 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: pngqr
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 3
-  version: "0.3"
+  prerelease: 
+  version: "0.4"
 platform: ruby
 authors: 
 - Andrew Snow
@@ -13,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-08 00:00:00 +11:00
+date: 2011-03-17 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,8 +21,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id001
@@ -37,8 +32,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id002
@@ -78,22 +71,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 2
       version: "1.2"
 requirements: []
 
 rubyforge_project: pngqr
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Ruby Gem to generate PNG files with QR codes in them