zm-ruby-client 2.2.6 → 2.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a5a4bebcb7800be6b55381b31b54478860b70e5362c54791176efaa191acc660
-  data.tar.gz: 5fde40a0299e54e83590991d73dbc38fe91b4b23af26e1d4730ebb4b8057e179
+  metadata.gz: fc00d91e324f3525589fe4aff9db5d55036d3d52881cc4e03a4019d4bd9a3f7c
+  data.tar.gz: 4429603c4c08dfa045d06fab04e3f1f73d90355b35ced2ebd5228888e26ef5a6
 SHA512:
-  metadata.gz: e39fc183d251eb1c2ea95735dc3fc75ddee51d8e8528c326db7dc15ac234479da40cad1e3d3bdeed949e7c46cbe3d3dc53178d5dc48f54cfcc2b6b4a4a4bc335
-  data.tar.gz: ebb4ddfa47b3053f46bd80728584c6b7cc5b95d4d87f55aa2eb476bfd434faa86e52ed9aa67ceadd7bda2b091c902c792e011f3d2e314eeb768283ae77ac7065
+  metadata.gz: ac9161207764343feaaa8f90d64a4ea9d179eaedecfcfdbcdebf2b7e906a8a1f3122d269321dc4b96ee441087a33957fa452f01a2c0cb3a089da887e565e7ba0
+  data.tar.gz: 00e61ace101d6fd24ec2c57ff9a2cf5e79bc67d612f711199517dade6c9aae779c25ca628252e1cb5e2cb4bd2b5019f1b7384914292ab3dd2fbb0b124d8e2738

data/VERSION

@@ -1 +1 @@
-2.2.6
+2.2.7

data/lib/zm/client/connector/rest_account.rb

@@ -28,36 +28,38 @@ module Zm
         @cookies = cookies
       end
 
-      def download(download_url, dest_file_path)
+      def read(download_url)
         url, path = split_url(download_url)
 
-        conn = Faraday.new(**http_options(url)) do |faraday|
-          faraday.response :logger, nil, { headers: true, bodies: true, errors: true } if @verbose
-        end
+        conn = conn_get(url)
 
-        response = nil
+        data = +''
 
-        File.open(dest_file_path, 'wb') do |f|
-          response = conn.get(path) do |request|
-            request.options.on_data = Proc.new do |chunk, _, _|
-              f.write chunk
-            end
+        response = conn.get(path) do |request|
+          request.options.on_data = Proc.new do |chunk, _, _|
+            data.concat(chunk)
           end
         end
 
         if response.status >= 400
-          File.unlink(dest_file_path) if File.exist?(dest_file_path)
           raise RestError, "Download failure: #{response.body} (status=#{response.status})"
         end
+
+        data
+      end
+
+      def download(download_url, dest_file_path)
+        url, path = split_url(download_url)
+
+        conn = conn_get(url)
+
+        write_downloaded_file(dest_file_path, conn, path)
       end
 
       def upload(upload_url, src_file_path)
         url, path = split_url(upload_url)
 
-        conn = Faraday.new(**http_options(url)) do |faraday|
-          faraday.request :multipart
-          faraday.response :logger, nil, { headers: true, bodies: true, errors: true } if @verbose
-        end
+        conn = conn_multipart(url)
 
         payload = { file: Faraday::Multipart::FilePart.new(src_file_path, nil) }
         response = conn.post(path, payload)
@@ -76,6 +78,38 @@ module Zm
 
       private
 
+      def conn_get(url)
+        Faraday.new(**http_options(url)) do |faraday|
+          faraday.response :logger, nil, { headers: true, bodies: true, errors: true } if @verbose
+        end
+      end
+
+      def conn_multipart(url)
+        Faraday.new(**http_options(url)) do |faraday|
+          faraday.request :multipart
+          faraday.response :logger, nil, { headers: true, bodies: true, errors: true } if @verbose
+        end
+      end
+
+      def write_downloaded_file(dest_file_path, conn, path)
+        response = nil
+
+        File.open(dest_file_path, 'wb') do |f|
+          response = conn.get(path) do |request|
+            request.options.on_data = Proc.new do |chunk, _, _|
+              f.write chunk
+            end
+          end
+        end
+
+        if response.status >= 400
+          File.unlink(dest_file_path) if File.exist?(dest_file_path)
+          raise RestError, "Download failure: #{response.body} (status=#{response.status})"
+        end
+
+        response
+      end
+
       def split_url(url)
         uri = URI(url)
         url = "#{uri.scheme}://#{uri.host}:#{uri.port}"

data/lib/zm/client/connector/soap_base.rb

@@ -72,13 +72,11 @@ module Zm
       def do_request(body, error_handler = SoapError)
         response = http_client.post(@soap_path, body)
 
-        soapbody = JSON.parse(response.body, symbolize_names: true)
-
         if response.status >= 400
-          raise(error_handler, soapbody)
+          raise(error_handler, response.body)
         end
 
-        soapbody
+        JSON.parse(response.body, symbolize_names: true)
       end
 
       def envelope(soap_element)

data/lib/zm/client/connector/soap_error.rb

@@ -9,10 +9,30 @@ module Zm
       attr_reader :reason, :code
 
       def initialize(soapbody)
-        @reason = soapbody[:Body][:Fault][:Reason][:Text]
-        @code = soapbody[:Body][:Fault][:Detail][:Error][:Code]
+        if soapbody.start_with?('{')
+          init_from_json(soapbody)
+        elsif soapbody.start_with?('<')
+          init_from_xml(soapbody)
+        end
+
         super "[#{@code}] [#{@reason}]"
       end
+
+      private
+
+      def init_from_json(soapbody)
+        json = JSON.parse(soapbody, symbolize_names: true)
+        @reason = json[:Body][:Fault][:Reason][:Text]
+        @code = json[:Body][:Fault][:Detail][:Error][:Code]
+      end
+
+      def init_from_xml(soapbody)
+        code_match = soapbody.match(%r{<Code>(.*?)</Code>})
+        @code = code_match[1]
+
+        text_match = soapbody.match(%r{<soap:Reason>.*?<soap:Text>(.*?)</soap:Text>}m)
+        @reason = text_match[1]
+      end
     end
 
     class AuthError < SoapError

data/lib/zm/client/contact/group_contact_jsns_builder.rb

@@ -47,12 +47,6 @@ module Zm
 
       alias to_create to_jsns
 
-      # def members_node
-      #   @item.members.all.reject(&:current?).map do |m|
-      #     { type: m.type, value: m.value, op: m.op }
-      #   end
-      # end
-
       def instance_variables_array
         [[:nickname, @item.name], [:fullName, @item.name], [:fileAs, "8:#{@item.name}"], %i[type group]]
       end

data/lib/zm/client/document/document_jsns_initializer.rb

@@ -23,7 +23,7 @@ module Zm
           item.md = json[:md]
           item.rev = json[:rev]
           item.f = json[:f]
-          item.tn = json[:tn].to_s.split(',')
+          item.tn = json[:tn]
           item.t = json[:t]
           item.meta = json[:meta]
           item.ct = json[:ct]

data/lib/zm/client/filter_rules/filter_rule.rb

@@ -5,6 +5,15 @@ module Zm
     # class account filter rule
     class FilterRule < Base::Object
       attr_accessor :name, :active, :filterTests, :filterActions
+
+      def to_h
+        {
+          name: name,
+          active: active,
+          filterTests: filterTests,
+          filterActions: filterActions
+        }
+      end
     end
   end
 end

data/lib/zm/client/filter_rules/filter_rules_builder.rb

@@ -12,7 +12,10 @@ module Zm
       def make
         return [] if json_items.nil?
 
-        json_items.first[:filterRule].map do |entry|
+        rules = json_items.first[:filterRule]
+        return [] if rules.nil?
+
+        rules.map do |entry|
           FilterRuleJsnsInitializer.create(@parent, entry)
         end
       end

data/lib/zm/client/filter_rules/filter_rules_collection.rb

@@ -10,6 +10,17 @@ module Zm
         super(parent)
       end
 
+      def save!
+        return false unless defined? @all
+
+        soap_request = SoapElement.mail(SoapMailConstants::MODIFY_FILTER_RULES_REQUEST)
+        node_rules = SoapElement.create(:filterRules).add_attribute(:filterRule, @all.map(&:to_h))
+        soap_request.add_node(node_rules)
+        @parent.sacc.invoke(soap_request)
+
+        true
+      end
+
       private
 
       def make_query

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

@@ -7,18 +7,33 @@ module Zm
       include BelongsToFolder
       include BelongsToTag
 
-      attr_accessor :id, :d, :l, :f, :su, :fr, :autoSendTime, :mid, :idnt, :tn, :subject
-      attr_reader :recipients, :attachments, :body
+      attr_accessor :id, :d, :l, :f, :su, :fr, :autoSendTime, :mid, :idnt, :tn, :subject, :s
+
+      alias size s
 
       def initialize(parent)
         @parent = parent
         @subject = ''
 
+        yield(self) if block_given?
+      end
+
+      def recipients
+        return @recipients if defined? @recipients
+
         @recipients = Recipients.new
-        @body = Body.new
+      end
+
+      def attachments
+        return @attachments if defined? @attachments
+
         @attachments = AttachmentsCollection.new
+      end
 
-        yield(self) if block_given?
+      def body
+        return @body if defined? @body
+
+        @body = Body.new
       end
 
       def download(dest_file_path, fmt = 'eml')
@@ -26,6 +41,11 @@ module Zm
         uploader.download_file( Zm::Client::FolderDefault::ROOT[:path], fmt, [Zm::Client::FolderView::MESSAGE], [@id], dest_file_path)
       end
 
+      def read(fmt = 'eml')
+        uploader = Upload.new(@parent, RestAccountConnector.new)
+        uploader.read_file( Zm::Client::FolderDefault::ROOT[:path], fmt, [Zm::Client::FolderView::MESSAGE], [@id])
+      end
+
       def date
         @date ||= Time.at(d.to_i / 1000)
       end
@@ -42,8 +62,23 @@ module Zm
         raise NotImplementedError
       end
 
-      def update!(*args)
-        raise NotImplementedError
+      def update!(l: nil, rgb: nil, color: nil, f: nil, tn: nil)
+        attrs = {
+          op: :update,
+          id: @id,
+          l: l,
+          rgb: rgb,
+          color: color,
+          f: f,
+          tn: tn
+        }
+
+        attrs.delete_if { |_, v| v.nil? }
+
+        soap_request = SoapElement.mail(SoapMailConstants::MSG_ACTION_REQUEST)
+        node_action = SoapElement.create(SoapConstants::ACTION).add_attributes(attrs)
+        soap_request.add_node(node_action)
+        @parent.sacc.invoke(soap_request)
       end
 
       def rename!(*args)

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

@@ -20,7 +20,8 @@ module Zm
           item.mid  = json[:mid]
           item.idnt = json[:idnt]
           item.f = json[:f]
-          item.tn = json[:tn].to_s.split(',')
+          item.tn = json[:tn]
+          item.s = json[:s]
 
           json[:e].each do |e|
             recipient = Recipient.new(e[:t], e[:a], e[:p])

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

@@ -23,6 +23,20 @@ module Zm
         end
       end
 
+      def delete_all(ids)
+        attrs = {
+          op: :delete,
+          id: ids.join(',')
+        }
+
+        attrs.delete_if { |_, v| v.nil? }
+
+        soap_request = SoapElement.mail(SoapMailConstants::MSG_ACTION_REQUEST)
+        node_action = SoapElement.create(SoapConstants::ACTION).add_attributes(attrs)
+        soap_request.add_node(node_action)
+        @parent.sacc.invoke(soap_request)
+      end
+
       private
 
       def build_options

data/lib/zm/client/tag/account_object_tags_collection.rb

@@ -13,7 +13,7 @@ module Zm
         end
 
         def all!
-          @all = @parent.tn
+          @all = @parent.tn.split(',')
         end
 
         def add!(*new_tags)

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

@@ -26,6 +26,10 @@ module Zm
         @rac.download(download_file_url(folder_path, fmt, types, ids), dest_file_path)
       end
 
+      def read_file(folder_path, fmt, types, ids)
+        @rac.read(download_file_url(folder_path, fmt, types, ids))
+      end
+
       def download_folder(id, fmt, dest_file_path)
         @rac.download(download_folder_url(id, fmt), dest_file_path)
       end

data/lib/zm/modules/common/zimbra-attrs.csv

@@ -734,4 +734,5 @@ zimbraRecoveryAccountCodeValidity,"account,cos,calendarResource",,,single,,,cstr
 zimbraResetPasswordRecoveryCodeExpiry,"account,cos,calendarResource",,,single,,,cstring,,,,
 zimbraShowClientTOS,"account,domain,cos,calendarResource",,,single,,,cstring,,,,
 zimbraDistributionListSendShareMessageToNewMembers,distributionList,,,single,,,boolean,,,,
-zimbraServiceEnabled,,,server,multi,,,cstring,,,,
+zimbraServiceEnabled,,,server,multi,,,cstring,,,,
+zimbraVirtualHostname,domain,,,single,,,cstring,,,,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zm-ruby-client
 version: !ruby/object:Gem::Version
-  version: 2.2.6
+  version: 2.2.7
 platform: ruby
 authors:
 - Maxime Désécot
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-05-06 00:00:00.000000000 Z
+date: 2025-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -341,7 +341,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.11
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: zm-ruby-client