dbf 1.5.3 → 1.6.0

data/Gemfile.lock

@@ -1,30 +1,26 @@
 PATH
   remote: .
   specs:
-    dbf (1.5.2)
-      activesupport (~> 3.0.0)
+    dbf (1.6.0)
       fastercsv (= 1.5.4)
-      i18n (~> 0.5.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.0.5)
-    diff-lcs (1.1.2)
+    diff-lcs (1.1.3)
     fastercsv (1.5.4)
-    i18n (0.5.0)
-    rspec (2.5.0)
-      rspec-core (~> 2.5.0)
-      rspec-expectations (~> 2.5.0)
-      rspec-mocks (~> 2.5.0)
-    rspec-core (2.5.1)
-    rspec-expectations (2.5.0)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.4)
+    rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.5.0)
+    rspec-mocks (2.6.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   dbf!
-  rspec (= 2.5.0)
+  rspec (= 2.6.0)

data/README.md

@@ -28,8 +28,8 @@ Load a DBF file:
 Enumerate all records
 
     widgets.each do |record|
-      puts widget.name
-      puts widget.email
+      puts record.name
+      puts record.email
     end
     
 Load a single record using <tt>find</tt>

data/Rakefile

@@ -8,7 +8,7 @@ RSpec::Core::RakeTask.new :spec do |t|
 end
 
 require 'rake'
-require 'rake/rdoctask'
+require 'rdoc/task'
 Rake::RDocTask.new { |rdoc|
   rdoc.rdoc_dir = 'doc'
   rdoc.title    = "DBF - A small fast library for reading dBase, xBase, Clipper and FoxPro database files."

data/lib/dbf.rb

@@ -1,18 +1,11 @@
 require 'date'
-gem 'activesupport'
-require 'active_support/core_ext/object'
-require 'active_support/core_ext/date/conversions'
-require 'active_support/core_ext/time/conversions'
-require 'active_support/core_ext/date_time/conversions'
-require 'active_support/core_ext/string/conversions'
-require 'active_support/core_ext/string/inflections'
-require 'active_support/core_ext/enumerable'
 
 require 'csv'
 if CSV.const_defined? :Reader
   require 'fastercsv'
 end
 
+require 'dbf/util'
 require 'dbf/attributes'
 require 'dbf/record'
 require 'dbf/column'

data/lib/dbf/attributes.rb

@@ -1,6 +1,6 @@
 class Attributes < Hash
   def []=(key, value)
     merge!(key => value)
-    merge!(key.underscore => value)
+    merge!(Util.underscore(key) => value)
   end
 end

data/lib/dbf/column.rb

@@ -48,14 +48,14 @@ module DBF
     end
 
     def underscored_name
-      @underscored_name ||= name.underscore
+      @underscored_name ||= Util.underscore(name)
     end
 
     private
 
     def decode_date(value) #nodoc
       value.gsub!(' ', '0')
-      value.blank? ? nil : value.to_date
+      value !~ /\S/ ? nil : Date.parse(value)
     rescue
       nil
     end

data/lib/dbf/memo.rb

@@ -3,6 +3,10 @@ module DBF
     BLOCK_HEADER_SIZE = 8
     FPT_HEADER_SIZE = 512
     
+    def self.open(filename, version)
+      self.new File.open(filename, 'rb'), version
+    end
+    
     def initialize(data, version)
       @data, @version = data, version
     end

data/lib/dbf/record.rb

@@ -21,7 +21,7 @@ module DBF
     # 
     # @return [Array]
     def to_a
-      @columns.map { |column| attributes[column.name.underscore] }
+      @columns.map { |column| attributes[Util.underscore(column.name)] }
     end
     
     # Do all search parameters match?
@@ -29,7 +29,7 @@ module DBF
     # @param [Hash] options
     # @return [Boolean]
     def match?(options)
-      options.all? {|key, value| attributes[key.to_s.underscore] == value}
+      options.all? {|key, value| attributes[Util.underscore(key.to_s)] == value}
     end
     
     def attributes

data/lib/dbf/table.rb

@@ -173,7 +173,7 @@ module DBF
       %w(fpt FPT dbt DBT).each do |extname|
         filename = path.sub(/#{File.extname(path)[1..-1]}$/, extname)
         if File.exists?(filename)
-          return Memo.new(File.open(filename, 'rb'), version)
+          return Memo.open(filename, version)
         end
       end
       nil
@@ -181,7 +181,7 @@ module DBF
 
     def find_all(options) #nodoc
       map do |record|
-        if record.try(:match?, options)
+        if record.match? options
           yield record if block_given?
           record
         end
@@ -189,7 +189,7 @@ module DBF
     end
 
     def find_first(options) #nodoc
-      detect {|record| record.try(:match?, options)}
+      detect {|record| record.match? options}
     end
 
     def deleted_record? #nodoc

data/lib/dbf/util.rb

@@ -0,0 +1,9 @@
+class Util
+  def self.underscore(string)
+    string.gsub(/::/, '/').
+      gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
+      gsub(/([a-z\d])([A-Z])/,'\1_\2').
+      tr('-', '_').
+      downcase
+  end
+end

data/lib/dbf/version.rb

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

data/spec/dbf/column_spec.rb

@@ -93,7 +93,7 @@ describe DBF::Column do
       
       context 'with valid datetime' do
         it "casts to DateTime" do
-          column.type_cast("Nl%\000\300Z\252\003").should == "2002-10-10T17:04:56+00:00"
+          column.type_cast("Nl%\000\300Z\252\003").should == DateTime.parse("2002-10-10T17:04:56+00:00")
         end
       end
       

data/spec/dbf/file_formats_spec.rb

@@ -3,7 +3,7 @@ require "spec_helper"
 shared_examples_for 'DBF' do
   specify "sum of column lengths should equal record length specified in header plus one" do
     header_record_length = @table.instance_eval {@record_length}
-    sum_of_column_lengths = 1 + @table.columns.sum {|column| column.length}
+    sum_of_column_lengths = @table.columns.inject(1) {|sum, column| sum += column.length}
     
     header_record_length.should == sum_of_column_lengths
   end
@@ -51,7 +51,7 @@ shared_examples_for 'DBF' do
   specify "column attributes should be accessible in underscored form" do
     @table.columns do |column|
       record = @table.records.first
-      record.send(column_name).should == record.send(column_name.underscore)
+      record.send(column_name).should == record.send(Util.underscore(column_name))
     end
   end
   

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dbf
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 15
   prerelease: 
   segments: 
   - 1
-  - 5
-  - 3
-  version: 1.5.3
+  - 6
+  - 0
+  version: 1.6.0
 platform: ruby
 authors: 
 - Keith Morrison
@@ -15,45 +15,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-06 00:00:00 -07:00
-default_executable: 
+date: 2011-09-02 00:00:00 Z
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: activesupport
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        - 0
-        version: 3.0.0
-  type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: i18n
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 0
-        - 5
-        - 0
-        version: 0.5.0
-  type: :runtime
-  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: fastercsv
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -65,23 +32,23 @@ dependencies:
         - 4
         version: 1.5.4
   type: :runtime
-  version_requirements: *id003
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 23
         segments: 
         - 2
-        - 5
+        - 6
         - 0
-        version: 2.5.0
+        version: 2.6.0
   type: :development
-  version_requirements: *id004
+  version_requirements: *id002
 description: A small fast library for reading dBase, xBase, Clipper and FoxPro database files.
 email: keithm@infused.org
 executables: 
@@ -107,6 +74,7 @@ files:
 - lib/dbf/memo.rb
 - lib/dbf/record.rb
 - lib/dbf/table.rb
+- lib/dbf/util.rb
 - lib/dbf/version.rb
 - lib/dbf.rb
 - spec/dbf/column_spec.rb
@@ -126,7 +94,6 @@ files:
 - spec/fixtures/dbase_f5.dbf
 - spec/fixtures/dbase_f5.fpt
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/infused/dbf
 licenses: []
 
@@ -158,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Read xBase files