zm-ruby-client 0.14.0 → 0.17.1

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

data/lib/zm/client/signature.rb

@@ -2,5 +2,6 @@
 
 require 'zm/client/signature/signature'
 require 'zm/client/signature/signature_jsns_builder'
+require 'zm/client/signature/signature_jsns_initializer'
 require 'zm/client/signature/signatures_builder'
 require 'zm/client/signature/signatures_collection'

data/lib/zm/client/tag/tag.rb

@@ -4,41 +4,48 @@ module Zm
   module Client
     # class account tag
     class Tag < Base::AccountObject
+      include Zm::Model::AttributeChangeObserver
 
-      INSTANCE_VARIABLE_KEYS = %i[id name color rgb u n d rev md ms]
+      INSTANCE_VARIABLE_KEYS = %i[id name color rgb]
 
-      attr_accessor *INSTANCE_VARIABLE_KEYS
+      attr_accessor :id
 
-      def concat
-        INSTANCE_VARIABLE_KEYS.map { |key| instance_variable_get(arrow_name(key)) }
-      end
+      define_changed_attributes :name, :color, :rgb
 
-      def init_from_json(json)
-        INSTANCE_VARIABLE_KEYS.each do |key|
-          instance_variable_set(arrow_name(key), json[key])
-        end
+      def all_instance_variable_keys
+        INSTANCE_VARIABLE_KEYS
       end
 
       def create!
-        rep = @parent.sacc.create_tag(@parent.token, @name, @color, @rgb)
-        init_from_json(rep[:Body][:CreateTagResponse][:tag].first)
+        rep = @parent.sacc.create_tag(@parent.token, jsns_builder.to_jsns)
+        json = rep[:Body][:CreateTagResponse][:tag].first
+        TagJsnsInitializer.update(self, json)
+        super
       end
 
       def modify!
-        @parent.sacc.tag_action(@parent.token, :update, @id, { color: @color, rgb: @rgb })
+        @parent.sacc.tag_action(@parent.token, jsns_builder.to_update) if color_changed? || rgb_changed?
+        super
+      end
+
+      def update!(hash)
+        # todo
       end
 
       def delete!
-        @parent.sacc.tag_action(@parent.token, :delete, @id)
+        @parent.sacc.tag_action(@parent.token, jsns_builder.to_delete)
+        super
       end
 
-      def rename!(new_name)
-        @parent.sacc.tag_action(
-          @parent.token,
-          :rename,
-          @id,
-          name: new_name
-        )
+      def rename!
+        @parent.sacc.tag_action(@parent.token, jsns_builder.to_rename) if name_changed?
+        super
+      end
+
+      private
+
+      def jsns_builder
+        @jsns_builder ||= TagJsnsBuilder.new(self)
       end
     end
   end

data/lib/zm/client/tag/tag_jsns_builder.rb

@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+module Zm
+  module Client
+    # class for account tag jsns builder
+    class TagJsnsBuilder
+
+      def initialize(tag)
+        @tag = tag
+      end
+
+      def to_jsns
+        tag = {
+          name: @tag.name,
+          color: @tag.color,
+          rgb: @tag.rgb
+        }.delete_if { |_, v| v.nil? }
+
+        { tag: tag }
+      end
+
+      alias to_create to_jsns
+
+      def to_update
+        action = {
+          op: :update,
+          id: @tag.id,
+          color: @tag.color,
+          rgb: @tag.rgb
+        }.reject { |_, v| v.nil? }
+
+        { action: action }
+      end
+
+      def to_delete
+        action = {
+          op: :delete,
+          id: @tag.id
+        }
+
+        { action: action }
+      end
+
+      def to_rename
+        action = {
+          op: :rename,
+          id: @tag.id,
+          name: @tag.name
+        }
+
+        { action: action }
+      end
+    end
+  end
+end

data/lib/zm/client/tag/tag_jsns_initializer.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Zm
+  module Client
+    # class for initialize account tag
+    class TagJsnsInitializer
+      class << self
+        def create(parent, json)
+          item = Tag.new(parent)
+
+          update(item, json)
+        end
+
+        def update(item, json)
+
+          item.instance_variable_set(:@id, json[:id])
+          item.instance_variable_set(:@name, json[:name])
+          item.instance_variable_set(:@color, json[:color].to_i)
+          item.instance_variable_set(:@rgb, json[:rgb])
+
+          item
+        end
+      end
+    end
+  end
+end

data/lib/zm/client/tag/tags_builder.rb

@@ -5,19 +5,16 @@ module Zm
     # class factory [tags]
     class TagBuilder < Base::ObjectsBuilder
       def initialize(parent, json)
-        @parent = parent
-        @json = json
+        super(parent, json)
+        @child_class = Tag
+        @json_item_key = :tag
       end
 
       def make
-        root = @json[:Body][:GetTagResponse][:tag]
-        return [] if root.nil?
+        return [] if json_items.nil?
 
-        root = [root] unless root.is_a?(Array)
-        root.map do |s|
-          tag = Tag.new(@parent)
-          tag.init_from_json(s)
-          tag
+        json_items.map do |entry|
+          TagJsnsInitializer.create(@parent, entry)
         end
       end
     end

data/lib/zm/client/tag/tags_collection.rb

@@ -3,23 +3,17 @@
 module Zm
   module Client
     # collection account tags
-    class TagsCollection < Base::ObjectsCollection
+    class TagsCollection < Base::AccountObjectsCollection
       def initialize(parent)
-        @parent = parent
-      end
-
-      def new
-        tag = Tag.new(@parent)
-        yield(tag) if block_given?
-        tag
+        @child_class = Tag
+        @builder_class = TagBuilder
+        super(parent)
       end
 
       private
 
-      def build_response
-        rep = @parent.sacc.get_tag(@parent.token)
-        tb = TagBuilder.new @parent, rep
-        tb.make
+      def make_query
+        @parent.sacc.get_tag(@parent.token)
       end
     end
   end

data/lib/zm/client/tag.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
 require 'zm/client/tag/tag'
+require 'zm/client/tag/tag_jsns_builder'
+require 'zm/client/tag/tag_jsns_initializer'
 require 'zm/client/tag/tags_builder'
 require 'zm/client/tag/tags_collection'

data/lib/zm/client/task/tasks_collection.rb

@@ -3,97 +3,13 @@
 module Zm
   module Client
     # collection of tasks
-    class TasksCollection < Base::ObjectsCollection
-      attr_accessor :more
-
+    class TasksCollection < Base::AccountSearchObjectsCollection
       def initialize(parent)
-        @parent = parent
-        @more = true
-        reset_query_params
-      end
-
-      def new
-        task = Task.new(@parent)
-        yield(task) if block_given?
-        task
-      end
-
-      def start_at(start_at)
-        @start_at = start_at
-        self
-      end
-
-      def end_at(end_at)
-        @end_at = end_at
-        self
-      end
-
-      def folders(folders)
-        @folders = folders
-        @folder_ids = @folders.map(&:id)
-        self
-      end
-
-      def folder_ids(folder_ids)
-        @folder_ids = folder_ids
-        self
-      end
-
-      def where(query)
-        @query = query
-        self
-      end
-
-      def ids
-        search_builder.ids
-      end
-
-      private
-
-      def search_response
-        rep = @parent.sacc.search(@parent.token, 'task', @offset, @limit, 'taskDueAsc', query, build_options)
-        @more = rep[:Body][:SearchResponse][:more]
-        rep
-      end
-
-      def search_builder
-        TasksBuilder.new(@parent, search_response)
-      end
-
-      def build_response
-        tasks = search_builder.make
-        tasks.each { |appo| appo.folder = find_folder(appo) } unless @folders.empty?
-        tasks
-      end
-
-      def build_options
-        return {} if !@start_at.is_a?(Time) && !@end_at.is_a?(Time)
-
-        {
-          calExpandInstStart: (@start_at.to_f * 1000).to_i,
-          calExpandInstEnd: (@end_at.to_f * 1000).to_i,
-        }
-      end
-
-      def query
-        return @query unless @query.nil?
-
-        return nil if @folder_ids.empty?
-
-        @folder_ids.map { |id| %Q{inid:"#{id}"} }.join(' OR ')
-      end
-
-      def find_folder(task)
-        @folders.find { |folder| folder.id == task.l }
-      end
-
-      def reset_query_params
-        super
-        @start_at = nil
-        @end_at = nil
-        @query = nil
-        @folder_ids = []
-        @folders = []
+        super(parent)
+        @child_class = Task
+        @builder_class = TasksBuilder
+        @type = 'task'
+        @sort_by = 'taskDueAsc'
       end
     end
   end

data/lib/zm/client/upload/upload.rb

@@ -44,7 +44,7 @@ module Zm
         uri.query_values = h
         url_folder_path << '?' << uri.query
 
-        puts url_folder_path
+        # puts url_folder_path
 
         url_folder_path
       end

data/lib/zm/client/version.rb

@@ -9,8 +9,8 @@ module Zm
 
     module VERSION
       MAJOR = 0
-      MINOR = 14
-      TINY  = 0
+      MINOR = 17
+      TINY  = 1
 
       STRING = [MAJOR, MINOR, TINY].compact.join('.')
     end

data/lib/zm/modules/common/dl_common.rb

@@ -8,10 +8,11 @@ module DistributionListCommon
     zimbraMailForwardingAddress
     description
     zimbraDistributionListSendShareMessageToNewMembers
+    zimbraHideInGal
     zimbraNotes
   ].freeze
 
-  ATTRS_READ = %w[zimbraMailAlias]
+  ATTRS_READ = %w[zimbraMailAlias zimbraACE]
 
   ATTRS_WRITE = %w[
     zimbraMailStatus
@@ -20,6 +21,7 @@ module DistributionListCommon
     zimbraMailTransport
     zimbraMailForwardingAddress
     description
+    zimbraHideInGal
     zimbraDistributionListSendShareMessageToNewMembers
   ].freeze