barby 0.6.2 → 0.6.8

data/lib/barby/barcode/ean_13.rb

@@ -129,7 +129,7 @@ module Barby
     def weighted_sum
       odds, evens = odd_and_even_numbers
       odds.map!{|n| n * 3 }
-      sum = (odds+evens).inject(0){|s,n| s+n }
+      (odds+evens).inject(0){|s,n| s+n }
     end
 
     #Mod10

data/lib/barby/barcode/gs1_128.rb

@@ -3,18 +3,22 @@ require 'barby/barcode/code_128'
 module Barby
 
 
+  #DEPRECATED - Use the Code128 class directly instead:
+  #
+  #  Code128.new("#{Code128::FNC1}#{application_identifier}#{data}")
+  #
   #AKA EAN-128, UCC-128
   class GS1128 < Code128
 
     attr_accessor :application_identifier
 
     def initialize(data, type, ai)
+      warn "DEPRECATED: The GS1128 class has been deprecated, use Code128 directly instead (called from #{caller[0]})"
       self.application_identifier = ai
       super(data, type)
     end
 
 
-    #TODO: Not sure this is entirely right
     def data
       FNC1+application_identifier+super
     end

data/lib/barby/barcode/qr_code.rb

@@ -41,6 +41,7 @@ module Barby
 
     def initialize(data, options={})
       self.data = data
+      @level, @size = nil
       options.each{|k,v| send("#{k}=", v) }
       raise(ArgumentError, "data too large") unless size
     end
@@ -70,7 +71,7 @@ module Barby
       return @size if @size
 
       level_index = LEVELS[level]
-      length = data.length
+      length = data.bytesize
       found_size = nil
       SIZES.each do |size,max_values|
         if max_values[level_index] >= length

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/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
@@ -23,6 +31,11 @@ module Barby
     attr_writer :x, :y, :xdim, :height, :margin
 
 
+    def initialize(*)
+      super
+      @x, @y, @xdim, @height, @margin = nil
+    end
+
     #Render the barcode onto a Cairo context
     def render_to_cairo_context(context, options={})
       if context.respond_to?(:have_current_point?) and
@@ -37,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,20 +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_accessor :xdim, :ydim, :width, :height, :margin
+    attr_writer :xdim, :ydim, :height, :margin
 
 
-    #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
@@ -25,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
@@ -40,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
@@ -97,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,8 +7,7 @@ module Barby
 
     register :to_pdf, :annotate_pdf
 
-    attr_accessor :xdim, :ydim, :x, :y, :height, :margin, :unbleed
-
+    attr_writer :xdim, :ydim, :x, :y, :height, :margin, :unbleed, :color
 
     def to_pdf(opts={})
       doc_opts = opts.delete(:document) || {}
@@ -21,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|
@@ -50,9 +52,11 @@ module Barby
             end
             xpos += (xdim*amount)
           end
-        end
+        end#if
+
+        pdf.fill_color = orig_color
 
-      end
+      end#with_options
 
       pdf
     end
@@ -108,6 +112,10 @@ module Barby
       @unbleed || 0
     end
 
+    def color
+      @color
+    end
+
 
   private
 

data/lib/barby/outputter/rmagick_outputter.rb

@@ -1,17 +1,26 @@
 require 'barby/outputter'
-require 'RMagick'
+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_accessor :height, :xdim, :ydim, :margin
+    attr_writer :height, :xdim, :ydim, :margin, :foreground, :background
 
 
     #Returns a string containing a PNG image
@@ -28,23 +37,25 @@ module Barby
     def to_jpg(*a)
       to_blob('jpg', *a)
     end
-    
+
     def to_blob(format, *a)
       img = to_image(*a)
       blob = img.to_blob{|i| i.format = format }
-      
+
       #Release the memory used by RMagick explicitly. Ruby's GC
       #isn't aware of it and can't clean it up automatically
       img.destroy! if img.respond_to?(:destroy!)
-      
+
       blob
     end
 
     #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
@@ -59,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
@@ -72,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
@@ -129,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,7 +19,7 @@ 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 to_svg(opts={})
@@ -34,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>
@@ -46,7 +46,6 @@ EOT
       end
     end
 
-
     def bars_to_rects(opts={})
       rects = ''
       with_options opts do
@@ -80,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
@@ -119,12 +116,10 @@ EOT
       path_data
     end
 
-
     def title
       @title || barcode.to_s
     end
 
-
     def width
       length * xdim
     end
@@ -184,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
@@ -193,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
@@ -218,8 +218,6 @@ EOT
       str.gsub('&', '&amp;').gsub('<', '&lt;').gsub('>', '&gt;')
     end
 
-
   end
 
-
 end

data/lib/barby/version.rb

@@ -2,8 +2,8 @@ module Barby #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 6
-    TINY  = 2
+    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'