zm-ruby-client 2.2.7 → 3.0.0

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

@@ -5,64 +5,56 @@ module Zm
     # class for account mountpoint
     class MountPoint < Base::Object
       include BelongsToFolder
-      # include Zm::Model::AttributeChangeObserver
+      include RequestMethodsMailbox
+      include MailboxItemConcern
 
       attr_accessor :owner, :rev, :reminder, :ms, :deletable, :rid, :uuid, :url, :f, :broken, :luuid, :ruuid,
-                    :activesyncdisabled, :absFolderPath, :view, :zid, :id, :webOfflineSyncDays,
-                    :name, :color, :rgb, :l
-
-      # define_changed_attributes :name, :color, :rgb, :l
+                    :activesyncdisabled, :absFolderPath, :view, :zid, :webOfflineSyncDays, :name, :color, :rgb
 
       def initialize(parent)
-        @l = FolderDefault::ROOT[:id]
-        super(parent)
+        @l = FolderDefault::ROOT.id
+        super
       end
 
       def create!
-        rep = @parent.sacc.invoke(jsns_builder.to_jsns)
+        rep = @parent.soap_connector.invoke(build_create)
         json = rep[:CreateMountpointResponse][:link].first
 
         MountpointJsnsInitializer.update(self, json)
-        @id
+        id
       end
 
       def modify!
         raise NotImplementedError
       end
 
+      def build_modify
+        raise NotImplementedError
+      end
+
       def update!(*args)
         raise NotImplementedError
       end
 
       def color!
-        # @parent.sacc.invoke(jsns_builder.to_color) if color_changed? || rgb_changed?
-        @parent.sacc.invoke(jsns_builder.to_color)
-
+        @parent.soap_connector.invoke(build_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
+      def build_color
+        jsns_builder.to_color
       end
 
       def reload!
         raise NotImplementedError
       end
 
-      def delete!
-        return false if @id.nil?
-
-        @parent.sacc.invoke(jsns_builder.to_delete)
-        @id = nil
-      end
-
       private
 
       def jsns_builder
-        @jsns_builder ||= MountpointJsnsBuilder.new(self)
+        return @jsns_builder if defined? @jsns_builder
+
+        @jsns_builder = MountpointJsnsBuilder.new(self)
       end
     end
   end

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

@@ -19,11 +19,13 @@ module Zm
           view: @item.view,
           zid: @item.zid,
           rid: @item.rid
-        }.delete_if { |_, v| v.nil? }
+        }
+        link.compact!
 
         attrs = { link: link }
 
-        SoapElement.mail(SoapMailConstants::CREATE_MOUNTPOINT_REQUEST).add_attributes(attrs)
+        SoapElement.mail(SoapMailConstants::CREATE_MOUNTPOINT_REQUEST)
+                   .add_attributes(attrs)
       end
 
       alias to_create to_jsns
@@ -39,7 +41,8 @@ module Zm
           rgb: @item.rgb,
           url: @item.url,
           view: @item.view
-        }.delete_if { |_, v| v.nil? }
+        }
+        attrs.compact!
 
         if @item.is_immutable?
           attrs.delete(:name)

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

@@ -6,33 +6,34 @@ module Zm
     class MountpointJsnsInitializer
       class << self
         def create(parent, json)
-          item = MountPoint.new(parent)
-          update(item, json)
+          MountPoint.new(parent).tap do |item|
+            update(item, json)
+          end
         end
 
         def update(item, json)
-          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.id = json.delete(:id)
+          item.name = json.delete(:name)
+          item.owner = json.delete(:owner)
+          item.rev = json.delete(:rev)
+          item.reminder = json.delete(:reminder)
+          item.ms = json.delete(:ms)
+          item.deletable = json.delete(:deletable)
+          item.rid = json.delete(:rid)
+          item.uuid = json.delete(:uuid)
+          item.url = json.delete(:url)
+          item.f = json.delete(:f)
+          item.broken = json.delete(:broken)
+          item.luuid = json.delete(:luuid)
+          item.ruuid = json.delete(:ruuid)
+          item.activesyncdisabled = json.delete(:activesyncdisabled)
+          item.absFolderPath = json.delete(:absFolderPath)
+          item.view = json.delete(:view)
+          item.zid = json.delete(:zid)
+          item.webOfflineSyncDays = json.delete(:webOfflineSyncDays)
+          item.l = json.delete(:l)
+          item.color = json.delete(:color)
+          item.rgb = json.delete(:rgb)
 
           item
         end

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

@@ -5,7 +5,7 @@ module Zm
     # class factory [mountpoints]
     class MountPointsBuilder < Base::ObjectsBuilder
       def initialize(parent, json)
-        super(parent, json)
+        super
         @key_link = :link
         @key_folder = :folder
         @list = []

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

@@ -11,7 +11,7 @@ module Zm
       def initialize(parent)
         @child_class = MountPoint
         @builder_class = MountPointsBuilder
-        super(parent)
+        super
         @root = nil
         reset_query_params
       end
@@ -19,22 +19,30 @@ module Zm
       def where(view: nil, tr: nil)
         @view = view
         @tr = tr
-        @all = nil
         self
       end
 
       def clear
-        @all = nil
         @root = nil
         reset_query_params
       end
 
-      private
+      def jsns_builder
+        return @jsns_builder if defined? @jsns_builder
+
+        @jsns_builder = FoldersJsnsBuilder.new(self)
+      end
 
       def make_query
-        @parent.sacc.invoke(jsns_builder.to_jsns)
+        @parent.soap_connector.invoke(build_query)
+      end
+
+      def build_query
+        jsns_builder.to_jsns
       end
 
+      private
+
       def reset_query_params
         @view = nil
         @tr = nil
@@ -42,10 +50,6 @@ module Zm
         @needGranteeName = nil
         @depth = nil
       end
-
-      def jsns_builder
-        @jsns_builder ||= FoldersJsnsBuilder.new(self)
-      end
     end
   end
 end

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

@@ -16,7 +16,9 @@ module Zm
       end
 
       def items
-        @items ||= MtaQueueItemsCollection.new self
+        return @items if defined? @items
+
+        @items = MtaQueueItemsCollection.new self
       end
 
       def hold!(ids)
@@ -38,7 +40,9 @@ module Zm
       private
 
       def jsns_builder
-        @jsns_builder ||= MtaQueueJsnsBuilder.new(self)
+        return @jsns_builder if defined? @jsns_builder
+
+        @jsns_builder = MtaQueueJsnsBuilder.new(self)
       end
     end
   end

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

@@ -5,15 +5,11 @@ module Zm
     # class for initialize account
     class MtaQueueJsnsInitializer < Base::BaseJsnsInitializer
       class << self
-        def create(parent, json)
-          item = MtaQueue.new(parent)
-
-          update(item, json)
-        end
+        def klass = MtaQueue
 
         def update(item, json)
-          item.n = json[:n]
-          item.name = json[:name]
+          item.n = json.delete(:n)
+          item.name = json.delete(:name)
 
           item
         end

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

@@ -15,7 +15,9 @@ module Zm
       private
 
       def json_items
-        @json_items ||= @json[:GetMailQueueInfoResponse][:server].first[:queue]
+        return @json_items if defined? @json_items
+
+        @json_items = @json[:GetMailQueueInfoResponse][:server].first[:queue]
       end
     end
   end

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

@@ -3,8 +3,8 @@
 module Zm
   module Client
     class MtaQueueItem < Base::Object
-      attr_accessor :name, :n, :size, :fromdomain, :id, :reason, :time, :to, :addr, :filter, :host, :from, :todomain,
-                    :received
+      attr_accessor :name, :n, :size, :fromdomain, :id, :reason, :time, :to, :addr,
+                    :filter, :host, :from, :todomain, :received
 
       def mta_queue
         parent
@@ -15,7 +15,9 @@ module Zm
       end
 
       def sent_at
-        @sent_at ||= Time.at(@time / 1000)
+        return @sent_at if defined? @sent_at
+
+        @sent_at = Time.at(@time / 1000)
       rescue StandardError
         nil
       end

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

@@ -5,11 +5,7 @@ module Zm
     # class for initialize account
     class MtaQueueItemJsnsInitializer < Base::BaseJsnsInitializer
       class << self
-        def create(parent, json)
-          item = MtaQueueItem.new(parent)
-
-          update(item, json)
-        end
+        def klass = MtaQueueItem
 
         def update(item, json)
           item.size = json[:size]

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

@@ -15,7 +15,9 @@ module Zm
       private
 
       def json_items
-        @json_items ||= @json[:GetMailQueueResponse][:server].first[:queue].first[:qi]
+        return @json_items if defined? @json_items
+
+        @json_items = @json[:GetMailQueueResponse][:server].first[:queue].first[:qi]
       end
     end
   end

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

@@ -57,7 +57,9 @@ module Zm
       end
 
       def jsns_builder
-        @jsns_builder ||= MtaQueueJsnsBuilder.new(self)
+        return @jsns_builder if defined? @jsns_builder
+
+        @jsns_builder = MtaQueueJsnsBuilder.new(self)
       end
     end
   end

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

@@ -4,22 +4,14 @@ module Zm
   module Client
     # objectClass: zimbraCalendarResource
     class Resource < Base::MailboxObject
+      include RequestMethodsAdmin
+
       LOCATION = 'Location'
       EQUIPMENT = 'Equipment'
       TYPES = [LOCATION, EQUIPMENT].freeze
 
-      def delete!
-        sac.invoke(jsns_builder.to_delete)
-        @id = nil
-      end
-
-      def modify!
-        sac.invoke(jsns_builder.to_update)
-        true
-      end
-
       def create!
-        resp = sac.invoke(jsns_builder.to_create)
+        resp = sac.invoke(build_create)
         @id = resp[:CreateCalendarResourceResponse][:calresource].first[:id]
       end
 
@@ -35,14 +27,10 @@ module Zm
         zimbraCalResType == EQUIPMENT
       end
 
-      private
-
-      def do_update!(hash)
-        sac.invoke(jsns_builder.to_patch(hash))
-      end
-
       def jsns_builder
-        @jsns_builder ||= ResourceJsnsBuilder.new(self)
+        return @jsns_builder if defined? @jsns_builder
+
+        @jsns_builder = ResourceJsnsBuilder.new(self)
       end
     end
   end

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

@@ -12,13 +12,17 @@ module Zm
         req = {
           name: @item.name,
           password: @item.password
-        }.reject { |_, v| v.nil? }
+        }
+        req.compact!
 
-        soap_request = SoapElement.admin(SoapAdminConstants::CREATE_CALENDAR_RESOURCE_REQUEST).add_attributes(req)
+        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)
+            node_attr = SoapElement.create(SoapConstants::A)
+                                   .add_attribute(SoapConstants::N, key)
+                                   .add_content(value)
             soap_request.add_node(node_attr)
           end
         end
@@ -27,13 +31,14 @@ module Zm
       end
 
       def to_update
-        soap_request = SoapElement.admin(SoapAdminConstants::MODIFY_CALENDAR_RESOURCE_REQUEST).add_attribute(
-          SoapConstants::ID, @item.id
-        )
+        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)
+            node_attr = SoapElement.create(SoapConstants::A)
+                                   .add_attribute(SoapConstants::N, key)
+                                   .add_content(value)
             soap_request.add_node(node_attr)
           end
         end
@@ -42,14 +47,15 @@ module Zm
       end
 
       def to_patch(hash)
-        soap_request = SoapElement.admin(SoapAdminConstants::MODIFY_CALENDAR_RESOURCE_REQUEST).add_attribute(
-          SoapConstants::ID, @item.id
-        )
+        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)
+            node_attr = SoapElement.create(SoapConstants::A)
+                                   .add_attribute(SoapConstants::N, key)
+                                   .add_content(value)
             soap_request.add_node(node_attr)
           end
         end
@@ -58,7 +64,8 @@ module Zm
       end
 
       def to_delete
-        SoapElement.admin(SoapAdminConstants::DELETE_CALENDAR_RESOURCE_REQUEST).add_attribute('id', @item.id)
+        SoapElement.admin(SoapAdminConstants::DELETE_CALENDAR_RESOURCE_REQUEST)
+                   .add_attribute(SoapConstants::ID, @item.id)
       end
 
       def attrs_only_set_h
@@ -72,7 +79,7 @@ module Zm
           [n, values]
         end
 
-        Hash[arr]
+        arr.to_h
       end
     end
   end

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

@@ -5,23 +5,13 @@ module Zm
     # class for initialize resource
     class ResourceJsnsInitializer < Base::BaseJsnsInitializer
       class << self
-        def create(parent, json)
-          item = Resource.new(parent)
-
-          update(item, json)
-        end
+        def klass = Resource
 
         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.used = json.delete(:used) unless json[:used].nil?
+          item.zimbraMailQuota = json.delete(:limit) unless json[:limit].nil?
 
-          item
+          super
         end
       end
     end

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

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

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

@@ -8,20 +8,25 @@ module Zm
         @child_class = Resource
         @builder_class = ResourcesBuilder
         @search_type = SearchType::RESOURCE
-        super(parent)
+        super
       end
 
       def find_by!(hash)
+        entry = sac.invoke(build_find_by(hash))[:GetCalendarResourceResponse][:calresource].first
+
+        reset_query_params
+        ResourceJsnsInitializer.create(@parent, entry)
+      end
+
+      def build_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)
+        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
-        ResourceJsnsInitializer.create(@parent, entry)
+        soap_request
       end
 
       private

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

@@ -4,61 +4,45 @@ module Zm
   module Client
     # class account SearchFolder
     class SearchFolder < Base::Object
-      # include Zm::Model::AttributeChangeObserver
+      include RequestMethodsMailbox
+      include MailboxItemConcern
 
-      attr_accessor :id, :uuid, :deletable, :name, :absFolderPath, :l, :luuid, :color, :rgb, :rev, :ms,
+      attr_accessor :uuid, :deletable, :name, :absFolderPath, :luuid, :color, :rgb, :rev, :ms,
                     :webOfflineSyncDays, :activesyncdisabled, :query, :sortBy, :types,
-                    :name, :color, :rgb, :l, :query, :sortBy
-
-      # define_changed_attributes :name, :color, :rgb, :l, :query, :sortBy
+                    :name, :color, :rgb, :query, :sortBy
 
       def initialize(parent)
-        @l = FolderDefault::ROOT[:id]
+        @l = FolderDefault::ROOT.id
         @types = 'messages'
-        super(parent)
+        super
       end
 
       def create!
-        rep = @parent.sacc.invoke(jsns_builder.to_jsns)
+        rep = @parent.soap_connector.invoke(build_create)
         json = rep[:CreateSearchFolderResponse][:search].first
         SearchFolderJsnsInitializer.update(self, json)
         @id
       end
 
-      def modify!
-        @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)
-
+        @parent.soap_connector.invoke(build_color)
         true
       end
 
-      def delete!
-        return false if @id.nil?
-
-        @parent.sacc.invoke(jsns_builder.to_delete)
-        @id = nil
+      def build_color
+        jsns_builder.to_color
       end
 
       private
 
       def jsns_builder
-        @jsns_builder ||= SearchFolderJsnsBuilder.new(self)
+        return @jsns_builder if defined? @jsns_builder
+
+        @jsns_builder = SearchFolderJsnsBuilder.new(self)
       end
     end
   end

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

@@ -16,7 +16,8 @@ module Zm
           l: @item.l,
           color: @item.color,
           sortBy: @item.sortBy
-        }.delete_if { |_, v| v.nil? }
+        }
+        attrs.compact!
 
         soap_request = SoapElement.mail(SoapMailConstants::CREATE_SEARCH_FOLDER_REQUEST)
         node_search = SoapElement.create(SoapConstants::SEARCH).add_attributes(attrs)
@@ -31,7 +32,8 @@ module Zm
           id: @item.id,
           query: @item.query,
           types: @item.types
-        }.reject { |_, v| v.nil? }
+        }
+        attrs.compact!
 
         soap_request = SoapElement.mail(SoapMailConstants::MODIFY_SEARCH_FOLDER_REQUEST)
         node_search = SoapElement.create(SoapConstants::SEARCH).add_attributes(attrs)
@@ -46,7 +48,8 @@ module Zm
           name: @item.name,
           color: @item.color,
           rgb: @item.rgb
-        }.reject { |_, v| v.nil? }
+        }
+        attrs.compact!
 
         build(attrs)
       end
@@ -79,9 +82,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