Updated sources

Author: product-team

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    groupdocs_annotation_cloud (21.6)
+    groupdocs_annotation_cloud (22.2)
       addressable (~> 2.5.0, >= 2.5.0)
       faraday (~> 0.14.0)
 
@@ -12,10 +12,10 @@ GEM
       public_suffix (>= 2.0.2, < 4.0)
     faraday (0.14.0)
       multipart-post (>= 1.2, < 3)
-    minitest (5.11.3)
+    minitest (5.15.0)
     multipart-post (2.1.1)
     public_suffix (3.1.1)
-    rake (13.0.1)
+    rake (13.0.6)
 
 PLATFORMS
   x64-mingw32

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.6"
+gem "groupdocs_annotation_cloud", "~> 22.2"
 ```
 
 ## Getting Started

lib/groupdocs_annotation_cloud.rb

@@ -33,6 +33,7 @@
 require_relative 'groupdocs_annotation_cloud/models/annotate_options'
 require_relative 'groupdocs_annotation_cloud/models/annotation_info'
 require_relative 'groupdocs_annotation_cloud/models/annotation_reply_info'
+require_relative 'groupdocs_annotation_cloud/models/consumption_result'
 require_relative 'groupdocs_annotation_cloud/models/disc_usage'
 require_relative 'groupdocs_annotation_cloud/models/document_info'
 require_relative 'groupdocs_annotation_cloud/models/error'
@@ -63,5 +64,6 @@
 require_relative 'groupdocs_annotation_cloud/api/file_api'
 require_relative 'groupdocs_annotation_cloud/api/folder_api'
 require_relative 'groupdocs_annotation_cloud/api/info_api'
+require_relative 'groupdocs_annotation_cloud/api/license_api'
 require_relative 'groupdocs_annotation_cloud/api/preview_api'
 require_relative 'groupdocs_annotation_cloud/api/storage_api'

lib/groupdocs_annotation_cloud/api/license_api.rb

@@ -0,0 +1,169 @@
+# -----------------------------------------------------------------------------------
+# <copyright company="Aspose Pty Ltd" file="license.rb">
+#   Copyright (c) 2003-2021 Aspose Pty Ltd
+# </copyright>
+# <summary>
+#  Permission is hereby granted, free of charge, to any person obtaining a copy
+#  of this software and associated documentation files (the "Software"), to deal
+#  in the Software without restriction, including without limitation the rights
+#  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+#  copies of the Software, and to permit persons to whom the Software is
+#  furnished to do so, subject to the following conditions:
+#
+#  The above copyright notice and this permission notice shall be included in all
+#  copies or substantial portions of the Software.
+#
+#  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+#  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+#  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+#  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+#  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+#  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+#  SOFTWARE.
+# </summary>
+# -----------------------------------------------------------------------------------
+
+require 'uri'
+require 'date'
+
+module GroupDocsAnnotationCloud
+  #
+  # GroupDocs.Annotation Cloud API
+  #
+  class LicenseApi
+    attr_accessor :config
+
+    #make LicenseApi.new private 
+    private_class_method :new
+
+    # Initializes new instance of LicenseApi
+    #
+    # @param [config] Configuration 
+    # @return [LicenseApi] New instance of LicenseApi
+    def initialize(config)
+      @config = config
+      @api_client = ApiClient.new(config)
+      @access_token = nil
+    end
+
+    # Initializes new instance of LicenseApi
+    #
+    # @param [app_sid] Application identifier (App SID)
+    # @param [app_key] Application private key (App Key)
+    # @return [LicenseApi] New instance of LicenseApi
+    def self.from_keys(app_sid, app_key)
+      config = Configuration.new(app_sid, app_key)
+      return new(config)
+    end
+
+    # Initializes new instance of LicenseApi
+    #
+    # @param [config] Configuration 
+    # @return [LicenseApi] New instance of LicenseApi
+    def self.from_config(config)
+      return new(config)
+    end
+
+    # Get license consumption
+    # 
+    # @return [ConsumptionResult]
+    def get_consumption_credit()
+      data, _status_code, _headers = get_consumption_credit_with_http_info()
+      data
+    end
+
+    # Get license consumption
+    # 
+    
+    # @return [Array<(ConsumptionResult, Fixnum, Hash)>]
+    # ConsumptionResult data, response status code and response headers
+    def get_consumption_credit_with_http_info()
+      
+
+      @api_client.config.logger.debug 'Calling API: LicenseApi.get_consumption_credit ...' if @api_client.config.debugging
+      # resource path
+      local_var_path = '/annotation/consumption'
+
+      # query parameters
+      query_params = {}
+
+      # header parameters
+      header_params = {}
+      # HTTP header 'Accept' (if needed)
+      header_params['Accept'] = @api_client.select_header_accept(['application/json'])
+      # HTTP header 'Content-Type'
+      header_params['Content-Type'] = @api_client.select_header_content_type(['application/json'])
+
+      # form parameters
+      form_params = {}
+
+      # http body (model)
+      post_body = nil
+      data, status_code, headers = @api_client.call_api(:GET, local_var_path,
+                                                        header_params: header_params,
+                                                        query_params: query_params,
+                                                        form_params: form_params,
+                                                        body: post_body,
+                                                        access_token: get_access_token,
+                                                        return_type: 'ConsumptionResult')
+      if @api_client.config.debugging
+        @api_client.config.logger.debug "API called:
+        LicenseApi#get_consumption_credit\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+      end
+      [data, status_code, headers]
+    end
+
+    #
+    # Helper method to convert first letter to downcase
+    #
+    private def downcase_first_letter(str)
+      value = str[0].downcase + str[1..-1]
+      value
+    end
+                 
+    #
+    # Retrieves access token
+    #
+    private def get_access_token
+        if @access_token.nil? then
+          request_access_token
+        end
+        
+        @access_token  
+    end
+
+    #
+    # Gets a access token from server
+    #
+    private def request_access_token
+        auth_config = Configuration.new(@config.app_sid, @config.app_key)
+        auth_config.api_base_url = @config.api_base_url
+        auth_config.debugging = @config.debugging
+        auth_config.logger = @config.logger
+        auth_config.temp_folder_path = @config.temp_folder_path
+        auth_config.client_side_validation = @config.client_side_validation
+        auth_config.api_version = ''
+
+        auth_api_client = ApiClient.new(auth_config)
+
+        request_url = "/connect/token"
+        post_data = "grant_type=client_credentials&client_id=#{@config.app_sid}&client_secret=#{@config.app_key}"
+
+        data, _status_code, _header = auth_api_client.call_api(:POST, request_url, :body => post_data, :return_type => 'Object')
+        
+        @access_token = data[:access_token]
+
+        expires_in_seconds = data[:expires_in].to_i - 5 * 60 
+        expires_in_days = Rational(expires_in_seconds, 60 * 60 * 24)
+        @access_token_expires_at = DateTime.now + expires_in_days
+    end
+    
+    # requires all files inside a directory from current dir
+    # @param _dir can be relative path like '/lib' or "../lib"
+    private def require_all(_dir)
+      Dir[File.expand_path(File.join(File.dirname(File.absolute_path(__FILE__)), _dir)) + "/*.rb"].each do |file|
+        require file
+      end
+    end
+  end
+end

lib/groupdocs_annotation_cloud/models/annotation_info.rb

@@ -94,6 +94,9 @@ class AnnotationInfo
     # Gets or sets the annotation's background color 
     attr_accessor :background_color
 
+    # Gets or sets annotation color
+    attr_accessor :squiggly_color
+
     # Gets or sets the annotation's font family
     attr_accessor :font_family
 
@@ -114,6 +117,9 @@ class AnnotationInfo
 
     # Gets or sets image file path in cloud storage, for Image annotations
     attr_accessor :image_path
+
+    # Sets auto scale for watermark annotation
+    attr_accessor :auto_scale
     class EnumAttributeValidator
       attr_reader :datatype
       attr_reader :allowable_values
@@ -160,13 +166,15 @@ def self.attribute_map
         :'pen_width' => :'PenWidth',
         :'pen_style' => :'PenStyle',
         :'background_color' => :'BackgroundColor',
+        :'squiggly_color' => :'SquigglyColor',
         :'font_family' => :'FontFamily',
         :'font_size' => :'FontSize',
         :'opacity' => :'Opacity',
         :'angle' => :'Angle',
         :'z_index' => :'ZIndex',
         :'url' => :'Url',
-        :'image_path' => :'ImagePath'
+        :'image_path' => :'ImagePath',
+        :'auto_scale' => :'AutoScale'
       }
     end
 
@@ -194,13 +202,15 @@ def self.swagger_types
         :'pen_width' => :'Integer',
         :'pen_style' => :'String',
         :'background_color' => :'Integer',
+        :'squiggly_color' => :'Integer',
         :'font_family' => :'String',
         :'font_size' => :'Float',
         :'opacity' => :'Float',
         :'angle' => :'Float',
         :'z_index' => :'Integer',
         :'url' => :'String',
-        :'image_path' => :'String'
+        :'image_path' => :'String',
+        :'auto_scale' => :'BOOLEAN'
       }
     end
 
@@ -300,6 +310,10 @@ def initialize(attributes = {})
         self.background_color = attributes[:'BackgroundColor']
       end
 
+      if attributes.key?(:'SquigglyColor')
+        self.squiggly_color = attributes[:'SquigglyColor']
+      end
+
       if attributes.key?(:'FontFamily')
         self.font_family = attributes[:'FontFamily']
       end
@@ -328,6 +342,10 @@ def initialize(attributes = {})
         self.image_path = attributes[:'ImagePath']
       end
 
+      if attributes.key?(:'AutoScale')
+        self.auto_scale = attributes[:'AutoScale']
+      end
+
     end
 
     # Show invalid properties with the reasons. Usually used together with valid?
@@ -366,6 +384,10 @@ def list_invalid_properties
         invalid_properties.push("invalid value for 'z_index', z_index cannot be nil.")
       end
 
+      if @auto_scale.nil?
+        invalid_properties.push("invalid value for 'auto_scale', auto_scale cannot be nil.")
+      end
+
       return invalid_properties
     end
 
@@ -382,12 +404,13 @@ def valid?
       return false if @creator_id.nil?
       return false if @box.nil?
       return false if @type.nil?
-      type_validator = EnumAttributeValidator.new('String', ["None", "Area", "Arrow", "Distance", "Ellipse", "Link", "Point", "Polyline", "ResourcesRedaction", "TextField", "TextHighlight", "TextRedaction", "TextReplacement", "TextStrikeout", "TextUnderline", "Watermark", "Image"])
+      type_validator = EnumAttributeValidator.new('String', ["None", "Area", "Arrow", "Distance", "Ellipse", "Link", "Point", "Polyline", "ResourcesRedaction", "TextField", "TextHighlight", "TextRedaction", "TextReplacement", "TextStrikeout", "TextUnderline", "Watermark", "Image", "TextSquiggly"])
       return false unless type_validator.valid?(@type)
       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 false if @auto_scale.nil?
       return true
     end
 
@@ -424,7 +447,7 @@ def vertical_alignment=(vertical_alignment)
     # Custom attribute writer method checking allowed values (enum).
     # @param [Object] type Object to be assigned
     def type=(type)
-      validator = EnumAttributeValidator.new('String', ["None", "Area", "Arrow", "Distance", "Ellipse", "Link", "Point", "Polyline", "ResourcesRedaction", "TextField", "TextHighlight", "TextRedaction", "TextReplacement", "TextStrikeout", "TextUnderline", "Watermark", "Image"])
+      validator = EnumAttributeValidator.new('String', ["None", "Area", "Arrow", "Distance", "Ellipse", "Link", "Point", "Polyline", "ResourcesRedaction", "TextField", "TextHighlight", "TextRedaction", "TextReplacement", "TextStrikeout", "TextUnderline", "Watermark", "Image", "TextSquiggly"])
       if type.to_i == 0
         unless validator.valid?(type)
           # raise ArgumentError, "invalid value for 'type', must be one of #{validator.allowable_values}."
@@ -477,13 +500,15 @@ def ==(other)
           pen_width == other.pen_width &&
           pen_style == other.pen_style &&
           background_color == other.background_color &&
+          squiggly_color == other.squiggly_color &&
           font_family == other.font_family &&
           font_size == other.font_size &&
           opacity == other.opacity &&
           angle == other.angle &&
           z_index == other.z_index &&
           url == other.url &&
-          image_path == other.image_path
+          image_path == other.image_path &&
+          auto_scale == other.auto_scale
     end
 
     # @see the `==` method
@@ -495,7 +520,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, z_index, 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, squiggly_color, font_family, font_size, opacity, angle, z_index, url, image_path, auto_scale].hash
     end
 
     # Downcases first letter.