barby 0.6.7 → 0.6.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 9930672e6c6e3b86ec968b0185c698a37e00567d
-  data.tar.gz: ec20ca147ea99a0d0543c3428d4cd4dbf4058ee0
+SHA256:
+  metadata.gz: 64d74091ea1f3aa79457c34878fc3b0d6f4c805dbb985d12eb372f29a7837e36
+  data.tar.gz: a8a61c1af0a401a1b36bc675653d2063e569443d434a57b5a2d95c7abfc1d193
 SHA512:
-  metadata.gz: c5ce490db8fc1212d5faffc15016c86fa49cc93248109d2aa1bcd4dc255283de6cfdabc94ac4fd5beb28ec2f45a0279105d0019161be07c0f4f8e24b8f193ed6
-  data.tar.gz: 84f578fcfc64bafd2d6b224b8d8953ea96b69afbb9b9db1f5bcb69ec19ef34300d9ada7145be6521bd2b1618f6fb51c60bfd10c815863d8044584cc5ccbab6c4
+  metadata.gz: 99143c0bf41695fa1416956073bcb6c9d7257c677fa36337638f890681665bacd51c4b04cd3412008592c8f23e4130fec74363eb425c776f8c827bf360d07c5b
+  data.tar.gz: d1b1f6aa2a63484b00f79bd184bef605b75850152dd54600b7eb25434f114c45c6994ce725af7535edefb8a536fc93f3e42c7d4bd2547c6f88d8da90d0947f8f

data/.gitignore

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

data/Gemfile

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

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.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.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
@@ -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
@@ -146,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,12 +19,8 @@ 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
@@ -41,8 +37,8 @@ module Barby
 <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>
@@ -183,6 +179,14 @@ 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
     end

data/lib/barby/version.rb

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

data/test/bookland_test.rb

@@ -0,0 +1,54 @@
+require 'test_helper'
+require 'barby/barcode/bookland'
+
+class BooklandTest < Barby::TestCase
+
+  before do
+    #        Gr Publ Tit Checksum
+    @isbn = '96-8261-240-3'
+    @code = Bookland.new(@isbn)
+  end
+
+  it "should have the expected data" do
+    @code.data.must_equal '978968261240'
+  end
+
+  it "should have the expected numbers" do
+    @code.numbers.must_equal [9,7,8,9,6,8,2,6,1,2,4,0]
+  end
+
+  it "should have the expected checksum" do
+    @code.checksum.must_equal 4
+  end
+
+  it "should raise an error when data not valid" do
+    lambda{ Bookland.new('1234') }.must_raise ArgumentError
+  end
+
+  describe 'ISBN conversion' do
+
+    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'
+      code = Bookland.new('979-82-92526-14-9')
+      assert code.valid?
+      code.data.must_equal '979829252614'
+    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
+    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'
+    end
+
+  end
+
+end
+