infopark_cloud_connector 6.8.0.356.19698103 → 6.8.0.406.131718077

data/lib/rails_connector/cache.rb

@@ -15,8 +15,8 @@ class Cache
     value
   end
 
-  def write(key, value)
-    @fallback_backend.write(cache_key_for_fallback_backend(key), value) if @fallback_backend
+  def write(key, value, options={})
+    @fallback_backend.write(cache_key_for_fallback_backend(key), value, options) if @fallback_backend
     @cache[key] = value
   end
 

data/lib/rails_connector/cms_api_search_request.rb

@@ -15,7 +15,7 @@ module RailsConnector
     # @api public
     def initialize(query_string, options = {})
       @query_string = query_string
-      @options = Configuration.cms_api_options.merge(options)
+      @options = options
     end
 
     # Accesses Cms Api Search using #query and fetches search hits.

data/lib/rails_connector/cms_backend.rb

@@ -32,6 +32,10 @@ module RailsConnector
       current.query_counter
     end
 
+    def self.find_blob_data_by_id(id)
+      current.find_blob_data_by_id(id)
+    end
+
   end
 
 end

data/lib/rails_connector/cms_rest_api.rb

@@ -1,4 +1,5 @@
 require 'restclient'
+require 'active_support/all'
 
 module RailsConnector
 
@@ -20,6 +21,8 @@ module RailsConnector
   #   RailsConnector::CmsRestApi.delete('revisions/001384beff9e5845/objs/f4123622ff07b70b')
   class CmsRestApi
 
+    cattr_accessor :credentials
+
     def self.get(resource_path, payload = nil)
       request_cms_api(:get, resource_path, payload)
     end
@@ -32,8 +35,14 @@ module RailsConnector
       request_cms_api(:post, resource_path, payload)
     end
 
-    def self.delete(resource_path)
-      request_cms_api(:delete, resource_path, nil)
+    def self.delete(resource_path, payload = nil)
+      request_cms_api(:delete, resource_path, payload)
+    end
+
+    # @param [Hash] value
+    # @return [void]
+    def self.credentials=(value)
+      @@credentials = value.symbolize_keys
     end
 
     private
@@ -47,10 +56,6 @@ module RailsConnector
       MultiJson.decode(RestClient::Request.execute(request_params))
     end
 
-    def self.credentials
-      RailsConnector::Configuration.cms_api_options
-    end
-
     def self.basic_request_params
       headers = {
         :content_type => :json,

data/lib/rails_connector/content_service.rb

@@ -7,8 +7,7 @@ class ContentService
     retry_once_on_socket_error do
       ConnectionManager.ensure_started(uri)
       request = build_request(path, payload)
-      response = ConnectionManager.connection.request(request)
-      MultiJson.load(response.body)
+      handle_response(ConnectionManager.connection.request(request))
     end
   end
 
@@ -34,6 +33,14 @@ class ContentService
       request
     end
 
+    def handle_response(response)
+      if response.code.first == '2'
+        MultiJson.load(response.body)
+      else
+        raise "Server responded with status code #{response.code}"
+      end
+    end
+
     def uri
       url = config['url']
       url = "#{DEFAULT_PROTOCOL}://#{url}" unless url.match /^http/
@@ -78,7 +85,8 @@ class ContentService
       conn = Net::HTTP.new(uri.host, uri.port)
       if uri.scheme == 'https'
         conn.use_ssl = true
-        conn.verify_mode = OpenSSL::SSL::VERIFY_PEER
+        # TODO: Change to OpenSSL::SSL::VERIFY_PEER
+        conn.verify_mode = OpenSSL::SSL::VERIFY_NONE
       end
       retry_twice_on_socket_error { conn.start }
       @connection = conn

data/lib/rails_connector/dynamo_cms_backend.rb

@@ -18,6 +18,7 @@ module RailsConnector
 
     def find_workspace_data_by_id(id)
       WorkspaceDataFromDatabase.find(id)
+    rescue Kvom::NotFound
     end
 
     def find_obj_data_by(workspace_data, index, keys)

data/lib/rails_connector/service_blob.rb

@@ -37,7 +37,7 @@ class ServiceBlob
   private
 
   def raw_data
-    @raw_data ||= ContentService.query("blobs/query", :blob_ids => [id])["blobs"][id]
+    @raw_data ||= CmsBackend.find_blob_data_by_id(id)
   end
 
   def meta_data

data/lib/rails_connector/service_cms_backend.rb

@@ -5,6 +5,7 @@ module RailsConnector
   # connects the cloud connector to the connector service
   class ServiceCmsBackend < CmsBackend
     CACHE_PREFIX = 'v1'
+    BLOB_DATA_CACHE_PREFIX = 'blob_data'.freeze
 
     def initialize
       @query_counter = 0
@@ -13,14 +14,15 @@ module RailsConnector
     def begin_caching
       @editable_cache = Configuration.cache_editable_workspaces ? persistent_cache : Cache.new
       @read_only_cache = persistent_cache
+      @blob_data_cache = persistent_cache
     end
 
     def end_caching
-      @editable_cache = @read_only_cache = nil
+      @editable_cache = @read_only_cache = @blob_data_cache = nil
     end
 
     def caching?
-      @read_only_cache && @editable_cache
+      @read_only_cache && @editable_cache && @blob_data_cache
     end
 
     def query_counter
@@ -32,8 +34,9 @@ module RailsConnector
         "workspaces/query",
         :workspace_id => id
       )
-      raw_workspace_data = raw_data["workspace"] or raise "Workspace Data missing"
-      WorkspaceDataFromService.new(raw_workspace_data)
+      if raw_workspace_data = raw_data['workspace']
+        WorkspaceDataFromService.new raw_workspace_data
+      end
     end
 
     def find_obj_data_by(workspace_data, index, keys)
@@ -51,6 +54,14 @@ module RailsConnector
       end
     end
 
+    def find_blob_data_by_id(id)
+      if caching?
+        find_blob_data_from_cache_or_database_by_id(id)
+      else
+        find_blob_data_from_database_by(id)
+      end
+    end
+
     private
 
     def persistent_cache
@@ -136,6 +147,24 @@ module RailsConnector
       workspace_data.cachable? ? @read_only_cache : @editable_cache
     end
 
+    def find_blob_data_from_cache_or_database_by_id(id)
+      cache_key = "#{BLOB_DATA_CACHE_PREFIX}/#{id}"
+      if data_from_cache = @blob_data_cache.read(cache_key)
+        data_from_cache
+      else
+        data_from_database = find_blob_data_from_database_by(id)
+        if maxage = data_from_database['maxage']
+          @blob_data_cache.write(cache_key, data_from_database, :expires_in => maxage)
+        end
+        data_from_database
+      end
+    end
+
+    def find_blob_data_from_database_by(id)
+      @query_counter += 1
+      ContentService.query('blobs/query', :blob_ids => [id])['blobs'][id]
+    end
+
   end
 
 end

data/lib/rails_connector/workspace.rb

@@ -21,7 +21,11 @@ class Workspace
   end
 
   def self.find(id)
-    Workspace.new(CmsBackend.find_workspace_data_by_id(id))
+    if workspace_data = CmsBackend.find_workspace_data_by_id(id)
+      Workspace.new workspace_data
+    else
+      raise ResourceNotFound, "Could not find #{self} with id #{id}"
+    end
   end
 
   def initialize(workspace_data)

data/lib/rails_connector/workspace_selection_middleware.rb

@@ -15,7 +15,7 @@ class WorkspaceSelectionMiddleware
       if workspace_id
         begin
           Workspace.find(workspace_id)
-        rescue Kvom::NotFound
+        rescue RailsConnector::ResourceNotFound
           Workspace.default
         end
       else

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: infopark_cloud_connector
 version: !ruby/object:Gem::Version 
-  hash: 39396865
+  hash: 263434717
   prerelease: 
   segments: 
   - 6
   - 8
   - 0
-  - 356
-  - 19698103
-  version: 6.8.0.356.19698103
+  - 406
+  - 131718077
+  version: 6.8.0.406.131718077
 platform: ruby
 authors: 
 - Infopark AG
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-11-27 00:00:00 +01:00
+date: 2012-12-04 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -57,14 +57,14 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 39396865
+        hash: 263434717
         segments: 
         - 6
         - 8
         - 0
-        - 356
-        - 19698103
-        version: 6.8.0.356.19698103
+        - 406
+        - 131718077
+        version: 6.8.0.406.131718077
   version_requirements: *id003
   name: kvom
   prerelease: false