zm-ruby-client 0.14.0 → 0.18.0

data/lib/zm/client/message/message.rb

@@ -4,7 +4,7 @@ module Zm
   module Client
     # class message for account
     class Message < Base::AccountObject
-      INSTANCE_VARIABLE_KEYS = %i[id date l su fr]
+      INSTANCE_VARIABLE_KEYS = %i[id date l su fr autoSendTime mid idnt]
       attr_accessor *INSTANCE_VARIABLE_KEYS
 
       attr_accessor :subject
@@ -22,6 +22,14 @@ module Zm
         yield(self) if block_given?
       end
 
+      def has_attachment?
+        @has_attachment ||= @attachments.all.any?
+      end
+
+      def all_instance_variable_keys
+        INSTANCE_VARIABLE_KEYS
+      end
+
       def from
         @from ||= @recipients.find { |r| r.field == Recipient::FROM }
       end
@@ -31,15 +39,6 @@ module Zm
         @l = folder.id
       end
 
-      def to_jsns
-        {
-          attach: @attachments.to_jsns,
-          e: @recipients.to_jsns,
-          su: { _content: @subject },
-          mp: @body.to_jsns
-        }
-      end
-
       def delete!
         msg_action('delete')
       end
@@ -89,6 +88,20 @@ module Zm
         @parent.sacc.send_msg(@parent.token, to_jsns)
       end
 
+      def to_jsns
+        h = {
+          id: @id,
+          attach: @attachments.to_jsns,
+          e: @recipients.to_jsns,
+          su: { _content: @su },
+          mp: @body.to_jsns
+        }.delete_if { |_, v| v.nil? }
+
+        h[:did] = @id if l.to_i == FolderDefault::DRAFTS[:id]
+
+        h
+      end
+
       def init_from_json(json)
         # puts json
         @id   = json[:id]
@@ -96,11 +109,54 @@ module Zm
         @l    = json[:l]
         @su   = json[:su]
         @fr   = json[:fr]
+        @autoSendTime   = json[:autoSendTime]
+        @mid  = json[:mid]
+        @idnt = json[:idnt]
+        @has_attachment = json[:f].to_s.include?('a')
 
         json[:e].each do |e|
           recipient = Recipient.new(e[:t], e[:a], e[:p])
           @recipients.add(recipient)
         end
+
+        init_part_from_json(json[:mp])
+      end
+
+      def init_part_from_json(json)
+        return if json.nil?
+        # puts json
+        json = [json] unless json.is_a?(Array)
+
+        json.each do |json_part|
+          if ['text/plain', 'text/html'].include?(json_part[:ct])
+            init_body_from_json(json_part)
+          elsif json_part[:cd] == 'attachment'
+            init_attachment_from_json(json_part)
+          else
+            init_part_from_json(json_part[:mp])
+          end
+        end
+      end
+
+      def init_body_from_json(json)
+        # puts "\ninit_body_from_json #{json}\n"
+        body.text = json[:content] if json[:ct] == 'text/plain'
+        body.html = json[:content] if json[:ct] == 'text/html'
+      end
+
+      def init_attachment_from_json(json)
+        # puts "\ninit_attachment_from_json #{json}\n"
+        pj = Zm::Client::Message::Attachment.new(self)
+        # pj.part = json[:part],
+        pj.mid  = json[:mid]
+        pj.aid  = json[:aid]
+        pj.ct   = json[:ct]
+        pj.s    = json[:s]
+        pj.filename = json[:filename]
+        pj.ci   = json[:ci]
+        pj.cd   = json[:cd]
+        pj.part = json[:part]
+        attachments.add(pj)
       end
 
       def msg_action(action_name, options = {})
@@ -113,18 +169,18 @@ module Zm
         attr_accessor :text, :html
 
         def text_jsns
-          { ct: 'text/plain', content: { _content: @text } }
+          @text.nil? ? nil : { ct: 'text/plain', content: { _content: @text } }
         end
 
         def html_jsns
-          { ct: 'text/html', content: { _content: @html } }
+          @html.nil? ? nil : { ct: 'text/html', content: { _content: @html } }
         end
 
         def to_jsns
           [
             {
               ct: 'multipart/alternative',
-              mp: [text_jsns, html_jsns]
+              mp: [text_jsns, html_jsns].compact
             }
           ]
         end
@@ -132,36 +188,66 @@ module Zm
 
       # collection attachments
       class Attachments
+        attr_reader :all
         def initialize
-          @attachments = []
+          @all = []
         end
 
         def add(attachment)
           return unless attachment.is_a?(Attachment)
 
-          @attachments.push(attachment)
+          @all.push(attachment)
         end
 
         def to_jsns
-          @attachments.map(&:to_jsns)
+          @all.map(&:to_jsns)
         end
       end
 
       # class attachment for email
       class Attachment
-        attr_accessor :aid, :part, :mid
+        attr_accessor :aid, :part, :mid, :ct, :s, :filename, :ci, :cd
 
-        def initialize
+        def initialize(parent)
+          @parent = parent
           yield(self) if block_given?
         end
 
+        def download(dest_file_path)
+          h = {
+            id: @parent.id,
+            part: part,
+            auth: 'qp',
+            zauthtoken: account.token,
+            disp: 'a'
+          }
+
+          url = account.home_url
+
+          uri = Addressable::URI.new
+          uri.query_values = h
+          url << '?' << uri.query
+
+          uploader = Upload.new(@parent, RestAccountConnector.new)
+          uploader.download_file_with_url(url, dest_file_path)
+        end
+
         def to_jsns
           {
-            part: @part,
-            mid: @mid,
-            aid: @aid
+            part: part,
+            mid: mid,
+            aid: aid,
+            ct: ct,
+            s: s,
+            filename: filename,
+            ci: ci,
+            cd: cd
           }.reject { |_, v| v.nil? }
         end
+
+        def account
+          @parent.parent
+        end
       end
 
       # Collection recipients
@@ -212,6 +298,10 @@ module Zm
           @display_name = display_name
         end
 
+        def to_s
+          "#{@email} (#{@display_name})"
+        end
+
         def to_jsns
           {
             t: @field,

data/lib/zm/client/message/messages_builder.rb

@@ -16,7 +16,7 @@ module Zm
       end
 
       def ids
-        root.map { |s| s[:id] }
+        @json[:Body][:SearchResponse][:hit].map { |s| s[:id] }
       end
 
       def root

data/lib/zm/client/message/messages_collection.rb

@@ -3,108 +3,26 @@
 module Zm
   module Client
     # Collection Messages
-    class MessagesCollection < Base::ObjectsCollection
-      attr_accessor :more
-
+    class MessagesCollection < Base::AccountSearchObjectsCollection
       def initialize(parent)
-        @parent = parent
-        @more = true
-        reset_query_params
-      end
-
-
-      def find(id)
-        rep = @parent.sacc.get_msg(@parent.token, id, { part: 0 })
-        entry = rep[:Body][:GetMsgResponse][:m].first
-        # puts entry
-        msg = Message.new(@parent)
-        msg.init_from_json(entry)
-        msg
-      end
-
-      def new
-        message = Message.new(@parent)
-        yield(message) if block_given?
-        message
-      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
-
-      def all
-        build_response
+        super(parent)
+        @child_class = Message
+        @builder_class = MessagesBuilder
+        @type = 'message'
+        @sort_by = 'dateDesc'
       end
 
       private
 
-      def search_response
-        rep = @parent.sacc.search(@parent.token, 'message', @offset, @limit, 'dateDesc', query, build_options)
-        @more = rep[:Body][:SearchResponse][:more]
-        rep
-      end
-
-      def search_builder
-        MessagesBuilder.new(@parent, search_response)
-      end
-
-      def build_response
-        messages = search_builder.make
-        messages.each { |msg| msg.folder = find_folder(msg) } unless @folders.empty?
-        messages
-      end
-
       def build_options
-        {
-          recip: 2
-        }
-      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(message)
-        @folders.find { |folder| folder.id == message.l }
+        options = super
+        options[:recip] = @recip
+        options
       end
 
       def reset_query_params
         super
-        @start_at = nil
-        @end_at = nil
-        @query = nil
-        @folder_ids = []
-        @folders = []
+        @recip = 2
       end
     end
   end

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