files.com 1.1.767 → 1.1.769

data/lib/files.com/list.rb

@@ -1,97 +1,129 @@
+require "set"
+
 module Files
+  # A page of results from a list operation, such as Files::User.list.
+  #
+  # +each+, and every other Enumerable method, covers the records on this page.
+  # +auto_paging_each+ continues through the pages that follow, requesting each
+  # one only when iteration reaches it. To move through a list one page at a
+  # time, use +has_next_page?+ and +next_page+:
+  #
+  #   page = Files::User.list(per_page: 100)
+  #   loop do
+  #     page.each { |user| puts user.username }
+  #     break unless page.has_next_page?
+  #
+  #     page = page.next_page
+  #   end
+  #
+  # A list operation returns its first page without requesting it yet. A page
+  # is requested when first used, and enumerating it again reuses its records.
+  #
+  # The two ways of paging keep separate places. All pages of one list share
+  # the place +next_page+ continues from, so calling it on an older page still
+  # returns the page after the newest one. +auto_paging_each+ always starts at
+  # the page it is called on, follows the cursors from there, and leaves
+  # +next_page+ where it was.
   class List
     include Enumerable
 
-    def initialize(resource_wrapper, params, current_response = nil, current_options = nil, &request_page)
-      @resource_wrapper = resource_wrapper
-      @params = params
-      @current_response = current_response
-      @current_options = current_options
-      @request_page = request_page
-      params[:per_page] ||= 1_000
-    end
+    # A requested page: its records, the cursor that requested it, and the
+    # cursor the API returned for the page after it, if any.
+    Page = Struct.new(:records, :cursor, :next_cursor)
 
-    # Iterates through each resource in all pages, making additional fetches to
-    # the API as necessary.
-    #
-    # Note that this method will make as many API calls as necessary to fetch
-    # all resources. For more granular control, please see +each+ and
-    # +next_page+.
-    def auto_paging_each(&block)
-      return enum_for(:auto_paging_each).lazy unless block_given?
+    # Where next_page continues from, shared by all pages of one list.
+    Progress = Struct.new(:next_cursor, :requested_cursors)
+    private_constant :Page, :Progress
 
-      loop do
-        page = next_page
-        break unless page.valid_response?
+    # The block requests one page. It receives that page's parameters, which
+    # are +params+ plus its cursor, and a check to pass on to Api.send_request,
+    # so a rejected page leaves the caller's options as they were. +params+
+    # itself is copied, not changed.
+    def initialize(resource_wrapper, params, &request)
+      @resource_wrapper = resource_wrapper
+      @params = params.dup
+      @params[:per_page] ||= 1_000
+      @request = request
+      @progress = Progress.new(nil, Set.new)
+    end
 
-        page.set_cursor
+    # Yields each record on this page and returns the block's results. Without
+    # a block, returns an Enumerator.
+    def each(&block)
+      return enum_for(:each) unless block
 
-        page.wrap_data do |data|
-          block.call(data)
-        end
+      page.records.map(&block)
+    end
 
-        break if page.on_last_page?
+    # Yields each record on this page and then on each page after it, requesting
+    # those pages as iteration reaches them. Without a block, returns a lazy
+    # Enumerator, so methods such as +first+ request only the pages they need.
+    # This does not change where +next_page+ continues.
+    def auto_paging_each(&block)
+      return enum_for(:auto_paging_each).lazy unless block
+
+      requested_cursors = Set[page.cursor]
+      list = self
+      list.page.records.each(&block)
+      while (cursor = list.page.next_cursor)
+        list = request_list(cursor, requested_cursors)
+        list.page.records.each(&block)
       end
     end
 
-    # Iterates through each resource in the current page.
-    #
-    # Note that this method makes no effort to fetch a new page when it gets to
-    # the end of the current page's resources. See also +auto_paging_each+.
-    def each(&block)
-      page = current_page
-      return [] unless page.valid_response?
-
-      page.set_cursor
-      page.wrap_data { |data| block.call data }
+    # Whether +next_page+ has another page to return, as reported by the page
+    # +next_page+ returned last (the first page, before any call). When stepping
+    # with <tt>page = page.next_page</tt>, that is this page.
+    def has_next_page?
+      page
+      !@progress.next_cursor.nil?
     end
 
-    # Fetches the next page of resources (if there is one).
-    #
-    # This method will try to respect the per_page set. If none
-    # was given, the default per_page will be used.
+    # Requests the page after the last one +next_page+ returned, starting after
+    # the first page, so repeated calls on any page of this list walk forward.
+    # Once there are no more pages, returns an empty page without a request.
     def next_page
-      self.class.new(resource_wrapper, params, *request_page.call, &request_page)
+      page
+      return with_page(Page.new([], nil, nil)) unless @progress.next_cursor
+
+      list = request_list(@progress.next_cursor, @progress.requested_cursors)
+      @progress.next_cursor = list.page.next_cursor
+      list
     end
 
     protected
 
-    attr_reader :resource_wrapper,
-                :params,
-                :request_page
-
-    def current_page
-      @current_page ||= if @current_response and @current_options
-                          self
-                        else
-                          next_page
-                        end
-    end
+    attr_writer :page
 
-    def data
-      @current_response.data
-    end
-
-    def wrap_data
-      data.map do |object|
-        yield resource_wrapper.new(object, @current_options)
+    def page
+      @page ||= request_page(@params[:cursor]).tap do |first_page|
+        @progress.requested_cursors << first_page.cursor
+        @progress.next_cursor = first_page.next_cursor
       end
     end
 
-    def set_cursor
-      params[:cursor] = @current_options[:client].cursor
-    end
+    private
+
+    # A cursor this list has already requested would repeat pages, possibly
+    # forever, so it ends the list with an error instead. A request that fails
+    # can be tried again.
+    def request_list(cursor, requested_cursors)
+      raise APIConnectionError, "The Files.com API repeated a list cursor, so the SDK stopped requesting pages." if requested_cursors.include?(cursor)
 
-    def cursor
-      params[:cursor]
+      list = with_page(request_page(cursor))
+      requested_cursors << cursor
+      list
     end
 
-    def valid_response?
-      @current_response.http_status == 200
+    def request_page(cursor)
+      response, options = @request.call(cursor ? @params.merge(cursor: cursor) : @params) { |reply| reply.require_list(@resource_wrapper) }
+      records = response.data.map { |attributes| @resource_wrapper.new(attributes, options) }
+      next_cursor = response.http_headers["x-files-cursor"]
+      Page.new(records, cursor, (next_cursor unless next_cursor.to_s.strip.empty?))
     end
 
-    def on_last_page?
-      !cursor or (data.count < params[:per_page])
+    def with_page(page)
+      dup.tap { |list| list.page = page }
     end
   end
 end

data/lib/files.com/models/action_log.rb

@@ -98,8 +98,8 @@ module Files
       raise InvalidParameterError.new("Bad parameter: filter_lt must be an Hash") if params[:filter_lt] and !params[:filter_lt].is_a?(Hash)
       raise InvalidParameterError.new("Bad parameter: filter_lteq must be an Hash") if params[:filter_lteq] and !params[:filter_lteq].is_a?(Hash)
 
-      List.new(ActionLog, params) do
-        Api.send_request("/action_logs", :get, params, options)
+      List.new(ActionLog, params) do |page_params, &check_page|
+        Api.send_request("/action_logs", :get, page_params, options, &check_page)
       end
     end
 

data/lib/files.com/models/action_notification_export.rb

@@ -149,9 +149,9 @@ module Files
         raise NotImplementedError.new("The ActionNotificationExport object doesn't support updates.")
       else
         new_obj = ActionNotificationExport.create(@attributes, @options)
+        @attributes = new_obj.attributes
       end
 
-      @attributes = new_obj.attributes
       true
     end
 
@@ -163,7 +163,7 @@ module Files
       raise InvalidParameterError.new("Bad parameter: id must be an Integer") if params[:id] and !params[:id].is_a?(Integer)
       raise MissingParameterError.new("Parameter missing: id") unless params[:id]
 
-      response, options = Api.send_request("/action_notification_exports/#{params[:id]}", :get, params, options)
+      response, options = Api.send_request("/action_notification_exports/#{params[:id]}", :get, params, options) { |reply| reply.require_object("ActionNotificationExport") }
       ActionNotificationExport.new(response.data, options)
     end
 
@@ -195,7 +195,7 @@ module Files
       raise InvalidParameterError.new("Bad parameter: query_path must be an String") if params[:query_path] and !params[:query_path].is_a?(String)
       raise InvalidParameterError.new("Bad parameter: query_folder must be an String") if params[:query_folder] and !params[:query_folder].is_a?(String)
 
-      response, options = Api.send_request("/action_notification_exports", :post, params, options)
+      response, options = Api.send_request("/action_notification_exports", :post, params, options) { |reply| reply.require_object("ActionNotificationExport") }
       ActionNotificationExport.new(response.data, options)
     end
   end

data/lib/files.com/models/action_notification_export_result.rb

@@ -71,8 +71,8 @@ module Files
       raise InvalidParameterError.new("Bad parameter: action_notification_export_id must be an Integer") if params[:action_notification_export_id] and !params[:action_notification_export_id].is_a?(Integer)
       raise MissingParameterError.new("Parameter missing: action_notification_export_id") unless params[:action_notification_export_id]
 
-      List.new(ActionNotificationExportResult, params) do
-        Api.send_request("/action_notification_export_results", :get, params, options)
+      List.new(ActionNotificationExportResult, params) do |page_params, &check_page|
+        Api.send_request("/action_notification_export_results", :get, page_params, options, &check_page)
       end
     end
 

data/lib/files.com/models/ai_assistant_personality.rb

@@ -89,7 +89,9 @@ module Files
       raise InvalidParameterError.new("Bad parameter: workspace_id must be an Integer") if params[:workspace_id] and !params[:workspace_id].is_a?(Integer)
       raise MissingParameterError.new("Parameter missing: id") unless params[:id]
 
-      Api.send_request("/ai_assistant_personalities/#{@attributes[:id]}", :patch, params, @options)
+      response, options = Api.send_request("/ai_assistant_personalities/#{@attributes[:id]}", :patch, params, @options) { |reply| reply.require_object("AiAssistantPersonality") }
+      @attributes = response.data
+      [ response, options ]
     end
 
     def delete(params = {})
@@ -109,12 +111,12 @@ module Files
 
     def save
       if @attributes[:id]
-        new_obj = update(@attributes)
+        update(@attributes)
       else
         new_obj = AiAssistantPersonality.create(@attributes, @options)
+        @attributes = new_obj.attributes
       end
 
-      @attributes = new_obj.attributes
       true
     end
 
@@ -129,8 +131,8 @@ module Files
       raise InvalidParameterError.new("Bad parameter: sort_by must be an Hash") if params[:sort_by] and !params[:sort_by].is_a?(Hash)
       raise InvalidParameterError.new("Bad parameter: filter must be an Hash") if params[:filter] and !params[:filter].is_a?(Hash)
 
-      List.new(AiAssistantPersonality, params) do
-        Api.send_request("/ai_assistant_personalities", :get, params, options)
+      List.new(AiAssistantPersonality, params) do |page_params, &check_page|
+        Api.send_request("/ai_assistant_personalities", :get, page_params, options, &check_page)
       end
     end
 
@@ -146,7 +148,7 @@ module Files
       raise InvalidParameterError.new("Bad parameter: id must be an Integer") if params[:id] and !params[:id].is_a?(Integer)
       raise MissingParameterError.new("Parameter missing: id") unless params[:id]
 
-      response, options = Api.send_request("/ai_assistant_personalities/#{params[:id]}", :get, params, options)
+      response, options = Api.send_request("/ai_assistant_personalities/#{params[:id]}", :get, params, options) { |reply| reply.require_object("AiAssistantPersonality") }
       AiAssistantPersonality.new(response.data, options)
     end
 
@@ -167,7 +169,7 @@ module Files
       raise MissingParameterError.new("Parameter missing: name") unless params[:name]
       raise MissingParameterError.new("Parameter missing: system_prompt") unless params[:system_prompt]
 
-      response, options = Api.send_request("/ai_assistant_personalities", :post, params, options)
+      response, options = Api.send_request("/ai_assistant_personalities", :post, params, options) { |reply| reply.require_object("AiAssistantPersonality") }
       AiAssistantPersonality.new(response.data, options)
     end
 
@@ -186,7 +188,7 @@ module Files
       raise InvalidParameterError.new("Bad parameter: workspace_id must be an Integer") if params[:workspace_id] and !params[:workspace_id].is_a?(Integer)
       raise MissingParameterError.new("Parameter missing: id") unless params[:id]
 
-      response, options = Api.send_request("/ai_assistant_personalities/#{params[:id]}", :patch, params, options)
+      response, options = Api.send_request("/ai_assistant_personalities/#{params[:id]}", :patch, params, options) { |reply| reply.require_object("AiAssistantPersonality") }
       AiAssistantPersonality.new(response.data, options)
     end
 

data/lib/files.com/models/ai_task.rb

@@ -271,7 +271,9 @@ module Files
       raise InvalidParameterError.new("Bad parameter: workspace_id must be an Integer") if params[:workspace_id] and !params[:workspace_id].is_a?(Integer)
       raise MissingParameterError.new("Parameter missing: id") unless params[:id]
 
-      Api.send_request("/ai_tasks/#{@attributes[:id]}", :patch, params, @options)
+      response, options = Api.send_request("/ai_tasks/#{@attributes[:id]}", :patch, params, @options) { |reply| reply.require_object("AiTask") }
+      @attributes = response.data
+      [ response, options ]
     end
 
     def delete(params = {})
@@ -291,12 +293,12 @@ module Files
 
     def save
       if @attributes[:id]
-        new_obj = update(@attributes)
+        update(@attributes)
       else
         new_obj = AiTask.create(@attributes, @options)
+        @attributes = new_obj.attributes
       end
 
-      @attributes = new_obj.attributes
       true
     end
 
@@ -311,8 +313,8 @@ module Files
       raise InvalidParameterError.new("Bad parameter: sort_by must be an Hash") if params[:sort_by] and !params[:sort_by].is_a?(Hash)
       raise InvalidParameterError.new("Bad parameter: filter must be an Hash") if params[:filter] and !params[:filter].is_a?(Hash)
 
-      List.new(AiTask, params) do
-        Api.send_request("/ai_tasks", :get, params, options)
+      List.new(AiTask, params) do |page_params, &check_page|
+        Api.send_request("/ai_tasks", :get, page_params, options, &check_page)
       end
     end
 
@@ -328,7 +330,7 @@ module Files
       raise InvalidParameterError.new("Bad parameter: id must be an Integer") if params[:id] and !params[:id].is_a?(Integer)
       raise MissingParameterError.new("Parameter missing: id") unless params[:id]
 
-      response, options = Api.send_request("/ai_tasks/#{params[:id]}", :get, params, options)
+      response, options = Api.send_request("/ai_tasks/#{params[:id]}", :get, params, options) { |reply| reply.require_object("AiTask") }
       AiTask.new(response.data, options)
     end
 
@@ -376,7 +378,7 @@ module Files
       raise MissingParameterError.new("Parameter missing: name") unless params[:name]
       raise MissingParameterError.new("Parameter missing: prompt") unless params[:prompt]
 
-      response, options = Api.send_request("/ai_tasks", :post, params, options)
+      response, options = Api.send_request("/ai_tasks", :post, params, options) { |reply| reply.require_object("AiTask") }
       AiTask.new(response.data, options)
     end
 
@@ -433,7 +435,7 @@ module Files
       raise InvalidParameterError.new("Bad parameter: workspace_id must be an Integer") if params[:workspace_id] and !params[:workspace_id].is_a?(Integer)
       raise MissingParameterError.new("Parameter missing: id") unless params[:id]
 
-      response, options = Api.send_request("/ai_tasks/#{params[:id]}", :patch, params, options)
+      response, options = Api.send_request("/ai_tasks/#{params[:id]}", :patch, params, options) { |reply| reply.require_object("AiTask") }
       AiTask.new(response.data, options)
     end
 

data/lib/files.com/models/api_key.rb

@@ -190,7 +190,9 @@ module Files
       raise InvalidParameterError.new("Bad parameter: name must be an String") if params[:name] and !params[:name].is_a?(String)
       raise MissingParameterError.new("Parameter missing: id") unless params[:id]
 
-      Api.send_request("/api_keys/#{@attributes[:id]}", :patch, params, @options)
+      response, options = Api.send_request("/api_keys/#{@attributes[:id]}", :patch, params, @options) { |reply| reply.require_object("ApiKey") }
+      @attributes = response.data
+      [ response, options ]
     end
 
     def delete(params = {})
@@ -210,12 +212,12 @@ module Files
 
     def save
       if @attributes[:id]
-        new_obj = update(@attributes)
+        update(@attributes)
       else
         new_obj = ApiKey.create(@attributes, @options)
+        @attributes = new_obj.attributes
       end
 
-      @attributes = new_obj.attributes
       true
     end
 
@@ -240,8 +242,8 @@ module Files
       raise InvalidParameterError.new("Bad parameter: filter_lt must be an Hash") if params[:filter_lt] and !params[:filter_lt].is_a?(Hash)
       raise InvalidParameterError.new("Bad parameter: filter_lteq must be an Hash") if params[:filter_lteq] and !params[:filter_lteq].is_a?(Hash)
 
-      List.new(ApiKey, params) do
-        Api.send_request("/api_keys", :get, params, options)
+      List.new(ApiKey, params) do |page_params, &check_page|
+        Api.send_request("/api_keys", :get, page_params, options, &check_page)
       end
     end
 
@@ -250,7 +252,7 @@ module Files
     end
 
     def self.find_current(params = {}, options = {})
-      response, options = Api.send_request("/api_key", :get, params, options)
+      response, options = Api.send_request("/api_key", :get, params, options) { |reply| reply.require_object("ApiKey") }
       ApiKey.new(response.data, options)
     end
 
@@ -262,7 +264,7 @@ module Files
       raise InvalidParameterError.new("Bad parameter: id must be an Integer") if params[:id] and !params[:id].is_a?(Integer)
       raise MissingParameterError.new("Parameter missing: id") unless params[:id]
 
-      response, options = Api.send_request("/api_keys/#{params[:id]}", :get, params, options)
+      response, options = Api.send_request("/api_keys/#{params[:id]}", :get, params, options) { |reply| reply.require_object("ApiKey") }
       ApiKey.new(response.data, options)
     end
 
@@ -289,7 +291,7 @@ module Files
       raise InvalidParameterError.new("Bad parameter: workspace_id must be an Integer") if params[:workspace_id] and !params[:workspace_id].is_a?(Integer)
       raise MissingParameterError.new("Parameter missing: name") unless params[:name]
 
-      response, options = Api.send_request("/api_keys", :post, params, options)
+      response, options = Api.send_request("/api_keys", :post, params, options) { |reply| reply.require_object("ApiKey") }
       ApiKey.new(response.data, options)
     end
 
@@ -302,7 +304,7 @@ module Files
       raise InvalidParameterError.new("Bad parameter: name must be an String") if params[:name] and !params[:name].is_a?(String)
       raise InvalidParameterError.new("Bad parameter: permission_set must be an String") if params[:permission_set] and !params[:permission_set].is_a?(String)
 
-      response, options = Api.send_request("/api_key", :patch, params, options)
+      response, options = Api.send_request("/api_key", :patch, params, options) { |reply| reply.require_object("ApiKey") }
       ApiKey.new(response.data, options)
     end
 
@@ -319,7 +321,7 @@ module Files
       raise InvalidParameterError.new("Bad parameter: name must be an String") if params[:name] and !params[:name].is_a?(String)
       raise MissingParameterError.new("Parameter missing: id") unless params[:id]
 
-      response, options = Api.send_request("/api_keys/#{params[:id]}", :patch, params, options)
+      response, options = Api.send_request("/api_keys/#{params[:id]}", :patch, params, options) { |reply| reply.require_object("ApiKey") }
       ApiKey.new(response.data, options)
     end
 

data/lib/files.com/models/api_request_log.rb

@@ -133,8 +133,8 @@ module Files
       raise InvalidParameterError.new("Bad parameter: filter_lt must be an Hash") if params[:filter_lt] and !params[:filter_lt].is_a?(Hash)
       raise InvalidParameterError.new("Bad parameter: filter_lteq must be an Hash") if params[:filter_lteq] and !params[:filter_lteq].is_a?(Hash)
 
-      List.new(ApiRequestLog, params) do
-        Api.send_request("/api_request_logs", :get, params, options)
+      List.new(ApiRequestLog, params) do |page_params, &check_page|
+        Api.send_request("/api_request_logs", :get, page_params, options, &check_page)
       end
     end
 

data/lib/files.com/models/app.rb

@@ -127,8 +127,8 @@ module Files
       raise InvalidParameterError.new("Bad parameter: filter must be an Hash") if params[:filter] and !params[:filter].is_a?(Hash)
       raise InvalidParameterError.new("Bad parameter: filter_prefix must be an Hash") if params[:filter_prefix] and !params[:filter_prefix].is_a?(Hash)
 
-      List.new(App, params) do
-        Api.send_request("/apps", :get, params, options)
+      List.new(App, params) do |page_params, &check_page|
+        Api.send_request("/apps", :get, page_params, options, &check_page)
       end
     end
 

data/lib/files.com/models/as2_incoming_message.rb

@@ -203,8 +203,8 @@ module Files
       raise InvalidParameterError.new("Bad parameter: filter_lt must be an Hash") if params[:filter_lt] and !params[:filter_lt].is_a?(Hash)
       raise InvalidParameterError.new("Bad parameter: filter_lteq must be an Hash") if params[:filter_lteq] and !params[:filter_lteq].is_a?(Hash)
 
-      List.new(As2IncomingMessage, params) do
-        Api.send_request("/as2_incoming_messages", :get, params, options)
+      List.new(As2IncomingMessage, params) do |page_params, &check_page|
+        Api.send_request("/as2_incoming_messages", :get, page_params, options, &check_page)
       end
     end
 

data/lib/files.com/models/as2_outgoing_message.rb

@@ -188,8 +188,8 @@ module Files
       raise InvalidParameterError.new("Bad parameter: filter_lt must be an Hash") if params[:filter_lt] and !params[:filter_lt].is_a?(Hash)
       raise InvalidParameterError.new("Bad parameter: filter_lteq must be an Hash") if params[:filter_lteq] and !params[:filter_lteq].is_a?(Hash)
 
-      List.new(As2OutgoingMessage, params) do
-        Api.send_request("/as2_outgoing_messages", :get, params, options)
+      List.new(As2OutgoingMessage, params) do |page_params, &check_page|
+        Api.send_request("/as2_outgoing_messages", :get, page_params, options, &check_page)
       end
     end
 

data/lib/files.com/models/as2_partner.rb

@@ -226,7 +226,9 @@ module Files
       raise InvalidParameterError.new("Bad parameter: public_certificate must be an String") if params[:public_certificate] and !params[:public_certificate].is_a?(String)
       raise MissingParameterError.new("Parameter missing: id") unless params[:id]
 
-      Api.send_request("/as2_partners/#{@attributes[:id]}", :patch, params, @options)
+      response, options = Api.send_request("/as2_partners/#{@attributes[:id]}", :patch, params, @options) { |reply| reply.require_object("As2Partner") }
+      @attributes = response.data
+      [ response, options ]
     end
 
     def delete(params = {})
@@ -246,12 +248,12 @@ module Files
 
     def save
       if @attributes[:id]
-        new_obj = update(@attributes)
+        update(@attributes)
       else
         new_obj = As2Partner.create(@attributes, @options)
+        @attributes = new_obj.attributes
       end
 
-      @attributes = new_obj.attributes
       true
     end
 
@@ -266,8 +268,8 @@ module Files
       raise InvalidParameterError.new("Bad parameter: sort_by must be an Hash") if params[:sort_by] and !params[:sort_by].is_a?(Hash)
       raise InvalidParameterError.new("Bad parameter: filter must be an Hash") if params[:filter] and !params[:filter].is_a?(Hash)
 
-      List.new(As2Partner, params) do
-        Api.send_request("/as2_partners", :get, params, options)
+      List.new(As2Partner, params) do |page_params, &check_page|
+        Api.send_request("/as2_partners", :get, page_params, options, &check_page)
       end
     end
 
@@ -283,7 +285,7 @@ module Files
       raise InvalidParameterError.new("Bad parameter: id must be an Integer") if params[:id] and !params[:id].is_a?(Integer)
       raise MissingParameterError.new("Parameter missing: id") unless params[:id]
 
-      response, options = Api.send_request("/as2_partners/#{params[:id]}", :get, params, options)
+      response, options = Api.send_request("/as2_partners/#{params[:id]}", :get, params, options) { |reply| reply.require_object("As2Partner") }
       As2Partner.new(response.data, options)
     end
 
@@ -321,7 +323,7 @@ module Files
       raise MissingParameterError.new("Parameter missing: uri") unless params[:uri]
       raise MissingParameterError.new("Parameter missing: public_certificate") unless params[:public_certificate]
 
-      response, options = Api.send_request("/as2_partners", :post, params, options)
+      response, options = Api.send_request("/as2_partners", :post, params, options) { |reply| reply.require_object("As2Partner") }
       As2Partner.new(response.data, options)
     end
 
@@ -353,7 +355,7 @@ module Files
       raise InvalidParameterError.new("Bad parameter: public_certificate must be an String") if params[:public_certificate] and !params[:public_certificate].is_a?(String)
       raise MissingParameterError.new("Parameter missing: id") unless params[:id]
 
-      response, options = Api.send_request("/as2_partners/#{params[:id]}", :patch, params, options)
+      response, options = Api.send_request("/as2_partners/#{params[:id]}", :patch, params, options) { |reply| reply.require_object("As2Partner") }
       As2Partner.new(response.data, options)
     end
 

data/lib/files.com/models/as2_station.rb

@@ -178,7 +178,9 @@ module Files
       raise InvalidParameterError.new("Bad parameter: private_key_password must be an String") if params[:private_key_password] and !params[:private_key_password].is_a?(String)
       raise MissingParameterError.new("Parameter missing: id") unless params[:id]
 
-      Api.send_request("/as2_stations/#{@attributes[:id]}", :patch, params, @options)
+      response, options = Api.send_request("/as2_stations/#{@attributes[:id]}", :patch, params, @options) { |reply| reply.require_object("As2Station") }
+      @attributes = response.data
+      [ response, options ]
     end
 
     def delete(params = {})
@@ -198,12 +200,12 @@ module Files
 
     def save
       if @attributes[:id]
-        new_obj = update(@attributes)
+        update(@attributes)
       else
         new_obj = As2Station.create(@attributes, @options)
+        @attributes = new_obj.attributes
       end
 
-      @attributes = new_obj.attributes
       true
     end
 
@@ -218,8 +220,8 @@ module Files
       raise InvalidParameterError.new("Bad parameter: sort_by must be an Hash") if params[:sort_by] and !params[:sort_by].is_a?(Hash)
       raise InvalidParameterError.new("Bad parameter: filter must be an Hash") if params[:filter] and !params[:filter].is_a?(Hash)
 
-      List.new(As2Station, params) do
-        Api.send_request("/as2_stations", :get, params, options)
+      List.new(As2Station, params) do |page_params, &check_page|
+        Api.send_request("/as2_stations", :get, page_params, options, &check_page)
       end
     end
 
@@ -235,7 +237,7 @@ module Files
       raise InvalidParameterError.new("Bad parameter: id must be an Integer") if params[:id] and !params[:id].is_a?(Integer)
       raise MissingParameterError.new("Parameter missing: id") unless params[:id]
 
-      response, options = Api.send_request("/as2_stations/#{params[:id]}", :get, params, options)
+      response, options = Api.send_request("/as2_stations/#{params[:id]}", :get, params, options) { |reply| reply.require_object("As2Station") }
       As2Station.new(response.data, options)
     end
 
@@ -259,7 +261,7 @@ module Files
       raise MissingParameterError.new("Parameter missing: public_certificate") unless params[:public_certificate]
       raise MissingParameterError.new("Parameter missing: private_key") unless params[:private_key]
 
-      response, options = Api.send_request("/as2_stations", :post, params, options)
+      response, options = Api.send_request("/as2_stations", :post, params, options) { |reply| reply.require_object("As2Station") }
       As2Station.new(response.data, options)
     end
 
@@ -278,7 +280,7 @@ module Files
       raise InvalidParameterError.new("Bad parameter: private_key_password must be an String") if params[:private_key_password] and !params[:private_key_password].is_a?(String)
       raise MissingParameterError.new("Parameter missing: id") unless params[:id]
 
-      response, options = Api.send_request("/as2_stations/#{params[:id]}", :patch, params, options)
+      response, options = Api.send_request("/as2_stations/#{params[:id]}", :patch, params, options) { |reply| reply.require_object("As2Station") }
       As2Station.new(response.data, options)
     end