infopark_cloud_connector 6.8.3.115.227021242 → 6.8.3.174.51542603

data/lib/rails_connector/basic_obj.rb

@@ -1,16 +1,15 @@
 require 'json'
 require 'ostruct'
-require 'kvom'
 
 module RailsConnector
   # The CMS file class
   # @api public
   class BasicObj
     extend ActiveModel::Naming
-    include Kvom::ModelIdentity
 
     include DateAttribute
     include SEO
+    include ModelIdentity
 
     # Create a new Obj instance with the given values and attributes.
     # Normally this method should not be used.

data/lib/rails_connector/blob.rb

@@ -1,81 +1,48 @@
-require "aws-sdk"
-
 module RailsConnector
 
+# TODO Caching:
+# unlimited urls: ewig
+# limited urls: zeitlimit - x (x fuer mindestverwendbarkeitszeit)
 class Blob
 
   class << self
-    def find(id)
-      new(blob_class.find(id))
-    end
-
-    def config
-      @config or raise "Blob storage has not been configured yet"
-    end
-
-    def configure(spec)
-      @config = spec.symbolize_keys
-      @blob_class = nil
-    end
-
-    def blob_class
-      @blob_class ||= blob_class_from_config
-    end
 
-    # for testing purposes
-    def reset_blob_class_cache
-      @blob_class = nil
+    def configure(config)
     end
 
-    def unconfigure
-      @config = nil
+    def find(id)
+      new(id)
     end
 
-    private
-
-    def blob_class_from_config
-      blob_class =
-          case config[:type].to_sym
-          when :s3
-            S3Blob
-          when :service
-            ServiceBlob
-          else
-            raise "Unsupported blob storage type #{config[:type]}"
-          end
-      blob_class.configure(config)
-      blob_class
-    end
   end
 
-  def initialize(blob_instance)
-    @instance = blob_instance
-  end
+  attr_reader :id
 
-  def id
-    instance.id
+  def initialize(id)
+    @id = id
   end
 
   def url
-    instance.url
-  end
-
-  def meta_url
-    instance.meta_url
+    raw_data["url"]
   end
 
   def content_type
-    instance.content_type
+    meta_data[:content_type]
   end
 
   def length
-    instance.length
+    meta_data[:content_length].to_i
   end
 
   private
 
-  attr_reader :instance
+  def raw_data
+    @raw_data ||= CmsBackend.find_blob_data_by_id(id)
+  end
 
+  def meta_data
+    @meta_data ||= RestClient.head(raw_data["meta_url"]).headers
+  end
 end
 
-end # module RailsConnector
+end

data/lib/rails_connector/cache_middleware.rb

@@ -10,7 +10,6 @@ class CacheMiddleware
     @app.call(env)
   ensure
     CmsBackend.end_caching
-    DictStorage.clear_first_level_cache
   end
 end
 

data/lib/rails_connector/cms_backend.rb

@@ -1,39 +1,201 @@
+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 CmsBackend
+    BLOB_DATA_CACHE_PREFIX = 'blob_data'.freeze
+    VALID_INDEX_NAMES = %w[id path ppath permalink].freeze
 
-    def self.current
-      @current ||= begin
-        RailsConnector::Configuration.content_service ? ServiceCmsBackend.new : DynamoCmsBackend.new
+    class << self
+      def instance
+        @instance ||= new
       end
+
+      delegate :begin_caching, :end_caching, :caching?, :query_counter, :find_workspace_data_by_id,
+          :find_obj_data_by, :find_blob_data_by_id, to: :instance
+    end
+
+    def initialize
+      @query_counter = 0
     end
 
-    def self.begin_caching
-      current.begin_caching
+    def begin_caching
+      @caching = true
     end
 
-    def self.end_caching
-      current.end_caching
+    def end_caching
+      CmsCacheStorage.cache.clear
+      @caching = false
     end
 
-    def self.find_obj_data_by(workspace_data, index, keys)
-      current.find_obj_data_by(workspace_data, index, keys)
+    def caching?
+      !!@caching
+    end
+
+    def query_counter
+      @query_counter
+    end
+
+    def find_workspace_data_by_id(id)
+      from_content_state_id = ContentStateCaching.find_content_state_id(id)
+      request_params = {:workspace_id => id}
+      request_params[:content_state_id] = from_content_state_id if from_content_state_id
+      raw_data = ContentService.query('workspaces/query', request_params)
+      if raw_workspace_data = raw_data['workspace']
+        workspace_data = WorkspaceDataFromService.new(raw_workspace_data)
+        if from_content_state_id != workspace_data.content_state_id
+          ContentStateCaching.store_content_state(workspace_data)
+          ContentStateCaching.store_content_state_id(workspace_data.id,
+              workspace_data.content_state_id)
+        end
+        workspace_data
+      end
     end
 
-    def self.find_workspace_data_by_id(id)
-      current.find_workspace_data_by_id(id)
+    def find_obj_data_by(workspace_data, index, keys)
+      index = index.to_s
+      assert_valid_index_name(index)
+      raw_data = find_raw_data_from_cache_or_database_by(workspace_data, index, keys)
+      raw_data.map do |raw_list|
+        raw_list.map do |raw_obj_data|
+          ObjDataFromService.new(raw_obj_data)
+        end
+      end
+    end
+
+    def find_blob_data_by_id(id)
+      cache_key = "#{BLOB_DATA_CACHE_PREFIX}/#{id}"
+      if data_from_cache = CmsCacheStorage.cache.read(cache_key)
+        data_from_cache
+      else
+        data_from_database = find_blob_data_from_database_by(id)
+        if maxage = data_from_database['maxage']
+          CmsCacheStorage.cache.write(cache_key, data_from_database, :expires_in => maxage)
+        end
+        data_from_database
+      end
+    end
+
+    private
+
+    def find_raw_data_from_cache_or_database_by(workspace_data, index, keys)
+      keys_from_database = []
+      # load results from cache
+      results_from_cache = keys.map do |key|
+        find_raw_data_from_cache_by(workspace_data, index, key).tap do |objs|
+          keys_from_database << key unless objs
+        end
+      end
+
+      # load cache misses from database and store them in cache
+      results_from_database =
+          find_raw_data_from_database_by(workspace_data, index, keys_from_database)
+      keys_from_database.each_with_index do |key, key_number|
+        store_raw_data_list_in_cache(workspace_data, index, key, results_from_database[key_number])
+      end
+
+      # combine the results
+      results_from_cache.map do |objs_from_cache|
+        objs_from_cache || results_from_database.shift
+      end
+    end
+
+    def find_raw_data_from_cache_by(workspace_data, index, key)
+      ContentStateCaching.find_obj_data(workspace_data, index, key) if caching?
+    end
+
+    def find_raw_data_from_database_by(workspace_data, index, keys)
+      return [] if keys.blank?
+      instrumenter = ActiveSupport::Notifications.instrumenter
+      instrumenter.instrument(
+        "cms_load.rails_connector", :name => "Obj Load", :index => index, :keys => keys
+      ) do
+        @query_counter += 1
+        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
+
+    UNIQUE_INDICES = [:id, :path, :permalink].freeze
+
+    def store_raw_data_list_in_cache(workspace_data, index, key, raw_data_list)
+      raw_data_list.each do |values|
+        UNIQUE_INDICES.each do |unique_index|
+          unique_index_values = values["_#{unique_index}"]
+          if unique_index_values.present?
+            store_item_in_cache(workspace_data, unique_index, unique_index_values.first, [values])
+          end
+        end
+      end
+      unless UNIQUE_INDICES.include?(index)
+        store_item_in_cache(workspace_data, index, key, raw_data_list)
+      end
     end
 
-    def self.caching?
-      current.caching?
+    def store_item_in_cache(workspace_data, index, key, item)
+      ContentStateCaching.store_obj_data(workspace_data, index, key, item)
     end
 
-    def self.query_counter
-      current.query_counter
+    def find_blob_data_from_database_by(id)
+      @query_counter += 1
+      ContentService.query('blobs/query', :blob_ids => [id])['blobs'][id]
     end
 
-    def self.find_blob_data_by_id(id)
-      current.find_blob_data_by_id(id)
+    def assert_valid_index_name(index)
+      raise ArgumentError, "invalid index name '#{index}'" unless VALID_INDEX_NAMES.include?(index)
     end
 
   end

data/lib/rails_connector/model_identity.rb

@@ -0,0 +1,13 @@
+module RailsConnector
+
+module ModelIdentity
+  def ==(other)
+    other.equal?(self) || other.instance_of?(self.class) && other.id == id
+  end
+
+  alias_method :eql?, :==
+
+  delegate :hash, to: :id
+end
+
+end

data/lib/rails_connector/workspace.rb

@@ -2,7 +2,8 @@ module RailsConnector
 
 class Workspace
   extend ActiveModel::Naming
-  include Kvom::ModelIdentity
+
+  include ModelIdentity
 
   def self.current=(workspace_or_proc)
     @current = workspace_or_proc
@@ -44,16 +45,6 @@ class Workspace
     @workspace_data
   end
 
-  # only available with direct access to dynamo
-  def revision
-    @workspace_data.revision
-  end
-
-  # only available with direct access to dynamo
-  def content_cache_id=(id)
-    @workspace_data.content_cache_id = id
-  end
-
   def published?
     self.id == 'published'
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: infopark_cloud_connector
 version: !ruby/object:Gem::Version
-  version: 6.8.3.115.227021242
+  version: 6.8.3.174.51542603
   prerelease: 
 platform: ruby
 authors:
@@ -9,24 +9,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-01 00:00:00.000000000 Z
+date: 2013-03-05 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: aws-sdk
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.3.6
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.3.6
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
@@ -75,22 +59,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.3.2
-- !ruby/object:Gem::Dependency
-  name: kvom
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 6.8.3.115.227021242
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 6.8.3.115.227021242
 description: The Cloud Connector for Infopark CMS Fiona enables you to develop modern,
   dynamic Web 2.0 applications using Ruby on Rails and at the same time display CMS
   managed content.
@@ -121,15 +89,12 @@ files:
 - lib/rails_connector/blob.rb
 - lib/rails_connector/cache.rb
 - lib/rails_connector/cache_middleware.rb
-- lib/rails_connector/chain.rb
 - lib/rails_connector/client_error.rb
 - lib/rails_connector/cloud_engine.rb
 - lib/rails_connector/cms_api_search_request.rb
 - lib/rails_connector/cms_backend.rb
-- lib/rails_connector/cms_base_model.rb
 - lib/rails_connector/cms_cache_storage.rb
 - lib/rails_connector/cms_rest_api.rb
-- lib/rails_connector/content_cache.rb
 - lib/rails_connector/content_conversion.rb
 - lib/rails_connector/content_service.rb
 - lib/rails_connector/content_state.rb
@@ -138,8 +103,6 @@ files:
 - lib/rails_connector/controller_runtime.rb
 - lib/rails_connector/date_attribute.rb
 - lib/rails_connector/default_search_request.rb
-- lib/rails_connector/dict_storage.rb
-- lib/rails_connector/dynamo_cms_backend.rb
 - lib/rails_connector/elasticsearch_request.rb
 - lib/rails_connector/errors.rb
 - lib/rails_connector/link.rb
@@ -152,22 +115,14 @@ files:
 - lib/rails_connector/migrations/migration_store.rb
 - lib/rails_connector/migrations/migrator.rb
 - lib/rails_connector/migrations/workspace_lock.rb
+- lib/rails_connector/model_identity.rb
 - lib/rails_connector/named_link.rb
 - lib/rails_connector/obj_data.rb
-- lib/rails_connector/obj_data_from_database.rb
 - lib/rails_connector/obj_data_from_hash.rb
 - lib/rails_connector/obj_data_from_service.rb
 - lib/rails_connector/obj_search_enumerator.rb
-- lib/rails_connector/path_conversion.rb
-- lib/rails_connector/permission.rb
 - lib/rails_connector/rack_middlewares.rb
-- lib/rails_connector/revision.rb
-- lib/rails_connector/s3_blob.rb
-- lib/rails_connector/service_blob.rb
-- lib/rails_connector/service_cms_backend.rb
-- lib/rails_connector/version.rb
 - lib/rails_connector/workspace.rb
-- lib/rails_connector/workspace_data_from_database.rb
 - lib/rails_connector/workspace_data_from_service.rb
 - lib/rails_connector/workspace_selection_middleware.rb
 - lib/tasks/migration.rake
@@ -185,7 +140,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 723525395
+      hash: 676465587
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: