[Rt-commit] r18631 - in rt/3.999/trunk: . lib/RT/Action lib/RT/Crypt lib/RT/Interface lib/RT/Model lib/RT/ScripAction

sartak at bestpractical.com sartak at bestpractical.com
Mon Mar 2 21:59:12 EST 2009


Author: sartak
Date: Mon Mar  2 21:59:11 2009
New Revision: 18631

Modified:
   rt/3.999/trunk/   (props changed)
   rt/3.999/trunk/lib/RT/Action/UpdateTicket.pm
   rt/3.999/trunk/lib/RT/Crypt/GnuPG.pm
   rt/3.999/trunk/lib/RT/Interface/Web.pm
   rt/3.999/trunk/lib/RT/Model/TicketCollection.pm
   rt/3.999/trunk/lib/RT/ScripAction/CreateTickets.pm
   rt/3.999/trunk/t/api/date.t

Log:
 r80812 at onn:  sartak | 2009-03-02 21:59:04 -0500
 Convert basic usage of set(format => 'unknown') to new_from_string


Modified: rt/3.999/trunk/lib/RT/Action/UpdateTicket.pm
==============================================================================
--- rt/3.999/trunk/lib/RT/Action/UpdateTicket.pm	(original)
+++ rt/3.999/trunk/lib/RT/Action/UpdateTicket.pm	Mon Mar  2 21:59:11 2009
@@ -31,12 +31,7 @@
         if ( defined $value ) {
 
             # convert date to be as utc
-            my $date = RT::Date->new();
-            $date->set(
-                format => 'unknown',
-                value  => $value,
-            );
-
+            my $date = RT::Date->new_from_string($value);
             $self->argument_value( $field, $date->iso );
         }
     }

Modified: rt/3.999/trunk/lib/RT/Crypt/GnuPG.pm
==============================================================================
--- rt/3.999/trunk/lib/RT/Crypt/GnuPG.pm	(original)
+++ rt/3.999/trunk/lib/RT/Crypt/GnuPG.pm	Mon Mar  2 21:59:11 2009
@@ -2224,16 +2224,11 @@
     # never
     return $value unless $value;
 
-    require RT::Date;
-    my $obj = RT::Date->new( current_user => RT->system_user );
-
-    # unix time
-    if ( $value =~ /^\d+$/ ) {
-        $obj->set( value => $value );
-    } else {
-        $obj->set( format => 'unknown', value => $value, time_zone => 'UTC' );
-    }
-    return $obj;
+    return RT::DateTime->new_from_string(
+        $value,
+        current_user => RT->system_user,
+        time_zone    => 'UTC',
+    );
 }
 
 sub delete_key {

Modified: rt/3.999/trunk/lib/RT/Interface/Web.pm
==============================================================================
--- rt/3.999/trunk/lib/RT/Interface/Web.pm	(original)
+++ rt/3.999/trunk/lib/RT/Interface/Web.pm	Mon Mar  2 21:59:11 2009
@@ -394,13 +394,11 @@
 
     my $due;
     if ( defined $ARGS{'Due'} and $ARGS{'Due'} =~ /\S/ ) {
-        $due = new RT::Date( current_user => Jifty->web->current_user );
-        $due->set( format => 'unknown', value => $ARGS{'Due'} );
+        $due = RT::DateTime->new_from_string($ARGS{'Due'});
     }
     my $starts;
     if ( defined $ARGS{'Starts'} and $ARGS{'Starts'} =~ /\S/ ) {
-        $starts = new RT::Date( current_user => Jifty->web->current_user );
-        $starts->set( format => 'unknown', value => $ARGS{'Starts'} );
+        $starts = RT::DateTime->new_from_string($ARGS{'Starts'});
     }
 
     my $sigless = RT::Interface::Web::strip_content(
@@ -812,12 +810,7 @@
 sub parse_date_to_iso {
     my $date = shift;
 
-    my $date_obj = RT::Date->new();
-    $date_obj->set(
-        format => 'unknown',
-        value  => $date
-    );
-    return ( $date_obj->iso );
+    return RT::DateTime->new_from_string($date)->iso;
 }
 
 
@@ -1342,11 +1335,8 @@
 
         my ( $code, $msg );
 
-        my $DateObj = RT::Date->new();
-        $DateObj->set(
-            format => 'unknown',
-            value  => $args_ref->{ $field . '_date' }
-        );
+        my $date = $args_ref->{ $field . '_date' };
+        my $DateObj = RT::DateTime->new_from_string($date);
 
         my $obj = $field . "_obj";
         if (    ( defined $DateObj->epoch )

Modified: rt/3.999/trunk/lib/RT/Model/TicketCollection.pm
==============================================================================
--- rt/3.999/trunk/lib/RT/Model/TicketCollection.pm	(original)
+++ rt/3.999/trunk/lib/RT/Model/TicketCollection.pm	Mon Mar  2 21:59:11 2009
@@ -525,8 +525,7 @@
     die "Incorrect Meta Data for $field"
         unless ( defined $meta->[1] );
 
-    my $date = RT::Date->new();
-    $date->set( format => 'unknown', value => $value );
+    my $date = RT::DateTime->new_from_string($value);
 
     if ( $op eq "=" ) {
 
@@ -625,8 +624,7 @@
         );
     }
 
-    my $date = RT::Date->new();
-    $date->set( format => 'unknown', value => $value );
+    my $date = RT::DateTime->new_from_string($value);
 
     $sb->open_paren;
     if ( $op eq "=" ) {

Modified: rt/3.999/trunk/lib/RT/ScripAction/CreateTickets.pm
==============================================================================
--- rt/3.999/trunk/lib/RT/ScripAction/CreateTickets.pm	(original)
+++ rt/3.999/trunk/lib/RT/ScripAction/CreateTickets.pm	Mon Mar  2 21:59:11 2009
@@ -685,17 +685,9 @@
     }
 
     foreach my $date qw(due starts started resolved) {
-        my $dateobj = RT::Date->new;
         next unless $args{$date};
-        if ( $args{$date} =~ /^\d+$/ ) {
-            $dateobj->set( format => 'unix', value => $args{$date} );
-        } else {
-            eval { $dateobj->set( format => 'iso', value => $args{$date} ); };
-            if ( $@ or $dateobj->epoch <= 0 ) {
-                $dateobj->set( format => 'unknown', value => $args{$date} );
-            }
-        }
-        $args{$date} = $dateobj->iso;
+        my $dt = RT::DateTime->new_from_string($args{$date});
+        $args{$date} = $dt->iso;
     }
 
     $args{'requestor'} ||= $self->ticket_obj->role_group("requestor")->member_emails

Modified: rt/3.999/trunk/t/api/date.t
==============================================================================
--- rt/3.999/trunk/t/api/date.t	(original)
+++ rt/3.999/trunk/t/api/date.t	Mon Mar  2 21:59:11 2009
@@ -42,7 +42,6 @@
     is($date->time_zone->name, 'UTC', "dropped all timzones to UTC");
     is($date->set_time_zone('user')->time_zone->name, 'UTC', "dropped all timzones to UTC");
     is($date->set_time_zone('server')->time_zone->name, 'UTC', "dropped all timzones to UTC");
-    is($date->set_time_zone('unknown')->time_zone->name, 'UTC', "with wrong context returns UTC");
 
     $current_user->user_object->__set( column => 'time_zone', value => 'Europe/Moscow');
     is($current_user->user_object->time_zone,
@@ -51,7 +50,7 @@
     is($date->set_time_zone('user')->time_zone->name,
        'Europe/Moscow',
        "in user context returns user's time_zone");
-    is($date->time_zone->name, 'UTC', "the deafult value is always UTC");
+    is($date->time_zone->name, 'UTC', "the default value is always UTC");
     is($date->set_time_zone('server')->time_zone->name, 'UTC', "wasn't changed");
 
     RT->config->set( TimeZone => 'Africa/Ouagadougou' );
@@ -61,7 +60,7 @@
     is($date->set_time_zone('user')->time_zone->name,
        'Europe/Moscow',
        "in user context still returns user's time_zone");
-    is($date->time_zone->name, 'UTC', "the deafult value is always UTC");
+    is($date->time_zone->name, 'UTC', "the default value is always UTC");
 
     $current_user->user_object->__set( column => 'time_zone', value => '');
     is($current_user->user_object->time_zone,
@@ -70,7 +69,7 @@
     is($date->set_time_zone('user')->time_zone->name,
        'Africa/Ouagadougou',
        "in user context returns time zone of the server if user's one is not defined");
-    is($date->time_zone->name, 'UTC', "the deafult value is always UTC");
+    is($date->time_zone->name, 'UTC', "the default value is always UTC");
 
     RT->config->set( TimeZone => 'GMT' );
     is($date->set_time_zone('server')->time_zone->name,


More information about the Rt-commit mailing list