zm-ruby-client 0.18.3 → 2.0.2

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

@@ -3,71 +3,40 @@
 module Zm
   module Client
     # class for account task
-    class Task < Base::AccountObject
+    class Task < Base::Object
+      include BelongsToFolder
+      include BelongsToTag
 
-      INSTANCE_VARIABLE_KEYS = %i[id uid name l desc start_at dur end_at tn]
-
-      attr_accessor *INSTANCE_VARIABLE_KEYS
-      attr_writer :folder
-      attr_reader :json
-
-      alias description desc
-      alias parent_id l
-
-      def initialize(parent, json = nil)
-        @parent = parent
-        init_from_json(json) if json.is_a?(Hash)
-        yield(self) if block_given?
-      end
-
-      def concat
-        INSTANCE_VARIABLE_KEYS.map { |key| instance_variable_get(arrow_name(key)) }
-      end
-
-      def folder
-        @folder ||= @parent.folders.all.find { |folder| folder.id == l }
-      end
+      attr_accessor :uid, :priority, :ptst, :percentComplete, :name, :loc, :alarm, :isOrg, :id, :invId, :compNum, :l,
+                    :status, :class, :allDay, :f, :tn, :t, :rev, :s, :d, :md, :ms, :cm, :sf
 
       def download(dest_file_path, fmt = 'ics')
-        # @parent.uploader.download_file(folder.absFolderPath, 'ics', ['task'], [id], dest_file_path)
         uploader = Upload.new(@parent, RestAccountConnector.new)
-        uploader.download_file(folder.absFolderPath, fmt, ['task'], [id], dest_file_path)
+        uploader.download_file(Zm::Client::FolderDefault::ROOT[:path], fmt, [Zm::Client::FolderView::TASK], [@id], dest_file_path)
       end
 
       def create!
-        # rep = @parent.sacc.create_task(@parent.token, @l, @name, @view)
-        # init_from_json(rep[:Body][:CreateTaskResponse][:task].first)
+        raise NotImplementedError
       end
 
-      def reload!
-        # rep = @parent.sacc.get_task(@parent.token, @id)
-        # init_from_json(rep[:Body][:GetTaskResponse][:task].first)
+      def modify!
+        raise NotImplementedError
       end
 
-      def delete!
-        # @parent.sacc.task_action(@parent.token, :delete, @id)
+      def update!(*args)
+        raise NotImplementedError
       end
 
-      def init_from_json(json)
-        @json = json
-        @id = json[:id].to_i
-        @uid = json[:uid]
-        @tn = json[:tn]
-        @name = json[:name]
-        @l = json[:l]
-        @desc = json[:fr]
-        make_date(json)
+      def rename!(*args)
+        raise NotImplementedError
       end
 
-      def make_date(json)
-        return if json[:inst].nil? || json[:inst].first.empty? || json[:dur].nil?
-
-        @start_at = Time.at(json[:inst].first[:s] / 1000)
-        @end_at = Time.at((json[:inst].first[:s] + json[:dur]) / 1000)
-
-        return if json[:dur].nil?
+      def reload!
+        raise NotImplementedError
+      end
 
-        @dur = json[:dur] / 1000
+      def delete!
+        raise NotImplementedError
       end
     end
   end

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

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+module Zm
+  module Client
+    # class for account document
+    class TaskJsnsInitializer
+      class << self
+        def create(parent, json)
+          item = Task.new(parent)
+          update(item, json)
+        end
+
+        def update(item, json)
+          item.uid = json[:uid]
+          item.priority = json[:priority].to_i
+          item.ptst = json[:ptst]
+          item.percentComplete = json[:percentComplete].to_f
+          item.name = json[:name]
+          item.loc = json[:loc]
+          item.alarm = json[:alarm]
+          item.isOrg = json[:isOrg]
+          item.id = json[:id].to_i
+          item.invId = json[:invId]
+          item.compNum = json[:compNum]
+          item.l = json[:l].to_i
+          item.status = json[:status]
+          item.class = json[:class]
+          item.allDay = json[:allDay]
+          item.f = json[:f]
+          item.tn = json[:tn]
+          item.t = json[:t]
+          item.rev = json[:rev]
+          item.s = json[:s]
+          item.d = json[:d]
+          item.md = json[:md]
+          item.ms = json[:ms]
+          item.cm = json[:cm]
+          item.sf = json[:sf]
+
+          item
+        end
+      end
+    end
+  end
+end

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

@@ -5,26 +5,16 @@ module Zm
     # class factory [tasks]
     class TasksBuilder < Base::ObjectsBuilder
       def initialize(parent, json)
-        @parent = parent
-        @json = json
+        super(parent, json)
+        @json_item_key = :task
       end
 
       def make
-        root.map do |s|
-          Task.new(@parent, s)
-        end
-      end
-
-      def ids
-        root.map { |s| s[:id] }
-      end
-
-      def root
-        root = @json[:Body][:SearchResponse][:task]
-        return [] if root.nil?
+        return [] if json_items.nil?
 
-        root = [root] unless root.is_a?(Array)
-        root
+        json_items.map do |entry|
+          TaskJsnsInitializer.create(@parent, entry)
+        end
       end
     end
   end

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

@@ -4,6 +4,8 @@ module Zm
   module Client
     # collection of tasks
     class TasksCollection < Base::AccountSearchObjectsCollection
+      DEFAULT_QUERY = 'in:tasks'
+
       def initialize(parent)
         super(parent)
         @child_class = Task
@@ -11,6 +13,33 @@ module Zm
         @type = 'task'
         @sort_by = 'taskDueAsc'
       end
+
+      def find_each
+        @all = []
+        (1970..(Time.now.year + 10)).each do |year|
+          @start_at = Time.new(year, 1, 1)
+          @end_at = Time.new(year, 12, 31)
+          @more = true
+          @offset = 0
+          @limit = 500
+
+          while @more
+            @all += build_response
+            @offset += @limit
+          end
+        end
+        @all
+      end
+
+      private
+
+      def query
+        return @query unless @query.nil?
+
+        return DEFAULT_QUERY if @folder_ids.empty?
+
+        @folder_ids.map { |id| %(inid:"#{id}") }.join(' OR ')
+      end
     end
   end
 end

data/lib/zm/client/task.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
 require 'zm/client/task/task'
+require 'zm/client/task/task_jsns_initializer'
 require 'zm/client/task/tasks_builder'
 require 'zm/client/task/tasks_collection'

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

@@ -5,16 +5,19 @@ module Zm
     # class for upload account file
     class Upload
       FMT_TYPES_H = {
-          'ics' => ['appointment'],
-          'vcard' => ['contact']
-      }
+        'ics' => ['appointment'],
+        'vcard' => ['contact']
+      }.freeze
 
       def initialize(parent, rac = nil)
         @parent = parent
         @rac = rac || @parent.rac
+        @rac.cookies("ZM_AUTH_TOKEN=#{@parent.token}")
       end
 
       def download_file_with_url(url, dest_file_path)
+        raise ZmError, 'home_url is not defined' if @parent.home_url.nil?
+
         url = File.join(@parent.home_url, url) unless url.start_with?('http')
         @rac.download(url, dest_file_path)
       end
@@ -28,37 +31,35 @@ module Zm
       end
 
       def download_folder_url(id, fmt)
-        url_folder_path = @parent.home_url
+        raise ZmError, 'home_url is not defined' if @parent.home_url.nil?
+
+        url_folder_path = @parent.home_url.dup
 
         h = {
           fmt: fmt,
           id: id,
-          emptyname: 'Vide',
+          emptyname: 'Empty',
           charset: 'UTF-8',
-          auth: 'qp',
-          zauthtoken: @parent.token,
+          auth: 'co',
           disp: 'a'
         }
 
-        uri = Addressable::URI.new
-        uri.query_values = h
-        url_folder_path << '?' << uri.query
-
-        # puts url_folder_path
+        url_folder_path << '?' << Utils.format_url_params(h)
 
         url_folder_path
       end
 
       def download_file_url(folder_path, fmt, types, ids = [])
+        raise ZmError, 'home_url is not defined' if @parent.home_url.nil?
+
         url_folder_path = File.join(@parent.home_url, folder_path.to_s)
 
         h = {
           fmt: fmt,
           types: query_value_types(types, fmt),
-          emptyname: 'Vide',
+          emptyname: 'Empty',
           charset: 'UTF-8',
-          auth: 'qp',
-          zauthtoken: @parent.token,
+          auth: 'co',
           disp: 'a'
         }
 
@@ -66,11 +67,7 @@ module Zm
 
         h.reject! { |_, v| is_blank?(v) }
 
-        uri = Addressable::URI.new
-        uri.query_values = h
-        url_folder_path << '?' << uri.query
-
-        # puts url_folder_path
+        url_folder_path << '?' << Utils.format_url_params(h)
 
         url_folder_path
       end
@@ -80,6 +77,8 @@ module Zm
       end
 
       def send_file_url(folder_path, fmt, types, resolve)
+        raise ZmError, 'home_url is not defined' if @parent.home_url.nil?
+
         # resolve=[modfy|replace|reset|skip]
         url_folder_path = File.join(@parent.home_url, folder_path.to_s)
 
@@ -87,16 +86,13 @@ module Zm
           fmt: fmt,
           types: query_value_types(types, fmt),
           resolve: resolve,
-          auth: 'qp',
-          zauthtoken: @parent.token
+          auth: 'co'
         }
 
         h.reject! { |_, v| is_blank?(v) }
 
-        uri = Addressable::URI.new
-        uri.query_values = h
+        url_folder_path << '?' << Utils.format_url_params(h)
 
-        url_folder_path << '?' << uri.query
         url_folder_path
       end
 
@@ -110,19 +106,19 @@ module Zm
       end
 
       def upload_attachment_url
-        @rac.cookie("ZM_AUTH_TOKEN=#{@parent.token}")
-        uri = Addressable::URI.new
-        uri.query_values = {
+        h = {
           fmt: 'extended,raw'
         }
-        File.join(@parent.public_url, 'service/upload') << '?' << uri.query
+
+        File.join(@parent.public_url, 'service/upload') << '?' << Utils.format_url_params(h)
       end
 
       def query_ids(ids)
         return {} if ids.nil?
         return { id: ids } unless ids.is_a?(Array)
         return { id: ids.first } if ids.length == 1
-        return { list: ids.join(',') }
+
+        { list: ids.join(',') }
       end
 
       def query_value_types(types, fmt)

data/lib/zm/client/version.rb

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

data/lib/zm/client.rb

@@ -1,5 +1,8 @@
-require 'zm/client/config'
+# frozen_string_literal: true
+
+require 'zm/modules/inspector'
 require 'zm/client/version'
 require 'zm/client/constant'
 require 'zm/client/base'
 require 'zm/client/cluster'
+require 'zm/client/soap_request'

data/lib/zm/modules/base.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+require 'zm/modules/zm_logger'
+require 'zm/modules/zm_model'
+require 'zm/modules/missing_method_static_collection'
+
+require 'zm/modules/has_soap_admin_connector'
+
+require 'zm/modules/belongs_to_folder'
+require 'zm/modules/belongs_to_tag'

data/lib/zm/modules/belongs_to_folder.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+module Zm
+  module Client
+    module BelongsToFolder
+      def folder_id
+        @l
+      end
+
+      def folder=(folder)
+        return unless @l != folder.id
+
+        @l = folder.id
+        @folder = folder
+      end
+
+      def folder
+        @folder || folder!
+      end
+
+      def folder!
+        @folder = @parent.folders.all.find { |folder| folder.id == @l }
+      end
+
+      def move!(new_folder_id)
+        new_folder_id = new_folder_id.id if new_folder_id.is_a?(Zm::Client::Folder)
+        @parent.sacc.invoke(jsns_builder.to_move(new_folder_id))
+        @l = new_folder_id
+        folder!
+      end
+
+      def trash!
+        @parent.sacc.invoke(jsns_builder.to_trash)
+      end
+    end
+  end
+end

data/lib/zm/modules/belongs_to_tag.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Zm
+  module Client
+    module BelongsToTag
+      def tags
+        @tags ||= AccountObject::TagsCollection.new(self)
+      end
+    end
+  end
+end