qr4r 0.3.5 → 0.4.0

data/.gitignore

@@ -0,0 +1,2 @@
+.bundle/
+*~

data/Gemfile

@@ -1,2 +1,2 @@
-source :rubygems
-gemspec 
+source 'https://rubygems.org'
+gemspec 

data/Gemfile.lock

@@ -0,0 +1,20 @@
+PATH
+  remote: .
+  specs:
+    qr4r (0.4.0)
+      mojo_magick
+      rqrcode
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    mojo_magick (0.5.4)
+    rake (10.1.0)
+    rqrcode (0.4.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  qr4r!
+  rake

data/README.md

@@ -44,6 +44,19 @@ Add a fat border
 
 NOTE: The current implementation or rQRCode (and therefore this wrapper library) supports encoding up to 119 characters.  Beyond that, you'll need something a bit more sophisticated.
 
+## Wanna try it out?
+
+Check out the Sinatra test app here: https://github.com/rcode5/qr4r_test_app
+
+
+## Versions/Changelog
+
+#### 0.4.0
+
+* Moved to new mojo_magick gem
+* no longer ruby 1.8.7 compatible
+* fixed issue with border coming out black
+
 ## Authors
 
 Original author: [Jon Rogers](http://github.com/bunnymatic) [at rcode5](http://www.rcode5.com)

data/examples/generate_qr4r.rb

@@ -0,0 +1,78 @@
+#!/usr/bin/env ruby
+
+require 'qr4r'
+require 'optparse'
+require 'ostruct'
+
+class CmdlineOpts
+
+  @opts = nil
+
+  ALLOWED_FORMATS = %w(jpg jpeg gif tif tiff png)
+
+  attr_reader :options
+
+  def initialize(args)
+    @options = OpenStruct.new
+    @options.format = "gif"
+    @options.border = 0
+    @options.pixel_size = 10
+    @options.verbose = false
+
+    @opts = OptionParser.new do |opts|
+      opts.banner = "Usage: $0 [options] outfile the stuff to encode"
+
+      opts.separator ""
+
+      # Mandatory argument.
+      opts.on("-f", "--format FILE_FORMAT", ALLOWED_FORMATS, "Output qrcode image format (default: gif)", " (#{ALLOWED_FORMATS.join ', '})") do |fmt|
+        @options.format = fmt
+      end
+      opts.on("-b", "--border N",
+              "Render with a border of this size") do |border|
+        @options.border = border.to_i
+      end
+      opts.on("-p", "--pixelsize N",
+              "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
+      end
+
+      # No argument, shows at tail.  This will print an options summary.
+      # Try it and see!
+      opts.on_tail("-h", "--help", "Show this message") do
+        puts opts
+        exit
+      end
+    end
+
+    @opts.parse!(args)
+
+  end  # parse()
+  
+  def help
+    puts @opts
+  end
+
+end 
+
+cmd_options = CmdlineOpts.new(ARGV)
+
+if ARGV.length < 2
+  cmd_options.help
+else
+  outfile = ARGV.shift
+  to_encode = ARGV.join ' '
+  options = cmd_options.options
+
+  if options.verbose
+    print "Encoding \"#{to_encode}\" to file #{outfile}"
+    print " with border #{options.border}"  if options.border > 0
+    print " and pixel_size #{options.pixel_size}"
+    puts " and format #{options.format}"
+  end
+
+  Qr4r::encode(to_encode, outfile, cmd_options.options.marshal_dump)
+end

data/lib/qr4r.rb

@@ -25,58 +25,66 @@ module Qr4r
   #   size = 9, max string length = 98
   #   size = 10, max string length = 119
 
+  SIZE_RESTRICTIONS = [0, 7, 14, 24, 34, 44, 58, 64, 84, 98, 119] 
+
   def self.encode(str, outfile, *rest)
     opts = rest[0] if rest && rest.length > 0
-    opts = opts || {} 
-    if !opts[:size]
-      opts.merge!({:size => compute_size(str)})
-    end
-    if !opts[:pixel_size]
-      opts.merge!({:pixel_size => 3})
-    end
-    qr = RQRCode::QRCode.new(str, opts)
-    data = []
-    qr.modules.each_index do |x|
-      qr.modules.each_index do |y|
-        if qr.dark?(x,y)
-          3.times { data << 0 }
-        else
-          3.times { data << 255 }
+    opts ||= {} 
+    opts.merge!({:size => compute_size(str)}) unless opts[:size]
+    opts.merge!({:pixel_size => 3}) unless opts[:pixel_size]
+    qr, data = build_qr_code(str, opts)
+    create_image(qr,data,outfile,opts)
+  end
+
+  class << self
+    private
+    def build_qr_code(str,opts)
+      qr = RQRCode::QRCode.new(str, opts)
+      data = [].tap do |data|
+        qr.modules.each_index do |x|
+          qr.modules.each_index do |y|
+            if qr.dark?(x,y)
+              3.times { data << 0 }
+            else
+              3.times { data << 255 }
+            end
+          end
         end
       end
+      [qr, data]
     end
-    MojoMagick::convert do |c|
-      d = data.pack 'C'*data.size
-      c.blob(d, :format => :rgb, :depth => 8, :size => ("%dx%d" % [qr.modules.size, qr.modules.size]))
-      if opts[:pixel_size]
-        wd = qr.modules.size * opts[:pixel_size].to_i
-        c.scale "%dx%d" % [ wd, wd ]
-      end
-      if opts[:border]
-        border = opts[:border].to_i
-        c.bordercolor '"#ffffff"'
-        c.border '%dx%d' % [ border, border ]
+
+    def create_image(qr, data, outfile, opts) 
+      MojoMagick::convert do |c|
+        d = data.pack 'C'*data.size
+        c.blob(d, :format => :rgb, :depth => 8, :size => ("%dx%d" % [qr.modules.size, qr.modules.size]))
+        if opts[:pixel_size]
+          wd = qr.modules.size * opts[:pixel_size].to_i
+          c.scale "%dx%d" % [ wd, wd ]
+        end
+        if opts[:border]
+          border = opts[:border].to_i
+          c.bordercolor 'white'
+          c.border '%dx%d' % [ border, border ]
+        end
+        c.file outfile
       end
-      c.file outfile
     end
-  end
 
-  private
-  SIZE_RESTRICTIONS = [0, 7, 14, 24, 34, 44, 58, 64, 84, 98, 119] 
 
-  def self.compute_size(str)
-    slen = str.size
-    size = 4
-    ii = 0
-    while ii < SIZE_RESTRICTIONS.length do
-      if slen < SIZE_RESTRICTIONS[ii]
-        break
+    def compute_size(str)
+      slen = str.size
+      ii = 0
+      while ii < SIZE_RESTRICTIONS.length do
+        if slen < SIZE_RESTRICTIONS[ii]
+          break
+        end
+        ii+=1
       end
-      ii+=1
-    end
-    if ii > 10
-      raise "Your string is too big for this encoder.  It should be less than #{SIZE_RESTRICTIONS.last} characters"
+      if ii > 10
+        raise "Your string is too big for this encoder.  It should be less than #{SIZE_RESTRICTIONS.last} characters"
+      end
+      return ii
     end
-    return ii
   end
 end

data/lib/qr4r/version.rb

@@ -1,3 +1,3 @@
 module Qr4r
-  VERSION = '0.3.5'
+  VERSION = '0.4.0'
 end

data/test/qr4r_test.rb

@@ -100,7 +100,7 @@ class Qr4rTest < Test::Unit::TestCase
   end
 
   def test_compute_size
-    test_sizes =   [ 7, 14, 24, 34, 44, 58, 64, 84, 98]
+    test_sizes = [ 7, 14, 24, 34, 44, 58, 64, 84, 98]
     test_sizes.each_with_index do |sz, idx|
       str = 'a'*(sz-1)
       assert Qr4r.send(:compute_size, str) == idx+1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qr4r
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-29 00:00:00.000000000 Z
+date: 2013-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rqrcode
@@ -66,10 +66,13 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- .gitignore
 - .rvmrc
 - Gemfile
+- Gemfile.lock
 - README.md
 - Rakefile
+- examples/generate_qr4r.rb
 - init.rb
 - lib/qr4r.rb
 - lib/qr4r.rb~
@@ -89,17 +92,23 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3751263750711033208
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3751263750711033208
 requirements: []
 rubyforge_project: qr4r
 rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: qr4r-0.3.5
+summary: qr4r-0.4.0
 test_files:
 - test/qr4r_test.rb