zm-ruby-client 0.10.4 → 0.17.1

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

@@ -3,92 +3,39 @@
 module Zm
   module Client
     # class for account mountpoint
-    class MountPoint < Base::AccountObject
+    class MountPoint < Base::FolderObject
+      include Zm::Model::AttributeChangeObserver
+
       INSTANCE_VARIABLE_KEYS = %i[
         owner rev reminder ms deletable l rid uuid url f broken
         luuid ruuid activesyncdisabled absFolderPath view zid name id
         webOfflineSyncDays color rgb
       ].freeze
 
-      attr_accessor(*INSTANCE_VARIABLE_KEYS)
+      attr_reader :owner, :rev, :reminder, :ms, :deletable, :rid, :uuid, :url, :f, :broken, :luuid, :ruuid, :activesyncdisabled, :absFolderPath, :view, :zid, :id, :webOfflineSyncDays
+
+      define_changed_attributes :name, :color, :rgb, :l
 
-      def concat
-        INSTANCE_VARIABLE_KEYS.map { |key| instance_variable_get(arrow_name(key)) }
+      def all_instance_variable_keys
+        INSTANCE_VARIABLE_KEYS
       end
 
       alias parent_id l
 
-      def initialize(parent, json = nil)
-        @parent = parent
-        @l = 1
-        init_from_json(json) if json.is_a?(Hash)
-        yield(self) if block_given?
-      end
-
       def create!
-        rep = @parent.sacc.create_mountpoint(@parent.token, build_create_options)
-        init_from_json(rep[:Body][:CreateMountpointResponse][:link].first)
-      end
-
-      def build_create_options
-        {
-          l: @l,
-          name: @name,
-          view: @view,
-          zid: @zid,
-          rid: @rid,
-          url: @url,
-          color: @color,
-          rgb: @rgb,
-          f: @f
-        }.delete_if { |_, v| v.nil? }
-      end
-
-      def modify!
-        update!(build_update_options)
+        rep = @parent.sacc.create_mountpoint(@parent.token, jsns_builder.to_jsns)
+        json = rep[:Body][:CreateMountpointResponse][:link].first
+        MountpointJsnsInitializer.update(self, json)
       end
 
       def update!(options)
-        @parent.sacc.folder_action(@parent.token, 'update', @id, options)
+        # todo
       end
 
-      def build_update_options
-        {
-          f: @f,
-          name: @name,
-          l: @l,
-          color: @color,
-          rgb: @rgb
-        }.delete_if { |_, v| v.nil? }
-      end
-
-      def rename!(new_name)
-        @parent.sacc.folder_action(@parent.token, 'rename', @id, name: new_name)
-        @name = new_name
-      end
-
-      def move!(folder_id)
-        @parent.sacc.folder_action(@parent.token, 'move', @id, l: folder_id)
-        @l = folder_id
-      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 delete!
-        @parent.sacc.folder_action(@parent.token, :delete, @id)
-      end
+      private
 
-      def init_from_json(json)
-        INSTANCE_VARIABLE_KEYS.each do |key|
-          var_name = "@#{key}"
-          instance_variable_set(var_name, json[key])
-        end
+      def jsns_builder
+        @jsns_builder ||= MountpointJsnsBuilder.new(self)
       end
     end
   end

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

@@ -0,0 +1,100 @@
+# frozen_string_literal: true
+
+module Zm
+  module Client
+    # class for account folder
+    class MountpointJsnsBuilder < Base::BaseJsnsBuilder
+
+      def to_find
+        { link: { l: @item.id } }
+      end
+
+      def to_jsns
+        link = {
+          f: @item.f,
+          name: @item.name,
+          l: @item.l,
+          color: @item.color,
+          rgb: @item.rgb,
+          url: @item.url,
+          fb: @item.fb,
+          view: @item.view,
+          zid: @item.zid,
+          rid: @item.rid
+        }.delete_if { |_, v| v.nil? }
+
+        { link: link }
+      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_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
+    end
+  end
+end

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

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module Zm
+  module Client
+    # class for initialize account mountpoint
+    class MountpointJsnsInitializer
+      class << self
+        def create(parent, json)
+          item = MountPoint.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/mountpoint/mountpoints_builder.rb

@@ -24,7 +24,7 @@ module Zm
         json_folders.each do |json_folder|
           if json_folder[@key_link].is_a?(Array)
             @list += json_folder[@key_link].map do |json_link|
-              MountPoint.new(@account, json_link)
+              MountpointJsnsInitializer.create(@account, json_link)
             end
           end
 

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

@@ -3,23 +3,20 @@
 module Zm
   module Client
     # collection of mountpoints
-    class MountPointsCollection < Base::ObjectsCollection
-      METHODS_MISSING_LIST = %i[select each map length].to_set.freeze
+    class MountPointsCollection < Base::AccountObjectsCollection
 
       attr_reader :root
 
+      attr_accessor :view, :tr, :visible, :needGranteeName, :depth
+
       def initialize(parent)
-        @parent = parent
+        @child_class = MountPoint
+        @builder_class = MountPointsBuilder
+        super(parent)
         @root = nil
         reset_query_params
       end
 
-      def new
-        mountpoint = MountPoint.new(@parent)
-        yield(mountpoint) if block_given?
-        mountpoint
-      end
-
       def where(view: nil, tr: nil)
         @view = view
         @tr = tr
@@ -27,14 +24,6 @@ module Zm
         self
       end
 
-      def all
-        @all || all!
-      end
-
-      def all!
-        build_response
-      end
-
       def clear
         @all = nil
         @root = nil
@@ -43,18 +32,20 @@ module Zm
 
       private
 
-      def build_response
-        @all = MountPointsBuilder.new(@parent, make_query).make
-        @all
-      end
-
       def make_query
-        @parent.sacc.get_all_folders(@parent.token, @view, @tr)
+        @parent.sacc.get_folder(@parent.token, jsns_builder.to_jsns)
       end
 
       def reset_query_params
         @view = nil
         @tr = nil
+        @visible = nil
+        @needGranteeName = nil
+        @depth = nil
+      end
+
+      def jsns_builder
+        @jsns_builder ||= FoldersJsnsBuilder.new(self)
       end
     end
   end

data/lib/zm/client/mountpoint.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
 require 'zm/client/mountpoint/mountpoint'
+require 'zm/client/mountpoint/mountpoint_jsns_builder'
+require 'zm/client/mountpoint/mountpoint_jsns_initializer'
 require 'zm/client/mountpoint/mountpoints_builder'
 require 'zm/client/mountpoint/mountpoints_collection'

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

@@ -15,11 +15,11 @@ module Zm
         @grantee_type = 'usr'.freeze
       end
 
-      def to_h
-        hashmap = Hash[all_instance_variable_keys.map { |key| [key, instance_variable_get(arrow_name(key))] }]
-        hashmap.delete_if { |_, v| v.nil? }
-        hashmap
-      end
+      # def to_h
+      #   hashmap = Hash[all_instance_variable_keys.map { |key| [key, instance_variable_get(arrow_name(key))] }]
+      #   hashmap.delete_if { |_, v| v.nil? }
+      #   hashmap
+      # end
 
       def all_instance_variable_keys
         ResourceCommon::ALL_ATTRS

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'