barby 0.2.1 → 0.3.0

data/lib/barby.rb

@@ -10,5 +10,8 @@ require 'barby/barcode/ean_13'
 require 'barby/barcode/ean_8'
 require 'barby/barcode/bookland'
 require 'barby/barcode/qr_code'
+require 'barby/barcode/code_25'
+require 'barby/barcode/code_25_interleaved'
+require 'barby/barcode/code_25_iata'
 
 require 'barby/outputter'

data/lib/barby/barcode.rb

@@ -52,6 +52,11 @@ module Barby
     end
 
 
+    def to_s
+      self.class.name.split('::').last
+    end
+
+
     #Is this barcode 2D?
     def two_dimensional?
       is_a? Barcode2D

data/lib/barby/barcode/code_128.rb

@@ -170,10 +170,40 @@ module Barby
     end
 
 
+    def to_s
+      full_data
+    end
+
+
     def data
       @data
     end
 
+    #Returns the data for this barcode plus that for the entire extra chain,
+    #excluding all change codes
+    def full_data
+      data + full_extra_data
+    end
+
+    #Returns the data for this barcode plus that for the entire extra chain,
+    #including all change codes prefixing each extra
+    def full_data_with_change_codes
+      data + full_extra_data_with_change_code
+    end
+
+    #Returns the full_data for the extra or an empty string if there is no extra
+    def full_extra_data
+      return '' unless extra
+      extra.full_data
+    end
+
+    #Returns the full_data for the extra with the change code for the extra
+    #prepended. If there is no extra, an empty string is returned
+    def full_extra_data_with_change_code
+      return '' unless extra
+      change_code_for(extra) + extra.full_data_with_change_codes
+    end
+
     #Set the data for this barcode. If the barcode changes
     #character set, an extra will be created.
     def data=(data)
@@ -296,14 +326,20 @@ module Barby
       encodings[values[char]]
     end
 
+    def change_code_for_class(klass)
+      {Code128A => CODEA, Code128B => CODEB, Code128C => CODEC}[klass]
+    end
+
+    #Find the character that changes the character set to the one
+    #represented in +barcode+
+    def change_code_for(barcode)
+      change_code_for_class(barcode.class)
+    end
+
     #Find the numeric value for the character that changes the character
     #set to the one represented in +barcode+
     def change_code_number_for(barcode)
-      case barcode
-        when Code128A then values[CODEA]
-        when Code128B then values[CODEB]
-        when Code128C then values[CODEC]
-      end
+      values[change_code_for(barcode)]
     end
 
     #Find the encoding to change to the character set in +barcode+

data/lib/barby/barcode/code_25.rb

@@ -41,7 +41,7 @@ module Barby
     end
 
     def data_encoding_with_checksum
-      data_encoding+checksum_encoding
+      digit_encodings_with_checksum.join
     end
 
     def encoding
@@ -53,10 +53,18 @@ module Barby
       data.split(//)
     end
 
+    def characters_with_checksum
+      characters.push(checksum.to_s)
+    end
+
     def digits
       characters.map{|c| c.to_i }
     end
 
+    def digits_with_checksum
+      digits.push(checksum)
+    end
+
     def even_and_odd_digits
       alternater = false
       digits.reverse.partition{ alternater = !alternater }
@@ -64,10 +72,17 @@ module Barby
 
 
     def digit_encodings
+      raise_invalid unless valid?
       digits.map{|d| encoding_for(d) }
     end
     alias character_encodings digit_encodings
 
+    def digit_encodings_with_checksum
+      raise_invalid unless valid?
+      digits_with_checksum.map{|d| encoding_for(d) }
+    end
+    alias character_encodings_with_checksum digit_encodings_with_checksum
+
 
     #Returns the encoding for a single digit
     def encoding_for(digit)
@@ -82,6 +97,10 @@ module Barby
       end
     end
 
+    def encoding_for_bars_without_end_space(*a)
+      encoding_for_bars(*a).gsub(/0+$/, '')
+    end
+
 
     #Mod10
     def checksum
@@ -117,6 +136,8 @@ module Barby
     end
 
 
+    #2 of 5 doesn't require a checksum, but you can include a Mod10 checksum
+    #by setting +include_checksum+ to true
     def include_checksum?
       include_checksum
     end
@@ -132,8 +153,7 @@ module Barby
     end
 
     def stop_encoding
-      #Removes trailing space generated by encoding_for_bars
-      encoding_for_bars(STOP_ENCODING).gsub(/0+$/, '')
+      encoding_for_bars_without_end_space(STOP_ENCODING)
     end
 
 
@@ -155,6 +175,18 @@ module Barby
     end
 
 
+    def to_s
+      (include_checksum? ? characters_with_checksum : characters).join
+    end
+
+
+  private
+
+    def raise_invalid
+      raise ArgumentError, "data not valid"
+    end
+
+
   end
 
 

data/lib/barby/barcode/code_25_iata.rb

@@ -0,0 +1,23 @@
+require 'barby/barcode/code_25'
+
+module Barby
+
+  #The IATA version of 2 of 5 is identical to its parent except for different
+  #start and stop codes. This is the one used on the tags they put on your
+  #luggage when you check it in at the airport.
+  class Code25IATA < Code25
+
+    START_ENCODING = [N,N]
+    STOP_ENCODING  = [W,N]
+
+    def start_encoding
+      encoding_for_bars(START_ENCODING)
+    end
+
+    def stop_encoding
+      encoding_for_bars_without_end_space(STOP_ENCODING)
+    end
+
+  end
+
+end

data/lib/barby/barcode/code_25_interleaved.rb

@@ -2,69 +2,69 @@ require 'barby/barcode/code_25'
 
 module Barby
 
+  #Code 2 of 5 interleaved. Same as standard 2 of 5, but spaces are used
+  #for encoding as well as the bars. Each pair of numbers get interleaved,
+  #that is, the first is encoded in the bars and the second is encoded
+  #in the spaced. This means an interleaved 2/5 barcode must have an even
+  #number of digits.
   class Code25Interleaved < Code25
 
     START_ENCODING = [N,N,N,N]
     STOP_ENCODING =  [W,N,N]
 
 
-    def data_encoding
-      digit_pair_encodings.join
-    end
-
-
-    def character_pairs
-      chars = characters
-      pairs = Array.new((chars.size/2.0).ceil){ [] }
-      chars.each_with_index{|c,i| pairs[(i/2.0).floor] << c }
-      pairs
+    def digit_pairs(d=nil)
+      (d || digits).inject [] do |ary,d|
+        ary << [] if !ary.last || ary.last.size == 2
+        ary.last << d
+        ary
+      end
     end
 
-    def digit_pairs
-      d = digits
-      pairs = Array.new((d.size/2.0).ceil){ [] }
-      d.each_with_index{|dd,i| pairs[(i/2.0).floor] << dd }
-      pairs
+    def digit_pairs_with_checksum
+      digit_pairs(digits_with_checksum)
     end
 
 
-    def digit_pair_encodings
+    def digit_encodings
+      raise_invalid unless valid?
       digit_pairs.map{|p| encoding_for_pair(p) }
     end
 
+    def digit_encodings_with_checksum
+      digit_pairs_with_checksum.map{|p| encoding_for_pair(p) }
+    end
+
 
     def encoding_for_pair(pair)
       bars, spaces = ENCODINGS[pair.first], ENCODINGS[pair.last]
-      bars.zip(spaces).inject '' do |enc,p|
-        bar, space = *p
-        enc + ('1' *  (bar == WIDE ? wide_width : narrow_width)) +
-        ('0' *  (space == WIDE ? wide_width : narrow_width))
-      end
+      encoding_for_interleaved(bars.zip(spaces))
     end
 
-    #def encoding_for_bars(*bars_and_spaces)
-    #  bar = false
-    #  bars_and_spaces.flatten.inject '' do |enc,bar_or_space|
-    #    bar = !bar
-    #    enc + (bar ? '1' : '0')*(bar_or_space == WIDE ? wide_width : narrow_width)
-    #  end
-    #end
-
 
-    def start_encoding
-      bar = false
-      START_ENCODING.inject '' do |enc,bar_or_space|
+    #Encodes an array of interleaved W or N bars and spaces
+    #ex: [W,N,W,W,N,N] => "111011100010"
+    def encoding_for_interleaved(*bars_and_spaces)
+      bar = false#starts with bar
+      bars_and_spaces.flatten.inject '' do |enc,bar_or_space|
         bar = !bar
         enc << (bar ? '1' : '0') * (bar_or_space == WIDE ? wide_width : narrow_width)
       end
     end
 
+
+    def start_encoding
+      encoding_for_interleaved(START_ENCODING)
+    end
+
     def stop_encoding
-      bar = false
-      STOP_ENCODING.inject '' do |enc,bar_or_space|
-        bar = !bar
-        enc << (bar ? '1' : '0') * (bar_or_space == WIDE ? wide_width : narrow_width)
-      end
+      encoding_for_interleaved(STOP_ENCODING)
+    end
+
+
+    def valid?
+      #                           When checksum is included, it's included when determining "evenness"
+      super && digits.size % 2 == (include_checksum? ? 1 : 0)
     end
 
 

data/lib/barby/barcode/code_39.rb

@@ -194,6 +194,11 @@ module Barby
     end
 
 
+    def to_s
+      data
+    end
+
+
   end
 
 

data/lib/barby/barcode/code_93.rb

@@ -220,6 +220,11 @@ module Barby
     end
 
 
+    def to_s
+      data
+    end
+
+
   end
 
 end

data/lib/barby/barcode/ean_13.rb

@@ -148,6 +148,11 @@ module Barby
     end
 
 
+    def to_s
+      data_with_checksum
+    end
+
+
     #Is this a UPC-A barcode?
     #UPC barcodes are EAN codes that start with 0
     def upc?

data/lib/barby/barcode/gs1_128.rb

@@ -13,7 +13,8 @@ module Barby
       super(data, type)
     end
 
-    
+
+    #TODO: Not sure this is entirely right
     def data
       FNC1+application_identifier+super
     end
@@ -30,6 +31,10 @@ module Barby
       encodings[application_identifier_number]
     end
 
+    def to_s
+      "(#{application_identifier}) #{partial_data}"
+    end
+
 
   end
 

data/lib/barby/barcode/qr_code.rb

@@ -77,6 +77,11 @@ module Barby
     end
 
 
+    def to_s
+      data[0,20]
+    end
+
+
   private
   
     #Generate an RQRCode object with the available values

data/lib/barby/outputter/rmagick_outputter.rb

@@ -16,17 +16,28 @@ module Barby
 
     #Returns a string containing a PNG image
     def to_png(*a)
-      to_image(*a).to_blob{|i| i.format ='png' }
+      to_blob('png', *a)
     end
 
     #Returns a string containint a GIF image
     def to_gif(*a)
-      to_image(*a).to_blob{|i| i.format ='gif' }
+      to_blob('gif', *a)
     end
 
     #Returns a string containing a JPEG image
     def to_jpg(*a)
-      to_image(*a).to_blob{|i| i.format = 'jpg' }
+      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

data/lib/barby/outputter/svg_outputter.rb

@@ -0,0 +1,225 @@
+require 'barby/outputter'
+
+module Barby
+
+  #Renders the barcode to a simple SVG image using pure ruby
+  #
+  #Registers the to_svg, bars_to_path, and bars_to_rects method
+  #
+  #Bars can be rendered as a stroked path or as filled rectangles.  Path
+  #generally yields smaller files, but this doesn't render cleanly in Firefox
+  #3 for odd xdims.  My guess is that the renderer tries to put half a pixel
+  #on one side of the path and half on the other, leading to fuzzy dithering
+  #instead of sharp, clean b&w.
+  #
+  #Therefore, default behavior is to use a path for even xdims, and
+  #rectangles for odd.  This can be overridden by calling with explicit
+  #:use => 'rects' or :use => 'path' options.
+  class SvgOutputter < Outputter
+
+    register :to_svg, :bars_to_rects, :bars_to_path
+
+    attr_writer :title, :xdim, :ydim, :height, :rmargin, :lmargin, :tmargin, :bmargin, :xmargin, :ymargin, :margin
+
+
+    def to_svg(opts={})
+      with_options opts do
+        case opts[:use]
+          when 'rects' then bars = bars_to_rects
+          when 'path'  then bars = bars_to_path
+        else
+          xdim_odd = (xdim % 2 == 1)
+          bars = xdim_odd ? bars_to_rects : bars_to_path
+        end
+
+        <<-"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">
+<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">
+#{bars}
+</g></g>
+</svg>
+EOT
+      end
+    end
+
+
+    def bars_to_rects(opts={})
+      rects = ''
+      with_options opts do
+        x, y = lmargin, tmargin
+
+        if barcode.two_dimensional?
+          boolean_groups.each do |line|
+            line.each do |bar, amount|
+              bar_width = xdim * amount
+              if bar
+                rects << %Q|<rect x="#{x}" y="#{y}" width="#{bar_width}px" height="#{ydim}px" />\n|
+              end
+              x += bar_width
+            end
+            y += ydim
+            x = lmargin
+          end
+
+        else
+          boolean_groups.each do |bar, amount|
+            bar_width = xdim * amount
+            if bar
+              rects << %Q|<rect x="#{x}" y="#{y}" width="#{bar_width}px" height="#{height}px" />\n|
+            end
+            x += bar_width
+          end
+
+        end
+      end # with_options
+
+      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
+        x, y = lmargin+(xdim/2), tmargin
+
+        if barcode.two_dimensional?
+          booleans.each do |line|
+            line.each do |bar|
+              if bar
+                path_data << "M#{x} #{y}V #{y+ydim}"
+              end
+              x += xdim
+            end
+            y += ydim
+            x = lmargin+(xdim/2)
+          end
+
+        else
+          booleans.each do |bar|
+            if bar
+              path_data << "M#{x} #{y}V#{y+height}"
+            end
+            x += xdim
+          end
+
+        end
+      end # with_options
+
+      path_data
+    end
+
+
+    def title
+      @title || barcode.to_s
+    end
+
+
+    def width
+      length * xdim
+    end
+
+    def height
+      barcode.two_dimensional? ? (ydim * encoding.length) : (@height || 100)
+    end
+
+    def full_width
+      width + lmargin + rmargin
+    end
+
+    def full_height
+      height + tmargin + bmargin
+    end
+
+    def xdim
+      @xdim || 1
+    end
+
+    def ydim
+      @ydim || xdim
+    end
+
+    def lmargin
+      @lmargin || _xmargin
+    end
+
+    def rmargin
+      @rmargin || _xmargin
+    end
+
+    def tmargin
+      @tmargin || _ymargin
+    end
+
+    def bmargin
+      @bmargin || _ymargin
+    end
+
+    def xmargin
+      return nil if @lmargin || @rmargin
+      _margin
+    end
+
+    def ymargin
+      return nil if @tmargin || @bmargin
+      _margin
+    end
+
+    def margin
+      return nil if @ymargin || @xmargin || @tmargin || @bmargin || @lmargin || @rmargin
+      _margin
+    end
+
+    def length
+      barcode.two_dimensional? ? encoding.first.length : encoding.length
+    end
+
+
+    def svg_width(opts={})
+      opts[:rot] ? full_height : full_width
+    end
+
+    def svg_height(opts={})
+      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
+      @xmargin || _margin
+    end
+
+    def _ymargin
+      @ymargin || _margin
+    end
+
+    def _margin
+      @margin || 10
+    end
+
+    #Escape XML special characters <, & and >
+    def escape(str)
+      str.gsub('&', '&amp;').gsub('<', '&lt;').gsub('>', '&gt;')
+    end
+
+
+  end
+
+
+end

data/lib/barby/version.rb

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

data/vendor/rqrcode/CHANGELOG

@@ -1,3 +1,7 @@
+*0.3.2* (Mar 15th, 2009)
+
+* Ruby 1.9 fixes by [Tore Darell http://tore.darell.no] [Chris Mowforth http://blog.99th.st]
+
 *0.3.1* (Nov 24th, 2008)
 
 * expanded RS block table to QRcode version 40  [Vladislav Gorodetskiy]

data/vendor/rqrcode/Rakefile

@@ -6,7 +6,7 @@ require 'rake/rdoctask'
 require 'rake/testtask'
 
 NAME = "rqrcode"
-VERS = "0.3.1"
+VERS = "0.3.2"
 CLEAN.include ['pkg', 'rdoc']
 
 Gem::manage_gems

data/vendor/rqrcode/lib/rqrcode/qrcode/qr_8bit_byte.rb

@@ -27,7 +27,9 @@ module RQRCode
 
     def write( buffer )
       ( 0...@data.size ).each do |i|
-        buffer.put( @data[i], 8 )
+        c = @data[i]
+        c = c.ord if c.respond_to?(:ord)#String#[] returns single-char string in 1.9, .ord gets ASCII pos
+        buffer.put( c, 8 )
       end
     end
   end

data/vendor/rqrcode/lib/rqrcode/qrcode/qr_util.rb

@@ -137,10 +137,10 @@ module RQRCode #:nodoc:
 
         # 1 - 9
         case mode
-        when QRMODE[:mode_number] :  10
-        when QRMODE[:mode_alpha_num] : 9
-        when QRMODE[:mode_8bit_byte] : 8
-        when QRMODE[:mode_kanji] : 8
+        when QRMODE[:mode_number] then  10
+        when QRMODE[:mode_alpha_num] then 9
+        when QRMODE[:mode_8bit_byte] then 8
+        when QRMODE[:mode_kanji] then 8
         else
           raise QRCodeRunTimeError, "mode: #{mode}"
         end
@@ -149,10 +149,10 @@ module RQRCode #:nodoc:
 
         # 10 -26
         case mode
-        when QRMODE[:mode_number] :  12
-        when QRMODE[:mode_alpha_num] : 11
-        when QRMODE[:mode_8bit_byte] : 16
-        when QRMODE[:mode_kanji] : 10
+        when QRMODE[:mode_number] then  12
+        when QRMODE[:mode_alpha_num] then 11
+        when QRMODE[:mode_8bit_byte] then 16
+        when QRMODE[:mode_kanji] then 10
         else
           raise QRCodeRunTimeError, "mode: #{mode}"
         end
@@ -161,10 +161,10 @@ module RQRCode #:nodoc:
 
         # 27 - 40
         case mode
-        when QRMODE[:mode_number] :  14
-        when QRMODE[:mode_alpha_num] : 13
-        when QRMODE[:mode_8bit_byte] : 16
-        when QRMODE[:mode_kanji] : 12
+        when QRMODE[:mode_number] then  14
+        when QRMODE[:mode_alpha_num] then 13
+        when QRMODE[:mode_8bit_byte] then 16
+        when QRMODE[:mode_kanji] then 12
         else
           raise QRCodeRunTimeError, "mode: #{mode}"
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: barby
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors: 
 - Tore Darell
@@ -9,7 +9,7 @@ autorequire: barby
 bindir: bin
 cert_chain: []
 
-date: 2008-11-24 00:00:00 +01:00
+date: 2009-05-25 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -34,6 +34,7 @@ files:
 - lib/barby/outputter/png_outputter.rb
 - lib/barby/outputter/prawn_outputter.rb
 - lib/barby/outputter/cairo_outputter.rb
+- lib/barby/outputter/svg_outputter.rb
 - lib/barby/barcode
 - lib/barby/barcode/code_25.rb
 - lib/barby/barcode/ean_13.rb
@@ -44,6 +45,7 @@ files:
 - lib/barby/barcode/code_39.rb
 - lib/barby/barcode/bookland.rb
 - lib/barby/barcode/code_128.rb
+- lib/barby/barcode/code_25_iata.rb
 - lib/barby/barcode/gs1_128.rb
 - lib/barby.rb
 - bin/barby