barby 0.6.5 → 0.6.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: bf63b4cabe71e145f367917c72ddd3a87b44655d
-  data.tar.gz: 978466b7b734651b5f9362b67136033bdcf572a7
+SHA256:
+  metadata.gz: 64d74091ea1f3aa79457c34878fc3b0d6f4c805dbb985d12eb372f29a7837e36
+  data.tar.gz: a8a61c1af0a401a1b36bc675653d2063e569443d434a57b5a2d95c7abfc1d193
 SHA512:
-  metadata.gz: 8152a2ea8b9b84264e904f5d50f61c6712fd238580041b5cc0852eacdce210b9e4d6a345ea753c3c4d58c62439d69ab7882006643caa31607eefedcc6226268d
-  data.tar.gz: 0b9e1005bc39a1ea0e8ecd6c57947be36f35e8d1a5529c48073f7d505bc82fa92a7ca1c67d987eb9f94507edd4f5b501cf58c4f994fd8339687fd1659f665404
+  metadata.gz: 99143c0bf41695fa1416956073bcb6c9d7257c677fa36337638f890681665bacd51c4b04cd3412008592c8f23e4130fec74363eb425c776f8c827bf360d07c5b
+  data.tar.gz: d1b1f6aa2a63484b00f79bd184bef605b75850152dd54600b7eb25434f114c45c6994ce725af7535edefb8a536fc93f3e42c7d4bd2547c6f88d8da90d0947f8f

data/.gitignore

@@ -0,0 +1,2 @@
+*.swp
+Gemfile.lock

data/CHANGELOG

@@ -1,3 +1,11 @@
+* 0.6.7
+
+* RMagick outputter should use line command for lines [joshuaflanagan]
+
+* 0.6.6
+
+* Add support for Codabar symbology [labocho]
+
 * 0.6.1
 
 * Fix single-pixel error with RMagick [James Brink]

data/Gemfile

@@ -0,0 +1,5 @@
+source "https://rubygems.org"
+
+git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
+
+gemspec

data/README.md

@@ -12,7 +12,8 @@ lines or squares, outputters will do that for you.
 Likewise, you can easily add an outputter for a format that doesn't have one
 yet, and it will work with all existing symbologies.
 
-For more information, check out [the Barby wiki] [wiki].
+For more information, check out [the Barby wiki][wiki].
+
 
 ### New require policy
 
@@ -51,24 +52,24 @@ puts barcode.to_ascii #Implicitly uses the AsciiOutputter
 require 'barby/barcode/<filename>'
 ```
 
-| Name                                | Filename              | Dependencies  |
-| ----------------------------------- | --------------------- | ------------- |
-| Code 25                             | `code_25`             | ─             |
-| ├─ Interleaved                      | `code_25_interleaved` | ─             |
-| └─ IATA                             | `code_25_iata`        | ─             |
-| Code 39                             | `code_39`             | ─             |
-| └─ Extended                         | `code_39`             | ─             |
-| Code 93                             | `code_93`             | ─             |
-| Code 128 (A, B, and C)              | `code_128`            | ─             |
-| └─ GS1 128                          | `gs1_128`             | ─             |
-| 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`    |
-| PDF417                              | `pdf_417`             | JRuby         |
+| Name                                | Filename              | Dependencies                       |
+| ----------------------------------- | --------------------- | ---------------------------------- |
+| Code 25                             | `code_25`             | ─                                  |
+| ├─ Interleaved                      | `code_25_interleaved` | ─                                  |
+| └─ IATA                             | `code_25_iata`        | ─                                  |
+| Code 39                             | `code_39`             | ─                                  |
+| └─ Extended                         | `code_39`             | ─                                  |
+| Code 93                             | `code_93`             | ─                                  |
+| Code 128 (A, B, and C)              | `code_128`            | ─                                  |
+| └─ GS1 128                          | `gs1_128`             | ─                                  |
+| 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`    |
+| PDF417                              | `pdf_417`             | JRuby                              |
 
 
 ## Outputters
@@ -99,7 +100,7 @@ require 'barby/outputter/<filename>_outputter'
 
 ---
 
-For more information, check out [the Barby wiki] [wiki].
+For more information, check out [the Barby wiki][wiki].
 
 
   [wiki]: https://github.com/toretore/barby/wiki

data/Rakefile

@@ -0,0 +1,15 @@
+require 'rake'
+require 'rake/testtask'
+require 'rdoc/task'
+
+Rake::TestTask.new do |t|
+  t.libs = ['lib','test']
+  t.test_files = Dir.glob("test/**/*_test.rb").sort
+  t.verbose = true
+end
+
+RDoc::Task.new do |rdoc|
+  rdoc.main = "README"
+  rdoc.rdoc_files.include("README", "lib")
+  rdoc.rdoc_dir = 'doc'
+end

data/barby.gemspec

@@ -0,0 +1,31 @@
+$:.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.extra_rdoc_files  = ["README.md"]
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.test_files.delete("test/outputter/rmagick_outputter_test.rb")
+  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"
+end

data/lib/barby/barcode/codabar.rb

@@ -0,0 +1,82 @@
+require "barby/barcode"
+
+module Barby
+  # https://en.wikipedia.org/wiki/Codabar
+  class Codabar < Barcode1D
+    BLACK_NARROW_WIDTH = 1
+    WHITE_NARROW_WIDTH = 2
+    WIDE_WIDTH_RATE = 3
+    SPACING = 5 # must be equal to or wider than white narrow width
+    CHARACTERS = "0123456789-$:/.+ABCD".freeze
+    # even: black, odd: white
+    # 0: narrow, 1: wide
+    BINARY_EXPRESSION = [
+      "0000011", # 0
+      "0000110", # 1
+      "0001001", # 2
+      "1100000", # 3
+      "0010010", # 4
+      "1000010", # 5
+      "0100001", # 6
+      "0100100", # 7
+      "0110000", # 8
+      "1001000", # 9
+      "0001100", # -
+      "0011000", # $
+      "1000101", # :
+      "1010001", # /
+      "1010100", # .
+      "0010101", # +
+      "0011010", # A
+      "0101001", # B
+      "0001011", # C
+      "0001110", # D
+    ].each(&:freeze)
+    CHARACTER_TO_BINARY = Hash[CHARACTERS.chars.zip(BINARY_EXPRESSION)].freeze
+    FORMAT = /\A[ABCD][0123456789\-\$:\/\.\+]+[ABCD]\z/.freeze
+    ONE = "1".freeze
+    ZERO = "0".freeze
+
+    attr_accessor :data, :black_narrow_width, :white_narrow_width, :wide_width_rate, :spacing
+
+    def initialize(data)
+      self.data = data
+      raise ArgumentError, 'data not valid' unless valid?
+
+      self.black_narrow_width = BLACK_NARROW_WIDTH
+      self.white_narrow_width = WHITE_NARROW_WIDTH
+      self.wide_width_rate = WIDE_WIDTH_RATE
+      self.spacing = SPACING
+    end
+
+    def encoding
+      data.chars.map{|c| binary_to_bars(CHARACTER_TO_BINARY[c]) }.join(ZERO * spacing)
+    end
+
+    def valid?
+      data =~ FORMAT
+    end
+
+    private
+    def binary_to_bars(bin)
+      bin.chars.each_with_index.map{|c, i|
+        black = i % 2 == 0
+        narrow = c == ZERO
+
+        if black
+          if narrow
+            ONE * black_narrow_width
+          else
+            ONE * (black_narrow_width * wide_width_rate).to_i
+          end
+        else
+          if narrow
+            ZERO * white_narrow_width
+          else
+            ZERO * (white_narrow_width * wide_width_rate).to_i
+          end
+        end
+      }.join
+    end
+  end
+end

data/lib/barby/barcode.rb

@@ -17,7 +17,7 @@ module Barby
   #   '101100111000111100001'
   #  end
   # end
-  # 
+  #
   # require 'barby/outputter/ascii_outputter'
   # puts StaticBarcode.new.to_ascii(:height => 3)
   #
@@ -33,8 +33,8 @@ module Barby
   #   end
   # end
   class Barcode
-  
-    
+
+
     #Every barcode must have an encoding method. This method returns
     #a string containing a series of 1 and 0, representing bars and
     #spaces. One digit is the width of one "module" or X dimension.

data/lib/barby/outputter/cairo_outputter.rb

@@ -4,9 +4,17 @@ require 'stringio'
 
 module Barby
 
-  #Uses Cairo to render a barcode to a number of formats: PNG, PS, EPS, PDF and SVG
+  # Uses Cairo to render a barcode to a number of formats: PNG, PS, EPS, PDF and SVG
   #
-  #Registers methods render_to_cairo_context, to_png, to_ps, to_eps, to_pdf and to_svg
+  # Registers methods render_to_cairo_context, to_png, to_ps, to_eps, to_pdf and to_svg
+  #
+  # Options:
+  #
+  #   * xdim
+  #   * ydim             - (2D only)
+  #   * height           - (1D only)
+  #   * foreground       - Cairo::Color::Base or Cairo::Color.parse(value)
+  #   * background       - ^
   class CairoOutputter < Outputter
 
     register :render_to_cairo_context
@@ -42,7 +50,7 @@ module Barby
       _height = height(options)
       original_current_x = current_x
       context.save do
-        context.set_source_color(:black)
+        context.set_source_color(options[:foreground] || :black)
         context.fill do
           if barcode.two_dimensional?
             boolean_groups.each do |groups|

data/lib/barby/outputter/png_outputter.rb

@@ -3,24 +3,30 @@ require 'chunky_png'
 
 module Barby
 
-  #Renders the barcode to a PNG image using chunky_png (gem install chunky_png)
+  # Renders the barcode to a PNG image using chunky_png (gem install chunky_png)
+  #
+  # Registers the to_png, to_datastream and to_canvas methods
+  #
+  # Options:
+  #
+  #   * xdim:         X dimension - bar width                                           [1]
+  #   * ydim:         Y dimension - bar height (2D only)                                [1]
+  #   * height:       Height of bars (1D only)                                          [100]
+  #   * margin:       Size of margin around barcode                                     [0]
+  #   * foreground:   Foreground color (see ChunkyPNG::Color - can be HTML color name)  [black]
+  #   * background:   Background color (see ChunkyPNG::Color - can be HTML color name)  [white]
   #
-  #Registers the to_png, to_datastream and to_canvas methods
   class PngOutputter < Outputter
 
     register :to_png, :to_image, :to_datastream
 
-    attr_writer :xdim, :ydim, :width, :height, :margin
+    attr_writer :xdim, :ydim, :height, :margin
 
-    def initialize(*)
-      super
-      @xdim, @height, @margin = nil
-    end
 
-    #Creates a PNG::Canvas object and renders the barcode on it
+    #Creates a ChunkyPNG::Image object and renders the barcode on it
     def to_image(opts={})
       with_options opts do
-        canvas = ChunkyPNG::Image.new(full_width, full_height, ChunkyPNG::Color::WHITE)
+        canvas = ChunkyPNG::Image.new(full_width, full_height, background)
 
         if barcode.two_dimensional?
           x, y = margin, margin
@@ -29,7 +35,7 @@ module Barby
               if bar
                 x.upto(x+(xdim-1)) do |xx|
                   y.upto y+(ydim-1) do |yy|
-                    canvas[xx,yy] = ChunkyPNG::Color::BLACK
+                    canvas[xx,yy] = foreground
                   end
                 end
               end
@@ -44,7 +50,7 @@ module Barby
             if bar
               x.upto(x+(xdim-1)) do |xx|
                 y.upto y+(height-1) do |yy|
-                  canvas[xx,yy] = ChunkyPNG::Color::BLACK
+                  canvas[xx,yy] = foreground
                 end
               end
             end
@@ -101,6 +107,32 @@ module Barby
       @margin || 10
     end
 
+
+    def background=(c)
+      @background = if c.is_a?(String) || c.is_a?(Symbol)
+                      ChunkyPNG::Color.html_color(c.to_sym)
+                    else
+                      c
+                    end
+    end
+
+    def background
+      @background || ChunkyPNG::Color::WHITE
+    end
+
+    def foreground=(c)
+      @foreground = if c.is_a?(String) || c.is_a?(Symbol)
+                      ChunkyPNG::Color.html_color(c.to_sym)
+                    else
+                      c
+                    end
+    end
+
+    def foreground
+      @foreground || ChunkyPNG::Color::BLACK
+    end
+
+
     def length
       barcode.two_dimensional? ? encoding.first.length : encoding.length
     end

data/lib/barby/outputter/prawn_outputter.rb

@@ -7,13 +7,7 @@ module Barby
 
     register :to_pdf, :annotate_pdf
 
-    attr_writer :xdim, :ydim, :x, :y, :height, :margin, :unbleed
-
-
-    def initialize(*)
-      super
-      @xdim, @ydim, @x, @y, @height, @margin, @unbleed = nil
-    end
+    attr_writer :xdim, :ydim, :x, :y, :height, :margin, :unbleed, :color
 
     def to_pdf(opts={})
       doc_opts = opts.delete(:document) || {}
@@ -26,6 +20,9 @@ module Barby
       with_options opts do
         xpos, ypos = x, y
         orig_xpos = xpos
+        orig_color = pdf.fill_color
+
+        pdf.fill_color = color if color
 
         if barcode.two_dimensional?
           boolean_groups.reverse_each do |groups|
@@ -55,9 +52,11 @@ module Barby
             end
             xpos += (xdim*amount)
           end
-        end
+        end#if
 
-      end
+        pdf.fill_color = orig_color
+
+      end#with_options
 
       pdf
     end
@@ -113,6 +112,10 @@ module Barby
       @unbleed || 0
     end
 
+    def color
+      @color
+    end
+
 
   private
 

data/lib/barby/outputter/rmagick_outputter.rb

@@ -4,21 +4,25 @@ require 'rmagick'
 module Barby
 
 
-  #Renders images from barcodes using RMagick
+  # Renders images from barcodes using RMagick
   #
-  #Registers the to_png, to_gif, to_jpg and to_image methods
+  # Registers the to_png, to_gif, to_jpg and to_image methods
+  #
+  # Options:
+  #
+  #   * xdim          -
+  #   * ydim          - 2D only
+  #   * height        - 1D only
+  #   * margin        -
+  #   * foreground    - RMagick "colorspec"
+  #   * background    - ^
   class RmagickOutputter < Outputter
 
     register :to_png, :to_gif, :to_jpg, :to_image
 
-    attr_writer :height, :xdim, :ydim, :margin
+    attr_writer :height, :xdim, :ydim, :margin, :foreground, :background
 
 
-    def initialize(*)
-      super
-      @height, @xdim, @ydim, @margin = nil
-    end
-
     #Returns a string containing a PNG image
     def to_png(*a)
       to_blob('png', *a)
@@ -48,8 +52,10 @@ module Barby
     #Returns an instance of Magick::Image
     def to_image(opts={})
       with_options opts do
-        canvas = Magick::Image.new(full_width, full_height)
+        b = background #Capture locally because Magick::Image.new block uses instance_eval
+        canvas = Magick::Image.new(full_width, full_height){ self.background_color = b }
         bars = Magick::Draw.new
+        bars.fill = foreground
 
         x1 = margin
         y1 = margin
@@ -64,7 +70,14 @@ module Barby
                 if x1 == x2 && y1 == y2
                   bars.point(x1,y1)
                 else
-                  bars.rectangle(x1, y1, x2, y2)
+                  # For single pixel lines, use line
+                  if x1 == x2
+                    bars.line(x1, y1, x1, y2)
+                  elsif y1 == y2
+                    bars.line(x1, y1, x2, y1)
+                  else
+                    bars.rectangle(x1, y1, x2, y2)
+                  end
                 end
               end
               x1 += xdim
@@ -77,7 +90,12 @@ module Barby
             if bar
               x2 = x1+(xdim-1)
               y2 = y1+(height-1)
-              bars.rectangle(x1, y1, x2, y2)
+              # For single pixel width, use line
+              if x1 == x2
+                bars.line(x1, y1, x1, y2)
+              else
+                bars.rectangle(x1, y1, x2, y2)
+              end
             end
             x1 += xdim
           end
@@ -134,6 +152,15 @@ module Barby
     end
 
 
+    def foreground
+      @foreground || 'black'
+    end
+
+    def background
+      @background || 'white'
+    end
+
+
   end
 
 

data/lib/barby/outputter/svg_outputter.rb

@@ -19,14 +19,9 @@ module Barby
 
     register :to_svg, :bars_to_rects, :bars_to_path
 
-    attr_writer :title, :xdim, :ydim, :height, :rmargin, :lmargin, :tmargin, :bmargin, :xmargin, :ymargin, :margin
+    attr_writer :title, :xdim, :ydim, :height, :rmargin, :lmargin, :tmargin, :bmargin, :xmargin, :ymargin, :margin, :foreground, :background
 
 
-    def initialize(*)
-      super
-      @title, @xdim, @ydim, @height, @rmargin, @lmargin, @tmargin, @bmargin, @xmargin, @ymargin, @margin = nil
-    end
-
     def to_svg(opts={})
       with_options opts do
         case opts[:use]
@@ -39,11 +34,11 @@ module Barby
 
         <<-"EOT"
 <?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="#{svg_width(opts)}px" height="#{svg_height(opts)}px" viewBox="0 0 #{svg_width(opts)} #{svg_height(opts)}" version="1.1">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="#{svg_width(opts)}px" height="#{svg_height(opts)}px" viewBox="0 0 #{svg_width(opts)} #{svg_height(opts)}" version="1.1" preserveAspectRatio="none" >
 <title>#{escape title}</title>
 <g id="canvas" #{transform(opts)}>
-<rect x="0" y="0" width="#{full_width}px" height="#{full_height}px" fill="white" />
-<g id="barcode" fill="black">
+<rect x="0" y="0" width="#{full_width}px" height="#{full_height}px" fill="#{background}" />
+<g id="barcode" fill="#{foreground}">
 #{bars}
 </g></g>
 </svg>
@@ -51,7 +46,6 @@ EOT
       end
     end
 
-
     def bars_to_rects(opts={})
       rects = ''
       with_options opts do
@@ -85,14 +79,12 @@ EOT
       rects
     end
 
-
     def bars_to_path(opts={})
       with_options opts do
         %Q|<path stroke="black" stroke-width="#{xdim}" d="#{bars_to_path_data(opts)}" />|
       end
     end
 
-
     def bars_to_path_data(opts={})
       path_data = ''
       with_options opts do
@@ -124,12 +116,10 @@ EOT
       path_data
     end
 
-
     def title
       @title || barcode.to_s
     end
 
-
     def width
       length * xdim
     end
@@ -189,6 +179,13 @@ EOT
       barcode.two_dimensional? ? encoding.first.length : encoding.length
     end
 
+    def foreground
+      @foreground || '#000'
+    end
+
+    def background
+      @background || '#fff'
+    end
 
     def svg_width(opts={})
       opts[:rot] ? full_height : full_width
@@ -198,12 +195,10 @@ EOT
       opts[:rot] ? full_width : full_height
     end
 
-
     def transform(opts={})
       opts[:rot] ? %Q|transform="rotate(-90) translate(-#{full_width}, 0)"| : nil
     end
 
-
   private
 
     def _xmargin
@@ -223,8 +218,6 @@ EOT
       str.gsub('&', '&amp;').gsub('<', '&lt;').gsub('>', '&gt;')
     end
 
-
   end
 
-
 end

data/lib/barby/outputter.rb

@@ -28,7 +28,7 @@ module Barby
       self.barcode = barcode
     end
 
-  
+
     #Register one or more handler methods with this outputter
     #Barcodes will then be able to use these methods to get the output
     #from the outputter. For example, if you have an ImageOutputter,

data/lib/barby/version.rb

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

data/test/barcodes.rb

@@ -0,0 +1,20 @@
+require 'code_128_test'
+
+require 'code_25_test'
+require 'code_25_interleaved_test'
+require 'code_25_iata_test'
+
+require 'code_39_test'
+require 'code_93_test'
+
+require 'codabar_test'
+
+require 'ean13_test'
+require 'ean8_test'
+require 'bookland_test'
+require 'upc_supplemental_test'
+
+require 'data_matrix_test'
+require 'qr_code_test'
+
+#require 'pdf_417_test'