infopark_cloud_connector 6.8.0.beta.200.891.647580e → 6.8.0.15.a24f5ff

data/lib/rails_connector/cache_middleware.rb

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

data/lib/rails_connector/cms_api_search_request.rb

@@ -0,0 +1,60 @@
+require 'json'
+require 'restclient'
+
+module RailsConnector
+
+  # This class provides a basic implementation for accessing the search using the cms api.
+  # It can be activated by making it the superclass of SearchRequest.
+  # It should be customized by subclassing.
+  class CmsApiSearchRequest
+
+    # Takes +query_string+ and +options+ for accessing Cms Api Search.
+    #
+    # +options+ is a hash and may include:
+    #
+    # <tt>:limit</tt>:: The maximum number of hits
+    # <tt>:offset</tt>:: The search offset
+    # <tt>:url</tt>:: The URL to the CMS API search
+    # <tt>:login</tt>:: The login for the CMS API search
+    # <tt>:api_key</tt>:: The api_key for the CMS API search
+    def initialize(query_string, options = {})
+      @query_string = query_string
+      @options = Configuration.cms_api_options.merge(options)
+    end
+
+    # Accesses Cms Api Search using #query and fetches search hits.
+    def fetch_hits
+      hits = JSON.parse(
+        RestClient::Request.execute({
+          :method => :get,
+          :url => url,
+          :user => @options[:login],
+          :password => @options[:api_key],
+          :headers => {
+            :content_type => :json,
+            :accept => :json,
+            :params => {
+              :query => @query_string,
+              :offset => @options[:offset],
+              :limit => @options[:limit],
+            },
+          },
+        })
+      )
+
+      result = SES::SearchResult.new(hits['total'])
+      hits['results'].each do |hit|
+        hard_coded_score = 1
+        result << SES::Hit.new(hit, hard_coded_score, nil)
+      end
+      result
+    end
+
+    private
+
+    def url
+      "#{@options[:url]}/revisions/#{Revision.current.id}/objs/search"
+    end
+  end
+
+end

data/lib/rails_connector/cms_backend.rb

@@ -0,0 +1,27 @@
+module RailsConnector
+
+  class CmsBackend
+
+    def self.current
+      @current ||= DynamoCmsBackend.new
+    end
+
+    def self.begin_caching
+      current.begin_caching
+    end
+
+    def self.end_caching
+      current.end_caching
+    end
+
+    def self.find_obj_data_by(revision, index, keys)
+      current.find_obj_data_by(revision, index, keys)
+    end
+
+    def self.caching?
+      current.caching?
+    end
+
+  end
+
+end

data/lib/rails_connector/default_search_request.rb

@@ -1,6 +1,6 @@
 module RailsConnector
   # This class provides a default implementation for accessing the search server.
   # It is used by DefaultSearchController.
-  class DefaultSearchRequest < ElasticsearchRequest
+  class DefaultSearchRequest < CmsApiSearchRequest
   end
 end

data/lib/rails_connector/dynamo_cms_backend.rb

@@ -0,0 +1,121 @@
+module RailsConnector
+
+  class DynamoCmsBackend
+    CACHE_PREFIX = 'revision'
+
+    def begin_caching
+      @editable_cache = Configuration.cache_editable_workspaces ? persistent_cache : Cache.new
+      @read_only_cache = persistent_cache
+    end
+
+    def end_caching
+      @editable_cache = @read_only_cache = nil
+    end
+
+    def find_obj_data_by(revision, index, keys)
+      raw_data =
+        if caching?
+          find_obj_data_from_cache_or_database_by(revision, index, keys)
+        else
+          find_obj_data_from_database_by(revision, index, keys)
+        end
+
+      raw_data.map do |raw_list|
+        raw_list.map do |raw_obj_data|
+          ObjDataFromDatabase.new(raw_obj_data, revision)
+        end
+      end
+    end
+
+    def caching?
+      @read_only_cache && @editable_cache
+    end
+
+    private
+
+    def persistent_cache
+      Cache.new(:fallback_backend => Rails.cache, :cache_prefix => CACHE_PREFIX)
+    end
+
+    def find_obj_data_from_database_by(revision, index, keys)
+      return [] if keys.blank?
+      instrumenter = ActiveSupport::Notifications.instrumenter
+      instrumenter.instrument(
+        "cms_load.rails_connector", :name => "Obj Load", :index => index, :keys => keys
+      ) do
+        keys.map do |key|
+          results = revision.chain.query(index, key)
+          results.values.map { |row| extract_obj_data(row) }
+        end
+      end
+    end
+
+    def find_obj_data_from_cache_or_database_by(revision, index, keys)
+      keys_from_database = []
+      # load results from cache
+      results_from_cache = keys.map do |key|
+        cache_for(revision).read(cache_key_for(revision, 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_obj_data_from_database_by(revision, index, keys_from_database)
+      keys_from_database.each_with_index do |key, key_number|
+        store_obj_data_list_in_cache(revision, 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
+
+    UNIQUE_INDICES = [:id, :path, :permalink].freeze
+    OBJ_PROPERTY_VALUE_TO_RANGE_VALUE_CONVERSIONS = {
+      :path => PathConversion.method(:path_from_list)
+    }.freeze
+
+    def store_obj_data_list_in_cache(revision, index, key, obj_data_list)
+      obj_data_list.each do |obj_data|
+        values = obj_data["values"]
+        UNIQUE_INDICES.each do |unique_index|
+          index_value = values["_#{unique_index}"]
+          if (converter = OBJ_PROPERTY_VALUE_TO_RANGE_VALUE_CONVERSIONS[unique_index])
+            index_value = converter.call(index_value)
+          end
+          store_item_in_cache(revision, unique_index, index_value, [obj_data])
+        end
+      end
+      unless UNIQUE_INDICES.include?(index)
+        store_item_in_cache(revision, index, key, obj_data_list)
+      end
+    end
+
+    def store_item_in_cache(revision, index, key, item)
+      cache_for(revision).write(cache_key_for(revision, index, key), item) if caching?
+    end
+
+    def cache_key_for(revision, index, key)
+      "#{revision.id}/obj/#{index}/#{key}"
+    end
+
+    def extract_obj_data(data)
+      {
+        "values" => data["values"].merge(
+          "_id" => data["obj_id"],
+          "_obj_type" => data["obj_type"],
+          "_obj_class" => data["obj_class_name"]
+        ),
+        "rtc_ref" => data["rtc_ref"],
+        "ext_ref" => data["ext_ref"],
+      }
+    end
+
+    def cache_for(revision)
+      revision.editable ? @editable_cache : @read_only_cache
+    end
+
+  end
+
+end

data/lib/rails_connector/obj.rb

@@ -9,7 +9,6 @@ module RailsConnector
     include Kvom::ModelIdentity
 
     include DateAttribute
-    include StringTagging
     include SEO
     include ObjBody
 
@@ -19,21 +18,23 @@ module RailsConnector
     # Create a new Obj instance with the given values and attributes.
     # Normally this method should not be used.
     # Instead Objs should be loaded from the cms database.
-    def initialize(values = {}, meta = {})
-      update_data(values, meta)
+    def initialize(obj_data = {})
+      if !obj_data.respond_to?(:value_and_type_of)
+        obj_data = ObjDataFromHash.new(obj_data)
+      end
+
+      update_data(obj_data)
     end
 
     # instantiate an Obj instance from obj_data.
     # May result in an instance of a subclass of Obj according to STI rules.
     def self.instantiate(obj_data) # :nodoc:
-      obj_class = obj_data["values"]["_obj_class"]
-      Obj.compute_type(obj_class).new(
-        obj_data["values"], obj_data
-      )
+      obj_class = obj_data.value_of("_obj_class")
+      Obj.compute_type(obj_class).new(obj_data)
     end
 
     def id
-      read_raw_attribute_value('_id')
+      read_attribute('_id')
     end
 
     ### FINDERS ####################
@@ -105,7 +106,7 @@ module RailsConnector
     # accepts the name of an "obj_by" - view and a list of keys.
     # returns a list of lists of Objs: a list of Objs for each given keys.
     def self.find_objs_by(view, keys) # :nodoc:
-      Revision.current.find_obj_data_by(view, keys).map do |list|
+      CmsBackend.find_obj_data_by(Revision.current, view, keys).map do |list|
         list.map { |obj_data| Obj.instantiate(obj_data) }
       end
     end
@@ -163,7 +164,7 @@ module RailsConnector
     end
 
     def path_list # :nodoc:
-      read_attribute_value('_path') || []
+      read_attribute('_path') || []
     end
 
     # returns the Obj's name, i.e. the last component of the path.
@@ -207,7 +208,7 @@ module RailsConnector
 
     # returns the obj's permalink.
     def permalink
-      read_attribute_value('_permalink')
+      read_attribute('_permalink')
     end
 
     # This method determines the controller that should be invoked when the Obj is requested.
@@ -236,12 +237,12 @@ module RailsConnector
     end
 
     def title
-      read_attribute_value('title')
+      read_attribute('title')
     end
 
     # Returns the type of the object: :document, :publication, :image or :generic
     def object_type
-      read_attribute_value('_obj_type').to_sym
+      read_attribute('_obj_type').to_sym
     end
 
     # Returns true if image? or generic?
@@ -286,7 +287,7 @@ module RailsConnector
     # (for example a teaser) and will not be delivered by the rails application
     # as a standalone web page.
     def suppressed?
-      read_raw_attribute_value('_suppress_export') ? true : false
+      read_attribute('_suppress_export') ? true : false
     end
 
     # Returns true if the export of the object is not suppressed and the content is active?
@@ -360,7 +361,7 @@ module RailsConnector
     end
 
     def sort_order # :nodoc:
-      read_attribute_value('_sort_order') == 1 ? "descending" : "ascending"
+      read_attribute('_sort_order') == 1 ? "descending" : "ascending"
     end
 
     def sort_type1 # :nodoc:
@@ -376,15 +377,15 @@ module RailsConnector
     end
 
     def sort_key1 # :nodoc:
-      converted_sort_key('_sort_key1')
+      read_attribute('_sort_key1')
     end
 
     def sort_key2 # :nodoc:
-      converted_sort_key('_sort_key2')
+      read_attribute('_sort_key2')
     end
 
     def sort_key3 # :nodoc:
-      converted_sort_key('_sort_key3')
+      read_attribute('_sort_key3')
     end
 
     # Returns the Object with the given name next in the hierarchy
@@ -440,28 +441,28 @@ module RailsConnector
     # Notice that the ruby class of this Obj instance will NOT change,
     # even if the obj_class in the database has changed.
     def reload
-      obj_data = Revision.current.find_obj_data_by(:id, [id.to_s]).first.first
-      update_data(obj_data["values"], obj_data)
+      obj_data = CmsBackend.find_obj_data_by(Revision.current, :id, [id.to_s]).first.first
+      update_data(obj_data)
     end
 
     def text_links
-      read_attribute_value('_text_links')
+      read_attribute('_text_links')
     end
 
     def obj_class
-      read_attribute_value('_obj_class')
+      read_attribute('_obj_class')
     end
 
     def last_changed
-      read_attribute_value('_last_changed')
+      read_attribute('_last_changed')
     end
 
     def valid_from
-      read_attribute_value('_valid_from')
+      read_attribute('_valid_from')
     end
 
     def valid_until
-      read_attribute_value('_valid_until')
+      read_attribute('_valid_until')
     end
 
     # For a binary Obj, the content_type is equal to the content_type of it's body (i.e. it's data).
@@ -496,12 +497,6 @@ module RailsConnector
       end
     end
 
-    # Returns a list of the names of all custom attributes defined for this Obj as Symbols.
-    # A custom attribute is a user-defined attribute, i.e. one that is not built-in in the CMS.
-    def custom_attribute_names
-      obj_class_instance.attributes.map(&:to_sym)
-    end
-
     def self.preview_time=(t) # :nodoc:
       Thread.current[:preview_time] = t
     end
@@ -515,42 +510,27 @@ module RailsConnector
     end
 
     def has_attribute?(name)
-      obj_class_instance.has_attribute?(name)
+      data_from_cms.has_attribute?(name.to_s)
     end
 
     private
 
-    def obj_class_instance
-      ObjClass.by_name(obj_class)
-    end
+    attr_accessor :data_from_cms
 
-    def update_data(values = {}, meta = {})
-      @values = values || {}
-      meta ||= {}
-      @rtc_ref = meta['rtc_ref']
-      @ext_ref = meta['ext_ref']
+    def update_data(data)
+      self.data_from_cms = data
       @attribute_cache = {}
     end
 
     def read_attribute(attribute_name)
-      attribute_type = Attribute.type_of(attribute_name)
-      if type_of(attribute_name) == attribute_type
-        read_attribute_value(attribute_name, attribute_type)
-      else
-        default_attribute_value(attribute_type)
-      end
-    end
-
-    def read_attribute_value(attribute_name, attribute_type = nil)
       @attribute_cache.fetch(attribute_name) do
-        attribute_type ||= type_of(attribute_name)
-        attribute_value = read_raw_attribute_value(attribute_name)
+        (raw_value, attribute_type) = data_from_cms.value_and_type_of(attribute_name)
         @attribute_cache[attribute_name] =
-            prepare_attribute_value(attribute_name, attribute_type, attribute_value)
+          prepare_attribute_value(raw_value, attribute_type)
       end
     end
 
-    def prepare_attribute_value(attribute_name, attribute_type, attribute_value)
+    def prepare_attribute_value(attribute_value, attribute_type)
       case attribute_type
       when :markdown
         StringTagging.tag_as_markdown(attribute_value, self)
@@ -559,64 +539,12 @@ module RailsConnector
       when :date
         DateAttribute.parse(attribute_value) if attribute_value
       when :linklist
-        if attribute_name == '_text_links'
-          LinkList.new(attribute_value && attribute_value.values)
-        else
-          LinkList.new(attribute_value)
-        end
+        LinkList.new(attribute_value)
       else
         attribute_value
       end
     end
 
-    def default_attribute_value(attribute_type)
-      case attribute_type
-      when :linklist
-        LinkList.new(nil)
-      when :multienum
-        []
-      else
-        nil
-      end
-    end
-
-    def attributes
-      @attributes ||= @rtc_ref ? attributes_from_rtc : {}
-    end
-
-    def attributes_from_rtc
-      rtc = DictStorage.get(@rtc_ref)
-      if rtc['obj_classes'] && rtc['attributes'] && oc = rtc['obj_classes'][@values['_obj_class']]
-        rtc['attributes'].inject({}) do |attrs, (name, value)|
-          attrs[name] = value if oc['attributes'] && oc['attributes'].include?(name)
-          attrs
-        end
-      else
-        {}
-      end
-    end
-
-    def type_of(key)
-      key = key.to_s
-      case key
-      when "_text_links"
-        :linklist
-      when "_valid_from"
-        :date
-      when "_valid_until"
-        :date
-      when "_last_changed"
-        :date
-      when "title"
-        :html
-      else
-        if attr_def = attributes[key]
-          type = attr_def["type"]
-          type.to_sym if type
-        end
-      end
-    end
-
     def as_date(value)
       DateAttribute.parse(value) unless value.nil?
     end
@@ -650,37 +578,7 @@ module RailsConnector
     end
 
     def converted_sort_type(attribute)
-      read_attribute_value(attribute) == 1 ? "numeric" : "alphaNumeric"
-    end
-
-    def converted_sort_key(attribute)
-      key = read_attribute_value(attribute)
-      case key
-      when "_valid_until"
-        "_valid_until"
-      when "_valid_from"
-        "_valid_from"
-      when "_last_changed"
-        "_last_changed"
-      else
-        key
-      end
-    end
-
-    def read_raw_attribute_value(attribute_name)
-      return @values[attribute_name] if @values.key?(attribute_name)
-      if @ext_ref && (attribute_name == "_text_links" || ?_ != attribute_name[0])
-        extend_values_with_dict_storage_values
-      end
-      @values[attribute_name]
-    end
-
-    def extend_values_with_dict_storage_values
-      # may raise Kvom::Storage::NotFound
-      values = DictStorage.get(@ext_ref)
-      @values.reverse_merge!(values)
-      @ext_ref = nil
-      @values
+      read_attribute(attribute) == 1 ? "numeric" : "alphaNumeric"
     end
 
     class << self
@@ -705,4 +603,3 @@ module RailsConnector
   end
 
 end
-

data/lib/rails_connector/obj_body.rb

@@ -7,7 +7,7 @@ module ObjBody
     if binary?
       nil
     else
-      StringTagging.tag_as_html(read_attribute_value('body'), self)
+      StringTagging.tag_as_html(read_attribute('body'), self)
     end
   end
 
@@ -52,7 +52,7 @@ module ObjBody
   private
 
   def find_blob
-    blob_spec = read_attribute_value('blob')
+    blob_spec = read_attribute('blob')
     Blob.find(blob_spec["id"], :context => path) if blob_spec
   end
 end

data/lib/rails_connector/obj_data.rb

@@ -0,0 +1,19 @@
+#:enddoc:
+module RailsConnector
+
+  class ObjData
+    def value_of(attribute_name)
+      value_and_type_of(attribute_name).first
+    end
+
+    def value_and_type_of(attribute_name)
+      raise "implement in subclass"
+    end
+
+    def has_attribute?(name)
+      raise "implement in subclass"
+    end
+
+  end
+
+end

data/lib/rails_connector/obj_data_from_database.rb

@@ -0,0 +1,126 @@
+#:enddoc:
+module RailsConnector
+
+  class ObjDataFromDatabase < ObjData
+
+    def initialize(data, revision)
+      @rtc_ref = data["rtc_ref"]
+      @values = data["values"]
+      @ext_ref = data["ext_ref"]
+      @revision = revision
+    end
+
+    def value_and_type_of(attribute_name)
+      if internal_attribute?(attribute_name)
+        attribute_type = type_of_internal(attribute_name)
+
+        attribute_value = read_value(attribute_name)
+        if attribute_name == '_text_links'
+          attribute_value = attribute_value && attribute_value.values
+        end
+      else
+        attribute_type = current_attribute_type(attribute_name)
+        if legacy_attribute_type(attribute_name) == attribute_type
+          attribute_value = read_value(attribute_name)
+        else
+          attribute_value = default_attribute_value(attribute_type)
+        end
+      end
+
+      [attribute_value, attribute_type]
+    end
+
+    def has_attribute?(name)
+      obj_class_attributes.include?(name)
+    end
+
+    private
+
+    attr_reader :values, :ext_ref, :rtc_ref, :revision
+
+    def current_attribute_type(name)
+      revision.attributes[name]["type"].to_sym
+    end
+
+    def obj_class_attributes
+      name = values["_obj_class"]
+      if data = revision.obj_classes[name]
+        data["attributes"] || []
+      else
+        raise "Could not find ObjClass with name #{name} in Revision #{revision.id}!"
+      end
+    end
+
+    def read_value(attribute_name)
+      return values[attribute_name] if values.key?(attribute_name)
+      if ext_ref && (attribute_name == "_text_links" || ?_ != attribute_name[0])
+        extend_values_with_dict_storage_values
+      end
+      values[attribute_name]
+    end
+
+    def extend_values_with_dict_storage_values
+      # may raise Kvom::Storage::NotFound
+      ext_values = DictStorage.get(ext_ref)
+      values.reverse_merge!(ext_values)
+      @ext_ref = nil
+    end
+
+    SPECIAL_INTERNAL_ATTRIBUTES = Set.new(%w[title body blob])
+
+    def internal_attribute?(attribute_name)
+      ?_ == attribute_name[0] || SPECIAL_INTERNAL_ATTRIBUTES.include?(attribute_name)
+    end
+
+    def type_of_internal(key)
+      case key
+      when "_text_links"
+        :linklist
+      when "_valid_from"
+        :date
+      when "_valid_until"
+        :date
+      when "_last_changed"
+        :date
+      when "title"
+        :html
+      end
+    end
+
+    def legacy_attribute_type(name)
+      if attr_def = legacy_attributes[name]
+        type = attr_def["type"]
+        type.to_sym if type
+      end
+    end
+
+    def default_attribute_value(attribute_type)
+      case attribute_type
+      when :linklist
+        []
+      when :multienum
+        []
+      else
+        nil
+      end
+    end
+
+    def legacy_attributes
+      @attributes ||=
+        begin
+          rtc = DictStorage.get(rtc_ref)
+          if rtc['obj_classes'] && rtc['attributes'] && oc = rtc['obj_classes'][values['_obj_class']]
+            rtc['attributes'].inject({}) do |attrs, (name, value)|
+              attrs[name] = value if oc['attributes'] && oc['attributes'].include?(name)
+              attrs
+            end
+          else
+            {}
+          end
+        end
+    end
+
+  end
+
+end
+

data/lib/rails_connector/obj_data_from_hash.rb

@@ -0,0 +1,20 @@
+#:enddoc:
+module RailsConnector
+
+  class ObjDataFromHash < ObjData
+    def initialize(hash)
+      @hash = hash
+    end
+
+    def value_and_type_of(attribute_name)
+      [@hash[attribute_name], nil]
+    end
+
+    def has_attribute?(name)
+      @hash.has_key?(name)
+    end
+
+  end
+
+end
+

data/lib/rails_connector/revision.rb

@@ -2,8 +2,6 @@
 module RailsConnector
 
   class Revision < CmsBaseModel
-    CACHE_PREFIX = 'revision'
-
     self.key_prefix = "rev"
 
     property :generation
@@ -34,31 +32,6 @@ module RailsConnector
       find_by_label("published")
     end
 
-    def self.begin_caching
-      @editable_cache = Configuration.cache_editable_workspaces ? persistent_cache : Cache.new
-      @read_only_cache = persistent_cache
-    end
-
-    def self.end_caching
-      @editable_cache = @read_only_cache = nil
-    end
-
-    def self.caching?
-      @read_only_cache && @editable_cache
-    end
-
-    def self.cache_for(revision)
-      revision.editable ? @editable_cache : @read_only_cache
-    end
-
-    def find_obj_data_by(index, keys)
-      if self.class.caching?
-        find_obj_data_from_cache_or_database_by(index, keys)
-      else
-        find_obj_data_from_database_by(index, keys)
-      end
-    end
-
     def chain
       @chain ||= Chain.build_for(self, content_cache)
     end
@@ -97,91 +70,8 @@ module RailsConnector
 
     private
 
-    def self.persistent_cache
-      Cache.new(:fallback_backend => Rails.cache, :cache_prefix => CACHE_PREFIX)
-    end
-
-    def find_obj_data_from_database_by(index, keys)
-      return [] if keys.blank?
-      instrumenter = ActiveSupport::Notifications.instrumenter
-      instrumenter.instrument(
-        "cms_load.rails_connector", :name => "Obj Load", :index => index, :keys => keys
-      ) do
-        keys.map do |key|
-          results = chain.query(index, key)
-          results.values.map { |row| extract_obj_data(row) }
-        end
-      end
-    end
-
-    def find_obj_data_from_cache_or_database_by(index, keys)
-      keys_from_database = []
-      # load results from cache
-      results_from_cache = keys.map do |key|
-        cache.read(cache_key_for(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_obj_data_from_database_by(index, keys_from_database)
-      keys_from_database.each_with_index do |key, key_number|
-        store_obj_data_list_in_cache(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
-
-    UNIQUE_INDICES = [:id, :path, :permalink].freeze
-    OBJ_PROPERTY_VALUE_TO_RANGE_VALUE_CONVERSIONS = {
-      :path => PathConversion.method(:path_from_list)
-    }.freeze
-
-    def store_obj_data_list_in_cache(index, key, obj_data_list)
-      obj_data_list.each do |obj_data|
-        values = obj_data["values"]
-        UNIQUE_INDICES.each do |unique_index|
-          index_value = values["_#{unique_index}"]
-          if (converter = OBJ_PROPERTY_VALUE_TO_RANGE_VALUE_CONVERSIONS[unique_index])
-            index_value = converter.call(index_value)
-          end
-          store_item_in_cache(unique_index, index_value, [obj_data])
-        end
-      end
-      unless UNIQUE_INDICES.include?(index)
-        store_item_in_cache(index, key, obj_data_list)
-      end
-    end
-
-    def store_item_in_cache(index, key, item)
-      cache.write(cache_key_for(index, key), item) if self.class.caching?
-    end
-
-    def cache_key_for(index, key)
-      "#{id}/obj/#{index}/#{key}"
-    end
-
-    def extract_obj_data(data)
-      {
-        "values" => data["values"].merge(
-          "_id" => data["obj_id"],
-          "_obj_type" => data["obj_type"],
-          "_obj_class" => data["obj_class_name"]
-        ),
-        "rtc_ref" => data["rtc_ref"],
-        "ext_ref" => data["ext_ref"],
-      }
-    end
-
     def rtc
       @rtc ||= DictStorage.get(read_attribute("rtc_ref"))
     end
-
-    def cache
-      self.class.cache_for(self)
-    end
   end
 end

metadata

@@ -1,18 +1,19 @@
 --- !ruby/object:Gem::Specification 
 name: infopark_cloud_connector
 version: !ruby/object:Gem::Version 
-  hash: -306389274
-  prerelease: 6
+  hash: -358797853
+  prerelease: 9
   segments: 
   - 6
   - 8
   - 0
-  - beta
-  - 200
-  - 891
-  - 647580
-  - e
-  version: 6.8.0.beta.200.891.647580e
+  - 15
+  - a
+  - 24
+  - f
+  - 5
+  - ff
+  version: 6.8.0.15.a24f5ff
 platform: ruby
 authors: 
 - Infopark AG
@@ -20,7 +21,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-29 00:00:00 +02:00
+date: 2012-09-13 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -60,17 +61,18 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: -306389274
+        hash: -358797853
         segments: 
         - 6
         - 8
         - 0
-        - beta
-        - 200
-        - 891
-        - 647580
-        - e
-        version: 6.8.0.beta.200.891.647580e
+        - 15
+        - a
+        - 24
+        - f
+        - 5
+        - ff
+        version: 6.8.0.15.a24f5ff
   version_requirements: *id003
   name: kvom
   prerelease: false
@@ -85,17 +87,19 @@ extra_rdoc_files: []
 
 files: 
 - lib/infopark_cloud_connector.rb
-- lib/rails_connector/attribute.rb
 - lib/rails_connector/blob.rb
 - lib/rails_connector/cache.rb
 - lib/rails_connector/cache_middleware.rb
 - lib/rails_connector/chain.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/content_cache.rb
 - 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
@@ -103,7 +107,9 @@ files:
 - lib/rails_connector/named_link.rb
 - lib/rails_connector/obj.rb
 - lib/rails_connector/obj_body.rb
-- lib/rails_connector/obj_class.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/path_conversion.rb
 - lib/rails_connector/permission.rb
 - lib/rails_connector/rack_middlewares.rb

data/lib/rails_connector/attribute.rb

@@ -1,20 +0,0 @@
-#:enddoc:
-module RailsConnector
-  class Attribute
-    attr_reader :name, :type
-
-    def initialize(data)
-      @name, @type = data['name'], data['type'].to_sym
-    end
-
-    def self.by_name(name)
-      data = Revision.current.attributes[name.to_s]
-      new(data) if data
-    end
-
-    def self.type_of(name)
-      attribute = by_name(name)
-      attribute.type if attribute
-    end
-  end
-end

data/lib/rails_connector/obj_class.rb

@@ -1,22 +0,0 @@
-#:enddoc:
-module RailsConnector
-  class ObjClass
-    attr_reader :name, :attributes
-
-    def initialize(data)
-      @name, @attributes = data['name'], data['attributes'] || []
-    end
-
-    def self.by_name(name)
-      if data = Revision.current.obj_classes[name.to_s]
-        new(data)
-      else
-        raise ResourceNotFound, "Could not find #{self} with name #{name}"
-      end
-    end
-
-    def has_attribute?(attribute_name)
-      @attributes.include?(attribute_name.to_s)
-    end
-  end
-end