rbase-ff 0.9 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 43fb9c0a12fadbc618c2447b8a3d9f67e30cc4b0
-  data.tar.gz: 8b9e1657d06949598eb524d32d844c7bf1a0e773
+  metadata.gz: c9eb6abf1497f3b0c96a94d0193e0001d0a2613e
+  data.tar.gz: 14008e5e4c8db6fd58e34c8ab6a33ae4445d4e3f
 SHA512:
-  metadata.gz: 0b6f2fc63244d75a344b963ce63a9b03b1b446db53fc5e72144770a8fd01f855e64c49f8817b62cfa3541b369fe13c3da31f5fd184b7129f4650652fba2c1b75
-  data.tar.gz: 2d540336e920c3e05b286d452afcfbaf07989f66944edb5d3e023186f8396f4b82f0608e0cae12e22c5c2b3725b333d5f2d40d3879aac9c71d24f490fe6f71b6
+  metadata.gz: 56bee3cab28f813a227c009940a7d14cec5f48f67a9969d4a967d86d327bd0b422ff6e100a9b92d4af8a0058ebda490e779c01107bc416353c0e2c7a03026dfa
+  data.tar.gz: 2fff2c4048bb5e3d5cb3a3d432ef124796ef5bbcdbc7cd93a18384db393e77fbba73309ede0960aa941e6b1f69f51a7c1a9ff413631c9f6dde0e523faa7af6c4

data/README.md

@@ -1,10 +1,20 @@
-rbase
-=====
+rbase-ff
+========
 
-rbase gem (working with dbf files) for ruby 1.9.3 (iconv removed, some fixes)
+ChangeLog
+* 2018-04-14 Reading was broken due to relying on offset data in record data, which may be inaccurate.
+* 2018-04-14 No longer necessary to require 'date' separately
+* 2018-04-14 Added [] method to record; you can now do record[:field_name] instead of record.field_name
 
-How to use
-==========
+
+=======
+
+rbase gem (working with dbf files) for ruby 1.9.3+ (iconv removed, some fixes)
+
+I have copied this gem, made some minor changes, and pushed it to rubygems for public installation.  There are many forks of this on github, but no one has bothered to push it to rubygems that I can find.  This version is found on rubygems.org as rbase-ff.  I will continue to maintain this version and keep the rubygems version updated from here.  -- Tom L.
+
+How to write a DBF
+==================
 
 ```ruby
 require 'rubygems'
@@ -25,3 +35,15 @@ RBase::Table.open 'people' do |t|
   t.create name: 'People-4', birthdate: Date.new(2020,1,2), active: true, tax: 8.2
 end
 ```
+
+How to read a DBF
+=================
+
+```ruby
+RBase::Table.open 'people'.each do |record|
+  puts record.name
+  puts record.birthdate
+  puts record.active
+  puts record.tax
+end
+```

data/README.md~

@@ -0,0 +1,52 @@
+rbase-ff
+========
+
+ChangeLog
+* 2018-04-14 Reading was broken due to relying on offset data in record data, which may be inaccurate.
+<<<<<<< HEAD
+* 2018-04-14 No longer necessary to require 'date' separately
+* 2018-04-14 Added [] method to record; you can now do record[:field_name]
+instead of record.field_name
+
+
+=======
+
+>>>>>>> 026944151965b8526adbfb15c064be25f13268fd
+rbase gem (working with dbf files) for ruby 1.9.3+ (iconv removed, some fixes)
+
+I have copied this gem, made some minor changes, and pushed it to rubygems for public installation.  There are many forks of this on github, but no one has bothered to push it to rubygems that I can find.  This version is found on rubygems.org as rbase-ff.  I will continue to maintain this version and keep the rubygems version updated from here.  -- Tom L.
+
+How to write a DBF
+==================
+
+```ruby
+require 'rubygems'
+require "date"
+require "rbase"
+
+RBase.create_table 'people' do |t|
+  t.column :name, :string, :size => 30
+  t.column :birthdate, :date
+  t.column :active, :boolean
+  t.column :tax, :integer, :size => 10, :decimal => 2
+end
+
+RBase::Table.open 'people' do |t|
+  t.create name: 'People-1', birthdate: Date.new(2017,1,2), active: true, tax: 5.2
+  t.create name: 'People-2', birthdate: Date.new(2018,1,2), active: true, tax: 6.2
+  t.create name: 'People-3', birthdate: Date.new(2019,1,2), active: true, tax: 7.2
+  t.create name: 'People-4', birthdate: Date.new(2020,1,2), active: true, tax: 8.2
+end
+```
+
+How to read a DBF
+=================
+
+```ruby
+RBase::Table.open 'people'.each do |record|
+  puts record.name
+  puts record.birthdate
+  puts record.active
+  puts record.tax
+end
+```

data/lib/rbase/builder.rb

@@ -23,7 +23,7 @@ module RBase
   # For documentation on column parameters see RBase::Schema.column documentation.
   #
   def self.create_table(name, options = {})
-    options[:language] ||= LANGUAGE_RUSSIAN_WINDOWS
+    options[:language] ||= LANGUAGE_US_DOS
     
     schema = Schema.new
     yield schema if block_given?

data/lib/rbase/columns.rb

@@ -59,7 +59,7 @@ module RBase
       end
 
       def inspect
-        "#{name}(type=#{type}, size=#{size})"
+        "#{name}(type=#{type}, size=#{size}, offset=#{offset})"
       end
       
       protected

data/lib/rbase/record.rb

@@ -36,7 +36,7 @@ module RBase
   #   puts user.birth_date
   #
   class Record
-    attr_reader :table, :index
+    attr_reader :table, :index, :values_changed
 
     def initialize(table, attributes = {})
       @table = table
@@ -85,7 +85,11 @@ module RBase
       c.instance_variable_set("@data", @data)
       c
     end
-
+    
+    def [](name)
+      get_value(name)
+    end
+    
     def method_missing(sym, *args)
       name = sym.to_s
       if /=$/ =~ name && args.size == 1

data/lib/rbase/table.rb

@@ -191,10 +191,15 @@ module RBase
       @name_to_columns = {}
       column_options = {}
       column_options[:encoding] = options[:encoding] if options[:encoding]
+      offset = 1
+      size = 0
       while true do
+        offset += size
         column_data = @file.read(32)
+        puts ">>#{column_data}<<"
         break if column_data[0, 1] == "\x0d"
-        name, type, offset, size, decimal = *column_data.unpack('@0a11aLCC')
+        name, type, junk, size, decimal = *column_data.unpack('@0a11aLCC')
+        puts "name #{name}, offset #{offset}"
         name = name.strip
         @columns << Columns::Column.column_for(type).new(name, options.merge(:offset => offset, :size => size, :decimal => decimal))
         @name_to_columns[name.upcase.to_sym] = @columns.last

data/lib/rbase.rb

@@ -1,8 +1,5 @@
-require 'rbase/encoder'
-require 'rbase/columns'
-require 'rbase/schema'
-require 'rbase/memo_file'
-require 'rbase/table'
-require 'rbase/record'
-require 'rbase/schema_dumper'
-require 'rbase/builder'
+require 'date' unless defined? Date
+files = Dir.glob('rbase/*.rb')
+files.each do |file|
+  require_relative file
+end

data/rbase.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'rbase-ff'
-  s.version = '0.9'
+  s.version = '0.9.1'
   s.summary = 'Library to create/read/write to XBase databases (*.DBF files)'
   s.require_path = 'lib'
   s.files = Dir.glob('**/*').delete_if { |item| item =~ /^\./ }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbase-ff
 version: !ruby/object:Gem::Version
-  version: '0.9'
+  version: 0.9.1
 platform: ruby
 authors:
 - Maxim Kulkin, Leonardo Augusto Pires, Tom Lahti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-11 00:00:00.000000000 Z
+date: 2018-04-14 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: maxim.kulkin@gmail.com, leonardo.pires@gmail.com, uidzip@gmail.com
@@ -17,6 +17,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - README.md
+- README.md~
 - lib/rbase.rb
 - lib/rbase/builder.rb
 - lib/rbase/columns.rb