infopark_cloud_connector 6.8.0.beta.200.713.e5c3150 → 6.8.0.beta.200.720.44fbabd

data/lib/rails_connector/attribute.rb

@@ -8,7 +8,7 @@ module RailsConnector
     end
 
     def self.by_name(name)
-      data = Workspace.current.attributes[name.to_s]
+      data = Revision.current.attributes[name.to_s]
       new(data) if data
     end
 

data/lib/rails_connector/chain.rb

@@ -5,17 +5,17 @@ class Chain
   # the id of the content cache to use, or nil
   attr_reader :content_cache
 
-  # a chain of patch operations that can be used to construct the target workspace
+  # a chain of patch operations that can be used to construct the target revision
   # each chain member is an array with two elements.
   # the first element denotes the patch type (-1, 1), where
-  # 1 => apply the workspace
-  # -1 => revert the workspace
-  # and the second element is the workspace.
+  # 1 => apply the revision
+  # -1 => revert the revision
+  # and the second element is the revision.
   attr_reader :patches
 
-  def self.build_for(workspace, content_cache = nil)
-    if content_cache && content_cache.workspace
-      patches = patches_to(workspace, content_cache.workspace)
+  def self.build_for(revision, content_cache = nil)
+    if content_cache && content_cache.revision
+      patches = patches_to(revision, content_cache.revision)
 
       if content_cache.transfer_target
         if patches.present? && patches.first.second == content_cache.transfer_target
@@ -27,7 +27,7 @@ class Chain
 
       new(content_cache, patches)
     else
-      new(nil, patches_to(workspace))
+      new(nil, patches_to(revision))
     end
   end
 
@@ -44,7 +44,7 @@ class Chain
     @patches = patches
   end
 
-  # performs a workspace aware query on the cms database.
+  # performs a revision aware query on the cms database.
   #
   # returns a hash of results from the query.
   # the keys are the criterion by which the query results are grouped (typically the OBJ ID).
@@ -57,23 +57,23 @@ class Chain
     version_map = result_map.merge(result_map) do |ignore, results|
       results.map {|row| Version.new(row) }
     end
-    workspace_aware_results(version_map)
+    revision_aware_results(version_map)
   end
 
   private
 
-  # calculate a list of patches to get to the destionation workspace.
+  # calculate a list of patches to get to the destionation revision.
   # if origin is given, the list will start at origin.
-  # otherwise the list will start at the initial workspace.
+  # otherwise the list will start at the initial revision.
   def self.patches_to(destination, origin = nil)
     if destination.nil? && origin.nil?
       []
     elsif origin.nil? || origin.generation < destination.generation
-      patches_to(destination.base_workspace, origin) + [[1, destination]]
+      patches_to(destination.base_revision, origin) + [[1, destination]]
     elsif destination.nil? || origin.generation > destination.generation
-      [[-1, origin]] + patches_to(destination, origin.base_workspace)
+      [[-1, origin]] + patches_to(destination, origin.base_revision)
     elsif origin != destination
-      [[-1, origin]] + patches_to(destination.base_workspace, origin.base_workspace) + [[1, destination]]
+      [[-1, origin]] + patches_to(destination.base_revision, origin.base_revision) + [[1, destination]]
     else # origin == destination
       []
     end
@@ -94,7 +94,7 @@ class Chain
     end
     if patches.present?
       result_map[:patches] = CmsBaseModel.query_index(:obj, index, query_options.merge({
-        :range_value => workspace_range,
+        :range_value => revision_range,
       }))
     end
 
@@ -110,12 +110,12 @@ class Chain
       results << [1, result_map[:content_cache]]
     end
     if result_map[:patches].present?
-      results_by_workspace = result_map[:patches].group_by do |version|
-        version.workspace_id
+      results_by_revision = result_map[:patches].group_by do |version|
+        version.revision_id
       end
-      patches.each do |(patch_diff_type, workspace)|
-        results_for_workspace = results_by_workspace[workspace.id]
-        results << [patch_diff_type, results_for_workspace] if results_for_workspace
+      patches.each do |(patch_diff_type, revision)|
+        results_for_revision = results_by_revision[revision.id]
+        results << [patch_diff_type, results_for_revision] if results_for_revision
       end
     end
 
@@ -140,8 +140,8 @@ class Chain
   end
 
   # apply the diff chain for each of obj
-  # to determine which of them are included in the final workspace
-  def workspace_aware_results(result_map)
+  # to determine which of them are included in the final revision
+  def revision_aware_results(result_map)
     result_index = {}
 
     # note: using merge as a map function for hashes
@@ -162,11 +162,11 @@ class Chain
 
   private
 
-  def workspace_range
-    @workspace_range ||=
+  def revision_range
+    @revision_range ||=
       begin
-        sorted_keys = patches.map do |(type, workspace)|
-          "#{"%010d" % workspace.generation}/#{workspace.id}"
+        sorted_keys = patches.map do |(type, revision)|
+          "#{"%010d" % revision.generation}/#{revision.id}"
         end.sort
         Range.new(sorted_keys.first, sorted_keys.last)
       end

data/lib/rails_connector/content_cache.rb

@@ -7,21 +7,16 @@ class ContentCache < CmsBaseModel
   property :revision_id
   property :transferring_to
 
-  # TODO remove when renaming workspace to revision in code
-  def workspace_id
-    revision_id
+  # returns the revision that is represented by this content cache.
+  # returns nil if the revision cannot be found.
+  def revision
+    @revision ||= Revision.find_by_id(revision_id)
   end
 
-  # returns the workspace that is represented by this content cache.
-  # returns nil if the workspace cannot be found.
-  def workspace
-    @workspace ||= Workspace.find_by_id(workspace_id)
-  end
-
-  # returns the workspace that this content cache is currently transferring to.
-  # returns nil if no transfer is taking place or if the workspace cannot be found.
+  # returns the revision that this content cache is currently transferring to.
+  # returns nil if no transfer is taking place or if the revision cannot be found.
   def transfer_target
-    @transfer_target ||= transferring_to ? Workspace.find_by_id(transferring_to) : nil
+    @transfer_target ||= transferring_to ? Revision.find_by_id(transferring_to) : nil
   end
 end
 

data/lib/rails_connector/obj.rb

@@ -105,7 +105,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:
-      Workspace.current.find_obj_data_by(view, keys).map do |list|
+      Revision.current.find_obj_data_by(view, keys).map do |list|
         list.map { |obj_data| Obj.instantiate(obj_data) }
       end
     end
@@ -438,7 +438,7 @@ 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 = Workspace.current.find_obj_data_by(:id, [id.to_s]).first.first
+      obj_data = Revision.current.find_obj_data_by(:id, [id.to_s]).first.first
       update_data(obj_data["values"], obj_data)
     end
 

data/lib/rails_connector/obj_class.rb

@@ -8,7 +8,7 @@ module RailsConnector
     end
 
     def self.by_name(name)
-      data = Workspace.current.obj_classes[name.to_s]
+      data = Revision.current.obj_classes[name.to_s]
       new(data) if data
     end
 

data/lib/rails_connector/revision.rb

@@ -0,0 +1,142 @@
+#:enddoc:
+module RailsConnector
+
+  class Revision < CmsBaseModel
+
+    self.key_prefix = "rev"
+
+    property :generation
+    property :base_revision_id
+    property :title
+    property :content_cache_id
+    property :attributes
+    property :obj_classes
+
+    # Selects the revision with the given id as current revision
+    def self.current=(revision)
+      @current = revision
+    end
+
+    def self.current
+      @current || default
+    end
+
+    def self.find_by_label(label_name)
+      workspace = Workspace.find(label_name)
+      find(workspace.revision_id)
+    end
+
+    def self.default
+      find_by_label("published")
+    end
+
+    def find_obj_data_by(index, keys)
+      find_obj_data_from_cache_or_database_by(index, keys)
+    end
+
+    def chain
+      @chain ||= Chain.build_for(self, content_cache)
+    end
+
+    def invalidate_chain
+      @chain = nil
+    end
+
+    # returns the base revision or nil for an initial revision
+    def base_revision
+      @base_revision ||= base_revision_id ? Revision.find(base_revision_id) : nil
+    end
+
+    # returns the content cache to be used with this revision or nil if not available
+    def content_cache
+      if content_cache_id
+        if @content_cache && content_cache_id == @content_cache.id
+          @content_cache
+        else
+          @content_cache = ContentCache.find_by_id(content_cache_id)
+        end
+      end
+    end
+
+    def inspect
+      "<#{self.class} id=\"#{id}\" title=\"#{title}\">"
+    end
+
+    private
+
+    COMPOUND_KEY_INDICES = [:ppath].freeze
+
+    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, COMPOUND_KEY_INDICES.include?(index))
+          results.values.map { |row| extract_obj_data(row) }
+        end
+      end
+    end
+
+    def find_obj_data_from_cache_or_database_by(index, keys)
+      # load results from cache
+      keys_from_database = []
+      results_from_cache = keys.map do |key|
+        Cache.load([:obj, 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.store([:obj, index, key], item)
+    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"]
+        ),
+        "attributes" => data["attributes"],
+        "ext_ref" => data["ext_ref"],
+      }
+    end
+
+  end
+
+end

data/lib/rails_connector/version.rb

@@ -10,7 +10,7 @@ class Version
     @doc["obj_id"]
   end
 
-  def workspace_id
+  def revision_id
     @doc["revision_id"]
   end
 

data/lib/rails_connector/workspace.rb

@@ -1,147 +1,11 @@
 #:enddoc:
 module RailsConnector
 
-  class Workspace < CmsBaseModel
+class Workspace < CmsBaseModel
+  self.key_prefix = "ws"
 
-    self.key_prefix = "rev"
+  property :revision_id
 
-    property :generation
-    property :base_revision_id
-    property :title
-    property :content_cache_id
-    property :attributes
-    property :obj_classes
-
-    # TODO remove when renaming workspace to revision in code
-    def base_workspace_id
-      base_revision_id
-    end
-
-    # Selects the workspace with the given id as current workspace
-    def self.current=(workspace)
-      @current = workspace
-    end
-
-    def self.current
-      @current || Workspace.default
-    end
-
-    def self.find_by_label(label_name)
-      label = WorkspaceLabel.find(label_name)
-      find(label.workspace_id)
-    end
-
-    def self.default
-      Workspace.find_by_label("published")
-    end
-
-    def find_obj_data_by(index, keys)
-      find_obj_data_from_cache_or_database_by(index, keys)
-    end
-
-    def chain
-      @chain ||= Chain.build_for(self, content_cache)
-    end
-
-    def invalidate_chain
-      @chain = nil
-    end
-
-    # returns the base workspace or nil for an initial workspace
-    def base_workspace
-      @base_workspace ||= base_workspace_id ? Workspace.find(base_workspace_id) : nil
-    end
-
-    # returns the content cache to be used with this workspace or nil if not available
-    def content_cache
-      if content_cache_id
-        if @content_cache && content_cache_id == @content_cache.id
-          @content_cache
-        else
-          @content_cache = ContentCache.find_by_id(content_cache_id)
-        end
-      end
-    end
-
-    def inspect
-      "<#{self.class} id=\"#{id}\" title=\"#{title}\">"
-    end
-
-    private
-
-    COMPOUND_KEY_INDICES = [:ppath].freeze
-
-    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, COMPOUND_KEY_INDICES.include?(index))
-          results.values.map { |row| extract_obj_data(row) }
-        end
-      end
-    end
-
-    def find_obj_data_from_cache_or_database_by(index, keys)
-      # load results from cache
-      keys_from_database = []
-      results_from_cache = keys.map do |key|
-        Cache.load([:obj, 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.store([:obj, index, key], item)
-    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"]
-        ),
-        "attributes" => data["attributes"],
-        "ext_ref" => data["ext_ref"],
-      }
-    end
-
-  end
+end
 
 end

data/lib/rails_connector/workspace_selection_middleware.rb

@@ -11,7 +11,7 @@ class WorkspaceSelectionMiddleware
 
   def call(env)
     handle_workspace_parameter(env)
-    Workspace.current = workspace_to_show(env)
+    Revision.current = workspace_to_show(env)
 
     @app.call(env)
   end
@@ -30,9 +30,9 @@ class WorkspaceSelectionMiddleware
 
   def workspace_to_show(env)
     if preview_workspace = session(env)[CURRENT_WORKSPACE_SESSION_KEY]
-      Workspace.find(preview_workspace)
+      Revision.find(preview_workspace)
     else
-      Workspace.default
+      Revision.default
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: infopark_cloud_connector
 version: !ruby/object:Gem::Version 
-  hash: 2363298151
+  hash: -23731721781
   prerelease: 6
   segments: 
   - 6
@@ -9,12 +9,10 @@ version: !ruby/object:Gem::Version
   - 0
   - beta
   - 200
-  - 713
-  - e
-  - 5
-  - c
-  - 3150
-  version: 6.8.0.beta.200.713.e5c3150
+  - 720
+  - 44
+  - fbabd
+  version: 6.8.0.beta.200.720.44fbabd
 platform: ruby
 authors: 
 - Infopark AG
@@ -22,7 +20,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-29 00:00:00 +02:00
+date: 2012-07-02 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -63,19 +61,17 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 2363298151
+        hash: -23731721781
         segments: 
         - 6
         - 8
         - 0
         - beta
         - 200
-        - 713
-        - e
-        - 5
-        - c
-        - 3150
-        version: 6.8.0.beta.200.713.e5c3150
+        - 720
+        - 44
+        - fbabd
+        version: 6.8.0.beta.200.720.44fbabd
   version_requirements: *id003
   name: kvom
   prerelease: false
@@ -114,10 +110,10 @@ files:
 - 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/version.rb
 - lib/rails_connector/workspace.rb
-- lib/rails_connector/workspace_label.rb
 - lib/rails_connector/workspace_selection_middleware.rb
 - README
 has_rdoc: true

data/lib/rails_connector/workspace_label.rb

@@ -1,15 +0,0 @@
-#:enddoc:
-module RailsConnector
-
-class WorkspaceLabel < CmsBaseModel
-  self.key_prefix = "ws"
-
-  property :revision_id
-
-  # TODO remove when renaming workspace to revision in code
-  def workspace_id
-    revision_id
-  end
-end
-
-end