dbf 2.0.10 → 2.0.11

data/lib/dbf/encodings.rb

@@ -1,63 +1,63 @@
 module DBF
   ENCODINGS = {
-    "01" => "cp437",       # U.S. MS–DOS
-    "02" => "cp850",       # International MS–DOS
-    "03" => "cp1252",      # Windows ANSI
-    "08" => "cp865",       # Danish OEM
-    "09" => "cp437",       # Dutch OEM
-    "0a" => "cp850",       # Dutch OEM*
-    "0b" => "cp437",       # Finnish OEM
-    "0d" => "cp437",       # French OEM
-    "0e" => "cp850",       # French OEM*
-    "0f" => "cp437",       # German OEM
-    "10" => "cp850",       # German OEM*
-    "11" => "cp437",       # Italian OEM
-    "12" => "cp850",       # Italian OEM*
-    "13" => "cp932",       # Japanese Shift-JIS
-    "14" => "cp850",       # Spanish OEM*
-    "15" => "cp437",       # Swedish OEM
-    "16" => "cp850",       # Swedish OEM*
-    "17" => "cp865",       # Norwegian OEM
-    "18" => "cp437",       # Spanish OEM
-    "19" => "cp437",       # English OEM (Britain)
-    "1a" => "cp850",       # English OEM (Britain)*
-    "1b" => "cp437",       # English OEM (U.S.)
-    "1c" => "cp863",       # French OEM (Canada)
-    "1d" => "cp850",       # French OEM*
-    "1f" => "cp852",       # Czech OEM
-    "22" => "cp852",       # Hungarian OEM
-    "23" => "cp852",       # Polish OEM
-    "24" => "cp860",       # Portuguese OEM
-    "25" => "cp850",       # Portuguese OEM*
-    "26" => "cp866",       # Russian OEM
-    "37" => "cp850",       # English OEM (U.S.)*
-    "40" => "cp852",       # Romanian OEM
-    "4d" => "cp936",       # Chinese GBK (PRC)
-    "4e" => "cp949",       # Korean (ANSI/OEM)
-    "4f" => "cp950",       # Chinese Big5 (Taiwan)
-    "50" => "cp874",       # Thai (ANSI/OEM)
-    "57" => "cp1252",      # ANSI
-    "58" => "cp1252",      # Western European ANSI
-    "59" => "cp1252",      # Spanish ANSI
-    "64" => "cp852",       # Eastern European MS–DOS
-    "65" => "cp866",       # Russian MS–DOS
-    "66" => "cp865",       # Nordic MS–DOS
-    "67" => "cp861",       # Icelandic MS–DOS
-    "6a" => "cp737",       # Greek MS–DOS (437G)
-    "6b" => "cp857",       # Turkish MS–DOS
-    "6c" => "cp863",       # French–Canadian MS–DOS
-    "78" => "cp950",       # Taiwan Big 5
-    "79" => "cp949",       # Hangul (Wansung)
-    "7a" => "cp936",       # PRC GBK
-    "7b" => "cp932",       # Japanese Shift-JIS
-    "7c" => "cp874",       # Thai Windows/MS–DOS
-    "86" => "cp737",       # Greek OEM
-    "87" => "cp852",       # Slovenian OEM
-    "88" => "cp857",       # Turkish OEM
-    "c8" => "cp1250",      # Eastern European Windows
-    "c9" => "cp1251",      # Russian Windows
-    "ca" => "cp1254",      # Turkish Windows
-    "cb" => "cp1253",      # Greek Windows
-    "cc" => "cp1257",      # Baltic Windows
+    '01' => 'cp437',       # U.S. MS-DOS
+    '02' => 'cp850',       # International MS-DOS
+    '03' => 'cp1252',      # Windows ANSI
+    '08' => 'cp865',       # Danish OEM
+    '09' => 'cp437',       # Dutch OEM
+    '0a' => 'cp850',       # Dutch OEM*
+    '0b' => 'cp437',       # Finnish OEM
+    '0d' => 'cp437',       # French OEM
+    '0e' => 'cp850',       # French OEM*
+    '0f' => 'cp437',       # German OEM
+    '10' => 'cp850',       # German OEM*
+    '11' => 'cp437',       # Italian OEM
+    '12' => 'cp850',       # Italian OEM*
+    '13' => 'cp932',       # Japanese Shift-JIS
+    '14' => 'cp850',       # Spanish OEM*
+    '15' => 'cp437',       # Swedish OEM
+    '16' => 'cp850',       # Swedish OEM*
+    '17' => 'cp865',       # Norwegian OEM
+    '18' => 'cp437',       # Spanish OEM
+    '19' => 'cp437',       # English OEM (Britain)
+    '1a' => 'cp850',       # English OEM (Britain)*
+    '1b' => 'cp437',       # English OEM (U.S.)
+    '1c' => 'cp863',       # French OEM (Canada)
+    '1d' => 'cp850',       # French OEM*
+    '1f' => 'cp852',       # Czech OEM
+    '22' => 'cp852',       # Hungarian OEM
+    '23' => 'cp852',       # Polish OEM
+    '24' => 'cp860',       # Portuguese OEM
+    '25' => 'cp850',       # Portuguese OEM*
+    '26' => 'cp866',       # Russian OEM
+    '37' => 'cp850',       # English OEM (U.S.)*
+    '40' => 'cp852',       # Romanian OEM
+    '4d' => 'cp936',       # Chinese GBK (PRC)
+    '4e' => 'cp949',       # Korean (ANSI/OEM)
+    '4f' => 'cp950',       # Chinese Big5 (Taiwan)
+    '50' => 'cp874',       # Thai (ANSI/OEM)
+    '57' => 'cp1252',      # ANSI
+    '58' => 'cp1252',      # Western European ANSI
+    '59' => 'cp1252',      # Spanish ANSI
+    '64' => 'cp852',       # Eastern European MS-DOS
+    '65' => 'cp866',       # Russian MS-DOS
+    '66' => 'cp865',       # Nordic MS-DOS
+    '67' => 'cp861',       # Icelandic MS-DOS
+    '6a' => 'cp737',       # Greek MS-DOS (437G)
+    '6b' => 'cp857',       # Turkish MS-DOS
+    '6c' => 'cp863',       # French-Canadian MS-DOS
+    '78' => 'cp950',       # Taiwan Big 5
+    '79' => 'cp949',       # Hangul (Wansung)
+    '7a' => 'cp936',       # PRC GBK
+    '7b' => 'cp932',       # Japanese Shift-JIS
+    '7c' => 'cp874',       # Thai Windows/MS-DOS
+    '86' => 'cp737',       # Greek OEM
+    '87' => 'cp852',       # Slovenian OEM
+    '88' => 'cp857',       # Turkish OEM
+    'c8' => 'cp1250',      # Eastern European Windows
+    'c9' => 'cp1251',      # Russian Windows
+    'ca' => 'cp1254',      # Turkish Windows
+    'cb' => 'cp1253',      # Greek Windows
+    'cc' => 'cp1257',      # Baltic Windows
   }
 end

data/lib/dbf/header.rb

@@ -15,7 +15,7 @@ module DBF
     end
 
     def unpack_header
-      data.unpack("H2 x3 V v2 x17H2")
+      data.unpack('H2 x3 V v2 x17H2')
     end
   end
 end

data/lib/dbf/memo/base.rb

@@ -9,13 +9,13 @@ module DBF
       end
 
       def initialize(data, version)
-        @data, @version = data, version
+        @data = data
+        @version = version
       end
 
       def get(start_block)
-        if start_block > 0
-          build_memo start_block
-        end
+        return nil unless start_block > 0
+        build_memo start_block
       end
 
       def close
@@ -28,15 +28,15 @@ module DBF
 
       private
 
-      def offset(start_block) #nodoc
+      def offset(start_block) # nodoc
         start_block * block_size
       end
 
-      def content_size(memo_size) #nodoc
+      def content_size(memo_size) # nodoc
         (memo_size - block_size) + BLOCK_HEADER_SIZE
       end
 
-      def block_content_size #nodoc
+      def block_content_size # nodoc
         @block_content_size ||= block_size - BLOCK_HEADER_SIZE
       end
 

data/lib/dbf/memo/dbase3.rb

@@ -1,15 +1,16 @@
 module DBF
   module Memo
     class Dbase3 < Base
-      def build_memo(start_block) #nodoc
+      def build_memo(start_block) # nodoc
         @data.seek offset(start_block)
-        memo_string = ""
-        begin
+        memo_string = ''
+        loop do
           block = @data.read(BLOCK_SIZE).gsub(/(\000|\032)/, '')
           memo_string << block
-        end until block.size < BLOCK_SIZE
+          break if block.size < BLOCK_SIZE
+        end
         memo_string
       end
     end
   end
-end
+end

data/lib/dbf/memo/dbase4.rb

@@ -1,9 +1,9 @@
 module DBF
   module Memo
     class Dbase4 < Base
-      def build_memo(start_block) #nodoc
+      def build_memo(start_block) # nodoc
         @data.seek offset(start_block)
-        @data.read(@data.read(BLOCK_HEADER_SIZE).unpack("x4L").first)
+        @data.read(@data.read(BLOCK_HEADER_SIZE).unpack('x4L').first)
       end
     end
   end

data/lib/dbf/memo/foxpro.rb

@@ -3,10 +3,10 @@ module DBF
     class Foxpro < Base
       FPT_HEADER_SIZE = 512
 
-      def build_memo(start_block) #nodoc
+      def build_memo(start_block) # nodoc
         @data.seek offset(start_block)
 
-        memo_type, memo_size, memo_string = @data.read(block_size).unpack("NNa*")
+        memo_type, memo_size, memo_string = @data.read(block_size).unpack('NNa*')
         return nil unless memo_type == 1 && memo_size > 0
 
         if memo_size > block_content_size
@@ -22,7 +22,7 @@ module DBF
 
       private
 
-      def block_size #nodoc
+      def block_size # nodoc
         @block_size ||= begin
           @data.rewind
           @data.read(FPT_HEADER_SIZE).unpack('x6n').first || 0
@@ -30,4 +30,4 @@ module DBF
       end
     end
   end
-end
+end

data/lib/dbf/record.rb

@@ -9,7 +9,9 @@ module DBF
     # @memo [DBF::Memo]
     def initialize(data, columns, version, memo)
       @data = StringIO.new(data)
-      @columns, @version, @memo = columns, version, memo
+      @columns = columns
+      @version = version
+      @memo = memo
     end
 
     # Equality
@@ -24,7 +26,7 @@ module DBF
     #
     # @return [Array]
     def to_a
-      @columns.map {|column| attributes[column.name]}
+      @columns.map { |column| attributes[column.name] }
     end
 
     # Do all search parameters match?
@@ -32,17 +34,17 @@ module DBF
     # @param [Hash] options
     # @return [Boolean]
     def match?(options)
-      options.all? {|key, value| self[key] == value}
+      options.all? { |key, value| self[key] == value }
     end
 
     # Reads attributes by column name
     #
     # @param [String, Symbol] key
-    def [](key)
-      key = key.to_s
-      if attributes.has_key?(key)
+    def [](name)
+      key = name.to_s
+      if attributes.key?(key)
         attributes[key]
-      elsif index = underscored_column_names.index(key)
+      elsif (index = underscored_column_names.index(key))
         attributes[@columns[index].name]
       end
     end
@@ -51,7 +53,8 @@ module DBF
     #
     # @return [Hash]
     def attributes
-      @attributes ||= Hash[@columns.map {|column| [column.name, init_attribute(column)]}]
+      @attributes ||=
+        Hash[@columns.map { |column| [column.name, init_attribute(column)] }]
     end
 
     # Overrides standard Object.respond_to? to return true if a
@@ -69,8 +72,8 @@ module DBF
 
     private
 
-    def method_missing(method, *args) #nodoc
-      if index = underscored_column_names.index(method.to_s)
+    def method_missing(method, *args) # nodoc
+      if (index = underscored_column_names.index(method.to_s))
         attributes[@columns[index].name]
       else
         super
@@ -78,15 +81,15 @@ module DBF
     end
 
     def underscored_column_names # nodoc
-      @underscored_column_names ||= @columns.map {|column| column.underscored_name}
+      @underscored_column_names ||= @columns.map(&:underscored_name)
     end
 
-    def init_attribute(column) #nodoc
+    def init_attribute(column) # nodoc
       value = column.memo? ? memo(column) : unpack_data(column)
       column.type_cast(value)
     end
 
-    def memo(column) #nodoc
+    def memo(column) # nodoc
       if @memo
         @memo.get(memo_start_block(column))
       else
@@ -96,15 +99,14 @@ module DBF
       end
     end
 
-    def memo_start_block(column) #nodoc
+    def memo_start_block(column) # nodoc
       format = 'V' if %w(30 31).include?(@version)
       unpack_data(column, format).to_i
     end
 
-    def unpack_data(column, format=nil) #nodoc
+    def unpack_data(column, format = nil) # nodoc
       format ||= "a#{column.length}"
       @data.read(column.length).unpack(format).first
     end
-
   end
 end

data/lib/dbf/schema.rb

@@ -1,4 +1,5 @@
 module DBF
+  # The Schema module is mixin for the Table class
   module Schema
     # Generate an ActiveRecord::Schema
     #

data/lib/dbf/table.rb

@@ -11,33 +11,33 @@ module DBF
     DBF_HEADER_SIZE = 32
 
     VERSIONS = {
-      "02" => "FoxBase",
-      "03" => "dBase III without memo file",
-      "04" => "dBase IV without memo file",
-      "05" => "dBase V without memo file",
-      "07" => "Visual Objects 1.x",
-      "30" => "Visual FoxPro",
-      "31" => "Visual FoxPro with AutoIncrement field",
-      "43" => "dBASE IV SQL table files, no memo",
-      "63" => "dBASE IV SQL system files, no memo",
-      "7b" => "dBase IV with memo file",
-      "83" => "dBase III with memo file",
-      "87" => "Visual Objects 1.x with memo file",
-      "8b" => "dBase IV with memo file",
-      "8e" => "dBase IV with SQL table",
-      "cb" => "dBASE IV SQL table files, with memo",
-      "f5" => "FoxPro with memo file",
-      "fb" => "FoxPro without memo file"
+      '02' => 'FoxBase',
+      '03' => 'dBase III without memo file',
+      '04' => 'dBase IV without memo file',
+      '05' => 'dBase V without memo file',
+      '07' => 'Visual Objects 1.x',
+      '30' => 'Visual FoxPro',
+      '31' => 'Visual FoxPro with AutoIncrement field',
+      '43' => 'dBASE IV SQL table files, no memo',
+      '63' => 'dBASE IV SQL system files, no memo',
+      '7b' => 'dBase IV with memo file',
+      '83' => 'dBase III with memo file',
+      '87' => 'Visual Objects 1.x with memo file',
+      '8b' => 'dBase IV with memo file',
+      '8e' => 'dBase IV with SQL table',
+      'cb' => 'dBASE IV SQL table files, with memo',
+      'f5' => 'FoxPro with memo file',
+      'fb' => 'FoxPro without memo file'
     }
 
     FOXPRO_VERSIONS = {
-      "30" => "Visual FoxPro",
-      "31" => "Visual FoxPro with AutoIncrement field",
-      "f5" => "FoxPro with memo file",
-      "fb" => "FoxPro without memo file"
+      '30' => 'Visual FoxPro',
+      '31' => 'Visual FoxPro with AutoIncrement field',
+      'f5' => 'FoxPro with memo file',
+      'fb' => 'FoxPro without memo file'
     }
 
-    attr_reader   :header
+    attr_reader :header
     attr_accessor :encoding             # Source encoding (for ex. :cp1251)
 
     # Opens a DBF::Table
@@ -62,16 +62,14 @@ module DBF
     # @param [optional String, StringIO] memo Path to the memo file or a StringIO object
     # @param [optional String, Encoding] encoding Name of the encoding or an Encoding object
     def initialize(data, memo = nil, encoding = nil)
-      begin
-        @data = open_data(data)
-        @data.rewind
-        @header = Header.new(@data.read(DBF_HEADER_SIZE), supports_encoding?)
-        @encoding = encoding || header.encoding
-        @memo = open_memo(data, memo)
-        yield self if block_given?
-      rescue Errno::ENOENT => error
-        raise DBF::FileNotFoundError.new("file not found: #{data}")
-      end
+      @data = open_data(data)
+      @data.rewind
+      @header = Header.new(@data.read(DBF_HEADER_SIZE), supports_encoding?)
+      @encoding = encoding || header.encoding
+      @memo = open_memo(data, memo)
+      yield self if block_given?
+    rescue Errno::ENOENT
+      raise DBF::FileNotFoundError, "file not found: #{data}"
     end
 
     # @return [TrueClass, FalseClass]
@@ -106,7 +104,7 @@ module DBF
     #
     # @yield [nil, DBF::Record]
     def each
-      header.record_count.times {|i| yield record(i)}
+      header.record_count.times { |i| yield record(i) }
     end
 
     # Retrieve a record by index number.
@@ -117,9 +115,8 @@ module DBF
     # @return [DBF::Record, NilClass]
     def record(index)
       seek_to_record(index)
-      if !deleted_record?
-        DBF::Record.new(@data.read(header.record_length), columns, version, @memo)
-      end
+      return nil if deleted_record?
+      DBF::Record.new(@data.read(header.record_length), columns, version, @memo)
     end
 
     alias_method :row, :record
@@ -171,10 +168,11 @@ module DBF
     #   table.find :first, :first_name => "Keith"
     #
     # The <b>command</b> may be a record index, :all, or :first.
-    # <b>options</b> is optional and, if specified, should be a hash where the keys correspond
-    # to column names in the database.  The values will be matched exactly with the value
-    # in the database.  If you specify more than one key, all values must match in order
-    # for the record to be returned.  The equivalent SQL would be "WHERE key1 = 'value1'
+    # <b>options</b> is optional and, if specified, should be a hash where the
+    # keys correspond to column names in the database.  The values will be
+    # matched exactly with the value in the database.  If you specify more
+    # than one key, all values must match in order for the record to be
+    # returned.  The equivalent SQL would be "WHERE key1 = 'value1'
     # AND key2 = 'value2'".
     #
     # @param [Fixnum, Symbol] command
@@ -185,7 +183,7 @@ module DBF
       when Fixnum
         record(command)
       when Array
-        command.map {|i| record(i)}
+        command.map { |i| record(i) }
       when :all
         find_all(options, &block)
       when :first
@@ -204,7 +202,7 @@ module DBF
     #
     # @return [String]
     def column_names
-      columns.map { |column| column.name }
+      columns.map(&:name)
     end
 
     # Is string encoding supported?
@@ -219,7 +217,7 @@ module DBF
       ''.respond_to?(:encoding)
     end
 
-    def supports_iconv? #nodoc
+    def supports_iconv? # nodoc
       require 'iconv'
       true
     rescue
@@ -228,10 +226,10 @@ module DBF
 
     private
 
-    def build_columns #nodoc
+    def build_columns # nodoc
       columns = []
       @data.seek(DBF_HEADER_SIZE)
-      while !["\0", "\r"].include?(first_byte = @data.read(1))
+      until ["\0", "\r"].include?(first_byte = @data.read(1))
         column_data = first_byte + @data.read(DBF_HEADER_SIZE - 1)
         name, type, length, decimal = column_data.unpack('a10 x a x4 C2')
         columns << column_class.new(self, name, type, length, decimal)
@@ -239,55 +237,43 @@ module DBF
       columns
     end
 
-
-    def foxpro? #nodoc
+    def foxpro? # nodoc
       FOXPRO_VERSIONS.keys.include? version
     end
 
-    def column_class #nodoc
+    def column_class # nodoc
       @column_class ||= foxpro? ? Column::Foxpro : Column::Dbase
     end
 
-    def memo_class #nodoc
+    def memo_class # nodoc
       @memo_class ||= if foxpro?
         Memo::Foxpro
       else
-        if version == "83"
-          Memo::Dbase3
-        else
-          Memo::Dbase4
-        end
+        version == '83' ? Memo::Dbase3 : Memo::Dbase4
       end
     end
 
-    def column_count #nodoc
-      @column_count ||= ((header.header_length - DBF_HEADER_SIZE + 1) / DBF_HEADER_SIZE).to_i
-    end
-
-    def open_data(data) #nodoc
+    def open_data(data) # nodoc
       data.is_a?(StringIO) ? data : File.open(data, 'rb')
     end
 
-    def open_memo(data, memo = nil) #nodoc
-      if memo.is_a? StringIO
-        memo_class.new(memo, version)
-      elsif memo
-        memo_class.open(memo, version)
+    def open_memo(data, memo = nil) # nodoc
+      if memo
+        meth = memo.is_a?(StringIO) ? :new : :open
+        memo_class.send(meth, memo, version)
       elsif !data.is_a? StringIO
-        files = Dir.glob(memo_search_path(data))
+        files = Dir.glob(memo_search_path data)
         files.any? ? memo_class.open(files.first, version) : nil
-      else
-        nil
       end
     end
 
-    def memo_search_path(io) #nodoc
+    def memo_search_path(io) # nodoc
       dirname = File.dirname(io)
       basename = File.basename(io, '.*')
       "#{dirname}/#{basename}*.{fpt,FPT,dbt,DBT}"
     end
 
-    def find_all(options) #nodoc
+    def find_all(options) # nodoc
       map do |record|
         if record && record.match?(options)
           yield record if block_given?
@@ -296,25 +282,24 @@ module DBF
       end.compact
     end
 
-    def find_first(options) #nodoc
-      detect {|record| record && record.match?(options)}
+    def find_first(options) # nodoc
+      detect { |record| record && record.match?(options) }
     end
 
-    def deleted_record? #nodoc
+    def deleted_record? # nodoc
       @data.read(1).unpack('a') == ['*']
     end
 
-    def seek(offset) #nodoc
+    def seek(offset) # nodoc
       @data.seek header.header_length + offset
     end
 
-    def seek_to_record(index) #nodoc
+    def seek_to_record(index) # nodoc
       seek(index * header.record_length)
     end
 
-    def csv_class #nodoc
+    def csv_class # nodoc
       @csv_class ||= CSV.const_defined?(:Reader) ? FCSV : CSV
     end
   end
-
 end