barby 0.6.9 → 0.7.0

data/test/outputter/svg_outputter_test.rb

@@ -16,8 +16,9 @@ class SvgBarcode < Barby::Barcode
   end
 end
 
+
 class SvgOutputterTest < Barby::TestCase
-  
+
   before do
     load_outputter('svg')
     @barcode = SvgBarcode.new('10110011100011110000')
@@ -25,65 +26,65 @@ class SvgOutputterTest < Barby::TestCase
   end
 
   it 'should register to_svg, bars_to_rects, and bars_to_path' do
-    Barcode.outputters.must_include :to_svg
-    Barcode.outputters.must_include :bars_to_rects
-    Barcode.outputters.must_include :bars_to_path
+    assert Barcode.outputters.include?(:to_svg)
+    assert Barcode.outputters.include?(:bars_to_rects)
+    assert Barcode.outputters.include?(:bars_to_path)
   end
 
   it 'should return a string on to_svg' do
-    @barcode.to_svg.must_be_instance_of String
+    assert @barcode.to_svg.is_a?(String)
   end
-  
+
   it 'should return a string on bars_to_rects' do
-    @barcode.bars_to_rects.must_be_instance_of String
+    assert @barcode.bars_to_rects.is_a?(String)
   end
-  
+
   it 'should return a string on bars_to_path' do
-    @barcode.bars_to_path.must_be_instance_of String
+    assert @barcode.bars_to_path.is_a?(String)
   end
-  
+
   it 'should produce one rect for each bar' do
-    @barcode.bars_to_rects.scan(/<rect/).size.must_equal @outputter.send(:boolean_groups).select{|bg|bg[0]}.size
+    assert_equal @outputter.send(:boolean_groups).select{|bg|bg[0]}.size, @barcode.bars_to_rects.scan(/<rect/).size
   end
-  
+
   it 'should produce one path stroke for each bar module' do
-    @barcode.bars_to_path.scan(/(M\d+\s+\d+)\s*(V\d+)/).size.must_equal @outputter.send(:booleans).select{|bg|bg}.size
+    assert_equal @outputter.send(:booleans).select{|bg|bg}.size, @barcode.bars_to_path.scan(/(M\d+\s+\d+)\s*(V\d+)/).size
   end
-  
+
   it 'should return default values for attributes' do
-    @outputter.margin.must_be_instance_of Fixnum
+    assert @outputter.margin.is_a?(Integer)
   end
-  
+
   it 'should use defaults to populate higher level attributes' do
-    @outputter.xmargin.must_equal @outputter.margin
+    assert_equal @outputter.margin, @outputter.xmargin
   end
-  
+
   it 'should return nil for overridden attributes' do
     @outputter.xmargin = 1
-    @outputter.margin.must_equal nil
+    assert_equal nil, @outputter.margin
   end
-  
+
   it 'should still use defaults for unspecified attributes' do
     @outputter.xmargin = 1
-    @outputter.ymargin.must_equal @outputter.send(:_margin)
+    assert_equal @outputter.send(:_margin), @outputter.ymargin
   end
-  
+
   it 'should have a width equal to Xdim * barcode_string.length' do
-    @outputter.width.must_equal @outputter.barcode.encoding.length * @outputter.xdim
+    assert_equal @outputter.barcode.encoding.length * @outputter.xdim, @outputter.width
   end
-  
+
   it 'should have a full_width which is by default the sum of width + (margin*2)' do
-    @outputter.full_width.must_equal @outputter.width + (@outputter.margin*2)
+    assert_equal(@outputter.width + (@outputter.margin*2), @outputter.full_width)
   end
-  
+
   it 'should have a full_width which is the sum of width + xmargin + ymargin' do
-    @outputter.full_width.must_equal @outputter.width + @outputter.xmargin + @outputter.ymargin
+    assert_equal @outputter.width + @outputter.xmargin + @outputter.ymargin, @outputter.full_width
   end
-  
+
   it 'should use Barcode#to_s for title' do
-    @outputter.title.must_equal @barcode.data
+    assert_equal @barcode.data, @outputter.title
     def @barcode.to_s; "the eastern star"; end
-    @outputter.title.must_equal "the eastern star"
+    assert_equal "the eastern star", @outputter.title
   end
-  
+
 end

data/test/outputter_test.rb

@@ -15,7 +15,7 @@ class OutputterTest < Barby::TestCase
     @outputter.register :quux => :my_quux
     Barcode.outputters.must_include(:quux)
   end
-  
+
   describe "Outputter instances" do
 
     before do
@@ -26,56 +26,56 @@ class OutputterTest < Barby::TestCase
     end
 
     it "should have a method 'booleans' which converts the barcode encoding to an array of true,false values" do
-      @outputter.send(:booleans).length.must_equal @barcode.encoding.length
+      assert_equal @barcode.encoding.length, @outputter.send(:booleans).length
       t, f = true, false
-      @outputter.send(:booleans).must_equal [t,f,t,t,f,f,t,t,t,f,f,f]
+      assert_equal [t,f,t,t,f,f,t,t,t,f,f,f], @outputter.send(:booleans)
     end
 
     it "should convert 2D encodings with 'booleans'" do
       barcode = Barcode2D.new
       def barcode.encoding; ['101100','110010']; end
       outputter = Outputter.new(barcode)
-      outputter.send(:booleans).length.must_equal barcode.encoding.length
+      assert_equal barcode.encoding.length, outputter.send(:booleans).length
       t, f = true, false
-      outputter.send(:booleans).must_equal [[t,f,t,t,f,f], [t,t,f,f,t,f]]
+      assert_equal [[t,f,t,t,f,f], [t,t,f,f,t,f]], outputter.send(:booleans)
     end
 
     it "should have an 'encoding' attribute" do
-      @outputter.send(:encoding).must_equal @barcode.encoding
+      assert_equal @barcode.encoding, @outputter.send(:encoding)
     end
 
     it "should cache encoding" do
-      @outputter.send(:encoding).must_equal @barcode.encoding
+      assert_equal @barcode.encoding, @outputter.send(:encoding)
       previous_encoding = @barcode.encoding
       @barcode.encoding = '101010'
-      @outputter.send(:encoding).must_equal previous_encoding
-      @outputter.send(:encoding, true).must_equal @barcode.encoding
+      assert_equal previous_encoding, @outputter.send(:encoding)
+      assert_equal @barcode.encoding, @outputter.send(:encoding, true)
     end
 
     it "should have a boolean_groups attribute which collects continuous bars and spaces" do
       t, f = true, false
                                                   # 1     0     11    00    111   000
-      @outputter.send(:boolean_groups).must_equal [[t,1],[f,1],[t,2],[f,2],[t,3],[f,3]]
+      assert_equal [[t,1],[f,1],[t,2],[f,2],[t,3],[f,3]], @outputter.send(:boolean_groups)
 
       barcode = Barcode2D.new
       def barcode.encoding; ['1100', '111000']; end
       outputter = Outputter.new(barcode)
-      outputter.send(:boolean_groups).must_equal [[[t,2],[f,2]],[[t,3],[f,3]]]
+      assert_equal [[[t,2],[f,2]],[[t,3],[f,3]]], outputter.send(:boolean_groups)
     end
 
     it "should have a with_options method which sets the instance's attributes temporarily while the block gets yielded" do
       class << @outputter; attr_accessor :foo, :bar; end
       @outputter.foo, @outputter.bar = 'humbaba', 'scorpion man'
       @outputter.send(:with_options, :foo => 'horse', :bar => 'donkey') do
-        @outputter.foo.must_equal 'horse'
-        @outputter.bar.must_equal 'donkey'
+        assert_equal 'horse', @outputter.foo
+        assert_equal 'donkey', @outputter.bar
       end
-      @outputter.foo.must_equal 'humbaba'
-      @outputter.bar.must_equal 'scorpion man'
+      assert_equal 'humbaba', @outputter.foo
+      assert_equal 'scorpion man', @outputter.bar
     end
 
     it "should return the block value on with_options" do
-      @outputter.send(:with_options, {}){ 'donkey' }.must_equal 'donkey'
+      assert_equal 'donkey', @outputter.send(:with_options, {}){ 'donkey' }
     end
 
     it "should have a two_dimensional? method which returns true if the barcode is 2d" do
@@ -94,7 +94,7 @@ class OutputterTest < Barby::TestCase
   end
 
   describe "Barcode instances" do
-  
+
     before do
       @outputter = Class.new(Outputter)
       @outputter.register :foo
@@ -102,33 +102,31 @@ class OutputterTest < Barby::TestCase
       @outputter.class_eval{ def foo; 'foo'; end; def my_bar; 'bar'; end }
       @barcode = Barcode.new
     end
-  
+
     it "should respond to registered output methods" do
-      @barcode.foo.must_equal 'foo'
-      @barcode.bar.must_equal 'bar'
+      assert_equal 'foo', @barcode.foo
+      assert_equal 'bar', @barcode.bar
     end
-  
+
     it "should send arguments to registered method on outputter class" do
       @outputter.class_eval{ def foo(*a); a; end; def my_bar(*a); a; end }
-      @barcode.foo(1,2,3).must_equal [1,2,3]
-      @barcode.bar('humbaba').must_equal ['humbaba']
+      assert_equal [1,2,3], @barcode.foo(1,2,3)
+      assert_equal ['humbaba'], @barcode.bar('humbaba')
     end
-  
+
     it "should pass block to registered methods" do
       @outputter.class_eval{ def foo(*a, &b); b.call(*a); end }
-      @barcode.foo(1,2,3){|*a| a }.must_equal [1,2,3]
+      assert_equal [1,2,3], @barcode.foo(1,2,3){|*a| a }
     end
-  
+
     it "should be able to get an instance of a specific outputter" do
-      @barcode.outputter_for(:foo).must_be_instance_of(@outputter)
+      assert @barcode.outputter_for(:foo).is_a?(@outputter)
     end
-  
+
     it "should be able to get a specific outputter class" do
-      @barcode.outputter_class_for(:foo).must_equal @outputter
+      assert_equal @outputter, @barcode.outputter_class_for(:foo)
     end
-  
+
   end
 
 end
-
-

data/test/pdf_417_test.rb

@@ -4,42 +4,42 @@ if defined? JRUBY_VERSION
   require 'barby/barcode/pdf_417'
 
   class Pdf417Test < Barby::TestCase
-    
+
     it "should produce a nice code" do
       enc = Pdf417.new('Ereshkigal').encoding
-      enc.must_equal [
+      assert_equal [
         "111111111101010100101111010110011110100111010110001110100011101101011100100001111111101000110100100",
-        "111111111101010100101111010110000100100110100101110000101011111110101001111001111111101000110100100", 
+        "111111111101010100101111010110000100100110100101110000101011111110101001111001111111101000110100100",
         "111111111101010100101101010111111000100100011100110011111010101100001111100001111111101000110100100",
-        "111111111101010100101111101101111110110100010100011101111011010111110111111001111111101000110100100", 
-        "111111111101010100101101011110000010100110010101110010100011101101110001110001111111101000110100100", 
-        "111111111101010100101111101101110000110101101100000011110011110110111110111001111111101000110100100", 
-        "111111111101010100101101001111001111100110001101001100100010100111101110100001111111101000110100100", 
-        "111111111101010100101111110110010111100111100100101000110010101111111001111001111111101000110100100", 
-        "111111111101010100101010011101111100100101111110001110111011111101001110110001111111101000110100100", 
-        "111111111101010100101010001111011100100100111110111110111010100101100011100001111111101000110100100", 
-        "111111111101010100101101001111000010100110001101110000101011101100111001110001111111101000110100100", 
-        "111111111101010100101101000110011111100101111111011101100011111110100011100101111111101000110100100", 
-        "111111111101010100101010000101010000100100011100001100101010100100110000111001111111101000110100100", 
-        "111111111101010100101111010100100001100100010100111100101011110110001001100001111111101000110100100", 
+        "111111111101010100101111101101111110110100010100011101111011010111110111111001111111101000110100100",
+        "111111111101010100101101011110000010100110010101110010100011101101110001110001111111101000110100100",
+        "111111111101010100101111101101110000110101101100000011110011110110111110111001111111101000110100100",
+        "111111111101010100101101001111001111100110001101001100100010100111101110100001111111101000110100100",
+        "111111111101010100101111110110010111100111100100101000110010101111111001111001111111101000110100100",
+        "111111111101010100101010011101111100100101111110001110111011111101001110110001111111101000110100100",
+        "111111111101010100101010001111011100100100111110111110111010100101100011100001111111101000110100100",
+        "111111111101010100101101001111000010100110001101110000101011101100111001110001111111101000110100100",
+        "111111111101010100101101000110011111100101111111011101100011111110100011100101111111101000110100100",
+        "111111111101010100101010000101010000100100011100001100101010100100110000111001111111101000110100100",
+        "111111111101010100101111010100100001100100010100111100101011110110001001100001111111101000110100100",
         "111111111101010100101111010100011110110110011111101001100010100100001001111101111111101000110100100"
-      ]
-      enc.length.must_equal 15
-      enc[0].length.must_equal 99
+      ], enc
+      assert_equal 15, enc.length
+      assert_equal 99, enc[0].length
     end
 
     it "should produce a 19x135 code with default aspect_ratio" do
       enc = Pdf417.new('qwertyuiopasdfghjklzxcvbnm'*3).encoding
-      enc.length.must_equal 19
-      enc[0].length.must_equal 135
+      assert_equal 19, enc.length
+      assert_equal 135, enc[0].length
     end
 
     it "should produce a 29x117 code with 0.7 aspect_ratio" do
-      enc = Pdf417.new('qwertyuiopasdfghjklzxcvbnm'*3, :aspect_ratio => 0.7).encoding
-      enc.length.must_equal 29
-      enc[0].length.must_equal 117
+      enc = Pdf417.new('qwertyuiopasdfghjklzxcvbnm'*3, aspect_ratio: 0.7).encoding
+      assert_equal 29, enc.length
+      assert_equal 117, enc[0].length
     end
-    
+
   end
 
 end

data/test/qr_code_test.rb

@@ -9,70 +9,75 @@ class QrCodeTest < Barby::TestCase
   end
 
   it "should have the expected data" do
-    @code.data.must_equal @data
+    assert_equal @data, @code.data
   end
 
   it "should have the expected encoding" do
     # Should be an array of strings, where each string represents a "line"
-    @code.encoding.must_equal(rqrcode(@code).modules.map do |line|
+    expected = rqrcode(@code).modules.map do |line|
       line.inject(''){|s,m| s << (m ? '1' : '0') }
-    end)
+    end
+    assert_equal expected, @code.encoding
 
   end
-  
+
   it "should be able to change its data and output a different encoding" do
     @code.data = 'hades'
-    @code.data.must_equal 'hades'
-    @code.encoding.must_equal(rqrcode(@code).modules.map do |line|
+    assert_equal 'hades', @code.data
+    expected = rqrcode(@code).modules.map do |line|
       line.inject(''){|s,m| s << (m ? '1' : '0') }
-    end)
+    end
+    assert_equal expected, @code.encoding
   end
-  
+
   it "should have a 'level' accessor" do
-    @code.must_respond_to :level
-    @code.must_respond_to :level=
+    assert @code.respond_to?(:level)
+    assert @code.respond_to?(:level=)
   end
-  
+
   it "should set size according to size of data" do
-    QrCode.new('1'*15, :level => :l).size.must_equal 1
-    QrCode.new('1'*15, :level => :m).size.must_equal 2
-    QrCode.new('1'*15, :level => :q).size.must_equal 2
-    QrCode.new('1'*15, :level => :h).size.must_equal 3
-  
-    QrCode.new('1'*30, :level => :l).size.must_equal 2
-    QrCode.new('1'*30, :level => :m).size.must_equal 3
-    QrCode.new('1'*30, :level => :q).size.must_equal 3
-    QrCode.new('1'*30, :level => :h).size.must_equal 4
-  
-    QrCode.new('1'*270, :level => :l).size.must_equal 10
+    assert_equal 1, QrCode.new('1'*15, level: :l).size
+    assert_equal 2, QrCode.new('1'*15, level: :m).size
+    assert_equal 2, QrCode.new('1'*15, level: :q).size
+    assert_equal 3, QrCode.new('1'*15, level: :h).size
+
+    assert_equal 2, QrCode.new('1'*30, level: :l).size
+    assert_equal 3, QrCode.new('1'*30, level: :m).size
+    assert_equal 3, QrCode.new('1'*30, level: :q).size
+    assert_equal 4, QrCode.new('1'*30, level: :h).size
+
+    assert_equal 10, QrCode.new('1'*270, level: :l).size
   end
-  
+
   it "should allow size to be set manually" do
-    code = QrCode.new('1'*15, :level => :l, :size => 2)
-    code.size.must_equal 2
-    code.encoding.must_equal(rqrcode(code).modules.map do |line|
+    code = QrCode.new('1'*15, level: :l, size: 2)
+    assert_equal 2, code.size
+    expected = rqrcode(code).modules.map do |line|
       line.inject(''){|s,m| s << (m ? '1' : '0') }
-    end)
+    end
+    assert_equal expected, code.encoding
   end
-  
+
   it "should raise ArgumentError when data too large" do
-    assert QrCode.new('1'*2953, :level => :l)
-    lambda{ QrCode.new('1'*2954, :level => :l) }.must_raise ArgumentError
+    QrCode.new('1'*2953, level: :l)
+    assert_raises ArgumentError do
+      QrCode.new('1'*2954, level: :l)
+    end
   end
-  
+
   it "should return the original data on to_s" do
-    @code.to_s.must_equal 'Ereshkigal'
+    assert_equal 'Ereshkigal', @code.to_s
   end
-  
+
   it "should include at most 20 characters on to_s" do
-    QrCode.new('123456789012345678901234567890').to_s.must_equal '12345678901234567890'
+    assert_equal '12345678901234567890', QrCode.new('123456789012345678901234567890').to_s
   end
 
-  
+
   private
-  
+
   def rqrcode(code)
-    RQRCode::QRCode.new(code.data, :level => code.level, :size => code.size)
+    RQRCode::QRCode.new(code.data, level: code.level, size: code.size)
   end
 
 end

data/test/test_helper.rb

@@ -4,7 +4,7 @@ require 'minitest/autorun'
 require 'minitest/spec'
 
 module Barby
-  class TestCase < MiniTest::Spec
+  class TestCase < Minitest::Spec
 
     include Barby
 

data/test/upc_supplemental_test.rb

@@ -25,49 +25,49 @@ class UpcSupplementalTest < Barby::TestCase
     refute UPCSupplemental.new('1b').valid?
     refute UPCSupplemental.new('a1').valid?
   end
-  
+
   describe 'checksum for 5 digits' do
-    
+
     it 'should have the expected odd_digits' do
-      UPCSupplemental.new('51234').odd_digits.must_equal [4,2,5]
-      UPCSupplemental.new('54321').odd_digits.must_equal [1,3,5]
-      UPCSupplemental.new('99990').odd_digits.must_equal [0,9,9]
+      assert_equal [4,2,5], UPCSupplemental.new('51234').odd_digits
+      assert_equal [1,3,5], UPCSupplemental.new('54321').odd_digits
+      assert_equal [0,9,9], UPCSupplemental.new('99990').odd_digits
     end
 
     it 'should have the expected even_digits' do
-      UPCSupplemental.new('51234').even_digits.must_equal [3,1]
-      UPCSupplemental.new('54321').even_digits.must_equal [2,4]
-      UPCSupplemental.new('99990').even_digits.must_equal [9,9]
+      assert_equal [3,1], UPCSupplemental.new('51234').even_digits
+      assert_equal [2,4], UPCSupplemental.new('54321').even_digits
+      assert_equal [9,9], UPCSupplemental.new('99990').even_digits
     end
 
     it 'should have the expected odd and even sums' do
-      UPCSupplemental.new('51234').odd_sum.must_equal 33
-      UPCSupplemental.new('54321').odd_sum.must_equal 27
-      UPCSupplemental.new('99990').odd_sum.must_equal 54
+      assert_equal 33, UPCSupplemental.new('51234').odd_sum
+      assert_equal 27, UPCSupplemental.new('54321').odd_sum
+      assert_equal 54, UPCSupplemental.new('99990').odd_sum
 
-      UPCSupplemental.new('51234').even_sum.must_equal 36
-      UPCSupplemental.new('54321').even_sum.must_equal 54
-      UPCSupplemental.new('99990').even_sum.must_equal 162
+      assert_equal 36, UPCSupplemental.new('51234').even_sum
+      assert_equal 54, UPCSupplemental.new('54321').even_sum
+      assert_equal 162, UPCSupplemental.new('99990').even_sum
     end
 
     it 'should have the expected checksum' do
-      UPCSupplemental.new('51234').checksum.must_equal 9
-      UPCSupplemental.new('54321').checksum.must_equal 1
-      UPCSupplemental.new('99990').checksum.must_equal 6
+      assert_equal 9, UPCSupplemental.new('51234').checksum
+      assert_equal 1, UPCSupplemental.new('54321').checksum
+      assert_equal 6, UPCSupplemental.new('99990').checksum
     end
-    
+
   end
-  
+
   describe 'checksum for 2 digits' do
-    
+
     it 'should have the expected checksum' do
-      UPCSupplemental.new('51').checksum.must_equal 3
-      UPCSupplemental.new('21').checksum.must_equal 1
-      UPCSupplemental.new('99').checksum.must_equal 3
+      assert_equal 3, UPCSupplemental.new('51').checksum
+      assert_equal 1, UPCSupplemental.new('21').checksum
+      assert_equal 3, UPCSupplemental.new('99').checksum
     end
-    
+
   end
-  
+
   describe 'encoding' do
 
     before do
@@ -76,27 +76,27 @@ class UpcSupplementalTest < Barby::TestCase
     end
 
     it 'should have the expected encoding' do
-      #                                                START 5          1          2          3          4
-      UPCSupplemental.new('51234').encoding.must_equal '1011 0110001 01 0011001 01 0011011 01 0111101 01 0011101'.tr(' ', '')
-      #                                                      9          9          9          9          0
-      UPCSupplemental.new('99990').encoding.must_equal '1011 0001011 01 0001011 01 0001011 01 0010111 01 0100111'.tr(' ', '')
-      #                                             START 5          1
-      UPCSupplemental.new('51').encoding.must_equal '1011 0111001 01 0110011'.tr(' ', '')
-      #                                                   2          2
-      UPCSupplemental.new('22').encoding.must_equal '1011 0011011 01 0010011'.tr(' ', '')
+      #            START 5          1          2          3          4
+      assert_equal '1011 0110001 01 0011001 01 0011011 01 0111101 01 0011101'.tr(' ', ''), UPCSupplemental.new('51234').encoding
+      #                  9          9          9          9          0
+      assert_equal '1011 0001011 01 0001011 01 0001011 01 0010111 01 0100111'.tr(' ', ''), UPCSupplemental.new('99990').encoding
+      #            START 5          1
+      assert_equal '1011 0111001 01 0110011'.tr(' ', ''), UPCSupplemental.new('51').encoding
+      #                  2          2
+      assert_equal '1011 0011011 01 0010011'.tr(' ', ''), UPCSupplemental.new('22').encoding
     end
 
     it 'should be able to change its data' do
       prev_encoding = @code.encoding
       @code.data = '99990'
-      @code.encoding.wont_equal prev_encoding
-      #                               9          9          9          9          0
-      @code.encoding.must_equal '1011 0001011 01 0001011 01 0001011 01 0010111 01 0100111'.tr(' ', '')
+      refute_equal prev_encoding, @code.encoding
+      #                  9          9          9          9          0
+      assert_equal '1011 0001011 01 0001011 01 0001011 01 0010111 01 0100111'.tr(' ', ''), @code.encoding
       prev_encoding = @code.encoding
       @code.data = '22'
-      @code.encoding.wont_equal prev_encoding
-      #                               2          2
-      @code.encoding.must_equal '1011 0011011 01 0010011'.tr(' ', '')
+      refute_equal prev_encoding, @code.encoding
+      #                  2          2
+      assert_equal '1011 0011011 01 0010011'.tr(' ', ''), @code.encoding
     end
 
   end