zm-ruby-client 0.18.3 → 2.0.2

data/lib/zm/client/folder/folder.rb

@@ -3,33 +3,26 @@
 module Zm
   module Client
     # class for account folder
-    class Folder < Base::FolderObject
-      include Zm::Model::AttributeChangeObserver
+    class Folder < Base::Object
+      include BelongsToFolder
+      # include Zm::Model::AttributeChangeObserver
 
-      INSTANCE_VARIABLE_KEYS = %i[type id uuid name absFolderPath l url luuid f
-                                  view rev ms webOfflineSyncDays activesyncdisabled n s i4ms i4next zid rid
-                                  ruuid owner reminder acl itemCount broken deletable color rgb fb].freeze
+      attr_accessor :type, :id, :uuid, :name, :absFolderPath, :l, :url, :luuid, :f, :view, :rev, :ms,
+                    :webOfflineSyncDays, :activesyncdisabled, :n, :s, :i4ms, :i4next, :zid, :rid, :ruuid,
+                    :owner, :reminder, :acl, :itemCount, :broken, :deletable, :color, :rgb, :fb, :folders,
+                    :grants, :retention_policies,
+                    :name, :color, :rgb, :l, :url, :f, :view
 
-      attr_reader :type, :id, :uuid, :absFolderPath, :luuid, :rev, :ms, :webOfflineSyncDays, :activesyncdisabled, :n,
-                  :s, :i4ms, :i4next, :zid, :rid, :ruuid, :owner, :reminder, :acl, :itemCount, :broken, :deletable, :fb
-
-      attr_accessor :folders, :grants, :retention_policies
-      attr_writer :absFolderPath
-
-      define_changed_attributes :name, :color, :rgb, :l, :url, :f, :view
-
-      def all_instance_variable_keys
-        INSTANCE_VARIABLE_KEYS
-      end
+      # define_changed_attributes :name, :color, :rgb, :l, :url, :f, :view
 
       alias nb_messages n
       alias nb_items n
-      alias parent_id l
       alias size s
 
       def initialize(parent)
         super(parent)
 
+        @l = FolderDefault::ROOT[:id]
         @type = :folder
         @folders = []
         @grants = FolderGrantsCollection.new(self)
@@ -37,7 +30,7 @@ module Zm
 
         yield(self) if block_given?
 
-        extend(DocumentFolder) if view == 'document'
+        extend(DocumentFolder) if view == Zm::Client::FolderView::DOCUMENT
       end
 
       def is_immutable?
@@ -49,37 +42,46 @@ module Zm
       end
 
       def create!
-        rep = @parent.sacc.create_folder(@parent.token, jsns_builder.to_jsns)
-        json = rep[:Body][:CreateFolderResponse][:folder].first
+        rep = @parent.sacc.invoke(jsns_builder.to_jsns)
+        json = rep[:CreateFolderResponse][:folder].first
         FolderJsnsInitializer.update(self, json)
+        @id
       end
 
-      def update!(options)
-        options.delete_if { |k, v| v.nil? || !respond_to?(k) }
-        return false if options.empty?
+      def modify!
+        @parent.sacc.invoke(jsns_builder.to_update)
+        true
+      end
 
-        @parent.sacc.folder_action(@parent.token, jsns_builder.to_patch(options))
+      def update!(hash)
+        return false if hash.delete_if { |k, v| v.nil? || !respond_to?(k) }.empty?
 
-        options.each do |k, v|
-          instance_variable_set("@#{k}", v)
+        do_update!(hash)
+
+        hash.each do |key, value|
+          update_attribute(key, value)
         end
 
         true
       end
 
-      # def add_retention_policy!(retention_policies)
-      #   options = if retention_policies.is_a?(Hash)
-      #               retention_policies
-      #             else
-      #               retention_policies.map(&:to_h).reduce({}, :merge)
-      #             end
-      #
-      #   @parent.sacc.folder_action(@parent.token, 'retentionPolicy', @id, retentionPolicy: options)
-      # 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 rename!(new_name)
+        return false if new_name == @name
+
+        @parent.sacc.invoke(jsns_builder.to_rename(new_name))
+        @name = new_name
+      end
 
       def reload!
-        rep = @parent.sacc.get_folder(@parent.token, jsns_builder.to_find)
-        json = rep[:Body][:GetFolderResponse][:folder].first
+        rep = @parent.sacc.invoke(jsns_builder.to_find)
+        json = rep[:GetFolderResponse][:folder].first
         FolderJsnsInitializer.update(self, json)
         true
       end
@@ -89,51 +91,65 @@ module Zm
       end
 
       def empty!
-        @parent.sacc.folder_action(@parent.token, jsns_builder.to_empty) unless @n.zero?
+        return false if empty?
+
+        @parent.sacc.invoke(jsns_builder.to_empty)
         @n = 0
       end
       alias clear empty!
 
       def delete!
-        return false if is_immutable?
+        return false if is_immutable? || @id.nil?
 
-        super
+        @parent.sacc.invoke(jsns_builder.to_delete)
+        @id = nil
       end
 
-      def upload(file_path, fmt = nil, types = nil, resolve = 'replace')
-        fmt ||= File.extname(file_path)[1..]
-        uploader = Upload.new(@parent, RestAccountConnector.new)
-        uploader.send_file(absFolderPath, fmt, types, resolve, file_path)
+      def remove_flag!(pattern)
+        flags = f.tr(pattern, '')
+        update!(f: flags)
       end
 
-      def import(file_path)
-        uploader = Upload.new(@parent, RestAccountConnector.new)
-        uploader.send_file(absFolderPath, 'tgz', nil, 'skip', file_path)
+      def add_message(eml, d = nil, f = nil, tn = nil)
+        m = {
+          l: id,
+          d: d,
+          f: f,
+          tn: tn,
+          content: { _content: eml }
+        }.reject { |_, v| v.nil? }
+
+        attrs = { m: m }
+
+        soap_request = SoapElement.mail(SoapMailConstants::ADD_MSG_REQUEST).add_attributes(attrs)
+        @parent.sacc.invoke(soap_request)
+      end
+
+      def add_appointments(ics)
+        attrs = { l: id, ct: SoapConstants::TEXT_CALENDAR }
+        soap_request = SoapElement.mail(SoapMailConstants::IMPORT_APPOINTMENTS_REQUEST).add_attributes(attrs)
+        node_content = SoapElement.create(SoapConstants::CONTENT).add_content(ics)
+        soap_request.add_node(node_content)
+        @parent.sacc.invoke(soap_request).dig(:ImportAppointmentsResponse, :appt)
       end
 
       def download(dest_file_path, fmt = 'tgz')
         uploader = Upload.new(@parent, RestAccountConnector.new)
-        # uploader.download_file(absFolderPath, fmt, [view], nil, dest_file_path)
         uploader.download_folder(@id, fmt, dest_file_path)
       end
 
-      def export(dest_file_path)
-        h = {
-          fmt: 'tgz',
-          emptyname: 'Vide',
-          charset: 'UTF-8',
-          auth: 'qp',
-          zauthtoken: @parent.token,
-          query: to_query
-        }
-
-        url_query = absFolderPath + '?' + h.map { |k, v| [k, v].join('=') }.join('&')
-
-        @parent.uploader.download_file_with_url(url_query, dest_file_path)
+      def upload(file_path, fmt = nil, types = nil, resolve = 'replace')
+        fmt ||= File.extname(file_path)[1..]
+        uploader = Upload.new(@parent, RestAccountConnector.new)
+        uploader.send_file(absFolderPath, fmt, types, resolve, file_path)
       end
 
       private
 
+      def do_update!(hash)
+        @parent.sacc.invoke(jsns_builder.to_patch(hash))
+      end
+
       def jsns_builder
         @jsns_builder ||= FolderJsnsBuilder.new(self)
       end

data/lib/zm/client/folder/folder_grant.rb

@@ -4,6 +4,13 @@ module Zm
   module Client
     # class for account folder
     class FolderGrant
+      GT_USER = 'usr'
+      GT_GROUP = 'dom'
+      GT_DOMAIN = 'grp'
+      GT_PUB = 'pub'
+      GT_GUEST = 'guest'
+      GT_KEY = 'key'
+
       attr_reader :parent, :folder_id
       attr_accessor :zid, :gt, :perm, :d, :expiry, :key
 
@@ -22,45 +29,58 @@ module Zm
         @folder_id = parent.parent.id
       end
 
-      def to_h
-        h = Hash[instance_variables.reject { |iv| iv == :@parent }.map { |iv| [iv, instance_variable_get(iv)] }]
-        h.merge!({ :@parent => @parent.class })
-        h
-      end
-
       def is_account?
-        gt == 'usr'
+        gt == GT_USER
       end
 
       def is_dom?
-        gt == 'dom'
+        gt == GT_DOMAIN
       end
 
       def is_dl?
-        gt == 'grp'
+        gt == GT_GROUP
       end
 
       def is_public?
-        gt == 'pub'
+        gt == GT_PUBLIC
       end
 
       def is_external?
-        gt == 'guest'
+        gt == GT_GUEST
       end
 
       def is_key?
-        gt == 'key'
+        gt == GT_KEY
       end
 
       def save!
-        @parent.sacc.folder_action(get_token, jsns_builder.to_create)
+        @parent.sacc.invoke(jsns_builder.to_create)
       end
 
       def delete!
-        @parent.sacc.folder_action(get_token, jsns_builder.to_delete)
+        @parent.sacc.invoke(jsns_builder.to_delete)
         @parent.all.delete(self)
       end
 
+      def to_s
+        inspect
+      end
+
+      def to_h
+        Hash[instance_variables_map]
+      end
+
+      def inspect
+        keys_str = to_h.map { |k, v| "#{k}: #{v}" }.join(', ')
+        "#{self.class}:#{format('0x00%x', (object_id << 1))} #{keys_str}"
+      end
+
+      def instance_variables_map
+        keys = instance_variables.dup
+        keys.delete(:@parent)
+        keys.map { |key| [key, instance_variable_get(key)] }
+      end
+
       private
 
       def jsns_builder

data/lib/zm/client/folder/folder_grant_jsns_builder.rb

@@ -4,7 +4,6 @@ module Zm
   module Client
     # class for account folder grant jsns builder
     class FolderGrantJsnsBuilder < Base::BaseJsnsBuilder
-
       def to_jsns
         grant = {
           zid: @item.zid,
@@ -15,28 +14,40 @@ module Zm
           key: @item.key
         }.delete_if { |_, v| v.nil? }
 
-        {
+        attrs = {
           action: {
             op: :grant,
             id: @item.folder_id,
             grant: grant
           }
         }
+
+        SoapElement.mail(SoapMailConstants::FOLDER_ACTION_REQUEST).add_attributes(attrs)
       end
 
       alias to_create to_jsns
 
       def to_delete
-        {
+        attrs = {
           action: {
             op: '!grant',
             id: @item.folder_id,
-            zid: @item.zid,
+            zid: delete_zid,
             gt: @item.gt,
             perm: @item.perm,
             d: @item.d
           }
         }
+
+        SoapElement.mail(SoapMailConstants::FOLDER_ACTION_REQUEST).add_attributes(attrs)
+      end
+
+      def delete_zid
+        return @item.zid unless @item.zid.nil?
+
+        return '99999999-9999-9999-9999-999999999999' if @item.gt == 'pub'
+
+        '00000000-0000-0000-0000-000000000000'
       end
     end
   end

data/lib/zm/client/folder/folder_grants_collection.rb

@@ -4,14 +4,37 @@ module Zm
   module Client
     # class for folder retention policies collection
     class FolderGrantsCollection
+      include MissingMethodStaticCollection
 
-      attr_reader :parent, :all
+      attr_reader :parent
 
       def initialize(parent)
         @parent = parent
         @all = []
       end
 
+      def new_from_object(item, perm)
+        case item
+        when Account
+          zid = item.id
+          gt = FolderGrant::GT_USER
+        when Resource
+          zid = item.id
+          gt = FolderGrant::GT_USER
+        when DistributionList
+          zid = item.id
+          gt = FolderGrant::GT_GROUP
+        when Domain
+          zid = item.id
+          gt = FolderGrant::GT_DOMAIN
+        else
+          zid = nil
+          gt = nil
+        end
+
+        new(zid, gt, perm, nil)
+      end
+
       def new(zid, gt, perm, d)
         FolderGrant.new(self, zid, gt, perm, d)
       end
@@ -19,6 +42,13 @@ module Zm
       def create(zid, gt, perm, d)
         fg = new(zid, gt, perm, d)
         add(fg)
+        fg
+      end
+
+      def create_from_object(item, perm)
+        fg = new_from_object(item, perm)
+        add(fg)
+        fg
       end
 
       def add(fg)
@@ -26,10 +56,14 @@ module Zm
       end
 
       def soap_account_connector
-        @parent.soap_account_connector
+        @parent.parent.soap_account_connector
       end
 
       alias sacc soap_account_connector
+
+      def to_s
+        @all.map(&:to_s)
+      end
     end
   end
 end

data/lib/zm/client/folder/folder_jsns_builder.rb

@@ -3,10 +3,10 @@
 module Zm
   module Client
     # class for account folder jsns builder
-    class FolderJsnsBuilder < Base::BaseJsnsBuilder
-
+    class FolderJsnsBuilder < BaseAccountJsnsBuilder
       def to_find
-        { folder: { l: @item.id } }
+        attrs = { folder: { l: @item.id } }
+        SoapElement.mail(SoapMailConstants::GET_FOLDER_REQUEST).add_attributes(attrs)
       end
 
       def to_jsns
@@ -21,7 +21,9 @@ module Zm
           view: @item.view
         }.delete_if { |_, v| v.nil? }
 
-        { folder: folder }
+        attrs = { folder: folder }
+
+        SoapElement.mail(SoapMailConstants::CREATE_FOLDER_REQUEST).add_attributes(attrs)
       end
 
       alias to_create to_jsns
@@ -45,7 +47,9 @@ module Zm
           action.delete(:l)
         end
 
-        { action: action }
+        attrs = { action: action }
+
+        SoapElement.mail(SoapMailConstants::FOLDER_ACTION_REQUEST).add_attributes(attrs)
       end
 
       def to_patch(options)
@@ -54,39 +58,23 @@ module Zm
           id: @item.id
         }.merge(options)
 
-        { action: action }
-      end
+        attrs = { action: action }
 
-      def to_rename
-        action = {
-          op: :rename,
-          id: @item.id,
-          name: @item.name
-        }
-
-        { action: action }
+        SoapElement.mail(SoapMailConstants::FOLDER_ACTION_REQUEST).add_attributes(attrs)
       end
 
-      def to_move
-        action = {
-          op: :move,
-          id: @item.id,
-          l: @item.l
-        }
-
-        { action: action }
-      end
+      def to_retentionpolicy
+        retentionpolicy = @item.retention_policies.all.map { |rp| retentionpolicy_jsns(rp) }.reduce({}, :merge)
 
-      def to_color
-        action = {
-          op: :color,
-          id: @item.id
+        attrs = {
+          action: {
+            op: :retentionpolicy,
+            id: @item.id,
+            retentionPolicy: retentionpolicy
+          }
         }
 
-        action[:rgb] = @item.rgb if @item.rgb_changed?
-        action[:color] = @item.color if @item.color_changed?
-
-        { action: action }
+        SoapElement.mail(SoapMailConstants::FOLDER_ACTION_REQUEST).add_attributes(attrs)
       end
 
       def to_empty
@@ -96,23 +84,9 @@ module Zm
           recursive: false
         }
 
-        { action: action }
-      end
-
-      def to_delete
-        { action: { op: :delete, id: @item.id } }
-      end
-
-      def to_retentionpolicy
-        retentionpolicy = @item.retention_policies.all.map { |rp| retentionpolicy_jsns(rp) }.reduce({}, :merge)
+        attrs = { action: action }
 
-        {
-          action: {
-            op: :retentionpolicy,
-            id: @item.id,
-            retentionPolicy: retentionpolicy
-          }
-        }
+        SoapElement.mail(SoapMailConstants::FOLDER_ACTION_REQUEST).add_attributes(attrs)
       end
 
       private

data/lib/zm/client/folder/folder_jsns_initializer.rb

@@ -7,24 +7,47 @@ module Zm
       class << self
         def create(parent, json)
           item = Folder.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.type = json[:type]
+          item.id = json[:id].to_i
+          item.uuid = json[:uuid]
+          item.name = json[:name]
+          item.absFolderPath = json[:absFolderPath]
+          item.l = json[:l].to_i
+          item.url = json[:url]
+          item.luuid = json[:luuid]
+          item.f = json[:f]
+          item.view = json[:view]
+          item.rev = json[:rev]
+          item.ms = json[:ms]
+          item.webOfflineSyncDays = json[:webOfflineSyncDays]
+          item.activesyncdisabled = json[:activesyncdisabled]
+          item.n = json[:n]
+          item.s = json[:s]
+          item.i4ms = json[:i4ms]
+          item.i4next = json[:i4next]
+          item.zid = json[:zid]
+          item.rid = json[:rid]
+          item.ruuid = json[:ruuid]
+          item.owner = json[:owner]
+          item.reminder = json[:reminder]
+          item.acl = json[:acl]
+          item.itemCount = json[:itemCount]
+          item.broken = json[:broken]
+          item.deletable = json[:deletable]
+          item.color = json[:color]
+          item.rgb = json[:rgb]
+          item.fb = json[:fb]
+
           if !json[:acl].nil? && json[:acl][:grant].is_a?(Array)
             json[:acl][:grant].each do |json|
               item.grants.create(json[:zid], json[:gt], json[:perm], json[:d])
             end
           end
-  
+
           if json[:retentionPolicy].is_a?(Array)
             json[:retentionPolicy].first.map do |policy, v|
               next if v.first[:policy].nil?
@@ -34,14 +57,8 @@ module Zm
               item.retention_policies.create(policy, lifetime, type)
             end
           end
-  
-          item
-        end
 
-        def arrow_name(name)
-          return name if name.to_s.start_with?('@')
-
-          "@#{name}"
+          item
         end
       end
     end

data/lib/zm/client/folder/folder_retention_policies_collection.rb

@@ -4,8 +4,7 @@ module Zm
   module Client
     # class for folder retention policies collection
     class FolderRetentionPoliciesCollection
-
-      attr_reader :all
+      include MissingMethodStaticCollection
 
       def initialize(parent)
         @parent = parent
@@ -26,7 +25,7 @@ module Zm
       end
 
       def save!
-        @parent.sacc.folder_action(@parent.parent.token, jsns_builder.to_retentionpolicy)
+        @parent.sacc.invoke(jsns_builder.to_retentionpolicy)
         true
       end
 

data/lib/zm/client/folder/folder_retention_policy.rb

@@ -4,7 +4,6 @@ module Zm
   module Client
     # class for account folder retention policy
     class FolderRetentionPolicy
-
       attr_accessor :type, :policy, :lifetime
 
       def initialize(parent, policy, lifetime, type)

data/lib/zm/client/folder/folders_builder.rb

@@ -4,16 +4,15 @@ module Zm
   module Client
     # class factory [folders]
     class FoldersBuilder < Base::ObjectsBuilder
-      def initialize(account, json)
-        @account = account
-        @json = json
+      def initialize(parent, json)
+        super(parent, json)
         @key = :folder
         @root_folder = nil
         @list = []
       end
 
       def ids
-        root = @json[:Body][:GetFolderResponse][@key]
+        root = @json[:GetFolderResponse][@key]
         construct_tree_ids(root.first[@key])
         @list
       end
@@ -26,20 +25,18 @@ module Zm
       end
 
       def make
-        root = @json[:Body][:GetFolderResponse][@key]
+        root = @json[:GetFolderResponse][@key]
 
-        @root_folder = FolderJsnsInitializer.create(@account, root.first)
+        @root_folder = FolderJsnsInitializer.create(@parent, root.first)
 
-        if !root.first[@key].nil? && root.first[@key].any?
-          construct_tree(@root_folder, root.first[@key])
-        end
+        construct_tree(@root_folder, root.first[@key]) if !root.first[@key].nil? && root.first[@key].any?
 
         @root_folder
       end
 
       def construct_tree(parent_folder, json_folders)
         json_folders.each do |json_folder|
-          folder = FolderJsnsInitializer.create(@account, json_folder)
+          folder = FolderJsnsInitializer.create(@parent, json_folder)
           parent_folder.folders << folder
 
           construct_tree(folder, json_folder[@key]) if !json_folder[@key].nil? && json_folder[@key].any?