zm-ruby-client 3.0.1 → 3.1.0

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

@@ -15,13 +15,13 @@ module Zm
         }
         req.compact!
 
-        soap_request = SoapElement.admin(SoapAdminConstants::CREATE_CALENDAR_RESOURCE_REQUEST)
+        soap_request = SoapRequest::SoapElement.admin(Zm::SoapRequest::SoapAdminConstants::CREATE_CALENDAR_RESOURCE_REQUEST)
                                   .add_attributes(req)
 
         attrs_only_set_h.each do |key, values|
           values.each do |value|
-            node_attr = SoapElement.create(SoapConstants::A)
-                                   .add_attribute(SoapConstants::N, key)
+            node_attr = SoapRequest::SoapElement.create(SoapRequest::SoapConstants::A)
+                                   .add_attribute(SoapRequest::SoapConstants::N, key)
                                    .add_content(value)
             soap_request.add_node(node_attr)
           end
@@ -31,13 +31,13 @@ module Zm
       end
 
       def to_update
-        soap_request = SoapElement.admin(SoapAdminConstants::MODIFY_CALENDAR_RESOURCE_REQUEST)
-                                  .add_attribute(SoapConstants::ID, @item.id)
+        soap_request = SoapRequest::SoapElement.admin(Zm::SoapRequest::SoapAdminConstants::MODIFY_CALENDAR_RESOURCE_REQUEST)
+                                  .add_attribute(SoapRequest::SoapConstants::ID, @item.id)
 
         attrs_only_set_h.each do |key, values|
           values.each do |value|
-            node_attr = SoapElement.create(SoapConstants::A)
-                                   .add_attribute(SoapConstants::N, key)
+            node_attr = SoapRequest::SoapElement.create(SoapRequest::SoapConstants::A)
+                                   .add_attribute(SoapRequest::SoapConstants::N, key)
                                    .add_content(value)
             soap_request.add_node(node_attr)
           end
@@ -47,14 +47,14 @@ module Zm
       end
 
       def to_patch(hash)
-        soap_request = SoapElement.admin(SoapAdminConstants::MODIFY_CALENDAR_RESOURCE_REQUEST)
-                                  .add_attribute(SoapConstants::ID, @item.id)
+        soap_request = SoapRequest::SoapElement.admin(Zm::SoapRequest::SoapAdminConstants::MODIFY_CALENDAR_RESOURCE_REQUEST)
+                                  .add_attribute(SoapRequest::SoapConstants::ID, @item.id)
 
         hash.each do |key, values|
           values = [values] unless values.is_a?(Array)
           values.each do |value|
-            node_attr = SoapElement.create(SoapConstants::A)
-                                   .add_attribute(SoapConstants::N, key)
+            node_attr = SoapRequest::SoapElement.create(SoapRequest::SoapConstants::A)
+                                   .add_attribute(SoapRequest::SoapConstants::N, key)
                                    .add_content(value)
             soap_request.add_node(node_attr)
           end
@@ -64,8 +64,8 @@ module Zm
       end
 
       def to_delete
-        SoapElement.admin(SoapAdminConstants::DELETE_CALENDAR_RESOURCE_REQUEST)
-                   .add_attribute(SoapConstants::ID, @item.id)
+        SoapRequest::SoapElement.admin(Zm::SoapRequest::SoapAdminConstants::DELETE_CALENDAR_RESOURCE_REQUEST)
+                   .add_attribute(SoapRequest::SoapConstants::ID, @item.id)
       end
 
       def attrs_only_set_h

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

@@ -7,7 +7,7 @@ module Zm
       def initialize(parent)
         @child_class = Resource
         @builder_class = ResourcesBuilder
-        @search_type = SearchType::RESOURCE
+        @search_type = :resources
         super
       end
 
@@ -19,13 +19,13 @@ module Zm
       end
 
       def build_find_by(hash)
-        soap_request = SoapElement.admin(SoapAdminConstants::GET_CALENDAR_RESOURCE_REQUEST)
-        node_res = SoapElement.create(SoapConstants::CAL_RESOURCE)
-                              .add_attribute(SoapConstants::BY, hash.keys.first)
+        soap_request = SoapRequest::SoapElement.admin(Zm::SoapRequest::SoapAdminConstants::GET_CALENDAR_RESOURCE_REQUEST)
+        node_res = SoapRequest::SoapElement.create(SoapRequest::SoapConstants::CAL_RESOURCE)
+                              .add_attribute(SoapRequest::SoapConstants::BY, hash.keys.first)
                               .add_content(hash.values.first)
         soap_request.add_node(node_res)
-        soap_request.add_attribute(SoapConstants::ATTRS, attrs_comma)
-        soap_request.add_attribute(SoapConstants::APPLY_COS, @apply_cos)
+        soap_request.add_attribute(SoapRequest::SoapConstants::ATTRS, attrs_comma)
+        soap_request.add_attribute(SoapRequest::SoapConstants::APPLY_COS, @apply_cos)
         soap_request
       end
 
@@ -33,7 +33,20 @@ module Zm
 
       def reset_query_params
         super
-        @attrs = SearchType::Attributes::RESOURCE.dup
+        @attrs = %w[
+          displayName
+          zimbraId
+          zimbraMailHost
+          uid
+          zimbraAccountStatus
+          description
+          zimbraCalResType
+          zimbraIsDelegatedAdminAccount
+          zimbraIsAdminAccount
+          zimbraIsSystemResource
+          zimbraIsSystemAccount
+          zimbraIsExternalVirtualAccount
+        ]
       end
     end
   end

data/lib/zm/client/search_folder/search_folder.rb

@@ -4,12 +4,13 @@ module Zm
   module Client
     # class account SearchFolder
     class SearchFolder < Base::Object
-      include RequestMethodsMailbox
+      include SoapRequest::RequestMethodsMailbox
       include MailboxItemConcern
+      extend Relationship
+      has_jsns_builder
 
       attr_accessor :uuid, :deletable, :name, :absFolderPath, :luuid, :color, :rgb, :rev, :ms,
-                    :webOfflineSyncDays, :activesyncdisabled, :query, :sortBy, :types,
-                    :name, :color, :rgb, :query, :sortBy
+                    :webOfflineSyncDays, :activesyncdisabled, :query, :sortBy, :types
 
       def initialize(parent)
         @l = FolderDefault::ROOT.id
@@ -36,14 +37,6 @@ module Zm
       def build_color
         jsns_builder.to_color
       end
-
-      private
-
-      def jsns_builder
-        return @jsns_builder if defined? @jsns_builder
-
-        @jsns_builder = SearchFolderJsnsBuilder.new(self)
-      end
     end
   end
 end

data/lib/zm/client/search_folder/search_folder_jsns_builder.rb

@@ -19,8 +19,8 @@ module Zm
         }
         attrs.compact!
 
-        soap_request = SoapElement.mail(SoapMailConstants::CREATE_SEARCH_FOLDER_REQUEST)
-        node_search = SoapElement.create(SoapConstants::SEARCH).add_attributes(attrs)
+        soap_request = SoapRequest::SoapElement.mail(SoapRequest::SoapMailConstants::CREATE_SEARCH_FOLDER_REQUEST)
+        node_search = SoapRequest::SoapElement.create(SoapRequest::SoapConstants::SEARCH).add_attributes(attrs)
         soap_request.add_node(node_search)
         soap_request
       end
@@ -35,8 +35,8 @@ module Zm
         }
         attrs.compact!
 
-        soap_request = SoapElement.mail(SoapMailConstants::MODIFY_SEARCH_FOLDER_REQUEST)
-        node_search = SoapElement.create(SoapConstants::SEARCH).add_attributes(attrs)
+        soap_request = SoapRequest::SoapElement.mail(SoapRequest::SoapMailConstants::MODIFY_SEARCH_FOLDER_REQUEST)
+        node_search = SoapRequest::SoapElement.create(SoapRequest::SoapConstants::SEARCH).add_attributes(attrs)
         soap_request.add_node(node_search)
         soap_request
       end
@@ -95,8 +95,8 @@ module Zm
       end
 
       def build(attrs)
-        soap_request = SoapElement.mail(SoapMailConstants::FOLDER_ACTION_REQUEST)
-        node_action = SoapElement.create(SoapConstants::ACTION).add_attributes(attrs)
+        soap_request = SoapRequest::SoapElement.mail(SoapRequest::SoapMailConstants::FOLDER_ACTION_REQUEST)
+        node_action = SoapRequest::SoapElement.create(SoapRequest::SoapConstants::ACTION).add_attributes(attrs)
         soap_request.add_node(node_action)
         soap_request
       end

data/lib/zm/client/search_folder/search_folders_collection.rb

@@ -15,7 +15,7 @@ module Zm
       end
 
       def build_query
-        SoapElement.mail(SoapMailConstants::GET_SEARCH_FOLDER_REQUEST)
+        SoapRequest::SoapElement.mail(SoapRequest::SoapMailConstants::GET_SEARCH_FOLDER_REQUEST)
       end
     end
   end

data/lib/zm/client/server/server.rb

@@ -1,42 +1,36 @@
 # frozen_string_literal: true
 
-require 'zm/client/backup'
-require 'zm/client/mta_queue'
-
 module Zm
   module Client
     # objectClass: zimbraServer
     class Server < Base::Object
-      include HasSoapAdminConnector
-
-      def mta_queues
-        return @mta_queues if defined? @mta_queues
+      extend Relationship
+      include Zm::Utils::HasSoapAdminConnector
 
-        @mta_queues = MtaQueuesCollection.new(self)
-      end
+      has_many :mta_queues, klass: :'Zm::Client::MtaQueuesCollection'
+      has_many :backups, klass: :'Zm::Client::BackupsCollection'
+      has_many :accounts, klass: :'Zm::Client::ServerAccountsCollection'
 
-      def backups
-        return @backups if defined? @backups
+      def update!(hash = nil, update_attributes: true, **attrs)
+        hash = hash.nil? ? attrs : hash.merge(attrs)
+        return false if hash.delete_if { |k, v| v.nil? || !respond_to?(k) }.empty?
 
-        @backups = BackupsCollection.new(self)
-      end
+        do_update!(hash)
 
-      def accounts
-        return @accounts if defined? @accounts
+        do_update_attributes(hash) if update_attributes
 
-        @accounts = ServerAccountsCollection.new(self)
+        @updated = true
       end
 
-      def update!(hash)
-        return false if hash.delete_if { |k, v| v.nil? || !respond_to?(k) }.empty?
-
-        do_update!(hash)
-
+      def do_update_attributes(hash)
         hash.each do |key, value|
           update_attribute(key, value)
         end
+      end
 
-        true
+      def mailboxes
+        soap_request = Zm::SoapRequest::SoapElement.admin(SoapRequest::SoapAdminConstants::GET_ALL_MAILBOXES_REQUEST)
+        @parent.soap_admin_connector.target_invoke(soap_request, @id).dig(:GetAllMailboxesResponse, :mbox)
       end
     end
   end

data/lib/zm/client/server/server_services.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Zm
+  module Client
+    module ServerServices
+      AMAVIS = 'amavis'
+      ANTIVIRUS = 'antivirus'
+      ANTISPAM = 'antispam'
+      OPENDKIM = 'opendkim'
+      DNSCACHE = 'dnscache'
+      LOGGER = 'logger'
+      LDAP = 'ldap'
+      SERVICE = 'service'
+      ZIMBRA = 'zimbra'
+      ZIMBRA_ADMIN = 'zimbraAdmin'
+      ZIMLET = 'zimlet'
+      MAILBOX = 'mailbox'
+      MEMCACHED = 'memcached'
+      SPELL = 'spell'
+      MTA = 'mta'
+      PROXY = 'proxy'
+      STATS = 'stats'
+      SNMP = 'snmp'
+    end
+  end
+end

data/lib/zm/client/server/servers_collection.rb

@@ -20,12 +20,12 @@ module Zm
       end
 
       def build_find_by(hash)
-        soap_request = SoapElement.admin(SoapAdminConstants::GET_SERVER_REQUEST)
-        node_server = SoapElement.create(SoapConstants::SERVER)
-                                 .add_attribute(SoapConstants::BY, hash.keys.first)
+        soap_request = Zm::SoapRequest::SoapElement.admin(Zm::SoapRequest::SoapAdminConstants::GET_SERVER_REQUEST)
+        node_server = Zm::SoapRequest::SoapElement.create(Zm::SoapRequest::SoapConstants::SERVER)
+                                 .add_attribute(Zm::SoapRequest::SoapConstants::BY, hash.keys.first)
                                  .add_content(hash.values.first)
         soap_request.add_node(node_server)
-        soap_request.add_attribute(SoapConstants::ATTRS, attrs_comma) unless @attrs.nil?
+        soap_request.add_attribute(Zm::SoapRequest::SoapConstants::ATTRS, attrs_comma) unless @attrs.nil?
         soap_request
       end
 
@@ -39,8 +39,8 @@ module Zm
       end
 
       def build_query
-        soap_request = SoapElement.admin(SoapAdminConstants::GET_ALL_SERVERS_REQUEST)
-        soap_request.add_attribute(SoapConstants::SERVICE, @service) unless @service.nil?
+        soap_request = SoapRequest::SoapElement.admin(Zm::SoapRequest::SoapAdminConstants::GET_ALL_SERVERS_REQUEST)
+        soap_request.add_attribute(SoapRequest::SoapConstants::SERVICE, @service) unless @service.nil?
         soap_request
       end
     end

data/lib/zm/client/share/share.rb

@@ -4,14 +4,11 @@ module Zm
   module Client
     # class for account share
     class Share < Base::Object
+      extend Relationship
       attr_accessor :ownerId, :ownerEmail, :ownerName, :folderId, :folderUuid, :folderPath,
                     :view, :rights, :granteeType, :granteeId, :granteeName, :mid
 
-      def mountpoints
-        return @mountpoints if defined? @mountpoints
-
-        @mountpoints = ShareMountPointsCollection.new(self)
-      end
+      has_many :mountpoints, klass: :'Zm::Client::ShareMountPointsCollection'
     end
   end
 end

data/lib/zm/client/share/shares_builder.rb

@@ -3,7 +3,7 @@
 module Zm
   module Client
     # class factory [shares]
-    class ShareBuilder < Base::ObjectsBuilder
+    class SharesBuilder < Base::ObjectsBuilder
       def initialize(parent, json)
         super
         @json_item_key = :share

data/lib/zm/client/share/shares_collection.rb

@@ -5,6 +5,7 @@ module Zm
     # collection of shares
     class SharesCollection < Base::ObjectsCollection
       def initialize(parent)
+        super()
         @parent = parent
         reset_query_params
       end
@@ -21,11 +22,11 @@ module Zm
       end
 
       def share_response
-        soap_request = SoapElement.account(SoapAccountConstants::GET_SHARE_INFO_REQUEST)
-                                  .add_attributes({ includeSelf: SoapUtils::OFF })
+        soap_request = SoapRequest::SoapElement.account(Zm::SoapRequest::SoapAccountConstants::GET_SHARE_INFO_REQUEST)
+                                  .add_attributes({ includeSelf: Zm::Utils::SearchUtils::OFF })
 
         unless @owner_name.nil?
-          node_owner = SoapElement.create('owner')
+          node_owner = SoapRequest::SoapElement.create('owner')
                                   .add_attributes({ by: :name })
                                   .add_content(@owner_name)
           soap_request.add_node(node_owner)
@@ -35,7 +36,7 @@ module Zm
       end
 
       def share_builder
-        ShareBuilder.new(@parent, share_response)
+        SharesBuilder.new(@parent, share_response)
       end
 
       def reset_query_params

data/lib/zm/client/signature/signature.rb

@@ -4,7 +4,9 @@ module Zm
   module Client
     # class account signature
     class Signature < Base::Object
-      include RequestMethodsMailbox
+      include SoapRequest::RequestMethodsMailbox
+      extend Relationship
+      has_jsns_builder
 
       attr_accessor :id, :name, :txt, :html
 
@@ -18,30 +20,22 @@ module Zm
       end
 
       def type
-        return ContentType::HTML unless html.nil?
+        return Zm::Utils::ContentType::HTML unless html.nil?
 
-        ContentType::TEXT
+        Zm::Utils::ContentType::TEXT
       end
 
       def html?
-        type == ContentType::HTML
+        type == Zm::Utils::ContentType::HTML
       end
 
       def txt?
-        type == ContentType::TEXT
+        type == Zm::Utils::ContentType::TEXT
       end
 
       def content
         html || txt || ''
       end
-
-      private
-
-      def jsns_builder
-        return @jsns_builder if defined? @jsns_builder
-
-        @jsns_builder = SignatureJsnsBuilder.new(self)
-      end
     end
   end
 end

data/lib/zm/client/signature/signature_jsns_builder.rb

@@ -9,24 +9,24 @@ module Zm
       end
 
       def to_jsns
-        soap_request = SoapElement.account(SoapAccountConstants::CREATE_SIGNATURE_REQUEST)
-        node_signature = SoapElement.create(SoapConstants::SIGNATURE)
+        soap_request = SoapRequest::SoapElement.account(Zm::SoapRequest::SoapAccountConstants::CREATE_SIGNATURE_REQUEST)
+        node_signature = SoapRequest::SoapElement.create(SoapRequest::SoapConstants::SIGNATURE)
                                     .add_attributes({ name: @signature.name })
         soap_request.add_node(node_signature)
-        node_content = SoapElement.create(SoapConstants::CONTENT)
-                                  .add_attribute(SoapConstants::TYPE, @signature.type)
+        node_content = SoapRequest::SoapElement.create(SoapRequest::SoapConstants::CONTENT)
+                                  .add_attribute(SoapRequest::SoapConstants::TYPE, @signature.type)
                                   .add_content(@signature.content)
         node_signature.add_node(node_content)
         soap_request
       end
 
       def to_update
-        soap_request = SoapElement.account(SoapAccountConstants::MODIFY_SIGNATURE_REQUEST)
-        node_signature = SoapElement.create(SoapConstants::SIGNATURE)
+        soap_request = SoapRequest::SoapElement.account(Zm::SoapRequest::SoapAccountConstants::MODIFY_SIGNATURE_REQUEST)
+        node_signature = SoapRequest::SoapElement.create(SoapRequest::SoapConstants::SIGNATURE)
                                     .add_attributes({ name: @signature.name, id: @signature.id })
         soap_request.add_node(node_signature)
-        node_content = SoapElement.create(SoapConstants::CONTENT)
-                                  .add_attribute(SoapConstants::TYPE, @signature.type)
+        node_content = SoapRequest::SoapElement.create(SoapRequest::SoapConstants::CONTENT)
+                                  .add_attribute(SoapRequest::SoapConstants::TYPE, @signature.type)
                                   .add_content(@signature.content)
         node_signature.add_node(node_content)
         soap_request
@@ -38,16 +38,16 @@ module Zm
           name: new_name
         }
 
-        soap_request = SoapElement.account(SoapAccountConstants::MODIFY_SIGNATURE_REQUEST)
-        node_signature = SoapElement.create(SoapConstants::SIGNATURE).add_attributes(attrs)
+        soap_request = SoapRequest::SoapElement.account(Zm::SoapRequest::SoapAccountConstants::MODIFY_SIGNATURE_REQUEST)
+        node_signature = SoapRequest::SoapElement.create(SoapRequest::SoapConstants::SIGNATURE).add_attributes(attrs)
         soap_request.add_node(node_signature)
         soap_request
       end
 
       def to_delete
-        soap_request = SoapElement.account(SoapAccountConstants::DELETE_SIGNATURE_REQUEST)
-        node_signature = SoapElement.create(SoapConstants::SIGNATURE)
-                                    .add_attribute(SoapConstants::ID, @signature.id)
+        soap_request = SoapRequest::SoapElement.account(Zm::SoapRequest::SoapAccountConstants::DELETE_SIGNATURE_REQUEST)
+        node_signature = SoapRequest::SoapElement.create(SoapRequest::SoapConstants::SIGNATURE)
+                                    .add_attribute(SoapRequest::SoapConstants::ID, @signature.id)
         soap_request.add_node(node_signature)
         soap_request
       end

data/lib/zm/client/signature/signature_jsns_initializer.rb

@@ -22,8 +22,8 @@ module Zm
           content.each do |c|
             next if c[:type].nil?
 
-            item.txt = c[:_content] if c[:type] == ContentType::TEXT
-            item.html = c[:_content] if c[:type] == ContentType::HTML
+            item.txt = c[:_content] if c[:type] == Zm::Utils::ContentType::TEXT
+            item.html = c[:_content] if c[:type] == Zm::Utils::ContentType::HTML
           end
 
           item

data/lib/zm/client/signature/signatures_collection.rb

@@ -15,7 +15,7 @@ module Zm
       end
 
       def build_query
-        SoapElement.account(SoapAccountConstants::GET_SIGNATURES_REQUEST)
+        SoapRequest::SoapElement.account(Zm::SoapRequest::SoapAccountConstants::GET_SIGNATURES_REQUEST)
       end
     end
   end

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

@@ -2,67 +2,65 @@
 
 module Zm
   module Client
-    class AccountObject
-      class TagsCollection
-        def initialize(parent)
-          @parent = parent
-        end
-
-        def all
-          return @all if defined? @all
+    class AccountObjectTagsCollection
+      def initialize(parent)
+        @parent = parent
+      end
 
-          @all = @parent.tn.to_s.split(',')
-        end
+      def all
+        return @all if defined? @all
 
-        def add!(*new_tags)
-          new_tags.flatten!
-          Utils.map_format(new_tags, String, :name)
-          return false if new_tags.delete_if { |tag_name| all.include?(tag_name) }.empty?
+        @all = @parent.tn.to_s.split(',')
+      end
 
-          new_tags.each do |tag_name|
-            attrs = {
-              op: :tag,
-              id: @parent.id,
-              tn: tag_name
-            }
+      def add!(*new_tags)
+        new_tags.flatten!
+        Utils.map_format(new_tags, String, :name)
+        return false if new_tags.delete_if { |tag_name| all.include?(tag_name) }.empty?
 
-            do_action(attrs)
-          end
+        new_tags.each do |tag_name|
+          attrs = {
+            op: :tag,
+            id: @parent.id,
+            tn: tag_name
+          }
 
-          @all += new_tags
-          update_parent
+          do_action(attrs)
         end
 
-        def remove!(*tag_names)
-          tag_names.flatten!
-          Utils.map_format(tag_names, String, :name)
-          return false if tag_names.delete_if { |tag_name| !all.include?(tag_name) }.empty?
+        @all += new_tags
+        update_parent
+      end
 
-          tag_names.each do |tag_name|
-            attrs = {
-              op: '!tag',
-              id: @parent.id,
-              tn: tag_name
-            }
+      def remove!(*tag_names)
+        tag_names.flatten!
+        Utils.map_format(tag_names, String, :name)
+        return false if tag_names.delete_if { |tag_name| !all.include?(tag_name) }.empty?
 
-            do_action(attrs)
-          end
+        tag_names.each do |tag_name|
+          attrs = {
+            op: '!tag',
+            id: @parent.id,
+            tn: tag_name
+          }
 
-          @all -= tag_names
-          update_parent
+          do_action(attrs)
         end
 
-        def update_parent
-          @parent.tn = @all.join(',')
-        end
+        @all -= tag_names
+        update_parent
+      end
 
-        def do_action(attrs)
-          soap_request = SoapElement.mail(SoapMailConstants::ITEM_ACTION_REQUEST)
-          node_action = SoapElement.create(SoapConstants::ACTION).add_attributes(attrs)
-          soap_request.add_node(node_action)
+      def update_parent
+        @parent.tn = @all.join(',')
+      end
 
-          @parent.parent.soap_connector.invoke(soap_request)
-        end
+      def do_action(attrs)
+        soap_request = SoapRequest::SoapElement.mail(SoapRequest::SoapMailConstants::ITEM_ACTION_REQUEST)
+        node_action = SoapRequest::SoapElement.create(SoapRequest::SoapConstants::ACTION).add_attributes(attrs)
+        soap_request.add_node(node_action)
+
+        @parent.parent.soap_connector.invoke(soap_request)
       end
     end
   end

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

@@ -4,8 +4,10 @@ module Zm
   module Client
     # class account tag
     class Tag < Base::Object
-      include RequestMethodsMailbox
+      include SoapRequest::RequestMethodsMailbox
       include MailboxItemConcern
+      extend Relationship
+      has_jsns_builder
 
       attr_accessor :name, :color, :rgb
 
@@ -15,14 +17,6 @@ module Zm
         TagJsnsInitializer.update(self, json)
         id
       end
-
-      private
-
-      def jsns_builder
-        return @jsns_builder if defined? @jsns_builder
-
-        @jsns_builder = TagJsnsBuilder.new(self)
-      end
     end
   end
 end

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

@@ -3,7 +3,7 @@
 module Zm
   module Client
     # class for account tag jsns builder
-    class TagJsnsBuilder < BaseAccountJsnsBuilder
+    class TagJsnsBuilder < Base::BaseAccountJsnsBuilder
       def to_jsns
         attrs = {
           name: @item.name,
@@ -12,8 +12,8 @@ module Zm
         }
         attrs.compact!
 
-        soap_request = SoapElement.mail(SoapMailConstants::CREATE_TAG_REQUEST)
-        node_tag = SoapElement.create(SoapConstants::TAG).add_attributes(attrs)
+        soap_request = SoapRequest::SoapElement.mail(SoapRequest::SoapMailConstants::CREATE_TAG_REQUEST)
+        node_tag = SoapRequest::SoapElement.create(SoapRequest::SoapConstants::TAG).add_attributes(attrs)
         soap_request.add_node(node_tag)
         soap_request
       end

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

@@ -3,7 +3,7 @@
 module Zm
   module Client
     # class factory [tags]
-    class TagBuilder < Base::ObjectsBuilder
+    class TagsBuilder < Base::ObjectsBuilder
       def initialize(parent, json)
         super
         @json_item_key = :tag