dbf 3.0.3 → 3.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7fcab794d4aecd4f5e77cfd92906d883668cf7dd
-  data.tar.gz: d5ccc39ccfd37f5b6c539b4185f52769c0b6382e
+  metadata.gz: 8a9691bee280ae2d7df25c7f2fb328a8ac15d9dd
+  data.tar.gz: c93cc164e9b0749baa2b700a4f322d4ae7c0242a
 SHA512:
-  metadata.gz: f3cddf7e897fa59cb4560b452eddd89f196f574e827383d8470d79a9e5448356acc59764de27a6257f4f6efd5b3334f69e6a2c263b24c5ba27472e2d30baf71b
-  data.tar.gz: 3577e03cd8f8327dd60aadcb8c124e102d26f755c82588d5020df09fa3e1bc666c3b59e88069d70309753d42c250ad60a279f114a9bf8fcf5973d618e39817c8
+  metadata.gz: f0870b61e88a071d6d0d5cb8cec8036fad9566f00820ae5186298507598c6f4cd1f563dcd0d56f46e501fa392b8f33225915008cd0a9a0ba5eace029e9092926
+  data.tar.gz: aa88664313b12814de6590430b129f4414a9b967119b21a40537ed9a1b53698f2d04c0a5083ed7c50c1ce35fc8d8995cc055c9da46523197192e35375332134e

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 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/README.md

@@ -166,6 +166,32 @@ class CreateBooks < ActiveRecord::Migration
 end
 ```
 
+## Migrating to Sequel
+
+An example of migrating a DBF book table to Sequel using a migration:
+
+```ruby
+require 'dbf'
+
+class Book < Sequel::Model; end
+
+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
+```
+
 ## Command-line utility
 
 A small command-line utility called dbf is installed along with the gem.
@@ -173,14 +199,20 @@ A small command-line utility called dbf is installed along with the gem.
     $ dbf -h
     usage: dbf [-h|-s|-a] filename
       -h = print this message
+      -v = print the version number
       -s = print summary information
       -a = create an ActiveRecord::Schema
+      -r = create a Sequel Migration
       -c = create a csv file
 
 Create an executable ActiveRecord schema:
 
     dbf -a books.dbf > books_schema.rb
 
+Create an executable Sequel schema:
+
+    dbf -r books.dbf > migrate/001_create_books.rb
+
 Dump all records to a CSV file:
 
     dbf -c books.dbf > books.csv

data/bin/dbf

@@ -3,22 +3,34 @@
 require 'dbf'
 require 'optparse'
 
-params = ARGV.getopts('h', 's', 'a', 'c')
+params = ARGV.getopts('h', 's', 'a', 'c', 'r', 'v')
 
-if params['h'] then
-  puts "usage: #{File.basename(__FILE__)} [-h|-s|-a|-c] filename"
+if params['v'] then
+  puts "dbf version: #{DBF::VERSION}"
+
+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 "  -c = create a csv file"
+  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
 
   # create an ActiveRecord::Schema
   if params['a']
     table = DBF::Table.new filename
-    puts table.schema
+    puts table.schema(:activerecord)
+  end
+
+  # create an Sequel::Migration
+  if params['r']
+    table = DBF::Table.new filename
+    puts table.schema(:sequel)
   end
 
   if params['s']

data/lib/dbf.rb

@@ -3,6 +3,7 @@ require 'date'
 require 'csv'
 require 'json'
 
+require 'dbf/version'
 require 'dbf/schema'
 require 'dbf/record'
 require 'dbf/column_type'

data/lib/dbf/column.rb

@@ -63,6 +63,13 @@ module DBF
       "\"#{underscored_name}\", #{schema_data_type}\n"
     end
 
+    # Sequel Schema definition
+    #
+    # @return [String]
+    def sequel_schema_definition
+      ":#{underscored_name}, #{schema_data_type(:sequel)}\n"
+    end
+
     # Underscored name
     #
     # This is the column name converted to underscore format.
@@ -112,7 +119,7 @@ module DBF
       ]
     end
 
-    def schema_data_type # nodoc
+    def schema_data_type(format = :activerecord) # nodoc
       case type
       when 'N', 'F'
         decimal > 0 ? ':float' : ':integer'
@@ -135,7 +142,11 @@ module DBF
           ':text'
         end
       else
-        ":string, :limit => #{length}"
+        if format == :sequel
+          ":varchar, :size => #{length}"
+        else
+          ":string, :limit => #{length}"
+        end
       end
     end
 

data/lib/dbf/schema.rb

@@ -23,16 +23,16 @@ module DBF
     #
     # @param [Symbol] format Valid options are :activerecord and :json
     # @return [String]
-    def schema(format = :activerecord)
-      supported_formats = [:activerecord, :json]
+    def schema(format = :activerecord, table_only = false)
+      supported_formats = [:activerecord, :json, :sequel]
       if supported_formats.include?(format)
-        send "#{format}_schema"
+        send("#{format}_schema", table_only)
       else
         raise ArgumentError
       end
     end
 
-    def activerecord_schema
+    def activerecord_schema(_table_only = false)
       s = "ActiveRecord::Schema.define do\n"
       s << "  create_table \"#{File.basename(@data.path, '.*')}\" do |t|\n"
       columns.each do |column|
@@ -42,7 +42,21 @@ module DBF
       s
     end
 
-    def json_schema
+    def sequel_schema(table_only = false)
+      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"
+      columns.each do |column|
+        s << "      column #{column.sequel_schema_definition}"
+      end
+      s << "    end\n"
+      s << "  end\n"  unless table_only
+      s << "end\n"  unless table_only
+      s
+    end
+
+    def json_schema(_table_only = false)
       columns.map(&:to_hash).to_json
     end
   end

data/lib/dbf/version.rb

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

data/spec/dbf/table_spec.rb

@@ -56,6 +56,57 @@ RSpec.describe DBF::Table do
     end
   end
 
+  describe '#sequel_schema' do
+    it 'should return a valid Sequel migration by default' do
+      expect(table.sequel_schema).to eq <<-SCHEMA
+Sequel.migration do
+  change do
+     create_table(:dbase_83) do
+      column :id, :integer
+      column :catcount, :integer
+      column :agrpcount, :integer
+      column :pgrpcount, :integer
+      column :order, :integer
+      column :code, :varchar, :size => 50
+      column :name, :varchar, :size => 100
+      column :thumbnail, :varchar, :size => 254
+      column :image, :varchar, :size => 254
+      column :price, :float
+      column :cost, :float
+      column :desc, :text
+      column :weight, :float
+      column :taxable, :boolean
+      column :active, :boolean
+    end
+  end
+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
+      column :id, :integer
+      column :catcount, :integer
+      column :agrpcount, :integer
+      column :pgrpcount, :integer
+      column :order, :integer
+      column :code, :varchar, :size => 50
+      column :name, :varchar, :size => 100
+      column :thumbnail, :varchar, :size => 254
+      column :image, :varchar, :size => 254
+      column :price, :float
+      column :cost, :float
+      column :desc, :text
+      column :weight, :float
+      column :taxable, :boolean
+      column :active, :boolean
+    end
+SCHEMA
+    end
+    
+  end
+
   describe '#json_schema' do
     it 'is valid JSON' do
       expect { JSON.parse(table.json_schema) }.to_not raise_error

metadata

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