dbf 2.0.1 → 2.0.2

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# 2.0.2
+  - Allow overriding the character encoding specified in the file
+
 # 2.0.1
   - Add experimental support for character encodings under Ruby 1.8
 

data/lib/dbf/table.rb

@@ -49,11 +49,17 @@ module DBF
     #   # working with a dbf and memo in memory
     #   table = DBF::Table.new StringIO.new(dbf_data), StringIO.new(memo_data)
     #
+    #   # working with a dbf overriding specified in the dbf encoding
+    #   table = DBF::Table.new 'data.dbf', nil, 'cp437'
+    #   table = DBF::Table.new 'data.dbf', 'memo.dbt', Encoding::US_ASCII
+    #
     # @param [String, StringIO] data Path to the dbf file or a StringIO object
     # @param [optional String, StringIO] memo Path to the memo file or a StringIO object
-    def initialize(data, memo = nil)
+    # @param [optional String, Encoding] encoding Name of the encoding or an Encoding object
+    def initialize(data, memo = nil, encoding = nil)
       @data = open_data(data)
       get_header_info
+      @encoding = encoding if encoding && @encoding
       @memo = open_memo(data, memo)
     end
     

data/lib/dbf/version.rb

@@ -1,3 +1,3 @@
 module DBF
-  VERSION = '2.0.1'
+  VERSION = '2.0.2'
 end

data/spec/dbf/record_spec.rb

@@ -52,13 +52,27 @@ describe DBF::Record do
   end
 
   describe 'column data for table' do
-    let(:table) { DBF::Table.new "#{DB_PATH}/cp1251.dbf"}
+    describe 'using specified in dbf encoding' do
+      let(:table) { DBF::Table.new "#{DB_PATH}/cp1251.dbf"}
 
-    let(:record) { table.find(0) }
-    it 'should automatically encodes to default system encoding' do
-      if table.supports_encoding?
-        record.name.encoding.should == Encoding.default_external
-        record.name.encode("UTF-8").unpack("H4").should == ["d0b0"] # russian a
+      let(:record) { table.find(0) }
+      it 'should automatically encodes to default system encoding' do
+        if table.supports_encoding?
+          record.name.encoding.should == Encoding.default_external
+          record.name.encode("UTF-8").unpack("H4").should == ["d0b0"] # russian a
+        end
+      end
+    end
+
+    describe 'overriding specified in dbf encoding' do
+      let(:table) { DBF::Table.new "#{DB_PATH}/cp1251.dbf", nil, 'cp866'}
+
+      let(:record) { table.find(0) }
+      it 'should transcode from manually specified encoding to default system encoding' do
+        if table.supports_encoding?
+          record.name.encoding.should == Encoding.default_external
+          record.name.encode("UTF-8").unpack("H4").should == ["d180"] # russian а encoded in cp1251 and read as if it was encoded in cp866
+        end
       end
     end
   end

metadata

@@ -1,75 +1,75 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: dbf
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 2
-  - 0
-  - 1
-  version: 2.0.1
+version: !ruby/object:Gem::Version
+  version: 2.0.2
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Keith Morrison
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-09-28 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-11-02 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: fastercsv
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        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 
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 9
-        - 0
+      - !ruby/object:Gem::Version
+        version: 1.5.4
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
         version: 2.9.0
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 9
-        - 2
+      - !ruby/object:Gem::Version
+        version: 2.9.0
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
         version: 0.9.2
   type: :development
-  version_requirements: *id003
-description: A small fast library for reading dBase, xBase, Clipper and FoxPro database files.
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.2
+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
@@ -109,39 +109,32 @@ files:
 - spec/rvm_ruby_runner.rb
 - spec/spec_helper.rb
 - dbf.gemspec
-has_rdoc: true
 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 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 3
-      - 0
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.0
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.8.24
 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