dbf 2.0.10 → 2.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c8808826478c973095384cbe5b0f86e94f96ed8
-  data.tar.gz: 0ccf185436e3753f2bc08cb7211d1dea19e4b438
+  metadata.gz: 8aee45603d7f53ed73d7a1a6068f823330c1770a
+  data.tar.gz: 1478ad383f4b9b568d27ea315f16ac73690e3962
 SHA512:
-  metadata.gz: 9cda0f53ddb72957e83d63504b0d0a58227b05f07623b057cacce2d5325203ebb3419ce8524a82d2ef59b5d5a2dd5a35edcc5f4f5e9cc1bee7e3186b2565a0ae
-  data.tar.gz: 965eaaf92b0274c7e88b88e5c31c02387f95dd9810b25a65b2e41c756e615850e1ad6778265e6aa343b4c189caa040e5610672419337a874693f9cdf3c296af5
+  metadata.gz: 1d2bdc66cdfc536d6f0f1881dd0bf26f883521357b775ca847ffff09f1b8d7fa0f7e8a1fcc78cef4bb97067e57969f9730c9bb2de87b1c67d9e984184899f87b
+  data.tar.gz: 055e8f333772efc02e22556a225094cb2e1368f77cffac249c6b660fd2304c0ca5b838c86cb2994a3408eb03313bb253e686610acabe15586e23fa304a4a83e4

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 2.0.11
+  - Foxpro doubles should always return the full stored precision
+    (see https://github.com/infused/dbf/pull/69)
+
 # 2.0.10
   - allow 0 length fields, but always return nil as value
 

data/Gemfile.lock

@@ -1,22 +1,21 @@
 PATH
   remote: .
   specs:
-    dbf (2.0.9)
+    dbf (2.0.10)
       fastercsv (~> 1.5)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    celluloid (0.16.0)
-      timers (~> 4.0.0)
     coderay (1.1.0)
     diff-lcs (1.2.5)
     fastercsv (1.5.5)
-    ffi (1.9.8)
+    ffi (1.9.10)
+    ffi (1.9.10-java)
     formatador (0.2.5)
-    guard (2.12.5)
+    guard (2.13.0)
       formatador (>= 0.2.4)
-      listen (~> 2.7)
+      listen (>= 2.7, <= 4.0)
       lumberjack (~> 1.0)
       nenv (~> 0.1)
       notiffany (~> 0.0)
@@ -24,48 +23,52 @@ GEM
       shellany (~> 0.0)
       thor (>= 0.18.1)
     guard-compat (1.2.1)
-    guard-rspec (4.5.0)
+    guard-rspec (4.6.4)
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
-    hitimes (1.2.2)
-    listen (2.10.0)
-      celluloid (~> 0.16.0)
+    listen (3.0.3)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
     lumberjack (1.0.9)
     method_source (0.8.2)
     nenv (0.2.0)
-    notiffany (0.0.6)
+    notiffany (0.0.7)
       nenv (~> 0.1)
       shellany (~> 0.0)
     pry (0.10.1)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    rb-fsevent (0.9.4)
+    pry (0.10.1-java)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+      spoon (~> 0.0)
+    rb-fsevent (0.9.5)
     rb-inotify (0.9.5)
       ffi (>= 0.5.0)
-    rspec (3.2.0)
-      rspec-core (~> 3.2.0)
-      rspec-expectations (~> 3.2.0)
-      rspec-mocks (~> 3.2.0)
-    rspec-core (3.2.3)
-      rspec-support (~> 3.2.0)
-    rspec-expectations (3.2.1)
+    rspec (3.3.0)
+      rspec-core (~> 3.3.0)
+      rspec-expectations (~> 3.3.0)
+      rspec-mocks (~> 3.3.0)
+    rspec-core (3.3.2)
+      rspec-support (~> 3.3.0)
+    rspec-expectations (3.3.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.2.0)
-    rspec-mocks (3.2.1)
+      rspec-support (~> 3.3.0)
+    rspec-mocks (3.3.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.2.0)
-    rspec-support (3.2.2)
+      rspec-support (~> 3.3.0)
+    rspec-support (3.3.0)
     shellany (0.0.1)
     slop (3.6.0)
+    spoon (0.0.4)
+      ffi
     thor (0.19.1)
-    timers (4.0.1)
-      hitimes
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES

data/lib/dbf/column/base.rb

@@ -24,13 +24,8 @@ module DBF
         @version = table.version
         @encoding = table.encoding
 
-        unless length >= 0
-          raise LengthError, 'field length must be 0 or greater'
-        end
-
-        if @name.empty?
-          raise NameError, 'column name cannot be empty'
-        end
+        validate_length
+        validate_name
       end
 
       # Cast value to native type
@@ -40,17 +35,8 @@ module DBF
       def type_cast(value)
         return nil if length == 0
 
-        case type
-          when 'N' then unpack_number(value)
-          when 'I' then unpack_unsigned_long(value)
-          when 'F' then value.to_f
-          when 'Y' then (unpack_unsigned_long(value) / 10000.0).to_f
-          when 'D' then decode_date(value)
-          when 'T' then decode_datetime(value)
-          when 'L' then boolean(value)
-          when 'M' then decode_memo(value)
-          else          encode_string(value.to_s).strip
-        end
+        meth = type_cast_methods[type]
+        meth ? send(meth, value) : encode_string(value, true)
       end
 
       # Returns true if the column is a memo
@@ -75,95 +61,135 @@ module DBF
       # @return [String]
       def underscored_name
         @underscored_name ||= begin
-          name.gsub(/::/, '/').
-            gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
-            gsub(/([a-z\d])([A-Z])/,'\1_\2').
-            tr('-', '_').
-            downcase
+          un = name.dup
+          un.gsub!(/::/, '/')
+          un.gsub!(/([A-Z]+)([A-Z][a-z])/, '\1_\2')
+          un.gsub!(/([a-z\d])([A-Z])/, '\1_\2')
+          un.tr!('-', '_')
+          un.downcase!
+          un
         end
       end
 
       private
 
-      def decode_date(value) #nodoc
+      def type_cast_methods # nodoc
+        {
+          'N' => :unpack_number,
+          'I' => :unpack_unsigned_long,
+          'F' => :unpack_float,
+          'Y' => :unpack_currency,
+          'D' => :decode_date,
+          'T' => :decode_datetime,
+          'L' => :boolean,
+          'M' => :decode_memo,
+          'B' => :unpack_double
+        }
+      end
+
+      def decode_date(value) # nodoc
         value.gsub!(' ', '0')
         value !~ /\S/ ? nil : Date.parse(value)
       rescue
         nil
       end
 
-      def decode_datetime(value) #nodoc
+      def decode_datetime(value) # nodoc
         days, msecs = value.unpack('l2')
         secs = (msecs / 1000).to_i
-        DateTime.jd(days, (secs/3600).to_i, (secs/60).to_i % 60, secs % 60)
+        DateTime.jd(days, (secs / 3600).to_i, (secs / 60).to_i % 60, secs % 60)
       rescue
         nil
       end
 
-      def decode_memo(value) #nodoc
+      def decode_memo(value) # nodoc
         value && encode_string(value)
       end
 
-      def unpack_number(value) #nodoc
+      def unpack_number(value) # nodoc
         decimal.zero? ? value.to_i : value.to_f
       end
 
-      def unpack_unsigned_long(value) #nodoc
+      def unpack_currency(value) # nodoc
+        (unpack_unsigned_long(value) / 10_000.0).to_f
+      end
+
+      def unpack_unsigned_long(value) # nodoc
         value.unpack('V')[0]
       end
 
-      def boolean(value) #nodoc
+      def unpack_float(value) # nodoc
+        value.to_f
+      end
+
+      def unpack_double(value) # nodoc
+        value.unpack('E')[0]
+      end
+
+      def boolean(value) # nodoc
         value.strip =~ /^(y|t)$/i ? true : false
       end
 
-      def encode_string(value) #nodoc
-        if @encoding && table.supports_encoding?
-          if table.supports_string_encoding?
-            value.force_encoding(@encoding).encode(*encoding_args)
-          elsif table.supports_iconv?
-            Iconv.conv('UTF-8', @encoding, value)
+      def encode_string(value, strip_output = false) # nodoc
+        output =
+          if supports_encoding? && table.supports_string_encoding?
+            value.to_s.force_encoding(@encoding).encode(*encoding_args)
+          elsif supports_encoding? && table.supports_iconv?
+            Iconv.conv('UTF-8', @encoding, value.to_s)
+          else
+            value
           end
-        else
-          value
-        end
+
+        strip_output ? output.strip : output
       end
 
-      def encoding_args #nodoc
+      def encoding_args # nodoc
         [Encoding.default_external, {:undef => :replace, :invalid => :replace}]
       end
 
-      def schema_data_type #nodoc
+      def schema_data_type # nodoc
         case type
-        when "N", "F"
-          decimal > 0 ? ":float" : ":integer"
-        when "I"
-          ":integer"
-        when "Y"
-          ":decimal, :precision => 15, :scale => 4"
-        when "D"
-          ":date"
-        when "T"
-          ":datetime"
-        when "L"
-          ":boolean"
-        when "M"
-          ":text"
-        when "B"
+        when 'N', 'F'
+          decimal > 0 ? ':float' : ':integer'
+        when 'I'
+          ':integer'
+        when 'Y'
+          ':decimal, :precision => 15, :scale => 4'
+        when 'D'
+          ':date'
+        when 'T'
+          ':datetime'
+        when 'L'
+          ':boolean'
+        when 'M'
+          ':text'
+        when 'B'
           if DBF::Table::FOXPRO_VERSIONS.keys.include?(@version)
-            decimal > 0 ? ":float" : ":integer"
+            ':float'
           else
-            ":text"
+            ':text'
           end
         else
           ":string, :limit => #{length}"
         end
       end
 
-      def clean(value) #nodoc
+      def clean(value) # nodoc
         truncated_value = value.strip.partition("\x00").first
         truncated_value.gsub(/[^\x20-\x7E]/, '')
       end
 
+      def validate_length
+        raise LengthError, 'field length must be 0 or greater' if length < 0
+      end
+
+      def validate_name
+        raise NameError, 'column name cannot be empty' if @name.empty?
+      end
+
+      def supports_encoding?
+        @encoding && table.supports_encoding?
+      end
     end
   end
 end

data/lib/dbf/column/foxpro.rb

@@ -1,7 +1,7 @@
 module DBF
   module Column
     class Foxpro < Base
-      # def unpack_binary(value) #nodoc
+      # def unpack_binary(value) # nodoc
       #   value.unpack('d')[0]
       # end
     end

data/lib/dbf/database/foxpro.rb

@@ -1,12 +1,13 @@
 module DBF
-  # DBF::Database::Foxpro is the primary interface to a Visual Foxpro database container (.dbc file).
-  # When using this database container, long fieldnames are supported, and you can reference tables
-  # directly instead of instantiating Table objects yourself.
-  # Table references are created based on the filename, but it this class tries to correct the
-  # table filenames because they could be wrong for case sensitive filesystems, e.g. when
-  # a foxpro database is uploaded to a linux server.
+  # DBF::Database::Foxpro is the primary interface to a Visual Foxpro database
+  # container (.dbc file). When using this database container, long fieldnames
+  # are supported, and you can reference tables directly instead of
+  # instantiating Table objects yourself.
+  # Table references are created based on the filename, but it this class
+  # tries to correct the table filenames because they could be wrong for
+  # case sensitive filesystems, e.g. when a foxpro database is uploaded to
+  # a linux server.
   module Database
-
     class Foxpro
       # Opens a DBF::Database::Foxpro
       # Examples:
@@ -16,15 +17,13 @@ module DBF
       #  # Calling a table
       #  contacts = db.contacts.record(0)
       def initialize(path)
-        begin
-          @path = path
-          @dirname = File.dirname(@path)
-          @db = DBF::Table.new(@path)
-          @tables = extract_dbc_data
-
-        rescue Errno::ENOENT
-          raise DBF::FileNotFoundError.new("file not found: #{data}")
-        end
+        @path = path
+        @dirname = File.dirname(@path)
+        @db = DBF::Table.new(@path)
+        @tables = extract_dbc_data
+
+      rescue Errno::ENOENT
+        raise DBF::FileNotFoundError, "file not found: #{data}"
       end
 
       def table_names
@@ -49,14 +48,14 @@ module DBF
         path = Dir.glob(glob).find { |match| match.downcase == example.downcase }
 
         unless path && File.exist?(path)
-          raise DBF::FileNotFoundError.new("related table not found: #{name}")
+          raise DBF::FileNotFoundError, "related table not found: #{name}"
         end
 
         path
       end
 
       def method_missing(method, *args) # nodoc
-        if index = table_names.index(method.to_s)
+        if table_names.index(method.to_s)
           table method.to_s
         else
           super
@@ -65,9 +64,10 @@ module DBF
 
       private
 
-      # This method extracts the data from the database container. This is just an ordinary table
-      # with a treelike structure. Field definitions are in the same order as in the linked tables
-      # but only the long name is provided.
+      # This method extracts the data from the database container. This is
+      # just an ordinary table with a treelike structure. Field definitions
+      # are in the same order as in the linked tables but only the long name
+      # is provided.
       def extract_dbc_data # nodoc
         data = {}
         @db.each do |record|
@@ -76,18 +76,36 @@ module DBF
           case record.objecttype
           when 'Table'
             # This is a related table
-            data[record.objectid] = {:name => record.objectname, :fields => []}
+            process_table record, data
           when 'Field'
             # This is a related field. The parentid points to the table object.
             # Create using the parentid if the parentid is still unknown.
-            data[record.parentid] ||= {:name => "UNKNOWN", :fields => []}
-            data[record.parentid][:fields] << record.objectname
+            process_field record, data
           end
         end
 
-        Hash[data.values.map {|v| [v[:name], v[:fields]] }]
+        Hash[
+          data.values.map { |v| [v[:name], v[:fields]] }
+        ]
+      end
+
+      def process_table(record, data)
+        id = record.objectid
+        name = record.objectname
+        data[id] = table_field_hash(name)
       end
 
+      def process_field(record, data)
+        id = record.parentid
+        name = 'UNKNOWN'
+        field = record.objectname
+        data[id] ||= table_field_hash(name)
+        data[id][:fields] << field
+      end
+
+      def table_field_hash(name)
+        {:name => name, :fields => []}
+      end
     end
 
     class Table < DBF::Table
@@ -102,7 +120,6 @@ module DBF
           long_name = long_names[columns.index(column)]
           column_class.new(self, long_name, column.type, column.length, column.decimal)
         end
-
       end
     end
   end