barby 0.6.8 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64d74091ea1f3aa79457c34878fc3b0d6f4c805dbb985d12eb372f29a7837e36
-  data.tar.gz: a8a61c1af0a401a1b36bc675653d2063e569443d434a57b5a2d95c7abfc1d193
+  metadata.gz: f5aba9010322760b9c4416d397c0566cf91df3c2e980c9f5b0d4af162e9823ee
+  data.tar.gz: d69476e6a231e61eff9406e752cc59527a0ffae9c3d9ca8155a62f9719487cbc
 SHA512:
-  metadata.gz: 99143c0bf41695fa1416956073bcb6c9d7257c677fa36337638f890681665bacd51c4b04cd3412008592c8f23e4130fec74363eb425c776f8c827bf360d07c5b
-  data.tar.gz: d1b1f6aa2a63484b00f79bd184bef605b75850152dd54600b7eb25434f114c45c6994ce725af7535edefb8a536fc93f3e42c7d4bd2547c6f88d8da90d0947f8f
+  metadata.gz: 94249381a5c5a2a4625bb6d64ccfe5ebb0d8b63ee326cbc0313cc07006a1a7c9654d8e3a2e9b006d93d040abbba594f4f137aea9346447909bb1834fb8b90edf
+  data.tar.gz: 1af6b8bcc689f7014d2d06a4e7fcaa9c2004909d0f5c609f6b32dc70f39bfd1e37b765337f8b126798ddac3158736e40adfa05909fae579c3fd66de36a0ef7cc

data/CHANGELOG

@@ -1,3 +1,12 @@
+* 0.7.0
+
+* Swap semaocde for dmtx [ksylvest]
+
+* 0.6.9
+
+* Remove use of instance_eval in RMagick outputter [stlewis]
+* Codabar in README [nashirox]
+
 * 0.6.7
 
 * RMagick outputter should use line command for lines [joshuaflanagan]

data/README.md

@@ -62,13 +62,14 @@ require 'barby/barcode/<filename>'
 | Code 93                             | `code_93`             | ─                                  |
 | Code 128 (A, B, and C)              | `code_128`            | ─                                  |
 | └─ GS1 128                          | `gs1_128`             | ─                                  |
+| Codabar                             | `codabar`             | ─                                  |
 | EAN-13                              | `ean_13`              | ─                                  |
 | ├─ Bookland                         | `bookland`            | ─                                  |
 | └─ UPC-A                            | `ean_13`              | ─                                  |
 | EAN-8                               | `ean_8`               | ─                                  |
 | UPC/EAN supplemental, 2 & 5 digits  | `upc_supplemental`    | ─                                  |
 | QR Code                             | `qr_code`             | `rqrcode`                          |
-| DataMatrix (Semacode)               | `data_matrix`         | `semacode` or `semacode-ruby19`    |
+| DataMatrix (dmtx)                   | `data_matrix`         | `dmtx`                             |
 | PDF417                              | `pdf_417`             | JRuby                              |
 
 

data/barby.gemspec

@@ -2,16 +2,16 @@ $:.push File.expand_path("../lib", __FILE__)
 require "barby/version"
 
 Gem::Specification.new do |s|
-  s.name        = "barby"
-  s.version     = Barby::VERSION::STRING
-  s.platform    = Gem::Platform::RUBY
-  s.summary     = "The Ruby barcode generator"
-  s.email       = "toredarell@gmail.com"
-  s.homepage    = "http://toretore.github.com/barby"
-  s.description = "Barby creates barcodes."
-  s.authors     = ['Tore Darell']
-
-  s.rubyforge_project = "barby"
+  s.name                  = "barby"
+  s.version               = Barby::VERSION::STRING
+  s.platform              = Gem::Platform::RUBY
+  s.summary               = "The Ruby barcode generator"
+  s.email                 = "toredarell@gmail.com"
+  s.homepage              = "http://toretore.github.com/barby"
+  s.description           = "Barby creates barcodes."
+  s.authors               = ['Tore Darell']
+  s.required_ruby_version = '>= 3.1'
+  s.licenses              = []
 
   s.extra_rdoc_files  = ["README.md"]
 
@@ -21,11 +21,11 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths     = ["lib"]
 
-  s.add_development_dependency "minitest",        "~> 5.11"
-  s.add_development_dependency "bundler",         "~> 1.16"
-  s.add_development_dependency "rake",            "~> 10.0"
-  s.add_development_dependency "semacode-ruby19", "~> 0.7"
-  s.add_development_dependency "rqrcode",         "~> 0.10"
-  s.add_development_dependency "prawn",           "~> 2.2"
-  s.add_development_dependency "cairo",           "~> 1.15"
+  s.add_development_dependency "minitest",        "~> 5.25"
+  s.add_development_dependency "bundler",         "~> 2.5"
+  s.add_development_dependency "rake",            "~> 13.2"
+  s.add_development_dependency "rqrcode",         "~> 2.2"
+  s.add_development_dependency "prawn",           "~> 2.5"
+  s.add_development_dependency "cairo",           "~> 1.17"
+  s.add_development_dependency "dmtx",            "~> 0.2"
 end

data/lib/barby/barcode/data_matrix.rb

@@ -1,10 +1,10 @@
-require 'semacode' #Ruby 1.8: gem install semacode - Ruby 1.9: gem install semacode-ruby19
+require 'dmtx' # gem install dmtx
 require 'barby/barcode'
 
 module Barby
 
 
-  #Uses the semacode library (gem install semacode) to encode DataMatrix barcodes
+  #Uses the dmtx library (gem install dmtx) to encode DataMatrix barcodes
   class DataMatrix < Barcode2D
 
     attr_reader :data
@@ -21,21 +21,56 @@ module Barby
     end
 
     def encoder
-      @encoder ||= ::DataMatrix::Encoder.new(data)
+      @encoder ||= ::Dmtx::DataMatrix.new(data)
     end
 
 
+    # Converts the barcode to an array of lines where 0 is white and 1 is black.
+    #
+    # @example
+    #   code = Barby::DataMatrix.new('humbaba')
+    #   code.encoding
+    #   # => [
+    #   # "10101010101010",
+    #   # "10111010000001",
+    #   # "11100101101100",
+    #   # "11101001110001",
+    #   # "11010101111110",
+    #   # "11100101100001",
+    #   # "11011001011110",
+    #   # "10011011010011",
+    #   # "11011010000100",
+    #   # "10101100101001",
+    #   # "11011100001100",
+    #   # "10101110110111",
+    #   # "11000001010100",
+    #   # "11111111111111",
+    #   # ]
+    #
+    # @return [String]
     def encoding
-      encoder.data.map{|a| a.map{|b| b ? '1' : '0' }.join }
+      width = encoder.width
+      height = encoder.height
+
+      height.times.map { |y| width.times.map { |x| bit?(x, y) ? '1' : '0' }.join }
     end
 
 
-    def semacode?
-      #TODO: Not sure if this is right
-      data =~ /^http:\/\//
+    # NOTE: this method is not exposed via the gem so using send ahead of opening a PR to hopefully support:
+    #
+    # https://github.com/mtgrosser/dmtx/blob/master/lib/dmtx/data_matrix.rb#L133-L135
+    #
+    # @param x [Integer] x-coordinate
+    # @param y [Integer] y-coordinate
+    # @return [Boolean]
+    def bit?(x, y)
+      encoder.send(:bit?, x, y)
     end
 
 
+    # The data being encoded.
+    #
+    # @return [String]
     def to_s
       data
     end

data/lib/barby/outputter/rmagick_outputter.rb

@@ -53,7 +53,7 @@ module Barby
     def to_image(opts={})
       with_options opts do
         b = background #Capture locally because Magick::Image.new block uses instance_eval
-        canvas = Magick::Image.new(full_width, full_height){ self.background_color = b }
+        canvas = Magick::Image.new(full_width, full_height){ |i|  i.background_color = b }
         bars = Magick::Draw.new
         bars.fill = foreground
 

data/lib/barby/version.rb

@@ -1,8 +1,8 @@
 module Barby #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 6
-    TINY  = 8
+    MINOR = 7
+    TINY  = 0
 
     STRING = [MAJOR, MINOR, TINY].join('.').freeze
   end

data/test/bookland_test.rb

@@ -10,19 +10,21 @@ class BooklandTest < Barby::TestCase
   end
 
   it "should have the expected data" do
-    @code.data.must_equal '978968261240'
+    assert_equal '978968261240', @code.data
   end
 
   it "should have the expected numbers" do
-    @code.numbers.must_equal [9,7,8,9,6,8,2,6,1,2,4,0]
+    assert_equal [9,7,8,9,6,8,2,6,1,2,4,0], @code.numbers
   end
 
   it "should have the expected checksum" do
-    @code.checksum.must_equal 4
+    assert_equal 4, @code.checksum
   end
 
   it "should raise an error when data not valid" do
-    lambda{ Bookland.new('1234') }.must_raise ArgumentError
+    assert_raises ArgumentError do
+      Bookland.new('1234')
+    end
   end
 
   describe 'ISBN conversion' do
@@ -30,22 +32,22 @@ class BooklandTest < Barby::TestCase
     it "should accept ISBN with number system and check digit" do
       code = Bookland.new('978-82-92526-14-9')
       assert code.valid?
-      code.data.must_equal '978829252614'
+      assert_equal '978829252614', code.data
       code = Bookland.new('979-82-92526-14-9')
       assert code.valid?
-      code.data.must_equal '979829252614'
+      assert_equal '979829252614', code.data
     end
 
     it "should accept ISBN without number system but with check digit" do
       code = Bookland.new('82-92526-14-9')
       assert code.valid?
-      code.data.must_equal '978829252614' #978 is the default prefix
+      assert_equal '978829252614', code.data #978 is the default prefix
     end
 
     it "should accept ISBN without number system or check digit" do
       code = Bookland.new('82-92526-14')
       assert code.valid?
-      code.data.must_equal '978829252614'
+      assert_equal '978829252614', code.data
     end
 
   end

data/test/codabar_test.rb

@@ -19,7 +19,9 @@ class CodabarTest < Barby::TestCase
     end
 
     it "should raise an exception when data is invalid" do
-      lambda{ Codabar.new('A12345E') }.must_raise(ArgumentError)
+      assert_raises ArgumentError do
+        Codabar.new('A12345E')
+      end
     end
   end
 
@@ -31,7 +33,7 @@ class CodabarTest < Barby::TestCase
     end
 
     it "should have the same data as was passed to it" do
-      @code.data.must_equal @data
+      assert_equal @data, @code.data
     end
   end
 
@@ -46,12 +48,13 @@ class CodabarTest < Barby::TestCase
     end
 
     it "should have the expected encoding" do
-      @code.encoding.must_equal [
+      assert_equal [
         "1011001001", # A
         "101010011", # 0
         "101011001", # 1
         "1010011001", # D
-      ].join("00")
+      ].join("00"),
+      @code.encoding
     end
   end
 end