Changeset 1744

Timestamp:

04/03/08 08:14:20 (15 months ago)

Author:

fumiakiy

Message:

Implemented MT::DateTime::compare. BugId:67917

Location:

branches/release-33

Files:

• lib/MT/AtomServer.pm (modified) (2 diffs)
• lib/MT/DateTime.pm (modified) (2 diffs)
• lib/MT/Util.pm (modified) (1 diff)
• lib/MT/XMLRPCServer.pm (modified) (2 diffs)
• t/45-datetime.t (modified) (2 diffs)

branches/release-33/lib/MT/AtomServer.pm

@@ -557 +557 @@
     if (my $iso = $atom->issued) {
         my $pub_ts = MT::Util::iso2ts($blog, $iso);
-        my @ts = MT::Util::offset_time_list(time, $blog->id);
-        my $ts = sprintf '%04d%02d%02d%02d%02d%02d',
-            $ts[5]+1900, $ts[4]+1, @ts[3,2,1,0];
         $entry->authored_on($pub_ts);
-        if ($pub_ts > $ts) {
+        if ( 0 < MT::DateTime->compare( blog => $blog,
+                a => $pub_ts,
+                b => { value => time(), type => 'epoch' } )
+           )
+        {
             $entry->status(MT::Entry::FUTURE())
         }
@@ -647 +648 @@
     if (my $iso = $atom->issued) {
         my $pub_ts = MT::Util::iso2ts($blog, $iso);
-        my @ts = MT::Util::offset_time_list(time, $blog->id);
-        my $ts = sprintf '%04d%02d%02d%02d%02d%02d',
-            $ts[5]+1900, $ts[4]+1, @ts[3,2,1,0];
         $entry->authored_on($pub_ts);
-        if ($pub_ts > $ts) {
+        if ( 0 < MT::DateTime->compare( blog => $blog,
+                a => $pub_ts,
+                b => { value => time(), type => 'epoch' } )
+           )
+        {
             $entry->status(MT::Entry::FUTURE())
         }

branches/release-33/lib/MT/DateTime.pm

@@ -13 +13 @@
 use vars qw( @EXPORT_OK );
 @EXPORT_OK = qw( ymd2rd tz_offset_as_seconds );
+
+use MT::Util qw( epoch2ts );
 
 sub new {
@@ -170 +172 @@
 }
 
+sub _param2ts {
+    my ( $param, $blog ) = @_;
+
+    my ( $type, $value );
+    if ( 'HASH' eq ref($param) ) {
+        $type = $param->{type};
+        $value = $param->{value};
+    }
+    else {
+        $type = 'ts';
+        $value = $param;
+    }
+    if ( 'CODE' eq ref($value) ) {
+        $value = $value->();
+    }
+
+    my $ts;
+    if ( 'epoch' eq $type ) {
+        $ts = epoch2ts( $blog, $value );
+    }
+    elsif ( 'datetime' eq $type ) {
+        $ts = sprintf "%04d%02d%02d%02d%02d%02d",
+            $value->year,
+            $value->month,
+            $value->day,
+            $value->hour,
+            $value->minute,
+            $value->second;
+    }
+    else {
+        $ts = $value;
+    }
+    $ts;
+}
+
+sub compare {
+    my $self = shift;
+    my %param = @_;
+    # a => $ts | CODE | { value => CODE|$v, type => ts|epoch|datetime }
+    # b => $ts | CODE | { value => CODE|$v, type => ts|epoch|datetime }
+    # blog => ref|N|undef
+    # comparer => CODE|undef
+
+    my $blog = $param{blog};
+    if ( defined($blog) && !ref($blog) ) {
+        $blog = MT->model('blog')->load( $blog );
+        $blog = undef unless ref($blog);
+    }
+
+    if ( !exists($param{a}) && ref($self) ) {
+        $param{a} = { value => $self, type => 'datetime' };
+    }
+    my $ts_a = _param2ts( $param{a}, $blog );
+
+    if ( !exists($param{b}) && ref($self) ) {
+        $param{b} = { value => $self, type => 'datetime' };
+    }
+    my $ts_b = _param2ts( $param{b}, $blog );
+
+    my $comparer = $param{code};
+    if ( 'CODE' eq ref($comparer) ) {
+        return $comparer->( $ts_a, $ts_b );
+    }
+    else {
+        return $ts_a - $ts_b;
+    }
+}
+
 1;
 __END__

branches/release-33/lib/MT/Util.pm

@@ -119 +119 @@
 sub epoch2ts {
     my ($blog, $epoch) = @_;
-    $epoch = offset_time($epoch, $blog) if ref $blog;
+    $epoch = offset_time($epoch, $blog) if defined $blog;
     my ($s, $m, $h, $d, $mo, $y) = gmtime($epoch);
     sprintf("%04d%02d%02d%02d%02d%02d",

branches/release-33/lib/MT/XMLRPCServer.pm

@@ -361 +361 @@
         $entry->authored_on(MT::XMLRPCServer::Util::iso2ts($blog, $iso))
             || die MT::XMLRPCServer::_fault(MT->translate("Invalid timestamp format"));
-        my @ts = MT::Util::offset_time_list(time, $blog_id);
-        my $ts = sprintf '%04d%02d%02d%02d%02d%02d',
-            $ts[5]+1900, $ts[4]+1, @ts[3,2,1,0];
+        require MT::DateTime;
         $entry->status(MT::Entry::FUTURE())
-            if ($entry->authored_on > $ts);
+            if MT::DateTime->compare(
+                blog => $blog,
+                a => $entry->authored_on,
+                b => { value => time(), type => 'epoch' } ) > 0;
     }
     $entry->discover_tb_from_entry();
@@ -487 +488 @@
         $entry->authored_on(MT::XMLRPCServer::Util::iso2ts($entry->blog_id, $iso))
            || die MT::XMLRPCServer::_fault(MT->translate("Invalid timestamp format"));
+        require MT::DateTime;
+        $entry->status(MT::Entry::FUTURE())
+            if MT::DateTime->compare(
+                a => $entry->authored_on,
+                b => { value => time(), type => 'epoch' } ) > 0;
     }
     $entry->discover_tb_from_entry();

branches/release-33/t/45-datetime.t

@@ -24 +24 @@
 
 my $num_tests = 3;
-plan tests => (scalar @dates) * $num_tests;
+plan tests => 9 + (scalar @dates) * $num_tests;
 
 foreach my $dh (@dates) {
@@ -67 +67 @@
 }
 
+# compare tests
+my $t = time();
+ok( (MT::DateTime->compare( a => '20080401123456', b => '20080401123456' ) == 0), 'the same time is equal to each other');
+ok( (MT::DateTime->compare( a => '20080401123457', b => '20080401123456' ) > 0), 'a > b returns positive');
+ok( (MT::DateTime->compare( a => '20080401123456', b => '20080501123456' ) < 0), 'a < b returns negative');
+ok( (MT::DateTime->compare( a => { value => $t, type => 'epoch' }, b => { value => $t, type => 'epoch' } ) == 0), 'the same time is equal to each other');
+ok( (MT::DateTime->compare( b => { value => $t, type => 'epoch' }, a => { value => $t, type => 'epoch' } ) == 0), 'the same time is equal to each other');
+ok( (MT::DateTime->compare( b => { value => time(), type => 'epoch' }, a => '20080101235959' ) < 0), 'today is larger than Jan 1st 23:59:59, 2008');
+ok( (MT::DateTime->compare( a => { value => time(), type => 'epoch' }, b => '20080101235959' ) > 0), 'today is larger than Jan 1st 23:59:59, 2008');
+my $dt1 = MT::DateTime->new( %{$dates[0]} );
+my $dt2 = MT::DateTime->new( %{$dates[$#dates]} );
+ok( ($dt1->compare(a => { value => $dt2, type => 'datetime' }) > 0),
+    sprintf("%04d-%02d-%02d %02d:%02d:%02d %s", $dates[$#dates]{year}, $dates[$#dates]{month}, $dates[$#dates]{day}, $dates[$#dates]{hour}, $dates[$#dates]{minute}, $dates[$#dates]{second}, $dates[$#dates]{time_zone}) .
+    ' is the future from ' .
+    sprintf("%04d-%02d-%02d %02d:%02d:%02d %s", $dates[0]{year}, $dates[0]{month}, $dates[0]{day}, $dates[0]{hour}, $dates[0]{minute}, $dates[0]{second}, $dates[0]{time_zone})
+);
+ok( ($dt1->compare(b => { value => $dt2, type => 'datetime' }) < 0),
+    sprintf("%04d-%02d-%02d %02d:%02d:%02d %s", $dates[0]{year}, $dates[0]{month}, $dates[0]{day}, $dates[0]{hour}, $dates[0]{minute}, $dates[0]{second}, $dates[0]{time_zone}) .
+    ' is the past from ' .
+    sprintf("%04d-%02d-%02d %02d:%02d:%02d %s", $dates[$#dates]{year}, $dates[$#dates]{month}, $dates[$#dates]{day}, $dates[$#dates]{hour}, $dates[$#dates]{minute}, $dates[$#dates]{second}, $dates[$#dates]{time_zone})
+);