dbf 3.1.1 → 3.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a8b06626d3eb46fa746bd21d8b359c099dec90b2
-  data.tar.gz: e1da4bd35cc876d257552581d1d41079d55fc15c
+SHA256:
+  metadata.gz: 2701f07f7f1de7cf433af7589ddab5e0d63d465735e1bf6e3856ab26246cb40b
+  data.tar.gz: 788b16069d991e4a0d56fa776d8a52911d3acbc7c32c583e20651977d1189b63
 SHA512:
-  metadata.gz: 1496225ad7fbbc044287627d2a13196e70614d4adbd7467911b51bd4860ce6e35f86c86713c5ec05dbed19a0c956bad80e2906ea8c6541ffd4f6a26764e73304
-  data.tar.gz: 23f28160bb106378de8e7ffe409ab1db78d31d6c8f380a5a2e21e05f820b48b86030dba346e6d5c461cb292cfbd640c7562ec5a653e29055ea3822166bf97593
+  metadata.gz: 8df157ab067bd42bf9dc2b875630e2fcbaa378292cd480bc638c83a0b5aca4001d9fccbc1ab6604dd940d74837b512ea9f997c0f16c9aaf6d8837c1a5fd38eaa
+  data.tar.gz: cd9f715b341ac1f696ba0f25183af91a64dda196ae6fbe48f81e595aacdffe677eca01826106b933d2c9abf067dfb570fa57c146f7da0695764e83f0fa3996f4

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# 3.1.2
+  - Fix incorrect columns list when StringIO and encoding set
+
 # 3.1.1
   - Use Date.strptime to parse date fields
 

data/Gemfile

@@ -2,9 +2,11 @@ gemspec
 source 'https://rubygems.org'
 
 group :development, :test do
+  gem 'awesome_print'
   gem 'byebug'
-  gem 'rake'
-  gem 'rspec'
   gem 'guard'
   gem 'guard-rspec'
+  gem 'rake'
+  gem 'rubocop'
+  gem 'rspec'
 end

data/Gemfile.lock

@@ -1,20 +1,21 @@
 PATH
   remote: .
   specs:
-    dbf (3.1.1)
+    dbf (3.1.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    byebug (9.0.5)
-    coderay (1.1.0)
-    diff-lcs (1.2.5)
-    ffi (1.9.10)
-    ffi (1.9.10-java)
+    ast (2.3.0)
+    awesome_print (1.8.0)
+    byebug (9.1.0)
+    coderay (1.1.2)
+    diff-lcs (1.3)
+    ffi (1.9.18)
     formatador (0.2.5)
-    guard (2.13.0)
+    guard (2.14.1)
       formatador (>= 0.2.4)
-      listen (>= 2.7, <= 4.0)
+      listen (>= 2.7, < 4.0)
       lumberjack (~> 1.0)
       nenv (~> 0.1)
       notiffany (~> 0.0)
@@ -22,62 +23,71 @@ GEM
       shellany (~> 0.0)
       thor (>= 0.18.1)
     guard-compat (1.2.1)
-    guard-rspec (4.6.4)
+    guard-rspec (4.7.3)
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
-    listen (3.0.5)
-      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.8)
+    listen (3.1.5)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+      ruby_dep (~> 1.2)
+    lumberjack (1.0.12)
+    method_source (0.9.0)
+    nenv (0.3.0)
+    notiffany (0.1.1)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    pry (0.10.3)
+    parallel (1.12.0)
+    parser (2.4.0.2)
+      ast (~> 2.3)
+    powerpack (0.1.1)
+    pry (0.11.3)
       coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    pry (0.10.3-java)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-      spoon (~> 0.0)
-    rake (11.2.2)
-    rb-fsevent (0.9.6)
-    rb-inotify (0.9.5)
-      ffi (>= 0.5.0)
-    rspec (3.4.0)
-      rspec-core (~> 3.4.0)
-      rspec-expectations (~> 3.4.0)
-      rspec-mocks (~> 3.4.0)
-    rspec-core (3.4.1)
-      rspec-support (~> 3.4.0)
-    rspec-expectations (3.4.0)
+      method_source (~> 0.9.0)
+    rainbow (2.2.2)
+      rake
+    rake (12.3.0)
+    rb-fsevent (0.10.2)
+    rb-inotify (0.9.10)
+      ffi (>= 0.5.0, < 2)
+    rspec (3.7.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+    rspec-core (3.7.0)
+      rspec-support (~> 3.7.0)
+    rspec-expectations (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-mocks (3.4.0)
+      rspec-support (~> 3.7.0)
+    rspec-mocks (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-support (3.4.0)
+      rspec-support (~> 3.7.0)
+    rspec-support (3.7.0)
+    rubocop (0.51.0)
+      parallel (~> 1.10)
+      parser (>= 2.3.3.1, < 3.0)
+      powerpack (~> 0.1)
+      rainbow (>= 2.2.2, < 3.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (~> 1.0, >= 1.0.1)
+    ruby-progressbar (1.9.0)
+    ruby_dep (1.5.0)
     shellany (0.0.1)
-    slop (3.6.0)
-    spoon (0.0.4)
-      ffi
-    thor (0.19.1)
+    thor (0.20.0)
+    unicode-display_width (1.3.0)
 
 PLATFORMS
-  java
   ruby
 
 DEPENDENCIES
+  awesome_print
   byebug
   dbf!
   guard
   guard-rspec
   rake
   rspec
+  rubocop
 
 BUNDLED WITH
-   1.13.7
+   1.16.1

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2006-2017 Keith Morrison <keithm@infused.org>
+Copyright (c) 2006-2018 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

@@ -1,8 +1,8 @@
 # DBF
 [![Version](http://img.shields.io/gem/v/dbf.svg?style=flat)](https://rubygems.org/gems/dbf)
 [![Build Status](http://img.shields.io/travis/infused/dbf/master.svg?style=flat)](http://travis-ci.org/infused/dbf)
-[![Code Quality](http://img.shields.io/codeclimate/github/infused/dbf.svg?style=flat)](https://codeclimate.com/github/infused/dbf)
-[![Test Coverage](http://img.shields.io/codeclimate/coverage/github/infused/dbf.svg?style=flat)](https://codeclimate.com/github/infused/dbf)
+[![Code Quality](http://img.shields.io/codeclimate/maintainability/infused/dbf.svg?style=flat)](https://codeclimate.com/github/infused/dbf)
+[![Code Coverage](http://img.shields.io/codeclimate/c/infused/dbf.svg?style=flat)](https://codeclimate.com/github/infused/dbf)
 [![Dependency Status](http://img.shields.io/gemnasium/infused/dbf.svg?style=flat)](https://gemnasium.com/infused/dbf)
 [![Total Downloads](https://img.shields.io/gem/dt/dbf.svg)](https://rubygems.org/gems/dbf/)
 
@@ -22,7 +22,7 @@ NOTE: beginning with version 3 we have dropped support for Ruby 1.8 and 1.9. If
 
 DBF is tested to work with the following versions of Ruby:
 
-* MRI Ruby 2.0.x, 2.1.x, 2.2.x, 2.3.x, 2.4.x
+* MRI Ruby 2.0.x, 2.1.x, 2.2.x, 2.3.x, 2.4.x, 2.5.x
 * JRuby 1.7.x
 
 ## Installation
@@ -272,7 +272,7 @@ for a full list of supported column types.
 
 ## License
 
-Copyright (c) 2006-2017 Keith Morrison <<keithm@infused.org>>
+Copyright (c) 2006-2018 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/Rakefile

@@ -3,16 +3,16 @@ Bundler.setup(:default, :development)
 
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new :spec do |t|
-  t.rspec_opts = %w(--color)
+  t.rspec_opts = %w[--color]
 end
 
 RSpec::Core::RakeTask.new :specdoc do |t|
-  t.rspec_opts = %w(-fl)
+  t.rspec_opts = %w[-fl]
 end
 
 task default: :spec
 
-desc "Open an irb session preloaded with this library"
+desc 'Open an irb session preloaded with this library'
 task :console do
-  sh "irb -rubygems -I lib -r dbf.rb"
+  sh 'irb -rubygems -I lib -r dbf.rb'
 end

data/bin/dbf

@@ -11,16 +11,16 @@ if params['v']
 
 elsif params['h'] then
   puts "usage: #{File.basename(__FILE__)} [-h|-s|-a|-c|-r] filename"
-  puts "  -h = print this message"
-  puts "  -v = print the DBF gem version"
-  puts "  -s = print summary information"
-  puts "  -a = create an ActiveRecord::Schema"
-  puts "  -r = create a Sequel migration"
-  puts "  -c = create a CSV file"
+  puts '  -h = print this message'
+  puts '  -v = print the DBF gem version'
+  puts '  -s = print summary information'
+  puts '  -a = create an ActiveRecord::Schema'
+  puts '  -r = create a Sequel migration'
+  puts '  -c = create a CSV file'
 else
 
   filename = ARGV.shift
-  abort "You must supply a filename on the command line" unless filename
+  abort 'You must supply a filename on the command line' unless filename
 
   # create an ActiveRecord::Schema
   if params['a']
@@ -43,10 +43,10 @@ else
     puts "Records: #{table.record_count}"
 
     puts "\nFields:"
-    puts "Name             Type       Length     Decimal"
-    puts "-" * 78
+    puts 'Name             Type       Length     Decimal'
+    puts '-' * 78
     table.columns.each do |f|
-      puts "%-16s %-10s %-10s %-10s" % [f.name, f.type, f.length, f.decimal]
+      puts '%-16s %-10s %-10s %-10s' % [f.name, f.type, f.length, f.decimal]
     end
   end
 

data/lib/dbf/column.rb

@@ -21,6 +21,7 @@ module DBF
       G: ColumnType::General
     }
     TYPE_CAST_CLASS.default = ColumnType::String
+    TYPE_CAST_CLASS.freeze
 
     # Initialize a new DBF::Column
     #
@@ -81,68 +82,41 @@ module DBF
 
     private
 
-    def clean(value) # nodoc
+    def clean(value) # :nodoc:
       truncated_value = value.strip.partition("\x00").first
       truncated_value.gsub(/[^\x20-\x7E]/, '')
     end
 
-    def encode(value, strip_output = false) # nodoc
-      return value if !value.respond_to?(:encoding)
+    def encode(value, strip_output = false) # :nodoc:
+      return value unless value.respond_to?(:encoding)
 
       output = @encoding ? encode_string(value) : value
       strip_output ? output.strip : output
     end
 
-    def encoding_args # nodoc
+    def encoding_args # :nodoc:
       @encoding_args ||= [
         Encoding.default_external,
         {undef: :replace, invalid: :replace}
       ]
     end
 
-    def encode_string(string) # nodoc
+    def encode_string(string) # :nodoc:
       string.force_encoding(@encoding).encode(*encoding_args)
     end
 
-    def schema_data_type(format = :activerecord) # 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'
-        ':binary'
-      else
-        if format == :sequel
-          ":varchar, :size => #{length}"
-        else
-          ":string, :limit => #{length}"
-        end
-      end
-    end
-
-    def type_cast_class # nodoc
+    def type_cast_class # :nodoc:
       @type_cast_class ||= begin
         klass = @length == 0 ? ColumnType::Nil : TYPE_CAST_CLASS[type.to_sym]
         klass.new(@decimal, @encoding)
       end
     end
 
-    def validate_length # nodoc
+    def validate_length # :nodoc:
       raise LengthError, 'field length must be 0 or greater' if length < 0
     end
 
-    def validate_name # nodoc
+    def validate_name # :nodoc:
       raise NameError, 'column name cannot be empty' if @name.empty?
     end
   end

data/lib/dbf/column_type.rb

@@ -4,7 +4,7 @@ module DBF
       ENCODING_ARGS = [
         Encoding.default_external,
         {undef: :replace, invalid: :replace}
-      ]
+      ].freeze
 
       attr_reader :decimal, :encoding
 

data/lib/dbf/database/foxpro.rb

@@ -21,7 +21,6 @@ module DBF
         @dirname = File.dirname(@path)
         @db = DBF::Table.new(@path)
         @tables = extract_dbc_data
-
       rescue Errno::ENOENT
         raise DBF::FileNotFoundError, "file not found: #{data}"
       end
@@ -33,7 +32,7 @@ module DBF
       # Returns table with given name
       # @return Table
       def table(name)
-        Table.new(table_path name) do |table|
+        Table.new table_path(name) do |table|
           table.long_names = @tables[name]
         end
       end
@@ -53,12 +52,12 @@ module DBF
         path
       end
 
-      def method_missing(method, *args) # nodoc
-        if table_names.index(method.to_s)
-          table method.to_s
-        else
-          super
-        end
+      def method_missing(method, *args) # :nodoc:
+        table_names.index(method.to_s) ? table(method.to_s) : super
+      end
+
+      def respond_to_missing?(method, *)
+        table_names.index(method.to_s) || super
       end
 
       private
@@ -67,7 +66,7 @@ module DBF
       # 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
+      def extract_dbc_data # :nodoc:
         data = {}
         @db.each do |record|
           next unless record
@@ -110,7 +109,7 @@ module DBF
     class Table < DBF::Table
       attr_accessor :long_names
 
-      def build_columns # nodoc
+      def build_columns # :nodoc:
         columns = super
 
         # modify the column definitions to use the long names as the

data/lib/dbf/encodings.rb

@@ -58,6 +58,6 @@ module DBF
     'c9' => 'cp1251',      # Russian Windows
     'ca' => 'cp1254',      # Turkish Windows
     'cb' => 'cp1253',      # Greek Windows
-    'cc' => 'cp1257',      # Baltic Windows
-  }
+    'cc' => 'cp1257'       # Baltic Windows
+  }.freeze
 end

data/lib/dbf/memo/base.rb

@@ -28,19 +28,19 @@ 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
 
-      def block_size #nodoc
+      def block_size # :nodoc:
         BLOCK_SIZE
       end
     end