dbf 1.6.0 → 1.6.1

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 1.6.1
+  - fix YAML issue when using MRI version > 1.9.1
+  - remove Table#seek_to_index and Table#current_record private methods
+
+## 1.6.0
+  - remove activesupport gem dependency
+
 ## 1.5.0
 
 - Significant internal restructuring and performance improvements. Initial

data/Gemfile.lock

@@ -2,13 +2,17 @@ PATH
   remote: .
   specs:
     dbf (1.6.0)
-      fastercsv (= 1.5.4)
+      fastercsv (~> 1.5.4)
 
 GEM
   remote: http://rubygems.org/
   specs:
+    archive-tar-minitar (0.5.2)
+    columnize (0.3.4)
     diff-lcs (1.1.3)
     fastercsv (1.5.4)
+    linecache19 (0.5.12)
+      ruby_core_source (>= 0.1.4)
     rspec (2.6.0)
       rspec-core (~> 2.6.0)
       rspec-expectations (~> 2.6.0)
@@ -17,10 +21,21 @@ GEM
     rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.6.0)
+    ruby-debug-base19 (0.11.25)
+      columnize (>= 0.3.1)
+      linecache19 (>= 0.5.11)
+      ruby_core_source (>= 0.1.4)
+    ruby-debug19 (0.11.6)
+      columnize (>= 0.3.1)
+      linecache19 (>= 0.5.11)
+      ruby-debug-base19 (>= 0.11.19)
+    ruby_core_source (0.1.5)
+      archive-tar-minitar (>= 0.5.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   dbf!
-  rspec (= 2.6.0)
+  rspec (~> 2.6.0)
+  ruby-debug19

data/README.md

@@ -11,7 +11,7 @@ database files
 
 ## Compatibility
 
-DBF works with Ruby 1.8.6, 1.8.7, and 1.9.2
+DBF is tested to work with MRI Ruby 1.8.6, 1.8.7, 1.9.2 and Jruby 1.6.2
 
 ## Installation
   
@@ -19,7 +19,7 @@ DBF works with Ruby 1.8.6, 1.8.7, and 1.9.2
   
 ## Basic Usage
 
-Load a DBF file:
+Open a DBF file:
 
     require 'dbf'
 
@@ -32,7 +32,7 @@ Enumerate all records
       puts record.email
     end
     
-Load a single record using <tt>find</tt>
+Find a single record
 
     widget.find(6)
 
@@ -69,11 +69,14 @@ An example of migrating a DBF book table to ActiveRecord using a migration:
 
     require 'dbf'
 
+    class Book < ActiveRecord::Base; end
+    
     class CreateBooks < ActiveRecord::Migration
       def self.up
         table = DBF::Table.new('db/dbf/books.dbf')
         eval(table.schema)
-
+        
+        Book.reset_column_information
         table.each do |record|
           Book.create(record.attributes)
         end
@@ -95,6 +98,14 @@ A small command-line utility called dbf is installed along with the gem.
       -a = create an ActiveRecord::Schema
       -c = create a csv file
       
+Create an executable ActiveRecord schema:
+    
+    dbf -a books.dbf > books_schema.rb
+    
+Dump all records to a CSV file:
+
+    dbf -c books.dbf
+      
 ## dBase version support
 
 The basic dBase data types are generally supported well. Support for the
@@ -111,7 +122,6 @@ for a full list of supported column types.
 
 * DBF is read-only
 * Index files are not utilized
-* No character set conversions from the code page defined in the dBase file
 
 ## License
 

data/lib/dbf.rb

@@ -1,5 +1,6 @@
 require 'date'
 
+require 'yaml'
 require 'csv'
 if CSV.const_defined? :Reader
   require 'fastercsv'

data/lib/dbf/table.rb

@@ -2,8 +2,6 @@ module DBF
 
   # DBF::Table is the primary interface to a single DBF file and provides
   # methods for enumerating and searching the records.
-
-  # TODO set record_length to length of actual used column lengths
   class Table
     include Enumerable
 
@@ -60,8 +58,8 @@ module DBF
     # @param [Fixnum] index
     # @return [DBF::Record, NilClass]
     def record(index)
-      seek_to_record(index)
-      current_record
+      seek(index * @record_length)
+      deleted_record? ? nil : DBF::Record.new(@data.read(@record_length), columns, version, @memo)
     end
 
     alias_method :row, :record
@@ -196,10 +194,6 @@ module DBF
       @data.read(1).unpack('a') == ['*']
     end
 
-    def current_record #nodoc
-      deleted_record? ? nil : DBF::Record.new(@data.read(@record_length), columns, version, @memo)
-    end
-
     def get_header_info #nodoc
       @data.rewind
       @version, @record_count, @header_length, @record_length, encoding_key =
@@ -211,10 +205,6 @@ module DBF
       @data.seek @header_length + offset
     end
 
-    def seek_to_record(index) #nodoc
-      seek index * @record_length
-    end
-
     def csv_class #nodoc
       CSV.const_defined?(:Reader) ? FCSV : CSV
     end
@@ -224,7 +214,7 @@ module DBF
     end
 
     def self.encodings
-      @encodings ||= YAML.load_file(File.expand_path("../encodings.yml", __FILE__))
+      @encodings ||= YAML.load File.read(File.expand_path("../encodings.yml", __FILE__))
     end
   end
 

data/lib/dbf/version.rb

@@ -1,3 +1,3 @@
 module DBF
-  VERSION = '1.6.0'
+  VERSION = '1.6.1'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dbf
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 1
   - 6
-  - 0
-  version: 1.6.0
+  - 1
+  version: 1.6.1
 platform: ruby
 authors: 
 - Keith Morrison
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-02 00:00:00 Z
+date: 2011-09-28 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: fastercsv
@@ -23,7 +23,7 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
         hash: 11
         segments: 
@@ -39,7 +39,7 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
         hash: 23
         segments: 
@@ -49,6 +49,20 @@ dependencies:
         version: 2.6.0
   type: :development
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: ruby-debug
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id003
 description: A small fast library for reading dBase, xBase, Clipper and FoxPro database files.
 email: keithm@infused.org
 executables: