docspring 4.1.0 → 4.2.0

data/lib/docspring/models/template.rb

@@ -28,7 +28,7 @@ module DocSpring
     # `pdf`: fields placed on an uploaded PDF. `html`: a PDF rendered from HTML and SCSS. It can't be changed after the template is created.
     attr_accessor :template_type
 
-    # Whether the template can generate PDFs. HTML templates are always ready. A PDF template is ready once its document has been processed (`document.state` is `processed`).
+    # Whether the template can generate PDFs. HTML templates are always ready. A PDF template is ready once DocSpring has stored its PDF, made an image of each page and finished looking for fields on each page, which can be after `document.state` becomes `processed`. A PDF template with no PDF (`document` is null) isn't ready.
     attr_accessor :ready
 
     # The PDF of a PDF template. Null for HTML templates, and for a PDF template that has no PDF yet.
@@ -40,9 +40,6 @@ module DocSpring
     # The path of the folder the template is in, such as `/Contracts`. `/` for a template at the root.
     attr_accessor :path
 
-    # The published version this is, such as `1.2.0`. Null for the draft.
-    attr_accessor :version
-
     # The template's latest published version. Null if no version has been published.
     attr_accessor :latest_version
 
@@ -52,6 +49,18 @@ module DocSpring
     # A locked template can't be changed or deleted until it's unlocked (`locked` can always be changed).
     attr_accessor :locked
 
+    # When the draft was last changed.
+    attr_accessor :last_changed_at
+
+    # When the template was created.
+    attr_accessor :created_at
+
+    # When the template was last updated.
+    attr_accessor :updated_at
+
+    # The published version this is, such as `1.2.0`. Null for the draft.
+    attr_accessor :version
+
     # Print the submission ID in the footer of each page of PDFs signed through signature requests.
     attr_accessor :add_signature_request_submission_id_footers
 
@@ -70,7 +79,7 @@ module DocSpring
     # Generate PDFs whose text and check fields stay fillable ("Generate Editable PDFs"). A submission's `editable` overrides it.
     attr_accessor :editable_submissions
 
-    # The sites where the template's signature requests, forms and embedded template editor can be loaded: a host such as `app.example.com`, with an optional leading wildcard (`*.example.com`), port (`localhost:3000`) or scheme (`https://app.example.com`; without one, `http` and `https` both work). When it's empty, live signature requests don't load on any site, and the embedded template editor loads on every site.
+    # The sites that can embed the template's live signature requests and its embedded template editor: a host such as `app.example.com`, with an optional leading wildcard (`*.example.com`), port (`localhost:3000`) or scheme (`https://app.example.com`; without one, `http` and `https` both work). Browsers open a live signature request in a frame only on these sites (and DocSpring's), so with an empty list it can't be embedded anywhere; a test signature request can be embedded on any site. The embedded template editor loads only for a page on one of these sites (by its Referer or Origin header), and on any site when the list is empty. Forms embedded on a page (Visual Forms JS and the simple form) aren't restricted.
     attr_accessor :embed_domains
 
     # Allow the embedded template editor to change sensitive template settings (webhooks, redirect URL, encryption, public access, expiration and so on).
@@ -115,18 +124,9 @@ module DocSpring
     # Whether `slack_webhook_url` is set.
     attr_accessor :has_slack_webhook_url
 
-    # When the draft was last changed.
-    attr_accessor :last_changed_at
-
     # Who last changed the draft: a user in your account, an API token, or someone using the embedded template editor. Null if no change has been recorded.
     attr_accessor :last_changed_by
 
-    # When the template was created.
-    attr_accessor :created_at
-
-    # When the template was last updated.
-    attr_accessor :updated_at
-
     attr_accessor :defaults
 
     # Conditional logic: each rule shows or hides its target fields, or makes them required, depending on the values of other fields.
@@ -156,6 +156,9 @@ module DocSpring
     # How an HTML template's PDFs are printed. Null for PDF templates. Setting it replaces the whole object: options left out use their defaults.
     attr_accessor :html_engine_options
 
+    # Whether an HTML template HTML-escapes the values it prints. When true, `{{ value }}` prints a value as text, so a `<` or `&` in it is printed as that character, and `{{ value | raw }}` prints a value as HTML. New HTML templates default to true. Templates created before October 2026, or with API v1, default to false, which prints every value as HTML. Null for PDF templates.
+    attr_accessor :html_escape_data
+
     # The token that opens the template in the embedded template editor.
     attr_accessor :embed_edit_token
 
@@ -195,10 +198,13 @@ module DocSpring
         :'document' => :'document',
         :'parent_folder_id' => :'parent_folder_id',
         :'path' => :'path',
-        :'version' => :'version',
         :'latest_version' => :'latest_version',
         :'version_published_at' => :'version_published_at',
         :'locked' => :'locked',
+        :'last_changed_at' => :'last_changed_at',
+        :'created_at' => :'created_at',
+        :'updated_at' => :'updated_at',
+        :'version' => :'version',
         :'add_signature_request_submission_id_footers' => :'add_signature_request_submission_id_footers',
         :'ai_field_naming_language' => :'ai_field_naming_language',
         :'allow_additional_properties' => :'allow_additional_properties',
@@ -220,10 +226,7 @@ module DocSpring
         :'public_web_form' => :'public_web_form',
         :'redirect_url' => :'redirect_url',
         :'has_slack_webhook_url' => :'has_slack_webhook_url',
-        :'last_changed_at' => :'last_changed_at',
         :'last_changed_by' => :'last_changed_by',
-        :'created_at' => :'created_at',
-        :'updated_at' => :'updated_at',
         :'defaults' => :'defaults',
         :'field_dependencies' => :'field_dependencies',
         :'field_groups' => :'field_groups',
@@ -234,6 +237,7 @@ module DocSpring
         :'header_html' => :'header_html',
         :'footer_html' => :'footer_html',
         :'html_engine_options' => :'html_engine_options',
+        :'html_escape_data' => :'html_escape_data',
         :'embed_edit_token' => :'embed_edit_token',
         :'versions' => :'versions'
       }
@@ -260,10 +264,13 @@ module DocSpring
         :'document' => :'TemplateDocument',
         :'parent_folder_id' => :'String',
         :'path' => :'String',
-        :'version' => :'String',
         :'latest_version' => :'String',
         :'version_published_at' => :'Time',
         :'locked' => :'Boolean',
+        :'last_changed_at' => :'Time',
+        :'created_at' => :'Time',
+        :'updated_at' => :'Time',
+        :'version' => :'String',
         :'add_signature_request_submission_id_footers' => :'Boolean',
         :'ai_field_naming_language' => :'AiFieldNamingLanguage',
         :'allow_additional_properties' => :'Boolean',
@@ -285,10 +292,7 @@ module DocSpring
         :'public_web_form' => :'Boolean',
         :'redirect_url' => :'String',
         :'has_slack_webhook_url' => :'Boolean',
-        :'last_changed_at' => :'Time',
         :'last_changed_by' => :'TemplateActor',
-        :'created_at' => :'Time',
-        :'updated_at' => :'Time',
         :'defaults' => :'TemplateDefaults',
         :'field_dependencies' => :'Array<TemplateFieldDependency>',
         :'field_groups' => :'Array<FieldGroup>',
@@ -299,6 +303,7 @@ module DocSpring
         :'header_html' => :'String',
         :'footer_html' => :'String',
         :'html_engine_options' => :'HtmlEngineOptions',
+        :'html_escape_data' => :'Boolean',
         :'embed_edit_token' => :'String',
         :'versions' => :'Array<TemplateVersion>'
       }
@@ -311,12 +316,12 @@ module DocSpring
         :'description',
         :'document',
         :'parent_folder_id',
-        :'version',
         :'latest_version',
         :'version_published_at',
+        :'last_changed_at',
+        :'version',
         :'ai_field_naming_language',
         :'redirect_url',
-        :'last_changed_at',
         :'last_changed_by',
         :'predefined_fields_sample_data',
         :'html',
@@ -324,6 +329,7 @@ module DocSpring
         :'header_html',
         :'footer_html',
         :'html_engine_options',
+        :'html_escape_data',
         :'embed_edit_token',
       ])
     end
@@ -402,12 +408,6 @@ module DocSpring
         self.path = nil
       end
 
-      if attributes.key?(:'version')
-        self.version = attributes[:'version']
-      else
-        self.version = nil
-      end
-
       if attributes.key?(:'latest_version')
         self.latest_version = attributes[:'latest_version']
       else
@@ -426,6 +426,30 @@ module DocSpring
         self.locked = nil
       end
 
+      if attributes.key?(:'last_changed_at')
+        self.last_changed_at = attributes[:'last_changed_at']
+      else
+        self.last_changed_at = nil
+      end
+
+      if attributes.key?(:'created_at')
+        self.created_at = attributes[:'created_at']
+      else
+        self.created_at = nil
+      end
+
+      if attributes.key?(:'updated_at')
+        self.updated_at = attributes[:'updated_at']
+      else
+        self.updated_at = nil
+      end
+
+      if attributes.key?(:'version')
+        self.version = attributes[:'version']
+      else
+        self.version = nil
+      end
+
       if attributes.key?(:'add_signature_request_submission_id_footers')
         self.add_signature_request_submission_id_footers = attributes[:'add_signature_request_submission_id_footers']
       else
@@ -554,30 +578,12 @@ module DocSpring
         self.has_slack_webhook_url = nil
       end
 
-      if attributes.key?(:'last_changed_at')
-        self.last_changed_at = attributes[:'last_changed_at']
-      else
-        self.last_changed_at = nil
-      end
-
       if attributes.key?(:'last_changed_by')
         self.last_changed_by = attributes[:'last_changed_by']
       else
         self.last_changed_by = nil
       end
 
-      if attributes.key?(:'created_at')
-        self.created_at = attributes[:'created_at']
-      else
-        self.created_at = nil
-      end
-
-      if attributes.key?(:'updated_at')
-        self.updated_at = attributes[:'updated_at']
-      else
-        self.updated_at = nil
-      end
-
       if attributes.key?(:'defaults')
         self.defaults = attributes[:'defaults']
       else
@@ -646,6 +652,12 @@ module DocSpring
         self.html_engine_options = nil
       end
 
+      if attributes.key?(:'html_escape_data')
+        self.html_escape_data = attributes[:'html_escape_data']
+      else
+        self.html_escape_data = nil
+      end
+
       if attributes.key?(:'embed_edit_token')
         self.embed_edit_token = attributes[:'embed_edit_token']
       else
@@ -686,6 +698,14 @@ module DocSpring
         invalid_properties.push('invalid value for "locked", locked cannot be nil.')
       end
 
+      if @created_at.nil?
+        invalid_properties.push('invalid value for "created_at", created_at cannot be nil.')
+      end
+
+      if @updated_at.nil?
+        invalid_properties.push('invalid value for "updated_at", updated_at cannot be nil.')
+      end
+
       if @add_signature_request_submission_id_footers.nil?
         invalid_properties.push('invalid value for "add_signature_request_submission_id_footers", add_signature_request_submission_id_footers cannot be nil.')
       end
@@ -762,14 +782,6 @@ module DocSpring
         invalid_properties.push('invalid value for "has_slack_webhook_url", has_slack_webhook_url cannot be nil.')
       end
 
-      if @created_at.nil?
-        invalid_properties.push('invalid value for "created_at", created_at cannot be nil.')
-      end
-
-      if @updated_at.nil?
-        invalid_properties.push('invalid value for "updated_at", updated_at cannot be nil.')
-      end
-
       if @defaults.nil?
         invalid_properties.push('invalid value for "defaults", defaults cannot be nil.')
       end
@@ -802,6 +814,8 @@ module DocSpring
       return false if @ready.nil?
       return false if @path.nil?
       return false if @locked.nil?
+      return false if @created_at.nil?
+      return false if @updated_at.nil?
       return false if @add_signature_request_submission_id_footers.nil?
       return false if @allow_additional_properties.nil?
       return false if @allow_skipping_optional_fields.nil?
@@ -821,8 +835,6 @@ module DocSpring
       return false if @public_submissions.nil?
       return false if @public_web_form.nil?
       return false if @has_slack_webhook_url.nil?
-      return false if @created_at.nil?
-      return false if @updated_at.nil?
       return false if @defaults.nil?
       return false if @field_dependencies.nil?
       return false if @field_groups.nil?
@@ -881,6 +893,26 @@ module DocSpring
       @locked = locked
     end
 
+    # Custom attribute writer method with validation
+    # @param [Object] created_at Value to be assigned
+    def created_at=(created_at)
+      if created_at.nil?
+        fail ArgumentError, 'created_at cannot be nil'
+      end
+
+      @created_at = created_at
+    end
+
+    # Custom attribute writer method with validation
+    # @param [Object] updated_at Value to be assigned
+    def updated_at=(updated_at)
+      if updated_at.nil?
+        fail ArgumentError, 'updated_at cannot be nil'
+      end
+
+      @updated_at = updated_at
+    end
+
     # Custom attribute writer method with validation
     # @param [Object] add_signature_request_submission_id_footers Value to be assigned
     def add_signature_request_submission_id_footers=(add_signature_request_submission_id_footers)
@@ -1071,26 +1103,6 @@ module DocSpring
       @has_slack_webhook_url = has_slack_webhook_url
     end
 
-    # Custom attribute writer method with validation
-    # @param [Object] created_at Value to be assigned
-    def created_at=(created_at)
-      if created_at.nil?
-        fail ArgumentError, 'created_at cannot be nil'
-      end
-
-      @created_at = created_at
-    end
-
-    # Custom attribute writer method with validation
-    # @param [Object] updated_at Value to be assigned
-    def updated_at=(updated_at)
-      if updated_at.nil?
-        fail ArgumentError, 'updated_at cannot be nil'
-      end
-
-      @updated_at = updated_at
-    end
-
     # Custom attribute writer method with validation
     # @param [Object] defaults Value to be assigned
     def defaults=(defaults)
@@ -1154,10 +1166,13 @@ module DocSpring
           document == o.document &&
           parent_folder_id == o.parent_folder_id &&
           path == o.path &&
-          version == o.version &&
           latest_version == o.latest_version &&
           version_published_at == o.version_published_at &&
           locked == o.locked &&
+          last_changed_at == o.last_changed_at &&
+          created_at == o.created_at &&
+          updated_at == o.updated_at &&
+          version == o.version &&
           add_signature_request_submission_id_footers == o.add_signature_request_submission_id_footers &&
           ai_field_naming_language == o.ai_field_naming_language &&
           allow_additional_properties == o.allow_additional_properties &&
@@ -1179,10 +1194,7 @@ module DocSpring
           public_web_form == o.public_web_form &&
           redirect_url == o.redirect_url &&
           has_slack_webhook_url == o.has_slack_webhook_url &&
-          last_changed_at == o.last_changed_at &&
           last_changed_by == o.last_changed_by &&
-          created_at == o.created_at &&
-          updated_at == o.updated_at &&
           defaults == o.defaults &&
           field_dependencies == o.field_dependencies &&
           field_groups == o.field_groups &&
@@ -1193,6 +1205,7 @@ module DocSpring
           header_html == o.header_html &&
           footer_html == o.footer_html &&
           html_engine_options == o.html_engine_options &&
+          html_escape_data == o.html_escape_data &&
           embed_edit_token == o.embed_edit_token &&
           versions == o.versions
     end
@@ -1206,7 +1219,7 @@ module DocSpring
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [id, name, description, template_type, ready, document, parent_folder_id, path, version, latest_version, version_published_at, locked, add_signature_request_submission_id_footers, ai_field_naming_language, allow_additional_properties, allow_skipping_optional_fields, default_form_mode, editable_submissions, embed_domains, embed_edit_allow_settings, embed_edit_allow_versioning, embed_edit_allow_document_replacement, encrypt_pdfs, has_encrypt_pdfs_password, expire_submissions, expire_after, expiration_interval, merge_audit_trail_pdf, parse_dates_using_template_date_format, public_submissions, public_web_form, redirect_url, has_slack_webhook_url, last_changed_at, last_changed_by, created_at, updated_at, defaults, field_dependencies, field_groups, predefined_fields, predefined_fields_sample_data, html, scss, header_html, footer_html, html_engine_options, embed_edit_token, versions].hash
+      [id, name, description, template_type, ready, document, parent_folder_id, path, latest_version, version_published_at, locked, last_changed_at, created_at, updated_at, version, add_signature_request_submission_id_footers, ai_field_naming_language, allow_additional_properties, allow_skipping_optional_fields, default_form_mode, editable_submissions, embed_domains, embed_edit_allow_settings, embed_edit_allow_versioning, embed_edit_allow_document_replacement, encrypt_pdfs, has_encrypt_pdfs_password, expire_submissions, expire_after, expiration_interval, merge_audit_trail_pdf, parse_dates_using_template_date_format, public_submissions, public_web_form, redirect_url, has_slack_webhook_url, last_changed_by, defaults, field_dependencies, field_groups, predefined_fields, predefined_fields_sample_data, html, scss, header_html, footer_html, html_engine_options, html_escape_data, embed_edit_token, versions].hash
     end
 
     # Builds the object from hash

data/lib/docspring/models/template_actor.rb

@@ -16,7 +16,7 @@ require 'time'
 module DocSpring
   # A user in your account, an API token, or someone using the embedded template editor.
   class TemplateActor < ApiModelBase
-    # `user`: a user in your account. `api`: an API token. `external_user`: someone using the embedded template editor, as identified by your app.
+    # `user`: a user in your account, also when they make the change with an app they connected (an OAuth access token). `api`: an API token. `external_user`: someone using the embedded template editor, as identified by your app.
     attr_accessor :type
 
     # The user's ID, for `user`.

data/lib/docspring/models/template_document.rb

@@ -19,21 +19,21 @@ module DocSpring
     # The PDF's file name. Null until a `document_url` has been downloaded.
     attr_accessor :filename
 
-    # The MD5 hash of the PDF.
-    attr_accessor :md5
-
-    # `pending` while DocSpring processes the PDF, then `processed`. `password_required`, `malformed_pdf` and `unknown_error` mean the PDF couldn't be processed, and `error_message` says why: upload it again or upload another one. `downloading` while DocSpring downloads a `document_url`, then as for an upload. `download_failed` means it couldn't be downloaded, and `error_message` says why. A template keeps its PDF while a new one is downloaded, and when it couldn't be.
+    # `pending` while DocSpring processes the PDF, then `processed` (`ready` says when its pages are done too). `password_required`, `malformed_pdf` and `unknown_error` mean the PDF couldn't be processed, and `error_message` says why: upload it again or upload another one. `downloading` while DocSpring downloads a `document_url`, then as for an upload. `download_failed` means it couldn't be downloaded, and `error_message` says why. A template keeps its PDF while a new one is downloaded, and when it couldn't be.
     attr_accessor :state
 
     # Why the PDF couldn't be processed or downloaded, and how to fix it. Null unless `state` is an error.
     attr_accessor :error_message
 
-    # Whether the fields are being re-imported from this PDF (`reimport_fields` when the PDF was replaced): `requested` while DocSpring processes the PDF, then `imported`, or `no_fields` when the PDF had no fillable fields and the template kept its fields. `none` when no re-import was asked for, or when it couldn't run (the PDF couldn't be processed, or the template was locked or published while it was).
-    attr_accessor :field_reimport_state
-
     # 0 until the PDF has been processed.
     attr_accessor :page_count
 
+    # The MD5 hash of the PDF.
+    attr_accessor :md5
+
+    # Whether the fields are being re-imported from this PDF (`reimport_fields` when the PDF was replaced): `requested` while DocSpring processes the PDF, then `imported`, or `no_fields` when the PDF had no fillable fields and the template kept its fields. `none` when no re-import was asked for, or when it couldn't run (the PDF couldn't be processed, or the template was locked or published while it was).
+    attr_accessor :field_reimport_state
+
     # Each page's width and height in PDF points. Null until the PDF has been processed.
     attr_accessor :page_dimensions
 
@@ -78,11 +78,11 @@ module DocSpring
     def self.attribute_map
       {
         :'filename' => :'filename',
-        :'md5' => :'md5',
         :'state' => :'state',
         :'error_message' => :'error_message',
-        :'field_reimport_state' => :'field_reimport_state',
         :'page_count' => :'page_count',
+        :'md5' => :'md5',
+        :'field_reimport_state' => :'field_reimport_state',
         :'page_dimensions' => :'page_dimensions',
         :'has_fillable_fields' => :'has_fillable_fields',
         :'page_processing_statuses' => :'page_processing_statuses',
@@ -106,11 +106,11 @@ module DocSpring
     def self.openapi_types
       {
         :'filename' => :'String',
-        :'md5' => :'String',
         :'state' => :'TemplateDocumentState',
         :'error_message' => :'String',
-        :'field_reimport_state' => :'FieldReimportState',
         :'page_count' => :'Integer',
+        :'md5' => :'String',
+        :'field_reimport_state' => :'FieldReimportState',
         :'page_dimensions' => :'Array<Array<Float>>',
         :'has_fillable_fields' => :'Boolean',
         :'page_processing_statuses' => :'Array<TemplatePageProcessingStatus>',
@@ -124,8 +124,8 @@ module DocSpring
     def self.openapi_nullable
       Set.new([
         :'filename',
-        :'md5',
         :'error_message',
+        :'md5',
         :'page_dimensions',
         :'has_fillable_fields',
         :'field_logic_status',
@@ -166,12 +166,6 @@ module DocSpring
         self.filename = nil
       end
 
-      if attributes.key?(:'md5')
-        self.md5 = attributes[:'md5']
-      else
-        self.md5 = nil
-      end
-
       if attributes.key?(:'state')
         self.state = attributes[:'state']
       else
@@ -184,18 +178,24 @@ module DocSpring
         self.error_message = nil
       end
 
-      if attributes.key?(:'field_reimport_state')
-        self.field_reimport_state = attributes[:'field_reimport_state']
-      else
-        self.field_reimport_state = nil
-      end
-
       if attributes.key?(:'page_count')
         self.page_count = attributes[:'page_count']
       else
         self.page_count = nil
       end
 
+      if attributes.key?(:'md5')
+        self.md5 = attributes[:'md5']
+      else
+        self.md5 = nil
+      end
+
+      if attributes.key?(:'field_reimport_state')
+        self.field_reimport_state = attributes[:'field_reimport_state']
+      else
+        self.field_reimport_state = nil
+      end
+
       if attributes.key?(:'page_dimensions')
         if (value = attributes[:'page_dimensions']).is_a?(Array) || value.nil?
           self.page_dimensions = value
@@ -246,14 +246,14 @@ module DocSpring
         invalid_properties.push('invalid value for "state", state cannot be nil.')
       end
 
-      if @field_reimport_state.nil?
-        invalid_properties.push('invalid value for "field_reimport_state", field_reimport_state cannot be nil.')
-      end
-
       if @page_count.nil?
         invalid_properties.push('invalid value for "page_count", page_count cannot be nil.')
       end
 
+      if @field_reimport_state.nil?
+        invalid_properties.push('invalid value for "field_reimport_state", field_reimport_state cannot be nil.')
+      end
+
       if @page_processing_statuses.nil?
         invalid_properties.push('invalid value for "page_processing_statuses", page_processing_statuses cannot be nil.')
       end
@@ -266,8 +266,8 @@ module DocSpring
     def valid?
       warn '[DEPRECATED] the `valid?` method is obsolete'
       return false if @state.nil?
-      return false if @field_reimport_state.nil?
       return false if @page_count.nil?
+      return false if @field_reimport_state.nil?
       return false if @page_processing_statuses.nil?
       true
     end
@@ -282,16 +282,6 @@ module DocSpring
       @state = state
     end
 
-    # Custom attribute writer method with validation
-    # @param [Object] field_reimport_state Value to be assigned
-    def field_reimport_state=(field_reimport_state)
-      if field_reimport_state.nil?
-        fail ArgumentError, 'field_reimport_state cannot be nil'
-      end
-
-      @field_reimport_state = field_reimport_state
-    end
-
     # Custom attribute writer method with validation
     # @param [Object] page_count Value to be assigned
     def page_count=(page_count)
@@ -302,6 +292,16 @@ module DocSpring
       @page_count = page_count
     end
 
+    # Custom attribute writer method with validation
+    # @param [Object] field_reimport_state Value to be assigned
+    def field_reimport_state=(field_reimport_state)
+      if field_reimport_state.nil?
+        fail ArgumentError, 'field_reimport_state cannot be nil'
+      end
+
+      @field_reimport_state = field_reimport_state
+    end
+
     # Custom attribute writer method with validation
     # @param [Object] page_processing_statuses Value to be assigned
     def page_processing_statuses=(page_processing_statuses)
@@ -318,11 +318,11 @@ module DocSpring
       return true if self.equal?(o)
       self.class == o.class &&
           filename == o.filename &&
-          md5 == o.md5 &&
           state == o.state &&
           error_message == o.error_message &&
-          field_reimport_state == o.field_reimport_state &&
           page_count == o.page_count &&
+          md5 == o.md5 &&
+          field_reimport_state == o.field_reimport_state &&
           page_dimensions == o.page_dimensions &&
           has_fillable_fields == o.has_fillable_fields &&
           page_processing_statuses == o.page_processing_statuses &&
@@ -340,7 +340,7 @@ module DocSpring
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [filename, md5, state, error_message, field_reimport_state, page_count, page_dimensions, has_fillable_fields, page_processing_statuses, field_logic_status, download_url, permanent_url].hash
+      [filename, state, error_message, page_count, md5, field_reimport_state, page_dimensions, has_fillable_fields, page_processing_statuses, field_logic_status, download_url, permanent_url].hash
     end
 
     # Builds the object from hash