zm-ruby-client 0.10.4 → 0.17.1

data/lib/zm/client/domain/domains_collection.rb

@@ -3,29 +3,26 @@
 module Zm
   module Client
     # Class Collection [Domain]
-    class DomainsCollection < Base::ObjectsCollection
+    class DomainsCollection < Base::AdminObjectsCollection
       def initialize(parent)
         @child_class = Domain
-        @parent = parent
-        reset_query_params
+        @builder_class = DomainsBuilder
+        @search_type = SearchType::DOMAIN
+        super(parent)
       end
 
-      def find_by(hash, *attrs)
-        rep = sac.get_domain(hash.values.first, hash.keys.first, attrs.join(COMMA))
+      def find_by(hash)
+        rep = sac.get_domain(hash.values.first, hash.keys.first, attrs_comma)
         entry = rep[:Body][:GetDomainResponse][:domain].first
 
+        reset_query_params
         build_from_entry(entry)
       end
 
       private
 
-      def build_response
-        DomainsBuilder.new(@parent, make_query).make
-      end
-
       def reset_query_params
         super
-        @search_type = SearchType::DOMAIN
         @attrs = SearchType::Attributes::DOMAIN.dup
         @all_servers = 1
         @refresh = 0

data/lib/zm/client/domain.rb

@@ -3,3 +3,4 @@
 require 'zm/client/domain/domain'
 require 'zm/client/domain/domains_builder'
 require 'zm/client/domain/domains_collection'
+require 'zm/client/domain/domain_accounts_collection'

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

@@ -3,17 +3,22 @@
 module Zm
   module Client
     # class for account folder
-    class Folder < Base::AccountObject
+    class Folder < Base::FolderObject
+      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]
+                                  view rev ms webOfflineSyncDays activesyncdisabled n s i4ms i4next zid rid
+                                  ruuid owner reminder acl itemCount broken deletable color rgb fb].freeze
+
+      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 *INSTANCE_VARIABLE_KEYS
       attr_accessor :folders, :grants, :retention_policies
 
-      def concat
-        INSTANCE_VARIABLE_KEYS.map { |key| instance_variable_get(arrow_name(key)) }
+      define_changed_attributes :name, :color, :rgb, :l, :url, :f, :view
+
+      def all_instance_variable_keys
+        INSTANCE_VARIABLE_KEYS
       end
 
       alias nb_messages n
@@ -21,14 +26,16 @@ module Zm
       alias parent_id l
       alias size s
 
-      def initialize(parent, json = nil, key = :folder)
-        @parent = parent
-        @type = key
+      def initialize(parent)
+        super(parent)
+
+        @type = :folder
         @folders = []
-        @grants = []
-        @retention_policies = []
-        init_from_json(json) if json.is_a?(Hash)
+        @grants = FolderGrantsCollection.new(self)
+        @retention_policies = FolderRetentionPoliciesCollection.new(self)
+
         yield(self) if block_given?
+
         extend(DocumentFolder) if view == 'document'
       end
 
@@ -40,69 +47,40 @@ module Zm
         "inid:#{id}"
       end
 
-      def to_h
-        {
-          f: f,
-          name: name,
-          l: l,
-          color: color,
-          rgb: rgb,
-          url: url,
-          fb: fb,
-          view: view
-        }
-      end
-
       def create!
-        options = to_h
-        options.delete_if { |_, v| v.nil? }
-        rep = @parent.sacc.create_folder(@parent.token, options)
-        # rep = @parent.sacc.create_folder(@parent.token, @l, @name, @view, @color)
-        init_from_json(rep[:Body][:CreateFolderResponse][:folder].first)
-      end
-
-      def modify!
-        options = to_h
-        options.delete_if { |_, v| v.nil? }
-
-        if is_immutable?
-          options.delete(:name)
-          options.delete(:l)
-        end
-
-        update!(options)
+        rep = @parent.sacc.create_folder(@parent.token, jsns_builder.to_jsns)
+        json = rep[:Body][:CreateFolderResponse][:folder].first
+        FolderJsnsInitializer.update(self, json)
       end
 
       def update!(options)
-        @parent.sacc.folder_action(@parent.token, 'update', @id, options)
-      end
+        options.delete_if { |k, v| v.nil? || !respond_to?(k) }
+        return false if options.empty?
 
-      def rename!(new_name)
-        @parent.sacc.folder_action(@parent.token, 'rename', @id, name: new_name)
-        @name = new_name
-      end
+        @parent.sacc.folder_action(@parent.token, jsns_builder.to_patch(options))
 
-      def add_retention_policy!(retention_policies)
-        options = retention_policies.is_a?(Hash) ? retention_policies : retention_policies.map(&:to_h).reduce({}, :merge)
-        @parent.sacc.folder_action(@parent.token, 'retentionPolicy', @id, retentionPolicy: options)
-      end
+        options.each do |k, v|
+          instance_variable_set("@#{k}", v)
+        end
 
-      def move!(folder_id)
-        @parent.sacc.folder_action(@parent.token, 'move', @id, l: folder_id)
-        @l = folder_id
+        true
       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 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 reload!
-        rep = @parent.sacc.get_folder(@parent.token, @id)
-        init_from_json(rep[:Body][:GetFolderResponse][:folder].first)
+        rep = @parent.sacc.get_folder(@parent.token, jsns_builder.to_find)
+        json = rep[:Body][:GetFolderResponse][:folder].first
+        FolderJsnsInitializer.update(self, json)
+        true
       end
 
       def empty?
@@ -110,60 +88,19 @@ module Zm
       end
 
       def empty!
-        @parent.sacc.folder_action(
-          @parent.token,
-          :empty,
-          @id,
-          recursive: false
-        )
+        @parent.sacc.folder_action(@parent.token, jsns_builder.to_empty) unless @n.zero?
+        @n = 0
       end
       alias clear empty!
 
       def delete!
-        @parent.sacc.folder_action(@parent.token, :delete, @id)
-      end
-
-      #
-      # folder_grant: Zm::Client::FolderGrant
-      #
-      def grant!(folder_grant)
-        @parent.sacc.folder_action(
-            @parent.token,
-            'grant',
-            @id,
-            grant: folder_grant.to_h
-        )
-      end
+        return false if is_immutable?
 
-      # def grant!(parent, right)
-      #   @parent.sacc.folder_action(
-      #     @parent.token,
-      #     'grant',
-      #     @id,
-      #     grant: {
-      #       zid: parent.id,
-      #       gt: parent.grantee_type,
-      #       perm: right
-      #     }
-      #   )
-      # end
-
-      def remove_grant!(zid)
-        @parent.sacc.folder_action(
-          @parent.token,
-          '!grant',
-          @id,
-          zid: zid
-        )
-      end
-
-      def retention_policies_h
-        @retention_policies.map(&:to_h).reduce({}, :merge)
+        super
       end
 
       def upload(file_path, fmt = nil, types = nil, resolve = 'replace')
-        fmt ||= File.extname(file_path)[1..-1]
-        # @parent.uploader.send_file(absFolderPath, fmt, types, resolve, file_path)
+        fmt ||= File.extname(file_path)[1..]
         uploader = Upload.new(@parent, RestAccountConnector.new)
         uploader.send_file(absFolderPath, fmt, types, resolve, file_path)
       end
@@ -194,21 +131,10 @@ module Zm
         @parent.uploader.download_file_with_url(url_query, dest_file_path)
       end
 
-      def init_from_json(json)
-        INSTANCE_VARIABLE_KEYS.each do |key|
-          var_name = "@#{key}"
-          instance_variable_set(var_name, json[key])
-        end
-
-        if !json[:acl].nil? && json[:acl][:grant].is_a?(Array)
-          @grants = json[:acl][:grant].map { |grant| FolderGrant.create_by_json(self, grant) }
-        end
+      private
 
-        if json[:retentionPolicy].is_a?(Array)
-          @retention_policies = json[:retentionPolicy].first.map do |k, v|
-            FolderRetentionPolicy.create_by_json(self, k, v.first)
-          end
-        end
+      def jsns_builder
+        @jsns_builder ||= FolderJsnsBuilder.new(self)
       end
     end
   end

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

@@ -3,19 +3,29 @@
 module Zm
   module Client
     # class for account folder
-    class FolderGrant < Base::AccountObject
-      attr_accessor :zid, :gt, :perm, :d
+    class FolderGrant
+      attr_reader :parent, :folder_id
+      attr_accessor :zid, :gt, :perm, :d, :expiry, :key
 
-      class << self
-        def create_by_json(parent, json)
-          fg = self.new(parent)
-          fg.init_from_json(json)
-          fg
-        end
+      # pour créer un nouveau partage, il faut indiquer zid et/ou d
+      # l'attribut gt est obligatoire !
+      # l'attribut perm est obligatoire !
+
+      def initialize(parent, zid, gt, perm, d)
+        @parent = parent
+        @zid = zid
+        @gt = gt
+        @perm = perm
+        @d = d
+        @expiry = nil
+        @key = nil
+        @folder_id = parent.parent.id
       end
 
-      def concat
-        [zid, gt, perm, d]
+      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?
@@ -38,20 +48,32 @@ module Zm
         gt == 'guest'
       end
 
-      def init_from_json(json)
-        @zid = json[:zid]
-        @gt = json[:gt]
-        @perm = json[:perm]
-        @d = json[:d]
+      def is_key?
+        gt == 'key'
       end
 
-      def to_h
-        {
-            zid: @zid,
-            gt: @gt,
-            perm: @perm,
-            d: @d
-        }
+      def save!
+        @parent.sacc.folder_action(get_token, jsns_builder.to_create)
+      end
+
+      def delete!
+        @parent.sacc.folder_action(get_token, jsns_builder.to_delete)
+        @parent.all.delete(self)
+      end
+
+      private
+
+      def jsns_builder
+        @jsns_builder ||= FolderGrantJsnsBuilder.new(self)
+      end
+
+      def get_token(target = self)
+        token = nil
+        return target.token if target.respond_to?(:token) && !target.token.nil?
+
+        token = get_token(target.parent) if target.respond_to?(:parent)
+
+        token
       end
     end
   end

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

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+module Zm
+  module Client
+    # class for account folder grant jsns builder
+    class FolderGrantJsnsBuilder < Base::BaseJsnsBuilder
+
+      def to_jsns
+        grant = {
+          zid: @item.zid,
+          gt: @item.gt,
+          perm: @item.perm,
+          d: @item.d,
+          expiry: @item.expiry,
+          key: @item.key
+        }.delete_if { |_, v| v.nil? }
+
+        {
+          action: {
+            op: :grant,
+            id: @item.folder_id,
+            grant: grant
+          }
+        }
+      end
+
+      alias to_create to_jsns
+
+      def to_delete
+        {
+          action: {
+            op: '!grant',
+            id: @item.folder_id,
+            zid: @item.zid,
+            gt: @item.gt,
+            perm: @item.perm,
+            d: @item.d
+          }
+        }
+      end
+    end
+  end
+end

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

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module Zm
+  module Client
+    # class for folder retention policies collection
+    class FolderGrantsCollection
+
+      attr_reader :parent, :all
+
+      def initialize(parent)
+        @parent = parent
+        @all = []
+      end
+
+      def new(zid, gt, perm, d)
+        FolderGrant.new(self, zid, gt, perm, d)
+      end
+
+      def create(zid, gt, perm, d)
+        fg = new(zid, gt, perm, d)
+        add(fg)
+      end
+
+      def add(fg)
+        @all << fg
+      end
+
+      def soap_account_connector
+        @parent.soap_account_connector
+      end
+
+      alias sacc soap_account_connector
+    end
+  end
+end

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

@@ -0,0 +1,132 @@
+# frozen_string_literal: true
+
+module Zm
+  module Client
+    # class for account folder jsns builder
+    class FolderJsnsBuilder < Base::BaseJsnsBuilder
+
+      def to_find
+        { folder: { l: @item.id } }
+      end
+
+      def to_jsns
+        folder = {
+          f: @item.f,
+          name: @item.name,
+          l: @item.l,
+          color: @item.color,
+          rgb: @item.rgb,
+          url: @item.url,
+          fb: @item.fb,
+          view: @item.view
+        }.delete_if { |_, v| v.nil? }
+
+        { folder: folder }
+      end
+
+      alias to_create to_jsns
+
+      def to_update
+        action = {
+          op: :update,
+          id: @item.id,
+          f: @item.f,
+          name: @item.name,
+          l: @item.l,
+          color: @item.color,
+          rgb: @item.rgb,
+          url: @item.url,
+          fb: @item.fb,
+          view: @item.view
+        }.delete_if { |_, v| v.nil? }
+
+        if @item.is_immutable?
+          action.delete(:name)
+          action.delete(:l)
+        end
+
+        { action: action }
+      end
+
+      def to_patch(options)
+        action = {
+          op: :update,
+          id: @item.id
+        }.merge(options)
+
+        { 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_empty
+        action = {
+          op: :empty,
+          id: @item.id,
+          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)
+
+        {
+          action: {
+            op: :retentionpolicy,
+            id: @item.id,
+            retentionPolicy: retentionpolicy
+          }
+        }
+      end
+
+      private
+
+      def retentionpolicy_jsns(rp)
+        {
+          rp.policy => {
+            policy: {
+              lifetime: rp.lifetime,
+              type: rp.type
+            }
+          }
+        }
+      end
+    end
+  end
+end

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

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+module Zm
+  module Client
+    # class for initialize account folder
+    class FolderJsnsInitializer
+      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
+  
+          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?
+
+              type = v.first[:policy].first[:type]
+              lifetime = v.first[:policy].first[:lifetime]
+              item.retention_policies.create(policy, lifetime, type)
+            end
+          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/folder/folder_retention_policies_collection.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module Zm
+  module Client
+    # class for folder retention policies collection
+    class FolderRetentionPoliciesCollection
+
+      attr_reader :all
+
+      def initialize(parent)
+        @parent = parent
+        @all = []
+      end
+
+      def new(policy, lifetime, type)
+        FolderRetentionPolicy.new(self, policy, lifetime, type)
+      end
+
+      def create(policy, lifetime, type)
+        frp = new(policy, lifetime, type)
+        add(frp)
+      end
+
+      def add(retention_policy)
+        @all << retention_policy
+      end
+
+      def save!
+        @parent.sacc.folder_action(@parent.parent.token, jsns_builder.to_retentionpolicy)
+        true
+      end
+
+      private
+
+      def jsns_builder
+        @jsns_builder ||= FolderJsnsBuilder.new(@parent)
+      end
+    end
+  end
+end