[Bps-public-commit] rtx-calendar branch, master, updated. 0.15-3-g3cf41fa

[Thomas Sibley]

The branch, master has been updated
       via  3cf41fa73b5f959e0059dbb0a493eac9a1e824f9 (commit)
       via  6b13cd46c54101efbf5bcac02c32dc19ab0b3c43 (commit)
       via  ed424bd6d817a699d5a9743611d9ed24247610b0 (commit)
      from  323331e75541c560038590e87c55f2e5b53f7f73 (commit)

Summary of changes:
 META.yml                      |  1 -
 Makefile.PL                   |  1 -
 README                        |  3 +--
 html/NoAuth/Calendar/dhandler | 13 +++++++------
 inc/Module/Install/RTx.pm     |  2 +-
 lib/RTx/Calendar.pm           |  3 +--
 6 files changed, 10 insertions(+), 13 deletions(-)

- Log -----------------------------------------------------------------
commit ed424bd6d817a699d5a9743611d9ed24247610b0
Author: KURASHIKI Satoru <lurdan at gmail.com>
Date:   Sun Jul 7 20:21:09 2013 +0900

    Migrate ical formatting from deprecated Date::ICal to RT::Date.

diff --git a/META.yml b/META.yml
index e9422ec..63738c1 100644
--- a/META.yml
+++ b/META.yml
@@ -23,7 +23,6 @@ no_index:
     - RT::Interface::Web::Menu
 requires:
   Data::ICal: 0
-  Date::ICal: 0
   DateTime: 0
   DateTime::Set: 0
   Digest::SHA: 0
diff --git a/Makefile.PL b/Makefile.PL
index d87b8eb..accaa3e 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -9,7 +9,6 @@ readme_from('lib/RTx/Calendar.pm');
 requires 'DateTime'      => 0;
 requires 'DateTime::Set' => 0;
 requires 'Data::ICal'    => 0;
-requires 'Date::ICal'    => 0;
 requires 'Digest::SHA';
 
 no_index(package => 'RT::Interface::Web::Menu');
diff --git a/README b/README
index bc0c45a..8556d15 100644
--- a/README
+++ b/README
@@ -15,9 +15,8 @@ DESCRIPTION
 INSTALLATION
     If you upgrade from 0.02, see next part before.
 
-    You need to install those three modules :
+    You need to install those two modules :
 
-      * Date::ICal
       * Data::ICal
       * DateTime::Set
 
diff --git a/html/NoAuth/Calendar/dhandler b/html/NoAuth/Calendar/dhandler
index ea08c9a..7c91bb5 100644
--- a/html/NoAuth/Calendar/dhandler
+++ b/html/NoAuth/Calendar/dhandler
@@ -3,7 +3,6 @@
 use Data::ICal;
 use Data::ICal::Entry::Todo;
 use Data::ICal::Entry::Event;
-use Date::ICal;
 
 $RT::ICalTicketType   ||= "Data::ICal::Entry::Todo";
 $RT::ICalReminderType ||= "Data::ICal::Entry::Event";
@@ -109,12 +108,13 @@ sub add_event {
     return unless defined $Reminder->RefersTo->First;
     my $Ticket  = $Reminder->RefersTo->First->TargetObj;
 
+    my $now = RT::Date->new( $session{'CurrentUser'} ); $now->SetToNow;
     my %event = (
 	summary => $Reminder->Subject ? $Reminder->Subject : '',
 	url        => "${RT::WebURL}/Ticket/Display.html?id=" . $Ticket->id,
-	uid        => Date::ICal->new( epoch => time() )->ical() . "-" . $Reminder->Id . "@" . $uid,
+	uid        => $now->iCal . "-" . $Reminder->Id . "@" . $uid,
 	categories => $Ticket->QueueObj->Name,
-	dtstart     => Date::ICal->new( epoch => $Reminder->DueObj->Unix )->ical,
+	dtstart     => $Reminder->DueObj->iCal,
     );
 
     my $event = $RT::ICalReminderType->new();
@@ -126,15 +126,16 @@ sub add_event {
 sub add_todo {
     my ($Ticket, $uid) = @_;
 
+    my $now = RT::Date->new( $session{'CurrentUser'} ); $now->SetToNow;
     my %vtodo = (
 	summary    => $Ticket->Subject ? $Ticket->Subject : '',
-	dtstart    => Date::ICal->new( epoch => $Ticket->CreatedObj->Unix )->ical,
+	dtstart    => $Ticket->CreatedObj->iCal,
 	url        => "${RT::WebURL}/Ticket/Display.html?id=" . $Ticket->id,
-	uid        => Date::ICal->new( epoch => time() )->ical() . "-" . $Ticket->Id . "@" . $uid,
+	uid        => $now->iCal . "-" . $Ticket->Id . "@" . $uid,
 	categories => $Ticket->QueueObj->Name,
     );
 
-    $vtodo{due} = Date::ICal->new( epoch => $Ticket->DueObj->Unix )->ical,
+    $vtodo{due} = $Ticket->DueObj->iCal,
         if $Ticket->DueObj;
 
     if ($Ticket->OwnerObj->Id != $RT::Nobody->Id and $Ticket->OwnerObj->EmailAddress) {
diff --git a/lib/RTx/Calendar.pm b/lib/RTx/Calendar.pm
index 7debc94..da81b6c 100644
--- a/lib/RTx/Calendar.pm
+++ b/lib/RTx/Calendar.pm
@@ -151,9 +151,8 @@ number based so that you can give those feeds to other people.
 
 If you upgrade from 0.02, see next part before.
 
-You need to install those three modules :
+You need to install those two modules :
 
-  * Date::ICal
   * Data::ICal
   * DateTime::Set
 

commit 6b13cd46c54101efbf5bcac02c32dc19ab0b3c43
Merge: 323331e ed424bd
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Wed Jul 10 13:37:58 2013 -0700

    Merge remote-tracking branch 'github/pr/5'


commit 3cf41fa73b5f959e0059dbb0a493eac9a1e824f9
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Wed Jul 10 13:42:45 2013 -0700

    Update M:I:RTx

diff --git a/inc/Module/Install/RTx.pm b/inc/Module/Install/RTx.pm
index abf6aea..c9fe996 100644
--- a/inc/Module/Install/RTx.pm
+++ b/inc/Module/Install/RTx.pm
@@ -8,7 +8,7 @@ no warnings 'once';
 
 use Module::Install::Base;
 use base 'Module::Install::Base';
-our $VERSION = '0.30';
+our $VERSION = '0.31';
 
 use FindBin;
 use File::Glob     ();

-----------------------------------------------------------------------