connectors_sdk 8.2.3.0 → 8.3.0.0.pre.20220414T060419Z

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c9444e4767b3968419c0810181da18254e8af904ab230ed7f52013f765365f5
-  data.tar.gz: 51bce284b26ed688847c14fc81766272ce6a3ac23fae3934921e19e0e51a7817
+  metadata.gz: a44a80ba5fe5032b6254fb8a2db25516542df5818044d627b6ba31f652a7812f
+  data.tar.gz: 52d1245cc24ab6e1a42c00483ec4a8ece48ede4a6465c9b46b3bf5e18c979678
 SHA512:
-  metadata.gz: ee7e9f2217b4d15db1567084f3642951b7d7ab8219f85b4377e26bfb38836dcbd5de986ec5847e1aae42165e8537fb83db20f16acdacb3cb56557e32a5dcafe1
-  data.tar.gz: 2c06c724cf5e0f993580d891c3392b284fc211ca925d2ddcf33feb89d5150f1976472b54ffd9b10acde88063044f4d94c60c6c2b6d331bab276e8a70f509d7f9
+  metadata.gz: 7a4021e1d7b83ec7334913f1ef5e684e02296097f223e96610cb31eb5502c36f9b45b03eeaf80e876aac5bcc531f85d10445917459b86cedc30d6609b33f5351
+  data.tar.gz: ca04ab72f48ed6e76b3a0e0cc8c260f81779ea906325a782eb61456c9c5be231043d7a73ca9625df63459460de587c65aa352fb2e1150fc8c92a253536fcd634

data/lib/connectors_sdk/base/registry.rb

@@ -17,8 +17,8 @@ module ConnectorsSdk
         @connectors[name] = klass
       end
 
-      def connector_class(name)
-        @connectors[name]
+      def connector(name)
+        @connectors[name].new
       end
     end
 

data/lib/connectors_sdk/office365/custom_client.rb

@@ -125,7 +125,7 @@ module ConnectorsSdk
         yielded = 0
         while stack.any?
           folder_id = stack.pop
-          item_children(drive_id, folder_id, :fields => fields_with_id, :break_after_page => break_after_page) do |item|
+          item_children(drive_id, folder_id, :fields => fields_with_id) do |item|
             if item.folder
               stack << item.id
             end
@@ -134,14 +134,9 @@ module ConnectorsSdk
             yielded += 1
           end
 
-          if break_after_page && yielded >= 100
-            if cursors['item_children_next_link'].present?
-              stack << folder_id
-            end
-            if stack.any?
-              cursors['page_cursor'] = stack.dup
-              break
-            end
+          if break_after_page && yielded >= 100 && stack.any?
+            cursors['page_cursor'] = stack.dup
+            break
           end
         end
       end
@@ -261,30 +256,15 @@ module ConnectorsSdk
         request_endpoint(:endpoint => "drives/#{drive_id}/root", :query_params => query_params)
       end
 
-      def item_children(drive_id, item_id, fields: [], break_after_page: false, &block)
-        next_link = cursors.delete('item_children_next_link') if break_after_page
-
-        response = if next_link.present?
-                     request_json(:url => next_link)
-                   else
-                     endpoint = "drives/#{drive_id}/items/#{item_id}/children"
-                     query_params = transform_fields_to_request_query_params(fields)
-                     request_endpoint(:endpoint => endpoint, :query_params => query_params)
-                   end
+      def item_children(drive_id, item_id, fields: [], &block)
+        endpoint = "drives/#{drive_id}/items/#{item_id}/children"
+        query_params = transform_fields_to_request_query_params(fields)
+        response = request_endpoint(:endpoint => endpoint, :query_params => query_params)
 
-        yielded = 0
         loop do
           response.value.each(&block)
           next_link = response['@odata.nextLink']
-
           break if next_link.nil?
-
-          yielded += response.value.size
-          if break_after_page && yielded >= 100
-            cursors['item_children_next_link'] = next_link
-            break
-          end
-
           response = request_json(:url => next_link)
         end
       end

data/lib/connectors_sdk/office365/extractor.rb

@@ -51,12 +51,12 @@ module ConnectorsSdk
             capture_exception(e)
           end
 
-          if break_after_page && (config.cursors['page_cursor'].present? || config.cursors['item_children_next_link'].present?)
+          if break_after_page && config.cursors['page_cursor'].present?
             break
           end
         end
 
-        if break_after_page && config.cursors['page_cursor'].blank? && config.cursors['item_children_next_link'].blank?
+        if break_after_page && config.cursors['page_cursor'].blank?
           @completed = true
           config.overwrite_cursors!(retrieve_latest_cursors)
           log_debug("Completed #{modified_since.nil? ? 'full' : 'incremental'} extraction")

data/lib/connectors_sdk/share_point/http_call_wrapper.rb

@@ -34,9 +34,9 @@ module ConnectorsSdk
       def document_batch(params)
         results = []
 
-        extractor = extractor(params)
+        @extractor = extractor(params)
 
-        extractor.yield_document_changes(:break_after_page => true, :modified_since => extractor.config.cursors['modified_since']) do |action, doc, download_args_and_proc|
+        @extractor.yield_document_changes(:break_after_page => true, :modified_since => @extractor.config.cursors['modified_since']) do |action, doc, download_args_and_proc|
           download_obj = nil
           if download_args_and_proc
             download_obj = {
@@ -54,11 +54,19 @@ module ConnectorsSdk
           }
         end
 
-        [results, extractor.config.cursors, extractor.completed]
+        results
       rescue ConnectorsSdk::Office365::CustomClient::ClientError => e
         raise e.status_code == 401 ? ConnectorsShared::InvalidTokenError : e
       end
 
+      def cursors
+        @extractor.config.cursors
+      end
+
+      def completed?
+        @extractor.completed
+      end
+
       def deleted(params)
         results = []
         extractor(params).yield_deleted_ids(params[:ids]) do |id|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: connectors_sdk
 version: !ruby/object:Gem::Version
-  version: 8.2.3.0
+  version: 8.3.0.0.pre.20220414T060419Z
 platform: ruby
 authors:
 - Elastic
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-07 00:00:00.000000000 Z
+date: 2022-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -61,6 +61,9 @@ files:
 - LICENSE
 - NOTICE.txt
 - lib/connectors_sdk.rb
+- lib/connectors_sdk/base/.config.rb.un~
+- lib/connectors_sdk/base/.connectors.rb.un~
+- lib/connectors_sdk/base/.registry.rb.un~
 - lib/connectors_sdk/base/adapter.rb
 - lib/connectors_sdk/base/config.rb
 - lib/connectors_sdk/base/custom_client.rb
@@ -70,6 +73,7 @@ files:
 - lib/connectors_sdk/office365/config.rb
 - lib/connectors_sdk/office365/custom_client.rb
 - lib/connectors_sdk/office365/extractor.rb
+- lib/connectors_sdk/share_point/.http_call_wrapper.rb.un~
 - lib/connectors_sdk/share_point/adapter.rb
 - lib/connectors_sdk/share_point/authorization.rb
 - lib/connectors_sdk/share_point/extractor.rb
@@ -85,9 +89,9 @@ homepage: https://github.com/elastic/connectors
 licenses:
 - Elastic-2.0
 metadata:
-  revision: e1223714e0bfdcdeb9a94774d6b81f5a8b5ce44e
-  repository: git@github.com:elastic/ent-search-connectors.git
-post_install_message: 
+  revision: 427fad57fc69a8107c127ecbf99c6a5e803ea90c
+  repository: https://github.com/elastic/connectors.git
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -98,12 +102,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.0.3.1
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.7.7
+signing_key:
 specification_version: 4
 summary: Gem containing apis used by Enterprise Search and implementations of Connectors
 test_files: []