zbar 0.1.1 → 0.2.0

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--format documentation

data/.travis.yml

@@ -0,0 +1,15 @@
+nguage: ruby
+rvm:
+  - 2.0.0
+  - 1.9.3
+  - 1.9.2
+  - jruby-18mode
+  - jruby-19mode
+  - rbx-18mode
+  - rbx-19mode
+  - ruby-head
+  - jruby-head
+  - 1.8.7
+  - ree
+before_install:
+  - sudo apt-get install libzbar-dev

data/Gemfile

@@ -0,0 +1,11 @@
+source 'https://rubygems.org'
+
+group :development do
+  gem "rspec", "~> 2.12.0"
+  gem "rspec", "~> 2.12.0"
+  gem "rdoc", "~> 3.12"
+  gem "bundler", "~> 1.0"
+  gem "jeweler", "~> 1.8.4"
+end
+
+gem "ffi", ">= 1.0.0"

data/README.rdoc

@@ -1,7 +1,7 @@
 = zbar
 by Will Glynn
 
-http://github.com/delta407/ruby-zbar
+http://github.com/willglynn/ruby-zbar
 
 == DESCRIPTION:
 
@@ -56,4 +56,4 @@ Doesn't expose all ZBar functionality, including:
 
 == Copyright
 
-Copyright (c) 2010 Will Glynn. See LICENSE for details.
+Copyright (c) 2010-2013 Will Glynn. See LICENSE for details.

data/Rakefile

@@ -1,48 +1,37 @@
-require 'rubygems'
-require 'rake'
+# encoding: utf-8
 
+require 'rubygems'
+require 'bundler'
 begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "zbar"
-    gem.summary = "Ruby bindings for ZBar, a barcode recognition library"
-    gem.description ="Ruby bindings for ZBar, a barcode recognition library. Uses FFI to interact with the underlying C library, but has no other dependencies."
-    gem.email = "will@willglynn.com"
-    gem.homepage = "http://github.com/delta407/ruby-zbar"
-    gem.authors = ["Will Glynn"]
-    gem.add_development_dependency "thoughtbot-shoulda", ">= 0"
-    gem.add_dependency "ffi", ">= 0"
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
+  Bundler.setup(:default, :development)
+rescue Bundler::BundlerError => e
+  $stderr.puts e.message
+  $stderr.puts "Run `bundle install` to install missing gems"
+  exit e.status_code
 end
+require 'rake'
 
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
+require 'jeweler'
+Jeweler::Tasks.new do |gem|
+  gem.name = "zbar"
+  gem.summary = "Ruby bindings for ZBar, a barcode recognition library"
+  gem.description ="Ruby bindings for ZBar, a barcode recognition library. Uses FFI to interact with the underlying C library, but has no other dependencies."
+  gem.email = "will@willglynn.com"
+  gem.homepage = "http://github.com/delta407/ruby-zbar"
+  gem.authors = ["Will Glynn"]
+  # dependencies defined in Gemfile
 end
+Jeweler::RubygemsDotOrgTasks.new
 
-begin
-  require 'rcov/rcovtask'
-  Rcov::RcovTask.new do |test|
-    test.libs << 'test'
-    test.pattern = 'test/**/test_*.rb'
-    test.verbose = true
-  end
-rescue LoadError
-  task :rcov do
-    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
-  end
+require 'rspec/core'
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.pattern = FileList['spec/**/*_spec.rb']
 end
 
-task :test => :check_dependencies
-
-task :default => :test
+task :default => :spec
 
-require 'rake/rdoctask'
+require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.2.0

data/lib/zbar.rb

@@ -4,3 +4,4 @@ require 'zbar/lib'
 require 'zbar/symbol'
 require 'zbar/processor'
 require 'zbar/image'
+require 'zbar/jpeg'

data/lib/zbar/image.rb

@@ -17,6 +17,9 @@ module ZBar
     # and convert it into a greyscale image suitable for further processing.
     # This conversion may fail if ZBar was not built with <tt>--with-jpeg</tt>.
     def self.from_jpeg(io_or_string)
+      raise "JPEG support is not available in your copy of libzbar" unless ZBar::JPEG.available?
+      ZBar::JPEG.warn_once_if_bugged
+      
       if io_or_string.respond_to?(:read)
         io_or_string = io_or_string.read
       end
@@ -37,10 +40,17 @@ module ZBar
     # http://netpbm.sourceforge.net/doc/pgm.html.
     def self.from_pgm(io_or_string)
       if io_or_string.respond_to?(:read)
-        io_or_string = io_or_string.read
+        string = io_or_string.read
+      else
+        string = io_or_string
       end
       
-      image_data = io_or_string.gsub(/^(P5)\s([0-9]+)\s([0-9]+)\s([0-9]+)\s/, '')
+      # Ensure we're in binary mode
+      if string.respond_to? :force_encoding
+        string.force_encoding 'binary'
+      end
+      
+      image_data = string.gsub(/^(P5)\s([0-9]+)\s([0-9]+)\s([0-9]+)\s/, '')
       if $1 != 'P5'
         raise ArgumentError, "input must be a PGM file"
       end
@@ -90,13 +100,30 @@ module ZBar
     end
     
     # Attempt to recognize barcodes in this image, using the supplied processor
-    # (if any), falling back to defaults.
+    # or processor configuration (if any), falling back to defaults.
     #
     # Returns an array of ZBar::Symbol objects.
-    def process(processor = nil)
-      processor ||= Processor.new
+    def process(processor_or_config = nil)
+      if processor_or_config.respond_to?(:process)
+        processor = processor_or_config
+      elsif processor_or_config.nil?
+        processor = Processor.new
+      else
+        processor = Processor.new(processor_or_config)
+      end
+
       processor.process(self)
     end
+    
+    # Retrieve the image's width in pixels
+    def width
+      ZBar.zbar_image_get_width(@img)
+    end
+    
+    # Retrieve the image's height in pixels
+    def height
+      ZBar.zbar_image_get_height(@img)
+    end
   end
 
 end

data/lib/zbar/jpeg.rb

@@ -0,0 +1,57 @@
+# zbar-0.10 has a problem handling certain JPEGs:
+# * http://sourceforge.net/p/zbar/discussion/664596/thread/58b8d79b
+# * https://github.com/willglynn/ruby-zbar/issues/2
+#
+# This is a problem in the underlying C library. It is fixed in zbar's source
+# control repository, but an updated package has not yet been released.
+#
+# If this affects you, ask whoever compiled your libzbar to apply this patch:
+# https://gist.github.com/willglynn/5659946
+
+module ZBar::JPEG
+  # Is JPEG support available?
+  def self.available?
+    if @available.nil?
+      @available = image_works?(WorkingBits)
+    end
+    
+    @available
+  end
+  
+  # Is JPEG support bugged?
+  # See https://github.com/willglynn/ruby-zbar/issues/2 for details.
+  def self.bugged?
+    if @bugged.nil?
+      @bugged = available? && !image_works?(BuggedBits)
+    end
+    
+    @bugged
+  end
+  
+  def self.warn_once_if_bugged #:nodoc:
+    @warn_attempted ||= begin
+      if bugged?
+        STDERR.print "Your libzbar has a JPEG bug. Some images will fail to process correctly.\nSee: https://github.com/willglynn/ruby-zbar/blob/master/lib/zbar/jpeg.rb\n"
+      end
+      true
+    end
+  end
+
+  protected
+  WorkingBits = "\377\330\377\340\000\020JFIF\000\001\001\000\000\001\000\001\000\000\377\333\000C\000\e\032\032)\035)A&&AB///BG?>>?GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG\377\333\000C\001\035))4&4?((?G?5?GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG\377\300\000\021\b\000\b\000\b\003\001\"\000\002\021\001\003\021\001\377\304\000\025\000\001\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\006\377\304\000\024\020\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\377\304\000\024\001\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\377\304\000\024\021\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\377\332\000\f\003\001\000\002\021\003\021\000?\000\246\000\037\377\331"
+  BuggedBits = "\377\330\377\340\000\020JFIF\000\001\002\000\000d\000d\000\000\377\354\000\021Ducky\000\001\000\004\000\000\000\000\000\000\377\356\000\016Adobe\000d\300\000\000\000\001\377\333\000\204\000\e\032\032)\035)A&&AB///BG?>>?GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG\001\035))4&4?((?G?5?GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG\377\300\000\021\b\000\b\000\b\003\001\"\000\002\021\001\003\021\001\377\304\000K\000\001\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\006\001\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\020\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\021\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\377\332\000\f\003\001\000\002\021\003\021\000?\000\246\000\037\377\331"
+  
+  def self.image_works?(bits) #:nodoc:
+    ZBar::Image.new.tap { |img|
+      img.set_data(ZBar::Format::JPEG, bits)
+      img.convert(ZBar::Format::Y800)
+    } && true
+  rescue ArgumentError
+    if $!.to_s == "conversion failed"
+      false
+    else
+      raise
+    end
+  end
+  
+end

data/lib/zbar/lib.rb

@@ -9,9 +9,11 @@ module ZBar
   begin
     ffi_lib(*paths)
   rescue LoadError => le
-    raise LoadError,
-      "didn't find libzbar on your system. " +
-      "Please install zbar (http://zbar.sourceforge.net/)"
+    raise LoadError, [
+      "Didn't find libzbar on your system",
+      "Please install zbar (http://zbar.sourceforge.net/) or ZBAR_LIB if it's in a weird place",
+      "FFI::Library::ffi_lib() failed with error: #{le}"
+    ].join("\n")
   end
   
   attach_function :zbar_symbol_get_type, [:pointer], :int
@@ -28,15 +30,20 @@ module ZBar
   attach_function :zbar_image_first_symbol, [:pointer], :pointer
   attach_function :zbar_image_set_format, [:pointer, :ulong], :void
   attach_function :zbar_image_convert, [:pointer, :ulong], :pointer
+  attach_function :zbar_image_get_width, [:pointer], :int
+  attach_function :zbar_image_get_height, [:pointer], :int
   attach_function :zbar_image_set_size, [:pointer, :uint, :uint], :void
   attach_function :zbar_image_set_data, [:pointer, :buffer_in, :uint, :pointer], :void
 
   attach_function :zbar_processor_create, [:int], :pointer
   attach_function :zbar_processor_destroy, [:pointer], :void
   attach_function :zbar_processor_init, [:pointer, :string, :int], :int
+  attach_function :zbar_processor_set_config, [:pointer, :int, :int, :int], :int
   
   attach_function :zbar_process_image, [:pointer, :pointer], :int
 
+  attach_function :zbar_parse_config, [:string, :pointer, :pointer, :pointer], :int
+
   attach_function :zbar_set_verbosity, [:int], :void
   attach_function :zbar_get_symbol_name, [:int], :string
   attach_function :zbar_get_addon_name, [:int], :string

data/lib/zbar/processor.rb

@@ -1,9 +1,17 @@
 module ZBar
   class Processor
     # Create a new processor.
-    def initialize(threads = 0)
+    # Accepts a hash of configurations
+    def initialize(config = nil)
+      # This function used to accept an integer refering to the number of threads
+      if config.kind_of?(Fixnum)
+        config = { :threads => config }
+      end
+      
+      config ||= {}
+      
       @processor = FFI::AutoPointer.new(
-        ZBar.zbar_processor_create(threads),
+        ZBar.zbar_processor_create(config[:threads] || 0),
         ZBar.method(:zbar_processor_destroy)
         )
   
@@ -11,8 +19,76 @@ module ZBar
         ZBar._zbar_error_spew(@processor, 0)
         raise "error!"
       end
+      
+      config.each { |key,value|
+        if key == :threads
+          # do nothing; we handled this above
+        else
+          setter = "#{key}=".to_sym
+          if respond_to?(setter)
+            send(setter, value)
+          else
+            raise ArgumentError, "unsupported configuration option: #{key}"
+          end
+        end
+      }
+    end
+    
+    # Indicates that this processor should only search for the indicated symbologies.
+    # Accepts an array of the following symbologies, specified as a string or symbol:
+    # - qrcode
+    # - upca
+    # - upce
+    # - ean13
+    # - ean8
+    # - i25
+    # - scanner
+    # - isbn13
+    # - isbn10
+    # - code39
+    # - pdf417
+    # - code128
+    def symbologies=(symbologies)
+      self.zbar_config = ["disable"] + symbologies.map { |sym| "#{sym}.enable" }
+      true
+    end
+    
+    # Indicates that this processor should only search for the indicated symbology.
+    # See #symbologies= for details.
+    def symbology=(symbology)
+      self.symbologies = [symbology]
+    end
+    
+    # Configures this processor using the specified configuration string. See
+    # zbar_parse_config (zbar/config.c) for supported values.
+    def zbar_config=(config_value)
+      case config_value
+      when String
+        symbology = FFI::MemoryPointer.new :int
+        config_t = FFI::MemoryPointer.new :int
+        value = FFI::MemoryPointer.new :int
+      
+        if ZBar.zbar_parse_config(config_value, symbology, config_t, value) == 0
+          # parsed successfully
+          if ZBar.zbar_processor_set_config(@processor, symbology.read_int, config_t.read_int, value.read_int) == 0
+            true
+          else
+            raise ArgumentError, "config string #{config_value.inspect} parsed but could not be set"
+          end
+        else
+          raise ArgumentError, "config string #{config_value.inspect} was not recognized"
+        end
+        
+      when Enumerable
+        config_value.each { |value|
+          self.zbar_config = value
+        }
+        
+      else
+        raise ArgumentError, "unsupported config value"
+      end
     end
-
+    
     # Attempt to recognize barcodes in this image. Raises an exception if ZBar
     # signals an error, otherwise returns an array of ZBar::Symbol objects.
     def process(image)

data/spec/spec_helper.rb

@@ -0,0 +1,12 @@
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+require 'rspec'
+require 'zbar'
+
+# Requires supporting files with custom matchers and macros, etc,
+# in ./support/ and its subdirectories.
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
+
+RSpec.configure do |config|
+  config.include FileHelpers
+end

data/spec/support/file_helpers.rb

@@ -0,0 +1,13 @@
+module FileHelpers
+  def file_path(filename)
+    File.dirname(__FILE__) + "/" + filename
+  end
+  
+  def open_file(filename, &block)
+    File.open(file_path(filename), 'rb', &block)
+  end
+  
+  def read_file(filename)
+    open_file(filename, &:read)
+  end
+end

data/spec/zbar/image_spec.rb

@@ -0,0 +1,60 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe ZBar::Image do
+  
+  if !ZBar::JPEG.available?
+    pending "JPEG support is not available in your copy of libzbar; skipping tests"
+  elsif ZBar::JPEG.bugged?
+    ZBar::JPEG.warn_once_if_bugged
+    pending "JPEG support is broken in your copy of libzbar; skipping tests"
+  else
+    describe ".from_jpeg" do
+      let(:jpeg_data) { read_file jpeg_file }
+      subject { described_class.from_jpeg(jpeg_data) }
+      context "given test.jpg" do
+        let(:jpeg_file) { "test.jpg" }
+      
+        its(:width) { should == 480 }
+        its(:height) { should == 240 }
+      
+        describe "process" do
+          it "delegates to the passed processor" do
+            processor = double("processor")
+            expected_result = Object.new
+            processor.should_receive(:process).with(subject).and_return(expected_result)
+          
+            subject.process(processor).should == expected_result
+          end
+
+          it "instantiates a new processor with no arguments" do
+            processor = double("processor")
+            processor.should_receive(:process)
+            ZBar::Processor.should_receive(:new).with().and_return(processor)
+            subject.process
+          end
+
+          it "instantiates a new processor with configuration" do
+            config_hash = { :foo => :bar }
+            processor = double("processor")
+            processor.should_receive(:process)
+            ZBar::Processor.should_receive(:new).with(config_hash).and_return(processor)
+            subject.process(config_hash)
+          end
+        end
+      end
+    end
+  end
+
+  describe ".from_pgm" do
+    let(:pgm_data) { read_file pgm_file }
+    let(:image) { described_class.from_pgm(pgm_data) }
+    subject { image }
+    
+    context "given test.pgm" do
+      let(:pgm_file) { "test.pgm" }
+
+      its(:width) { should == 480 }
+      its(:height) { should == 240 }
+    end
+  end
+end

data/spec/zbar/processor_spec.rb

@@ -0,0 +1,113 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe ZBar::Processor do
+  describe "new" do
+    it "calls ZBar.zbar_processor_create" do
+      ZBar.should_receive(:zbar_processor_create).and_call_original
+      described_class.new
+    end
+    
+    it "calls ZBar.zbar_processor_init" do
+      ZBar.should_receive(:zbar_processor_init).and_call_original
+      described_class.new
+    end
+
+    it "should instantiate with no parameters" do
+      described_class.new
+    end
+
+    it "should instantiate with an integer parameter" do
+      described_class.new(0)
+    end
+
+    it "should instantiate with an hash parameter" do
+      described_class.new(:threads => 0)
+    end
+  end
+  
+  describe "#zbar_config=" do
+    it "calls ZBar.zbar_parse_config" do
+      ZBar.should_receive(:zbar_parse_config).with("disable", anything(), anything(), anything()).and_call_original
+      subject.zbar_config = "disable"
+    end
+
+    it "calls ZBar.zbar_processor_set_config" do
+      ZBar.should_receive(:zbar_processor_set_config).and_call_original
+      subject.zbar_config = "disable"
+    end
+
+    it "calls itself repeatedly when given an array" do
+      args = ["foo", :bar, 1]
+      subject.should_receive(:zbar_config=).with(args).and_call_original
+      args.each { |arg|
+        subject.should_receive(:zbar_config=).with(arg)
+      }
+      subject.zbar_config = args
+    end
+    
+    it "succeeds for \"disable\"" do
+      subject.zbar_config = "disable"
+    end
+    it "succeeds for \"enable=0\"" do
+      subject.zbar_config = "enable=0"
+    end
+    it "succeeds for \"qrcode.enable=1\"" do
+      subject.zbar_config = "qrcode.enable=1"
+    end
+    
+    it "raises ArgumentError for \"foo bar baz\"" do
+      lambda {
+        subject.zbar_config = "foo bar baz"
+      }.should raise_error ArgumentError
+    end
+  end
+  
+  describe "#symbology=" do
+    it "delegates to #symbologies=" do
+      subject.should_receive(:symbologies=).with(['foo'])
+      subject.symbology = 'foo'
+    end
+  end
+  
+  describe "#symbologies=" do
+    it "enables the selected symbologies" do
+      subject.should_receive(:zbar_config=).with(["disable", "foo.enable", "bar.enable"])
+      subject.symbologies = ['foo', :bar]
+    end
+  end
+  
+  describe "#process" do
+    context "when processing test.pgm" do
+      let(:pgm_data) { read_file "test.pgm" }
+      let(:image) { ZBar::Image.from_pgm(pgm_data) }
+      let(:config) { {} }
+      let(:processor) { described_class.new(config) }
+      subject { processor.process(image) }
+      
+      it "finds the expected symbol" do
+        symbols = subject
+        symbols.size.should == 1
+
+        symbol = symbols[0]
+        symbol.should be_kind_of ZBar::Symbol
+        symbol.data.should == "9876543210128"
+        symbol.symbology.should == "EAN-13"
+      end
+      
+      context "when all symbologies are disabled" do
+        let(:config) { { :symbologies => [] } }
+        it { should be_empty }
+      end
+
+      context "when only a wrong symbology is enabled" do
+        let(:config) { { :symbology => :qrcode } }
+        it { should be_empty }
+      end
+
+      context "when the correct symbology is enabled" do
+        let(:config) { { :symbologies => ["qrcode", :ean13] } }
+        it { should_not be_empty }
+      end
+    end
+  end
+end

data/spec/zbar_spec.rb

@@ -0,0 +1,5 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe ZBar do
+  it { should be_kind_of Module }
+end

data/zbar.gemspec

@@ -1,63 +1,75 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{zbar}
-  s.version = "0.1.1"
+  s.name = "zbar"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Will Glynn"]
-  s.date = %q{2010-08-29}
-  s.description = %q{Ruby bindings for ZBar, a barcode recognition library. Uses FFI to interact with the underlying C library, but has no other dependencies.}
-  s.email = %q{will@willglynn.com}
+  s.date = "2013-06-13"
+  s.description = "Ruby bindings for ZBar, a barcode recognition library. Uses FFI to interact with the underlying C library, but has no other dependencies."
+  s.email = "will@willglynn.com"
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.rdoc"
+    "README.rdoc"
   ]
   s.files = [
     ".document",
-     ".gitignore",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "lib/zbar.rb",
-     "lib/zbar/image.rb",
-     "lib/zbar/lib.rb",
-     "lib/zbar/processor.rb",
-     "lib/zbar/symbol.rb",
-     "test/helper.rb",
-     "test/test.jpg",
-     "test/test.pgm",
-     "test/test_zbar.rb",
-     "zbar.gemspec"
+    ".rspec",
+    ".travis.yml",
+    "Gemfile",
+    "LICENSE",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "lib/zbar.rb",
+    "lib/zbar/image.rb",
+    "lib/zbar/jpeg.rb",
+    "lib/zbar/lib.rb",
+    "lib/zbar/processor.rb",
+    "lib/zbar/symbol.rb",
+    "spec/spec_helper.rb",
+    "spec/support/file_helpers.rb",
+    "spec/support/test.jpg",
+    "spec/support/test.pgm",
+    "spec/zbar/image_spec.rb",
+    "spec/zbar/processor_spec.rb",
+    "spec/zbar_spec.rb",
+    "zbar.gemspec"
   ]
-  s.homepage = %q{http://github.com/delta407/ruby-zbar}
-  s.rdoc_options = ["--charset=UTF-8"]
+  s.homepage = "http://github.com/delta407/ruby-zbar"
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
-  s.summary = %q{Ruby bindings for ZBar, a barcode recognition library}
-  s.test_files = [
-    "test/helper.rb",
-     "test/test_zbar.rb"
-  ]
+  s.rubygems_version = "1.8.25"
+  s.summary = "Ruby bindings for ZBar, a barcode recognition library"
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<thoughtbot-shoulda>, [">= 0"])
-      s.add_runtime_dependency(%q<ffi>, [">= 0"])
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<ffi>, [">= 1.0.0"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.12.0"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.12.0"])
+      s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.8.4"])
     else
-      s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
-      s.add_dependency(%q<ffi>, [">= 0"])
+      s.add_dependency(%q<ffi>, [">= 1.0.0"])
+      s.add_dependency(%q<rspec>, ["~> 2.12.0"])
+      s.add_dependency(%q<rspec>, ["~> 2.12.0"])
+      s.add_dependency(%q<rdoc>, ["~> 3.12"])
+      s.add_dependency(%q<bundler>, ["~> 1.0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
     end
   else
-    s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
-    s.add_dependency(%q<ffi>, [">= 0"])
+    s.add_dependency(%q<ffi>, [">= 1.0.0"])
+    s.add_dependency(%q<rspec>, ["~> 2.12.0"])
+    s.add_dependency(%q<rspec>, ["~> 2.12.0"])
+    s.add_dependency(%q<rdoc>, ["~> 3.12"])
+    s.add_dependency(%q<bundler>, ["~> 1.0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
   end
 end
 

metadata

@@ -1,102 +1,168 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: zbar
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 1
-  version: 0.1.1
+version: !ruby/object:Gem::Version
+  version: 0.2.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Will Glynn
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-08-29 00:00:00 -05:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: thoughtbot-shoulda
+date: 2013-06-13 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: ffi
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :runtime
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.12.0
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: ffi
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id002
-description: Ruby bindings for ZBar, a barcode recognition library. Uses FFI to interact with the underlying C library, but has no other dependencies.
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.12.0
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.12.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.12.0
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.12'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.12'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.8.4
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.8.4
+description: Ruby bindings for ZBar, a barcode recognition library. Uses FFI to interact
+  with the underlying C library, but has no other dependencies.
 email: will@willglynn.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.rdoc
-files: 
+files:
 - .document
-- .gitignore
+- .rspec
+- .travis.yml
+- Gemfile
 - LICENSE
 - README.rdoc
 - Rakefile
 - VERSION
 - lib/zbar.rb
 - lib/zbar/image.rb
+- lib/zbar/jpeg.rb
 - lib/zbar/lib.rb
 - lib/zbar/processor.rb
 - lib/zbar/symbol.rb
-- test/helper.rb
-- test/test.jpg
-- test/test.pgm
-- test/test_zbar.rb
+- spec/spec_helper.rb
+- spec/support/file_helpers.rb
+- spec/support/test.jpg
+- spec/support/test.pgm
+- spec/zbar/image_spec.rb
+- spec/zbar/processor_spec.rb
+- spec/zbar_spec.rb
 - zbar.gemspec
-has_rdoc: true
 homepage: http://github.com/delta407/ruby-zbar
 licenses: []
-
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
-require_paths: 
+rdoc_options: []
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: 4088186622936310540
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Ruby bindings for ZBar, a barcode recognition library
-test_files: 
-- test/helper.rb
-- test/test_zbar.rb
+test_files: []

data/.gitignore

@@ -1,21 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC

data/test/helper.rb

@@ -1,10 +0,0 @@
-require 'rubygems'
-require 'test/unit'
-require 'shoulda'
-
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'zbar'
-
-class Test::Unit::TestCase
-end

data/test/test_zbar.rb

@@ -1,42 +0,0 @@
-require 'helper'
-
-Path = File.dirname(__FILE__)
-
-class TestZBar < Test::Unit::TestCase
-  should "read the right barcode from a PGM blob" do
-    result = ZBar::Image.from_pgm(File.read("#{Path}/test.pgm")).process
-    assert_equal(result.size, 1)
-    assert_equal(result[0].data, '9876543210128')
-    assert_equal(result[0].symbology, 'EAN-13')
-  end
-  
-  should "read a barcode from a PGM file" do
-    File.open("#{Path}/test.pgm") { |f|
-      result = ZBar::Image.from_pgm(f).process
-      assert_equal(result.size, 1)
-    }
-  end
-
-  should "be able to re-use a processor" do
-    processor = ZBar::Processor.new
-    pgm = File.read("#{Path}/test.pgm")
-    
-    result1 = processor.process ZBar::Image.from_pgm(pgm)
-    result2 = processor.process ZBar::Image.from_pgm(pgm)
-    assert_equal(result1.size, 1)
-    assert_equal(result2.size, 1)
-    assert_equal(result1, result2)
-  end
-
-  should "read a barcode from a JPEG blob" do
-    result = ZBar::Image.from_jpeg(File.read("#{Path}/test.jpg")).process
-    assert_equal(result.size, 1)
-  end
-  
-  should "read a barcode from a JPEG file" do
-    File.open("#{Path}/test.jpg") { |f|
-      result = ZBar::Image.from_jpeg(f).process
-      assert_equal(result.size, 1)
-    }
-  end
-end