dbf 1.6.3 → 1.6.5

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# 1.6.5
+  - experimental support for visual foxpro double (b) data type
+
 # 1.6.3
   - Replace invalid chars with 'unicode replacement character' (U+FFFD)
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dbf (1.6.0)
+    dbf (1.6.3)
       fastercsv (~> 1.5.4)
 
 GEM
@@ -13,6 +13,8 @@ GEM
     fastercsv (1.5.4)
     linecache19 (0.5.12)
       ruby_core_source (>= 0.1.4)
+    rake (0.9.2)
+    rdoc (3.9.4)
     rspec (2.6.0)
       rspec-core (~> 2.6.0)
       rspec-expectations (~> 2.6.0)
@@ -37,5 +39,7 @@ PLATFORMS
 
 DEPENDENCIES
   dbf!
+  rake (~> 0.9.2)
+  rdoc (~> 3.9.0)
   rspec (~> 2.6.0)
   ruby-debug19

data/lib/dbf.rb

@@ -10,5 +10,6 @@ require 'dbf/util'
 require 'dbf/attributes'
 require 'dbf/record'
 require 'dbf/column'
+require 'dbf/foxpro_column'
 require 'dbf/memo'
 require 'dbf/table'

data/lib/dbf/column.rb

@@ -32,6 +32,7 @@ module DBF
         when 'D' then decode_date(value)
         when 'T' then decode_datetime(value)
         when 'L' then boolean(value)
+        when 'B' then unpack_binary(value)
         else          encode_string(value.to_s).strip
       end
     end
@@ -73,6 +74,9 @@ module DBF
     def unpack_unsigned_long(value) #nodoc
       value.unpack('V')[0]
     end
+    
+    def unpack_binary(value) #nodoc
+    end
 
     def boolean(value) #nodoc
       value.strip =~ /^(y|t)$/i ? true : false

data/lib/dbf/foxpro_column.rb

@@ -0,0 +1,7 @@
+module DBF
+  class FoxproColumn < Column
+    def unpack_binary(value) #nodoc
+      value.unpack('d')[0]
+    end
+  end
+end

data/lib/dbf/table.rb

@@ -21,6 +21,10 @@ module DBF
       "f5" => "FoxPro with memo file",
       "fb" => "FoxPro without memo file"
     }
+    
+    FOXPRO_VERSIONS = VERSION_DESCRIPTIONS.map do |version, description| 
+      version if description =~ /FoxPro/
+    end.compact
 
     attr_reader   :version              # Internal dBase version number
     attr_reader   :record_count         # Total number of records
@@ -164,6 +168,8 @@ module DBF
 
     # Retrieves column information from the database
     def columns
+      column_class = FOXPRO_VERSIONS.include?(version) ? FoxproColumn : Column
+      
       @columns ||= begin
         column_count = (@header_length - DBF_HEADER_SIZE + 1) / DBF_HEADER_SIZE
 
@@ -171,7 +177,9 @@ module DBF
         columns = []
         column_count.times do
           name, type, length, decimal = @data.read(32).unpack('a10 x a x4 C2')
-          columns << Column.new(name.strip, type, length, decimal, @encoding) if length > 0
+          if length > 0
+            columns << column_class.new(name.strip, type, length, decimal, @encoding)
+          end
         end
         columns
       end

data/lib/dbf/version.rb

@@ -1,3 +1,3 @@
 module DBF
-  VERSION = '1.6.3'
+  VERSION = '1.6.5'
 end

data/spec/dbf/file_formats_spec.rb

@@ -16,10 +16,6 @@ shared_examples_for 'DBF' do
     @table.count.should == @table.record_count
   end
   
-  specify "columns should be instances of DBF::Column" do
-    @table.columns.all? {|column| column.should be_an_instance_of(DBF::Column)}
-  end
-  
   specify "column names should not be blank" do
     @table.columns.all? {|column| column.name.should_not be_empty}
   end
@@ -54,7 +50,12 @@ shared_examples_for 'DBF' do
       record.send(column_name).should == record.send(Util.underscore(column_name))
     end
   end
-  
+end
+
+shared_examples_for 'Foxpro DBF' do
+  specify "columns should be instances of DBF::FoxproColumn" do
+    @table.columns.all? {|column| column.should be_an_instance_of(DBF::FoxproColumn)}
+  end
 end
 
 describe DBF, "of type 03 (dBase III without memo file)" do
@@ -163,6 +164,7 @@ describe DBF, "of type f5 (FoxPro with memo file)" do
   end
   
   it_should_behave_like "DBF"
+  it_should_behave_like "Foxpro DBF"
   
   it "should report the correct version number" do
     @table.version.should == "f5"

data/spec/dbf/table_spec.rb

@@ -1,6 +1,10 @@
 require "spec_helper"
 
 describe DBF::Table do  
+  # specify do
+  #   DBF::Table::FOXPRO_VERSIONS.should == %w(30 31 f5 fb)
+  # end
+  
   context "when closed" do
     before do
       @table = DBF::Table.new "#{DB_PATH}/dbase_83.dbf"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dbf
 version: !ruby/object:Gem::Version
-  version: 1.6.3
+  version: 1.6.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-25 00:00:00.000000000Z
+date: 2011-10-28 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastercsv
-  requirement: &2164833540 !ruby/object:Gem::Requirement
+  requirement: &70356603269760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.5.4
   type: :runtime
   prerelease: false
-  version_requirements: *2164833540
+  version_requirements: *70356603269760
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2164833080 !ruby/object:Gem::Requirement
+  requirement: &70356603269300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *2164833080
+  version_requirements: *70356603269300
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2164832620 !ruby/object:Gem::Requirement
+  requirement: &70356603268820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *2164832620
+  version_requirements: *70356603268820
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &2164819800 !ruby/object:Gem::Requirement
+  requirement: &70356603268320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 3.9.0
   type: :development
   prerelease: false
-  version_requirements: *2164819800
+  version_requirements: *70356603268320
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &2164819340 !ruby/object:Gem::Requirement
+  requirement: &70356603267840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164819340
+  version_requirements: *70356603267840
 description: A small fast library for reading dBase, xBase, Clipper and FoxPro database
   files.
 email: keithm@infused.org
@@ -88,6 +88,7 @@ files:
 - lib/dbf/attributes.rb
 - lib/dbf/column.rb
 - lib/dbf/encodings.yml
+- lib/dbf/foxpro_column.rb
 - lib/dbf/memo.rb
 - lib/dbf/record.rb
 - lib/dbf/table.rb
@@ -98,6 +99,8 @@ files:
 - spec/dbf/file_formats_spec.rb
 - spec/dbf/record_spec.rb
 - spec/dbf/table_spec.rb
+- spec/fixtures/colores.DBF
+- spec/fixtures/colores.FPT
 - spec/fixtures/cp1251.dbf
 - spec/fixtures/dbase_03.dbf
 - spec/fixtures/dbase_30.dbf
@@ -132,7 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.0
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Read xBase files