qrencoder 1.2.0 → 1.3.3

data/README.rdoc

@@ -20,7 +20,7 @@ UPS labels) in North America; ShotCode in the UK; and an additional format used
 in Korea. All vary in look and capacity, but QR code has one of the largest
 information densities and capacities among them with the following maximum data
 
-* Numeric	7,089
+* Numeric 7,089
 * Alphanumeric 4,296
 * 8-Bit 2,953
 * Kanji 1,817
@@ -51,19 +51,25 @@ pass to <tt>QREncoder#encode</tt>.
 This gem requires you to build the C library lib <tt>libqrcode.a</tt> available
 from http://megaui.net/fukuchi/works/qrencode/index.en.html.
 
-Normally, the build process also expects you to install <tt>libpng</tt>, but
-this is only used for the <tt>qrenc</tt> command-line utility and can be avoided
-if you run the following build sequence:
+Installation is usually as simple as:
+
+curl http://fukuchi.org/works/qrencode/qrencode-3.1.1.tar.gz | tar xz
+cd qrencode-3.1.1
+./configure
+make
+sudo make install
+
+If if worked, you should be able to type <tt>qrencode</tt> and get a help
+message.
+
+Normally, the build process also expects you to have <tt>libpng</tt>, but
+this is only used for the <tt>qrenc</tt> command-line utility and can be
+avoided if you run the following build sequence:
 
   ./configure --without-tools
   make
   sudo make install
 
-This gem also requires the following gems to be installed:
-
-* ruby-inline
-* png
-
 == INSTALLATION:
 
 * First build the <tt>libqrencode</tt> library following the instructions above.

data/ext/qrencoder_ext/extconf.rb

@@ -1,7 +1,7 @@
 require 'mkmf'
 
-dir_config("qrencode")
+dir_config("qrencoder")
 
 if have_header("qrencode.h") && have_library("qrencode", "QRinput_new")
-  create_makefile("qrencoder_ext")
+  create_makefile("qrencoder/qrencoder_ext")
 end

data/lib/qrencoder/qrcode.rb

@@ -1,4 +1,4 @@
-require 'png'
+require 'chunky_png'
 
 module QREncoder
   # Stores and represents data, points, and/or pixels for a QRCode
@@ -22,7 +22,7 @@ module QREncoder
     # [:transparent] Background transparency. Can be true or false. (default: +false+)
     #
     def png(options={})
-      PNG.new(canvas(options))
+      canvas(options)
     end
 
     ##
@@ -31,14 +31,14 @@ module QREncoder
     # Takes an optional hash of options. See QRCode#png for details.
     def canvas(options={})
       @margin = options[:margin] || 4
-      background = options[:transparent] ? PNG::Color::Background : PNG::Color::White
+      background = options[:transparent] ? ChunkyPNG::Color::TRANSPARENT : ChunkyPNG::Color::WHITE
       png_width = width + (2 * @margin)
 
-      canvas = PNG::Canvas.new(png_width, png_width, background)
+      canvas = ChunkyPNG::Image.new(png_width, png_width, background)
 
       points.each do |p|
         x, y = png_coordinates_for_point(p)
-        canvas[x,y] = PNG::Color::Black
+        canvas[x,y] = ChunkyPNG::Color::BLACK
       end
 
       canvas
@@ -47,7 +47,7 @@ module QREncoder
     private
     def png_coordinates_for_point(point)
       x = point[0] + @margin
-      y = width - 1 - point[1] + @margin
+      y = point[1] + @margin
       [x,y]
     end
   end

data/lib/qrencoder/version.rb

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

data/spec/integration_spec.rb

@@ -0,0 +1,24 @@
+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
+    end
+    it_should_behave_like "decodable" do
+      let(:message) {"Oh my! I'm amazed by technology."}
+    end
+    it_should_behave_like "decodable" do
+      let(:message) {"&*@ad!jlfj-=+"}
+    end
+  end
+end

data/spec/qrcode_spec.rb

@@ -146,15 +146,15 @@ describe QREncoder::QRCode do
   describe "#canvas" do
     let(:qrcode) { QREncoder.encode("hi") }
 
-    it "returns an instance of PNG::Canvas" do
-      qrcode.canvas.should be_kind_of(PNG::Canvas)
+    it "returns an instance of ChunkyPNG::Canvas" do
+      qrcode.canvas.should be_kind_of(ChunkyPNG::Canvas)
     end
 
     context "with no options specified" do
       subject { qrcode.canvas }
       its(:width) { should == qrcode.width + (4 * 2) }
       specify "background should be white" do
-        subject.data.first.first.should == PNG::Color::White
+        subject.get_pixel(1,1).should == ChunkyPNG::Color::WHITE
       end
     end
 
@@ -166,7 +166,7 @@ describe QREncoder::QRCode do
     context "with transparent set to true" do
       subject { qrcode.canvas(:transparent => true) }
       specify "background should be transparent" do
-        subject.data.first.first.should == PNG::Color::Background
+        subject.get_pixel(1,1).should == ChunkyPNG::Color::TRANSPARENT
       end
     end
   end
@@ -174,12 +174,12 @@ describe QREncoder::QRCode do
   describe "#png" do
     let(:qrcode) { QREncoder.encode("hi") }
 
-    it "returns an instance of PNG" do
-      qrcode.png.should be_kind_of(PNG)
+    it "returns an instance of ChunkyPNG" do
+      qrcode.png.should be_kind_of(ChunkyPNG::Image)
     end
 
     it "sends options to #canvas" do
-      canvas = PNG::Canvas.new(1,1)
+      canvas = ChunkyPNG::Canvas.new(1,1)
       options = { :margin => 5, :transparent => true }
       qrcode.should_receive(:canvas).with(options).and_return(canvas)
       qrcode.png(options)

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: qrencoder
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 2
-  - 0
-  version: 1.2.0
+  prerelease: 
+  version: 1.3.3
 platform: ruby
 authors: 
 - Jacob Harris
@@ -16,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-23 00:00:00 -06:00
+date: 2011-03-08 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,10 +23,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 4
-        - 0
         version: 2.4.0
   type: :development
   version_requirements: *id001
@@ -42,10 +34,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 7
-        - 5
         version: 0.7.5
   type: :development
   version_requirements: *id002
@@ -57,41 +45,29 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 2
-        - 20
         version: 0.2.20
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: png
+  name: zxing
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 2
-        - 0
-        version: 1.2.0
-  type: :runtime
+        version: "0.2"
+  type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: RubyInline
+  name: chunky_png
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 6
-        - 2
-        version: 3.6.2
+        version: 1.0.1
   type: :runtime
   version_requirements: *id005
 description: |-
@@ -102,20 +78,20 @@ email:
 - josh@joshuadavey.com
 executables: []
 
-extensions: []
-
+extensions: 
+- ext/qrencoder_ext/extconf.rb
 extra_rdoc_files: 
 - README.rdoc
 - ext/qrencoder_ext/qrencoder_ext.c
 files: 
 - lib/qrencoder/qrcode.rb
-- lib/qrencoder/qrencoder_ext.bundle
 - lib/qrencoder/version.rb
 - lib/qrencoder.rb
 - ext/qrencoder_ext/extconf.rb
 - ext/qrencoder_ext/qrencoder_ext.c
 - History.txt
 - README.rdoc
+- spec/integration_spec.rb
 - spec/qrcode_spec.rb
 - spec/qrencoder_spec.rb
 - spec/spec_helper.rb
@@ -133,27 +109,22 @@ 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
-      - 3
-      - 6
       version: 1.3.6
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.0
 signing_key: 
 specification_version: 3
 summary: Wrapper around the C qrencode library for creating QR Codes
 test_files: 
+- spec/integration_spec.rb
 - spec/qrcode_spec.rb
 - spec/qrencoder_spec.rb
 - spec/spec_helper.rb