pdf417 0.1.0 → 0.1.1

data/.gitignore

@@ -12,4 +12,3 @@ lib/pdf417/Makefile
 stash
 .rake_tasks
 tmp
-*.gemspec

data/README.rdoc

@@ -15,6 +15,8 @@ A wrapper for the pdf417lib C Library, from the README:
 Fetching the codewords only can be handy for using rtex and the pst-barcode package.  If you're using prawn
 or RMagic the to_blob function should help generate a complete barcode.
 
+Much of this was based off of reading through the Nokogiri and RMagic source code.  Thanks!
+
 == Usage
 
 There are a few ways to use the library, at its simplest:

data/Rakefile

@@ -57,3 +57,9 @@ Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_files.include("*.rdoc")
   rdoc.rdoc_files.include("ext/pdf417/*.c")
 end
+
+desc 'rebuilds the pdf417 library'
+task :build_extension do
+  pwd = `pwd`
+  exec "cd ext/pdf417 && make clean && ruby extconf.rb && make && cd #{pwd}"
+end

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/ext/pdf417/pdf417.c

@@ -39,7 +39,6 @@ void Init_pdf417() {
   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, "generation_options", rb_pdf417_options, 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);  
@@ -96,6 +95,7 @@ static VALUE rb_pdf417_new(VALUE class, VALUE text) {
   pdf417param *ptr;
   VALUE tdata = Data_Make_Struct(class, pdf417param, 0, rb_pdf417_cleanup, ptr);
   pdf417init(ptr);
+  rb_iv_set(tdata, "@generation_options", INT2NUM(ptr->options));
   argv[0] = text;
   rb_obj_call_init(tdata, 1, argv);
   return tdata;
@@ -112,15 +112,7 @@ static VALUE rb_pdf417_codewords(VALUE self) {
   int k;
   pdf417param *ptr;
   Data_Get_Struct(self, pdf417param, ptr);
-  
-  // Only re-do it if our text has changed
-  if ( ptr->text != STR2CSTR(rb_iv_get(self, "@text")) ) {
-    ptr->text = STR2CSTR(rb_iv_get(self, "@text")); //StringValuePtr(text); 
-
-    paintCode(ptr); //paintCode also sets the error correction, we call it here so we can get the blob if needed w/o trouble
-  }
-  
-  // otherwise, fill the array and respond
+  refreshStruct(self, ptr);
   if (ptr->error) {
       return Qnil; //could also return list
   }
@@ -143,15 +135,7 @@ static VALUE rb_pdf417_codewords(VALUE self) {
 static VALUE rb_pdf417_to_blob(VALUE self) {
   pdf417param *ptr;
   Data_Get_Struct(self, pdf417param, ptr);
-  
-  // Only re-do it if our text has changed
-  if ( ptr->text != STR2CSTR(rb_iv_get(self, "@text")) ) {
-    ptr->text = STR2CSTR(rb_iv_get(self, "@text")); //StringValuePtr(text); 
-
-    paintCode(ptr);
-  }
-  
-  // otherwise, fill the array and respond
+  refreshStruct(self, ptr);
   if (ptr->error) {
       return Qnil; //could also return list
   }
@@ -231,26 +215,6 @@ static VALUE rb_pdf417_errorLevel(VALUE self){
   return INT2NUM(ptr->errorLevel);
 }
 
-/*
- * call-seq:
- *  generation_options
- *
- * 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
- */
-static VALUE rb_pdf417_options(VALUE self){
-  pdf417param *ptr;
-  Data_Get_Struct(self, pdf417param, ptr);
-  return INT2NUM(ptr->options);
-}
-
 /*
  * call-seq:
  *  aspect_ratio
@@ -289,3 +253,29 @@ static VALUE rb_pdf417_error(VALUE self){
   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,12 +1,3 @@
-// strfunctions from Nokogiri
-#define PDF417_STR_NEW2(str) \
-  rb_str_new2((const char *)(str))
-
-#define PDF417_STR_NEW(str, len) \
-  rb_str_new((const char *)(str), (long)(len))
-
-#define RBSTR_OR_QNIL(_str) \
-  (_str ? PDF417_STR_NEW2(_str) : Qnil)
 
 VALUE rb_cPdf417;
 static VALUE rb_pdf417_encode_text(VALUE self, VALUE text);
@@ -21,7 +12,7 @@ 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_options(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);

data/lib/pdf417.rb

@@ -1,6 +1,33 @@
 require 'pdf417/pdf417'
 
 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
+
+  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|
@@ -14,8 +41,7 @@ class PDF417
       "#{attribute.to_s}=#{send(attribute).inspect}"
     }.join ' '
     "#<#{self.class.name}:#{sprintf("0x%x", object_id)} #{attributes}>"
-  end
-  
+  end  
   
   private
   def inspect_attributes

data/pdf417.gemspec

@@ -0,0 +1,57 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE
+# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{pdf417}
+  s.version = "0.1.1"
+
+  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.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.extra_rdoc_files = [
+    "LICENSE",
+     "README.rdoc"
+  ]
+  s.files = [
+    ".document",
+     ".gitignore",
+     "LICENSE",
+     "README.rdoc",
+     "Rakefile",
+     "VERSION",
+     "ext/pdf417/Makefile",
+     "ext/pdf417/extconf.rb",
+     "ext/pdf417/pdf417.c",
+     "ext/pdf417/pdf417.h",
+     "ext/pdf417/pdf417lib.c",
+     "ext/pdf417/pdf417lib.h",
+     "ext/pdf417/pdf417libimp.h",
+     "lib/pdf417.rb",
+     "pdf417.gemspec",
+     "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.summary = %q{A Ruby wrapper for the PDF417 barcode library}
+  s.test_files = [
+    "test/pdf417_test.rb",
+     "test/test_helper.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+    else
+    end
+  else
+  end
+end

data/test/pdf417_test.rb

@@ -1,7 +1,55 @@
 require 'test_helper'
 
 class Pdf417Test < Test::Unit::TestCase
-  should "probably rename this file and start testing for real" do
-    flunk "hey buddy, you should probably rename this file and start testing for real"
+  
+  should "initialize text" do
+    b = PDF417.new("fred")
+    assert_equal "fred", b.text
   end
+  
+  should "initialize generation_options" do
+    b = PDF417.new("fred")
+    assert_equal 0, b.generation_options
+  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
+  end
+  
+  should "re-generate if the text has been reassigned" do
+    b = PDF417.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.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.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
+    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)
+  end
+  
+  
 end

data/test/test_helper.rb

@@ -1,10 +1,13 @@
-require 'rubygems'
-require 'test/unit'
-require 'shoulda'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'ext'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'pdf417'
 
+require 'rubygems'
+require 'test/unit'
+require 'shoulda'
+
+
 class Test::Unit::TestCase
 end

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: pdf417
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  hash: 25
+  prerelease: 
+  segments: 
+  - 0
+  - 1
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - jamesprior
@@ -9,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-29 00:00:00 -04:00
+date: 2011-03-30 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -36,8 +42,8 @@ files:
 - ext/pdf417/pdf417lib.c
 - ext/pdf417/pdf417lib.h
 - ext/pdf417/pdf417libimp.h
-- ext/pdf417/test.rb
 - lib/pdf417.rb
+- pdf417.gemspec
 - test/pdf417_test.rb
 - test/test_helper.rb
 has_rdoc: true
@@ -51,21 +57,27 @@ require_paths:
 - lib
 - ext
 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: 
-rubygems_version: 1.3.5
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A Ruby wrapper for the PDF417 barcode library

data/ext/pdf417/test.rb

@@ -1,52 +0,0 @@
-# Basic testing file, run via make clean && ruby extconf.rb && make && ruby test.rb
-require 'pdf417'
-
-class PDF417
-  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
-      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
-
-
-puts "Testing codewords for 'fred'"
-PDF417.encode_text("fred").each_with_index{|cw,i| puts "Ruby thinks cw #{i} is #{cw}"}
-# For fred, should return:
-# Ruby thinks cw 0 is 4
-# Ruby thinks cw 1 is 815
-# Ruby thinks cw 2 is 514
-# Ruby thinks cw 3 is 119
-
-p = PDF417.new("test")
-puts p.inspect
-p = PDF417.new("fred")
-puts p.text
-puts p.codewords.inspect
-puts p.to_blob.inspect
-puts p.bit_columns
-puts p.bit_length
-puts p.code_rows
-puts p.code_columns
-puts p.codeword_length
-puts p.error_level
-puts p.generation_options
-puts p.aspect_ratio
-puts p.y_height
-puts p.generation_error
-puts p.inspect