dbf 2.0.11 → 2.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8aee45603d7f53ed73d7a1a6068f823330c1770a
-  data.tar.gz: 1478ad383f4b9b568d27ea315f16ac73690e3962
+  metadata.gz: fadab12ca4c3e6f7b7be026f240c816f1905336e
+  data.tar.gz: 2a3ad835ee60fa8be62ecdf901fc16fdc22e7bb3
 SHA512:
-  metadata.gz: 1d2bdc66cdfc536d6f0f1881dd0bf26f883521357b775ca847ffff09f1b8d7fa0f7e8a1fcc78cef4bb97067e57969f9730c9bb2de87b1c67d9e984184899f87b
-  data.tar.gz: 055e8f333772efc02e22556a225094cb2e1368f77cffac249c6b660fd2304c0ca5b838c86cb2994a3408eb03313bb253e686610acabe15586e23fa304a4a83e4
+  metadata.gz: 7460b41c54bcfa6ad7bf1dff4cbd1070a1923b38cc41b87b65a5211fcc0c31e00b1fa1786d40a854f7c42d4b8d1989707ee8777307dda1324c58a14dbcde76b4
+  data.tar.gz: 5dfed269798a64d07509b3cfa6f86f7363b8f9e0b4990d7673d9b1795876c4def3cda1254c7054b5f013bf75c5f75efec7c7af6477c8159c418330620ac0e968

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 2.0.12
+  - Parse (I) values as signed
+    (see https://github.com/infused/dbf/pull/70)
+
 # 2.0.11
   - Foxpro doubles should always return the full stored precision
     (see https://github.com/infused/dbf/pull/69)

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dbf (2.0.10)
+    dbf (2.0.11)
       fastercsv (~> 1.5)
 
 GEM

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2006-2014 Keith Morrison <keithm@infused.org>
+Copyright (c) 2006-2015 Keith Morrison <keithm@infused.org>
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -15,6 +15,7 @@ database files
 * Report bugs: <http://github.com/infused/dbf/issues>
 * Questions: Email <mailto:keithm@infused.org> and put DBF somewhere in the
   subject line
+* Change log: <https://github.com/infused/dbf/blob/master/CHANGELOG.md>
 
 ## Compatibility
 
@@ -180,13 +181,13 @@ Dump all records to a CSV file:
 ## Reading a Visual Foxpro database (v8, v9)
 
 A special Database::Foxpro class is available to read Visual Foxpro container files (.dbc-files). When using this class,
-long fieldnames are supported and tables can be references without using names.
+long field names are supported and tables can be referenced without using names.
 
 ```ruby
 require 'dbf'
 
 contacts = DBF::Database::Foxpro.new('contactdatabase.dbc').contacts
-mycontact = contacts.record(1).spouses_interests
+my_contact = contacts.record(1).spouses_interests
 ```
 
 
@@ -209,7 +210,7 @@ for a full list of supported column types.
 
 ## License
 
-Copyright (c) 2006-2014 Keith Morrison <<keithm@infused.org>>
+Copyright (c) 2006-2015 Keith Morrison <<keithm@infused.org>>
 
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation

data/lib/dbf/column/base.rb

@@ -76,7 +76,7 @@ module DBF
       def type_cast_methods # nodoc
         {
           'N' => :unpack_number,
-          'I' => :unpack_unsigned_long,
+          'I' => :unpack_signed_long,
           'F' => :unpack_float,
           'Y' => :unpack_currency,
           'D' => :decode_date,
@@ -111,11 +111,11 @@ module DBF
       end
 
       def unpack_currency(value) # nodoc
-        (unpack_unsigned_long(value) / 10_000.0).to_f
+        (unpack_signed_long(value) / 10_000.0).to_f
       end
 
-      def unpack_unsigned_long(value) # nodoc
-        value.unpack('V')[0]
+      def unpack_signed_long(value) # nodoc
+        value.unpack('l<')[0]
       end
 
       def unpack_float(value) # nodoc

data/lib/dbf/version.rb

@@ -1,3 +1,3 @@
 module DBF
-  VERSION = '2.0.11'
+  VERSION = '2.0.12'
 end

data/spec/dbf/column_spec.rb

@@ -58,6 +58,13 @@ describe DBF::Column::Dbase do
           expect(column.type_cast(value)).to be_a(Fixnum)
           expect(column.type_cast(value)).to eq 135
         end
+
+        it 'supports negative Fixnum' do
+          value = '-135'
+          column = DBF::Column::Dbase.new table, "ColumnName", "N", 3, 0
+          expect(column.type_cast(value)).to be_a(Fixnum)
+          expect(column.type_cast(value)).to eq -135
+        end
       end
 
       context 'and more than 0 decimals' do
@@ -67,6 +74,13 @@ describe DBF::Column::Dbase do
           expect(column.type_cast(value)).to be_a(Float)
           expect(column.type_cast(value)).to eq 13.5
         end
+
+        it 'supports negative Float' do
+          value = '-13.5'
+          column = DBF::Column::Dbase.new table, "ColumnName", "N", 2, 1
+          expect(column.type_cast(value)).to be_a(Float)
+          expect(column.type_cast(value)).to eq -13.5
+        end
       end
     end
 
@@ -84,6 +98,13 @@ describe DBF::Column::Dbase do
         expect(column.type_cast(value)).to be_a(Float)
         expect(column.type_cast(value)).to eq 135.0
       end
+
+      it 'supports negative Float' do
+        value = '-135'
+        column = DBF::Column::Dbase.new table, "ColumnName", "F", 3, 0
+        expect(column.type_cast(value)).to be_a(Float)
+        expect(column.type_cast(value)).to eq -135.0
+      end
     end
 
     context "with type B (binary)" do
@@ -99,6 +120,12 @@ describe DBF::Column::Dbase do
           expect(column.type_cast("\xEC\x51\xB8\x1E\x85\x6B\x31\x40")).to be_a(Float)
           expect(column.type_cast("\xEC\x51\xB8\x1E\x85\x6B\x31\x40")).to eq 17.42
         end
+
+        it 'supports negative binary' do
+          column = DBF::Column::Dbase.new table, "ColumnName", "B", 1, 2
+          expect(column.type_cast("\x00\x00\x00\x00\x00\xC0\x65\xC0")).to be_a(Float)
+          expect(column.type_cast("\x00\x00\x00\x00\x00\xC0\x65\xC0")).to eq -174.0
+        end
       end
     end
 
@@ -116,6 +143,13 @@ describe DBF::Column::Dbase do
         expect(column.type_cast(value)).to be_a(Fixnum)
         expect(column.type_cast(value)).to eq 96643
       end
+
+      it "supports negative Fixnum" do
+        value = "\x24\xE1\xFF\xFF\xFF\xFF\xFF\xFF"
+        column = DBF::Column::Dbase.new table, "ColumnName", "I", 3, 0
+        expect(column.type_cast(value)).to be_a(Fixnum)
+        expect(column.type_cast(value)).to eq -7900
+      end
     end
 
     context 'with type L (logical/boolean)' do
@@ -234,6 +268,11 @@ describe DBF::Column::Dbase do
       expect(column.type_cast(" \xBF\x02\x00\x00\x00\x00\x00")).to eq 18.0
     end
 
+    it 'supports negative currency' do
+      expect(column.type_cast("\xFC\xF0\xF0\xFE\xFF\xFF\xFF\xFF")).to be_a(Float)
+      expect(column.type_cast("\xFC\xF0\xF0\xFE\xFF\xFF\xFF\xFF")).to eq -1776.41
+    end
+
     context 'and 0 length' do
       it 'returns nil' do
         column = DBF::Column::Dbase.new table, "ColumnName", "Y", 0, 0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dbf
 version: !ruby/object:Gem::Version
-  version: 2.0.11
+  version: 2.0.12
 platform: ruby
 authors:
 - Keith Morrison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-01 00:00:00.000000000 Z
+date: 2015-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastercsv