pdf417 0.1.1 → 0.2.0

data/README.rdoc

@@ -4,7 +4,7 @@ A wrapper for the pdf417lib C Library, from the README:
 
     A library to generate the 2D barcode PDF417
 
-    Project: http://sourceforge.net/projects/pdf417.lib
+    Project: http://pdf417lib.sourceforge.net/
     Creator: Paulo Soares (psoares@consiste.pt)
     License: LGPL or MPL 1.1
 
@@ -23,13 +23,19 @@ There are a few ways to use the library, at its simplest:
 
   PDF417.encode_text("readable barcode data") => [12, 827, 120, 90, 41, 146, 30, 512, 423, 146, 90, 570]
   
-If you want to get the bitmap:
+If you want to get the raw barcode data from the PDF417 library:
 
  barcode = PDF417.new("readable barcode data")
  barcode.to_blob  # oops, wrong text
  barcode.text = "ACTUAL barcode data"
  barcode.to_blob
  
+If you want to get it as an array of strings (each array element representing a line)
+  barcode.encoding
+  
+If you have chunky_png installed and you'd rather have a PNG
+  barcode.to_png
+ 
 See the RDocs for more information.
 
 == Note on Patches/Pull Requests

data/Rakefile

@@ -61,5 +61,6 @@ end
 desc 'rebuilds the pdf417 library'
 task :build_extension do
   pwd = `pwd`
-  exec "cd ext/pdf417 && make clean && ruby extconf.rb && make && cd #{pwd}"
+  system "cd ext/pdf417 && make clean"
+  system "cd ext/pdf417 && ruby extconf.rb && make"
 end

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.2.0

data/ext/pdf417/Makefile

@@ -4,11 +4,11 @@ SHELL = /bin/sh
 #### Start of system configuration section. ####
 
 srcdir = .
-topdir = /opt/ruby-enterprise-1.8.7-2010.01/lib/ruby/1.8/i686-darwin10.3.0
+topdir = /opt/rubyEE/lib/ruby/1.8/i686-darwin10.3.0
 hdrdir = $(topdir)
 VPATH = $(srcdir):$(topdir):$(hdrdir)
 exec_prefix = $(prefix)
-prefix = $(DESTDIR)/opt/ruby-enterprise-1.8.7-2010.01
+prefix = $(DESTDIR)/opt/rubyEE
 sharedstatedir = $(prefix)/com
 mandir = $(datarootdir)/man
 psdir = $(docdir)
@@ -62,7 +62,7 @@ RUBY_SO_NAME = ruby
 arch = i686-darwin10.3.0
 sitearch = i686-darwin10.3.0
 ruby_version = 1.8
-ruby = /opt/ruby-enterprise-1.8.7-2010.01/bin/ruby
+ruby = /opt/rubyEE/bin/ruby
 RUBY = $(ruby)
 RM = rm -f
 MAKEDIRS = mkdir -p

data/ext/pdf417/pdf417.c

@@ -1,5 +1,6 @@
 /*  NOTE:  This relies on the PDF417 Library from http://sourceforge.net/projects/pdf417lib and is included here 
- *
+ * It is a little odd and not too C-like, because it is called 'pdf417' but defines both the PDF417 and the PDF417::Lib
+ * class.  Note that the majority of the functions are for the PDF417::Lib class, the PDF417 class is only a placeholder.
 */
 
 #include <ruby.h>
@@ -27,21 +28,22 @@
 
 // The initialization method for this module
 void Init_pdf417() {
-  rb_cPdf417 = rb_define_class("PDF417", rb_cObject);
-  rb_define_singleton_method(rb_cPdf417, "encode_text", rb_pdf417_encode_text, 1);
-  rb_define_singleton_method(rb_cPdf417, "new", rb_pdf417_new, 1);
-  rb_define_method(rb_cPdf417, "initialize", rb_pdf417_init, 1);
-  rb_define_method(rb_cPdf417, "codewords", rb_pdf417_codewords, 0);
-  rb_define_method(rb_cPdf417, "to_blob", rb_pdf417_to_blob, 0);
-  rb_define_method(rb_cPdf417, "bit_columns", rb_pdf417_bitColumns, 0);
-  rb_define_method(rb_cPdf417, "bit_length", rb_pdf417_lenBits, 0);
-  rb_define_method(rb_cPdf417, "code_rows", rb_pdf417_codeRows, 0);
-  rb_define_method(rb_cPdf417, "code_columns", rb_pdf417_codeColumns, 0);
-  rb_define_method(rb_cPdf417, "codeword_length", rb_pdf417_lenCodewords, 0);
-  rb_define_method(rb_cPdf417, "error_level", rb_pdf417_errorLevel, 0);
-  rb_define_method(rb_cPdf417, "aspect_ratio", rb_pdf417_aspectRatio, 0);
-  rb_define_method(rb_cPdf417, "y_height", rb_pdf417_yHeight, 0);
-  rb_define_method(rb_cPdf417, "generation_error", rb_pdf417_error, 0);  
+  rb_cPdf417 = rb_define_class("PDF417", rb_cObject); // Our PDF417 object    
+  rb_cPdf417_Lib = rb_define_class_under(rb_cPdf417, "Lib", rb_cObject); // Our PDF417::Lib object, to represent the C file
+  rb_define_singleton_method(rb_cPdf417_Lib, "encode_text", rb_pdf417_lib_encode_text, 1);
+  rb_define_singleton_method(rb_cPdf417_Lib, "new", rb_pdf417_lib_new, 1);
+  rb_define_method(rb_cPdf417_Lib, "initialize", rb_pdf417_lib_init, 1);
+  rb_define_method(rb_cPdf417_Lib, "codewords", rb_pdf417_lib_codewords, 0);
+  rb_define_method(rb_cPdf417_Lib, "to_blob", rb_pdf417_lib_to_blob, 0);
+  rb_define_method(rb_cPdf417_Lib, "bit_columns", rb_pdf417_lib_bitColumns, 0);
+  rb_define_method(rb_cPdf417_Lib, "bit_length", rb_pdf417_lib_lenBits, 0);
+  rb_define_method(rb_cPdf417_Lib, "code_rows", rb_pdf417_lib_codeRows, 0);
+  rb_define_method(rb_cPdf417_Lib, "code_cols", rb_pdf417_lib_codeColumns, 0);
+  rb_define_method(rb_cPdf417_Lib, "codeword_length", rb_pdf417_lib_lenCodewords, 0);
+  rb_define_method(rb_cPdf417_Lib, "error_level", rb_pdf417_lib_errorLevel, 0);
+  rb_define_method(rb_cPdf417_Lib, "aspect_ratio", rb_pdf417_lib_aspectRatio, 0);
+  rb_define_method(rb_cPdf417_Lib, "y_height", rb_pdf417_lib_yHeight, 0);
+  rb_define_method(rb_cPdf417_Lib, "generation_error", rb_pdf417_lib_error, 0);  
 }
 
 /*
@@ -50,7 +52,7 @@ void Init_pdf417() {
  *
  * Returns an array of integers showing the codewords
  */
-static VALUE rb_pdf417_encode_text(VALUE self, VALUE text) {
+static VALUE rb_pdf417_lib_encode_text(VALUE self, VALUE text) {
   VALUE list;
   int k;
   
@@ -74,12 +76,12 @@ static VALUE rb_pdf417_encode_text(VALUE self, VALUE text) {
 }
 
 /* :nodoc: */
-static void rb_pdf417_cleanup(void *p) {
+static void rb_pdf417_lib_cleanup(void *p) {
   pdf417free(p); 
 }
 
 /* :nodoc: */
-static VALUE rb_pdf417_init(VALUE self, VALUE text) {
+static VALUE rb_pdf417_lib_init(VALUE self, VALUE text) {
   rb_iv_set(self, "@text", text);
   return self;
 }
@@ -90,10 +92,10 @@ static VALUE rb_pdf417_init(VALUE self, VALUE text) {
  *
  * Makes a new PDF417 object for the given text string
  */
-static VALUE rb_pdf417_new(VALUE class, VALUE text) {
+static VALUE rb_pdf417_lib_new(VALUE class, VALUE text) {
   VALUE argv[1];
   pdf417param *ptr;
-  VALUE tdata = Data_Make_Struct(class, pdf417param, 0, rb_pdf417_cleanup, ptr);
+  VALUE tdata = Data_Make_Struct(class, pdf417param, 0, rb_pdf417_lib_cleanup, ptr);
   pdf417init(ptr);
   rb_iv_set(tdata, "@generation_options", INT2NUM(ptr->options));
   argv[0] = text;
@@ -107,23 +109,29 @@ static VALUE rb_pdf417_new(VALUE class, VALUE text) {
  *
  * Generates an array of codewords from the current text attribute
  */
-static VALUE rb_pdf417_codewords(VALUE self) {
-  VALUE list;
+static VALUE rb_pdf417_lib_codewords(VALUE self) {
+  VALUE list, text;
   int k;
-  pdf417param *ptr;
-  Data_Get_Struct(self, pdf417param, ptr);
-  refreshStruct(self, ptr);
-  if (ptr->error) {
-      return Qnil; //could also return list
+  pdf417param p;
+  
+  
+  text = rb_iv_get(self, "@text"); 
+  pdf417init(&p);
+  p.text = StringValuePtr(text);
+  fetchCodewords(&p);
+  if (p.error) {
+      pdf417free(&p);
+      return Qnil; //could also return list or raise something
   }
   
-  list = rb_ary_new2(ptr->lenCodewords);
+  list = rb_ary_new2(p.lenCodewords);
+  
+  pdf417free(&p); 
   
-  // The first codeword is the length of the data, which is all we're interested in here.
-  for (k = 0; k < ptr->codewords[0]; ++k) {
-    rb_ary_push(list, INT2NUM(ptr->codewords[k]));
+  for (k = 0; k < p.lenCodewords; ++k) {
+    rb_ary_push(list, INT2NUM(p.codewords[k]));
   }
-  return list;  
+  return list;
 }
 
 /*
@@ -132,11 +140,63 @@ static VALUE rb_pdf417_codewords(VALUE self) {
  *
  * Returns a binary string representing the image bits, requires scaling before display
  */
-static VALUE rb_pdf417_to_blob(VALUE self) {
+static VALUE rb_pdf417_lib_to_blob(VALUE self) {
+  VALUE generation_options, text, aspect_ratio, raw_codewords, y_height, error_level, code_rows, code_cols;
   pdf417param *ptr;
+  int options = 0;
+  
   Data_Get_Struct(self, pdf417param, ptr);
-  refreshStruct(self, ptr);
-  if (ptr->error) {
+  generation_options = rb_iv_get(self, "@generation_options");
+  text = rb_iv_get(self, "@text"); 
+  aspect_ratio = rb_iv_get(self, "@aspect_ratio");
+  raw_codewords = rb_iv_get(self, "@raw_codewords");
+  y_height = rb_iv_get(self, "@y_height");
+  error_level = rb_iv_get(self, "@error_level");
+  code_rows = rb_iv_get(self, "@code_rows");
+  code_cols = rb_iv_get(self, "@code_cols");
+  
+  // re-set our internal variables
+  pdf417init(ptr);
+  
+  // Always set the text, can't really go wrong here
+  ptr->text = StringValuePtr(text);
+  
+  // Start setting them based off of what we got
+  if ( TYPE(generation_options) == T_FIXNUM ){
+    ptr->options = FIX2INT(generation_options);
+  }
+  
+  if ( TYPE(aspect_ratio) == T_FLOAT ){
+    ptr->aspectRatio = (float)NUM2DBL(aspect_ratio);
+  }
+  
+  if ( TYPE(y_height) == T_FLOAT ){
+    ptr->yHeight = (float)NUM2DBL(y_height);
+  }
+  
+  if ( TYPE(error_level) == T_FIXNUM ){
+    ptr->errorLevel = FIX2INT(error_level);
+  }
+  
+  if ( TYPE(code_rows) == T_FIXNUM ){    
+    ptr->codeRows = FIX2INT(code_rows);
+  }
+
+  if ( TYPE(code_cols) == T_FIXNUM ){
+    ptr->codeColumns = FIX2INT(code_cols);
+  }
+    
+  if ( TYPE(raw_codewords) == T_ARRAY && ptr->options & PDF417_USE_RAW_CODEWORDS){
+    ptr->lenCodewords = RARRAY_LEN(raw_codewords);
+    int k;
+    for (k = 0; k < ptr->lenCodewords; ++k) {
+      ptr->codewords[k] = FIX2INT(rb_ary_entry(raw_codewords, k));
+    }
+  }
+  
+  paintCode(ptr); 
+  
+  if (ptr->error && ptr->error != PDF417_ERROR_SUCCESS) {
       return Qnil; //could also return list
   }
   
@@ -149,7 +209,7 @@ static VALUE rb_pdf417_to_blob(VALUE self) {
  *
  * The number of column bits in the bitmap
  */
-static VALUE rb_pdf417_bitColumns(VALUE self) {
+static VALUE rb_pdf417_lib_bitColumns(VALUE self) {
   pdf417param *ptr;
   Data_Get_Struct(self, pdf417param, ptr);
   return INT2NUM(ptr->bitColumns);
@@ -161,7 +221,7 @@ static VALUE rb_pdf417_bitColumns(VALUE self) {
  *
  * The size in bytes of the bitmap
  */
-static VALUE rb_pdf417_lenBits(VALUE self) {
+static VALUE rb_pdf417_lib_lenBits(VALUE self) {
   pdf417param *ptr;
   Data_Get_Struct(self, pdf417param, ptr);
   return INT2NUM(ptr->lenBits);
@@ -173,7 +233,7 @@ static VALUE rb_pdf417_lenBits(VALUE self) {
  *
  * The number of code rows and bitmap lines
  */
-static VALUE rb_pdf417_codeRows(VALUE self) {
+static VALUE rb_pdf417_lib_codeRows(VALUE self) {
   pdf417param *ptr;
   Data_Get_Struct(self, pdf417param, ptr);
   return INT2NUM(ptr->codeRows);
@@ -181,11 +241,11 @@ static VALUE rb_pdf417_codeRows(VALUE self) {
 
 /*
  * call-seq:
- *  code_columns
+ *  code_cols
  *
  * The number of code columns
  */
-static VALUE rb_pdf417_codeColumns(VALUE self) {
+static VALUE rb_pdf417_lib_codeColumns(VALUE self) {
   pdf417param *ptr;
   Data_Get_Struct(self, pdf417param, ptr);
   return INT2NUM(ptr->codeColumns);
@@ -197,7 +257,7 @@ static VALUE rb_pdf417_codeColumns(VALUE self) {
  *
  * The size of the code words, including error correction codes
  */
-static VALUE rb_pdf417_lenCodewords(VALUE self) {
+static VALUE rb_pdf417_lib_lenCodewords(VALUE self) {
   pdf417param *ptr;
   Data_Get_Struct(self, pdf417param, ptr);
   return INT2NUM(ptr->lenCodewords);
@@ -209,7 +269,7 @@ static VALUE rb_pdf417_lenCodewords(VALUE self) {
  *
  * The error level required 0-8
  */
-static VALUE rb_pdf417_errorLevel(VALUE self){
+static VALUE rb_pdf417_lib_errorLevel(VALUE self){
   pdf417param *ptr;
   Data_Get_Struct(self, pdf417param, ptr);
   return INT2NUM(ptr->errorLevel);
@@ -221,7 +281,7 @@ static VALUE rb_pdf417_errorLevel(VALUE self){
  *
  * The y/x aspect ratio
  */
-static VALUE rb_pdf417_aspectRatio(VALUE self){
+static VALUE rb_pdf417_lib_aspectRatio(VALUE self){
   pdf417param *ptr;
   Data_Get_Struct(self, pdf417param, ptr);
   return rb_float_new(ptr->aspectRatio);
@@ -233,7 +293,7 @@ static VALUE rb_pdf417_aspectRatio(VALUE self){
  *
  * The y/x dot ratio
  */
-static VALUE rb_pdf417_yHeight(VALUE self){
+static VALUE rb_pdf417_lib_yHeight(VALUE self){
   pdf417param *ptr;
   Data_Get_Struct(self, pdf417param, ptr);
   return rb_float_new(ptr->yHeight);
@@ -248,34 +308,8 @@ static VALUE rb_pdf417_yHeight(VALUE self){
  * [PDF417_ERROR_TEXT_TOO_BIG] the text was too big the PDF417 specifications
  * [PDF417_ERROR_INVALID_PARAMS] invalid parameters. Only used with PDF417_USE_RAW_CODEWORDS
  */
-static VALUE rb_pdf417_error(VALUE self){
+static VALUE rb_pdf417_lib_error(VALUE self){
   pdf417param *ptr;
   Data_Get_Struct(self, pdf417param, ptr);
   return INT2NUM(ptr->error);
 }
-
-// Refresh the PDF417 struct containing our data if anything important has changed.
-static void refreshStruct(VALUE self, pdf417param *ptr) {
-  
-  char* text = STR2CSTR(rb_iv_get(self, "@text"));
-  int options = 0;
-  VALUE generation_options = rb_iv_get(self, "@generation_options");
-  
-  if ( TYPE(generation_options) == T_FIXNUM ){
-    options = FIX2INT(generation_options);
-  }
-
-  // Only re-do it if our text has changed
-  if ( 0 != strcmp(ptr->text, text) || options != ptr->options) {
-    ptr->options = options;
-    ptr->outBits = NULL;
-    ptr->lenBits = 0;
-    ptr->error = 0;
-    ptr->lenText = -1;
-    ptr->text = "";
-    ptr->yHeight = 3;
-    ptr->aspectRatio = 0.5;
-    ptr->text = STR2CSTR(rb_iv_get(self, "@text")); 
-    paintCode(ptr); //paintCode also sets the error correction, we call it here so we can get the blob if needed w/o trouble
-  }
-}

data/ext/pdf417/pdf417.h

@@ -1,18 +1,18 @@
 
 VALUE rb_cPdf417;
-static VALUE rb_pdf417_encode_text(VALUE self, VALUE text);
-static VALUE rb_pdf417_codewords(VALUE self);
-static VALUE rb_pdf417_to_blob(VALUE self);
-static VALUE rb_pdf417_new(VALUE class, VALUE text);
-static void rb_pdf417_cleanup(void *p);
-static VALUE rb_pdf417_init(VALUE self, VALUE text);
-static VALUE rb_pdf417_bitColumns(VALUE self);
-static VALUE rb_pdf417_lenBits(VALUE self);
-static VALUE rb_pdf417_codeRows(VALUE self);
-static VALUE rb_pdf417_codeColumns(VALUE self);
-static VALUE rb_pdf417_lenCodewords(VALUE self);
-static VALUE rb_pdf417_errorLevel(VALUE self);
-static VALUE rb_pdf417_aspectRatio(VALUE self);
-static VALUE rb_pdf417_yHeight(VALUE self);
-static VALUE rb_pdf417_error(VALUE self);
-static void refreshStruct(VALUE self, pdf417param *ptr);
+VALUE rb_cPdf417_Lib;
+static VALUE rb_pdf417_lib_encode_text(VALUE self, VALUE text);
+static VALUE rb_pdf417_lib_codewords(VALUE self);
+static VALUE rb_pdf417_lib_to_blob(VALUE self);
+static VALUE rb_pdf417_lib_new(VALUE class, VALUE text);
+static void rb_pdf417_lib_cleanup(void *p);
+static VALUE rb_pdf417_lib_init(VALUE self, VALUE text);
+static VALUE rb_pdf417_lib_bitColumns(VALUE self);
+static VALUE rb_pdf417_lib_lenBits(VALUE self);
+static VALUE rb_pdf417_lib_codeRows(VALUE self);
+static VALUE rb_pdf417_lib_codeColumns(VALUE self);
+static VALUE rb_pdf417_lib_lenCodewords(VALUE self);
+static VALUE rb_pdf417_lib_errorLevel(VALUE self);
+static VALUE rb_pdf417_lib_aspectRatio(VALUE self);
+static VALUE rb_pdf417_lib_yHeight(VALUE self);
+static VALUE rb_pdf417_lib_error(VALUE self);

data/lib/pdf417.rb

@@ -1,50 +1,232 @@
 require 'pdf417/pdf417'
+require 'pdf417/lib'
 
 class PDF417
   
-  PDF417_USE_ASPECT_RATIO = 0
-  PDF417_FIXED_RECTANGLE = 1
-  PDF417_FIXED_COLUMNS = 2
-  PDF417_FIXED_ROWS = 4
-  PDF417_AUTO_ERROR_LEVEL = 0
-  PDF417_USE_ERROR_LEVEL = 16
-  PDF417_USE_RAW_CODEWORDS = 64
-  PDF417_INVERT_BITMAP = 128
+  class GenerationError < StandardError; end
+  
+  class << self
+    def encode_text(text)
+      PDF417::Lib.encode_text(text)
+    end    
+  end
 
-  PDF417_ERROR_SUCCESS = 0
-  PDF417_ERROR_TEXT_TOO_BIG = 1
-  PDF417_ERROR_INVALID_PARAMS = 2
-  
-  # The int representing the options used to generate the barcode, defined in the library as:
-  # [PDF417_USE_ASPECT_RATIO] use aspectRatio to set the y/x dimension. Also uses yHeight
-  # [PDF417_FIXED_RECTANGLE] make the barcode dimensions at least codeColumns by codeRows
-  # [PDF417_FIXED_COLUMNS] make the barcode dimensions at least codeColumns
-  # [PDF417_FIXED_ROWS] make the barcode dimensions at least codeRows
-  # [PDF417_AUTO_ERROR_LEVEL] automatic error level depending on text size
-  # [PDF417_USE_ERROR_LEVEL] the error level is errorLevel. The used errorLevel may be different
-  # [PDF417_USE_RAW_CODEWORDS] use codewords instead of text
-  # [PDF417_INVERT_BITMAP] invert the resulting bitmap
-  #
-  # For example
-  #   b.generation_options = PDF417::PDF417_INVERT_BITMAP | PDF417::PDF417_AUTO_ERROR_LEVEL
-  attr_accessor :generation_options
-  attr_accessor :text
-  def inspect # :nodoc:
-    attributes = inspect_attributes.reject { |x|
-      begin
-        attribute = send x
-        !attribute || (attribute.respond_to?(:empty?) && attribute.empty?)
-      rescue NoMethodError
-        true
+  attr_reader :bit_columns, :bit_rows, :bit_length
+  
+  def initialize(*attrs)
+    # TODO:  Test these defaults, make sure that they can get set on init, check to see that the output changes accordingly
+    self.text = ""
+    @y_height = 3
+    @aspect_ratio = 0.5
+    @rows = 1
+    @cols = 0
+    
+    if attrs.first.is_a?(String)
+      self.text = attrs.first
+    elsif attrs.first.is_a?(Hash)      
+      attrs.first.each do |k,v|
+        if self.respond_to?("#{k}=".to_sym)
+          self.send("#{k}=".to_sym, v)
+        end
       end
-    }.map { |attribute|
-      "#{attribute.to_s}=#{send(attribute).inspect}"
-    }.join ' '
-    "#<#{self.class.name}:#{sprintf("0x%x", object_id)} #{attributes}>"
-  end  
+    end
+
+    @blob = nil
+  end
+  
+  def inspect
+    "#<#{self.class.name}:#{self.object_id} >"
+  end
+  
+  
+  def text=(val)
+    @codewords = @blob = nil
+    @text = val
+  end
   
-  private
-  def inspect_attributes
-    [:text, :bit_columns, :bit_length, :code_rows, :code_columns, :codeword_length, :error_level, :generation_options, :aspect_ratio, :y_height, :generation_error]
+  def text
+    if @raw_codewords.nil?
+      @text
+    else
+      ""
+    end
+  end
+  
+  def codewords
+    return @raw_codewords if !@raw_codewords.nil?
+    @codewords ||= self.class.encode_text(text)
+  end
+          
+  # Y Height
+  def y_height
+    @y_height
+  end
+  def y_height=(val)
+    @blob = nil
+    @y_height = val
+  end
+    
+  # Aspect ratio
+  def aspect_ratio
+    @aspect_ratio
+  end
+  def aspect_ratio=(val)
+    @blob = nil
+    @aspect_ratio = val
+  end
+    
+  # For setting the codewords directly
+  def raw_codewords
+    @raw_codewords
+  end
+  def raw_codewords=(val)
+    @blob = nil
+    @raw_codewords = val
+  end
+    
+  # Make the barcode at least this number of rows
+  def rows
+    @rows
+  end
+  def rows=(val)
+    @blob = nil
+    @rows = val
   end
+    
+  # Make the barcode at least this number of columns
+  def cols
+    @cols
+  end
+  def cols=(val)
+    @blob = nil
+    @cols = val
+  end
+    
+  # Request the specified error level must be between 0 and 8
+  def error_level
+    @error_level
+  end
+  def error_level=(val)
+    @blob = nil
+    @error_level = val
+  end
+      
+  def generate!
+    lib = Lib.new(text)
+    options = []
+    # Setting the text via accessor will set the codewords to nil, but if they have
+    # been manually set pass them on.
+    if @raw_codewords.is_a?(Array)
+      lib.raw_codewords = @raw_codewords
+      lib.generation_options |= Lib::PDF417_USE_RAW_CODEWORDS
+      options << 'raw codewords'
+    end
+    
+    if self.rows.to_i > 0 && self.cols.to_i > 0
+      lib.code_rows = self.rows.to_i
+      lib.code_cols = self.cols.to_i
+      lib.generation_options |= Lib::PDF417_FIXED_RECTANGLE
+      options << "#{rows}x#{cols}"
+    elsif self.rows.to_i > 0
+      lib.code_rows = self.rows.to_i 
+      lib.generation_options |= Lib::PDF417_FIXED_ROWS
+      options << "#{rows} rows"
+    elsif self.cols.to_i > 0
+      lib.code_cols = self.cols.to_i
+      lib.generation_options |= Lib::PDF417_FIXED_COLUMNS
+      options << "#{cols} cols"
+    end
+  
+    if self.error_level.to_i >= 0 && self.error_level.to_i <= 8
+      lib.error_level = self.error_level.to_i
+      lib.generation_options |= Lib::PDF417_USE_ERROR_LEVEL
+      options << "requested #{error_level.to_i} error level"
+    end
+  
+    lib.aspect_ratio = self.aspect_ratio.to_f
+    lib.y_height = self.y_height.to_f
+  
+    (@blob = lib.to_blob) 
+    if @blob.nil? || @blob.empty?
+      if lib.generation_error == Lib::PDF417_ERROR_TEXT_TOO_BIG
+        raise GenerationError, "Text is too big"
+      elsif lib.generation_error == Lib::PDF417_ERROR_INVALID_PARAMS
+        msg = "Invalid parameters: #{options.join(', ')}"
+        if lib.generation_options & Lib::PDF417_USE_RAW_CODEWORDS && lib.raw_codewords.length != lib.raw_codewords.first
+          msg +=".  The first element of the raw codwords must be the length of the array.  Currently it is #{lib.raw_codewords.first}, perhaps it should be #{lib.raw_codewords.length}?"
+        end
+        raise GenerationError, msg
+      else
+        raise GenerationError, "Could not generate bitmap error: #{options.join(', ')}"
+      end
+    else
+      @codewords = lib.codewords
+      @bit_columns = lib.bit_columns
+      @bit_rows = ((lib.bit_columns - 1) / 8) + 1
+      @bit_length = lib.bit_length
+      @rows = lib.code_rows 
+      @cols = lib.code_cols
+      @error_level = lib.error_level
+      @aspect_ratio = lib.aspect_ratio
+      @y_height = lib.y_height
+      return true
+    end
+  end
+    
+  
+  def to_blob
+    self.generate! if @blob.nil?
+    @blob    
+  end      
+  alias_method :blob, :to_blob
+  
+  def encoding
+    self.generate! if @blob.nil?
+    
+    # This matches the output from the pdf417 lib sample output.
+    enc = self.blob.bytes.to_a.each_slice(self.bit_rows).to_a[0..(self.rows-1)] # sometimes we get more rows than expected, truncate
+    
+    # The length returned here is too long and we have extra data that gets padded w/ zeroes, meaning it doesn't all match.
+    # Eg, instead of ending with "111111101000101001" it ends with "1111111010001010010000000".
+    return enc.collect do |row_of_bytes|
+      row_of_bytes.collect{|x| sprintf("%08b", x)}.join[0..self.bit_columns-1]
+    end
+  end
+  
+  def encoding_to_s
+    self.encoding.each{|x| puts x.gsub("0"," ")}
+  end
+  
+  def to_png(opts = {})
+    require 'chunky_png' unless defined?(ChunkyPNG)
+    
+    self.generate! if @blob.nil?
+    opts[:x_scale] ||= 1
+    opts[:y_scale] ||= 3
+    opts[:margin] ||= 10
+    full_width = (self.bit_columns * opts[:x_scale]) + (opts[:margin] * 2)
+    full_height = (self.rows * opts[:y_scale]) + (opts[:margin] * 2)
+    
+    canvas = ChunkyPNG::Image.new(full_width, full_height, ChunkyPNG::Color::WHITE)
+
+    x, y = opts[:margin], opts[:margin]
+    booleans = encoding.map{|l| l.split(//).map{|c| c == '1' } }
+    booleans.each do |line|
+      line.each do |bar|
+        if bar
+          x.upto(x+(opts[:x_scale]-1)) do |xx|
+            y.upto y+(opts[:y_scale]-1) do |yy|
+              canvas[xx,yy] = ChunkyPNG::Color::BLACK
+            end
+          end
+        end
+        x += opts[:x_scale]
+      end
+      y += opts[:y_scale]
+      x = opts[:margin]
+    end
+    canvas.to_datastream.to_s    
+  end
+    
+  
 end

data/lib/pdf417/lib.rb

@@ -0,0 +1,54 @@
+require 'pdf417/pdf417'
+
+# A barebones ruby interface to the C library, uses C style constants
+# and mixes in attribute accessors for moving data back and forth
+class PDF417::Lib
+  
+  PDF417_USE_ASPECT_RATIO = 0
+  PDF417_FIXED_RECTANGLE = 1
+  PDF417_FIXED_COLUMNS = 2
+  PDF417_FIXED_ROWS = 4
+  PDF417_AUTO_ERROR_LEVEL = 0
+  PDF417_USE_ERROR_LEVEL = 16
+  PDF417_USE_RAW_CODEWORDS = 64
+  PDF417_INVERT_BITMAP = 128
+
+  PDF417_ERROR_SUCCESS = 0
+  PDF417_ERROR_TEXT_TOO_BIG = 1
+  PDF417_ERROR_INVALID_PARAMS = 2
+  
+  # The int representing the options used to generate the barcode, defined in the library as:
+  # [PDF417_USE_ASPECT_RATIO] use aspectRatio to set the y/x dimension. Also uses yHeight
+  # [PDF417_FIXED_RECTANGLE] make the barcode dimensions at least codeColumns by codeRows
+  # [PDF417_FIXED_COLUMNS] make the barcode dimensions at least codeColumns
+  # [PDF417_FIXED_ROWS] make the barcode dimensions at least codeRows
+  # [PDF417_AUTO_ERROR_LEVEL] automatic error level depending on text size
+  # [PDF417_USE_ERROR_LEVEL] the error level is errorLevel. The used errorLevel may be different
+  # [PDF417_USE_RAW_CODEWORDS] use codewords instead of text
+  # [PDF417_INVERT_BITMAP] invert the resulting bitmap
+  #
+  # For example
+  #   b.generation_options = PDF417::PDF417_INVERT_BITMAP | PDF417::PDF417_AUTO_ERROR_LEVEL
+  
+  attr_accessor :generation_options, :text, :raw_codewords
+  # The following are read from the last generated barcode, but they need a writer because they get set
+  attr_writer :code_rows, :code_cols, :error_level, :y_height, :aspect_ratio
+  def inspect # :nodoc:
+    attributes = inspect_attributes.reject { |x|
+      begin
+        attribute = send x
+        !attribute || (attribute.respond_to?(:empty?) && attribute.empty?)
+      rescue NoMethodError
+        true
+      end
+    }.map { |attribute|
+      "#{attribute.to_s}=#{send(attribute).inspect}"
+    }.join ' '
+    "#<#{self.class.name}:#{sprintf("0x%x", object_id)} #{attributes}>"
+  end  
+  
+  private
+  def inspect_attributes
+    [:text, :bit_columns, :bit_length, :code_rows, :code_columns, :codeword_length, :error_level, :generation_options, :aspect_ratio, :y_height, :generation_error]
+  end
+end

data/pdf417.gemspec

@@ -1,18 +1,18 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{pdf417}
-  s.version = "0.1.1"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["jamesprior"]
-  s.date = %q{2011-03-30}
+  s.date = %q{2011-07-25}
   s.description = %q{Generate a series of codewords or a binary blob for PDF417 barcodes}
   s.email = %q{j.prior@asee.org}
-  s.extensions = ["ext/pdf417/extconf.rb"]
+  s.extensions = ["ext/pdf417/extconf.rb", "ext/pdf417/extconf.rb"]
   s.extra_rdoc_files = [
     "LICENSE",
      "README.rdoc"
@@ -32,17 +32,21 @@ Gem::Specification.new do |s|
      "ext/pdf417/pdf417lib.h",
      "ext/pdf417/pdf417libimp.h",
      "lib/pdf417.rb",
+     "lib/pdf417/lib.rb",
      "pdf417.gemspec",
+     "script/console",
+     "test/pdf417/lib_test.rb",
      "test/pdf417_test.rb",
      "test/test_helper.rb"
   ]
   s.homepage = %q{http://github.com/asee/pdf417}
   s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib", "ext"]
-  s.rubygems_version = %q{1.6.2}
+  s.require_paths = ["lib", "ext", "ext"]
+  s.rubygems_version = %q{1.5.3}
   s.summary = %q{A Ruby wrapper for the PDF417 barcode library}
   s.test_files = [
-    "test/pdf417_test.rb",
+    "test/pdf417/lib_test.rb",
+     "test/pdf417_test.rb",
      "test/test_helper.rb"
   ]
 
@@ -55,3 +59,4 @@ Gem::Specification.new do |s|
   else
   end
 end
+

data/script/console

@@ -0,0 +1,10 @@
+#!/usr/bin/env ruby
+irb = RUBY_PLATFORM =~ /(:?mswin|mingw)/ ? 'irb.bat' : 'irb'
+libs =  " -r irb/completion"
+libs << " -I #{File.join(File.dirname(__FILE__), '..', 'lib')}"
+libs << " -I #{File.join(File.dirname(__FILE__), '..', 'ext')}"
+libs << " -I #{File.join(File.dirname(__FILE__), '..', '..', 'barby')}"
+libs << " -r pdf417"
+libs << " -r rubygems"
+#libs << " -r chunky_png"
+exec "#{irb} #{libs} --simple-prompt"

data/test/pdf417/lib_test.rb

@@ -0,0 +1,55 @@
+require 'test_helper'
+
+class PDF417::Lib::LibTest < Test::Unit::TestCase
+  
+  should "initialize text" do
+    b = PDF417::Lib.new("fred")
+    assert_equal "fred", b.text
+  end
+  
+  should "initialize generation_options" do
+    b = PDF417::Lib.new("fred")
+    assert_equal 0, b.generation_options
+  end
+  
+  should "know the right codewords for fred" do
+    assert_equal [4, 815, 514, 119], PDF417::Lib.encode_text("fred")
+    assert_equal [4, 815, 514, 119], PDF417::Lib.new("fred").codewords
+  end
+  
+  should "re-generate if the text has been reassigned" do
+    b = PDF417::Lib.new("fred")
+    fred_words = b.codewords
+    fred_blob = b.to_blob
+    b.text = "Joebob"
+    assert fred_words != b.codewords
+    assert fred_blob != b.to_blob
+  end
+  
+  should "re-generate if the text has been updated" do
+    b = PDF417::Lib.new("fred")
+    fred_words = b.codewords
+    fred_blob = b.to_blob
+    b.text += " and joe"
+    assert fred_words != b.codewords
+    assert fred_blob != b.to_blob    
+  end
+  
+  should "re-generate if the options have changed" do
+    b = PDF417::Lib.new("fred")
+    fred_words = b.codewords
+    fred_blob = b.to_blob
+    b.generation_options = PDF417::Lib::PDF417_INVERT_BITMAP
+    assert_equal b.generation_options, PDF417::Lib::PDF417_INVERT_BITMAP
+    assert_equal fred_words, b.codewords # NOTE that the codewords have not changed, just the binary blob
+    assert fred_blob != b.to_blob    
+  end
+  
+  should "work when generation options are set weird" do
+    b = PDF417::Lib.new("fred")
+    b.generation_options = "ALBERT"
+    assert b.codewords.is_a?(Array)
+  end
+  
+  
+end

data/test/pdf417_test.rb

@@ -1,23 +1,28 @@
+begin
+  require "RMagick"
+rescue LoadError
+end
+
 require 'test_helper'
 
 class Pdf417Test < Test::Unit::TestCase
   
-  should "initialize text" do
-    b = PDF417.new("fred")
+  should "initialize text as an attr" do
+    b = PDF417.new(:text => "fred")
     assert_equal "fred", b.text
   end
   
-  should "initialize generation_options" do
+  should "initialize text as a single parameter" do
     b = PDF417.new("fred")
-    assert_equal 0, b.generation_options
+    assert_equal "fred", b.text
   end
-  
+    
   should "know the right codewords for fred" do
     assert_equal [4, 815, 514, 119], PDF417.encode_text("fred")
-    assert_equal [4, 815, 514, 119], PDF417.new("fred").codewords
+    assert_equal [4, 815, 514, 119], PDF417.new(:text => "fred").codewords
   end
   
-  should "re-generate if the text has been reassigned" do
+  should "re-generate codewords if the text has been reassigned" do
     b = PDF417.new("fred")
     fred_words = b.codewords
     fred_blob = b.to_blob
@@ -39,17 +44,137 @@ class Pdf417Test < Test::Unit::TestCase
     b = PDF417.new("fred")
     fred_words = b.codewords
     fred_blob = b.to_blob
-    b.generation_options = PDF417::PDF417_INVERT_BITMAP
-    assert_equal b.generation_options, PDF417::PDF417_INVERT_BITMAP
+    b.rows = b.rows + 4
     assert_equal fred_words, b.codewords # NOTE that the codewords have not changed, just the binary blob
     assert fred_blob != b.to_blob    
   end
   
-  should "work when generation options are set weird" do
-    b = PDF417.new("fred")
-    b.generation_options = "ALBERT"
-    assert b.codewords.is_a?(Array)
+  should "set the text to nil when using raw codewords" do
+    b = PDF417.new("TEST") 
+    b.raw_codewords = [4, 815, 514, 119]
+    assert_equal "", b.text
+  end
+  
+  should "accept raw codewords" do
+    b = PDF417.new
+    b.raw_codewords = [4, 815, 514, 119]
+    assert_equal [4, 815, 514, 119], b.codewords
+    assert_nothing_raised do
+      b.to_blob
+    end
+    assert_barcode b
   end
   
+  context "after generating" do
+    setup do
+      @barcode = PDF417.new("test")
+      @barcode.generate!
+      @blob = @barcode.blob
+    end
+    
+    should "have a blob" do
+      assert_not_nil @barcode.blob
+      assert_not_nil @barcode.to_blob
+      assert_barcode @barcode
+    end
+    
+    should "know bit columns" do
+      assert_not_nil @barcode.bit_columns
+    end
+    
+    should "know bit rows" do
+      assert_not_nil @barcode.bit_rows
+    end
+    
+    should "know bit length" do
+      assert_not_nil @barcode.bit_length
+    end
+    
+    should "know rows" do
+      assert_not_nil @barcode.rows
+    end
+    
+    should "know cols" do
+      assert_not_nil @barcode.cols
+    end
+    
+    should "know error level" do
+      assert_not_nil @barcode.error_level
+    end
+    
+    should "know aspect ratio" do
+      assert_not_nil @barcode.aspect_ratio
+    end
+    
+    should "know y height" do
+      assert_not_nil @barcode.y_height
+    end
+    
+    should "regenerate after rows changed" do
+      @barcode.rows = 10
+      assert_not_equal @blob, @barcode.to_blob
+      assert_barcode @barcode
+    end
+    
+    should "regenerate after cols changed" do
+      @barcode.cols = 10
+      assert_not_equal @blob, @barcode.to_blob
+      assert_barcode @barcode
+    end
+    
+    should "regenerate after error level changed" do
+      @barcode.error_level = 7
+      assert_not_equal @blob, @barcode.to_blob
+      assert_barcode_start_sequence @barcode
+      assert_barcode_end_sequence @barcode
+    end
+    
+    should "regenerate after raw codewords changed" do
+      @barcode.raw_codewords = @barcode.codewords + [245, 123]
+      @barcode.raw_codewords[0] = @barcode.raw_codewords.length
+      assert_not_equal @blob, @barcode.to_blob
+      assert_barcode @barcode
+    end
+        
+    should "regenerate after aspect ratio changed" do
+      # Aspect ratio does not apply when both rows and cols are set, so re-set our 
+      # reference and make sure there is enough data to have rows and cols
+      @barcode.text = "SOME REALLY LONG TEXT HERE! Gonna need some rows...." * 10
+      @barcode.rows = nil
+      @barcode.cols = 2
+      @barcode.error_level = 3
+      @blob = @barcode.to_blob
+      @barcode.aspect_ratio = 1000
+      assert_not_equal @blob, @barcode.to_blob
+      assert_barcode_start_sequence @barcode
+      assert_barcode_end_sequence @barcode
+    end
+  end
+  
+  should "know max rows after generating out of bounds" do
+    b = PDF417.new(:rows => 10000, :text => "test")
+    b.generate!
+    assert_not_equal 10000, b.rows
+  end
+  
+  
+  # if Object.const_defined? "Magick"
+  #   context "using RMagick" do
+  #     setup do
+  #       @barcode = PDF417.new("test text" * 100)
+  #       @barcode.generate!
+  #     end
+  #     
+  #     should "make an image" do
+  #       # @barcode.to_blob.split(//).collect{|x| x.unpack("B*")}.to_s.inspect
+  #       image = Magick::Image::from_blob(@barcode.to_blob).first
+  #       puts "Width: #{image.columns}; Height: #{image.rows}"
+  #     end
+  #   end      
+  # else
+  #   puts "*** Skipping rmagick tests"
+  # end
+  
+  
   
 end

data/test/test_helper.rb

@@ -7,7 +7,30 @@ require 'pdf417'
 require 'rubygems'
 require 'test/unit'
 require 'shoulda'
+require 'ruby-debug'
 
 
 class Test::Unit::TestCase
 end
+
+def assert_barcode(barcode, msg = nil)
+  full_message = build_message(msg, "? should have a valid PDF417 start and end sequence for each row", barcode)
+  assert_block(full_message) do
+    barcode.encoding.any? && barcode.encoding.all?{|x| x.start_with?("11111111010101000") && x.end_with?("111111101000101001") }
+  end
+end
+
+def assert_barcode_start_sequence(barcode, msg = nil)
+  full_message = build_message(msg, "? should have a valid PDF417 start sequence for each row", barcode)
+  assert_block(full_message) do
+    barcode.encoding.any? && barcode.encoding.all?{|x| x.start_with?("11111111010101000")}
+  end
+end
+
+
+def assert_barcode_end_sequence(barcode, msg = nil)
+  full_message = build_message(msg, "? should have a valid PDF417 end sequence for each row", barcode)
+  assert_block(full_message) do
+    barcode.encoding.any? && barcode.encoding.all?{|x| x.end_with?("111111101000101001") }
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: pdf417
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
-  - 1
-  version: 0.1.1
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - jamesprior
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-30 00:00:00 -04:00
+date: 2011-07-25 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -25,6 +25,7 @@ executables: []
 
 extensions: 
 - ext/pdf417/extconf.rb
+- ext/pdf417/extconf.rb
 extra_rdoc_files: 
 - LICENSE
 - README.rdoc
@@ -43,7 +44,10 @@ files:
 - ext/pdf417/pdf417lib.h
 - ext/pdf417/pdf417libimp.h
 - lib/pdf417.rb
+- lib/pdf417/lib.rb
 - pdf417.gemspec
+- script/console
+- test/pdf417/lib_test.rb
 - test/pdf417_test.rb
 - test/test_helper.rb
 has_rdoc: true
@@ -56,6 +60,7 @@ rdoc_options:
 require_paths: 
 - lib
 - ext
+- ext
 required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
@@ -77,10 +82,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.5.3
 signing_key: 
 specification_version: 3
 summary: A Ruby wrapper for the PDF417 barcode library
 test_files: 
+- test/pdf417/lib_test.rb
 - test/pdf417_test.rb
 - test/test_helper.rb