infopark_cloud_connector 6.8.0.444.171626367 → 6.8.0.480.261594408

data/lib/rails_connector/content_service.rb

@@ -1,8 +1,17 @@
+module RailsConnector
 class ContentService
   DEFAULT_PROTOCOL = 'https'.freeze
   SOCKET_ERRORS = [EOFError, IOError, Errno::ECONNABORTED, Errno::ECONNRESET,
       Errno::EPIPE, Errno::EINVAL].freeze
 
+  class RateLimitExceeded < StandardError
+    def initialize(retry_after)
+      @retry_after = retry_after
+    end
+
+    attr_reader :retry_after
+  end
+
   def self.query(path, payload)
     retry_once_on_socket_error do
       ConnectionManager.ensure_started(uri)
@@ -23,6 +32,9 @@ class ContentService
         ConnectionManager.ensure_finished
         retried = true
         retry
+      rescue RateLimitExceeded => e
+        sleep (e.retry_after || 0.8).to_f
+        retry
       end
     end
 
@@ -36,6 +48,8 @@ class ContentService
     def handle_response(response)
       if response.code.first == '2'
         MultiJson.load(response.body)
+      elsif response.code == "429"
+        raise RateLimitExceeded.new(response["Retry-After"])
       else
         raise "Server responded with status code #{response.code}"
       end
@@ -113,3 +127,4 @@ class ContentService
     end
   end
 end
+end

data/lib/rails_connector/obj_search_enumerator.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 module RailsConnector
   # Provides an enumerator for iterating over obj search results and retrieving obj instances.
   # This is done using the {http://ruby-doc.org/core-1.8.7/Enumerable.html <code>Enumerable</code> mixin},

data/lib/rails_connector/service_cms_backend.rb

@@ -2,6 +2,50 @@ require 'rest_client'
 
 module RailsConnector
 
+  class ContentServiceObjQueries
+    def initialize(queries)
+      @queries = queries
+      @open_queries = queries.dup
+      @results = {}
+    end
+
+    def open_queries
+      @open_queries[0..99]
+    end
+
+    def handle_response(response)
+      objs = {}
+      response["objs"].each do |obj|
+        objs[obj["_id"].first] = obj
+      end
+
+      queries_to_delete = []
+      response["results"].each_with_index do |response, i|
+        query = @open_queries[i]
+        if response["continuation_handle"]
+          query[:continuation_handle] = response["continuation_handle"]
+        else
+          queries_to_delete << i
+        end
+        result = (@results[query.__id__] ||= [])
+        response["refs"].each do |obj_ref|
+          id = obj_ref["id"]
+          # TODO fetch missing ObjData from Service
+          result << (objs[id] or raise "Data for Obj with id #{id} missing!")
+        end
+      end
+      queries_to_delete.reverse_each {|i| @open_queries.delete_at(i) }
+    end
+
+    def results
+      @queries.map {|query| @results[query.__id__] || [] }
+    end
+
+    def finished?
+      open_queries.empty?
+    end
+  end
+
   # connects the cloud connector to the connector service
   class ServiceCmsBackend < CmsBackend
     CACHE_PREFIX = 'v1'
@@ -97,28 +141,16 @@ module RailsConnector
         "cms_load.rails_connector", :name => "Obj Load", :index => index, :keys => keys
       ) do
         @query_counter += 1
-        raw_data = ContentService.query(
-          "objs/query",
-          :queries => keys.map do |key|
-            { :type => index, :param => key }
-          end,
-          :workspace_id => workspace_data.id,
-          :revision_id => workspace_data.revision_id
-        )
-
-        objs = {}
-        raw_data["objs"].each do |obj|
-          objs[obj["_id"].first] = obj
-        end
-
-        raw_data["results"].map do |query|
-          query["refs"].map do |obj_ref|
-            id = obj_ref["id"]
-
-            # TODO fetch missing ObjData from Service
-            objs[id] or raise "Data for Obj with id #{id} missing!"
-          end
+        queries = ContentServiceObjQueries.new(keys.map {|key| {:type => index, :param => key} })
+        until queries.finished?
+          queries.handle_response(ContentService.query(
+            "objs/query",
+            :queries => queries.open_queries,
+            :workspace_id => workspace_data.id,
+            :revision_id => workspace_data.revision_id
+          ))
         end
+        queries.results
       end
     end
 

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: infopark_cloud_connector
 version: !ruby/object:Gem::Version 
-  hash: 343251185
+  hash: 523189551
   prerelease: 
   segments: 
   - 6
   - 8
   - 0
-  - 444
-  - 171626367
-  version: 6.8.0.444.171626367
+  - 480
+  - 261594408
+  version: 6.8.0.480.261594408
 platform: ruby
 authors: 
 - Infopark AG
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-12-06 00:00:00 +01:00
+date: 2012-12-12 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -57,14 +57,14 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 343251185
+        hash: 523189551
         segments: 
         - 6
         - 8
         - 0
-        - 444
-        - 171626367
-        version: 6.8.0.444.171626367
+        - 480
+        - 261594408
+        version: 6.8.0.480.261594408
   version_requirements: *id003
   name: kvom
   prerelease: false