barby 0.4.2 → 0.4.3

data/CHANGELOG

@@ -0,0 +1,51 @@
+* 0.4.3
+
+* 2- and 5-digit UPC supplements
+* Use ChunkyPNG for PngOutputter
+
+* 0.4.2
+
+* ChunkyPngOutputter now renders 2D barcodes not upside down [Thanks Scient]
+
+* 0.4.1
+
+* ChunkyPngOutputter - ChunkyPNG is a pure-Ruby PNG library
+
+* 0.4.0
+
+* Can you tell I'm just making up version numbers as I go along?
+* DataMatrix (not required automatically, requires the 'semacode' gem)
+* Refactored PrawnOutputter a little. No more stupid options hashes + unbleed attribute
+
+* 0.3.2
+
+* Fix bug where Code128 extras choke on newlines [Wayne Conrad]
+* Don't allow Code128 with empty data strings [Wayne Conrad]
+* Allow custom :size for QrCodes
+
+* 0.3.1
+
+* Add support for PDF417, using Pdf417lib (JRuby only) [Aslak Hellesøy]
+
+* 0.3.0
+
+* Make compatible with Ruby 1.9 [Chris Mowforth]
+* Add SvgOutputter for outputting SVGs without dependencies [Peter H. Li]
+
+* 0.2.1
+
+* Allow QR Codes with sizes up to 40
+
+* 0.2.0
+
+* Added support for 2D barcodes
+* Updated all outputters to support 2D barcodes
+* Added support for QR Code
+
+* 0.1.2
+
+* Added CairoOutputter [Kouhei Sutou]
+
+* 0.1.1
+
+* Added PngOutputter that uses "png" gem

data/LICENSE

@@ -0,0 +1,23 @@
+Copyright (c) 2008 Tore Darell
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+

data/bin/barby

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+#encoding: UTF-8
 require 'optparse'
 require 'rubygems'
 
@@ -6,8 +7,8 @@ require 'rubygems'
 require 'barby'
 
 options = {
-  :outputter => 'Png',
-  :outputter_method => 'to_png',
+  :outputter => 'Ascii',
+  :outputter_method => 'to_ascii',
   :barcode => 'Code128B'
 }
 
@@ -20,8 +21,8 @@ ARGV.options do |o|
   o.separator ''
 
   o.on('-b', '--barcode=ClassName', String, 'Barcode type (Code128B)'){|v| options[:barcode] = v }
-  o.on('-o', '--outputter=ClassName', String, 'Outputter (Png)'){|v| options[:outputter] = v }
-  o.on('-m', '--method=method_name', String, 'Outputter method (to_png)'){|v| options[:outputter_method] = v }
+  o.on('-o', '--outputter=ClassName', String, 'Outputter (Ascii)'){|v| options[:outputter] = v }
+  o.on('-m', '--method=method_name', String, 'Outputter method (to_ascii)'){|v| options[:outputter_method] = v }
 
   o.on_tail("-h", "--help", "Show this help message.") { puts o; exit }
     
@@ -34,7 +35,7 @@ end
 require "barby/outputter/#{options[:outputter].gsub(/[A-Z]/){|c| '_'+c.downcase }[1..-1]}_outputter"
 
 barcode_class = Barby.const_get(options[:barcode])
-barcode = barcode_class.new($*.empty? ? STDIN.read.chomp : $*)
+barcode = barcode_class.new($*.empty? ? STDIN.read.chomp : $*[0])
 outputter_class = Barby.const_get("#{options[:outputter]}Outputter")
 outputter = outputter_class.new(barcode)
 

data/lib/barby.rb

@@ -8,6 +8,7 @@ require 'barby/barcode/code_39'
 require 'barby/barcode/code_93'
 require 'barby/barcode/ean_13'
 require 'barby/barcode/ean_8'
+require 'barby/barcode/upc_supplemental'
 require 'barby/barcode/bookland'
 require 'barby/barcode/qr_code'
 require 'barby/barcode/code_25'

data/lib/barby/barcode/code_39.rb

@@ -88,7 +88,8 @@ module Barby
 
     attr_accessor :data, :spacing, :narrow_width, :wide_width, :extended, :include_checksum
     
-
+    # Do not surround "data" with the mandatory "*" as is this is done automically for you.
+    # So instead of passing "*123456*" as "data", just pass "123456".
     def initialize(data, extended=false)
       self.data = data
       self.extended = extended

data/lib/barby/barcode/ean_13.rb

@@ -175,4 +175,12 @@ module Barby
 
   end
 
+  class UPCA < EAN13
+
+    def data
+      '0' + super
+    end
+
+  end
+
 end

data/lib/barby/barcode/upc_supplemental.rb

@@ -0,0 +1,140 @@
+require 'barby/barcode'
+require 'barby/barcode/ean_13'
+
+module Barby
+
+
+  class UPCSupplemental < Barby::Barcode1D
+
+    attr_accessor :data
+
+    FORMAT = /^\d\d\d\d\d$|^\d\d$/
+
+    START = '1011'
+    SEPARATOR = '01'
+
+    ODD = :odd
+    EVEN = :even
+
+    PARITY_MAPS = {
+      2 => {
+        0 => [ODD, ODD],
+        1 => [ODD, EVEN],
+        2 => [EVEN, ODD],
+        3 => [EVEN, EVEN]
+      },
+      5 => {
+        0 => [EVEN, EVEN, ODD, ODD, ODD],
+        1 => [EVEN, ODD, EVEN, ODD, ODD],
+        2 => [EVEN, ODD, ODD, EVEN, ODD],
+        3 => [EVEN, ODD, ODD, ODD, EVEN],
+        4 => [ODD, EVEN, EVEN, ODD, ODD],
+        5 => [ODD, ODD, EVEN, EVEN, ODD],
+        6 => [ODD, ODD, ODD, EVEN, EVEN],
+        7 => [ODD, EVEN, ODD, EVEN, ODD],
+        8 => [ODD, EVEN, ODD, ODD, EVEN],
+        9 => [ODD, ODD, EVEN, ODD, EVEN]
+      }
+    }
+
+    ENCODINGS = {
+      ODD => EAN13::LEFT_ENCODINGS_ODD,
+      EVEN => EAN13::LEFT_ENCODINGS_EVEN
+    }
+
+
+    def initialize(data)
+      self.data = data
+    end
+
+
+    def size
+      data.size
+    end
+
+    def two_digit?
+      size == 2
+    end
+
+    def five_digit?
+      size == 5
+    end
+
+
+    def characters
+      data.split(//)
+    end
+
+    def digits
+      characters.map{|c| c.to_i }
+    end
+
+
+    #Odd and even methods are only useful for 5 digits
+    def odd_digits
+      alternater = false
+      digits.reverse.select{ alternater = !alternater }
+    end
+
+    def even_digits
+      alternater = true
+      digits.reverse.select{ alternater = !alternater }
+    end
+
+    def odd_sum
+      odd_digits.inject(0){|s,d| s + d * 3 }
+    end
+
+    def even_sum
+      even_digits.inject(0){|s,d| s + d * 9 }
+    end
+
+
+    #Checksum is different for 2 and 5 digits
+    #2-digits don't really have a checksum, just a remainder to look up the parity
+    def checksum
+      if two_digit?
+        data.to_i % 4
+      elsif five_digit?
+        (odd_sum + even_sum) % 10
+      end
+    end
+
+
+    #Parity maps are different for 2 and 5 digits
+    def parity_map
+      PARITY_MAPS[size][checksum]
+    end
+
+
+    def encoded_characters
+      parity_map.zip(digits).map do |parity, digit|
+        ENCODINGS[parity][digit]
+      end
+    end
+
+
+    def encoding
+      START + encoded_characters.join(SEPARATOR)
+    end
+
+
+    def valid?
+      data =~ FORMAT
+    end
+
+
+    def to_s
+      data
+    end
+
+
+    NO_PRICE = new('90000') #The book doesn't have a suggested retail price
+    COMPLIMENTARY = new('99991') #The book is complimentary (~free)
+    USED = new('99990') #The book is marked as used
+
+
+  end
+
+
+end

data/lib/barby/outputter/ascii_outputter.rb

@@ -6,7 +6,7 @@ module Barby
   #the barcode directly to the terminal for testing.
   #
   #Registers to_ascii
-  class ASCIIOutputter < Outputter
+  class AsciiOutputter < Outputter
 
     register :to_ascii
 

data/lib/barby/outputter/png_outputter.rb

@@ -1,31 +1,31 @@
 require 'barby/outputter'
-require 'png'
+require 'chunky_png'
 
 module Barby
 
-  #Renders the barcode to a PNG image using the "png" gem (gem install png)
+  #Renders the barcode to a PNG image using chunky_png (gem install chunky_png)
   #
-  #Registers the to_png and to_canvas methods
+  #Registers the to_png, to_datastream and to_canvas methods
   class PngOutputter < Outputter
 
-    register :to_png, :to_canvas
+    register :to_png, :to_image, :to_datastream
 
     attr_accessor :xdim, :ydim, :width, :height, :margin
 
 
     #Creates a PNG::Canvas object and renders the barcode on it
-    def to_canvas(opts={})
+    def to_image(opts={})
       with_options opts do
-        canvas = PNG::Canvas.new(full_width, full_height, PNG::Color::White)
+        canvas = ChunkyPNG::Image.new(full_width, full_height, ChunkyPNG::Color::WHITE)
 
         if barcode.two_dimensional?
           x, y = margin, margin
-          booleans.reverse_each do |line|
+          booleans.each do |line|
             line.each do |bar|
               if bar
                 x.upto(x+(xdim-1)) do |xx|
                   y.upto y+(ydim-1) do |yy|
-                    canvas[xx,yy] = PNG::Color::Black
+                    canvas[xx,yy] = ChunkyPNG::Color::BLACK
                   end
                 end
               end
@@ -40,7 +40,7 @@ module Barby
             if bar
               x.upto(x+(xdim-1)) do |xx|
                 y.upto y+(height-1) do |yy|
-                  canvas[xx,yy] = PNG::Color::Black
+                  canvas[xx,yy] = ChunkyPNG::Color::BLACK
                 end
               end
             end
@@ -53,9 +53,19 @@ module Barby
     end
 
 
+    #Create a ChunkyPNG::Datastream containing the barcode image
+    #
+    # :constraints - Value is passed on to ChunkyPNG::Image#to_datastream
+    #                E.g. to_datastream(:constraints => {:color_mode => ChunkyPNG::COLOR_GRAYSCALE})
+    def to_datastream(*a)
+      constraints = a.first && a.first[:constraints] ? [a.first[:constraints]] : []
+      to_image(*a).to_datastream(*constraints)
+    end
+
+
     #Renders the barcode to a PNG image
     def to_png(*a)
-      PNG.new(to_canvas(*a)).to_blob
+      to_datastream(*a).to_s
     end
 
 

data/lib/barby/version.rb

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

data/vendor/rqrcode/CHANGELOG

@@ -1,3 +1,8 @@
+*0.3.3* (Feb 1st, 2011)
+
+* check to see if the level is valid
+* fix for 'rszf' bug by [Rob la Lau https://github.com/ohreally]
+
 *0.3.2* (Mar 15th, 2009)
 
 * Ruby 1.9 fixes by [Tore Darell http://tore.darell.no] [Chris Mowforth http://blog.99th.st]

data/vendor/rqrcode/README

@@ -2,8 +2,6 @@
 
 rQRCode is a library for encoding QR Codes in Ruby. It has a simple interface with all the standard qrcode options. It was adapted from the Javascript library by Kazuhiko Arase.
 
-RubyForge Project Page  http://rubyforge.org/projects/rqrcode/
-
 == An Overview
 
 Let's clear up some rQRCode stuff.

data/vendor/rqrcode/Rakefile

@@ -6,17 +6,15 @@ require 'rake/rdoctask'
 require 'rake/testtask'
 
 NAME = "rqrcode"
-VERS = "0.3.2"
+VERS = "0.3.3"
 CLEAN.include ['pkg', 'rdoc']
 
-Gem::manage_gems
-
 spec = Gem::Specification.new do |s|
   s.name            = NAME
-  s.version          = VERS
+  s.version         = VERS
   s.author          = "Duncan Robertson"
-  s.email            = "duncan@whomwah.com"
-  s.homepage        = "http://rqrcode.rubyforge.org"
+  s.email           = "duncan@whomwah.com"
+  s.homepage        = "http://whomwah.github.com/rqrcode/"
   s.platform        = Gem::Platform::RUBY
   s.summary          = "A library to encode QR Codes" 
   s.rubyforge_project = NAME 

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

@@ -69,18 +69,21 @@ module RQRCode #:nodoc:
     #   qr = RQRCode::QRCode.new('hello world', :size => 1, :level => :m ) 
     #
 
- 		def initialize( *args )
+    def initialize( *args )
       raise QRCodeArgumentError unless args.first.kind_of?( String )
 
       @data                 = args.shift
       options               = args.extract_options!
       level                 = options[:level] || :h 
+
+      raise QRCodeArgumentError unless %w(l m q h).include?(level.to_s) 
+
       @error_correct_level  = QRERRORCORRECTLEVEL[ level.to_sym ] 
       @type_number          = options[:size] || 4
       @module_count         = @type_number * 4 + 17
-      @modules              = nil
-      @data_cache           = nil
+      @modules              = Array.new( @module_count )
       @data_list            = QR8bitByte.new( @data )
+      @data_cache           = nil
 
       self.make
     end
@@ -149,7 +152,6 @@ module RQRCode #:nodoc:
 
 
     def make_impl( test, mask_pattern ) #:nodoc:
-      @modules = Array.new( @module_count )
 
       ( 0...@module_count ).each do |row|
         @modules[row] = Array.new( @module_count )
@@ -292,7 +294,7 @@ module RQRCode #:nodoc:
 
             if @modules[row][ col - c ].nil?
               dark = false
-              if byte_index < data.size
+              if byte_index < data.size && !data[byte_index].nil?
                 dark = (( (data[byte_index]).rszf( bit_index ) & 1) == 1 )
               end
               mask = QRUtil.get_mask( mask_pattern, row, col - c )

data/vendor/rqrcode/test/runtest.rb

@@ -72,7 +72,27 @@ class QRCodeTest < Test::Unit::TestCase
   def test_to_s
     qr = RQRCode::QRCode.new( 'duncan', :size => 1 )
     assert_equal qr.to_s[0..21], "xxxxxxx xx x  xxxxxxx\n"
-    assert_equal qr.to_s( :true => 'q', :false => 'n' )[0..21], "qqqqqqqnqqnqnnqqqqqqq\n"
+    assert_equal qr.to_s( :true => 'q', :false => 'n' )[0..21], 
+      "qqqqqqqnqqnqnnqqqqqqq\n"
     assert_equal qr.to_s( :true => '@' )[0..21], "@@@@@@@ @@ @  @@@@@@@\n"
   end
+
+  def test_rszf_error_not_thrown
+    assert RQRCode::QRCode.new('2 1058 657682')
+    assert RQRCode::QRCode.new("40952", :size => 1, :level => :h)
+    assert RQRCode::QRCode.new("40932", :size => 1, :level => :h)
+  end
+
+  def test_levels
+    assert RQRCode::QRCode.new("duncan", :level => :l)
+    assert RQRCode::QRCode.new("duncan", :level => :m)
+    assert RQRCode::QRCode.new("duncan", :level => :q)
+    assert RQRCode::QRCode.new("duncan", :level => :h)
+    assert_raise(RQRCode::QRCodeArgumentError) {
+      %w(a b c d e f g i j k n o p r s t u v w x y z).each do |ltr|
+        RQRCode::QRCode.new( "duncan", :level => ltr.to_sym )
+      end
+    }
+  end
+
 end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: barby
 version: !ruby/object:Gem::Version 
-  hash: 11
   prerelease: false
   segments: 
   - 0
   - 4
-  - 2
-  version: 0.4.2
+  - 3
+  version: 0.4.3
 platform: ruby
 authors: 
 - Tore Darell
@@ -15,19 +14,22 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-08 00:00:00 +02:00
+date: 2011-05-10 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
 description: Barby creates barcodes.
 email: toredarell@gmail.com
-executables: []
-
+executables: 
+- barby
 extensions: []
 
 extra_rdoc_files: 
 - README
 files: 
+- CHANGELOG
+- README
+- LICENSE
 - lib/barby/barcode/bookland.rb
 - lib/barby/barcode/code_128.rb
 - lib/barby/barcode/code_25.rb
@@ -41,10 +43,10 @@ files:
 - lib/barby/barcode/gs1_128.rb
 - lib/barby/barcode/pdf_417.rb
 - lib/barby/barcode/qr_code.rb
+- lib/barby/barcode/upc_supplemental.rb
 - lib/barby/barcode.rb
 - lib/barby/outputter/ascii_outputter.rb
 - lib/barby/outputter/cairo_outputter.rb
-- lib/barby/outputter/chunky_png_outputter.rb
 - lib/barby/outputter/pdfwriter_outputter.rb
 - lib/barby/outputter/png_outputter.rb
 - lib/barby/outputter/prawn_outputter.rb
@@ -54,7 +56,6 @@ files:
 - lib/barby/vendor.rb
 - lib/barby/version.rb
 - lib/barby.rb
-- bin/barby
 - vendor/Pdf417lib-java-0.91/lib/Pdf417lib.jar
 - vendor/Pdf417lib-java-0.91/lib/Pdf417lib.java
 - vendor/rqrcode/CHANGELOG
@@ -77,7 +78,7 @@ files:
 - vendor/rqrcode/README
 - vendor/rqrcode/test/runtest.rb
 - vendor/rqrcode/test/test_data.rb
-- README
+- bin/barby
 has_rdoc: true
 homepage: http://toretore.github.com/barby
 licenses: []
@@ -92,7 +93,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -101,7 +101,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"

data/lib/barby/outputter/chunky_png_outputter.rb

@@ -1,107 +0,0 @@
-require 'barby/outputter'
-require 'chunky_png'
-
-module Barby
-
-  #Renders the barcode to a PNG image using the "png" gem (gem install png)
-  #
-  #Registers the to_png, to_datastream and to_canvas methods
-  class ChunkyPngOutputter < Outputter
-
-    register :to_png, :to_image, :to_datastream
-
-    attr_accessor :xdim, :ydim, :width, :height, :margin
-
-
-    #Creates a PNG::Canvas 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)
-
-        if barcode.two_dimensional?
-          x, y = margin, margin
-          booleans.each do |line|
-            line.each do |bar|
-              if bar
-                x.upto(x+(xdim-1)) do |xx|
-                  y.upto y+(ydim-1) do |yy|
-                    canvas[xx,yy] = ChunkyPNG::Color::BLACK
-                  end
-                end
-              end
-              x += xdim
-            end
-            y += ydim
-            x = margin
-          end
-        else
-          x, y = margin, margin
-          booleans.each do |bar|
-            if bar
-              x.upto(x+(xdim-1)) do |xx|
-                y.upto y+(height-1) do |yy|
-                  canvas[xx,yy] = ChunkyPNG::Color::BLACK
-                end
-              end
-            end
-            x += xdim
-          end
-        end
-
-        canvas
-      end
-    end
-
-
-    #Create a ChunkyPNG::Datastream containing the barcode image
-    #
-    # :constraints - Value is passed on to ChunkyPNG::Image#to_datastream
-    #                E.g. to_datastream(:constraints => {:color_mode => ChunkyPNG::COLOR_GRAYSCALE})
-    def to_datastream(*a)
-      constraints = a.first && a.first[:constraints] ? [a.first[:constraints]] : []
-      to_image(*a).to_datastream(*constraints)
-    end
-
-
-    #Renders the barcode to a PNG image
-    def to_png(*a)
-      to_datastream(*a).to_s
-    end
-
-
-    def width
-      length * xdim
-    end
-
-    def height
-      barcode.two_dimensional? ? (ydim * encoding.length) : (@height || 100)
-    end
-
-    def full_width
-      width + (margin * 2)
-    end
-
-    def full_height
-      height + (margin * 2)
-    end
-
-    def xdim
-      @xdim || 1
-    end
-
-    def ydim
-      @ydim || xdim
-    end
-
-    def margin
-      @margin || 10
-    end
-
-    def length
-      barcode.two_dimensional? ? encoding.first.length : encoding.length
-    end
-
-
-  end
-
-end