zbar 0.2.2 → 0.3.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: b8160eaff56757ec9c5b54c24779777d9591c7ed
+  data.tar.gz: ce3c5834bc210d0fe90c6a058f37999f85a0925d
+SHA512:
+  metadata.gz: 46cc77ec28f21fba5fda5baf717459fcf8c5f70fcb0f763c7579ac9afad1a23d9f63d1958271015e02631f5f5567d57f42ea46fdb8ca246a0a872e6eccecc1cc
+  data.tar.gz: e2927458f89dab6a8457e6b87a07295812b7ee2fb8509296cd20a93c2d08758f8b3cab7c0d21cda51577528f6f6c2d38cae84bca86eaa1dbe98cce76bb8a0fd3

data/.travis.yml

@@ -1,15 +1,15 @@
-nguage: ruby
+language: 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
+  - 2.4
+  - 2.2
+  - 2.3
+  - 2.1
+  - 2.0
+  - jruby
+matrix:
+  allow_failures:
+    - rvm: ruby-head
+    - rvm: jruby
 before_install:
   - sudo apt-get install libzbar-dev

data/Gemfile

@@ -1,11 +1,12 @@
 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"
+  gem "rspec", "~> 3.7"
+  gem "rspec-its", "~> 1.2"
+  gem "rdoc", "~> 5.1"
+  gem "bundler", "~> 1.16"
+  gem "jeweler", "~> 2.1"
+  gem "rake", "~> 12.2"
 end
 
-gem "ffi", ">= 1.0.0"
+gem "ffi", "~> 1.0"

data/README.rdoc

@@ -11,7 +11,7 @@ Ruby bindings for ZBar, a barcode recognition library.
 
   require 'zbar'
   
-  ZBar::Image.from_jpeg(File.read('test.jpg')).process
+  ZBar::Image.from_jpeg(File.binread('test.jpg')).process
   => [#<Zbar::Symbol:0x10147c668
     @addon="",
     @data="9876543210128",

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.3.0

data/lib/zbar/lib.rb

@@ -1,16 +1,18 @@
 module ZBar
   extend FFI::Library
 
+  search_string = '/{opt,usr}/{,local/}lib{,64}/{,x86_64-linux-gnu/,i386-linux-gnu/}libzbar.{dylib,so*}'
   paths =
     Array(
       ENV['ZBAR_LIB'] ||
-      Dir['/{opt,usr}/{,local/}lib{,64}/libzbar.{dylib,so*}']
+      Dir[search_string]
       )
   begin
     ffi_lib(*paths)
   rescue LoadError => le
     raise LoadError, [
       "Didn't find libzbar on your system",
+      "Searched in \"#{search_string}\"",
       "Please install zbar (http://zbar.sourceforge.net/) or set ZBAR_LIB if it's in a weird place",
       "FFI::Library::ffi_lib() failed with error: #{le}"
     ].join("\n")

data/lib/zbar/processor.rb

@@ -4,7 +4,7 @@ module ZBar
     # 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)
+      if config.kind_of?(Integer)
         config = { :threads => config }
       end
       
@@ -110,4 +110,4 @@ module ZBar
       out
     end
   end
-end
+end

data/spec/spec_helper.rb

@@ -1,6 +1,7 @@
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'rspec'
+require 'rspec/its'
 require 'zbar'
 
 # Requires supporting files with custom matchers and macros, etc,

data/spec/zbar/image_spec.rb

@@ -35,23 +35,23 @@ describe ZBar::Image 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)
+          expect(processor).to receive(:process).with(subject).and_return(expected_result)
         
-          subject.process(processor).should == expected_result
+          expect(subject.process(processor)).to eq(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)
+          expect(processor).to receive(:process)
+          expect(ZBar::Processor).to receive(:new).with(no_args).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)
+          expect(processor).to receive(:process)
+          expect(ZBar::Processor).to receive(:new).with(config_hash).and_return(processor)
           subject.process(config_hash)
         end
       end

data/spec/zbar/jpeg_spec.rb

@@ -5,31 +5,31 @@ describe ZBar::JPEG do
   
   describe "available?" do
     specify "should be a boolean" do
-      (!!subject.available?).should == (subject.available?)
+      expect(!!subject.available?).to eq(subject.available?)
     end
 
     specify "should memoize the result" do
       result = Object.new
       subject.instance_variable_set(:@available, result)
-      subject.available?.should == result
+      expect(subject.available?).to eq(result)
     end
   end
 
   describe "bugged?" do
     specify "should be a boolean" do
-      (!!subject.bugged?).should == (subject.bugged?)
+      expect(!!subject.bugged?).to eq(subject.bugged?)
     end
     
     specify "should memoize the result" do
       result = Object.new
       subject.instance_variable_set(:@bugged, result)
-      subject.bugged?.should == result
+      expect(subject.bugged?).to eq(result)
     end
     
     specify "should be false if JPEG support is unavailable" do
       subject.instance_variable_set(:@bugged, nil)
-      subject.should_receive(:available?).and_return(false)
-      subject.bugged?.should == false
+      expect(subject).to receive(:available?).and_return(false)
+      expect(subject.bugged?).to eq(false)
     end
   end
 end

data/spec/zbar/library_version_spec.rb

@@ -11,9 +11,9 @@ describe ZBar::LibraryVersion do
   
   describe "to_s" do
     subject { library_version.to_s }
-    it { should be_kind_of String }
+    it { is_expected.to be_kind_of String }
     it "is formatted as major.minor" do
-      should == "#{major}.#{minor}"
+      is_expected.to eq("#{major}.#{minor}")
     end
   end
   
@@ -22,19 +22,19 @@ describe ZBar::LibraryVersion do
     let(:bigger_minor) { described_class.new(major, minor + 1)}
     let(:equal) { described_class.new(major, minor)}
     
-    it { should be_kind_of Comparable }
+    it { is_expected.to be_kind_of Comparable }
     
     it "compares minors" do
-      library_version.should < bigger_minor
-      bigger_minor.should > library_version
+      expect(library_version).to be < bigger_minor
+      expect(bigger_minor).to be > library_version
     end
     it "compares majors" do
-      library_version.should < bigger_major
-      bigger_major.should > library_version
+      expect(library_version).to be < bigger_major
+      expect(bigger_major).to be > library_version
     end
     it "compares equally" do
-      library_version.should == equal
-      equal.should == library_version
+      expect(library_version).to eq(equal)
+      expect(equal).to eq(library_version)
     end
   end
 end

data/spec/zbar/processor_spec.rb

@@ -3,12 +3,12 @@ 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
+      expect(ZBar).to 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
+      expect(ZBar).to receive(:zbar_processor_init).and_call_original
       described_class.new
     end
 
@@ -27,20 +27,20 @@ describe ZBar::Processor do
   
   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
+      expect(ZBar).to 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
+      expect(ZBar).to 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
+      expect(subject).to receive(:zbar_config=).with(args).and_call_original
       args.each { |arg|
-        subject.should_receive(:zbar_config=).with(arg)
+        expect(subject).to receive(:zbar_config=).with(arg)
       }
       subject.zbar_config = args
     end
@@ -56,22 +56,22 @@ describe ZBar::Processor do
     end
     
     it "raises ArgumentError for \"foo bar baz\"" do
-      lambda {
+      expect {
         subject.zbar_config = "foo bar baz"
-      }.should raise_error ArgumentError
+      }.to raise_error ArgumentError
     end
   end
   
   describe "#symbology=" do
     it "delegates to #symbologies=" do
-      subject.should_receive(:symbologies=).with(['foo'])
+      expect(subject).to 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"])
+      expect(subject).to receive(:zbar_config=).with(["disable", "foo.enable", "bar.enable"])
       subject.symbologies = ['foo', :bar]
     end
   end
@@ -86,27 +86,27 @@ describe ZBar::Processor do
       
       it "finds the expected symbol" do
         symbols = subject
-        symbols.size.should == 1
+        expect(symbols.size).to eq(1)
 
         symbol = symbols[0]
-        symbol.should be_kind_of ZBar::Symbol
-        symbol.data.should == "9876543210128"
-        symbol.symbology.should == "EAN-13"
+        expect(symbol).to be_kind_of ZBar::Symbol
+        expect(symbol.data).to eq("9876543210128")
+        expect(symbol.symbology).to eq("EAN-13")
       end
       
       context "when all symbologies are disabled" do
         let(:config) { { :symbologies => [] } }
-        it { should be_empty }
+        it { is_expected.to be_empty }
       end
 
       context "when only a wrong symbology is enabled" do
         let(:config) { { :symbology => :qrcode } }
-        it { should be_empty }
+        it { is_expected.to be_empty }
       end
 
       context "when the correct symbology is enabled" do
         let(:config) { { :symbologies => ["qrcode", :ean13] } }
-        it { should_not be_empty }
+        it { is_expected.not_to be_empty }
       end
     end
   end

data/spec/zbar_spec.rb

@@ -1,16 +1,16 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe ZBar do
-  it { should be_kind_of Module }
+  it { is_expected.to be_kind_of Module }
   
   describe "library_version" do
     it "calls zbar_version(uint*, uint*)" do
-      ZBar.should_receive(:zbar_version).with(anything, anything).and_return(0)
+      expect(ZBar).to receive(:zbar_version).with(anything, anything).and_return(0)
       ZBar.library_version
     end
     
     it "returns LibraryVersion" do
-      ZBar.library_version.should be_kind_of ZBar::LibraryVersion
+      expect(ZBar.library_version).to be_kind_of ZBar::LibraryVersion
     end
   end
 end

data/zbar.gemspec

@@ -2,14 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+# stub: zbar 0.3.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "zbar"
-  s.version = "0.2.2"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib"]
   s.authors = ["Will Glynn"]
-  s.date = "2013-06-25"
+  s.date = "2017-11-05"
   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 = [
@@ -45,35 +47,37 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/willglynn/ruby-zbar"
   s.post_install_message = "\nzbar: This gem depends on the \"zbar\" C library.\n      If it's not installed, `require \"zbar\"` will fail.\n\n"
-  s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.25"
+  s.rubygems_version = "2.4.8"
   s.summary = "Ruby bindings for ZBar, a barcode recognition library"
 
   if s.respond_to? :specification_version then
-    s.specification_version = 3
+    s.specification_version = 4
 
     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"])
+      s.add_runtime_dependency(%q<ffi>, ["~> 1.0"])
+      s.add_development_dependency(%q<rspec>, ["~> 3.7"])
+      s.add_development_dependency(%q<rspec-its>, ["~> 1.2"])
+      s.add_development_dependency(%q<rdoc>, ["~> 5.1"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.16"])
+      s.add_development_dependency(%q<jeweler>, ["~> 2.1"])
+      s.add_development_dependency(%q<rake>, ["~> 12.2"])
     else
-      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"])
+      s.add_dependency(%q<ffi>, ["~> 1.0"])
+      s.add_dependency(%q<rspec>, ["~> 3.7"])
+      s.add_dependency(%q<rspec-its>, ["~> 1.2"])
+      s.add_dependency(%q<rdoc>, ["~> 5.1"])
+      s.add_dependency(%q<bundler>, ["~> 1.16"])
+      s.add_dependency(%q<jeweler>, ["~> 2.1"])
+      s.add_dependency(%q<rake>, ["~> 12.2"])
     end
   else
-    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"])
+    s.add_dependency(%q<ffi>, ["~> 1.0"])
+    s.add_dependency(%q<rspec>, ["~> 3.7"])
+    s.add_dependency(%q<rspec-its>, ["~> 1.2"])
+    s.add_dependency(%q<rdoc>, ["~> 5.1"])
+    s.add_dependency(%q<bundler>, ["~> 1.16"])
+    s.add_dependency(%q<jeweler>, ["~> 2.1"])
+    s.add_dependency(%q<rake>, ["~> 12.2"])
   end
 end
 

metadata

@@ -1,112 +1,113 @@
 --- !ruby/object:Gem::Specification
 name: zbar
 version: !ruby/object:Gem::Version
-  version: 0.2.2
-  prerelease: 
+  version: 0.3.0
 platform: ruby
 authors:
 - Will Glynn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-25 00:00:00.000000000 Z
+date: 2017-11-05 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
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: '3.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: '3.7'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rspec-its
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '5.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.16'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.4
+        version: '12.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.4
+        version: '12.2'
 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
@@ -116,9 +117,9 @@ extra_rdoc_files:
 - LICENSE
 - README.rdoc
 files:
-- .document
-- .rspec
-- .travis.yml
+- ".document"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.rdoc
@@ -143,30 +144,29 @@ files:
 - zbar.gemspec
 homepage: http://github.com/willglynn/ruby-zbar
 licenses: []
-post_install_message: ! "\nzbar: This gem depends on the \"zbar\" C library.\n      If
-  it's not installed, `require \"zbar\"` will fail.\n\n"
+metadata: {}
+post_install_message: |2+
+
+  zbar: This gem depends on the "zbar" C library.
+        If it's not installed, `require "zbar"` will fail.
+
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2616840748018373836
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.4.8
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Ruby bindings for ZBar, a barcode recognition library
 test_files: []