groupdocs_conversion_cloud 23.2 → 23.4

data/lib/groupdocs_conversion_cloud/models/docx_convert_options.rb

@@ -40,6 +40,9 @@ module GroupDocsConversionCloud
     # Convert specific pages. The list contains the page indexes of the pages to be converted
     attr_accessor :pages
 
+    # Watermark specific options
+    attr_accessor :watermark_options
+
     # Desired page width after conversion
     attr_accessor :width
 
@@ -55,9 +58,6 @@ module GroupDocsConversionCloud
     # Specifies the zoom level in percentage. Default is 100. Default zoom is supported till Microsoft Word 2010. Starting from Microsoft Word 2013 default zoom is no longer set to document, instead it appears to use the zoom factor of the last document that was opened.
     attr_accessor :zoom
 
-    # Watermark specific options
-    attr_accessor :watermark_options
-
     # Recognition mode when converting from pdf
     attr_accessor :pdf_recognition_mode
 
@@ -94,12 +94,12 @@ module GroupDocsConversionCloud
         :'from_page' => :'FromPage',
         :'pages_count' => :'PagesCount',
         :'pages' => :'Pages',
+        :'watermark_options' => :'WatermarkOptions',
         :'width' => :'Width',
         :'height' => :'Height',
         :'dpi' => :'Dpi',
         :'password' => :'Password',
         :'zoom' => :'Zoom',
-        :'watermark_options' => :'WatermarkOptions',
         :'pdf_recognition_mode' => :'PdfRecognitionMode',
         :'page_size' => :'PageSize',
         :'page_orientation' => :'PageOrientation'
@@ -112,12 +112,12 @@ module GroupDocsConversionCloud
         :'from_page' => :'Integer',
         :'pages_count' => :'Integer',
         :'pages' => :'Array<Integer>',
+        :'watermark_options' => :'WatermarkOptions',
         :'width' => :'Integer',
         :'height' => :'Integer',
         :'dpi' => :'Float',
         :'password' => :'String',
         :'zoom' => :'Integer',
-        :'watermark_options' => :'WatermarkOptions',
         :'pdf_recognition_mode' => :'String',
         :'page_size' => :'String',
         :'page_orientation' => :'String'
@@ -146,6 +146,10 @@ module GroupDocsConversionCloud
         end
       end
 
+      if attributes.key?(:'WatermarkOptions')
+        self.watermark_options = attributes[:'WatermarkOptions']
+      end
+
       if attributes.key?(:'Width')
         self.width = attributes[:'Width']
       end
@@ -166,10 +170,6 @@ module GroupDocsConversionCloud
         self.zoom = attributes[:'Zoom']
       end
 
-      if attributes.key?(:'WatermarkOptions')
-        self.watermark_options = attributes[:'WatermarkOptions']
-      end
-
       if attributes.key?(:'PdfRecognitionMode')
         self.pdf_recognition_mode = attributes[:'PdfRecognitionMode']
       end
@@ -298,12 +298,12 @@ module GroupDocsConversionCloud
           from_page == other.from_page &&
           pages_count == other.pages_count &&
           pages == other.pages &&
+          watermark_options == other.watermark_options &&
           width == other.width &&
           height == other.height &&
           dpi == other.dpi &&
           password == other.password &&
           zoom == other.zoom &&
-          watermark_options == other.watermark_options &&
           pdf_recognition_mode == other.pdf_recognition_mode &&
           page_size == other.page_size &&
           page_orientation == other.page_orientation
@@ -318,7 +318,7 @@ module GroupDocsConversionCloud
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [from_page, pages_count, pages, width, height, dpi, password, zoom, watermark_options, pdf_recognition_mode, page_size, page_orientation].hash
+      [from_page, pages_count, pages, watermark_options, width, height, dpi, password, zoom, pdf_recognition_mode, page_size, page_orientation].hash
     end
 
     # Downcases first letter.

data/lib/groupdocs_conversion_cloud/models/dot_convert_options.rb

@@ -40,6 +40,9 @@ module GroupDocsConversionCloud
     # Convert specific pages. The list contains the page indexes of the pages to be converted
     attr_accessor :pages
 
+    # Watermark specific options
+    attr_accessor :watermark_options
+
     # Desired page width after conversion
     attr_accessor :width
 
@@ -55,9 +58,6 @@ module GroupDocsConversionCloud
     # Specifies the zoom level in percentage. Default is 100. Default zoom is supported till Microsoft Word 2010. Starting from Microsoft Word 2013 default zoom is no longer set to document, instead it appears to use the zoom factor of the last document that was opened.
     attr_accessor :zoom
 
-    # Watermark specific options
-    attr_accessor :watermark_options
-
     # Recognition mode when converting from pdf
     attr_accessor :pdf_recognition_mode
 
@@ -94,12 +94,12 @@ module GroupDocsConversionCloud
         :'from_page' => :'FromPage',
         :'pages_count' => :'PagesCount',
         :'pages' => :'Pages',
+        :'watermark_options' => :'WatermarkOptions',
         :'width' => :'Width',
         :'height' => :'Height',
         :'dpi' => :'Dpi',
         :'password' => :'Password',
         :'zoom' => :'Zoom',
-        :'watermark_options' => :'WatermarkOptions',
         :'pdf_recognition_mode' => :'PdfRecognitionMode',
         :'page_size' => :'PageSize',
         :'page_orientation' => :'PageOrientation'
@@ -112,12 +112,12 @@ module GroupDocsConversionCloud
         :'from_page' => :'Integer',
         :'pages_count' => :'Integer',
         :'pages' => :'Array<Integer>',
+        :'watermark_options' => :'WatermarkOptions',
         :'width' => :'Integer',
         :'height' => :'Integer',
         :'dpi' => :'Float',
         :'password' => :'String',
         :'zoom' => :'Integer',
-        :'watermark_options' => :'WatermarkOptions',
         :'pdf_recognition_mode' => :'String',
         :'page_size' => :'String',
         :'page_orientation' => :'String'
@@ -146,6 +146,10 @@ module GroupDocsConversionCloud
         end
       end
 
+      if attributes.key?(:'WatermarkOptions')
+        self.watermark_options = attributes[:'WatermarkOptions']
+      end
+
       if attributes.key?(:'Width')
         self.width = attributes[:'Width']
       end
@@ -166,10 +170,6 @@ module GroupDocsConversionCloud
         self.zoom = attributes[:'Zoom']
       end
 
-      if attributes.key?(:'WatermarkOptions')
-        self.watermark_options = attributes[:'WatermarkOptions']
-      end
-
       if attributes.key?(:'PdfRecognitionMode')
         self.pdf_recognition_mode = attributes[:'PdfRecognitionMode']
       end
@@ -298,12 +298,12 @@ module GroupDocsConversionCloud
           from_page == other.from_page &&
           pages_count == other.pages_count &&
           pages == other.pages &&
+          watermark_options == other.watermark_options &&
           width == other.width &&
           height == other.height &&
           dpi == other.dpi &&
           password == other.password &&
           zoom == other.zoom &&
-          watermark_options == other.watermark_options &&
           pdf_recognition_mode == other.pdf_recognition_mode &&
           page_size == other.page_size &&
           page_orientation == other.page_orientation
@@ -318,7 +318,7 @@ module GroupDocsConversionCloud
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [from_page, pages_count, pages, width, height, dpi, password, zoom, watermark_options, pdf_recognition_mode, page_size, page_orientation].hash
+      [from_page, pages_count, pages, watermark_options, width, height, dpi, password, zoom, pdf_recognition_mode, page_size, page_orientation].hash
     end
 
     # Downcases first letter.

data/lib/groupdocs_conversion_cloud/models/dotm_convert_options.rb

@@ -40,6 +40,9 @@ module GroupDocsConversionCloud
     # Convert specific pages. The list contains the page indexes of the pages to be converted
     attr_accessor :pages
 
+    # Watermark specific options
+    attr_accessor :watermark_options
+
     # Desired page width after conversion
     attr_accessor :width
 
@@ -55,9 +58,6 @@ module GroupDocsConversionCloud
     # Specifies the zoom level in percentage. Default is 100. Default zoom is supported till Microsoft Word 2010. Starting from Microsoft Word 2013 default zoom is no longer set to document, instead it appears to use the zoom factor of the last document that was opened.
     attr_accessor :zoom
 
-    # Watermark specific options
-    attr_accessor :watermark_options
-
     # Recognition mode when converting from pdf
     attr_accessor :pdf_recognition_mode
 
@@ -94,12 +94,12 @@ module GroupDocsConversionCloud
         :'from_page' => :'FromPage',
         :'pages_count' => :'PagesCount',
         :'pages' => :'Pages',
+        :'watermark_options' => :'WatermarkOptions',
         :'width' => :'Width',
         :'height' => :'Height',
         :'dpi' => :'Dpi',
         :'password' => :'Password',
         :'zoom' => :'Zoom',
-        :'watermark_options' => :'WatermarkOptions',
         :'pdf_recognition_mode' => :'PdfRecognitionMode',
         :'page_size' => :'PageSize',
         :'page_orientation' => :'PageOrientation'
@@ -112,12 +112,12 @@ module GroupDocsConversionCloud
         :'from_page' => :'Integer',
         :'pages_count' => :'Integer',
         :'pages' => :'Array<Integer>',
+        :'watermark_options' => :'WatermarkOptions',
         :'width' => :'Integer',
         :'height' => :'Integer',
         :'dpi' => :'Float',
         :'password' => :'String',
         :'zoom' => :'Integer',
-        :'watermark_options' => :'WatermarkOptions',
         :'pdf_recognition_mode' => :'String',
         :'page_size' => :'String',
         :'page_orientation' => :'String'
@@ -146,6 +146,10 @@ module GroupDocsConversionCloud
         end
       end
 
+      if attributes.key?(:'WatermarkOptions')
+        self.watermark_options = attributes[:'WatermarkOptions']
+      end
+
       if attributes.key?(:'Width')
         self.width = attributes[:'Width']
       end
@@ -166,10 +170,6 @@ module GroupDocsConversionCloud
         self.zoom = attributes[:'Zoom']
       end
 
-      if attributes.key?(:'WatermarkOptions')
-        self.watermark_options = attributes[:'WatermarkOptions']
-      end
-
       if attributes.key?(:'PdfRecognitionMode')
         self.pdf_recognition_mode = attributes[:'PdfRecognitionMode']
       end
@@ -298,12 +298,12 @@ module GroupDocsConversionCloud
           from_page == other.from_page &&
           pages_count == other.pages_count &&
           pages == other.pages &&
+          watermark_options == other.watermark_options &&
           width == other.width &&
           height == other.height &&
           dpi == other.dpi &&
           password == other.password &&
           zoom == other.zoom &&
-          watermark_options == other.watermark_options &&
           pdf_recognition_mode == other.pdf_recognition_mode &&
           page_size == other.page_size &&
           page_orientation == other.page_orientation
@@ -318,7 +318,7 @@ module GroupDocsConversionCloud
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [from_page, pages_count, pages, width, height, dpi, password, zoom, watermark_options, pdf_recognition_mode, page_size, page_orientation].hash
+      [from_page, pages_count, pages, watermark_options, width, height, dpi, password, zoom, pdf_recognition_mode, page_size, page_orientation].hash
     end
 
     # Downcases first letter.

data/lib/groupdocs_conversion_cloud/models/dotx_convert_options.rb

@@ -40,6 +40,9 @@ module GroupDocsConversionCloud
     # Convert specific pages. The list contains the page indexes of the pages to be converted
     attr_accessor :pages
 
+    # Watermark specific options
+    attr_accessor :watermark_options
+
     # Desired page width after conversion
     attr_accessor :width
 
@@ -55,9 +58,6 @@ module GroupDocsConversionCloud
     # Specifies the zoom level in percentage. Default is 100. Default zoom is supported till Microsoft Word 2010. Starting from Microsoft Word 2013 default zoom is no longer set to document, instead it appears to use the zoom factor of the last document that was opened.
     attr_accessor :zoom
 
-    # Watermark specific options
-    attr_accessor :watermark_options
-
     # Recognition mode when converting from pdf
     attr_accessor :pdf_recognition_mode
 
@@ -94,12 +94,12 @@ module GroupDocsConversionCloud
         :'from_page' => :'FromPage',
         :'pages_count' => :'PagesCount',
         :'pages' => :'Pages',
+        :'watermark_options' => :'WatermarkOptions',
         :'width' => :'Width',
         :'height' => :'Height',
         :'dpi' => :'Dpi',
         :'password' => :'Password',
         :'zoom' => :'Zoom',
-        :'watermark_options' => :'WatermarkOptions',
         :'pdf_recognition_mode' => :'PdfRecognitionMode',
         :'page_size' => :'PageSize',
         :'page_orientation' => :'PageOrientation'
@@ -112,12 +112,12 @@ module GroupDocsConversionCloud
         :'from_page' => :'Integer',
         :'pages_count' => :'Integer',
         :'pages' => :'Array<Integer>',
+        :'watermark_options' => :'WatermarkOptions',
         :'width' => :'Integer',
         :'height' => :'Integer',
         :'dpi' => :'Float',
         :'password' => :'String',
         :'zoom' => :'Integer',
-        :'watermark_options' => :'WatermarkOptions',
         :'pdf_recognition_mode' => :'String',
         :'page_size' => :'String',
         :'page_orientation' => :'String'
@@ -146,6 +146,10 @@ module GroupDocsConversionCloud
         end
       end
 
+      if attributes.key?(:'WatermarkOptions')
+        self.watermark_options = attributes[:'WatermarkOptions']
+      end
+
       if attributes.key?(:'Width')
         self.width = attributes[:'Width']
       end
@@ -166,10 +170,6 @@ module GroupDocsConversionCloud
         self.zoom = attributes[:'Zoom']
       end
 
-      if attributes.key?(:'WatermarkOptions')
-        self.watermark_options = attributes[:'WatermarkOptions']
-      end
-
       if attributes.key?(:'PdfRecognitionMode')
         self.pdf_recognition_mode = attributes[:'PdfRecognitionMode']
       end
@@ -298,12 +298,12 @@ module GroupDocsConversionCloud
           from_page == other.from_page &&
           pages_count == other.pages_count &&
           pages == other.pages &&
+          watermark_options == other.watermark_options &&
           width == other.width &&
           height == other.height &&
           dpi == other.dpi &&
           password == other.password &&
           zoom == other.zoom &&
-          watermark_options == other.watermark_options &&
           pdf_recognition_mode == other.pdf_recognition_mode &&
           page_size == other.page_size &&
           page_orientation == other.page_orientation
@@ -318,7 +318,7 @@ module GroupDocsConversionCloud
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [from_page, pages_count, pages, width, height, dpi, password, zoom, watermark_options, pdf_recognition_mode, page_size, page_orientation].hash
+      [from_page, pages_count, pages, watermark_options, width, height, dpi, password, zoom, pdf_recognition_mode, page_size, page_orientation].hash
     end
 
     # Downcases first letter.

data/lib/groupdocs_conversion_cloud/models/{xps_convert_options.rb → e_book_convert_options.rb}

@@ -1,6 +1,6 @@
  #
  # --------------------------------------------------------------------------------------------------------------------
- # <copyright company="Aspose Pty Ltd" file="xps_convert_options.rb">
+ # <copyright company="Aspose Pty Ltd" file="e_book_convert_options.rb">
  #   Copyright (c) 2003-2023 Aspose Pty Ltd
  # </copyright>
  # <summary>
@@ -28,8 +28,8 @@
 require 'date'
 
 module GroupDocsConversionCloud
-  # Xps convert options
-  class XpsConvertOptions
+  # Ebook convert options
+  class EBookConvertOptions
 
     # Start conversion from FromPage page
     attr_accessor :from_page
@@ -40,52 +40,45 @@ module GroupDocsConversionCloud
     # Convert specific pages. The list contains the page indexes of the pages to be converted
     attr_accessor :pages
 
-    # Desired page width in pixels after conversion
-    attr_accessor :width
-
-    # Desired page height in pixels after conversion
-    attr_accessor :height
-
-    # Desired page DPI after conversion. The default resolution is: 96dpi
-    attr_accessor :dpi
-
-    # Set this property if you want to protect the converted document with a password
-    attr_accessor :password
-
-    # Desired page top margin in pixels after conversion
-    attr_accessor :margin_top
-
-    # Desired page bottom margin in pixels after conversion
-    attr_accessor :margin_bottom
-
-    # Desired page left margin in pixels after conversion
-    attr_accessor :margin_left
-
-    # Desired page right margin in pixels after conversion
-    attr_accessor :margin_right
-
-    # If true, the input firstly is converted to PDF and after that to desired format
-    attr_accessor :use_pdf
-
     # Watermark specific options
     attr_accessor :watermark_options
 
+    # Specifies page size
+    attr_accessor :page_size
+
+    # Specifies page orientation
+    attr_accessor :page_orientation
+    class EnumAttributeValidator
+      attr_reader :datatype
+      attr_reader :allowable_values
+
+      def initialize(datatype, allowable_values)
+        @allowable_values = allowable_values.map do |value|
+          case datatype.to_s
+          when /Integer/i
+            value.to_i
+          when /Float/i
+            value.to_f
+          else
+            value
+          end
+        end
+      end
+
+      def valid?(value)
+        !value || allowable_values.include?(value)
+      end
+    end
+
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
         :'from_page' => :'FromPage',
         :'pages_count' => :'PagesCount',
         :'pages' => :'Pages',
-        :'width' => :'Width',
-        :'height' => :'Height',
-        :'dpi' => :'Dpi',
-        :'password' => :'Password',
-        :'margin_top' => :'MarginTop',
-        :'margin_bottom' => :'MarginBottom',
-        :'margin_left' => :'MarginLeft',
-        :'margin_right' => :'MarginRight',
-        :'use_pdf' => :'UsePdf',
-        :'watermark_options' => :'WatermarkOptions'
+        :'watermark_options' => :'WatermarkOptions',
+        :'page_size' => :'PageSize',
+        :'page_orientation' => :'PageOrientation'
       }
     end
 
@@ -95,16 +88,9 @@ module GroupDocsConversionCloud
         :'from_page' => :'Integer',
         :'pages_count' => :'Integer',
         :'pages' => :'Array<Integer>',
-        :'width' => :'Integer',
-        :'height' => :'Integer',
-        :'dpi' => :'Float',
-        :'password' => :'String',
-        :'margin_top' => :'Integer',
-        :'margin_bottom' => :'Integer',
-        :'margin_left' => :'Integer',
-        :'margin_right' => :'Integer',
-        :'use_pdf' => :'BOOLEAN',
-        :'watermark_options' => :'WatermarkOptions'
+        :'watermark_options' => :'WatermarkOptions',
+        :'page_size' => :'String',
+        :'page_orientation' => :'String'
       }
     end
 
@@ -130,44 +116,16 @@ module GroupDocsConversionCloud
         end
       end
 
-      if attributes.key?(:'Width')
-        self.width = attributes[:'Width']
-      end
-
-      if attributes.key?(:'Height')
-        self.height = attributes[:'Height']
-      end
-
-      if attributes.key?(:'Dpi')
-        self.dpi = attributes[:'Dpi']
-      end
-
-      if attributes.key?(:'Password')
-        self.password = attributes[:'Password']
-      end
-
-      if attributes.key?(:'MarginTop')
-        self.margin_top = attributes[:'MarginTop']
-      end
-
-      if attributes.key?(:'MarginBottom')
-        self.margin_bottom = attributes[:'MarginBottom']
-      end
-
-      if attributes.key?(:'MarginLeft')
-        self.margin_left = attributes[:'MarginLeft']
+      if attributes.key?(:'WatermarkOptions')
+        self.watermark_options = attributes[:'WatermarkOptions']
       end
 
-      if attributes.key?(:'MarginRight')
-        self.margin_right = attributes[:'MarginRight']
+      if attributes.key?(:'PageSize')
+        self.page_size = attributes[:'PageSize']
       end
 
-      if attributes.key?(:'UsePdf')
-        self.use_pdf = attributes[:'UsePdf']
-      end
-
-      if attributes.key?(:'WatermarkOptions')
-        self.watermark_options = attributes[:'WatermarkOptions']
+      if attributes.key?(:'PageOrientation')
+        self.page_orientation = attributes[:'PageOrientation']
       end
 
     end
@@ -184,36 +142,12 @@ module GroupDocsConversionCloud
         invalid_properties.push("invalid value for 'pages_count', pages_count cannot be nil.")
       end
 
-      if @width.nil?
-        invalid_properties.push("invalid value for 'width', width cannot be nil.")
-      end
-
-      if @height.nil?
-        invalid_properties.push("invalid value for 'height', height cannot be nil.")
-      end
-
-      if @dpi.nil?
-        invalid_properties.push("invalid value for 'dpi', dpi cannot be nil.")
-      end
-
-      if @margin_top.nil?
-        invalid_properties.push("invalid value for 'margin_top', margin_top cannot be nil.")
-      end
-
-      if @margin_bottom.nil?
-        invalid_properties.push("invalid value for 'margin_bottom', margin_bottom cannot be nil.")
+      if @page_size.nil?
+        invalid_properties.push("invalid value for 'page_size', page_size cannot be nil.")
       end
 
-      if @margin_left.nil?
-        invalid_properties.push("invalid value for 'margin_left', margin_left cannot be nil.")
-      end
-
-      if @margin_right.nil?
-        invalid_properties.push("invalid value for 'margin_right', margin_right cannot be nil.")
-      end
-
-      if @use_pdf.nil?
-        invalid_properties.push("invalid value for 'use_pdf', use_pdf cannot be nil.")
+      if @page_orientation.nil?
+        invalid_properties.push("invalid value for 'page_orientation', page_orientation cannot be nil.")
       end
 
       return invalid_properties
@@ -224,17 +158,43 @@ module GroupDocsConversionCloud
     def valid?
       return false if @from_page.nil?
       return false if @pages_count.nil?
-      return false if @width.nil?
-      return false if @height.nil?
-      return false if @dpi.nil?
-      return false if @margin_top.nil?
-      return false if @margin_bottom.nil?
-      return false if @margin_left.nil?
-      return false if @margin_right.nil?
-      return false if @use_pdf.nil?
+      return false if @page_size.nil?
+      page_size_validator = EnumAttributeValidator.new('String', ["Default", "A3", "Statement", "Quarto", "Paper11x17", "Paper10x14", "Letter", "Legal", "Ledger", "Folio", "Executive", "EnvelopeDL", "Custom", "B5", "B4", "A5", "A4", "Tabloid"])
+      return false unless page_size_validator.valid?(@page_size)
+      return false if @page_orientation.nil?
+      page_orientation_validator = EnumAttributeValidator.new('String', ["Default", "Landscape", "Portrait"])
+      return false unless page_orientation_validator.valid?(@page_orientation)
       return true
     end
 
+    # Custom attribute writer method checking allowed values (enum).
+    # @param [Object] page_size Object to be assigned
+    def page_size=(page_size)
+      validator = EnumAttributeValidator.new('String', ["Default", "A3", "Statement", "Quarto", "Paper11x17", "Paper10x14", "Letter", "Legal", "Ledger", "Folio", "Executive", "EnvelopeDL", "Custom", "B5", "B4", "A5", "A4", "Tabloid"])
+      if page_size.to_i == 0
+        unless validator.valid?(page_size)
+          raise ArgumentError, "invalid value for 'page_size', must be one of #{validator.allowable_values}."
+        end
+        @page_size = page_size
+      else
+        @page_size = validator.allowable_values[page_size.to_i]
+      end
+    end
+
+    # Custom attribute writer method checking allowed values (enum).
+    # @param [Object] page_orientation Object to be assigned
+    def page_orientation=(page_orientation)
+      validator = EnumAttributeValidator.new('String', ["Default", "Landscape", "Portrait"])
+      if page_orientation.to_i == 0
+        unless validator.valid?(page_orientation)
+          raise ArgumentError, "invalid value for 'page_orientation', must be one of #{validator.allowable_values}."
+        end
+        @page_orientation = page_orientation
+      else
+        @page_orientation = validator.allowable_values[page_orientation.to_i]
+      end
+    end
+
     # Checks equality by comparing each attribute.
     # @param [Object] Object to be compared
     def ==(other)
@@ -243,16 +203,9 @@ module GroupDocsConversionCloud
           from_page == other.from_page &&
           pages_count == other.pages_count &&
           pages == other.pages &&
-          width == other.width &&
-          height == other.height &&
-          dpi == other.dpi &&
-          password == other.password &&
-          margin_top == other.margin_top &&
-          margin_bottom == other.margin_bottom &&
-          margin_left == other.margin_left &&
-          margin_right == other.margin_right &&
-          use_pdf == other.use_pdf &&
-          watermark_options == other.watermark_options
+          watermark_options == other.watermark_options &&
+          page_size == other.page_size &&
+          page_orientation == other.page_orientation
     end
 
     # @see the `==` method
@@ -264,7 +217,7 @@ module GroupDocsConversionCloud
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [from_page, pages_count, pages, width, height, dpi, password, margin_top, margin_bottom, margin_left, margin_right, use_pdf, watermark_options].hash
+      [from_page, pages_count, pages, watermark_options, page_size, page_orientation].hash
     end
 
     # Downcases first letter.