dbf 2.0.0 → 2.0.1

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# 2.0.1
+  - Add experimental support for character encodings under Ruby 1.8
+
 # 2.0.0
   - #44 Require FasterCSV gem on all platforms
   - Remove rdoc development dependency

data/Gemfile.lock

@@ -1,23 +1,24 @@
 PATH
   remote: .
   specs:
-    dbf (1.7.5)
-      fastercsv (~> 1.5.4)
+    dbf (1.7.4)
 
 GEM
   remote: http://rubygems.org/
   specs:
     diff-lcs (1.1.3)
-    fastercsv (1.5.5)
+    json (1.6.5)
     rake (0.9.2.2)
-    rspec (2.9.0)
-      rspec-core (~> 2.9.0)
-      rspec-expectations (~> 2.9.0)
-      rspec-mocks (~> 2.9.0)
-    rspec-core (2.9.0)
-    rspec-expectations (2.9.1)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.9.0)
+    rdoc (3.12)
+      json (~> 1.4)
+    rspec (2.8.0)
+      rspec-core (~> 2.8.0)
+      rspec-expectations (~> 2.8.0)
+      rspec-mocks (~> 2.8.0)
+    rspec-core (2.8.0)
+    rspec-expectations (2.8.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.8.0)
 
 PLATFORMS
   ruby
@@ -25,4 +26,5 @@ PLATFORMS
 DEPENDENCIES
   dbf!
   rake (~> 0.9.2)
-  rspec (~> 2.9.0)
+  rdoc (~> 3.11)
+  rspec (~> 2.8.0)

data/README.md

@@ -37,16 +37,22 @@ Enumerate all records
     
 Find a single record
 
-    widget.find(6)
+    widget = widgets.find(6)
+    
+Note that find() will return nil if the requested record has been deleted
+and not yet pruned from the database.
+
+The value for a attribute can be accessed via element reference in one of three
+ways
 
-Attributes can also be accessed through the attributes hash or the record
-object using either the original or underscored attribute name. Note that
-find() will return nil if the requested record has been deleted and not yet
-pruned from the database.
+    widget["SlotNumber"]   # original field name in dbf file
+    widget['slot_number']  # underscored field name string
+    widget[:slot_number]   # underscored field name symbol
+    
+Get a hash of all attributes. The keys are the original column names.
 
-    widget.find(4).attributes["SlotNumber"]
-    widget.find(4)["SlotNumber"]
-    widget.find(4)[:slot_number]
+    widgets.attributes
+    => {"Name" => "Thing1", "SlotNumber" => 1}
   
 Search for records using a simple hash format. Multiple search criteria are
 ANDed. Use the block form if the resulting recordset could be large, otherwise
@@ -81,7 +87,7 @@ An example of migrating a DBF book table to ActiveRecord using a migration:
         
         Book.reset_column_information
         table.each do |record|
-          Book.create(record.attributes)
+          Book.create(:title => record.title, :author => record.author)
         end
       end
 

data/lib/dbf/column/base.rb

@@ -96,7 +96,15 @@ module DBF
       end
 
       def encode_string(value) #nodoc
-        @encoding ? value.force_encoding(@encoding).encode(Encoding.default_external, :undef => :replace, :invalid => :replace) : value
+        if @encoding
+          if String.new.respond_to?(:encoding)
+            value.force_encoding(@encoding).encode(Encoding.default_external, :undef => :replace, :invalid => :replace)
+          else
+            Iconv.conv('UTF-8', @encoding, value)
+          end
+        else
+          value
+        end
       end
 
       def schema_data_type #nodoc

data/lib/dbf/table.rb

@@ -209,7 +209,14 @@ module DBF
     end
     
     def supports_encoding?
-      String.new.respond_to? :encoding
+      String.new.respond_to?(:encoding)
+    end
+    
+    def supports_iconv?
+      require 'iconv'
+      true
+    rescue
+      false
     end
     
     def foxpro?
@@ -281,7 +288,7 @@ module DBF
     def get_header_info #nodoc
       @data.rewind
       @version, @record_count, @header_length, @record_length, @encoding_key = read_header
-      @encoding = ENCODINGS[@encoding_key] if supports_encoding?
+      @encoding = ENCODINGS[@encoding_key] if supports_encoding? || supports_iconv?
     end
     
     def read_header #nodoc

data/lib/dbf/version.rb

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

data/spec/dbf/record_spec.rb

@@ -62,4 +62,19 @@ describe DBF::Record do
       end
     end
   end
+  
+  describe '#attributes' do
+    let(:table) { DBF::Table.new "#{DB_PATH}/dbase_8b.dbf"}
+    let(:record) { table.find(0) }
+    
+    it 'is a hash of attribute name/value pairs' do
+      record.attributes.should be_a(Hash)
+      record.attributes['CHARACTER'] == 'One'
+    end
+    
+    it 'has only original field names as keys' do
+      original_field_names = %w(CHARACTER DATE FLOAT LOGICAL MEMO NUMERICAL)
+      record.attributes.keys.sort.should == original_field_names
+    end
+  end
 end

metadata

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