zimbreasy 0.0.2 → 0.0.3

data/README.md

@@ -37,7 +37,14 @@ It's pretty simple to use, I will post some examples:
 
     zs = Zimbreasy::Account.new('username', 'password', "https://yourzimbraserver.com/service/soap"); #login
     zm = Zimbreasy::Mail.new(zs); #create a Zimbreasy::Mail object. This has methods for the ZimbraMail submodule of their API.
-    z = zm.create_appointment({:appointee_email => "neo@matrix.com", :start_time => Time.now+1.days, :end_time => (Time.now+1.days+1.hours), :name => "Joss Whedon Meeting", :subject => "Hallelujah", :desc => "Ridiculous stuff happening here"}) #I create an appointment.
+    z = zm.create_appointment({
+      :appointee_email => "neo@matrix.com", 
+      :start_time => Time.now+1.days, 
+      :end_time => (Time.now+1.days+1.hours), 
+      :name => "Joss Whedon Meeting", 
+      :subject => "Hallelujah", 
+      :desc => "Ridiculous stuff happening here"
+    }) #I create an appointment.
 
     => "BEGIN:VCALENDAR\r\nCALSCALE:GREGORIAN\r\nPRODID:iCalendar-Ruby\r\nVERSION:2.0\r\nBEGIN:VEVENT\r\nDESCRIPTION:Poopmaster\r\nDTEND:20130208T171612\r\nDTSTAMP:20130207T161614\r\nDTSTART:20130208T161612\r\nCLASS:PRIVATE\r\nSEQUENCE:0\r\nSUMMARY:Jossss\r\nUID:336-335\r\nEND:VEVENT\r\nEND:VCALENDAR\r\n"
 
@@ -45,11 +52,18 @@ It's pretty simple to use, I will post some examples:
 create_appointment returns ics formatted data, for use with icalendar. Notice that the UID in the data is 336-335. This is an invitation id, not an appointment id.
 The appointment id is 336, the first part of it.
 
-The Other methods of note:
+The other methods of note:
 
     zm.get_appointment(336) #takes appt id
   
-    zm.modify_appointment({:appointee_email => "neo@matrix.com", :start_time => Time.now, :end_time => (Time.now+2.hours), :name => "Joss Whedon!!!", :subject => "Hallelujah 2: The Electric Boogaloo", :desc => "Yoda Fights Back", :inv_id => "336-335"})
+    zm.modify_appointment({
+      :appointee_email => "neo@matrix.com", 
+      :start_time => Time.now, 
+      :end_time => (Time.now+2.hours), 
+      :name => "Joss Whedon!!!", 
+      :subject => "Hallelujah 2: The Electric Boogaloo", 
+      :desc => "Yoda Fights Back", :inv_id => "336-335"
+    })
 
     zm.cancel_appointment("336-335")
 
@@ -58,7 +72,7 @@ it seems Zimbra API only works with invitation, not appointment ids, when it com
 
     zm.get_appt_summaries(Time.now-1.days, Time.now)
 
-This just returns appointment Ics texts in an array.
+This just returns appointment Ics texts in an array. First arg is a Time object representing start date, second arg is end date.
 
 ## Contributing
 

data/lib/zimbreasy.rb

@@ -3,8 +3,11 @@ require "zimbreasy/version"
 require "zimbreasy/mail"
 require "zimbreasy/account"
 module Zimbreasy
+
   #takes a Time object. outputs string for zimbra api calls.
   def self.zimbra_date(time)
     time.strftime("%Y%m%dT%H%M%S")
   end
+
+  
 end

data/lib/zimbreasy/account.rb

@@ -1,6 +1,7 @@
 module Zimbreasy
   class Account
     attr_accessor :user, :pass, :endpoint, :client, :soap_namespace, :zimbra_namespace
+
     def initialize(user, pass, endpoint)
       @user = user
       @pass = pass
@@ -31,7 +32,7 @@ module Zimbreasy
       end
 
       @client.config.pretty_print_xml = true
-      @client.config.log = true
+      @client.config.log = false
 
       response = @client.request method  do
         soap.xml do |xml|

data/lib/zimbreasy/mail.rb

@@ -2,13 +2,14 @@ module Zimbreasy
   class Mail
     include Icalendar
     attr_accessor :account, :zimbra_namespace
+
     def initialize(account)
       @account = account
       @zimbra_namespace = "urn:zimbraMail"
     end
 
     #Params can contain the following:
-    #:appointee_email(req)
+    #:appointee_emails(req)
     #:start_time(opt)
     #:end_time(opt)
     #:name(opt)
@@ -26,24 +27,36 @@ module Zimbreasy
           appointment_xml_block(xml, params)
         end
       end
+    
       params.merge!({:appt_id => response.body[:create_appointment_response][:@inv_id]})
-      make_ical(params)
+
+      to_ical(params)
     end
+
+    def get_free_busy(start_time, end_time, email)
+      start_time = start_time.to_i*1000 #it wants millis, to_i gives seconds.
+      end_time = end_time.to_i*1000
+      response = account.make_call("GetFreeBusyRequest") do |xml|
+        xml.GetFreeBusyRequest({"xmlns" => @zimbra_namespace, "s" => start_time, "e" => end_time}) do |xml|
+          xml.usr({"name" => email})
+        end
+      end 
  
-    def make_ical(params)
-      calendar = Calendar.new   
-      calendar.event do
-        dtstart       params[:start_time]
-        dtend         params[:end_time]
-        summary       params[:name]
-        description   params[:desc]
-        uid           params[:appt_id]
-        klass         "PRIVATE"  
+      array = [] 
+      return response[:get_free_busy_response][:usr].reject { |k,v| k if k == :@id }.inject(Hash.new) do |hash, entry|
+        if entry[1].is_a?(Array)
+          array_of_times = entry[1].inject(Array.new) do |times_array, times_entry|
+            times_array << { :s => Time.at(times_entry[:@s].to_f/1000.0), :e => Time.at(times_entry[:@e].to_f/1000.0) }
+            times_array
+          end
+          hash[entry[0]] = array_of_times 
+        else
+          hash[entry[0]] = [ {:s => Time.at(entry[1][:@s].to_f/1000.0), :e => Time.at(entry[1][:@e].to_f/1000.0)} ] 
+        end
+        hash 
       end
-      
-      calendar.to_ical
     end
-
+ 
     def get_appointment(appt_id)
       response = account.make_call("GetAppointmentRequest") do |xml|
         xml.GetAppointmentRequest({ "xmlns" => @zimbra_namespace, "id" => appt_id})
@@ -59,7 +72,7 @@ module Zimbreasy
         :appt_id => appt_id
       }
 
-      make_ical(hash)
+      to_ical(hash)
     end 
 
     def get_appt_summaries(start_date, end_date)
@@ -74,17 +87,31 @@ module Zimbreasy
 
       appts = []
 
-      response[:get_appt_summaries_response][:appt].each do |appt|
+      if response[:get_appt_summaries_response][:appt].is_a?(Array)
+        response[:get_appt_summaries_response][:appt].each do |appt|
+          
+          inst = appt[:inst]
+                    
+          hash = {
+            :start_time => Zimbreasy.zimbra_date(Time.at(inst[:@s].to_f/1000.0)), 
+            :name => appt[:@name], 
+            :appt_id => appt[:@id]
+          }
+
+          appts << to_ical(hash)
+        end
+      else 
+        appt = response[:get_appt_summaries_response][:appt]
 
         inst = appt[:inst]
-                  
+
         hash = {
-          :start_time => Zimbreasy.zimbra_date(Time.at(inst[:@s].to_f/1000.0)), 
-          :name => appt[:@name], 
+          :start_time => Zimbreasy.zimbra_date(Time.at(inst[:@s].to_f/1000.0)),
+          :name => appt[:@name],
           :appt_id => appt[:@id]
         }
 
-        appts << make_ical(hash)
+        appts << to_ical(hash)
       end
       
       appts
@@ -104,11 +131,11 @@ module Zimbreasy
         end
       end
     
-      make_ical(params)
+      to_ical(params.merge({:appt_id => params[:inv_id]}))
     end
 
     #returns true if it worked, inv_id is not appt_id, it's normally something like 320-319, the first number is appt_id.
-    def cancel_appointment(inv_id)
+    def cancel_appointment(inv_id, emails, subject=nil, content=nil)
       unless inv_id and inv_id.is_a?(String) and inv_id.match(/-/) and inv_id.split("-").count==2 #so it has x-y formatting.
         raise 'inv_id must be string of format x-y, where x and y are numbers.'
       end
@@ -119,7 +146,23 @@ module Zimbreasy
           "id" => inv_id,
           "comp" => 0
         }) do |xml|
-          xml.inv({"id" => inv_id, "method" => "none", "compNum" => "0", "rsvp" => "1"})
+
+          xml.m do |xml|
+            emails.each do |email|
+              xml.e({"a" => email, "t" => "t"})
+            end
+
+            xml.su(subject)
+
+            xml.mp({"ct" => "text/plain"}) do |xml|
+              xml.content(content)
+            end
+
+            #xml.inv({"id" => inv_id, "method" => "none", "compNum" => "0", "rsvp" => "1"}) do |xml|
+            #  xml.comp({"method" => "none", "compNum" => "0", "rsvp" => "1"}) do |xml|
+            # end
+            #end
+          end
         end
       end
 
@@ -128,6 +171,19 @@ module Zimbreasy
 
     private
 
+    def to_ical(params)
+      calendar = Calendar.new   
+      calendar.event do
+        dtstart       params[:start_time]
+        dtend         params[:end_time]
+        summary       params[:name]
+        description   params[:desc]
+        uid           params[:appt_id]
+        klass         "PRIVATE"  
+      end
+      calendar.to_ical
+    end
+
     def appointment_xml_block(xml, params)
       xml.m({"su" => params[:subject]}) do |xml|
         xml.mp({"ct" =>(params[:mime_type] || "text/plain")})
@@ -137,8 +193,9 @@ module Zimbreasy
           xml.s({"d" => params[:start_time]}) if params[:start_time]
           xml.e({"d" => params[:end_time]}) if params[:end_time]
         end 
-        
-        xml.e({"a" => params[:appointee_email], "t" => "t"})
+        params[:appointee_emails].each do |email| 
+          xml.e({"a" => email, "t" => "t"})
+        end
       end
     end
   end

data/lib/zimbreasy/version.rb

@@ -1,3 +1,3 @@
 module Zimbreasy
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zimbreasy
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-07 00:00:00.000000000 Z
+date: 2013-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
-  requirement: &22555720 !ruby/object:Gem::Requirement
+  requirement: &10238380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *22555720
+  version_requirements: *10238380
 - !ruby/object:Gem::Dependency
   name: savon
-  requirement: &22546860 !ruby/object:Gem::Requirement
+  requirement: &10234600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *22546860
+  version_requirements: *10234600
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &22541180 !ruby/object:Gem::Requirement
+  requirement: &10231340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *22541180
+  version_requirements: *10231340
 - !ruby/object:Gem::Dependency
   name: icalendar
-  requirement: &22537660 !ruby/object:Gem::Requirement
+  requirement: &10227460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *22537660
+  version_requirements: *10227460
 description: A no-nonsense gem for the nonsensical Zimbra API.
 email:
 - jordanmprince@gmail.com