dbf 2.0.2 → 2.0.3

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# 2.0.3
+  - set encoding if table encoding is nil
+
 # 2.0.2
   - Allow overriding the character encoding specified in the file
 

data/README.md

@@ -14,8 +14,9 @@ database files
 DBF is tested to work with the following versions of ruby:
 
 * MRI Ruby 1.8.6, 1.8.7, 1.9.1, 1.9.2 and 1.9.3
-* JRuby 1.6.2, 1.6.3, 1.6.4, and 1.6.5
+* JRuby 1.6.x, 1.7.x
 * REE 1.8.6, 1.8.7
+* Rubinius (1.8 mode)
 
 ## Installation
   

data/dbf.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = '>= 1.3.0'
   s.add_dependency 'fastercsv', '~> 1.5.4'
   
-  s.add_development_dependency 'rspec', '~> 2.9.0'
+  s.add_development_dependency 'rspec', '~> 2.11.0'
   s.add_development_dependency 'rake', '~> 0.9.2'
 
   # if RUBY_VERSION.to_f >= 1.9

data/lib/dbf/table.rb

@@ -59,7 +59,7 @@ module DBF
     def initialize(data, memo = nil, encoding = nil)
       @data = open_data(data)
       get_header_info
-      @encoding = encoding if encoding && @encoding
+      @encoding = encoding || @encoding
       @memo = open_memo(data, memo)
     end
     

data/lib/dbf/version.rb

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

data/spec/dbf/column_spec.rb

@@ -106,10 +106,10 @@ describe DBF::Column::Dbase do
       if ruby_supports_mathn?
         context 'when requiring mathn' do
           it "casts to DateTime" do
-            expect do
+            lambda {
               require 'mathn'
               column.type_cast("Nl%\000\300Z\252\003")
-            end.call.should == DateTime.parse("2002-10-10T17:04:56+00:00")
+            }.call.should == DateTime.parse("2002-10-10T17:04:56+00:00")
           end
         end
       end

data/spec/dbf/record_spec.rb

@@ -19,17 +19,22 @@ describe DBF::Record do
       table = DBF::Table.new "#{DB_PATH}/dbase_8b.dbf"
       table.record(9)
     end
-
-    it 'should be false if other does not have attributes' do
-      (record == mock('other')).should be_false
+    
+    describe 'when other does not have attributes' do
+      it 'is false' do
+        (record == mock('other')).should be_false
+      end
     end
 
-    it 'should be true if other attributes match' do
-      attributes = {:x => 1, :y => 2}
-      record.stub!(:attributes).and_return(attributes)
-      other = mock('object', :attributes => attributes)
-      (record == other).should be_true
+    describe 'if other attributes match' do
+      it 'is true' do
+        attributes = {:x => 1, :y => 2}
+        record.stub!(:attributes).and_return(attributes)
+        other = mock('object', :attributes => attributes)
+        (record == other).should be_true
+      end
     end
+    
   end
 
   describe 'column accessors' do

data/spec/dbf/table_spec.rb

@@ -41,7 +41,7 @@ describe DBF::Table do
   end
   
   describe "#schema" do
-    it "should match the test schema fixture" do
+    it "matches the test schema fixture" do
       table = DBF::Table.new "#{DB_PATH}/dbase_83.dbf"
       control_schema = File.read("#{DB_PATH}/dbase_83_schema.txt")
       table.schema.should == control_schema
@@ -56,7 +56,7 @@ describe DBF::Table do
     end
     
     describe 'when no path param passed' do
-      it 'should dump to STDOUT' do
+      it 'writes to STDOUT' do
         begin
           $stdout = StringIO.new
           table.to_csv
@@ -68,7 +68,7 @@ describe DBF::Table do
     end
 
     describe 'when path param passed' do
-      it 'should create custom csv file' do
+      it 'creates a custom csv file' do
         table.to_csv('test.csv')
         File.exists?('test.csv').should be_true
       end
@@ -95,19 +95,19 @@ describe DBF::Table do
     let(:table) { DBF::Table.new "#{DB_PATH}/dbase_83.dbf" }
     
     describe "with index" do
-      it "should return the correct record" do
+      it "returns the correct record" do
         table.find(5).should == table.record(5)
       end
     end
     
     describe 'with array of indexes' do      
-      it "should return the correct records" do
+      it "returns the correct records" do
         table.find([1, 5, 10]).should == [table.record(1), table.record(5), table.record(10)]
       end
     end
     
     describe "with :all" do
-      it "should accept a block" do
+      it "accepts a block" do
         records = []
         table.find(:all, :weight => 0.0) do |record|
           records << record
@@ -115,11 +115,11 @@ describe DBF::Table do
         records.should == table.find(:all, :weight => 0.0)
       end
 
-      it "should return all records if options are empty" do
+      it "returns all records if options are empty" do
         table.find(:all).should == table.to_a
       end
 
-      it "should return matching records when used with options" do
+      it "returns matching records when used with options" do
         table.find(:all, "WEIGHT" => 0.0).should == table.select {|r| r["weight"] == 0.0}
       end
 
@@ -131,36 +131,36 @@ describe DBF::Table do
         table.find(:all, "WEIGHT" => 0.0).should_not be_empty
       end
       
-      it "should match symbolized column names" do
+      it "matches symbolized column names" do
         table.find(:all, :WEIGHT => 0.0).should_not be_empty
       end
       
-      it "should match downcased column names" do
+      it "matches downcased column names" do
         table.find(:all, "weight" => 0.0).should_not be_empty
       end
       
-      it "should match symbolized downcased column names" do
+      it "matches symbolized downcased column names" do
         table.find(:all, :weight => 0.0).should_not be_empty
       end
     end
     
     describe "with :first" do
-      it "should return the first record if options are empty" do
+      it "returns the first record if options are empty" do
         table.find(:first).should == table.record(0)
       end
 
-      it "should return the first matching record when used with options" do
+      it "returns the first matching record when used with options" do
         table.find(:first, "CODE" => "C").should == table.record(5)
       end
 
-      it "should AND multiple search terms" do
+      it "ANDs multiple search terms" do
         table.find(:first, "ID" => 30, "IMAGE" => "graphics/00000001/TBC01.jpg").should be_nil
       end
     end
   end
 
   describe "filename" do
-    it 'should be dbase_03.dbf' do
+    it 'is dbase_03.dbf' do
       table = DBF::Table.new "#{DB_PATH}/dbase_03.dbf"
       table.filename.should == "dbase_03.dbf"
     end
@@ -168,14 +168,14 @@ describe DBF::Table do
   
   describe 'has_memo_file?' do
     describe 'without a memo file' do
-      it 'returns false' do
+      it 'is false' do
         table = DBF::Table.new "#{DB_PATH}/dbase_03.dbf"
         table.has_memo_file?.should be_false
       end
     end
     
     describe 'with a memo file' do
-      it 'returns true' do
+      it 'is true' do
         table = DBF::Table.new "#{DB_PATH}/dbase_30.dbf" 
         table.has_memo_file?.should be_true
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dbf
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-02 00:00:00.000000000 Z
+date: 2012-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastercsv
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.9.0
+        version: 2.11.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.9.0
+        version: 2.11.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement