zm-ruby-client 0.18.3 → 2.0.2

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

@@ -4,7 +4,7 @@ module Zm
   module Client
     # Collection MtaQueues
     class MtaQueueItemsCollection < Base::ObjectsCollection
-      METHODS_MISSING_LIST = %i[select each map length].to_set.freeze
+      attr_reader :offset, :limit, :fields
 
       def initialize(parent)
         @parent = parent
@@ -19,14 +19,6 @@ module Zm
         mta_queue.parent
       end
 
-      def all
-        @all ||= all!
-      end
-
-      def all!
-        build_response
-      end
-
       def where(fields)
         @fields = fields
         self
@@ -46,42 +38,11 @@ module Zm
         all.map(&:id)
       end
 
-      def do_action(action_name)
-        sac.mail_queue_action(server.name, mta_queue.name, action_name, ids)
-      end
-
-      def hold!
-        do_action(Zm::Client::MtaQueueAction::HOLD)
-      end
-
-      def release!
-        do_action(Zm::Client::MtaQueueAction::RELEASE)
-      end
-
-      def delete!
-        do_action(Zm::Client::MtaQueueAction::DELETE)
-      end
-
-      def requeue!
-        do_action(Zm::Client::MtaQueueAction::REQUEUE)
-      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
-        json = sac.get_mail_queue(@parent.parent.name, @parent.name, @offset, @limit, @fields)
+        json = sac.invoke(jsns_builder.to_list)
+
         reset_query_params
         json
       end
@@ -94,6 +55,10 @@ module Zm
         super
         @fields = {}
       end
+
+      def jsns_builder
+        @jsns_builder ||= MtaQueueJsnsBuilder.new(self)
+      end
     end
   end
 end

data/lib/zm/client/mta_queue_item.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
 require 'zm/client/mta_queue_item/mta_queue_item'
+require 'zm/client/mta_queue_item/mta_queue_item_jsns_initializer'
 require 'zm/client/mta_queue_item/mta_queue_items_builder'
-require 'zm/client/mta_queue_item/mta_queue_items_collection'
+require 'zm/client/mta_queue_item/mta_queue_items_collection'

data/lib/zm/client/resource/resource.rb

@@ -1,115 +1,48 @@
 # frozen_string_literal: true
 
-require 'zm/modules/common/resource_common'
-
 module Zm
   module Client
     # objectClass: zimbraCalendarResource
-    class Resource < Base::AdminObject
-      attr_accessor :home_url, :zimbraCalResAutoDeclineRecurring
-
-      def initialize(parent)
-        extend(ResourceCommon)
-        super(parent)
-        @grantee_type = 'usr'.freeze
-      end
-
-      def all_instance_variable_keys
-        ResourceCommon::ALL_ATTRS
-      end
-
-      def rest_account_connector
-        @rest_account_connector ||= RestAccountConnector.new
-      end
-
-      alias rac rest_account_connector
-
-      def logged?
-        !@token.nil?
-      end
-
-      def login
-        if @parent.logged?
-          admin_login
-        else
-          account_login
-        end
-      end
-
-      def account_login_preauth
-        domain_key
-        raise ZmError, 'domain key is required to login !' if @domainkey.nil?
-
-        @token = sacc.auth_preauth(@name, @domainkey)
-      end
-
-      def account_login_password
-        raise ZmError, 'password is required to login !' if password.nil?
+    class Resource < Base::MailboxObject
+      LOCATION = 'Location'
+      EQUIPMENT = 'Equipment'
+      TYPES = [LOCATION, EQUIPMENT].freeze
 
-        @token = sacc.auth_password(@name, @password)
-      end
-
-      def admin_login
-        @token = sac.delegate_auth(@name)
-      end
-
-      def domain_name
-        @name.split('@').last
-      end
-
-      def domain_key
-        @domainkey ||= @parent.domain_key(domain_name)
-      end
-
-      def infos
-        @infos ||= read_infos
+      def delete!
+        sac.invoke(jsns_builder.to_delete)
+        @id = nil
       end
 
-      def read_infos
-        @infos = sacc.get_info(@token)[:Body][:GetInfoResponse]
-        @id = @infos[:id]
-        @used = @infos[:used]
-        @public_url = @infos[:publicURL]
-        @zimbraCOSId = @infos[:cos][:id]
-        @home_url = @infos[:rest]
+      def modify!
+        sac.invoke(jsns_builder.to_update)
+        true
       end
 
-      def folders
-        @folders ||= FoldersCollection.new(self)
+      def create!
+        resp = sac.invoke(jsns_builder.to_create)
+        @id = resp[:CreateCalendarResourceResponse][:calresource].first[:id]
       end
 
-      def delete!
-        sac.delete_resource(@id)
+      def attrs_write
+        @parent.zimbra_attributes.all_resource_attrs_writable_names
       end
 
-      def update!(hash)
-        sac.modify_resource(@id, hash)
-        hash.each { |k, v| send "#{k}=", v }
+      def location?
+        zimbraCalResType == LOCATION
       end
 
-      def modify!
-        attrs_to_modify = instance_variables_array(attrs_write)
-        return if attrs_to_modify.empty?
-
-        sac.modify_resource(@id, attrs_to_modify)
+      def equipment?
+        zimbraCalResType == EQUIPMENT
       end
 
-      def create!
-        rep = sac.create_resource(
-          @name,
-          @password,
-          instance_variables_array(attrs_write)
-        )
-        @id = rep[:Body][:CreateCalendarResourceResponse][:calresource].first[:id]
-      end
+      private
 
-      def rename!(email)
-        sac.rename_resource(@id, email)
-        @name = email
+      def do_update!(hash)
+        sac.invoke(jsns_builder.to_patch(hash))
       end
 
-      def uploader
-        @uploader ||= Upload.new(self)
+      def jsns_builder
+        @jsns_builder ||= ResourceJsnsBuilder.new(self)
       end
     end
   end

data/lib/zm/client/resource/resource_jsns_builder.rb

@@ -0,0 +1,79 @@
+# frozen_string_literal: true
+
+module Zm
+  module Client
+    # class for resource jsns builder
+    class ResourceJsnsBuilder
+      def initialize(item)
+        @item = item
+      end
+
+      def to_create
+        req = {
+          name: @item.name,
+          password: @item.password
+        }.reject { |_, v| v.nil? }
+
+        soap_request = SoapElement.admin(SoapAdminConstants::CREATE_CALENDAR_RESOURCE_REQUEST).add_attributes(req)
+
+        attrs_only_set_h.each do |key, values|
+          values.each do |value|
+            node_attr = SoapElement.create(SoapConstants::A).add_attribute(SoapConstants::N, key).add_content(value)
+            soap_request.add_node(node_attr)
+          end
+        end
+
+        soap_request
+      end
+
+      def to_update
+        soap_request = SoapElement.admin(SoapAdminConstants::MODIFY_CALENDAR_RESOURCE_REQUEST).add_attribute(
+          SoapConstants::ID, @item.id
+        )
+
+        attrs_only_set_h.each do |key, values|
+          values.each do |value|
+            node_attr = SoapElement.create(SoapConstants::A).add_attribute(SoapConstants::N, key).add_content(value)
+            soap_request.add_node(node_attr)
+          end
+        end
+
+        soap_request
+      end
+
+      def to_patch(hash)
+        soap_request = SoapElement.admin(SoapAdminConstants::MODIFY_CALENDAR_RESOURCE_REQUEST).add_attribute(
+          SoapConstants::ID, @item.id
+        )
+
+        hash.each do |key, values|
+          values = [values] unless values.is_a?(Array)
+          values.each do |value|
+            node_attr = SoapElement.create(SoapConstants::A).add_attribute(SoapConstants::N, key).add_content(value)
+            soap_request.add_node(node_attr)
+          end
+        end
+
+        soap_request
+      end
+
+      def to_delete
+        SoapElement.admin(SoapAdminConstants::DELETE_CALENDAR_RESOURCE_REQUEST).add_attribute('id', @item.id)
+      end
+
+      def attrs_only_set_h
+        selected_attrs = @item.attrs_write.map { |a| Utils.arrow_name_sym(a) }
+        attrs_only_set = @item.instance_variables & selected_attrs
+
+        arr = attrs_only_set.map do |name|
+          n = name.to_s[1..]
+          values = @item.instance_variable_get(name)
+          values = [values] unless values.is_a?(Array)
+          [n, values]
+        end
+
+        Hash[arr]
+      end
+    end
+  end
+end

data/lib/zm/client/resource/resource_jsns_initializer.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Zm
+  module Client
+    # class for initialize resource
+    class ResourceJsnsInitializer < Base::BaseJsnsInitializer
+      class << self
+        def create(parent, json)
+          item = Resource.new(parent)
+
+          update(item, json)
+        end
+
+        def update(item, json)
+          item.id = json[:id]
+          item.name = json[:name]
+          item.used = json[:used] unless json[:used].nil?
+          item.zimbraMailQuota = json[:limit] unless json[:limit].nil?
+
+          formatted_json(json).each do |k, v|
+            valorise(item, k, v)
+          end
+
+          item
+        end
+      end
+    end
+  end
+end

data/lib/zm/client/resource/resources_builder.rb

@@ -6,9 +6,16 @@ module Zm
     class ResourcesBuilder < Base::ObjectsBuilder
       def initialize(parent, json)
         super(parent, json)
-        @child_class = Resource
         @json_item_key = :calresource
       end
+
+      def make
+        return [] if json_items.nil?
+
+        json_items.map do |entry|
+          ResourceJsnsInitializer.create(@parent, entry)
+        end
+      end
     end
   end
 end

data/lib/zm/client/resource/resources_collection.rb

@@ -11,12 +11,17 @@ module Zm
         super(parent)
       end
 
-      def find_by(hash)
-        rep = sac.get_resource(hash.values.first, hash.keys.first, attrs_comma)
-        entry = rep[:Body][:GetCalendarResourceResponse][:calresource].first
+      def find_by!(hash)
+        soap_request = SoapElement.admin(SoapAdminConstants::GET_CALENDAR_RESOURCE_REQUEST)
+        node_res = SoapElement.create(SoapConstants::CAL_RESOURCE).add_attribute(SoapConstants::BY,
+                                                                        hash.keys.first).add_content(hash.values.first)
+        soap_request.add_node(node_res)
+        soap_request.add_attribute(SoapConstants::ATTRS, attrs_comma)
+        soap_request.add_attribute(SoapConstants::APPLY_COS, @apply_cos)
+        entry = sac.invoke(soap_request)[:GetCalendarResourceResponse][:calresource].first
 
         reset_query_params
-        build_from_entry(entry)
+        ResourceJsnsInitializer.create(@parent, entry)
       end
 
       private
@@ -24,9 +29,6 @@ module Zm
       def reset_query_params
         super
         @attrs = SearchType::Attributes::RESOURCE.dup
-        @all_servers = 1
-        @refresh = 0
-        @apply_cos = 1
       end
     end
   end

data/lib/zm/client/resource.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
 require 'zm/client/resource/resource'
+require 'zm/client/resource/resource_jsns_builder'
+require 'zm/client/resource/resource_jsns_initializer'
 require 'zm/client/resource/resources_builder'
 require 'zm/client/resource/resources_collection'

data/lib/zm/client/search_folder/search_folder.rb

@@ -3,34 +3,56 @@
 module Zm
   module Client
     # class account SearchFolder
-    class SearchFolder < Base::FolderObject
-      include Zm::Model::AttributeChangeObserver
+    class SearchFolder < Base::Object
+      # include Zm::Model::AttributeChangeObserver
 
-      INSTANCE_VARIABLE_KEYS = %i[id uuid deletable name absFolderPath l luuid color rgb rev ms webOfflineSyncDays activesyncdisabled query sortBy types]
+      attr_accessor :id, :uuid, :deletable, :name, :absFolderPath, :l, :luuid, :color, :rgb, :rev, :ms,
+                    :webOfflineSyncDays, :activesyncdisabled, :query, :sortBy, :types,
+                    :name, :color, :rgb, :l, :query, :sortBy
 
-      # attr_accessor *INSTANCE_VARIABLE_KEYS
-      attr_reader :id, :absFolderPath, :types
-
-      define_changed_attributes :name, :color, :rgb, :l, :query, :sortBy
+      # define_changed_attributes :name, :color, :rgb, :l, :query, :sortBy
 
       def initialize(parent)
-        super(parent)
+        @l = FolderDefault::ROOT[:id]
         @types = 'messages'
-      end
-
-      def all_instance_variable_keys
-        INSTANCE_VARIABLE_KEYS
+        super(parent)
       end
 
       def create!
-        rep = @parent.sacc.create_search_folder(@parent.token, jsns_builder.to_jsns)
-        json = rep[:Body][:CreateSearchFolderResponse][:search].first
+        rep = @parent.sacc.invoke(jsns_builder.to_jsns)
+        json = rep[:CreateSearchFolderResponse][:search].first
         SearchFolderJsnsInitializer.update(self, json)
+        @id
       end
 
       def modify!
-        @parent.sacc.modify_search_folder(@parent.token, jsns_builder.to_modify)
-        super
+        @parent.sacc.invoke(jsns_builder.to_modify)
+        true
+      end
+
+      def update!(*args)
+        raise NotImplementedError
+      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 color!
+        # @parent.sacc.invoke(jsns_builder.to_color) if color_changed? || rgb_changed?
+        @parent.sacc.invoke(jsns_builder.to_color)
+
+        true
+      end
+
+      def delete!
+        return false if @id.nil?
+
+        @parent.sacc.invoke(jsns_builder.to_delete)
+        @id = nil
       end
 
       private

data/lib/zm/client/search_folder/search_folder_jsns_builder.rb

@@ -4,13 +4,12 @@ module Zm
   module Client
     # class for account search folder jsns builder
     class SearchFolderJsnsBuilder
-
       def initialize(search_folder)
         @item = search_folder
       end
 
       def to_jsns
-        search = {
+        attrs = {
           name: @item.name,
           query: @item.query,
           types: @item.types,
@@ -19,23 +18,29 @@ module Zm
           sortBy: @item.sortBy
         }.delete_if { |_, v| v.nil? }
 
-        { search: search }
+        soap_request = SoapElement.mail(SoapMailConstants::CREATE_SEARCH_FOLDER_REQUEST)
+        node_search = SoapElement.create(SoapConstants::SEARCH).add_attributes(attrs)
+        soap_request.add_node(node_search)
+        soap_request
       end
 
       alias to_create to_jsns
 
       def to_modify
-        search = {
+        attrs = {
           id: @item.id,
           query: @item.query,
           types: @item.types
         }.reject { |_, v| v.nil? }
 
-        { search: search }
+        soap_request = SoapElement.mail(SoapMailConstants::MODIFY_SEARCH_FOLDER_REQUEST)
+        node_search = SoapElement.create(SoapConstants::SEARCH).add_attributes(attrs)
+        soap_request.add_node(node_search)
+        soap_request
       end
 
       def to_update
-        action = {
+        attrs = {
           op: :update,
           id: @item.id,
           name: @item.name,
@@ -43,43 +48,57 @@ module Zm
           rgb: @item.rgb
         }.reject { |_, v| v.nil? }
 
-        { action: action }
+        build(attrs)
       end
 
-      def to_rename
-        action = {
+      def to_rename(new_name)
+        attrs = {
           op: :rename,
           id: @item.id,
-          name: @item.name
+          name: new_name
         }
 
-        { action: action }
+        build(attrs)
       end
 
       def to_move
-        action = {
+        attrs = {
           op: :move,
           id: @item.id,
           l: @item.l
         }
 
-        { action: action }
+        build(attrs)
       end
 
       def to_color
-        action = {
+        attrs = {
           op: :color,
-          id: @item.id
+          id: @item.id,
+          rgb: @item.rgb,
+          color: @item.color
         }
 
-        action[:rgb] = @item.rgb if @item.rgb_changed?
-        action[:color] = @item.color if @item.color_changed?
+        # attrs[:rgb] = @item.rgb if @item.rgb_changed?
+        # attrs[:color] = @item.color if @item.color_changed?
 
-        { action: action }
+        build(attrs)
       end
 
       def to_delete
-        { action: { op: :delete, id: @item.id } }
+        attrs = {
+          op: :delete,
+          id: @item.id
+        }
+
+        build(attrs)
+      end
+
+      def build(attrs)
+        soap_request = SoapElement.mail(SoapMailConstants::FOLDER_ACTION_REQUEST)
+        node_action = SoapElement.create(SoapConstants::ACTION).add_attributes(attrs)
+        soap_request.add_node(node_action)
+        soap_request
       end
     end
   end

data/lib/zm/client/search_folder/search_folder_jsns_initializer.rb

@@ -7,25 +7,29 @@ module Zm
       class << self
         def create(parent, json)
           item = SearchFolder.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
-        end
+          item.id = json[:id].to_i
+          item.name = json[:name]
 
-        def arrow_name(name)
-          return name if name.to_s.start_with?('@')
+          item.uuid = json[:uuid]
+          item.deletable = json[:deletable]
+          item.absFolderPath = json[:absFolderPath]
+          item.l = json[:l].to_i
+          item.luuid = json[:luuid]
+          item.color = json[:color]
+          item.rgb = json[:rgb]
+          item.rev = json[:rev]
+          item.ms = json[:ms]
+          item.webOfflineSyncDays = json[:webOfflineSyncDays]
+          item.activesyncdisabled = json[:activesyncdisabled]
+          item.query = json[:query]
+          item.sortBy = json[:sortBy]
+          item.types = json[:types]
 
-          "@#{name}"
+          item
         end
       end
     end

data/lib/zm/client/search_folder/search_folders_builder.rb

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

data/lib/zm/client/search_folder/search_folders_collection.rb

@@ -13,7 +13,8 @@ module Zm
       private
 
       def make_query
-        @parent.sacc.get_all_search_folders(@parent.token)
+        soap_request = SoapElement.mail(SoapMailConstants::GET_SEARCH_FOLDER_REQUEST)
+        @parent.sacc.invoke(soap_request)
       end
     end
   end