zm-ruby-client 0.18.3 → 2.0.2

data/lib/zm/client/message/messages_collection.rb

@@ -8,8 +8,23 @@ module Zm
         super(parent)
         @child_class = Message
         @builder_class = MessagesBuilder
-        @type = 'message'
-        @sort_by = 'dateDesc'
+        @type = SoapConstants::MESSAGE
+        @sort_by = SoapConstants::DATE_DESC
+      end
+
+      def find_each
+        @all = []
+
+        @more = true
+        @offset = 0
+        @limit = 500
+
+        while @more
+          @all += build_response
+          @offset += @limit
+        end
+
+        @all
       end
 
       private

data/lib/zm/client/message.rb

@@ -1,5 +1,10 @@
 # frozen_string_literal: true
 
 require 'zm/client/message/message'
+require 'zm/client/message/message_flags'
+require 'zm/client/message/message_recipients'
+require 'zm/client/message/attachments_collection'
+require 'zm/client/message/message_jsns_builder'
+require 'zm/client/message/message_jsns_initializer'
 require 'zm/client/message/messages_builder'
 require 'zm/client/message/messages_collection'

data/lib/zm/client/mountpoint/mountpoint.rb

@@ -3,38 +3,60 @@
 module Zm
   module Client
     # class for account mountpoint
-    class MountPoint < Base::FolderObject
-      include Zm::Model::AttributeChangeObserver
+    class MountPoint < Base::Object
+      include BelongsToFolder
+      # include Zm::Model::AttributeChangeObserver
 
-      INSTANCE_VARIABLE_KEYS = %i[
-        owner rev reminder ms deletable l rid uuid url f broken
-        luuid ruuid activesyncdisabled absFolderPath view zid name id
-        webOfflineSyncDays color rgb
-      ].freeze
+      attr_accessor :owner, :rev, :reminder, :ms, :deletable, :rid, :uuid, :url, :f, :broken, :luuid, :ruuid,
+                    :activesyncdisabled, :absFolderPath, :view, :zid, :id, :webOfflineSyncDays,
+                    :name, :color, :rgb, :l
 
-      attr_reader :owner, :rev, :reminder, :ms, :deletable, :rid, :uuid, :url, :f, :broken, :luuid, :ruuid, :activesyncdisabled, :absFolderPath, :zid, :id, :webOfflineSyncDays
-      attr_writer :view, :zid, :rid
+      # define_changed_attributes :name, :color, :rgb, :l
 
-      define_changed_attributes :name, :color, :rgb, :l
-
-      def all_instance_variable_keys
-        INSTANCE_VARIABLE_KEYS
+      def initialize(parent)
+        @l = FolderDefault::ROOT[:id]
+        super(parent)
       end
 
-      alias parent_id l
-
       def create!
-        rep = @parent.sacc.create_mountpoint(@parent.token, jsns_builder.to_jsns)
-        json = rep[:Body][:CreateMountpointResponse][:link].first
+        rep = @parent.sacc.invoke(jsns_builder.to_jsns)
+        json = rep[:CreateMountpointResponse][:link].first
+
         MountpointJsnsInitializer.update(self, json)
+        @id
+      end
+
+      def modify!
+        raise NotImplementedError
+      end
+
+      def update!(*args)
+        raise NotImplementedError
       end
 
-      def update!(options)
-        # todo
+      def color!
+        # @parent.sacc.invoke(jsns_builder.to_color) if color_changed? || rgb_changed?
+        @parent.sacc.invoke(jsns_builder.to_color)
+
+        true
+      end
+
+      def rename!(new_name)
+        return false if new_name == @name
+
+        @parent.sacc.invoke(jsns_builder.to_rename(new_name))
+        @name = new_name
       end
 
-      def fb
-        nil
+      def reload!
+        raise NotImplementedError
+      end
+
+      def delete!
+        return false if @id.nil?
+
+        @parent.sacc.invoke(jsns_builder.to_delete)
+        @id = nil
       end
 
       private

data/lib/zm/client/mountpoint/mountpoint_jsns_builder.rb

@@ -3,8 +3,7 @@
 module Zm
   module Client
     # class for account folder
-    class MountpointJsnsBuilder < Base::BaseJsnsBuilder
-
+    class MountpointJsnsBuilder < BaseAccountJsnsBuilder
       def to_find
         { link: { l: @item.id } }
       end
@@ -22,13 +21,15 @@ module Zm
           rid: @item.rid
         }.delete_if { |_, v| v.nil? }
 
-        { link: link }
+        attrs = { link: link }
+
+        SoapElement.mail(SoapMailConstants::CREATE_MOUNTPOINT_REQUEST).add_attributes(attrs)
       end
 
       alias to_create to_jsns
 
       def to_update
-        action = {
+        attrs = {
           op: :update,
           id: @item.id,
           f: @item.f,
@@ -41,57 +42,11 @@ module Zm
         }.delete_if { |_, v| v.nil? }
 
         if @item.is_immutable?
-          action.delete(:name)
-          action.delete(:l)
+          attrs.delete(:name)
+          attrs.delete(:l)
         end
 
-        { action: action }
-      end
-
-      def to_rename
-        action = {
-          op: :rename,
-          id: @item.id,
-          name: @item.name
-        }
-
-        { action: action }
-      end
-
-      def to_move
-        action = {
-          op: :move,
-          id: @item.id,
-          l: @item.l
-        }
-
-        { action: action }
-      end
-
-      def to_color
-        action = {
-          op: :color,
-          id: @item.id
-        }
-
-        action[:rgb] = @item.rgb if @item.rgb_changed?
-        action[:color] = @item.color if @item.color_changed?
-
-        { action: action }
-      end
-
-      def to_empty
-        action = {
-          op: :empty,
-          id: @item.id,
-          recursive: false
-        }
-
-        { action: action }
-      end
-
-      def to_delete
-        { action: { op: :delete, id: @item.id } }
+        build(attrs)
       end
     end
   end

data/lib/zm/client/mountpoint/mountpoint_jsns_initializer.rb

@@ -7,26 +7,35 @@ module Zm
       class << self
         def create(parent, json)
           item = MountPoint.new(parent)
-
-          item.instance_variable_set(:@id, json[:id])
-          item.instance_variable_set(:@name, json[:name])
-
           update(item, json)
         end
 
         def update(item, json)
-          item.all_instance_variable_keys.reject { |key| json[key].nil? }.each do |key|
-            item.instance_variable_set(arrow_name(key), json[key])
-          end
+          item.id = json[:id].to_i
+          item.name = json[:name]
+          item.owner = json[:owner]
+          item.rev = json[:rev]
+          item.reminder = json[:reminder]
+          item.ms = json[:ms]
+          item.deletable = json[:deletable]
+          item.rid = json[:rid].to_i
+          item.uuid = json[:uuid]
+          item.url = json[:url]
+          item.f = json[:f]
+          item.broken = json[:broken]
+          item.luuid = json[:luuid]
+          item.ruuid = json[:ruuid]
+          item.activesyncdisabled = json[:activesyncdisabled]
+          item.absFolderPath = json[:absFolderPath]
+          item.view = json[:view]
+          item.zid = json[:zid]
+          item.webOfflineSyncDays = json[:webOfflineSyncDays]
+          item.l = json[:l].to_i
+          item.color = json[:color].to_i
+          item.rgb = json[:rgb].to_i
 
           item
         end
-
-        def arrow_name(name)
-          return name if name.to_s.start_with?('@')
-
-          "@#{name}"
-        end
       end
     end
   end

data/lib/zm/client/mountpoint/mountpoints_builder.rb

@@ -4,16 +4,15 @@ module Zm
   module Client
     # class factory [mountpoints]
     class MountPointsBuilder < Base::ObjectsBuilder
-      def initialize(account, json)
-        @account = account
-        @json = json
+      def initialize(parent, json)
+        super(parent, json)
         @key_link = :link
         @key_folder = :folder
         @list = []
       end
 
       def make
-        root = @json[:Body][:GetFolderResponse][@key_folder]
+        root = @json[:GetFolderResponse][@key_folder]
 
         construct_tree(root)
 
@@ -24,7 +23,7 @@ module Zm
         json_folders.each do |json_folder|
           if json_folder[@key_link].is_a?(Array)
             @list += json_folder[@key_link].map do |json_link|
-              MountpointJsnsInitializer.create(@account, json_link)
+              MountpointJsnsInitializer.create(@parent, json_link)
             end
           end
 

data/lib/zm/client/mountpoint/mountpoints_collection.rb

@@ -4,7 +4,6 @@ module Zm
   module Client
     # collection of mountpoints
     class MountPointsCollection < Base::AccountObjectsCollection
-
       attr_reader :root
 
       attr_accessor :view, :tr, :visible, :needGranteeName, :depth
@@ -33,7 +32,7 @@ module Zm
       private
 
       def make_query
-        @parent.sacc.get_folder(@parent.token, jsns_builder.to_jsns)
+        @parent.sacc.invoke(jsns_builder.to_jsns)
       end
 
       def reset_query_params

data/lib/zm/client/mta_queue/mta_queue.rb

@@ -4,56 +4,41 @@ require 'zm/client/mta_queue_item'
 
 module Zm
   module Client
-    class MtaQueue < Base::AdminObject
-      attr_reader :name, :n
+    class MtaQueue < Base::Object
+      include HasSoapAdminConnector
+
+      attr_accessor :name, :n
 
       alias nb_items n
 
       def server
-        parent
-      end
-
-      def to_h
-        hashmap = Hash[all_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 all_instance_variable_keys
-        %w[name n]
+        @parent
       end
 
       def items
         @items ||= MtaQueueItemsCollection.new self
       end
 
-      def do_action(action_name, ids)
-        sac.mail_queue_action(parent.name, name, action_name, ids)
-      end
-
       def hold!(ids)
-        do_action(Zm::Client::MtaQueueAction::HOLD, ids)
+        sac.invoke(jsns_builder.to_jsns(Zm::Client::MtaQueueAction::HOLD, ids))
       end
 
       def release!(ids)
-        do_action(Zm::Client::MtaQueueAction::RELEASE, ids)
+        sac.invoke(jsns_builder.to_jsns(Zm::Client::MtaQueueAction::RELEASE, ids))
       end
 
       def delete!(ids)
-        do_action(Zm::Client::MtaQueueAction::DELETE, ids)
+        sac.invoke(jsns_builder.to_jsns(Zm::Client::MtaQueueAction::DELETE, ids))
       end
 
       def requeue!(ids)
-        do_action(Zm::Client::MtaQueueAction::REQUEUE, ids)
+        sac.invoke(jsns_builder.to_jsns(Zm::Client::MtaQueueAction::REQUEUE, ids))
       end
 
-      def init_from_json(json)
-        @name = json[:name]
-        @n = json[:n].to_i
+      private
+
+      def jsns_builder
+        @jsns_builder ||= MtaQueueJsnsBuilder.new(self)
       end
     end
   end

data/lib/zm/client/mta_queue/mta_queue_jsns_builder.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+module Zm
+  module Client
+    # class for Mta Queue jsns builder
+    class MtaQueueJsnsBuilder
+      def initialize(item)
+        @item = item
+      end
+
+      def to_jsns(op, ids)
+        soap_request = SoapElement.admin(SoapAdminConstants::MAIL_QUEUE_ACTION_REQUEST)
+        node_server = SoapElement.create('server').add_attribute(SoapConstants::NAME, @item.server.name)
+        soap_request.add_node(node_server)
+        node_queue = SoapElement.create('queue')
+        node_server.add_node(node_queue)
+        node_action = SoapElement.create('action').add_attributes({ op: op, by: :id }).add_content(ids.join(','))
+        node_queue.add_node(node_action)
+
+        soap_request
+      end
+
+      def to_list
+        query = {
+          offset: @item.offset,
+          limit: @item.limit
+        }
+        query[:field] = @item.fields.map { |k, v| { name: k, match: { value: v } } } unless @item.fields.empty?
+        query.reject! { |_, v| v.nil? || v.empty? }
+
+        soap_request = SoapElement.admin(SoapAdminConstants::GET_MAIL_QUEUE_REQUEST)
+        node_server = SoapElement.create('server').add_attribute(SoapConstants::NAME, @item.server.name)
+        soap_request.add_node(node_server)
+        node_queue = SoapElement.create('queue').add_attributes({ name: @item.mta_queue.name, scan: 1, query: query })
+        node_server.add_node(node_queue)
+
+        soap_request
+      end
+    end
+  end
+end

data/lib/zm/client/mta_queue/mta_queue_jsns_initializer.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Zm
+  module Client
+    # class for initialize account
+    class MtaQueueJsnsInitializer < Base::BaseJsnsInitializer
+      class << self
+        def create(parent, json)
+          item = MtaQueue.new(parent)
+
+          update(item, json)
+        end
+
+        def update(item, json)
+          item.n = json[:n]
+          item.name = json[:name]
+
+          item
+        end
+      end
+    end
+  end
+end

data/lib/zm/client/mta_queue/mta_queues_builder.rb

@@ -5,21 +5,17 @@ module Zm
     # class factory [MtaQueue]
     class MtaQueuesBuilder < Base::ObjectsBuilder
       def make
-        records = []
-        return records if json_items.nil?
+        return [] if json_items.nil?
 
-        json_items.each do |entry|
-          mta_queue = MtaQueue.new(@parent)
-          mta_queue.init_from_json(entry)
-          records << mta_queue
+        json_items.map do |entry|
+          MtaQueueJsnsInitializer.create(@parent, entry)
         end
-        records
       end
 
       private
 
       def json_items
-        @json_items ||= @json[:Body][json_key][:server].first[:queue]
+        @json_items ||= @json[:GetMailQueueInfoResponse][:server].first[:queue]
       end
     end
   end

data/lib/zm/client/mta_queue/mta_queues_collection.rb

@@ -4,60 +4,40 @@ module Zm
   module Client
     # Collection MtaQueues
     class MtaQueuesCollection < Base::ObjectsCollection
-      METHODS_MISSING_LIST = %i[select each map length].to_set.freeze
-
       def initialize(parent)
         @parent = parent
         reset_query_params
       end
 
-      def all
-        @all ||= all!
-      end
-
-      def all!
-        build_response
-      end
-
       def defaults
         @all || defaults!
       end
 
       def defaults!
-        # queues = []
         Zm::Client::MtaQueueName::ALL.each do |queue_name|
           queue = MtaQueue.new(@parent)
           queue.name = queue_name
           set_dynamic_queue_method(queue)
           @queues_h[queue_name] = queue
-          # queues << queue
         end
-        # @all = queues
+
         @all = @queues_h.values
       end
 
       def find(queue_name)
         raise ZmError, 'Unknown queue name' unless Zm::Client::MtaQueueName::ALL.include?(queue_name)
+
         all! if @queues_h.empty?
         @queues_h[queue_name]
       end
 
-      def method_missing(method, *args, &block)
-        if METHODS_MISSING_LIST.include?(method)
-          build_response.send(method, *args, &block)
-        else
-          super
-        end
-      end
-
-      def respond_to_missing?(method, *)
-        METHODS_MISSING_LIST.include?(method) || super
-      end
-
       private
 
       def make_query
-        sac.get_mail_queue_info(@parent.name)
+        soap_request = SoapElement.admin(SoapAdminConstants::GET_MAIL_QUEUE_INFO_REQUEST)
+        node_server = SoapElement.create('server').add_attribute(SoapConstants::NAME, @parent.name)
+        soap_request.add_node(node_server)
+        sac.invoke(soap_request)
       end
 
       def build_response
@@ -72,7 +52,8 @@ module Zm
       end
 
       def set_dynamic_queue_method(queue)
-        s_name = "@#{queue.name}"
+        s_name = Utils.arrow_name(queue.name)
+
         instance_variable_set(s_name, queue)
         self.class.attr_reader queue.name
         @dynamic_methods << s_name

data/lib/zm/client/mta_queue.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
 require 'zm/client/mta_queue/mta_queue'
+require 'zm/client/mta_queue/mta_queue_jsns_initializer'
+require 'zm/client/mta_queue/mta_queue_jsns_builder'
 require 'zm/client/mta_queue/mta_queues_builder'
 require 'zm/client/mta_queue/mta_queues_collection'

data/lib/zm/client/mta_queue_item/mta_queue_item.rb

@@ -2,11 +2,9 @@
 
 module Zm
   module Client
-    class MtaQueueItem < Base::AdminObject
-      attr_reader :name, :n
-
-      INSTANCE_VARIABLE_KEYS = %i[size fromdomain id reason time to addr filter host from todomain received]
-      attr_reader *INSTANCE_VARIABLE_KEYS
+    class MtaQueueItem < Base::Object
+      attr_accessor :name, :n, :size, :fromdomain, :id, :reason, :time, :to, :addr, :filter, :host, :from, :todomain,
+                    :received
 
       def mta_queue
         parent
@@ -16,36 +14,11 @@ module Zm
         mta_queue.parent
       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 sent_at
         @sent_at ||= Time.at(@time / 1000)
-      rescue StandardError => e
+      rescue StandardError
         nil
       end
-
-      def hold!
-        sac.mail_queue_action(server.name, mta_queue.name, Zm::Client::MtaQueueAction::HOLD, @id)
-      end
-
-      def init_from_json(json)
-        @size = json[:size]
-        @fromdomain = json[:fromdomain]
-        @id = json[:id]
-        @reason = json[:reason]
-        @time = json[:time].to_i
-        @to = json[:to] ? json[:to].split(',') : []
-        @addr = json[:addr]
-        @filter = json[:filter]
-        @host = json[:host]
-        @from = json[:from]
-        @todomain = json[:todomain] ? json[:todomain].split(',') : []
-        @received = json[:received]
-      end
     end
   end
 end

data/lib/zm/client/mta_queue_item/mta_queue_item_jsns_initializer.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module Zm
+  module Client
+    # class for initialize account
+    class MtaQueueItemJsnsInitializer < Base::BaseJsnsInitializer
+      class << self
+        def create(parent, json)
+          item = MtaQueueItem.new(parent)
+
+          update(item, json)
+        end
+
+        def update(item, json)
+          item.size = json[:size]
+          item.fromdomain = json[:fromdomain]
+          item.id = json[:id]
+          item.reason = json[:reason]
+          item.time = json[:time].to_i
+          item.to = json[:to] ? json[:to].split(',') : []
+          item.addr = json[:addr]
+          item.filter = json[:filter]
+          item.host = json[:host]
+          item.from = json[:from]
+          item.todomain = json[:todomain] ? json[:todomain].split(',') : []
+          item.received = json[:received]
+
+          item
+        end
+      end
+    end
+  end
+end

data/lib/zm/client/mta_queue_item/mta_queue_items_builder.rb

@@ -5,22 +5,17 @@ module Zm
     # class factory [MtaQueueItem]
     class MtaQueueItemsBuilder < Base::ObjectsBuilder
       def make
-        records = []
-        return records if json_items.nil?
+        return [] if json_items.nil?
 
-        json_items.each do |entry|
-          mta_queue = MtaQueueItem.new(@parent)
-          mta_queue.init_from_json(entry)
-          records << mta_queue
+        json_items.map do |entry|
+          MtaQueueItemJsnsInitializer.create(@parent, entry)
         end
-        records
       end
 
       private
 
       def json_items
-        # puts @json
-        @json_items ||= @json[:Body][json_key][:server].first[:queue].first[:qi]
+        @json_items ||= @json[:GetMailQueueResponse][:server].first[:queue].first[:qi]
       end
     end
   end