Updated sources

Author: product-team

Gemfile.lock

@@ -1,10 +1,9 @@
 PATH
   remote: .
   specs:
-    groupdocs_annotation_cloud (21.2)
+    groupdocs_annotation_cloud (21.6)
       addressable (~> 2.5.0, >= 2.5.0)
       faraday (~> 0.14.0)
-      mimemagic (~> 0.3.2)
 
 GEM
   remote: https://rubygems.org/
@@ -13,7 +12,6 @@ GEM
       public_suffix (>= 2.0.2, < 4.0)
     faraday (0.14.0)
       multipart-post (>= 1.2, < 3)
-    mimemagic (0.3.5)
     minitest (5.11.3)
     multipart-post (2.1.1)
     public_suffix (3.1.1)

README.md

@@ -13,7 +13,7 @@ gem install groupdocs_annotation_cloud
 To add dependency to your app copy following into your Gemfile and run `bundle install`:
 
 ```
-gem "groupdocs_annotation_cloud", "~> 21.2"
+gem "groupdocs_annotation_cloud", "~> 21.6"
 ```
 
 ## Getting Started

groupdocs_annotation_cloud.gemspec

@@ -13,7 +13,6 @@ Gem::Specification.new do |s|
   s.metadata    = { 'source_code_uri' => 'https://github.com/groupdocs-annotation-cloud/groupdocs-annotation-cloud-ruby' }
 
   s.add_runtime_dependency 'faraday', '~> 0.14.0'
-  s.add_runtime_dependency 'mimemagic', '~> 0.3.2'
   s.add_runtime_dependency 'addressable', '~> 2.5.0', '>= 2.5.0'
 
   s.add_development_dependency 'minitest', '~> 5.11', '>= 5.11.3'

lib/groupdocs_annotation_cloud/api_error.rb

@@ -39,10 +39,23 @@ def initialize(arg = nil)
 
         if arg.key?(:response_body) then
           data = JSON.parse(arg[:response_body], :symbolize_names => true)
-          if !data.nil? && !data[:error].nil? then
-            @message = data[:error]
-          elsif !data.nil? && !data[:Error].nil? && !data[:Error][:Message].nil? then
-            @message = data[:Error][:Message]
+          if !data.nil? then
+            if !data[:error].nil? then
+              error = data[:error]
+              if error.kind_of?(String) then
+                @message = error
+              else
+                @message = error[:message]
+              end
+            else
+              message = data[:message]
+              if !message.nil? && message.kind_of?(String) then
+                @message = message
+                @code = data[:code]
+              else
+                @message = data
+              end              
+            end
           end
         end
 

lib/groupdocs_annotation_cloud/models/annotate_options.rb

@@ -49,6 +49,9 @@ class AnnotateOptions
     # Path to output document in the cloud storage. Required for Add method. Not required if Annotate (with file result) method used.
     attr_accessor :output_path
 
+    # The path to directory containing custom fonts in storage
+    attr_accessor :fonts_path
+
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
@@ -57,7 +60,8 @@ def self.attribute_map
         :'first_page' => :'FirstPage',
         :'last_page' => :'LastPage',
         :'only_annotated_pages' => :'OnlyAnnotatedPages',
-        :'output_path' => :'OutputPath'
+        :'output_path' => :'OutputPath',
+        :'fonts_path' => :'FontsPath'
       }
     end
 
@@ -69,7 +73,8 @@ def self.swagger_types
         :'first_page' => :'Integer',
         :'last_page' => :'Integer',
         :'only_annotated_pages' => :'BOOLEAN',
-        :'output_path' => :'String'
+        :'output_path' => :'String',
+        :'fonts_path' => :'String'
       }
     end
 
@@ -107,6 +112,10 @@ def initialize(attributes = {})
         self.output_path = attributes[:'OutputPath']
       end
 
+      if attributes.key?(:'FontsPath')
+        self.fonts_path = attributes[:'FontsPath']
+      end
+
     end
 
     # Show invalid properties with the reasons. Usually used together with valid?
@@ -147,7 +156,8 @@ def ==(other)
           first_page == other.first_page &&
           last_page == other.last_page &&
           only_annotated_pages == other.only_annotated_pages &&
-          output_path == other.output_path
+          output_path == other.output_path &&
+          fonts_path == other.fonts_path
     end
 
     # @see the `==` method
@@ -159,7 +169,7 @@ def eql?(other)
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [file_info, annotations, first_page, last_page, only_annotated_pages, output_path].hash
+      [file_info, annotations, first_page, last_page, only_annotated_pages, output_path, fonts_path].hash
     end
 
     # Downcases first letter.

lib/groupdocs_annotation_cloud/models/annotation_info.rb

@@ -106,6 +106,9 @@ class AnnotationInfo
     # Gets or sets the watermark annotation's rotation angle
     attr_accessor :angle
 
+    # Gets or sets z-index. Default value is 0 The z-index property specifies the stack order of an element.
+    attr_accessor :z_index
+
     # Gets or sets annotation link url
     attr_accessor :url
 
@@ -161,6 +164,7 @@ def self.attribute_map
         :'font_size' => :'FontSize',
         :'opacity' => :'Opacity',
         :'angle' => :'Angle',
+        :'z_index' => :'ZIndex',
         :'url' => :'Url',
         :'image_path' => :'ImagePath'
       }
@@ -194,6 +198,7 @@ def self.swagger_types
         :'font_size' => :'Float',
         :'opacity' => :'Float',
         :'angle' => :'Float',
+        :'z_index' => :'Integer',
         :'url' => :'String',
         :'image_path' => :'String'
       }
@@ -311,6 +316,10 @@ def initialize(attributes = {})
         self.angle = attributes[:'Angle']
       end
 
+      if attributes.key?(:'ZIndex')
+        self.z_index = attributes[:'ZIndex']
+      end
+
       if attributes.key?(:'Url')
         self.url = attributes[:'Url']
       end
@@ -353,6 +362,10 @@ def list_invalid_properties
         invalid_properties.push("invalid value for 'created_on', created_on cannot be nil.")
       end
 
+      if @z_index.nil?
+        invalid_properties.push("invalid value for 'z_index', z_index cannot be nil.")
+      end
+
       return invalid_properties
     end
 
@@ -374,6 +387,7 @@ def valid?
       return false if @created_on.nil?
       pen_style_validator = EnumAttributeValidator.new('String', ["Solid", "Dash", "DashDot", "Dot", "LongDash", "DashDotDot"])
       return false unless pen_style_validator.valid?(@pen_style)
+      return false if @z_index.nil?
       return true
     end
 
@@ -467,6 +481,7 @@ def ==(other)
           font_size == other.font_size &&
           opacity == other.opacity &&
           angle == other.angle &&
+          z_index == other.z_index &&
           url == other.url &&
           image_path == other.image_path
     end
@@ -480,7 +495,7 @@ def eql?(other)
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [id, text, text_to_replace, horizontal_alignment, vertical_alignment, creator_id, creator_name, creator_email, box, points, page_number, annotation_position, svg_path, type, replies, created_on, font_color, pen_color, pen_width, pen_style, background_color, font_family, font_size, opacity, angle, url, image_path].hash
+      [id, text, text_to_replace, horizontal_alignment, vertical_alignment, creator_id, creator_name, creator_email, box, points, page_number, annotation_position, svg_path, type, replies, created_on, font_color, pen_color, pen_width, pen_style, background_color, font_family, font_size, opacity, angle, z_index, url, image_path].hash
     end
 
     # Downcases first letter.

lib/groupdocs_annotation_cloud/models/preview_options.rb

@@ -46,8 +46,17 @@ class PreviewOptions
     # Preview image height. Not required. Default width used if not specified or 0.
     attr_accessor :height
 
+    # Gets or sets the resolution for generated images, in dots per inch. The default value is 96.
+    attr_accessor :resolution
+
     # Render document comments. Default value is 'false'.
     attr_accessor :render_comments
+
+    # The property that controls whether annotations will be generated on the preview. Default State - true.
+    attr_accessor :render_annotations
+
+    # The path to directory containing custom fonts in storage
+    attr_accessor :fonts_path
     class EnumAttributeValidator
       attr_reader :datatype
       attr_reader :allowable_values
@@ -78,7 +87,10 @@ def self.attribute_map
         :'page_numbers' => :'PageNumbers',
         :'width' => :'Width',
         :'height' => :'Height',
-        :'render_comments' => :'RenderComments'
+        :'resolution' => :'Resolution',
+        :'render_comments' => :'RenderComments',
+        :'render_annotations' => :'RenderAnnotations',
+        :'fonts_path' => :'FontsPath'
       }
     end
 
@@ -90,7 +102,10 @@ def self.swagger_types
         :'page_numbers' => :'Array<Integer>',
         :'width' => :'Integer',
         :'height' => :'Integer',
-        :'render_comments' => :'BOOLEAN'
+        :'resolution' => :'Integer',
+        :'render_comments' => :'BOOLEAN',
+        :'render_annotations' => :'BOOLEAN',
+        :'fonts_path' => :'String'
       }
     end
 
@@ -124,10 +139,22 @@ def initialize(attributes = {})
         self.height = attributes[:'Height']
       end
 
+      if attributes.key?(:'Resolution')
+        self.resolution = attributes[:'Resolution']
+      end
+
       if attributes.key?(:'RenderComments')
         self.render_comments = attributes[:'RenderComments']
       end
 
+      if attributes.key?(:'RenderAnnotations')
+        self.render_annotations = attributes[:'RenderAnnotations']
+      end
+
+      if attributes.key?(:'FontsPath')
+        self.fonts_path = attributes[:'FontsPath']
+      end
+
     end
 
     # Show invalid properties with the reasons. Usually used together with valid?
@@ -146,10 +173,18 @@ def list_invalid_properties
         invalid_properties.push("invalid value for 'height', height cannot be nil.")
       end
 
+      if @resolution.nil?
+        invalid_properties.push("invalid value for 'resolution', resolution cannot be nil.")
+      end
+
       if @render_comments.nil?
         invalid_properties.push("invalid value for 'render_comments', render_comments cannot be nil.")
       end
 
+      if @render_annotations.nil?
+        invalid_properties.push("invalid value for 'render_annotations', render_annotations cannot be nil.")
+      end
+
       return invalid_properties
     end
 
@@ -161,7 +196,9 @@ def valid?
       return false unless format_validator.valid?(@format)
       return false if @width.nil?
       return false if @height.nil?
+      return false if @resolution.nil?
       return false if @render_comments.nil?
+      return false if @render_annotations.nil?
       return true
     end
 
@@ -190,7 +227,10 @@ def ==(other)
           page_numbers == other.page_numbers &&
           width == other.width &&
           height == other.height &&
-          render_comments == other.render_comments
+          resolution == other.resolution &&
+          render_comments == other.render_comments &&
+          render_annotations == other.render_annotations &&
+          fonts_path == other.fonts_path
     end
 
     # @see the `==` method
@@ -202,7 +242,7 @@ def eql?(other)
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [file_info, format, page_numbers, width, height, render_comments].hash
+      [file_info, format, page_numbers, width, height, resolution, render_comments, render_annotations, fonts_path].hash
     end
 
     # Downcases first letter.

lib/groupdocs_annotation_cloud/version.rb

@@ -25,5 +25,5 @@
  # --------------------------------------------------------------------------------------------------------------------
  #
 module GroupDocsAnnotationCloud
-  VERSION = "21.2".freeze
+  VERSION = "21.6".freeze
 end

test/api/test_info_api.rb

@@ -46,12 +46,21 @@ def test_get_info
         file_info = FileInfo.new()
         file_info.file_path = test_file.path
         file_info.password = test_file.password
-
         request = GetInfoRequest.new(file_info)
         response = @info_api.get_info(request)
         assert_equal test_file.path, response.path
       end
     end  
 
+    def test_get_info_file_not_found
+      file_info = FileInfo.new()
+      file_info.file_path = "some-folder\\NotExist.docx"
+      request = GetInfoRequest.new(file_info)
+      error = assert_raises ApiError do
+        @info_api.get_info(request)
+      end
+      assert_equal "Specified file not found", error.message
+    end      
+
   end
 end