zm-ruby-client 2.2.7 → 3.0.0

data/lib/zm/client/appointment/appointment.rb

@@ -6,8 +6,10 @@ module Zm
     class Appointment < Base::Object
       include BelongsToFolder
       include BelongsToTag
+      include RequestMethodsMailbox
+      include MailboxItemConcern
 
-      attr_accessor :id, :uid, :name, :l, :desc, :start_at, :dur, :end_at, :tn, :allDay, :organizer, :timezone,
+      attr_accessor :uid, :name, :desc, :start_at, :dur, :end_at, :tn, :allDay, :organizer, :timezone,
                     :calItemId, :apptId, :invId, :rev, :fb, :transp
       attr_reader :recipients, :attendees, :body
 
@@ -24,25 +26,28 @@ module Zm
         yield(self) if block_given?
       end
 
-      def download(dest_file_path, fmt = 'ics')
-        uploader = Upload.new(@parent, RestAccountConnector.new)
-        uploader.download_file(Zm::Client::FolderDefault::ROOT[:path], fmt, [Zm::Client::FolderView::APPOINTMENT], [@id], dest_file_path)
+      def download(dest_file_path, fmt: 'ics')
+        uploader = @parent.build_uploader
+        uploader.download_file(dest_file_path, id, FolderView::APPOINTMENT, fmt:)
       end
 
       def create!
-        soap_request = SoapElement.mail(SoapMailConstants::CREATE_APPOINTMENT_REQUEST).add_attributes(jsns_builder.to_jsns)
-        rep = @parent.sacc.invoke(soap_request)
+        rep = @parent.soap_connector.invoke(build_create)
 
         aji = AppointmentJsnsInitializer.new(@parent, rep[:CreateAppointmentResponse])
         aji.appointment = self
         aji.update
-        @id
+        id
       end
 
-      def modify!
-        soap_request = SoapElement.mail(SoapMailConstants::MODIFY_APPOINTMENT_REQUEST).add_attributes(jsns_builder.to_update)
-        @parent.sacc.invoke(soap_request)
-        true
+      def build_create
+        SoapElement.mail(SoapMailConstants::CREATE_APPOINTMENT_REQUEST)
+                   .add_attributes(jsns_builder.to_jsns)
+      end
+
+      def build_modify
+        SoapElement.mail(SoapMailConstants::MODIFY_APPOINTMENT_REQUEST)
+                   .add_attributes(jsns_builder.to_update)
       end
 
       def update!(*args)
@@ -53,18 +58,16 @@ module Zm
         raise NotImplementedError
       end
 
-      def delete!
-        return false if @id.nil?
-
-        @parent.sacc.invoke(jsns_builder.to_delete)
-        @id = nil
+      def build_rename(*args)
+        raise NotImplementedError
       end
 
       def reload!
-        jsns = { m: { id: @id, html: 1 } }
+        jsns = { m: { id: id, html: SoapUtils::ON } }
 
-        soap_request = SoapElement.mail(SoapMailConstants::GET_MSG_REQUEST).add_attributes(jsns)
-        rep = @parent.sacc.invoke(soap_request)
+        soap_request = SoapElement.mail(SoapMailConstants::GET_MSG_REQUEST)
+                                  .add_attributes(jsns)
+        rep = @parent.soap_connector.invoke(soap_request)
         entry = rep[:GetMsgResponse][:m].first
 
         aji = AppointmentJsnsInitializer.new(@parent, entry)
@@ -107,8 +110,8 @@ module Zm
           @attendees = []
         end
 
-        def map(&block)
-          @attendees.map(&block)
+        def map(&)
+          @attendees.map(&)
         end
 
         def add(attendee)
@@ -144,10 +147,10 @@ module Zm
         end
       end
 
-      private
-
       def jsns_builder
-        @jsns_builder ||= AppointmentJsnsBuilder.new(self)
+        return @jsns_builder if defined? @jsns_builder
+
+        @jsns_builder = AppointmentJsnsBuilder.new(self)
       end
     end
   end

data/lib/zm/client/appointment/appointment_jsns_builder.rb

@@ -22,7 +22,7 @@ module Zm
 
       def to_update
         jsns = to_jsns
-        jsns[:comp] = 0
+        jsns[:comp] = SoapUtils::OFF
         jsns[:id] = @item.id
         jsns[:m][:inv][:uid] = @item.uid
         jsns
@@ -30,11 +30,13 @@ module Zm
 
       def recipients_to_jsns
         @item.recipients.map do |recipient|
-          {
+          h = {
             t: recipient.field,
             a: recipient.email,
             p: recipient.display_name
-          }.reject { |_, v| v.nil? }
+          }
+          h.compact!
+          h
         end
       end
 
@@ -56,29 +58,32 @@ module Zm
       end
 
       def comp_to_jsns
-        [
-          {
-            allDay: @item.allDay,
-            at: attendees_to_jsns,
-            e: end_at_jsns,
-            s: start_at_jsns,
-            or: organizer_to_jsns,
-            name: @item.name,
-            fb: @item.fb,
-            transp: @item.transp
-          }.reject { |_, v| v.nil? }
-        ]
+        h = {
+          allDay: @item.allDay,
+          at: attendees_to_jsns,
+          e: end_at_jsns,
+          s: start_at_jsns,
+          or: organizer_to_jsns,
+          name: @item.name,
+          fb: @item.fb,
+          transp: @item.transp
+        }
+        h.compact!
+
+        [h]
       end
 
       def attendees_to_jsns
         @item.attendees.map do |attendee|
-          {
+          h = {
             a: attendee.email,
             d: attendee.display_name,
             role: attendee.role,
             ptst: attendee.ptst,
             rsvp: attendee.rsvp
-          }.reject { |_, v| v.nil? }
+          }
+          h.compact!
+          h
         end
       end
 
@@ -99,14 +104,18 @@ module Zm
       def organizer_to_jsns
         return nil if @item.organizer.nil?
 
-        {
+        h = {
           a: @item.organizer.email,
           d: @item.organizer.display_name
-        }.reject { |_, v| v.nil? }
+        }
+        h.compact!
+        h
       end
 
       def time_format
-        @time_format ||= @item.allDay ? '%Y%m%d' : '%Y%m%dT%H%M00'
+        return @time_format if defined? @time_format
+
+        @time_format = @item.allDay ? '%Y%m%d' : '%Y%m%dT%H%M00'
       end
     end
   end

data/lib/zm/client/appointment/appointment_jsns_initializer.rb

@@ -9,16 +9,17 @@ module Zm
       def initialize(parent, json)
         @parent = parent
         @json = json
+        @inv_id = @json.delete(:invId)
       end
 
       def update
         return false if @appointment.nil?
 
-        @appointment.calItemId = @json[:calItemId]
-        @appointment.apptId = @json[:apptId]
-        @appointment.invId = @json[:invId]
-        @appointment.id = @json[:invId]
-        @appointment.rev = @json[:rev]
+        @appointment.calItemId = @json.delete(:calItemId)
+        @appointment.apptId = @json.delete(:apptId)
+        @appointment.invId = @inv_id
+        @appointment.id = @inv_id
+        @appointment.rev = @json.delete(:rev)
 
         true
       end
@@ -26,10 +27,10 @@ module Zm
       def create
         @appointment ||= Appointment.new(@parent)
 
-        @appointment.id = @json[:id]
-        @appointment.tn = @json[:tn]
-        @appointment.l = @json[:l].to_i
-        @appointment.uid = @json[:uid]
+        @appointment.id = @json.delete(:id)
+        @appointment.tn = @json.delete(:tn)
+        @appointment.l = @json.delete(:l)
+        @appointment.uid = @json.delete(:uid)
 
         if inv.nil?
           init_from_search
@@ -48,10 +49,10 @@ module Zm
         unless search_organizer_name.nil?
           @appointment.organizer = Zm::Client::Appointment::Organizer.new(search_organizer_name)
         end
-        @appointment.name = @json[:name]
-        @appointment.id = @json[:invId]
-        @appointment.desc = @json[:fr]
-        @appointment.allDay = @json[:allDay] unless @json[:allDay].nil?
+        @appointment.name = @json.delete(:name)
+        @appointment.id = @inv_id
+        @appointment.desc = @json.delete(:fr)
+        @appointment.allDay = @json.delete(:allDay) unless @json[:allDay].nil?
         search_make_date
       end
 

data/lib/zm/client/appointment/appointments_builder.rb

@@ -5,7 +5,7 @@ module Zm
     # class factory [appointments]
     class AppointmentsBuilder < Base::ObjectsBuilder
       def initialize(parent, json)
-        super(parent, json)
+        super
         @json_item_key = :appt
       end
 

data/lib/zm/client/appointment/appointments_collection.rb

@@ -5,7 +5,7 @@ module Zm
     # collection of appointments
     class AppointmentsCollection < Base::AccountSearchObjectsCollection
       def initialize(parent)
-        super(parent)
+        super
         @child_class = Appointment
         @builder_class = AppointmentsBuilder
         @type = SoapConstants::APPOINTMENT
@@ -13,19 +13,20 @@ module Zm
       end
 
       def find(id)
-        jsns = { m: { id: id, html: 1 } }
+        jsns = { m: { id: id, html: SoapUtils::ON } }
 
-        soap_request = SoapElement.mail(SoapMailConstants::GET_MSG_REQUEST).add_attributes(jsns)
-        rep = @parent.sacc.invoke(soap_request)
+        soap_request = SoapElement.mail(SoapMailConstants::GET_MSG_REQUEST)
+                                  .add_attributes(jsns)
+        rep = @parent.soap_connector.invoke(soap_request)
         entry = rep[:GetMsgResponse][:m].first
 
         AppointmentJsnsInitializer.new(@parent, entry).create
       end
 
       def find_each(offset: 0, limit: 500, &block)
-        (1970..(Time.now.year + 10)).each do |year|
-          @start_at = Time.new(year, 1, 1)
-          @end_at = Time.new(year, 12, 31)
+        (Time.at(0).year..(Time.now.year + 10)).each do |year|
+          @start_at ||= Time.new(year, 1, 1).to_i * 1000
+          @end_at ||= Time.new(year, 12, 31).to_i * 1000
           @more = true
           @offset = offset
           @limit = limit

data/lib/zm/client/backup/backup.rb

@@ -12,13 +12,17 @@ module Zm
       end
 
       def start_at
-        @start_at ||= Time.at(@start / 1000)
+        return @start_at if defined? @start_at
+
+        @start_at = Time.at(@start / 1000)
       rescue StandardError
         nil
       end
 
       def end_at
-        @end_at ||= Time.at(@end / 1000)
+        return @end_at if defined? @end_at
+
+        @end_at = Time.at(@end / 1000)
       rescue StandardError
         nil
       end

data/lib/zm/client/backup/backup_jsns_initializer.rb

@@ -6,19 +6,21 @@ module Zm
     class BackupJsnsInitializer
       class << self
         def create(parent, json)
-          item = Backup.new(parent)
-
-          item.label = json[:label]
-          item.type = json[:type]
-          item.aborted = json[:aborted]
-          item.start = json[:start].to_i
-          item.end = json[:end].to_i
-          item.minRedoSeq = json[:minRedoSeq]
-          item.maxRedoSeq = json[:maxRedoSeq]
-          item.live = json[:live]
-          item.accounts = json[:accounts]
+          Backup.new(parent).tap do |item|
+            update(item, json)
+          end
+        end
 
-          item
+        def update(item, json)
+          item.label = json.delete(:label)
+          item.type = json.delete(:type)
+          item.aborted = json.delete(:aborted)
+          item.start = json.delete(:start)
+          item.end = json.delete(:end)
+          item.minRedoSeq = json.delete(:minRedoSeq)
+          item.maxRedoSeq = json.delete(:maxRedoSeq)
+          item.live = json.delete(:live)
+          item.accounts = json.delete(:accounts)
         end
       end
     end

data/lib/zm/client/backup/backups_builder.rb

@@ -5,7 +5,7 @@ module Zm
     # class factory [Backup]
     class BackupsBuilder < Base::ObjectsBuilder
       def initialize(parent, json)
-        super(parent, json)
+        super
         @json_item_key = :backup
       end
 

data/lib/zm/client/backup/backups_collection.rb

@@ -11,7 +11,8 @@ module Zm
       private
 
       def make_query
-        soap_request = SoapElement.admin(SoapAdminConstants::BACKUP_QUERY_REQUEST).add_attribute(SoapConstants::QUERY, {})
+        soap_request = SoapElement.admin(SoapAdminConstants::BACKUP_QUERY_REQUEST)
+                                  .add_attribute(SoapConstants::QUERY, {})
         sac.target_invoke(soap_request, @parent.id)
       end
 

data/lib/zm/client/base/account_search_objects_collection.rb

@@ -8,28 +8,38 @@ module Zm
         attr_accessor :more
 
         def initialize(parent)
-          super(parent)
+          super
           @more = true
           reset_query_params
         end
 
         def find(id)
-          jsns = { m: { id: id, html: 1 } }
-
-          soap_request = SoapElement.mail(SoapMailConstants::GET_MSG_REQUEST).add_attributes(jsns)
-          rep = @parent.sacc.invoke(soap_request)
+          rep = @parent.soap_connector.invoke(build_find(id))
           entry = rep[:GetMsgResponse][:m].first
 
           MessageJsnsInitializer.create(@parent, entry)
         end
 
+        def build_find(id)
+          SoapElement.mail(SoapMailConstants::GET_MSG_REQUEST)
+                     .add_attributes({ m: { id: id, html: SoapUtils::ON } })
+        end
+
         def start_at(start_at)
-          @start_at = start_at
+          @start_at = if start_at.is_a?(Time)
+                        start_at.to_i * 1000
+                      elsif start_at.is_a?(Date)
+                        start_at.to_time.to_i * 1000
+                      end
           self
         end
 
         def end_at(end_at)
-          @end_at = end_at
+          @end_at = if end_at.is_a?(Time)
+                      end_at.to_i * 1000
+                    elsif end_at.is_a?(Date)
+                      end_at.to_time.to_i * 1000
+                    end
           self
         end
 
@@ -59,7 +69,6 @@ module Zm
         def order(sort_by)
           return self if @sort_by == sort_by
 
-          @all = nil
           @sort_by = sort_by
           self
         end
@@ -73,9 +82,11 @@ module Zm
           reset_query_params
         end
 
-        private
-
         def make_query
+          @parent.soap_connector.invoke(build_query)
+        end
+
+        def build_query
           jsns = {
             types: @type,
             offset: @offset,
@@ -87,12 +98,28 @@ module Zm
 
           jsns.merge!(build_options)
 
-          jsns.reject! { |_, v| v.nil? }
+          jsns.compact!
 
-          soap_request = SoapElement.mail(SoapMailConstants::SEARCH_REQUEST).add_attributes(jsns)
-          @parent.sacc.invoke(soap_request)
+          SoapElement.mail(SoapMailConstants::SEARCH_REQUEST)
+                     .add_attributes(jsns)
         end
 
+        def delete_all(ids)
+          attrs = {
+            op: :delete,
+            id: ids.join(',')
+          }
+
+          attrs.compact!
+
+          soap_request = SoapElement.mail(SoapMailConstants::ITEM_ACTION_REQUEST)
+          node_action = SoapElement.create(SoapConstants::ACTION).add_attributes(attrs)
+          soap_request.add_node(node_action)
+          @parent.soap_connector.invoke(soap_request)
+        end
+
+        private
+
         def search_builder
           @builder_class.new(@parent, search_response)
         end
@@ -122,14 +149,13 @@ module Zm
         end
 
         def build_options
-          start_at_ts = @start_at.is_a?(Time) ? (@start_at.to_f * 1000).to_i : nil
-          end_at_ts = @end_at.is_a?(Time) ? (@end_at.to_f * 1000).to_i : nil
-
-          {
+          h = {
             resultMode: @resultMode,
-            calExpandInstStart: start_at_ts,
-            calExpandInstEnd: end_at_ts
-          }.delete_if { |_, v| v.nil? }
+            calExpandInstStart: @start_at,
+            calExpandInstEnd: @end_at
+          }
+          h.compact!
+          h
         end
 
         def reset_query_params

data/lib/zm/client/base/admin_objects_collection.rb

@@ -12,9 +12,6 @@ module Zm
         end
 
         def find_by(hash)
-          item = find_in_cache(hash)
-          return item unless item.nil?
-
           find_by!(hash)
         end
 
@@ -25,28 +22,26 @@ module Zm
         end
 
         def ldap
-          @all = nil
           @apply_cos = SoapUtils::OFF
           self
         end
 
         def where(ldap_query)
-          @all = nil if ldap_filter.add(ldap_query)
+          ldap_filter.add(ldap_query)
 
           self
         end
 
-        def attrs(*attrs)
-          attrs.map!(&:to_s)
-          attrs.map!(&:strip)
-          attrs.sort!
-          attrs.uniq!
-          attrs.delete_if { |attr| attr.nil? || attr.empty? }
+        def attrs(*attributes)
+          attributes.flatten!
+          attributes.map! { |attr| attr.to_s.strip }
+          attributes.sort!
+          attributes.uniq!
+          attributes.delete_if { |attr| attr.nil? || attr.empty? }
 
-          return self if @attrs == attrs
+          return self if @attrs == attributes
 
-          @all = nil
-          @attrs = attrs
+          @attrs = attributes
           self
         end
 
@@ -59,7 +54,6 @@ module Zm
         end
 
         def clear
-          @all = nil
           ldap_filter.clear
           reset_query_params
           self
@@ -87,28 +81,27 @@ module Zm
           @persistent = previous_persistent
         end
 
-        private
-
         def make_query
-          soap_request = SoapElement.admin(SoapAdminConstants::SEARCH_DIRECTORY_REQUEST)
-          soap_request.add_attributes(jsns)
-          response = sac.invoke(soap_request)
+          response = sac.invoke(build_query)
           clear unless @persistent
           response
         end
 
-        def ldap_filter
-          @ldap_filter ||= LdapFilter.new
+        def build_query
+          SoapElement.admin(SoapAdminConstants::SEARCH_DIRECTORY_REQUEST)
+                     .add_attributes(jsns)
         end
 
-        def find_in_cache(hash)
-          return nil if @all.nil?
+        private
+
+        def ldap_filter
+          return @ldap_filter if defined? @ldap_filter
 
-          @all.find { |item| item.send(hash.keys.first) == hash.values.first }
+          @ldap_filter = LdapFilter.new
         end
 
         def jsns
-          {
+          h = {
             query: ldap_filter.join,
             maxResults: @max_result,
             limit: @limit,
@@ -121,7 +114,9 @@ module Zm
             sortAscending: @sort_ascending,
             countOnly: @count_only,
             attrs: attrs_comma
-          }.reject { |_, v| v.nil? }
+          }
+          h.compact!
+          h
         end
       end
     end

data/lib/zm/client/base/base_account_jsns_builder.rb

@@ -38,7 +38,7 @@ module Zm
           id: @item.id
         }.merge(hash)
 
-        attrs.reject! { |_, v| v.nil? }
+        attrs.compact!
 
         build(attrs)
       end
@@ -72,9 +72,6 @@ module Zm
           color: @item.color
         }
 
-        # attrs[:rgb] = @item.rgb if @item.rgb_changed?
-        # attrs[:color] = @item.color if @item.color_changed?
-
         build(attrs)
       end
 

data/lib/zm/client/base/base_jsns_initializer.rb

@@ -6,9 +6,15 @@ module Zm
       # class for account object jsns initializer
       class BaseJsnsInitializer
         class << self
+          def create(parent, json)
+            klass.new(parent).tap do |item|
+              update(item, json)
+            end
+          end
+
           def update(item, json)
-            item.id = json[:id]
-            item.name = json[:name]
+            item.id = json.delete(:id)
+            item.name = json.delete(:name)
 
             formatted_json(json).each do |k, v|
               valorise(item, k, v)
@@ -47,12 +53,6 @@ module Zm
             c = value.to_i
             c.to_s == value ? c : value
           end
-
-          # def arrow_name(name)
-          #   return name if name.to_s.start_with?('@')
-          #
-          #   "@#{name}"
-          # end
         end
       end
     end