qrencoder 1.3.3 → 1.3.4

data/History.txt

@@ -1,3 +1,36 @@
+== 1.3.4 / 2011-03-08
+
+* 1 Minor enhancement
+  * Add pixels_per_module option for enlarging the PNG image by the
+    provided factor.
+
+== 1.3.3 / 2011-03-08
+
+* Fix bug with C extension location
+
+== 1.3.2 / 2011-03-08
+
+* Bugfix release. Gem erroneously included pre-compiled file.
+
+== 1.3.1 / 2011-03-08
+
+* Bugfix release
+
+== 1.3.0 / 2011-03-08
+
+* 1 Minor enhancement
+  * Use more maintain ChunkyPNG library instead of PNG
+
+== 1.2.0 / 2011-02-23
+
+* Major API change
+  * Everything is now wrapped in the QREncoder module
+  * QRCode.encode_string and QRCode.encode_string_ex are now handled
+    through a more conventional object initializer. See QRCode#initialize
+    for documentation.
+  * QREncoder includes a convenience method for creating QRCode objects.
+    See QREncoder.encode for details.
+
 == 1.0.1 / 2008-03-11
 
 * 1 Minor enhancement
@@ -7,4 +40,3 @@
 
 * Initial release
   * Wooo!
-

data/lib/qrencoder.rb

@@ -33,7 +33,7 @@ module QREncoder
   # options. The options are as follows:
   #
   # [:version] An integer representing the minimum QRCode version (default: +1+)
-  # [:correction] The amount of error correction to apply. One of +:low+, +:medium+, +:high+. (default: +:low+)
+  # [:correction] The amount of error correction to apply. One of +:low+, +:medium+, +:quarter+, +:high+. (default: +:low+)
   # [:mode] The encoding mode to use. Must be one of +:numeric+, +:alphanumeric+, +:ascii+, +:kanji+. (default: +:ascii+)
   # [:case_sensitive] Set to +false+ if case does not matter. (default: +true+)
   #
@@ -52,6 +52,7 @@ module QREncoder
     {
       :low => QR_ECLEVEL_L,
       :medium => QR_ECLEVEL_M,
+      :quarter => QR_ECLEVEL_Q,
       :high => QR_ECLEVEL_H
     }
   end

data/lib/qrencoder/qrcode.rb

@@ -13,13 +13,13 @@ module QREncoder
 
     ##
     # Returns an instance of PNG, which can be saved to a file with PNG#save or
-    # converted to a blob for inline file transfer with PNG#to_blob. For more
-    # information, see http://seattlerb.rubyforge.org/png/
+    # converted to a blob for inline file transfer with PNG#to_blob.
     #
     # Options:
     #
     # [:margin] A pixel value for the margin around each side of the code. This should be 4 or greater. (default: +4+)
     # [:transparent] Background transparency. Can be true or false. (default: +false+)
+    # [:pixels_per_module] Adjusts the entire PNG image by the given factor, integer. (default: +1+)
     #
     def png(options={})
       canvas(options)
@@ -31,24 +31,23 @@ module QREncoder
     # Takes an optional hash of options. See QRCode#png for details.
     def canvas(options={})
       @margin = options[:margin] || 4
+      ppm = options[:pixels_per_module] || 1
       background = options[:transparent] ? ChunkyPNG::Color::TRANSPARENT : ChunkyPNG::Color::WHITE
-      png_width = width + (2 * @margin)
+      png_width = (width + (2 * @margin)) * ppm
 
       canvas = ChunkyPNG::Image.new(png_width, png_width, background)
 
-      points.each do |p|
-        x, y = png_coordinates_for_point(p)
-        canvas[x,y] = ChunkyPNG::Color::BLACK
+      points.each do |point|
+        ppm.times do |x_offset|
+          x = (point[0] + @margin) * ppm + x_offset
+          ppm.times do |y_offset|
+            y = (point[1] + @margin) * ppm + y_offset
+            canvas[x,y] = ChunkyPNG::Color::BLACK
+          end
+        end
       end
 
       canvas
     end
-
-    private
-    def png_coordinates_for_point(point)
-      x = point[0] + @margin
-      y = point[1] + @margin
-      [x,y]
-    end
   end
 end

data/lib/qrencoder/version.rb

@@ -1,3 +1,3 @@
 module QREncoder
-  VERSION = '1.3.3'
+  VERSION = '1.3.4'
 end

data/spec/integration_spec.rb

@@ -2,23 +2,36 @@ require 'spec_helper'
 require 'zxing'
 
 describe QREncoder do
-  context "full integration" do
-    shared_examples_for "decodable" do
-      let(:message) { 'a message' }
-      let(:path) do
-        File.expand_path("../../tmp/integration.png", __FILE__)
-      end
-      before { File.unlink(path) if File.file?(path) }
-      it "creates decodable QRCode png files" do
-        QREncoder.encode(message).save_png(path)
-        ZXing.decode(path).should == message
-      end
+  context "integration" do
+    let(:path) { File.expand_path("../../tmp/integration.png", __FILE__) }
+    let(:options) { Hash.new }
+    let(:png) { QREncoder.encode(message).png(options) }
+    before do
+      File.unlink(path) if File.file?(path)
+      png.save(path)
     end
-    it_should_behave_like "decodable" do
+
+    subject { ZXing.decode(path) }
+
+    context "with a sentence" do
       let(:message) {"Oh my! I'm amazed by technology."}
+      it { should == message }
     end
-    it_should_behave_like "decodable" do
+
+    context "with ascii characters" do
       let(:message) {"&*@ad!jlfj-=+"}
+      it { should == message }
+    end
+
+    context "with a custom pixel per module size" do
+      let(:message) { "bigger" }
+      let(:options) do
+        { :pixels_per_module => 4, :version => 1 }
+      end
+      it { should == message }
+      it "produces a larger png width and height" do
+        png.width.should == 29 * 4
+      end
     end
   end
 end

data/spec/qrcode_spec.rb

@@ -22,12 +22,12 @@ describe QREncoder::QRCode do
 
   describe "#dup" do
     subject { QREncoder.encode("something").dup }
-    its(:width) { should == 21 } 
+    its(:width) { should == 21 }
   end
 
   describe "#width" do
     subject { QREncoder.encode("something").width }
-    it { should == 21 } 
+    it { should == 21 }
   end
 
   describe "#version" do
@@ -158,11 +158,16 @@ describe QREncoder::QRCode do
       end
     end
 
-    context "with margin option of 8" do
+    context "with margin of 8" do
       subject { qrcode.canvas(:margin => 8) }
       its(:width) { should == qrcode.width + (8 * 2) }
     end
 
+    context "with pixels-per-module of 2" do
+      subject { qrcode.canvas(:pixels_per_module => 2) }
+      its(:width) { should == (qrcode.width + 8) * 2 }
+    end
+
     context "with transparent set to true" do
       subject { qrcode.canvas(:transparent => true) }
       specify "background should be transparent" do

metadata

@@ -2,7 +2,7 @@
 name: qrencoder
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.3.3
+  version: 1.3.4
 platform: ruby
 authors: 
 - Jacob Harris
@@ -56,7 +56,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "0.2"
+        version: 0.2.1
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -67,7 +67,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.0.1
+        version: 1.1.0
   type: :runtime
   version_requirements: *id005
 description: |-
@@ -119,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.0
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Wrapper around the C qrencode library for creating QR Codes