momomoto 0.1.9 → 0.1.10

data/lib/momomoto/table.rb

@@ -189,7 +189,7 @@ module Momomoto
               new_row[ key ] = true
             elsif value.default == "false"
               new_row[ key ] = false
-            elsif m = value.default.match( /^'([^']+)'::(text|interval|timestamp with time(out)? zone|time with(out)? time zone)$/ )
+            elsif m = value.default.match( /^'([^']+)'::(text|interval|time(stamp)? with(out)? time zone)$/ )
               new_row[ key ] = m[1]
             end
           end
@@ -295,7 +295,7 @@ module Momomoto
           raise Error, "Primary key fields must not be empty!" if not row.send( field_name )
           conditions[field_name] = row.send( field_name )
         end
-        sql = "DELETE FROM #{table_name} #{compile_where(conditions)};"
+        sql = "DELETE FROM #{full_name} #{compile_where(conditions)};"
         row.new_record = true
         database.execute( sql )
       end

data/lib/timeinterval.rb

@@ -3,23 +3,24 @@ require 'date'
 
 class TimeInterval
 
+  include Comparable
+
+  class ParseError < StandardError; end
+
   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 )
+      TimeInterval.new( interval )
     end
 
   end
 
+  def <=>( other )
+    self.to_i <=> other.to_i
+  end
+
   def strftime( fmt = "%H:%M:%S" )
     fmt.gsub( /%(.)/ ) do | match |
       case match[1,1]
@@ -27,7 +28,7 @@ class TimeInterval
         when 'M' then sprintf('%02d',@min)
         when 'S' then sprintf('%02d',@sec)
         when '%' then '%'
-        else '%' + match
+        else match
       end
     end
   end
@@ -43,9 +44,24 @@ class TimeInterval
   end
 
   def initialize( d = {} )
-    @hour = d[:hour] || 0
-    @min = d[:min] || 0
-    @sec = d[:sec] || 0
+    case d
+      when Hash then
+        @hour = d[:hour] || 0
+        @min = d[:min] || 0
+        @sec = d[:sec] || 0
+      when Integer then
+        @hour = d/3600
+        @min = (d/60)%60
+        @sec = d%60
+      when String then
+        parsed = Date._parse( d, false)
+        if ( parsed.empty? && d.length > 0 ) || !(parsed.keys - [:hour,:min,:sec]).empty?
+          raise ParseError, "Could not parse interval `#{d}`"
+        end
+        @hour = parsed[:hour] || 0
+        @min = parsed[:min] || 0
+        @sec = parsed[:sec] || 0
+    end
   end
 
 end

data/test/test_timeinterval.rb

@@ -1,12 +1,13 @@
 
 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
+    assert_raise( TimeInterval::ParseError ) do TimeInterval.parse("u") end
+    assert_raise( TimeInterval::ParseError ) do TimeInterval.parse("2023-05-05 23:05:00") end
   end
 
   def test_to_i
@@ -18,7 +19,22 @@ class TestTimeInterval < Test::Unit::TestCase
     end
   end
 
+  def test_strftime
+    i = TimeInterval.parse( "23:00:05" )
+    assert_equal( "23", i.strftime("%H"))
+    assert_equal( "00", i.strftime("%M"))
+    assert_equal( "05", i.strftime("%S"))
+    assert_equal( "%", i.strftime("%%"))
+    assert_equal( "%A", i.strftime("%A"))
+  end
 
+  def test_comparison
+    assert( TimeInterval.new( 0 ) < TimeInterval.new( 2 ) )
+    assert( TimeInterval.new( 42 ) > TimeInterval.new( 5 ) )
+    assert( TimeInterval.new( 23 ) == TimeInterval.new( 23 ) )
+    assert( TimeInterval.new( "0:00:00" ) == TimeInterval.new( 0 ) )
+    assert( TimeInterval.new( "01:00:00" ) == TimeInterval.new( "1:00:00" ) )
+  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.9
-date: 2007-10-25 00:00:00 +02:00
+  version: 0.1.10
+date: 2007-11-01 00:00:00 +01:00
 summary: Momomoto is an object relational mapper for PostgreSQL.
 require_paths: 
 - lib