dbf 3.0.4 → 3.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a9691bee280ae2d7df25c7f2fb328a8ac15d9dd
-  data.tar.gz: c93cc164e9b0749baa2b700a4f322d4ae7c0242a
+  metadata.gz: 064632eced72b296864cd94cecd0fe3dfee7cd6a
+  data.tar.gz: 2a6a8328c5d2bef35025cf4543c021ed4e6fb997
 SHA512:
-  metadata.gz: f0870b61e88a071d6d0d5cb8cec8036fad9566f00820ae5186298507598c6f4cd1f563dcd0d56f46e501fa392b8f33225915008cd0a9a0ba5eace029e9092926
-  data.tar.gz: aa88664313b12814de6590430b129f4414a9b967119b21a40537ed9a1b53698f2d04c0a5083ed7c50c1ce35fc8d8995cc055c9da46523197192e35375332134e
+  metadata.gz: 53f5f9819d2136a296f9677f6806d7d63ebc1794fd0dd7230da96db1035f7c9fa8ea5bd70674a029974a120f9e55997ccec17a42991b3ef911f4823d7a92f6d9
+  data.tar.gz: 1909fefeba3bd3dc38a3b8fc96c6bb1a75ac54e750e9b764b6b3bd90eaa43a8bdd138629df3168485553c7932aac09a28e7215a9fb403d45bec0efaf746f6e15

data/CHANGELOG.md

@@ -1,7 +1,9 @@
+# 3.0.5
+  - Override table name for schema output
+
 # 3.0.4
   - Adds -v command-line option to print version
   - Adds -r command-line option to create Sequel migration
-  -
 
 # 3.0.3
   - Uninitialized (N)umbers should return nil

data/Gemfile.lock

@@ -1,13 +1,10 @@
 PATH
   remote: .
   specs:
-    dbf (3.0.1)
-      bindata
 
 GEM
   remote: https://rubygems.org/
   specs:
-    bindata (2.1.0)
     byebug (8.2.0)
     coderay (1.1.0)
     diff-lcs (1.2.5)

data/LICENSE

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

@@ -20,9 +20,9 @@ NOTE: beginning with version 3 we have dropped support for Ruby 1.8 and 1.9. If
 
 ## Compatibility
 
-DBF is tested to work with the following versions of ruby:
+DBF is tested to work with the following versions of Ruby:
 
-* MRI Ruby 2.0.x, 2.1.x, 2.2.x
+* MRI Ruby 2.0.x, 2.1.x, 2.2.x, 2.3.x
 * JRuby head
 
 ## Installation
@@ -41,13 +41,26 @@ gem 'dbf'
 
 ## Basic Usage
 
-Open a DBF file:
+Open a DBF file using a path:
 
 ```ruby
 require 'dbf'
 widgets = DBF::Table.new("widgets.dbf")
 ```
 
+Open a DBF file using an IO object:
+
+```ruby
+data = File.open('widgets.dbf')
+widgets = DBF::Table.new(data)
+```
+
+Open a DBF by passing in raw data (wrap the raw data with a StringIO):
+
+```ruby
+widgets = DBF::Table.new(StringIO.new('raw binary data'))
+```
+
 Enumerate all records
 
 ```ruby
@@ -166,6 +179,13 @@ class CreateBooks < ActiveRecord::Migration
 end
 ```
 
+If you have initalized the DBF::Table with raw data, you will need to set the
+table name manually with:
+
+```ruby
+table.name = 'my_table_name'
+```
+
 ## Migrating to Sequel
 
 An example of migrating a DBF book table to Sequel using a migration:
@@ -179,19 +199,26 @@ Sequel.migration do
   up do
     table = DBF::Table.new('db/dbf/books.dbf')
     eval(table.schema(:sequel, true)) # passing true to limit output to create_table() only
-    
+
     Book.reset_column_information
     table.each do |record|
       Book.create(title: record.title, author: record.author)
     end
   end
-  
+
   down do
     drop_table(:books)
   end
 end
 ```
 
+If you have initalized the DBF::Table with raw data, you will need to set the
+table name manually with:
+
+```ruby
+table.name = 'my_table_name'
+```
+
 ## Command-line utility
 
 A small command-line utility called dbf is installed along with the gem.
@@ -249,7 +276,7 @@ for a full list of supported column types.
 
 ## License
 
-Copyright (c) 2006-2015 Keith Morrison <<keithm@infused.org>>
+Copyright (c) 2006-2016 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/bin/dbf

@@ -1,11 +1,12 @@
 #!/usr/bin/env ruby
 
 require 'dbf'
+require 'dbf/version'
 require 'optparse'
 
 params = ARGV.getopts('h', 's', 'a', 'c', 'r', 'v')
 
-if params['v'] then
+if params['v']
   puts "dbf version: #{DBF::VERSION}"
 
 elsif params['h'] then

data/lib/dbf/schema.rb

@@ -34,7 +34,7 @@ module DBF
 
     def activerecord_schema(_table_only = false)
       s = "ActiveRecord::Schema.define do\n"
-      s << "  create_table \"#{File.basename(@data.path, '.*')}\" do |t|\n"
+      s << "  create_table \"#{name}\" do |t|\n"
       columns.each do |column|
         s << "    t.column #{column.schema_definition}"
       end
@@ -46,7 +46,7 @@ module DBF
       s = ''
       s << "Sequel.migration do\n" unless table_only
       s << "  change do\n " unless table_only
-      s << "    create_table(:#{File.basename(@data.path, '.*')}) do\n"
+      s << "    create_table(:#{name}) do\n"
       columns.each do |column|
         s << "      column #{column.sequel_schema_definition}"
       end

data/lib/dbf/table.rb

@@ -39,6 +39,7 @@ module DBF
 
     attr_reader :header
     attr_accessor :encoding
+    attr_writer :name
 
     # Opens a DBF::Table
     # Examples:
@@ -96,7 +97,12 @@ module DBF
 
     # @return String
     def filename
-      File.basename @data.path
+      File.basename @data.path if @data.respond_to?(:path)
+    end
+
+    # @return String
+    def name
+      @name ||= filename && File.basename(filename, ".*")
     end
 
     # Calls block once for each record in the table. The record may be nil

data/lib/dbf/version.rb

@@ -1,3 +1,3 @@
 module DBF
-  VERSION = '3.0.4'
+  VERSION = '3.0.5'
 end

data/spec/dbf/table_spec.rb

@@ -49,10 +49,25 @@ RSpec.describe DBF::Table do
   end
 
   describe '#schema' do
-    let(:control_schema) { File.read(fixture('dbase_83_schema.txt')) }
+    describe 'when data is IO' do
+      let(:control_schema) { File.read(fixture('dbase_83_schema.txt')) }
 
-    it 'matches the test schema fixture' do
-      expect(table.schema).to eq control_schema
+      it 'matches the test schema fixture' do
+        expect(table.schema).to eq control_schema
+      end
+    end
+
+    describe 'when data is StringIO' do
+      let(:data) { StringIO.new File.read(dbf_path) }
+      let(:memo) { StringIO.new File.read(memo_path) }
+      let(:table) { DBF::Table.new data }
+
+      let(:control_schema) { File.read(fixture('dbase_83_schema.txt')) }
+
+      it 'matches the test schema fixture' do
+        table.name = 'dbase_83'
+        expect(table.schema).to eq control_schema
+      end
     end
   end
 
@@ -82,7 +97,7 @@ Sequel.migration do
 end
 SCHEMA
     end
-    
+
     it 'should return a limited Sequel migration when passed true' do
       expect(table.sequel_schema(true)).to eq <<-SCHEMA
     create_table(:dbase_83) do
@@ -104,7 +119,7 @@ SCHEMA
     end
 SCHEMA
     end
-    
+
   end
 
   describe '#json_schema' do
@@ -248,6 +263,34 @@ SCHEMA
     end
   end
 
+  describe '#name' do
+    describe 'when data is an IO' do
+      it 'defaults to the filename less extension' do
+        expect(table.name).to eq 'dbase_83'
+      end
+
+      it 'is mutable' do
+        table.name = 'database_83'
+        expect(table.name).to eq 'database_83'
+      end
+    end
+
+    describe 'when data is a StringIO' do
+      let(:data) { StringIO.new File.read(dbf_path) }
+      let(:memo) { StringIO.new File.read(memo_path) }
+      let(:table) { DBF::Table.new data }
+
+      it 'is nil' do
+        expect(table.name).to be_nil
+      end
+
+      it 'is mutable' do
+        table.name = 'database_83'
+        expect(table.name).to eq 'database_83'
+      end
+    end
+  end
+
   describe '#has_memo_file?' do
     describe 'without a memo file' do
       let(:table) { DBF::Table.new fixture('dbase_03.dbf') }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dbf
 version: !ruby/object:Gem::Version
-  version: 3.0.4
+  version: 3.0.5
 platform: ruby
 authors:
 - Keith Morrison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-22 00:00:00.000000000 Z
+date: 2016-02-10 00:00:00.000000000 Z
 dependencies: []
 description: A small fast library for reading dBase, xBase, Clipper and FoxPro database
   files.