groupdocs_comparison_cloud 18.9 → 19.5

data/lib/groupdocs_comparison_cloud/api_client.rb

@@ -1,6 +1,6 @@
 # -----------------------------------------------------------------------------------
 # <copyright company="Aspose Pty Ltd" file="api_client.rb">
-#   Copyright (c) 2003-2018 Aspose Pty Ltd
+#   Copyright (c) 2003-2019 Aspose Pty Ltd
 # </copyright>
 # <summary>
 #  Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -51,7 +51,7 @@ module GroupDocsComparisonCloud
     def initialize(config)
       @config = config
       @default_headers = {
-        'Content-Type' => "application/json",
+        'Content-Type' => config.api_version == '' ? "application/x-www-form-urlencoded" : "application/json",
         'x-groupdocs-client' => "ruby sdk",
         'x-groupdocs-version' => GroupDocsComparisonCloud::VERSION.to_s
       }
@@ -69,18 +69,8 @@ module GroupDocsComparisonCloud
       end
 
       unless response.success?
-        if response.status == 0
-          # Errors from libcurl will be made visible here
-          raise ApiError.new(:code => 0,
-                            :message => response.reason_phrase)
-        else
-          raise ApiError.new(:code => response.status,
-                            :response_headers => response.headers,
-                            :response_body => response.body),
-               response.reason_phrase
-        end
+        raise ApiError.new(:code => response.status, :response_body => response.body)
       end
-
       
       data = deserialize(response, opts[:return_type]) if opts[:return_type]
       [data, response.status, response.headers]
@@ -250,7 +240,7 @@ module GroupDocsComparisonCloud
       encoding = response.body.encoding
       tempfile = Tempfile.open(prefix, @config.temp_folder_path, encoding: encoding)
       @tempfile = tempfile
-      IO.binwrite(tempfile, response.body)
+      tempfile.write(response.body)
       response.on_complete do |resp|
         tempfile.close
         @config.logger.info "Temp file written to #{tempfile.path}, please copy the file to a proper folder "\
@@ -283,7 +273,9 @@ module GroupDocsComparisonCloud
     # @return [String] HTTP body data in the form of string
     def build_request_body(header_params, form_params, body)
       # http form
-      if header_params['Content-Type'] == 'application/x-www-form-urlencoded' ||
+      if body
+        data = body.is_a?(String) ? body : body.to_json      
+      elsif header_params['Content-Type'] == 'application/x-www-form-urlencoded' ||
           header_params['Content-Type'] == 'multipart/form-data'
         data = {}
         form_params.each do |key, value|
@@ -296,8 +288,6 @@ module GroupDocsComparisonCloud
             data[key] = value.to_s
           end
         end
-      elsif body
-        data = body.is_a?(String) ? body : body.to_json
       else
         data = nil
       end

data/lib/groupdocs_comparison_cloud/api_error.rb

@@ -1,6 +1,6 @@
 # -----------------------------------------------------------------------------------
 # <copyright company="Aspose Pty Ltd" file="api_error.rb">
-#   Copyright (c) 2003-2018 Aspose Pty Ltd
+#   Copyright (c) 2003-2019 Aspose Pty Ltd
 # </copyright>
 # <summary>
 #  Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -40,12 +40,14 @@ module GroupDocsComparisonCloud
         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][:message]
+            @message = data[:error]
+          elsif !data.nil? && !data[:Error].nil? && !data[:Error][:Message].nil? then
+            @message = data[:Error][:Message]
           end
         end
 
         if arg.key?(:arg) then
-          @code = arg[:code]
+          @code = arg[:Code]
         end
         
       else

data/lib/groupdocs_comparison_cloud/configuration.rb

@@ -1,6 +1,6 @@
 # ------------------------------------------------------------------------------------
 # <copyright company="Aspose Pty Ltd" file="configuration.rb">
-#   Copyright (c) 2003-2018 Aspose Pty Ltd
+#   Copyright (c) 2003-2019 Aspose Pty Ltd
 # </copyright>
 # <summary>
 #  Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -34,7 +34,7 @@ module GroupDocsComparisonCloud
     # @return [String] Api base url
     attr_accessor :api_base_url
 
-    # Api version, default is '/v1'
+    # Api version, default is '/v2.0'
     #
     # @return [String] Api version
     attr_accessor :api_version
@@ -81,7 +81,7 @@ module GroupDocsComparisonCloud
     # @return [Configuration] New instance of Configuration
     def initialize(app_sid, app_key)
       @api_base_url = "https://api.groupdocs.cloud"
-      @api_version = '/v1'
+      @api_version = '/v2.0'
       @app_sid = app_sid
       @app_key = app_key
       @client_side_validation = true

data/lib/groupdocs_comparison_cloud/models/{comparison_change.rb → change_info.rb}

@@ -1,7 +1,7 @@
  #
  # --------------------------------------------------------------------------------------------------------------------
- # <copyright company="Aspose Pty Ltd" file="comparison_change.rb">
- #   Copyright (c) 2003-2018 Aspose Pty Ltd
+ # <copyright company="Aspose Pty Ltd" file="change_info.rb">
+ #   Copyright (c) 2003-2019 Aspose Pty Ltd
  # </copyright>
  # <summary>
  #  Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -28,36 +28,36 @@
 require 'date'
 
 module GroupDocsComparisonCloud
-  # ComparisonChange dto
-  class ComparisonChange
+  # ChangeInfo Object fields
+  class ChangeInfo
 
-    # The identifier
+    # Id of change
     attr_accessor :id
 
-    # The type change
-    attr_accessor :type
+    # Action (accept or reject). This field shows comparison what to do with this change
+    attr_accessor :comparison_action
 
-    # The text
+    # Type of change (Inserted, Deleted or StyleChanged)
+    attr_accessor :comparison_type_changed
+
+    # Text of changed element
     attr_accessor :text
 
-    # The authors
+    # Array of authors who made this change (used for multi comparison)
     attr_accessor :authors
 
-    # The action
-    attr_accessor :action
-
-    # The style changes
-    attr_accessor :style_changes
+    # Array of style changes
+    attr_accessor :style_change_info
 
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
-        :'id' => :'id',
-        :'type' => :'type',
-        :'text' => :'text',
-        :'authors' => :'authors',
-        :'action' => :'action',
-        :'style_changes' => :'styleChanges'
+        :'id' => :'Id',
+        :'comparison_action' => :'ComparisonAction',
+        :'comparison_type_changed' => :'ComparisonTypeChanged',
+        :'text' => :'Text',
+        :'authors' => :'Authors',
+        :'style_change_info' => :'StyleChangeInfo'
       }
     end
 
@@ -65,11 +65,11 @@ module GroupDocsComparisonCloud
     def self.swagger_types
       {
         :'id' => :'Integer',
-        :'type' => :'String',
+        :'comparison_action' => :'String',
+        :'comparison_type_changed' => :'String',
         :'text' => :'String',
         :'authors' => :'Array<String>',
-        :'action' => :'String',
-        :'style_changes' => :'Array<ComparisonStyleChange>'
+        :'style_change_info' => :'Array<StyleChangeInfo>'
       }
     end
 
@@ -81,31 +81,31 @@ module GroupDocsComparisonCloud
       # convert string to symbol for hash key
       attributes = attributes.each_with_object({}) { |(k, v), h| h[k.to_sym] = v }
 
-      if attributes.key?(:'id')
-        self.id = attributes[:'id']
+      if attributes.key?(:'Id')
+        self.id = attributes[:'Id']
       end
 
-      if attributes.key?(:'type')
-        self.type = attributes[:'type']
+      if attributes.key?(:'ComparisonAction')
+        self.comparison_action = attributes[:'ComparisonAction']
       end
 
-      if attributes.key?(:'text')
-        self.text = attributes[:'text']
+      if attributes.key?(:'ComparisonTypeChanged')
+        self.comparison_type_changed = attributes[:'ComparisonTypeChanged']
       end
 
-      if attributes.key?(:'authors')
-        if (value = attributes[:'authors']).is_a?(Array)
-          self.authors = value
-        end
+      if attributes.key?(:'Text')
+        self.text = attributes[:'Text']
       end
 
-      if attributes.key?(:'action')
-        self.action = attributes[:'action']
+      if attributes.key?(:'Authors')
+        if (value = attributes[:'Authors']).is_a?(Array)
+          self.authors = value
+        end
       end
 
-      if attributes.key?(:'styleChanges')
-        if (value = attributes[:'styleChanges']).is_a?(Array)
-          self.style_changes = value
+      if attributes.key?(:'StyleChangeInfo')
+        if (value = attributes[:'StyleChangeInfo']).is_a?(Array)
+          self.style_change_info = value
         end
       end
 
@@ -135,11 +135,11 @@ module GroupDocsComparisonCloud
       return true if self.equal?(other)
       self.class == other.class &&
           id == other.id &&
-          type == other.type &&
+          comparison_action == other.comparison_action &&
+          comparison_type_changed == other.comparison_type_changed &&
           text == other.text &&
           authors == other.authors &&
-          action == other.action &&
-          style_changes == other.style_changes
+          style_change_info == other.style_change_info
     end
 
     # @see the `==` method
@@ -151,7 +151,13 @@ module GroupDocsComparisonCloud
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [id, type, text, authors, action, style_changes].hash
+      [id, comparison_action, comparison_type_changed, text, authors, style_change_info].hash
+    end
+
+    # Downcases first letter.
+    # @return downcased string
+    def uncap(str)
+      str[0, 1].downcase + str[1..-1]
     end
 
     # Builds the object from hash
@@ -160,14 +166,16 @@ module GroupDocsComparisonCloud
     def build_from_hash(attributes)
       return nil unless attributes.is_a?(Hash)
       self.class.swagger_types.each_pair do |key, type|
+        pname = uncap(self.class.attribute_map[key]).intern
+        value = attributes[pname]
         if type =~ /\AArray<(.*)>/i
           # check to ensure the input is an array given that the the attribute
-          # is documented as an array but the input is not
-          if attributes[self.class.attribute_map[key]].is_a?(Array)
-            self.send("#{key}=", attributes[self.class.attribute_map[key]].map { |v| _deserialize($1, v) })
+          # is documented as an array but the input is not                    
+          if value.is_a?(Array)
+            self.send("#{key}=", value.map { |v| _deserialize($1, v) })
           end
-        elsif !attributes[self.class.attribute_map[key]].nil?
-          self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]]))
+        elsif !value.nil?
+          self.send("#{key}=", _deserialize(type, value))
         end
         # or else data not found in attributes(hash), not an issue as the data can be optional
       end
@@ -182,9 +190,9 @@ module GroupDocsComparisonCloud
     def _deserialize(type, value)
       case type.to_sym
       when :DateTime
-        Time.at(/\d/.match(value)[0].to_f).to_datetime
+        Date.parse value
       when :Date
-        Time.at(/\d/.match(value)[0].to_f).to_date
+        Date.parse value
       when :String
         value.to_s
       when :Integer

data/lib/groupdocs_comparison_cloud/models/diagram_master_setting.rb

@@ -0,0 +1,259 @@
+ #
+ # --------------------------------------------------------------------------------------------------------------------
+ # <copyright company="Aspose Pty Ltd" file="diagram_master_setting.rb">
+ #   Copyright (c) 2003-2019 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 'date'
+
+module GroupDocsComparisonCloud
+  # DiagramMasterSetting Object fields
+  class DiagramMasterSetting
+
+    # Path to custom master path
+    attr_accessor :master_path
+
+    # Value of using master from source and target document together
+    attr_accessor :use_source_master
+
+    # Width of original document
+    attr_accessor :width
+
+    # Height of original document
+    attr_accessor :height
+
+    # Attribute mapping from ruby-style variable name to JSON key.
+    def self.attribute_map
+      {
+        :'master_path' => :'MasterPath',
+        :'use_source_master' => :'UseSourceMaster',
+        :'width' => :'Width',
+        :'height' => :'Height'
+      }
+    end
+
+    # Attribute type mapping.
+    def self.swagger_types
+      {
+        :'master_path' => :'String',
+        :'use_source_master' => :'BOOLEAN',
+        :'width' => :'Integer',
+        :'height' => :'Integer'
+      }
+    end
+
+    # Initializes the object
+    # @param [Hash] attributes Model attributes in the form of hash
+    def initialize(attributes = {})
+      return unless attributes.is_a?(Hash)
+
+      # convert string to symbol for hash key
+      attributes = attributes.each_with_object({}) { |(k, v), h| h[k.to_sym] = v }
+
+      if attributes.key?(:'MasterPath')
+        self.master_path = attributes[:'MasterPath']
+      end
+
+      if attributes.key?(:'UseSourceMaster')
+        self.use_source_master = attributes[:'UseSourceMaster']
+      end
+
+      if attributes.key?(:'Width')
+        self.width = attributes[:'Width']
+      end
+
+      if attributes.key?(:'Height')
+        self.height = attributes[:'Height']
+      end
+
+    end
+
+    # Show invalid properties with the reasons. Usually used together with valid?
+    # @return Array for valid properies with the reasons
+    def list_invalid_properties
+      invalid_properties = []
+      if @use_source_master.nil?
+        invalid_properties.push("invalid value for 'use_source_master', use_source_master 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
+
+      return invalid_properties
+    end
+
+    # Check to see if the all the properties in the model are valid
+    # @return true if the model is valid
+    def valid?
+      return false if @use_source_master.nil?
+      return false if @width.nil?
+      return false if @height.nil?
+      return true
+    end
+
+    # Checks equality by comparing each attribute.
+    # @param [Object] Object to be compared
+    def ==(other)
+      return true if self.equal?(other)
+      self.class == other.class &&
+          master_path == other.master_path &&
+          use_source_master == other.use_source_master &&
+          width == other.width &&
+          height == other.height
+    end
+
+    # @see the `==` method
+    # @param [Object] Object to be compared
+    def eql?(other)
+      self == other
+    end
+
+    # Calculates hash code according to all attributes.
+    # @return [Fixnum] Hash code
+    def hash
+      [master_path, use_source_master, width, height].hash
+    end
+
+    # Downcases first letter.
+    # @return downcased string
+    def uncap(str)
+      str[0, 1].downcase + str[1..-1]
+    end
+
+    # Builds the object from hash
+    # @param [Hash] attributes Model attributes in the form of hash
+    # @return [Object] Returns the model itself
+    def build_from_hash(attributes)
+      return nil unless attributes.is_a?(Hash)
+      self.class.swagger_types.each_pair do |key, type|
+        pname = uncap(self.class.attribute_map[key]).intern
+        value = attributes[pname]
+        if type =~ /\AArray<(.*)>/i
+          # check to ensure the input is an array given that the the attribute
+          # is documented as an array but the input is not                    
+          if value.is_a?(Array)
+            self.send("#{key}=", value.map { |v| _deserialize($1, v) })
+          end
+        elsif !value.nil?
+          self.send("#{key}=", _deserialize(type, value))
+        end
+        # or else data not found in attributes(hash), not an issue as the data can be optional
+      end
+
+      self
+    end
+
+    # Deserializes the data based on type
+    # @param string type Data type
+    # @param string value Value to be deserialized
+    # @return [Object] Deserialized data
+    def _deserialize(type, value)
+      case type.to_sym
+      when :DateTime
+        Date.parse value
+      when :Date
+        Date.parse value
+      when :String
+        value.to_s
+      when :Integer
+        value.to_i
+      when :Float
+        value.to_f
+      when :BOOLEAN
+        if value.to_s =~ /\A(true|t|yes|y|1)\z/i
+          true
+        else
+          false
+        end
+      when :Object
+        # generic object (usually a Hash), return directly
+        value
+      when /\AArray<(?<inner_type>.+)>\z/
+        inner_type = Regexp.last_match[:inner_type]
+        value.map { |v| _deserialize(inner_type, v) }
+      when /\AHash<(?<k_type>.+?), (?<v_type>.+)>\z/
+        k_type = Regexp.last_match[:k_type]
+        v_type = Regexp.last_match[:v_type]
+        {}.tap do |hash|
+          value.each do |k, v|
+            hash[_deserialize(k_type, k)] = _deserialize(v_type, v)
+          end
+        end
+      else
+      # model
+        temp_model = GroupDocsComparisonCloud.const_get(type).new
+        temp_model.build_from_hash(value)
+      end
+    end
+
+    # Returns the string representation of the object
+    # @return [String] String presentation of the object
+    def to_s
+      to_hash.to_s
+    end
+
+    # to_body is an alias to to_hash (backward compatibility)
+    # @return [Hash] Returns the object in the form of hash
+    def to_body
+      to_hash
+    end
+
+    # Returns the object in the form of hash
+    # @return [Hash] Returns the object in the form of hash
+    def to_hash
+      hash = {}
+      self.class.attribute_map.each_pair do |attr, param|
+        value = self.send(attr)
+        next if value.nil?
+        hash[param] = _to_hash(value)
+      end
+      hash
+    end
+
+    # Outputs non-array value in the form of hash
+    # For object, use to_hash. Otherwise, just return the value
+    # @param [Object] value Any valid value
+    # @return [Hash] Returns the value in the form of hash
+    def _to_hash(value)
+      if value.is_a?(Array)
+        value.compact.map { |v| _to_hash(v) }
+      elsif value.is_a?(Hash)
+        {}.tap do |hash|
+          value.each { |k, v| hash[k] = _to_hash(v) }
+        end
+      elsif value.respond_to? :to_hash
+        value.to_hash
+      else
+        value
+      end
+    end
+
+  end
+
+end