barby 0.3.2 → 0.4.0

data/lib/barby/barcode/data_matrix.rb

@@ -0,0 +1,46 @@
+require 'semacode'
+require 'barby/barcode'
+
+module Barby
+
+
+  #Uses the semacode library (gem install semacode) to encode DataMatrix barcodes
+  class DataMatrix < Barcode2D
+
+    attr_accessor :data
+
+
+    def initialize(data)
+      self.data = data
+    end
+
+
+    def data=(data)
+      @data = data
+      @encoder = nil
+    end
+
+    def encoder
+      @encoder ||= ::DataMatrix::Encoder.new(data)
+    end
+
+
+    def encoding
+      encoder.data.map{|a| a.map{|b| b ? '1' : '0' }.join }
+    end
+
+
+    def semacode?
+      #TODO: Not sure if this is right
+      data =~ /^http:\/\//
+    end
+
+
+    def to_s
+      data
+    end
+
+
+  end
+
+end

data/lib/barby/outputter.rb

@@ -60,13 +60,18 @@ module Barby
 
   private
 
+    def two_dimensional?
+      barcode.respond_to?(:two_dimensional?) && barcode.two_dimensional?
+    end
+
+
     #Converts the barcode's encoding (a string containing 1s and 0s)
     #to true and false values (1 == true == "black bar")
     #
     #If the barcode is 2D, each line will be converted to an array
     #in the same way
     def booleans(reload=false)#:doc:
-      if barcode.two_dimensional?
+      if two_dimensional?
         encoding(reload).map{|l| l.split(//).map{|c| c == '1' } }
       else
         encoding(reload).split(//).map{|c| c == '1' }
@@ -88,7 +93,7 @@ module Barby
     #
     #For example, "1100111000" becomes [[true,2],[false,2],[true,3],[false,3]]
     def boolean_groups(reload=false)
-      if barcode.two_dimensional?
+      if two_dimensional?
         encoding(reload).map do |line|
           line.scan(/1+|0+/).map do |group|
             [group[0,1] == '1', group.size]
@@ -102,6 +107,9 @@ module Barby
     end
 
 
+    #Takes a hash and temporarily sets properties on self (the outputter object)
+    #corresponding with the keys to their values. When the block exits, the
+    #properties are reset to their original values. Returns whatever the block returns.
     def with_options(options={})
       original_options = options.inject({}) do |origs,pair|
         if respond_to?(pair.first) && respond_to?("#{pair.first}=")

data/lib/barby/outputter/prawn_outputter.rb

@@ -7,90 +7,112 @@ module Barby
 
     register :to_pdf, :annotate_pdf
 
+    attr_accessor :xdim, :ydim, :x, :y, :height, :margin, :unbleed
+
 
     def to_pdf(opts={})
-      opts = options(opts)
-      annotate_pdf(Prawn::Document.new(opts[:document]), opts).render
+      doc_opts = opts.delete(:document) || {}
+      doc_opts[:page_size] ||= 'A4'
+      annotate_pdf(Prawn::Document.new(doc_opts), opts).render
     end
 
 
     def annotate_pdf(pdf, opts={})
-      opts = options(opts)
-      xpos, ypos, height, xdim = opts[:x], opts[:y], opts[:height], opts[:xdim]
-      ydim = opts[:ydim] || xdim
-      orig_xpos = xpos
-
-      if barcode.two_dimensional?
-        boolean_groups.reverse_each do |groups|
-          groups.each do |bar,amount|
+      with_options opts do
+        xpos, ypos = x, y
+        orig_xpos = xpos
+
+        if barcode.two_dimensional?
+          boolean_groups.reverse_each do |groups|
+            groups.each do |bar,amount|
+              if bar
+                pdf.move_to(xpos+unbleed, ypos+unbleed)
+                pdf.line_to(xpos+unbleed, ypos+ydim-unbleed)
+                pdf.line_to(xpos+(xdim*amount)-unbleed, ypos+ydim-unbleed)
+                pdf.line_to(xpos+(xdim*amount)-unbleed, ypos+unbleed)
+                pdf.line_to(xpos+unbleed, ypos+unbleed)
+                pdf.fill
+              end
+              xpos += (xdim*amount)
+            end
+            xpos = orig_xpos
+            ypos += ydim
+          end
+        else
+          boolean_groups.each do |bar,amount|
             if bar
-              pdf.move_to(xpos, ypos)
-              pdf.line_to(xpos, ypos+ydim)
-              pdf.line_to(xpos+(xdim*amount), ypos+ydim)
-              pdf.line_to(xpos+(xdim*amount), ypos)
-              pdf.line_to(xpos, ypos)
+              pdf.move_to(xpos+unbleed, ypos)
+              pdf.line_to(xpos+unbleed, ypos+height)
+              pdf.line_to(xpos+(xdim*amount)-unbleed, ypos+height)
+              pdf.line_to(xpos+(xdim*amount)-unbleed, ypos)
+              pdf.line_to(xpos+unbleed, ypos)
               pdf.fill
             end
             xpos += (xdim*amount)
           end
-          xpos = orig_xpos
-          ypos += ydim
-        end
-      else
-        boolean_groups.each do |bar,amount|
-          if bar
-            pdf.move_to(xpos, ypos)
-            pdf.line_to(xpos, ypos+height)
-            pdf.line_to(xpos+(xdim*amount), ypos+height)
-            pdf.line_to(xpos+(xdim*amount), ypos)
-            pdf.line_to(xpos, ypos)
-            pdf.fill
-          end
-          xpos += (xdim*amount)
         end
+
       end
 
       pdf
     end
 
 
-  private
+    def length
+      two_dimensional? ? encoding.first.length : encoding.length
+    end
 
-    def default_options
-      @default_options ||= {
-        :margin => 5,
-        :height => 100,
-        :xdim => 1
-      }
+    def width
+      length * xdim
     end
 
-    def options(opts={})
-      doc_opts = opts.delete(:document) || {}
-      opts = default_options.merge(opts)
-      opts[:x] ||= opts[:margin]
-      opts[:y] ||= opts[:margin]
-      opts[:document] = document_options(opts, doc_opts)
-      opts
+    def height
+      two_dimensional? ? (ydim * encoding.length) : (@height || 50)
     end
 
-    def document_options(opts, doc_opts)
-      o = doc_opts.dup
-      #o[:page_size] ||= page_size(opts[:xdim], opts[:height], opts[:margin])
-      #%w(left right top bottom).each{|s| o[:"#{s}_margin"] ||= opts[:margin] }
-      o[:page_size] ||= 'A4' #Prawn doesn't currently support custom page sizes
-      o
+    def full_width
+      width + (margin * 2)
     end
 
-    def page_size(xdim, height, margin)
-      [width(xdim,margin), height(height,margin)]
+    def full_height
+      height + (margin * 2)
     end
 
-    def width(xdim, margin)
-      (xdim * encoding.length) + (margin * 2)
+    #Margin is used for x and y if not given explicitly, effectively placing the barcode
+    #<margin> points from the [left,bottom] of the page.
+    #If you define x and y, there will be no margin. And if you don't define margin, it's 0.
+    def margin
+      @margin || 0
     end
 
-    def height(height, margin)
-      height + (margin * 2)
+    def x
+      @x || margin
+    end
+
+    def y
+      @y || margin
+    end
+
+    def xdim
+      @xdim || 1
+    end
+
+    def ydim
+      @ydim || xdim
+    end
+
+    #Defines an amount to reduce black bars/squares by to account for "ink bleed"
+    #If xdim = 3, unbleed = 0.2, a single/width black bar will be 2.6 wide
+    #For 2D, both x and y dimensions are reduced.
+    def unbleed
+      @unbleed || 0
+    end
+
+
+  private
+
+    def page_size(xdim, height, margin)
+      [width(xdim,margin), height(height,margin)]
     end
 
 

data/lib/barby/version.rb

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

metadata

@@ -1,19 +1,25 @@
 --- !ruby/object:Gem::Specification 
 name: barby
 version: !ruby/object:Gem::Version 
-  version: 0.3.2
+  hash: 15
+  prerelease: false
+  segments: 
+  - 0
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Tore Darell
-autorequire: barby
+autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-11-26 00:00:00 +01:00
+date: 2010-08-18 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
-description: 
+description: Barby creates barcodes.
 email: toredarell@gmail.com
 executables: []
 
@@ -22,53 +28,54 @@ extensions: []
 extra_rdoc_files: 
 - README
 files: 
-- lib/barby/vendor.rb
+- lib/barby/barcode/bookland.rb
+- lib/barby/barcode/code_128.rb
+- lib/barby/barcode/code_25.rb
+- lib/barby/barcode/code_25_iata.rb
+- lib/barby/barcode/code_25_interleaved.rb
+- lib/barby/barcode/code_39.rb
+- lib/barby/barcode/code_93.rb
+- lib/barby/barcode/data_matrix.rb
+- lib/barby/barcode/ean_13.rb
+- lib/barby/barcode/ean_8.rb
+- lib/barby/barcode/gs1_128.rb
+- lib/barby/barcode/pdf_417.rb
+- lib/barby/barcode/qr_code.rb
 - lib/barby/barcode.rb
-- lib/barby/version.rb
-- lib/barby/outputter.rb
-- lib/barby/outputter/pdfwriter_outputter.rb
-- lib/barby/outputter/rmagick_outputter.rb
 - lib/barby/outputter/ascii_outputter.rb
+- lib/barby/outputter/cairo_outputter.rb
+- lib/barby/outputter/pdfwriter_outputter.rb
 - lib/barby/outputter/png_outputter.rb
 - lib/barby/outputter/prawn_outputter.rb
-- lib/barby/outputter/cairo_outputter.rb
+- lib/barby/outputter/rmagick_outputter.rb
 - lib/barby/outputter/svg_outputter.rb
-- lib/barby/barcode/pdf_417.rb
-- lib/barby/barcode/code_25.rb
-- lib/barby/barcode/ean_13.rb
-- lib/barby/barcode/code_93.rb
-- lib/barby/barcode/ean_8.rb
-- lib/barby/barcode/qr_code.rb
-- lib/barby/barcode/code_25_interleaved.rb
-- 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/outputter.rb
+- 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/README
-- vendor/rqrcode/Rakefile
+- vendor/rqrcode/CHANGELOG
 - vendor/rqrcode/COPYING
-- vendor/rqrcode/lib/rqrcode/qrcode.rb
-- vendor/rqrcode/lib/rqrcode/qrcode/qr_rs_block.rb
+- vendor/rqrcode/lib/rqrcode/core_ext/array/behavior.rb
+- vendor/rqrcode/lib/rqrcode/core_ext/array.rb
+- vendor/rqrcode/lib/rqrcode/core_ext/integer/bitwise.rb
+- vendor/rqrcode/lib/rqrcode/core_ext/integer.rb
+- vendor/rqrcode/lib/rqrcode/core_ext.rb
+- vendor/rqrcode/lib/rqrcode/qrcode/qr_8bit_byte.rb
 - vendor/rqrcode/lib/rqrcode/qrcode/qr_bit_buffer.rb
-- vendor/rqrcode/lib/rqrcode/qrcode/qr_math.rb
 - vendor/rqrcode/lib/rqrcode/qrcode/qr_code.rb
+- vendor/rqrcode/lib/rqrcode/qrcode/qr_math.rb
 - vendor/rqrcode/lib/rqrcode/qrcode/qr_polynomial.rb
+- vendor/rqrcode/lib/rqrcode/qrcode/qr_rs_block.rb
 - vendor/rqrcode/lib/rqrcode/qrcode/qr_util.rb
-- vendor/rqrcode/lib/rqrcode/qrcode/qr_8bit_byte.rb
-- vendor/rqrcode/lib/rqrcode/core_ext.rb
-- vendor/rqrcode/lib/rqrcode/core_ext/integer/bitwise.rb
-- vendor/rqrcode/lib/rqrcode/core_ext/integer.rb
-- vendor/rqrcode/lib/rqrcode/core_ext/array.rb
-- vendor/rqrcode/lib/rqrcode/core_ext/array/behavior.rb
+- vendor/rqrcode/lib/rqrcode/qrcode.rb
 - vendor/rqrcode/lib/rqrcode.rb
-- vendor/rqrcode/test/test_data.rb
+- vendor/rqrcode/Rakefile
+- vendor/rqrcode/README
 - vendor/rqrcode/test/runtest.rb
-- vendor/rqrcode/CHANGELOG
+- vendor/rqrcode/test/test_data.rb
 - README
 has_rdoc: true
 homepage: http://toretore.github.com/barby
@@ -80,23 +87,29 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: barby
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: A pure-Ruby barcode generator
+summary: The Ruby barcode generator
 test_files: []