dbf 1.0.3 → 1.0.5

data/History.txt

@@ -1,4 +1,13 @@
+== 1.0.5
+
+* Strip non-ascii characters from column names
+
+== 1.0.4
+
+* Underscore column names when dumping schemas (FieldId becomes field_id)
+
 == 1.0.3
+
 * Add support for Visual Foxpro Integer and Datetime columns
 
 == 1.0.2

data/Rakefile

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

data/lib/dbf/column.rb

@@ -6,7 +6,47 @@ module DBF
 
     def initialize(name, type, length, decimal)
       raise ColumnLengthError, "field length must be greater than 0" unless length > 0
-      @name, @type, @length, @decimal = name.gsub(/\0/, ''), type, length, decimal
+      @name, @type, @length, @decimal = strip_non_ascii_chars(name), type, length, decimal
+    end
+    
+    def schema_definition
+      "\"#{underscore(name)}\", " + 
+      case type
+      when "N" # number
+        if decimal > 0
+          ":float"
+        else
+          ":integer"
+        end
+      when "D" # date
+        ":datetime"
+      when "L" # boolean
+        ":boolean"
+      when "M" # memo
+        ":text"
+      else
+        ":string, :limit => #{length}"
+      end + 
+      "\n"
+    end
+    
+    private
+
+    def underscore(camel_cased_word)
+      camel_cased_word.to_s.gsub(/::/, '/').
+        gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
+        gsub(/([a-z\d])([A-Z])/,'\1_\2').
+        tr("-", "_").
+        downcase
+    end
+    
+    def strip_non_ascii_chars(s)
+      clean = ''
+      s.each_byte do |char|
+        clean << char if char > 31 && char < 128
+      end
+      clean
     end
   end
+  
 end

data/lib/dbf/globals.rb

@@ -23,4 +23,6 @@ module DBF
   MS_PER_HOUR = MS_PER_MINUTE * 60
   
   class DBFError < StandardError; end
+  class InvalidColumnName < DBFError; end
+  class InvalidColumnLength < DBFError; end
 end

data/lib/dbf/record.rb

@@ -29,31 +29,30 @@ module DBF
     
     def initialize_values(columns)
       columns.each do |column|
-        case column.type
+        @attributes[column.name] = case column.type
         when 'N' # number
-          @attributes[column.name] = column.decimal.zero? ? unpack_string(column).to_i : unpack_string(column).to_f
+          column.decimal.zero? ? unpack_string(column).to_i : unpack_string(column).to_f
         when 'D' # date
           raw = unpack_string(column).strip
           unless raw.empty?
+            parts = raw.match(DATE_REGEXP).captures.map {|n| n.to_i}
             begin
-              parts = raw.match(DATE_REGEXP).to_a.slice(1,3).map {|n| n.to_i}
-              @attributes[column.name] = Time.gm(*parts)
+              Time.gm(*parts)
             rescue
-              parts = raw.match(DATE_REGEXP).to_a.slice(1,3).map {|n| n.to_i}
-              @attributes[column.name] = Date.new(*parts)
+              Date.new(*parts)
             end
           end
         when 'M' # memo
           starting_block = unpack_string(column).to_i
-          @attributes[column.name] = read_memo(starting_block)
+          read_memo(starting_block)
         when 'L' # logical
-          @attributes[column.name] = unpack_string(column) =~ /^(y|t)$/i ? true : false
+          unpack_string(column) =~ /^(y|t)$/i ? true : false
         when 'I' # integer
-          @attributes[column.name] = unpack_integer(column)
+          unpack_integer(column)
         when 'T' # datetime
-          @attributes[column.name] = unpack_datetime(column)
+          unpack_datetime(column)
         else
-          @attributes[column.name] = unpack_string(column).strip
+          unpack_string(column).strip
         end
       end
     end

data/lib/dbf/table.rb

@@ -105,19 +105,15 @@ module DBF
     # for the record to be returned.  The equivalent SQL would be "WHERE key1 = 'value1'
     # AND key2 = 'value2'".
     def find(command, options = {})
+      results = options.empty? ? records : records.select {|record| all_values_match?(record, options)}
+      
       case command
       when Fixnum
         record(command)
       when :all
-        return records if options.empty?
-        records.select do |record|
-          options.map {|key, value| record.attributes[key.to_s] == value}.all?
-        end
+        results
       when :first
-        return records.first if options.empty?
-        records.detect do |record|
-          options.map {|key, value| record.attributes[key.to_s] == value}.all?
-        end
+        results.first
       end
     end
     
@@ -151,24 +147,7 @@ module DBF
       s = "ActiveRecord::Schema.define do\n"
       s << "  create_table \"#{File.basename(@data.path, ".*")}\" do |t|\n"
       columns.each do |column|
-        s << "    t.column \"#{column.name}\""
-        case column.type
-        when "N" # number
-          if column.decimal > 0
-            s << ", :float"
-          else
-            s << ", :integer"
-          end
-        when "D" # date
-          s << ", :datetime"
-        when "L" # boolean
-          s << ", :boolean"
-        when "M" # memo
-          s << ", :text"
-        else
-          s << ", :string, :limit => #{column.length}"
-        end
-        s << "\n"
+        s << "    t.column #{column.schema_definition}"
       end
       s << "  end\nend"
       
@@ -206,8 +185,8 @@ module DBF
         @columns = []
         @column_count.times do
           name, type, length, decimal = @data.read(32).unpack('a10 x a x4 C2')
-          if length > 0 && name.strip.any?
-            @columns << Column.new(name, type, length, decimal)
+          if length > 0
+            @columns << Column.new(name.strip, type, length, decimal)
           end
         end
         # Reset the column count
@@ -263,6 +242,10 @@ module DBF
           end
         end
       end
+      
+      def all_values_match?(record, options)
+        options.map {|key, value| record.attributes[key.to_s] == value}.all?
+      end
   end
   
 end

data/spec/fixtures/dbase_83_schema.txt

@@ -1,19 +1,19 @@
 ActiveRecord::Schema.define do
   create_table "dbase_83" do |t|
-    t.column "ID", :integer
-    t.column "CATCOUNT", :integer
-    t.column "AGRPCOUNT", :integer
-    t.column "PGRPCOUNT", :integer
-    t.column "ORDER", :integer
-    t.column "CODE", :string, :limit => 50
-    t.column "NAME", :string, :limit => 100
-    t.column "THUMBNAIL", :string, :limit => 254
-    t.column "IMAGE", :string, :limit => 254
-    t.column "PRICE", :float
-    t.column "COST", :float
-    t.column "DESC", :text
-    t.column "WEIGHT", :float
-    t.column "TAXABLE", :boolean
-    t.column "ACTIVE", :boolean
+    t.column "id", :integer
+    t.column "catcount", :integer
+    t.column "agrpcount", :integer
+    t.column "pgrpcount", :integer
+    t.column "order", :integer
+    t.column "code", :string, :limit => 50
+    t.column "name", :string, :limit => 100
+    t.column "thumbnail", :string, :limit => 254
+    t.column "image", :string, :limit => 254
+    t.column "price", :float
+    t.column "cost", :float
+    t.column "desc", :text
+    t.column "weight", :float
+    t.column "taxable", :boolean
+    t.column "active", :boolean
   end
 end

data/spec/unit/column_spec.rb

@@ -26,8 +26,8 @@ describe DBF::Column, "when initialized" do
     lambda { column = DBF::Column.new "ColumnName", "N", -1, 0 }.should raise_error(DBF::ColumnLengthError)
   end
   
-  it "should strip null characters from the name" do
-    column = DBF::Column.new "Column\0Name\0", "N", 1, 0
+  it "should strip non-ascii characters from the name" do
+    column = DBF::Column.new "Col\200umn\0Name\037", "N", 1, 0
     column.name.should == "ColumnName"
   end
   

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: dbf
 version: !ruby/object:Gem::Version 
-  version: 1.0.3
-date: 2007-09-02 00:00:00 -07:00
+  version: 1.0.5
+date: 2007-11-27 00:00:00 -08:00
 summary: A small fast library for reading dBase, xBase, Clipper and FoxPro database files.
 require_paths: 
 - lib