dbf 1.6.5 → 1.6.6

data/CHANGELOG.md

@@ -1,5 +1,8 @@
+# 1.6.6
+  - add binary data type support to ActiveRecord schema output
+  
 # 1.6.5
-  - experimental support for visual foxpro double (b) data type
+  - support for visual foxpro double (b) data type
 
 # 1.6.3
   - Replace invalid chars with 'unicode replacement character' (U+FFFD)

data/Gemfile.lock

@@ -1,20 +1,74 @@
 PATH
   remote: .
   specs:
-    dbf (1.6.3)
+    dbf (1.6.5)
       fastercsv (~> 1.5.4)
 
 GEM
   remote: http://rubygems.org/
   specs:
+    Saikuro (1.1.0)
+    activesupport (3.1.1)
+      multi_json (~> 1.0)
     archive-tar-minitar (0.5.2)
+    arrayfields (4.7.4)
+    chronic (0.3.0)
+    churn (0.0.13)
+      chronic (>= 0.2.3)
+      hirb
+      json_pure
+      main
+      ruby_parser (~> 2.0.4)
+      sexp_processor (~> 3.0.3)
+    colored (1.2)
     columnize (0.3.4)
     diff-lcs (1.1.3)
+    erubis (2.7.0)
     fastercsv (1.5.4)
+    fattr (2.2.0)
+    flay (1.4.3)
+      ruby_parser (~> 2.0)
+      sexp_processor (~> 3.0)
+    flog (2.5.3)
+      ruby_parser (~> 2.0)
+      sexp_processor (~> 3.0)
+    hirb (0.5.0)
+    i18n (0.6.0)
+    json_pure (1.6.1)
     linecache19 (0.5.12)
       ruby_core_source (>= 0.1.4)
+    main (4.7.1)
+    map (4.7.1)
+    metric_fu (2.1.1)
+      Saikuro (>= 1.1.0)
+      activesupport (>= 2.0.0)
+      chronic (~> 0.3.0)
+      churn (>= 0.0.7)
+      flay (>= 1.2.1)
+      flog (>= 2.3.0)
+      rails_best_practices (>= 0.6.4)
+      rcov (>= 0.8.3.3)
+      reek (>= 1.2.6)
+      roodi (>= 2.1.0)
+      syntax
+    multi_json (1.0.3)
+    progressbar (0.9.1)
+    rails_best_practices (1.2.0)
+      activesupport
+      colored
+      erubis
+      i18n
+      progressbar
+      sexp_processor
     rake (0.9.2)
+    rcov (0.9.11)
     rdoc (3.9.4)
+    reek (1.2.8)
+      ruby2ruby (~> 1.2)
+      ruby_parser (~> 2.0)
+      sexp_processor (~> 3.0)
+    roodi (2.1.0)
+      ruby_parser
     rspec (2.6.0)
       rspec-core (~> 2.6.0)
       rspec-expectations (~> 2.6.0)
@@ -31,14 +85,25 @@ GEM
       columnize (>= 0.3.1)
       linecache19 (>= 0.5.11)
       ruby-debug-base19 (>= 0.11.19)
+    ruby2ruby (1.3.1)
+      ruby_parser (~> 2.0)
+      sexp_processor (~> 3.0)
     ruby_core_source (0.1.5)
       archive-tar-minitar (>= 0.5.2)
+    ruby_parser (2.0.6)
+      sexp_processor (~> 3.0)
+    sexp_processor (3.0.7)
+    syntax (1.0.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  arrayfields
   dbf!
+  fattr
+  map
+  metric_fu
   rake (~> 0.9.2)
   rdoc (~> 3.9.0)
   rspec (~> 2.6.0)

data/Rakefile

@@ -26,8 +26,8 @@ task :console do
   sh "irb -rubygems -I lib -r dbf.rb"
 end
 
-# require 'metric_fu'
-# MetricFu::Configuration.run do |config|
-#   config.rcov[:test_files] = ['spec/**/*_spec.rb']  
-#   config.rcov[:rcov_opts] << "-Ispec"
-# end
+require 'metric_fu'
+MetricFu::Configuration.run do |config|
+  config.rcov[:test_files] = ['spec/**/*_spec.rb']  
+  config.rcov[:rcov_opts] << "-Ispec"
+end

data/docs/supported_types.markdown

@@ -9,9 +9,9 @@
     +---------+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+
     | 05      | Y | Y | Y | Y | - | - | - | - | - | - | - | - | - | - | - | - | - |
     +---------+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+
-    | 30      | Y | Y | Y | Y | - | Y | N | N | N | N | N | Y | N | N | N | N | - |
+    | 30      | Y | Y | Y | Y | - | Y | Y | N | N | N | N | Y | N | N | N | N | - |
     +---------+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+
-    | 31      | Y | Y | Y | Y | Y | Y | N | N | N | N | N | Y | N | N | N | N | N |
+    | 31      | Y | Y | Y | Y | Y | Y | Y | N | N | N | N | Y | N | N | N | N | N |
     +---------+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+
     | 7b      | Y | Y | Y | Y | Y | Y | - | - | - | - | - | - | - | - | - | - | - |
     +---------+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+
@@ -19,7 +19,7 @@
     +---------+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+
     | 8e      | Y | Y | Y | Y | Y | - | - | - | - | - | - | - | - | N | - | - | - |
     +---------+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+
-    | f5      | Y | Y | Y | Y | Y | Y | N | N | N | N | N | Y | N | N | N | N | N |
+    | f5      | Y | Y | Y | Y | Y | Y | Y | N | N | N | N | Y | N | N | N | N | N |
     +---------+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+
-    | fb      | Y | Y | Y | Y | - | Y | N | N | N | N | N | Y | N | N | N | N | N |
+    | fb      | Y | Y | Y | Y | - | Y | Y | N | N | N | N | Y | N | N | N | N | N |
     +---------+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+

data/lib/dbf/column.rb

@@ -13,8 +13,8 @@ module DBF
     # @param [String] type
     # @param [Fixnum] length
     # @param [Fixnum] decimal
-    def initialize(name, type, length, decimal, encoding=nil)
-      @name, @type, @length, @decimal, @encoding = clean(name), type, length, decimal, encoding
+    def initialize(name, type, length, decimal, version, encoding=nil)
+      @name, @type, @length, @decimal, @version, @encoding = clean(name), type, length, decimal, version, encoding
 
       raise ColumnLengthError, "field length must be greater than 0" unless length > 0
       raise ColumnNameError, "column name cannot be empty" if @name.length == 0
@@ -100,15 +100,21 @@ module DBF
         ":boolean"
       when "M"
         ":text"
+      when "B"
+        if DBF::Table::FOXPRO_VERSIONS.include?(@version)
+          decimal > 0 ? ":float" : ":integer"
+        else
+          ":text"
+        end
       else
         ":string, :limit => #{length}"
       end
     end
 
-    def clean(s) #nodoc
-      first_null = s.index("\x00")
-      s = s[0, first_null] if first_null
-      s.gsub(/[^\x20-\x7E]/, "")
+    def clean(value) #nodoc
+      first_null = value.index("\x00")
+      value = value[0, first_null] if first_null
+      value.gsub(/[^\x20-\x7E]/, "")
     end
 
   end

data/lib/dbf/record.rb

@@ -46,10 +46,11 @@ module DBF
     
     def define_accessors #nodoc
       @columns.each do |column|
-        unless self.class.method_defined? column.underscored_name
+        name = column.underscored_name
+        unless respond_to? name
           self.class.class_eval <<-END
-            def #{column.underscored_name}
-              @#{column.underscored_name} ||= attributes['#{column.underscored_name}']
+            def #{name}
+              @#{name} ||= attributes['#{name}']
             end
           END
         end

data/lib/dbf/table.rb

@@ -168,17 +168,13 @@ 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
-
         @data.seek(DBF_HEADER_SIZE)
         columns = []
         column_count.times do
           name, type, length, decimal = @data.read(32).unpack('a10 x a x4 C2')
           if length > 0
-            columns << column_class.new(name.strip, type, length, decimal, @encoding)
+            columns << column_class.new(name.strip, type, length, decimal, version, @encoding)
           end
         end
         columns
@@ -190,6 +186,14 @@ module DBF
     end
 
     private
+    
+    def column_class
+      @column_class ||= FOXPRO_VERSIONS.include?(version) ? FoxproColumn : Column
+    end
+    
+    def column_count
+      @column_count ||= (@header_length - DBF_HEADER_SIZE + 1) / DBF_HEADER_SIZE
+    end
 
     def open_memo(path) #nodoc
       files = Dir.glob("#{File.dirname(path)}/#{File.basename(path, '.*')}*.{fpt,FPT,dbt,DBT}")

data/lib/dbf/version.rb

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

data/spec/dbf/column_spec.rb

@@ -3,7 +3,7 @@ require "spec_helper"
 describe DBF::Column do
   
   context "when initialized" do
-    let(:column) { DBF::Column.new "ColumnName", "N", 1, 0 }
+    let(:column) { DBF::Column.new "ColumnName", "N", 1, 0, "30" }
     
     it "sets the #name accessor" do
       column.name.should == "ColumnName"
@@ -22,15 +22,15 @@ describe DBF::Column do
     end
     
     describe 'with length of 0' do
-      specify { lambda { DBF::Column.new "ColumnName", "N", 0, 0 }.should raise_error(DBF::ColumnLengthError) }
+      specify { lambda { DBF::Column.new "ColumnName", "N", 0, 0, "30" }.should raise_error(DBF::ColumnLengthError) }
     end
     
     describe 'with length less than 0' do
-      specify { lambda { DBF::Column.new "ColumnName", "N", -1, 0 }.should raise_error(DBF::ColumnLengthError) }
+      specify { lambda { DBF::Column.new "ColumnName", "N", -1, 0, "30" }.should raise_error(DBF::ColumnLengthError) }
     end
     
     describe 'with empty column name' do
-      specify { lambda { DBF::Column.new "\xFF\xFC", "N", 1, 0 }.should raise_error(DBF::ColumnNameError) }
+      specify { lambda { DBF::Column.new "\xFF\xFC", "N", 1, 0, "30" }.should raise_error(DBF::ColumnNameError) }
     end
   end
   
@@ -39,7 +39,7 @@ describe DBF::Column do
       context 'and 0 decimals' do
         it 'casts value to Fixnum' do
           value = '135'
-          column = DBF::Column.new "ColumnName", "N", 3, 0
+          column = DBF::Column.new "ColumnName", "N", 3, 0, "30"
           column.type_cast(value).should be_a Fixnum
           column.type_cast(value).should == 135
         end
@@ -48,7 +48,7 @@ describe DBF::Column do
       context 'and more than 0 decimals' do
         it 'casts value to Float' do
           value = '13.5'
-          column = DBF::Column.new "ColumnName", "N", 2, 1
+          column = DBF::Column.new "ColumnName", "N", 2, 1, "30"
           column.type_cast(value).should be_a Float
           column.type_cast(value).should == 13.5
         end
@@ -58,7 +58,7 @@ describe DBF::Column do
     context 'with type F (float)' do
       it 'casts value to Float' do
         value = '135'
-        column = DBF::Column.new "ColumnName", "F", 3, 0
+        column = DBF::Column.new "ColumnName", "F", 3, 0, "30"
         column.type_cast(value).should be_a Float
         column.type_cast(value).should == 135.0
       end
@@ -67,13 +67,13 @@ describe DBF::Column do
     context 'with type I (integer)' do
       it "casts value to Fixnum" do
         value = "\203\171\001\000"
-        column = DBF::Column.new "ColumnName", "I", 3, 0
+        column = DBF::Column.new "ColumnName", "I", 3, 0, "30"
         column.type_cast(value).should == 96643
       end
     end
     
     context 'with type L (logical/boolean)' do
-      let(:column) { DBF::Column.new "ColumnName", "L", 1, 0 }
+      let(:column) { DBF::Column.new "ColumnName", "L", 1, 0, "30" }
       
       it "casts 'y' to true" do
         column.type_cast('y').should == true
@@ -89,7 +89,7 @@ describe DBF::Column do
     end
     
     context 'with type T (datetime)' do
-      let(:column) { DBF::Column.new "ColumnName", "T", 16, 0 }
+      let(:column) { DBF::Column.new "ColumnName", "T", 16, 0, "30" }
       
       context 'with valid datetime' do
         it "casts to DateTime" do
@@ -105,7 +105,7 @@ describe DBF::Column do
     end
     
     context 'with type D (date)' do
-      let(:column) { DBF::Column.new "ColumnName", "D", 8, 0 }
+      let(:column) { DBF::Column.new "ColumnName", "D", 8, 0, "30" }
       
       context 'with valid date' do
         it "casts to Date" do
@@ -122,7 +122,7 @@ describe DBF::Column do
     
     context 'with type M (memo)' do
       it "casts to string" do
-        column = DBF::Column.new "ColumnName", "M", 3, 0
+        column = DBF::Column.new "ColumnName", "M", 3, 0, "30"
         column.type_cast('abc').should be_a String
       end
     end
@@ -131,56 +131,78 @@ describe DBF::Column do
   context "#schema_definition" do
     context 'with type N (number)' do
       it "outputs an integer column" do
-        column = DBF::Column.new "ColumnName", "N", 1, 0
+        column = DBF::Column.new "ColumnName", "N", 1, 0, "30"
         column.schema_definition.should == "\"column_name\", :integer\n"
       end
     end
     
+    context "with type B (binary)" do
+      context "with Foxpro dbf" do
+        context "when decimal is greater than 0" do
+          it "outputs an float column" do
+            column = DBF::Column.new "ColumnName", "B", 1, 2, "f5"
+            column.schema_definition.should == "\"column_name\", :float\n"
+          end
+        end
+        
+        context "when decimal is 0" do
+          column = DBF::Column.new "ColumnName", "B", 1, 0, "f5"
+          column.schema_definition.should == "\"column_name\", :integer\n"
+        end
+      end
+      
+      context "when non-Foxpro dbf" do
+        it "outputs a text column" do
+          
+        end
+      end
+    end
+    
     it "defines a float colmn if type is (N)umber with more than 0 decimals" do
-      column = DBF::Column.new "ColumnName", "N", 1, 2
+      column = DBF::Column.new "ColumnName", "N", 1, 2, "30"
       column.schema_definition.should == "\"column_name\", :float\n"
     end
     
     it "defines a date column if type is (D)ate" do
-      column = DBF::Column.new "ColumnName", "D", 8, 0
+      column = DBF::Column.new "ColumnName", "D", 8, 0, "30"
       column.schema_definition.should == "\"column_name\", :date\n"
     end
     
     it "defines a datetime column if type is (D)ate" do
-      column = DBF::Column.new "ColumnName", "T", 16, 0
+      column = DBF::Column.new "ColumnName", "T", 16, 0, "30"
       column.schema_definition.should == "\"column_name\", :datetime\n"
     end
     
     it "defines a boolean column if type is (L)ogical" do
-      column = DBF::Column.new "ColumnName", "L", 1, 0
+      column = DBF::Column.new "ColumnName", "L", 1, 0, "30"
       column.schema_definition.should == "\"column_name\", :boolean\n"
     end
     
     it "defines a text column if type is (M)emo" do
-      column = DBF::Column.new "ColumnName", "M", 1, 0
+      column = DBF::Column.new "ColumnName", "M", 1, 0, "30"
       column.schema_definition.should == "\"column_name\", :text\n"
     end
     
     it "defines a string column with length for any other data types" do
-      column = DBF::Column.new "ColumnName", "X", 20, 0
+      column = DBF::Column.new "ColumnName", "X", 20, 0, "30"
       column.schema_definition.should == "\"column_name\", :string, :limit => 20\n"
     end
   end
   
   context "#name" do    
     it "contains only ASCII characters" do
-      column = DBF::Column.new "--\x1F-\x68\x65\x6C\x6C\x6F world-\x80--", "N", 1, 0
+      column = DBF::Column.new "--\x1F-\x68\x65\x6C\x6C\x6F world-\x80--", "N", 1, 0, "30"
       column.name.should == "---hello world---"
     end
 
     it "is truncated at the null character" do
-      column = DBF::Column.new "--\x1F-\x68\x65\x6C\x6C\x6F \x00 world-\x80--", "N", 1, 0
+      column = DBF::Column.new "--\x1F-\x68\x65\x6C\x6C\x6F \x00 world-\x80--", "N", 1, 0, "30"
       column.name.should == "---hello "
     end
   end
   
   context '#decode_date' do
-    let(:column) { DBF::Column.new "ColumnName", "N", 1, 0 }
+    let(:column) { DBF::Column.new "ColumnName", "N", 1, 0, "30" }
     
     it 'is nil if value is blank' do
       column.send(:decode_date, '').should be_nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dbf
 version: !ruby/object:Gem::Version
-  version: 1.6.5
+  version: 1.6.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-28 00:00:00.000000000Z
+date: 2011-10-30 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastercsv
-  requirement: &70356603269760 !ruby/object:Gem::Requirement
+  requirement: &70121607557520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.5.4
   type: :runtime
   prerelease: false
-  version_requirements: *70356603269760
+  version_requirements: *70121607557520
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70356603269300 !ruby/object:Gem::Requirement
+  requirement: &70121607556660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70356603269300
+  version_requirements: *70121607556660
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70356603268820 !ruby/object:Gem::Requirement
+  requirement: &70121607555460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *70356603268820
+  version_requirements: *70121607555460
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70356603268320 !ruby/object:Gem::Requirement
+  requirement: &70121607554600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 3.9.0
   type: :development
   prerelease: false
-  version_requirements: *70356603268320
+  version_requirements: *70121607554600
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &70356603267840 !ruby/object:Gem::Requirement
+  requirement: &70121607553520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,51 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70356603267840
+  version_requirements: *70121607553520
+- !ruby/object:Gem::Dependency
+  name: metric_fu
+  requirement: &70121607552460 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70121607552460
+- !ruby/object:Gem::Dependency
+  name: fattr
+  requirement: &70121607551860 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70121607551860
+- !ruby/object:Gem::Dependency
+  name: arrayfields
+  requirement: &70121607551280 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70121607551280
+- !ruby/object:Gem::Dependency
+  name: map
+  requirement: &70121607550460 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70121607550460
 description: A small fast library for reading dBase, xBase, Clipper and FoxPro database
   files.
 email: keithm@infused.org