zm-ruby-client 0.14.0 → 0.18.0

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

@@ -7,22 +7,7 @@ module Zm
       def initialize(parent, json)
         super(parent, json)
         @child_class = Resource
-      end
-
-      # def make
-      #   return [] if json_items.nil?
-      #
-      #   json_items.map do |entry|
-      #     resource = Resource.new(@parent)
-      #     resource.init_from_json(entry)
-      #     resource
-      #   end
-      # end
-
-      private
-
-      def json_items
-        @json_items ||= @json[:Body][json_key][:calresource]
+        @json_item_key = :calresource
       end
     end
   end

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

@@ -3,34 +3,26 @@
 module Zm
   module Client
     # Collection Resources
-    class ResourcesCollection < Base::ObjectsCollection
+    class ResourcesCollection < Base::AdminObjectsCollection
       def initialize(parent)
         @child_class = Resource
-        @parent = parent
-        reset_query_params
-      end
-
-      def ldap
-        @apply_cos = 0
-        self
+        @builder_class = ResourcesBuilder
+        @search_type = SearchType::RESOURCE
+        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
 
+        reset_query_params
         build_from_entry(entry)
       end
 
       private
 
-      def build_response
-        ResourcesBuilder.new(@parent, make_query).make
-      end
-
       def reset_query_params
         super
-        @search_type = SearchType::RESOURCE
         @attrs = SearchType::Attributes::RESOURCE.dup
         @all_servers = 1
         @refresh = 0

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

@@ -3,60 +3,40 @@
 module Zm
   module Client
     # class account SearchFolder
-    class SearchFolder < Base::AccountObject
+    class SearchFolder < Base::FolderObject
+      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 *INSTANCE_VARIABLE_KEYS
+      # attr_accessor *INSTANCE_VARIABLE_KEYS
+      attr_reader :id, :absFolderPath, :types
 
-      def concat
-        INSTANCE_VARIABLE_KEYS.map { |key| instance_variable_get(arrow_name(key)) }
+      define_changed_attributes :name, :color, :rgb, :l, :query, :sortBy
+
+      def initialize(parent)
+        super(parent)
+        @types = 'messages'
       end
 
-      def init_from_json(json)
-        INSTANCE_VARIABLE_KEYS.each do |key|
-          var_name = "@#{key}"
-          instance_variable_set(var_name, json[key])
-        end
+      def all_instance_variable_keys
+        INSTANCE_VARIABLE_KEYS
       end
 
       def create!
-        rep = @parent.sacc.create_search_folder(@parent.token, name, query, types, l, color, sortBy)
-        init_from_json(rep[:Body][:CreateSearchFolderResponse][:search].first)
+        rep = @parent.sacc.create_search_folder(@parent.token, jsns_builder.to_jsns)
+        json = rep[:Body][:CreateSearchFolderResponse][:search].first
+        SearchFolderJsnsInitializer.update(self, json)
       end
 
       def modify!
-        @parent.sacc.modify_search_folder(@parent.token, id, query, types)
-        @parent.sacc.folder_action(@parent.token, :update, id, build_update_options)
-      end
-
-      def query!(new_query)
-        @parent.sacc.modify_search_folder(@parent.token, id, new_query, types)
-        instance_variable_set("@query", new_query)
-      end
-
-      def color!(new_color)
-        key = new_color.to_i.zero? ? :rgb : :color
-        options = {}
-        options[key] = new_color
-        @parent.sacc.folder_action(@parent.token, :color, @id, options)
-        instance_variable_set("@#{key}", new_color)
-      end
-
-      def build_update_options
-        {
-          name: @name,
-          color: @color,
-          rgb: @rgb
-        }.delete_if { |_, v| v.nil? }
+        @parent.sacc.modify_search_folder(@parent.token, jsns_builder.to_modify)
+        super
       end
 
-      def delete!
-        @parent.sacc.folder_action(@parent.token, :delete, id)
-      end
+      private
 
-      def rename!(new_name)
-        # todo
+      def jsns_builder
+        @jsns_builder ||= SearchFolderJsnsBuilder.new(self)
       end
     end
   end

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

@@ -0,0 +1,86 @@
+# frozen_string_literal: true
+
+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 = {
+          name: @item.name,
+          query: @item.query,
+          types: @item.types,
+          l: @item.l,
+          color: @item.color,
+          sortBy: @item.sortBy
+        }.delete_if { |_, v| v.nil? }
+
+        { search: search }
+      end
+
+      alias to_create to_jsns
+
+      def to_modify
+        search = {
+          id: @item.id,
+          query: @item.query,
+          types: @item.types
+        }.reject { |_, v| v.nil? }
+
+        { search: search }
+      end
+
+      def to_update
+        action = {
+          op: :update,
+          id: @item.id,
+          name: @item.name,
+          color: @item.color,
+          rgb: @item.rgb
+        }.reject { |_, v| v.nil? }
+
+        { 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_delete
+        { action: { op: :delete, id: @item.id } }
+      end
+    end
+  end
+end

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

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module Zm
+  module Client
+    # class for initialize account search folder
+    class SearchFolderJsnsInitializer
+      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
+
+        def arrow_name(name)
+          return name if name.to_s.start_with?('@')
+
+          "@#{name}"
+        end
+      end
+    end
+  end
+end

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

@@ -2,23 +2,19 @@
 
 module Zm
   module Client
-    # class factory [folders]
+    # class factory [Search folders]
     class SearchFoldersBuilder < Base::ObjectsBuilder
       def initialize(parent, json)
-        @parent = parent
-        @json = json
+        super(parent, json)
+        @child_class = SearchFolder
+        @json_item_key = :search
       end
 
       def make
-        root = @json[:Body][:GetSearchFolderResponse][:search]
-        return [] if root.nil?
+        return [] if json_items.nil?
 
-        root = [root] unless root.is_a?(Array)
-
-        root.map do |s|
-          f = SearchFolder.new(@parent)
-          f.init_from_json(s)
-          f
+        json_items.map do |entry|
+          SearchFolderJsnsInitializer.create(@parent, entry)
         end
       end
     end

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

@@ -2,26 +2,18 @@
 
 module Zm
   module Client
-    # collection of folders
-    class SearchFoldersCollection < Base::ObjectsCollection
-      METHODS_MISSING_LIST = %i[select each map length].to_set.freeze
-
+    # collection of search folders
+    class SearchFoldersCollection < Base::AccountObjectsCollection
       def initialize(parent)
-        @parent = parent
-      end
-
-      def new
-        folder = SearchFolder.new(@parent)
-        yield(folder) if block_given?
-        folder
+        @child_class = SearchFolder
+        @builder_class = SearchFoldersBuilder
+        super(parent)
       end
 
       private
 
-      def build_response
-        rep = @parent.sacc.get_all_search_folders(@parent.token)
-        fb = SearchFoldersBuilder.new @parent, rep
-        fb.make
+      def make_query
+        @parent.sacc.get_all_search_folders(@parent.token)
       end
     end
   end

data/lib/zm/client/search_folder.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
 require 'zm/client/search_folder/search_folder'
+require 'zm/client/search_folder/search_folder_jsns_builder'
+require 'zm/client/search_folder/search_folder_jsns_initializer'
 require 'zm/client/search_folder/search_folders_builder'
 require 'zm/client/search_folder/search_folders_collection'

data/lib/zm/client/server/server.rb

@@ -481,6 +481,10 @@ module Zm
       attr_accessor *INSTANCE_VARIABLE_KEYS
       attr_accessor :name, :id
 
+      def all_instance_variable_keys
+        INSTANCE_VARIABLE_KEYS
+      end
+
       def mta_queues
         @mta_queues ||= mta_queues!
       end
@@ -497,20 +501,9 @@ module Zm
         BackupsCollection.new self
       end
 
-      # def accounts
-      #   @accounts ||= AccountsCollection.new @soap_admin_connector
-      # end
-
-      # def quotas
-      #   # todo
-      #   rep = @soap_admin_connector.get_quota_usage(name, 1)
-      #   AccountsBuilder.new(@soap_admin_connector, rep).make
-      # end
-
-      # def quotas!
-      #   @accounts = quotas
-      #   # todo il faudrait merger quotas dans @accounts
-      # end
+      def accounts
+        @accounts ||= ServerAccountsCollection.new(self)
+      end
     end
   end
 end

data/lib/zm/client/server/server_accounts_collection.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Zm
+  module Client
+    # Collection Accounts from server
+    class ServerAccountsCollection < AccountsCollection
+      def initialize(parent)
+        @target_server_id = parent.id
+        super(parent)
+      end
+
+      private
+
+      def ldap_filter
+        @ldap_filter ||= LdapFilter.new("(zimbraMailHost=#{@parent.name})")
+      end
+    end
+  end
+end

data/lib/zm/client/server/servers_builder.rb

@@ -4,22 +4,10 @@ module Zm
   module Client
     # class factory [servers]
     class ServersBuilder < Base::ObjectsBuilder
-      def make
-        return [] if json_items.nil?
-
-        servers = json_items.map do |entry|
-          server = Server.new(@parent)
-          server.init_from_json(entry)
-          server
-        end
-
-        servers
-      end
-
-      private
-
-      def json_items
-        @json_items ||= @json[:Body][json_key][:server]
+      def initialize(parent, json)
+        super(parent, json)
+        @child_class = Server
+        @json_item_key = :server
       end
     end
   end

data/lib/zm/client/server/servers_collection.rb

@@ -3,19 +3,18 @@
 module Zm
   module Client
     # Collection servers
-    class ServersCollection < Base::ObjectsCollection
+    class ServersCollection < Base::AdminObjectsCollection
       def initialize(parent)
-        @parent = parent
-        # @service = ServerServices::MAILBOX
+        @child_class = Server
+        @builder_class = ServersBuilder
         @service = nil
+        super(parent)
       end
 
       def find_by(hash)
         rep = sac.get_server(hash.values.first, hash.keys.first)
         entry = rep[:Body][:GetServerResponse][:server].first
-        server = Server.new(@parent)
-        server.init_from_json(entry)
-        server
+        build_from_entry(entry)
       end
 
       def where(service)
@@ -25,10 +24,6 @@ module Zm
 
       private
 
-      def build_response
-        ServersBuilder.new(@parent, make_query).make
-      end
-
       def make_query
         sac.get_all_servers(@service)
       end

data/lib/zm/client/server.rb

@@ -3,3 +3,4 @@
 require 'zm/client/server/server'
 require 'zm/client/server/servers_builder'
 require 'zm/client/server/servers_collection'
+require 'zm/client/server/server_accounts_collection'

data/lib/zm/client/share/share.rb

@@ -17,8 +17,8 @@ module Zm
         yield(self) if block_given?
       end
 
-      def concat
-        INSTANCE_VARIABLE_KEYS.map { |key| instance_variable_get(arrow_name(key)) }
+      def all_instance_variable_keys
+        INSTANCE_VARIABLE_KEYS
       end
 
       def create!
@@ -48,13 +48,6 @@ module Zm
         owner_name = (@ownerName || @ownerEmail).tr('/', '-')
         "#{folder_name} (#{owner_name})"
       end
-
-      def init_from_json(json)
-        INSTANCE_VARIABLE_KEYS.each do |key|
-          var_name = "@#{key}"
-          instance_variable_set(var_name, json[key])
-        end
-      end
     end
   end
 end

data/lib/zm/client/share/shares_builder.rb

@@ -5,18 +5,9 @@ module Zm
     # class factory [shares]
     class ShareBuilder < Base::ObjectsBuilder
       def initialize(parent, json)
-        @parent = parent
-        @json = json
-      end
-
-      def make
-        root = @json[:Body][:GetShareInfoResponse][:share]
-        return [] if root.nil?
-
-        root = [root] unless root.is_a?(Array)
-        root.map do |s|
-          Share.new(@parent, s)
-        end
+        super(parent, json)
+        @child_class = Share
+        @json_item_key = :share
       end
     end
   end

data/lib/zm/client/signature/signature.rb

@@ -4,37 +4,35 @@ module Zm
   module Client
     # class account signature
     class Signature < Base::AccountObject
+      include Zm::Model::AttributeChangeObserver
+
       TYPE_TXT = 'text/plain'
       TYPE_HTML = 'text/html'
 
       INSTANCE_VARIABLE_KEYS = %i[id name txt html]
 
-      attr_accessor *INSTANCE_VARIABLE_KEYS
+      attr_reader :id
 
-      def concat
-        INSTANCE_VARIABLE_KEYS.map { |key| instance_variable_get(arrow_name(key)) }
-      end
+      define_changed_attributes :name, :txt, :html
 
-      def init_from_json(json)
-        @id      = json[:id]
-        @name    = json[:name]
-        json[:content].each do |c|
-          @txt = c[:_content] if c[:type] == TYPE_TXT
-          @html = c[:_content] if c[:type] == TYPE_HTML
-        end if json[:content].is_a?(Array)
+      def all_instance_variable_keys
+        INSTANCE_VARIABLE_KEYS
       end
 
       def create!
         rep = @parent.sacc.create_signature(@parent.token, as_jsns)
         @id = rep[:Body][:CreateSignatureResponse][:signature].first[:id]
+        super
       end
 
       def modify!
         @parent.sacc.modify_signature(@parent.token, as_jsns)
+        super
       end
 
       def delete!
-        @parent.sacc.delete_signature(@parent.token, id)
+        @parent.sacc.delete_signature(@parent.token, jsns_builder.to_delete)
+        super
       end
 
       def type
@@ -54,8 +52,14 @@ module Zm
         html || txt
       end
 
+      private
+
+      def jsns_builder
+        @jsns_builder ||= SignatureJsnsBuilder.new(self)
+      end
+
       def as_jsns
-        SignatureJsnsBuilder.new(self).to_jsns
+        jsns_builder.to_jsns
       end
     end
   end

data/lib/zm/client/signature/signature_jsns_builder.rb

@@ -2,7 +2,7 @@
 
 module Zm
   module Client
-    # class for account signature
+    # class for account signature jsns builder
     class SignatureJsnsBuilder
 
       def initialize(signature)
@@ -24,6 +24,10 @@ module Zm
 
         jsns
       end
+
+      def to_delete
+        { signature: { id: @signature.id } }
+      end
     end
   end
 end

data/lib/zm/client/signature/signature_jsns_initializer.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Zm
+  module Client
+    # class for initialize account signature
+    class SignatureJsnsInitializer < Base::BaseJsnsInitializer
+
+      def initialize(parent, json)
+        super(parent, json)
+        @child_class = Signature
+      end
+
+      def create
+        super
+
+        @json[:content].each do |c|
+          @item.instance_variable_set(:@txt, c[:_content]) if c[:type] == Signature::TYPE_TXT
+          @item.instance_variable_set(:@html, c[:_content]) if c[:type] == Signature::TYPE_HTML
+        end if @json[:content].is_a?(Array)
+
+        @item
+      end
+    end
+  end
+end

data/lib/zm/client/signature/signatures_builder.rb

@@ -2,23 +2,19 @@
 
 module Zm
   module Client
-    # class factory [folders]
+    # class factory [signatures]
     class SignaturesBuilder < Base::ObjectsBuilder
       def initialize(parent, json)
-        @parent = parent
-        @json = json
+        super(parent, json)
+        @child_class = Signature
+        @json_item_key = :signature
       end
 
       def make
-        root = @json[:Body][:GetSignaturesResponse][:signature]
-        return [] if root.nil?
+        return [] if json_items.nil?
 
-        root = [root] unless root.is_a?(Array)
-
-        root.map do |s|
-          signature = Signature.new(@parent)
-          signature.init_from_json(s)
-          signature
+        json_items.map do |entry|
+          SignatureJsnsInitializer.new(@parent, entry).create
         end
       end
     end

data/lib/zm/client/signature/signatures_collection.rb

@@ -3,25 +3,17 @@
 module Zm
   module Client
     # collection of signatures
-    class SignaturesCollection < Base::ObjectsCollection
-      METHODS_MISSING_LIST = %i[select each map length].to_set.freeze
-
+    class SignaturesCollection < Base::AccountObjectsCollection
       def initialize(parent)
-        @parent = parent
-      end
-
-      def new
-        signature = Signature.new(@parent)
-        yield(signature) if block_given?
-        signature
+        @child_class = Signature
+        @builder_class = SignaturesBuilder
+        super(parent)
       end
 
       private
 
-      def build_response
-        rep = @parent.sacc.get_signatures(@parent.token)
-        sb = SignaturesBuilder.new @parent, rep
-        sb.make
+      def make_query
+        @parent.sacc.get_signatures(@parent.token)
       end
     end
   end