zm-ruby-client 0.18.5 → 2.0.0

data/lib/zm/client/account.rb

@@ -2,6 +2,7 @@
 
 require 'zm/client/account/account'
 require 'zm/client/account/account_jsns_initializer'
+require 'zm/client/account/account_jsns_builder'
 require 'zm/client/account/accounts_builder'
 require 'zm/client/account/accounts_collection'
 require 'zm/client/account/account_dls_membership_collection'

data/lib/zm/client/ace/ace.rb

@@ -3,26 +3,19 @@
 module Zm
   module Client
     # class account ace
-    class Ace < Base::AccountObject
-
-      INSTANCE_VARIABLE_KEYS = %i[zid gt right d]
-
-      attr_accessor *INSTANCE_VARIABLE_KEYS
-
-      def all_instance_variable_keys
-        INSTANCE_VARIABLE_KEYS
-      end
+    class Ace < Base::Object
+      attr_accessor :zid, :gt, :right, :d
 
       def create!
-        rep = @parent.sacc.grant_rights(get_token, jsns_builder.to_jsns)
-        json = rep[:Body][:GrantRightsResponse][:ace].first if rep[:Body][:GrantRightsResponse][:ace].is_a?(Array)
+        rep = @parent.sacc.invoke(jsns_builder.to_jsns)
+
+        json = rep[:GrantRightsResponse][:ace].first if rep[:GrantRightsResponse][:ace].is_a?(Array)
         AceJsnsInitializer.update(self, json) unless json.nil?
         true
       end
 
       def delete!
-        @parent.sacc.revoke_rights(get_token, jsns_builder.to_delete)
-        @parent.all.delete(self)
+        @parent.sacc.invoke(jsns_builder.to_delete)
         true
       end
 
@@ -31,15 +24,6 @@ module Zm
       def jsns_builder
         @jsns_builder ||= AceJsnsBuilder.new(self)
       end
-
-      def get_token(target = self)
-        token = nil
-        return target.token if target.respond_to?(:token) && !target.token.nil?
-
-        token = get_token(target.parent) if target.respond_to?(:parent)
-
-        token
-      end
     end
   end
 end

data/lib/zm/client/ace/ace_jsns_builder.rb

@@ -2,36 +2,35 @@
 
 module Zm
   module Client
-    # class for account folder jsns builder
+    # class for account ace jsns builder
     class AceJsnsBuilder < Base::BaseJsnsBuilder
-
       def to_find
-        return nil if @item.rights.empty?
+        soap_request = SoapElement.account(SoapAccountConstants::GET_RIGHTS_REQUEST)
+
+        soap_request.add_attribute(SoapConstants::ACE, @item.rights.map { |r| { right: r } }) unless @item.rights.empty?
 
-        ace = @item.rights.map { |r| { right: r } }
-        { ace: ace }
+        soap_request
       end
 
       def to_jsns
-        ace = {
-          zid: @item.zid,
-          gt: @item.gt,
-          right: @item.right,
-          d: @item.d
-        }.reject { |_, v| v.nil? }
-
-        { ace: ace }
+        soap_request = SoapElement.account(SoapAccountConstants::GRANT_RIGHTS_REQUEST)
+        soap_request.add_attribute(SoapConstants::ACE, attrs)
+        soap_request
       end
 
       def to_delete
-        ace = {
+        soap_request = SoapElement.account(SoapAccountConstants::REVOKE_RIGHTS_REQUEST)
+        soap_request.add_attribute(SoapConstants::ACE, attrs)
+        soap_request
+      end
+
+      def attrs
+        {
           zid: @item.zid,
           gt: @item.gt,
           right: @item.right,
           d: @item.d
         }.reject { |_, v| v.nil? }
-
-        { ace: ace }
       end
     end
   end

data/lib/zm/client/ace/ace_jsns_initializer.rb

@@ -12,7 +12,6 @@ module Zm
         end
 
         def update(item, json)
-
           item.instance_variable_set(:@zid, json[:zid])
           item.instance_variable_set(:@gt, json[:gt])
           item.instance_variable_set(:@right, json[:right])

data/lib/zm/client/ace/aces_builder.rb

@@ -6,7 +6,6 @@ module Zm
     class AcesBuilder < Base::ObjectsBuilder
       def initialize(parent, json)
         super(parent, json)
-        @child_class = Ace
         @json_item_key = :ace
       end
 

data/lib/zm/client/ace/aces_collection.rb

@@ -8,41 +8,25 @@ module Zm
 
       def initialize(parent)
         super(parent)
+        @child_class = Ace
         @builder_class = AcesBuilder
         @jsns_builder = AceJsnsBuilder.new(self)
         reset_query_params
       end
 
-      def new
-        ace = Ace.new(self)
-        yield(ace) if block_given?
-        ace
-      end
-
       def where(*rights)
         @rights += rights
         @rights.uniq!
         self
       end
 
-      def soap_account_connector
-        @parent.soap_account_connector
-      end
-
-      alias sacc soap_account_connector
-
       private
 
       def make_query
-        @parent.sacc.get_rights(@parent.token, @jsns_builder.to_find)
-      end
-
-      def build_response
-        @builder_class.new(self, make_query).make
+        @parent.sacc.invoke(@jsns_builder.to_find)
       end
 
       def reset_query_params
-        # @rights = %i[sendAs sendOnBehalfOf]
         @rights = []
       end
     end

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

@@ -3,17 +3,15 @@
 module Zm
   module Client
     # class for account appointment
-    class Appointment < Base::AccountObject
+    class Appointment < Base::Object
+      include BelongsToFolder
+      include BelongsToTag
 
-      INSTANCE_VARIABLE_KEYS = %i[id uid name l desc start_at dur end_at tn allDay organizer timezone calItemId apptId invId rev fb transp]
-
-      attr_accessor *INSTANCE_VARIABLE_KEYS
-      attr_writer :folder
-      attr_reader :json
+      attr_accessor :id, :uid, :name, :l, :desc, :start_at, :dur, :end_at, :tn, :allDay, :organizer, :timezone,
+                    :calItemId, :apptId, :invId, :rev, :fb, :transp
       attr_reader :recipients, :attendees, :body
 
       alias description desc
-      alias parent_id l
 
       def initialize(parent)
         @parent = parent
@@ -22,49 +20,58 @@ module Zm
         @attendees = Attendees.new
         @allDay = false
         @timezone = 'Europe/Berlin'
-        yield(self) if block_given?
-      end
-
-      def all_instance_variable_keys
-        INSTANCE_VARIABLE_KEYS
-      end
 
-      def folder
-        @folder ||= @parent.folders.all.find { |folder| folder.id == l }
+        yield(self) if block_given?
       end
 
       def download(dest_file_path, fmt = 'ics')
-        # @parent.uploader.download_file(folder.absFolderPath, 'ics', ['appointment'], [id], dest_file_path)
         uploader = Upload.new(@parent, RestAccountConnector.new)
-        uploader.download_file(folder.absFolderPath, fmt, ['appointment'], [id], dest_file_path)
+        uploader.download_file(Zm::Client::FolderDefault::ROOT[:path], fmt, [Zm::Client::FolderView::APPOINTMENT], [@id], dest_file_path)
       end
 
       def create!
-        rep = @parent.sacc.create_appointment(@parent.token, jsns_builder.to_jsns)
-        rep_h = rep[:Body][:CreateAppointmentResponse]
+        soap_request = SoapElement.mail(SoapMailConstants::CREATE_APPOINTMENT_REQUEST).add_attributes(jsns_builder.to_jsns)
+        rep = @parent.sacc.invoke(soap_request)
 
-        aji = AppointmentJsnsInitializer.new(@parent, rep_h)
+        aji = AppointmentJsnsInitializer.new(@parent, rep[:CreateAppointmentResponse])
         aji.appointment = self
         aji.update
+        @id
       end
 
       def modify!
-        @parent.sacc.modify_appointment(@parent.token, jsns_builder.to_update)
+        soap_request = SoapElement.mail(SoapMailConstants::MODIFY_APPOINTMENT_REQUEST).add_attributes(jsns_builder.to_update)
+        @parent.sacc.invoke(soap_request)
+        true
+      end
+
+      def update!(*args)
+        raise NotImplementedError
+      end
+
+      def rename!(*args)
+        raise NotImplementedError
+      end
+
+      def delete!
+        return false if @id.nil?
+
+        @parent.sacc.invoke(jsns_builder.to_delete)
+        @id = nil
       end
 
       def reload!
-        rep = @parent.sacc.get_msg(@parent.token, @id)
-        entry = rep[:Body][:GetMsgResponse][:m].first
+        jsns = { m: { id: @id, html: 1 } }
+
+        soap_request = SoapElement.mail(SoapMailConstants::GET_MSG_REQUEST).add_attributes(jsns)
+        rep = @parent.sacc.invoke(soap_request)
+        entry = rep[:GetMsgResponse][:m].first
+
         aji = AppointmentJsnsInitializer.new(@parent, entry)
         aji.appointment = self
         aji.create
       end
 
-      def delete!
-        @parent.sacc.cancel_appointment(@parent.token, jsns_builder.to_delete)
-        super
-      end
-
       def free!
         self.fb = 'F'
         self.transp = 'O'
@@ -111,9 +118,10 @@ module Zm
         end
 
         def del(attendee)
-          if attendee.is_a?(Attendee)
+          case attendee
+          when Attendee
             @attendees.delete(attendee)
-          elsif attendee.is_a?(String)
+          when String
             @attendees.delete_if { |at| at.email == attendee }
           end
         end

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

@@ -3,24 +3,12 @@
 module Zm
   module Client
     # class for account appointment
-    class AppointmentJsnsBuilder
-
-      def initialize(appointment)
-        @appointment = appointment
-      end
-
-      def to_delete
-        {
-          comp: 0,
-          id: @appointment.id
-        }
-      end
-
+    class AppointmentJsnsBuilder < BaseAccountJsnsBuilder
       def to_jsns
         {
           m: {
-            l: @appointment.l,
-            su: @appointment.name,
+            l: @item.l,
+            su: @item.name,
             e: recipients_to_jsns,
             mp: body_to_jsns,
             inv: {
@@ -35,13 +23,13 @@ module Zm
       def to_update
         jsns = to_jsns
         jsns[:comp] = 0
-        jsns[:id] = @appointment.id
-        jsns[:m][:inv][:uid] = @appointment.uid
+        jsns[:id] = @item.id
+        jsns[:m][:inv][:uid] = @item.uid
         jsns
       end
 
       def recipients_to_jsns
-        @appointment.recipients.map do |recipient|
+        @item.recipients.map do |recipient|
           {
             t: recipient.field,
             a: recipient.email,
@@ -53,37 +41,37 @@ module Zm
       def body_to_jsns
         [
           {
-            ct: 'multipart/alternative',
+            ct: ContentPart::ALTERNATIVE,
             mp: [body_text_jsns, body_html_jsns]
           }
         ]
       end
 
       def body_text_jsns
-        { ct: 'text/plain', content: { _content: @appointment.body.text } }
+        { ct: ContentType::TEXT, content: { _content: @item.body.text } }
       end
 
       def body_html_jsns
-        { ct: 'text/html', content: { _content: @appointment.body.html } }
+        { ct: ContentType::HTML, content: { _content: @item.body.html } }
       end
 
       def comp_to_jsns
         [
           {
-            allDay: @appointment.allDay,
+            allDay: @item.allDay,
             at: attendees_to_jsns,
             e: end_at_jsns,
             s: start_at_jsns,
             or: organizer_to_jsns,
-            name: @appointment.name,
-            fb: @appointment.fb,
-            transp: @appointment.transp
+            name: @item.name,
+            fb: @item.fb,
+            transp: @item.transp
           }.reject { |_, v| v.nil? }
         ]
       end
 
       def attendees_to_jsns
-        @appointment.attendees.map do |attendee|
+        @item.attendees.map do |attendee|
           {
             a: attendee.email,
             d: attendee.display_name,
@@ -96,29 +84,29 @@ module Zm
 
       def end_at_jsns
         {
-          d: @appointment.end_at.strftime(time_format),
-          tz: @appointment.timezone
+          d: @item.end_at.strftime(time_format),
+          tz: @item.timezone
         }
       end
 
       def start_at_jsns
         {
-          d: @appointment.start_at.strftime(time_format),
-          tz: @appointment.timezone
+          d: @item.start_at.strftime(time_format),
+          tz: @item.timezone
         }
       end
 
       def organizer_to_jsns
-        return nil if @appointment.organizer.nil?
+        return nil if @item.organizer.nil?
 
         {
-          a: @appointment.organizer.email,
-          d: @appointment.organizer.display_name
+          a: @item.organizer.email,
+          d: @item.organizer.display_name
         }.reject { |_, v| v.nil? }
       end
 
       def time_format
-        @time_format ||= @appointment.allDay ? '%Y%m%d' : '%Y%m%dT%H%M00'
+        @time_format ||= @item.allDay ? '%Y%m%d' : '%Y%m%dT%H%M00'
       end
     end
   end

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

@@ -4,7 +4,6 @@ module Zm
   module Client
     # class for account appointment
     class AppointmentJsnsInitializer
-
       attr_accessor :appointment
 
       def initialize(parent, json)
@@ -46,7 +45,9 @@ module Zm
       end
 
       def init_from_search
-        @appointment.organizer = Zm::Client::Appointment::Organizer.new(search_organizer_name) unless search_organizer_name.nil?
+        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]
@@ -64,7 +65,9 @@ module Zm
         @appointment.apptId = comp[:apptId]
         @appointment.allDay = comp[:allDay] unless comp[:allDay].nil?
 
-        @appointment.organizer = Zm::Client::Appointment::Organizer.new(comp_organizer_name) unless comp_organizer_name.nil?
+        unless comp_organizer_name.nil?
+          @appointment.organizer = Zm::Client::Appointment::Organizer.new(comp_organizer_name)
+        end
 
         attendees.each do |attendee|
           @appointment.attendees.add(Zm::Client::Appointment::Attendee.new(attendee[:a]))

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

@@ -5,28 +5,16 @@ module Zm
     # class factory [appointments]
     class AppointmentsBuilder < Base::ObjectsBuilder
       def initialize(parent, json)
-        @parent = parent
-        @json = json
+        super(parent, json)
+        @json_item_key = :appt
       end
 
       def make
-        root.map do |s|
-          # Appointment.new(@parent, s)
-          # Appointment.new(@parent)
-          AppointmentJsnsInitializer.new(@parent, s).create
-        end
-      end
-
-      def ids
-        root.map { |s| s[:id] }
-      end
-
-      def root
-        root = @json[:Body][:SearchResponse][:appt]
-        return [] if root.nil?
+        return [] if json_items.nil?
 
-        root = [root] unless root.is_a?(Array)
-        root
+        json_items.map do |entry|
+          AppointmentJsnsInitializer.new(@parent, entry).create
+        end
       end
     end
   end

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

@@ -8,15 +8,36 @@ module Zm
         super(parent)
         @child_class = Appointment
         @builder_class = AppointmentsBuilder
-        @type = 'appointment'
-        @sort_by = 'dateAsc'
+        @type = SoapConstants::APPOINTMENT
+        @sort_by = SoapConstants::DATE_ASC
       end
 
       def find(id)
-        rep = @parent.sacc.get_msg(@parent.token, id)
-        entry = rep[:Body][:GetMsgResponse][:m].first
+        jsns = { m: { id: id, html: 1 } }
+
+        soap_request = SoapElement.mail(SoapMailConstants::GET_MSG_REQUEST).add_attributes(jsns)
+        rep = @parent.sacc.invoke(soap_request)
+        entry = rep[:GetMsgResponse][:m].first
+
         AppointmentJsnsInitializer.new(@parent, entry).create
       end
+
+      def find_each
+        @all = []
+        (1970..(Time.now.year + 10)).each do |year|
+          @start_at = Time.new(year, 1, 1)
+          @end_at = Time.new(year, 12, 31)
+          @more = true
+          @offset = 0
+          @limit = 500
+
+          while @more
+            @all += build_response
+            @offset += @limit
+          end
+        end
+        @all
+      end
     end
   end
 end

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

@@ -2,10 +2,8 @@
 
 module Zm
   module Client
-    class Backup < Base::AdminObject
-      INSTANCE_VARIABLE_KEYS = %i[label type aborted start end minRedoSeq maxRedoSeq live accounts]
-
-      attr_reader *INSTANCE_VARIABLE_KEYS
+    class Backup < Base::Object
+      attr_accessor :label, :type, :aborted, :start, :end, :minRedoSeq, :maxRedoSeq, :live, :accounts
 
       alias name label
 
@@ -13,29 +11,15 @@ module Zm
         parent
       end
 
-      def all_instance_variable_keys
-        INSTANCE_VARIABLE_KEYS
-      end
-
-      # def to_h
-      #   hashmap = Hash[INSTANCE_VARIABLE_KEYS.map { |key| [key, instance_variable_get(arrow_name(key))] }]
-      #   hashmap.delete_if { |_, v| v.nil? }
-      #   hashmap
-      # end
-
-      def to_s
-        to_h.to_s
-      end
-
       def start_at
         @start_at ||= Time.at(@start / 1000)
-      rescue StandardError => e
+      rescue StandardError
         nil
       end
 
       def end_at
         @end_at ||= Time.at(@end / 1000)
-      rescue StandardError => e
+      rescue StandardError
         nil
       end
 
@@ -46,18 +30,6 @@ module Zm
       def incremental?
         @type == Zm::Client::BackupTypes::INCREMENTAL
       end
-
-      def init_from_json(json)
-        @label = json[:label]
-        @type = json[:type]
-        @aborted = json[:aborted]
-        @start = json[:start].to_i
-        @end = json[:end].to_i
-        @minRedoSeq = json[:minRedoSeq]
-        @maxRedoSeq = json[:maxRedoSeq]
-        @live = json[:live]
-        @accounts = json[:accounts]
-      end
     end
   end
 end

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

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Zm
+  module Client
+    # class for initialize backup
+    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]
+
+          item
+        end
+      end
+    end
+  end
+end

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

@@ -4,22 +4,17 @@ module Zm
   module Client
     # class factory [Backup]
     class BackupsBuilder < Base::ObjectsBuilder
-      def make
-        records = []
-        return records if json_items.nil?
-
-        json_items.each do |entry|
-          backup = Backup.new(@parent)
-          backup.init_from_json(entry)
-          records << backup
-        end
-        records
+      def initialize(parent, json)
+        super(parent, json)
+        @json_item_key = :backup
       end
 
-      private
+      def make
+        return [] if json_items.nil?
 
-      def json_items
-        @json_items ||= @json[:Body][json_key][:backup]
+        json_items.map do |entry|
+          BackupJsnsInitializer.create(@parent, entry)
+        end
       end
     end
   end

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

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

data/lib/zm/client/backup.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
 require 'zm/client/backup/backup'
+require 'zm/client/backup/backup_jsns_initializer'
 require 'zm/client/backup/backups_builder'
 require 'zm/client/backup/backups_collection'