rbase 0.1.2 → 0.1.3

data/Rakefile

@@ -7,11 +7,10 @@ desc 'Create a gem'
 task :gem do
   spec = Gem::Specification.new do |s|
     s.name = 'rbase'
-    s.version = '0.1.2'
+    s.version = '0.1.3'
     s.summary = 'Library to create/read/write to XBase databases (*.DBF files)'
     s.files = Dir.glob('**/*').delete_if { |item| item.include?('.svn') }
     s.require_path = 'lib'
-    s.autorequire = 'rbase'
     s.authors = 'Maxim Kulkin, Leonardo Augusto Pires'
     s.email = 'maxim.kulkin@gmail.com, leonardo.pires@gmail.com'
     s.homepage = 'http://rbase.rubyforge.com/'
@@ -21,6 +20,5 @@ task :gem do
     s.required_ruby_version = '>= 1.8.2'
   end
 
-  Gem.manage_gems
   Gem::Builder.new(spec).build
 end

data/lib/rbase/columns.rb

@@ -1,5 +1,7 @@
 module RBase
   module Columns
+    
+    require 'iconv'
 
     # Base class for all column types
     class Column
@@ -57,6 +59,10 @@ module RBase
       def unpack(value)
         throw "Not implemented"
       end
+
+      def inspect
+        "#{name}(type=#{type}, size=#{size})"
+      end
       
       protected
       
@@ -77,14 +83,27 @@ module RBase
         end
         
         super name, options.merge(:size => size)
+
+        if options[:encoding]
+          @unpack_converter = Iconv.new('utf-8', options[:encoding])
+          @pack_converter = Iconv.new(options[:encoding], 'utf-8')
+        end
       end
       
       def pack(value)
+	value = value.to_s
+        value = @pack_converter.iconv(value) if @pack_converter
         [value].pack("A#{size}")
       end
 
       def unpack(data)
-        data.rstrip
+        value = data.rstrip
+        value = @unpack_converter.iconv(value) if @unpack_converter
+        value
+      end
+
+      def inspect
+        "#{name}(string #{size})"
       end
     end
 
@@ -100,17 +119,33 @@ module RBase
       end
       
       def pack(value)
-        if decimal && decimal!=0
-          [format("%-#{size-decimal-1}.#{decimal}f", value)].pack("A#{size}")
+        if value
+          if float?
+            [format("%#{size-decimal-1}.#{decimal}f", value)].pack("A#{size}")
+          else
+            [format("%#{size}d", value)].pack("A#{size}")
+          end
         else
-          [format("%-#{size}d", value)].pack("A#{size}")
+          " "*size
         end
       end
 
       def unpack(data)
-        return nil if data.rstrip == ''
+        return nil if data.strip == ''
         data.rstrip.to_i
       end
+
+      def inspect
+        if float?
+          "#{name}(decimal)"
+        else
+          "#{name}(integer)"
+        end
+      end
+
+      def float?
+        decimal && decimal != 0
+      end
     end
 
 
@@ -139,6 +174,10 @@ module RBase
           nil
         end
       end
+
+      def inspect
+        "#{name}(boolean)"
+      end
     end
 
 
@@ -157,6 +196,10 @@ module RBase
         return nil if data.rstrip == ''
         Date.new(*data.unpack("a4a2a2").map { |s| s.to_i})
       end
+
+      def inspect
+        "#{name}(date)"
+      end
     end
     
     
@@ -175,6 +218,10 @@ module RBase
       def unpack(data)
         table.memo.read(data.to_i)
       end
+
+      def inspect
+        "#{name}(memo)"
+      end
     end
 
 
@@ -190,12 +237,16 @@ module RBase
       end
 
       def pack(value)
-        [format("%-#{size-decimal-1}.#{decimal}f", value)].pack("A#{size}")
+        [format("%-#{size-decimal-1}.#{decimal}f", value || 0.0)].pack("A#{size}")
       end
 
       def unpack(data)
         data.rstrip.to_f
       end
+
+      def inspect
+        "#{name}(float)"
+      end
     end
 
   end

data/lib/rbase/record.rb

@@ -1,7 +1,8 @@
 module RBase
-  class Error < Exception; end
 
-  class UnknownColumnError < RBase::Error
+  class StandardError < Exception; end
+
+  class UnknownColumnError < StandardError
     attr_reader :name
 
     def initialize(name)
@@ -10,6 +11,15 @@ module RBase
     end
   end
 
+  class InvalidValueError < StandardError
+    attr_reader :column, :value
+
+    def initialize(column, value)
+      super("Invalid value #{value.inspect} for column #{column.inspect}")
+      @column, @value = column, value
+    end
+  end
+
   # Class that contains data for particular table row.
   # Should not be created explicitly (use Table#create to create records)
   #
@@ -68,7 +78,7 @@ module RBase
       @deleted ||= new_record? ? false : @data[0, 1] == '*'
     end
 
-    # Returns cloned copy of current record 
+    # Clone record.
     def clone
       c = self.class.new(@table, @values_changed)
       c.instance_variable_set("@values_cached", @values_cached)
@@ -95,7 +105,12 @@ module RBase
         @data[0, 1] = deleted? ? '*' : ' '
         @values_changed.each do |k, v|
           column = @table.column(k)
-          @data[column.offset, column.size] = column.pack(v)
+          raise UnknownColumnError.new(k) unless column
+          begin
+            @data[column.offset, column.size] = column.pack(v)
+          rescue Object => e
+            raise InvalidValueError.new(column, v)
+          end
           @values_cached[k] = v
         end
       end
@@ -117,6 +132,7 @@ module RBase
     # Sets value of specified column.
     def set_value(name, value)
       name = name.to_s.upcase.to_sym
+      raise UnknownColumnError.new(name) unless @table.column(name)
       @values_changed[name] = value
     end
   end

data/lib/rbase/table.rb

@@ -3,6 +3,8 @@ module RBase
   class Table
     private_class_method :new
 
+    include Enumerable
+
     # Create new XBase table file. Table file name will be equal to name with ".dbf" suffix.
     #
     # Allowed options
@@ -58,9 +60,9 @@ module RBase
 
     # Open table with given name.
     # Table name should be like file name without ".dbf" suffix.
-    def self.open(name)
+    def self.open(name, options = {})
       table = new
-      table.instance_eval { open("#{name}.dbf") }
+      table.instance_eval { open("#{name}.dbf", options) }
       if block_given?
         result = yield table
         table.close
@@ -94,6 +96,16 @@ module RBase
       update_header
     end
 
+    def clear
+      file_end = @record_offset
+      @file.pos = file_end
+      @file.write "\x1a"
+      @file.truncate file_end+1
+
+      self.count = 0
+      update_header
+    end
+
     def close
       @file.close
     end
@@ -158,7 +170,7 @@ module RBase
 
     private
 
-    def open(name)
+    def open(name, options = {})
       @name = File.basename(name, '.dbf')
       @file = File.open(name, "r+b")
       header = @file.read(32)
@@ -177,12 +189,14 @@ module RBase
 
       @columns = []
       @name_to_columns = {}
+      column_options = {}
+      column_options[:encoding] = options[:encoding] if options[:encoding]
       while true do
         column_data = @file.read(32)
         break if column_data[0, 1] == "\x0d"
         name, type, offset, size, decimal = *column_data.unpack('@0a11aLCC')
         name = name.strip
-        @columns << Columns::Column.column_for(type).new(name, :offset => offset, :size => size, :decimal => decimal)
+        @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
       end
 
@@ -196,7 +210,8 @@ module RBase
         @file.pos = @record_offset + @record_size*count
         @file.write record.serialize
         @file.write [26].pack('c')
-        self.count += 1
+        record.instance_variable_set(:@index, count) 
+	self.count += 1
       else
         throw "Index out of bound" if record.index>=count
         @file.pos = @record_offset + @record_size*record.index

metadata

@@ -1,56 +1,64 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.2
-specification_version: 1
 name: rbase
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
-date: 2007-05-30 00:00:00 +04:00
-summary: Library to create/read/write to XBase databases (*.DBF files)
-require_paths: 
-- lib
-email: maxim.kulkin@gmail.com, leonardo.pires@gmail.com
-homepage: http://rbase.rubyforge.com/
-rubyforge_project: rbase
-description: 
-autorequire: rbase
-default_executable: 
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: 1.8.2
-  version: 
+  version: 0.1.3
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - Maxim Kulkin, Leonardo Augusto Pires
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2009-04-28 00:00:00 +04:00
+default_executable: 
+dependencies: []
+
+description: 
+email: maxim.kulkin@gmail.com, leonardo.pires@gmail.com
+executables: []
+
+extensions: []
+
+extra_rdoc_files: []
+
 files: 
-- lib
-- Rakefile
-- lib/rbase
-- lib/rbase.rb
-- lib/rbase/record.rb
-- lib/rbase/columns.rb
-- lib/rbase/schema.rb
 - lib/rbase/builder.rb
-- lib/rbase/table.rb
+- lib/rbase/columns.rb
 - lib/rbase/memo_file.rb
+- lib/rbase/record.rb
+- lib/rbase/schema.rb
 - lib/rbase/schema_dumper.rb
-test_files: []
+- lib/rbase/table.rb
+- lib/rbase.rb
+- Rakefile
+- rbase-0.1.3.gem
+has_rdoc: true
+homepage: http://rbase.rubyforge.com/
+licenses: []
 
+post_install_message: 
 rdoc_options: []
 
-extra_rdoc_files: []
-
-executables: []
-
-extensions: []
-
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: 1.8.2
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
 requirements: []
 
-dependencies: []
+rubyforge_project: rbase
+rubygems_version: 1.3.2
+signing_key: 
+specification_version: 3
+summary: Library to create/read/write to XBase databases (*.DBF files)
+test_files: []