infused-dbf 1.0.7 → 1.0.8

data/README.txt

@@ -2,7 +2,7 @@
 
 DBF is a small fast library for reading dBase, xBase, Clipper and FoxPro database files
 
-Copyright (c) 2006-2008 Keith Morrison <keithm@infused.org, www.infused.org>
+Copyright (c) 2006-2009 Keith Morrison <keithm@infused.org, www.infused.org>
 
 * Official project page: http://rubyforge.org/projects/dbf
 * API Documentation: http://dbf.rubyforge.org/docs
@@ -91,7 +91,7 @@ A small command-line utility called dbf is installed along with the gem.
 
 (The MIT Licence)
 
-Copyright (c) 2006-2008 Keith Morrison <keithm@infused.org>
+Copyright (c) 2006-2009 Keith Morrison <keithm@infused.org, www.infused.org>
 
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation

data/Rakefile

@@ -2,7 +2,7 @@ require 'hoe'
 require 'spec/rake/spectask'
 
 PKG_NAME = "dbf"
-PKG_VERSION = "1.0.7"
+PKG_VERSION = "1.0.8"
 PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
 
 Hoe.new PKG_NAME, PKG_VERSION do |p|

data/dbf.gemspec

@@ -1,15 +1,15 @@
 Gem::Specification.new do |s|
   s.name = %q{dbf}
-  s.version = "1.0.7"
+  s.version = "1.0.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Keith Morrison"]
-  s.date = %q{2009-01-01}
+  s.date = %q{2009-01-02}
   s.default_executable = %q{dbf}
-  s.description = %q{DBF is a small fast library for reading dBase, xBase, Clipper and FoxPro database files  Copyright (c) 2006-2008 Keith Morrison <keithm@infused.org, www.infused.org>  * Official project page: http://rubyforge.org/projects/dbf * API Documentation: http://dbf.rubyforge.org/docs * To report bugs: http://www.rubyforge.org/tracker/?group_id=2009 * Questions: Email keithm@infused.org and put DBF somewhere in the subject line}
+  s.description = %q{DBF is a small fast library for reading dBase, xBase, Clipper and FoxPro database files  Copyright (c) 2006-2009 Keith Morrison <keithm@infused.org, www.infused.org>  * Official project page: http://rubyforge.org/projects/dbf * API Documentation: http://dbf.rubyforge.org/docs * To report bugs: http://www.rubyforge.org/tracker/?group_id=2009 * Questions: Email keithm@infused.org and put DBF somewhere in the subject line}
   s.email = %q{keithm@infused.org}
   s.executables = ["dbf"]
-  s.extra_rdoc_files = ["History.txt", "Manifest.txt", "README.txt"]
+  s.extra_rdoc_files = ["History.txt", "README.txt"]
   s.files = ["History.txt", "Manifest.txt", "README.txt", "Rakefile", "bin/dbf", "dbf.gemspec", "lib/dbf.rb", "lib/dbf/column.rb", "lib/dbf/globals.rb", "lib/dbf/record.rb", "lib/dbf/table.rb", "spec/fixtures/dbase_03.dbf", "spec/fixtures/dbase_30.dbf", "spec/fixtures/dbase_30.fpt", "spec/fixtures/dbase_83.dbf", "spec/fixtures/dbase_83.dbt", "spec/fixtures/dbase_83_schema.txt", "spec/fixtures/dbase_8b.dbf", "spec/fixtures/dbase_8b.dbt", "spec/fixtures/dbase_f5.dbf", "spec/fixtures/dbase_f5.fpt", "spec/functional/dbf_shared.rb", "spec/functional/format_03_spec.rb", "spec/functional/format_30_spec.rb", "spec/functional/format_83_spec.rb", "spec/functional/format_8b_spec.rb", "spec/functional/format_f5_spec.rb", "spec/spec_helper.rb", "spec/unit/column_spec.rb", "spec/unit/record_spec.rb", "spec/unit/table_spec.rb"]
   s.has_rdoc = true
   s.homepage = %q{http://github.com/infused/dm-dbf/tree/master}

data/lib/dbf/column.rb

@@ -6,8 +6,10 @@ module DBF
     attr_reader :name, :type, :length, :decimal
     
     def initialize(name, type, length, decimal)
-      raise ColumnLengthError, "field length must be greater than 0" unless length > 0
       @name, @type, @length, @decimal = strip_non_ascii_chars(name), type, length, decimal
+      
+      raise ColumnLengthError, "field length must be greater than 0" unless length > 0
+      raise ColumnNameError, "column name cannot be empty" if @name.length == 0
     end
     
     def type_cast(value)
@@ -31,10 +33,8 @@ module DBF
     
     def decode_datetime(value)
       days, milliseconds = value.unpack('l2')
-      hours = (milliseconds / MS_PER_HOUR).to_i
-      minutes = ((milliseconds - (hours * MS_PER_HOUR)) / MS_PER_MINUTE).to_i
-      seconds = ((milliseconds - (hours * MS_PER_HOUR) - (minutes * MS_PER_MINUTE)) / MS_PER_SECOND).to_i
-      DateTime.jd(days, hours, minutes, seconds)
+      seconds = milliseconds / 1000
+      DateTime.jd(days, seconds/3600, seconds/60 % 60, seconds % 60)
     end
     
     def unpack_integer(value)
@@ -66,19 +66,12 @@ module DBF
       "\"#{name.underscore}\", #{data_type}\n"
     end
     
-    private
-    
+    # strip all non-ascii and non-printable characters
     def strip_non_ascii_chars(s)
-      clean = ''
-      s.each_byte do |char|
-        if char > 31 && char < 127
-          clean << char
-        else
-          raise ColumnNameError 'column name must not be empty' if clean.length == 0
-          return clean if char == 0
-        end
-      end
-      clean
+      # truncate the string at the first null character
+      s = s[0, s.index("\x00")] if s.index("\x00")
+      
+      s.gsub(/[^\x20-\x7E]/,"")
     end
   end
   

data/spec/unit/column_spec.rb

@@ -24,8 +24,13 @@ describe DBF::Column do
     end
   
     it "should raise an error if length is greater than 0" do
-      lambda { column = DBF::Column.new "ColumnName", "N", -1, 0 }.should raise_error(DBF::ColumnLengthError)
+      lambda { DBF::Column.new "ColumnName", "N", -1, 0 }.should raise_error(DBF::ColumnLengthError)
     end
+    
+    it "should raise error on emtpy column names" do
+      lambda { DBF::Column.new "\xFF\xFC", "N", 1, 0 }.should raise_error(DBF::ColumnNameError)
+    end
+    
   end
   
   context "#type_cast" do
@@ -110,14 +115,16 @@ describe DBF::Column do
   end
   
   context "#strip_non_ascii_chars" do
+    before do
+      @column = DBF::Column.new "ColumnName", "N", 1, 0
+    end
+    
     it "should strip characters below decimal 32 and above decimal 127" do
-      column = DBF::Column.new "ColumnName", "N", 1, 0
-      column.send(:strip_non_ascii_chars, "--\x1F-\x68\x65\x6C\x6C\x6F world-\x80--").should == "---hello world---"
+      @column.strip_non_ascii_chars("--\x1F-\x68\x65\x6C\x6C\x6F world-\x80--").should == "---hello world---"
     end
 
     it "should truncate characters with decimal 0" do
-      column = DBF::Column.new "ColumnName", "N", 1, 0
-      column.send(:strip_non_ascii_chars, "--\x1F-\x68\x65\x6C\x6C\x6F \x00 world-\x80--").should == "---hello "
+      @column.strip_non_ascii_chars("--\x1F-\x68\x65\x6C\x6C\x6F \x00 world-\x80--").should == "---hello "
     end
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: infused-dbf
 version: !ruby/object:Gem::Version 
-  version: 1.0.7
+  version: 1.0.8
 platform: ruby
 authors: 
 - Keith Morrison
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-01 00:00:00 -08:00
+date: 2009-01-02 00:00:00 -08:00
 default_executable: dbf
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,7 +30,7 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.8.2
     version: 
-description: "DBF is a small fast library for reading dBase, xBase, Clipper and FoxPro database files  Copyright (c) 2006-2008 Keith Morrison <keithm@infused.org, www.infused.org>  * Official project page: http://rubyforge.org/projects/dbf * API Documentation: http://dbf.rubyforge.org/docs * To report bugs: http://www.rubyforge.org/tracker/?group_id=2009 * Questions: Email keithm@infused.org and put DBF somewhere in the subject line"
+description: "DBF is a small fast library for reading dBase, xBase, Clipper and FoxPro database files  Copyright (c) 2006-2009 Keith Morrison <keithm@infused.org, www.infused.org>  * Official project page: http://rubyforge.org/projects/dbf * API Documentation: http://dbf.rubyforge.org/docs * To report bugs: http://www.rubyforge.org/tracker/?group_id=2009 * Questions: Email keithm@infused.org and put DBF somewhere in the subject line"
 email: keithm@infused.org
 executables: 
 - dbf
@@ -38,7 +38,6 @@ extensions: []
 
 extra_rdoc_files: 
 - History.txt
-- Manifest.txt
 - README.txt
 files: 
 - History.txt