momomoto 0.1.8 → 0.1.9

data/lib/momomoto/datatype/interval.rb

@@ -13,12 +13,12 @@ module Momomoto
       def filter_get( value )
         case value
           when nil, '' then nil
-          when ::Time then value
-          when String then ::Time.parse( value )
+          when ::TimeInterval then value
+          when String then ::TimeInterval.parse( value )
           else raise Error
         end
        rescue => e
-        raise ConversionError, 'Error while parsing time'
+        raise ConversionError, "Error while parsing interval (#{e.message})"
       end
 
       def filter_set( value )

data/lib/momomoto/datatype/text.rb

@@ -7,7 +7,7 @@ module Momomoto
       end
 
       def escape( input )
-        if input.nil? || input.empty?
+        if input.nil? || input.to_s.empty?
           "NULL"
         else
           "E'" + Database.escape_string( input.to_s ) + "'"

data/lib/momomoto/momomoto.rb

@@ -4,6 +4,7 @@ require 'momomoto/table'
 require 'momomoto/procedure'
 require 'momomoto/order'
 require 'momomoto/row'
+require 'timeinterval'
 require 'momomoto/datatype'
 require 'momomoto/database'
 

data/lib/momomoto/row.rb

@@ -82,6 +82,7 @@ module Momomoto
 
     # generic setter for column values
     def set_column( column, value )
+      raise "Unknown column #{column}" if not self.class.column_order.member?( column.to_sym )
       table = self.class.table
       if not new_record? and table.primary_keys.member?( column.to_sym )
         raise Error, "Setting primary keys(#{column}) is only allowed for new records"
@@ -96,6 +97,7 @@ module Momomoto
 
     # generic getter for column values
     def get_column( column )
+      raise "Unknown column #{column}" if not self.class.column_order.member?( column.to_sym )
       table = self.class.table
       index = self.class.column_order.index( column.to_sym )
       if table.columns[column.to_sym].respond_to?( :filter_get )

data/lib/momomoto/table.rb

@@ -20,9 +20,6 @@ module Momomoto
 
       # set the columns of the table this class operates on
       def columns=( columns )
-        # we store the order separate because it's quite important 
-        # that it's constant otherwise get_column and set_column 
-        # on the row class might stop working 
         @columns = columns
       end
 

data/lib/timeinterval.rb

@@ -0,0 +1,52 @@
+
+require 'date'
+
+class TimeInterval
+
+  attr_reader :hour, :min, :sec
+
+  class << self
+
+    def parse( interval )
+      d = Date._parse( interval, false)
+      if d.empty? && interval.length > 0
+        raise "Could not parse interval `#{interval}`"
+      end
+      if !(d.keys - [:hour,:min,:sec]).empty?
+        raise "Could not parse interval `#{interval}`"
+      end
+      TimeInterval.new( d )
+    end
+
+  end
+
+  def strftime( fmt = "%H:%M:%S" )
+    fmt.gsub( /%(.)/ ) do | match |
+      case match[1,1]
+        when 'H' then sprintf('%02d',@hour)
+        when 'M' then sprintf('%02d',@min)
+        when 'S' then sprintf('%02d',@sec)
+        when '%' then '%'
+        else '%' + match
+      end
+    end
+  end
+
+  def to_i
+    @hour * 3600 + @min * 60 + @sec
+  end
+
+  alias_method :to_int, :to_i
+
+  def to_s
+    strftime
+  end
+
+  def initialize( d = {} )
+    @hour = d[:hour] || 0
+    @min = d[:min] || 0
+    @sec = d[:sec] || 0
+  end
+
+end
+

data/test/test_interval.rb

@@ -25,12 +25,12 @@ class TestInterval < Test::Unit::TestCase
   def test_samples
     c = Class.new( Momomoto::Table )
     c.table_name = 'test_interval'
-    [Time.parse("00:00:00"), Time.parse("01:00:00"), Time.parse("23:00:00")].each do | number |
+    ["00:00:00","00:05:00","00:00:23","00:05:23","05:00:00","42:00:00","42:05:23"].each do | number |
       r = c.new( :data => number )
-      assert_equal( number, r.data )
+      assert_equal( number, r.data.to_s )
       r.write
-      r2 = c.select(:id=>r.id).first
-      assert_equal( number, r2.data )
+      r2 = c.select_single(:id=>r.id)
+      assert_equal( number, r2.data.to_s )
     end
   end
 

data/test/test_timeinterval.rb

@@ -0,0 +1,24 @@
+
+class TestTimeInterval < Test::Unit::TestCase
+
+
+  def test_parse
+    ["00:00:00","00:05:00","00:00:23","00:05:23","05:00:00","42:00:00","42:05:23"].each do | number |
+      i = TimeInterval.parse( number )
+      assert_equal( i.to_s, number )
+    end
+  end
+
+  def test_to_i
+    examples = { "00:00:00" => 0, "0:00:00" => 0, "000:00:00" => 0, "01:00:00" => 3600, "00:00:01" => 1, "00:01:00" => 60, "01:01:00" => 3660, "02:00:00" => 7200, "40:00:00" => 144000 }
+    examples.each do | string, number |
+      i = TimeInterval.parse( string )
+      assert_equal( i.to_i, number )
+      assert_equal( i.to_int, number )
+    end
+  end
+
+
+
+end
+

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: momomoto
 version: !ruby/object:Gem::Version 
-  version: 0.1.8
-date: 2007-10-15 00:00:00 +02:00
+  version: 0.1.9
+date: 2007-10-25 00:00:00 +02:00
 summary: Momomoto is an object relational mapper for PostgreSQL.
 require_paths: 
 - lib
@@ -29,6 +29,7 @@ post_install_message:
 authors: 
 - Sven Klemm
 files: 
+- lib/timeinterval.rb
 - lib/momomoto.rb
 - lib/momomoto/database.rb
 - lib/momomoto/momomoto.rb
@@ -82,6 +83,7 @@ files:
 - test/test_row.rb
 - test/test_timestamp_without_time_zone.rb
 - test/test_time_with_time_zone.rb
+- test/test_timeinterval.rb
 - test/test_database.rb
 - test/test_bytea.rb
 - test/test_information_schema.rb