dbf 1.6.1 → 1.6.2

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## 1.6.2
+  - add Table#filename method
+  - Rakefile now loads gems with bundler
+  - add Table#supports_encoding?
+  - simplify encodings.yml loader
+  - add rake and rdoc as development dependencies
+  - simplify open_memo file search logic
+  - remove unnecessary requires in spec helper
+  - fix cli summary
+
 ## 1.6.1
   - fix YAML issue when using MRI version > 1.9.1
   - remove Table#seek_to_index and Table#current_record private methods

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dbf (1.6.0)
+    dbf (1.6.2)
       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/Rakefile

@@ -1,6 +1,8 @@
 # encoding: utf-8
 
 require 'rubygems'
+require 'bundler/setup';
+Bundler.setup(:default, :development)
 
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new :spec do |t|

data/lib/dbf/encodings.yml

@@ -1,61 +1,61 @@
 # inspired by http://trac.osgeo.org/gdal/ticket/2864
 
-"01": cp437        # U.S. MS–DOS
-"02": cp850        # International MS–DOS
-"03": cp1252       # Windows ANSI
-"08": cp865        # Danish OEM
-"09": cp437        # Dutch OEM
-"0a": cp850        # Dutch OEM*
-"0b": cp437        # Finnish OEM
-"0d": cp437        # French OEM
-"0e": cp850        # French OEM*
-"0f": cp437        # German OEM
-"10": cp850        # German OEM*
-"11": cp437        # Italian OEM
-"12": cp850        # Italian OEM*
-"13": cp932        # Japanese Shift-JIS
-"14": cp850        # Spanish OEM*
-"15": cp437        # Swedish OEM
-"16": cp850        # Swedish OEM*
-"17": cp865        # Norwegian OEM
-"18": cp437        # Spanish OEM
-"19": cp437        # English OEM (Britain)
-"1a": cp850        # English OEM (Britain)*
-"1b": cp437        # English OEM (U.S.)
-"1c": cp863        # French OEM (Canada)
-"1d": cp850        # French OEM*
-"1f": cp852        # Czech OEM
-"22": cp852        # Hungarian OEM
-"23": cp852        # Polish OEM
-"24": cp860        # Portuguese OEM
-"25": cp850        # Portuguese OEM*
-"26": cp866        # Russian OEM
-"37": cp850        # English OEM (U.S.)*
-"40": cp852        # Romanian OEM
-"4d": cp936        # Chinese GBK (PRC)
-"4e": cp949        # Korean (ANSI/OEM)
-"4f": cp950        # Chinese Big5 (Taiwan)
-"50": cp874        # Thai (ANSI/OEM)
-"57": cp1252       # ANSI
-"58": cp1252       # Western European ANSI
-"59": cp1252       # Spanish ANSI
-"64": cp852        # Eastern European MS–DOS
-"65": cp866        # Russian MS–DOS
-"66": cp865        # Nordic MS–DOS
-"67": cp861        # Icelandic MS–DOS
-"6a": cp737        # Greek MS–DOS (437G)
-"6b": cp857        # Turkish MS–DOS
-"6c": cp863        # French–Canadian MS–DOS
-"78": cp950        # Taiwan Big 5
-"79": cp949        # Hangul (Wansung)
-"7a": cp936        # PRC GBK
-"7b": cp932        # Japanese Shift-JIS
-"7c": cp874        # Thai Windows/MS–DOS
-"86": cp737        # Greek OEM
-"87": cp852        # Slovenian OEM
-"88": cp857        # Turkish OEM
-"c8": cp1250       # Eastern European Windows
-"c9": cp1251       # Russian Windows
-"ca": cp1254       # Turkish Windows
-"cb": cp1253       # Greek Windows
-"cc": cp1257       # Baltic Windows
+"01": "cp437"        # U.S. MS–DOS
+"02": "cp850"        # International MS–DOS
+"03": "cp1252"       # Windows ANSI
+"08": "cp865"        # Danish OEM
+"09": "cp437"        # Dutch OEM
+"0a": "cp850"        # Dutch OEM*
+"0b": "cp437"        # Finnish OEM
+"0d": "cp437"        # French OEM
+"0e": "cp850"        # French OEM*
+"0f": "cp437"        # German OEM
+"10": "cp850"        # German OEM*
+"11": "cp437"        # Italian OEM
+"12": "cp850"        # Italian OEM*
+"13": "cp932"        # Japanese Shift-JIS
+"14": "cp850"        # Spanish OEM*
+"15": "cp437"        # Swedish OEM
+"16": "cp850"        # Swedish OEM*
+"17": "cp865"        # Norwegian OEM
+"18": "cp437"        # Spanish OEM
+"19": "cp437"        # English OEM (Britain)
+"1a": "cp850"        # English OEM (Britain)*
+"1b": "cp437"        # English OEM (U.S.)
+"1c": "cp863"        # French OEM (Canada)
+"1d": "cp850"        # French OEM*
+"1f": "cp852"        # Czech OEM
+"22": "cp852"        # Hungarian OEM
+"23": "cp852"        # Polish OEM
+"24": "cp860"        # Portuguese OEM
+"25": "cp850"        # Portuguese OEM*
+"26": "cp866"        # Russian OEM
+"37": "cp850"        # English OEM (U.S.)*
+"40": "cp852"        # Romanian OEM
+"4d": "cp936"        # Chinese GBK (PRC)
+"4e": "cp949"        # Korean (ANSI/OEM)
+"4f": "cp950"        # Chinese Big5 (Taiwan)
+"50": "cp874"        # Thai (ANSI/OEM)
+"57": "cp1252"       # ANSI
+"58": "cp1252"       # Western European ANSI
+"59": "cp1252"       # Spanish ANSI
+"64": "cp852"        # Eastern European MS–DOS
+"65": "cp866"        # Russian MS–DOS
+"66": "cp865"        # Nordic MS–DOS
+"67": "cp861"        # Icelandic MS–DOS
+"6a": "cp737"        # Greek MS–DOS (437G)
+"6b": "cp857"        # Turkish MS–DOS
+"6c": "cp863"        # French–Canadian MS–DOS
+"78": "cp950"        # Taiwan Big 5
+"79": "cp949"        # Hangul (Wansung)
+"7a": "cp936"        # PRC GBK
+"7b": "cp932"        # Japanese Shift-JIS
+"7c": "cp874"        # Thai Windows/MS–DOS
+"86": "cp737"        # Greek OEM
+"87": "cp852"        # Slovenian OEM
+"88": "cp857"        # Turkish OEM
+"c8": "cp1250"       # Eastern European Windows
+"c9": "cp1251"       # Russian Windows
+"ca": "cp1254"       # Turkish Windows
+"cb": "cp1253"       # Greek Windows
+"cc": "cp1257"       # Baltic Windows

data/lib/dbf/memo.rb

@@ -11,6 +11,10 @@ module DBF
       @data, @version = data, version
     end
     
+    def format
+      File.extname(@data.path)        
+    end
+    
     def get(start_block)
       if start_block > 0
         if format_fpt?

data/lib/dbf/table.rb

@@ -36,12 +36,24 @@ module DBF
       get_header_info
       @memo = open_memo(path)
     end
+    
+    def has_memo_file?
+      @memo && memo_file_format
+    end
+    
+    def memo_file_format
+      @memo.format if has_memo_file?
+    end
 
     # Closes the table and memo file
     def close
       @memo && @memo.close
       @data.close
     end
+    
+    def filename
+      File.basename @data.path
+    end
 
     # Calls block once for each record in the table. The record may be nil
     # if the record has been marked as deleted.
@@ -164,17 +176,16 @@ module DBF
         columns
       end
     end
+    
+    def supports_encoding?
+      "".respond_to? :encoding
+    end
 
     private
 
     def open_memo(path) #nodoc
-      %w(fpt FPT dbt DBT).each do |extname|
-        filename = path.sub(/#{File.extname(path)[1..-1]}$/, extname)
-        if File.exists?(filename)
-          return Memo.open(filename, version)
-        end
-      end
-      nil
+      files = Dir.glob("#{File.dirname(path)}/#{File.basename(path, '.*')}*.{fpt,FPT,dbt,DBT}")
+      files.any? ? Memo.open(files.first, version) : nil
     end
 
     def find_all(options) #nodoc
@@ -198,7 +209,7 @@ module DBF
       @data.rewind
       @version, @record_count, @header_length, @record_length, encoding_key =
         @data.read(DBF_HEADER_SIZE).unpack("H2 x3 V v2 x17H2")
-      @encoding = self.class.encodings[encoding_key] if "".respond_to? :encoding
+      @encoding = self.class.encodings[encoding_key] if supports_encoding?
     end
 
     def seek(offset) #nodoc
@@ -214,7 +225,7 @@ module DBF
     end
 
     def self.encodings
-      @encodings ||= YAML.load File.read(File.expand_path("../encodings.yml", __FILE__))
+      @encodings ||= YAML.load_file File.expand_path("../encodings.yml", __FILE__)
     end
   end
 

data/lib/dbf/version.rb

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

data/spec/dbf/record_spec.rb

@@ -47,7 +47,7 @@ describe DBF::Record do
 
     let(:record) { table.find(0) }
     it 'should automatically encodes to default system encoding' do
-      if "".respond_to? :encoding
+      if table.supports_encoding?
         record.name.encoding.should == Encoding.default_external
         record.name.encode("UTF-8").unpack("H4").should == ["d0b0"] # russian a
       end

data/spec/dbf/table_spec.rb

@@ -152,5 +152,14 @@ describe DBF::Table do
     end
   end
 
+  describe "filename" do
+    before do
+      @table = DBF::Table.new "#{DB_PATH}/dbase_03.dbf"
+    end
+    
+    it 'should be dbase_03.dbf' do
+      @table.filename.should == "dbase_03.dbf"
+    end
+  end
 end
 

data/spec/spec_helper.rb

@@ -1,8 +1,6 @@
 $:.unshift(File.dirname(__FILE__) + '/../lib/')
-require 'rubygems'
-require 'rspec'
 require 'dbf'
-require 'fileutils'
+require 'rspec'
 
 DB_PATH = File.dirname(__FILE__) + '/fixtures' unless defined?(DB_PATH)
 

metadata

@@ -1,79 +1,82 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: dbf
-version: !ruby/object:Gem::Version 
-  hash: 13
+version: !ruby/object:Gem::Version
+  version: 1.6.2
   prerelease: 
-  segments: 
-  - 1
-  - 6
-  - 1
-  version: 1.6.1
 platform: ruby
-authors: 
+authors:
 - Keith Morrison
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-09-28 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-10-16 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: fastercsv
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70325670387600 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 1
-        - 5
-        - 4
+      - !ruby/object:Gem::Version
         version: 1.5.4
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70325670387600
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70325670387140 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 2
-        - 6
-        - 0
+      - !ruby/object:Gem::Version
         version: 2.6.0
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: ruby-debug
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70325670387140
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70325670386640 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.2
+  type: :development
+  prerelease: false
+  version_requirements: *70325670386640
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: &70325670386180 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.9.0
+  type: :development
+  prerelease: false
+  version_requirements: *70325670386180
+- !ruby/object:Gem::Dependency
+  name: ruby-debug19
+  requirement: &70325670385780 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-description: A small fast library for reading dBase, xBase, Clipper and FoxPro database files.
+  prerelease: false
+  version_requirements: *70325670385780
+description: A small fast library for reading dBase, xBase, Clipper and FoxPro database
+  files.
 email: keithm@infused.org
-executables: 
+executables:
 - dbf
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.md
 - CHANGELOG.md
 - MIT-LICENSE
-files: 
+files:
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
@@ -110,40 +113,30 @@ files:
 - spec/spec_helper.rb
 homepage: http://github.com/infused/dbf
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --charset=UTF-8
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 27
-      segments: 
-      - 1
-      - 3
-      - 0
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.0
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Read xBase files
-test_files: 
+test_files:
 - spec/dbf/column_spec.rb
 - spec/dbf/file_formats_spec.rb
 - spec/dbf/record_spec.rb