infopark_cloud_connector 6.8.0.beta.200.650.7c93155 → 6.8.0.beta.200.663.ceecdee

data/lib/rails_connector/content_cache.rb

@@ -4,9 +4,14 @@ module RailsConnector
 class ContentCache < CmsBaseModel
   self.key_prefix = "cc"
 
-  property :workspace_id
+  property :revision_id
   property :transferring_to
 
+  # TODO remove when renaming workspace to revision in code
+  def workspace_id
+    revision_id
+  end
+
   # returns the workspace that is represented by this content cache.
   # returns nil if the workspace cannot be found.
   def workspace

data/lib/rails_connector/obj.rb

@@ -26,14 +26,14 @@ module RailsConnector
     # 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_class = obj_data["values"]["_obj_class"]
       Obj.compute_type(obj_class).new(
         obj_data["values"], obj_data
       )
     end
 
     def id
-      @values["id"]
+      @values["_id"]
     end
 
     ### FINDERS ####################
@@ -163,7 +163,7 @@ module RailsConnector
     end
 
     def path_list # :nodoc:
-      read_attribute(:path) || []
+      read_attribute(:_path) || []
     end
 
     # returns the Obj's name, i.e. the last component of the path.
@@ -211,7 +211,7 @@ module RailsConnector
 
     # returns the obj's permalink.
     def permalink
-      read_attribute(:permalink)
+      read_attribute(:_permalink)
     end
 
     # This method determines the controller that should be invoked when the Obj is requested.
@@ -245,7 +245,7 @@ module RailsConnector
 
     # Returns the type of the object: :document, :publication, :image or :generic
     def object_type
-      read_attribute(:obj_type).to_sym
+      read_attribute(:_obj_type).to_sym
     end
 
     # Returns true if image? or generic?
@@ -290,7 +290,7 @@ module RailsConnector
     # (for example a teaser) and will not be delivered by the rails application
     # as a standalone web page.
     def suppressed?
-      @values["suppress_export"] ? true : false
+      @values["_suppress_export"] ? true : false
     end
 
     # Returns true if the export of the object is not suppressed and the content is active?
@@ -364,31 +364,31 @@ module RailsConnector
     end
 
     def sort_order # :nodoc:
-      read_attribute(:sort_order) == 1 ? "descending" : "ascending"
+      read_attribute(:_sort_order) == 1 ? "descending" : "ascending"
     end
 
     def sort_type1 # :nodoc:
-      converted_sort_type(:sort_type1)
+      converted_sort_type(:_sort_type1)
     end
 
     def sort_type2 # :nodoc:
-      converted_sort_type(:sort_type2)
+      converted_sort_type(:_sort_type2)
     end
 
     def sort_type3 # :nodoc:
-      converted_sort_type(:sort_type3)
+      converted_sort_type(:_sort_type3)
     end
 
     def sort_key1 # :nodoc:
-      converted_sort_key(:sort_key1)
+      converted_sort_key(:_sort_key1)
     end
 
     def sort_key2 # :nodoc:
-      converted_sort_key(:sort_key2)
+      converted_sort_key(:_sort_key2)
     end
 
     def sort_key3 # :nodoc:
-      converted_sort_key(:sort_key3)
+      converted_sort_key(:_sort_key3)
     end
 
     # Returns the Object with the given name next in the hierarchy
@@ -399,18 +399,38 @@ module RailsConnector
       parent.find_nearest(name) unless self.root?
     end
 
+    OLD_INTERNAL_KEYS = Set.new(%w(
+      body
+      id
+      last_changed
+      name
+      obj_class
+      obj_type
+      path
+      permalink
+      sort_key1
+      sort_key2
+      sort_key3
+      sort_order
+      sort_type1
+      sort_type2
+      sort_type3
+      suppress_export
+      text_links
+      valid_from
+      valid_until
+    ))
     # Returns the value of the attribute specified by its name.
     #
     # Passing an invalid key will not raise an error, but return nil.
     def [](raw_key)
       key = raw_key.to_s
-      case key
-        when "name"
-          name
-        when "body"
-          body
-        else
-          read_attribute(key)
+      if OLD_INTERNAL_KEYS.include?(key)
+        send(key)
+      elsif key.start_with?('_')
+        send(key.slice(1..-1))
+      else
+        read_attribute(key)
       end
     end
 
@@ -422,16 +442,24 @@ module RailsConnector
       update_data(obj_data["values"], obj_data)
     end
 
+    def text_links
+      read_attribute(:_text_links)
+    end
+
+    def obj_class
+      read_attribute(:_obj_class)
+    end
+
     def last_changed
-      self[:last_changed]
+      read_attribute(:_last_changed)
     end
 
     def valid_from
-      self[:valid_from]
+      read_attribute(:_valid_from)
     end
 
     def valid_until
-      self[: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).
@@ -499,41 +527,35 @@ module RailsConnector
 
     def read_attribute(name)
       name = name.to_s
-      if name == "suppress_export"
-        suppress_export
-      else
-        raw = @values[name]
-        @attr_cache[name] ||= case type_of(name)
-          when :markdown
-            StringTagging.tag_as_markdown(raw, self)
-          when :html
-            StringTagging.tag_as_html(raw, self)
-          when :date
-            DateAttribute.parse raw if raw
-          when :linklist
-            if name == "text_links"
-              LinkList.new(raw.values)
-            else
-              LinkList.new(raw)
-            end
+      raw = @values[name]
+      @attr_cache[name] ||= case type_of(name)
+        when :markdown
+          StringTagging.tag_as_markdown(raw, self)
+        when :html
+          StringTagging.tag_as_html(raw, self)
+        when :date
+          DateAttribute.parse raw if raw
+        when :linklist
+          if name == "_text_links"
+            LinkList.new(raw.values)
           else
-            raw
-        end
+            LinkList.new(raw)
+          end
+        else
+          raw
       end
     end
 
     def type_of(key)
       key = key.to_s
       case key
-      when "permission_live_server_read"
-        nil
-      when "text_links"
+      when "_text_links"
         :linklist
-      when "valid_from"
+      when "_valid_from"
         :date
-      when "valid_until"
+      when "_valid_until"
         :date
-      when "last_changed"
+      when "_last_changed"
         :date
       when "title"
         :html
@@ -584,14 +606,12 @@ module RailsConnector
     def converted_sort_key(attribute)
       key = read_attribute(attribute)
       case key
-      when "validUntil"
-        "valid_until"
-      when "validFrom"
-        "valid_from"
-      when "lastChanged"
-        "last_changed"
-      when "contentType"
-        "content_type"
+      when "_validUntil"
+        "_valid_until"
+      when "_validFrom"
+        "_valid_from"
+      when "_lastChanged"
+        "_last_changed"
       else
         key
       end

data/lib/rails_connector/version.rb

@@ -11,7 +11,7 @@ class Version
   end
 
   def workspace_id
-    @doc["workspace_id"]
+    @doc["revision_id"]
   end
 
   def diff

data/lib/rails_connector/workspace.rb

@@ -3,13 +3,18 @@ module RailsConnector
 
   class Workspace < CmsBaseModel
 
-    self.key_prefix = "ws"
+    self.key_prefix = "rev"
 
     property :generation
-    property :base_workspace_id
+    property :base_revision_id
     property :title
     property :content_cache_id
 
+    # 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
@@ -107,7 +112,7 @@ module RailsConnector
       obj_data_list.each do |obj_data|
         values = obj_data["values"]
         UNIQUE_INDICES.each do |unique_index|
-          index_value = values[unique_index.to_s]
+          index_value = values["_#{unique_index}"]
           if (converter = OBJ_PROPERTY_VALUE_TO_RANGE_VALUE_CONVERSIONS[unique_index])
             index_value = converter.call(index_value)
           end
@@ -126,9 +131,9 @@ module RailsConnector
     def extract_obj_data(data)
       {
         "values" => data["values"].merge(
-          "id" => data["obj_id"],
-          "obj_type" => data["obj_type"],
-          "obj_class" => data["obj_class"]["name"]
+          "_id" => data["obj_id"],
+          "_obj_type" => data["obj_type"],
+          "_obj_class" => data["obj_class"]["name"]
         ),
         "attributes" => data["attributes"]
       }

data/lib/rails_connector/workspace_label.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: infopark_cloud_connector
 version: !ruby/object:Gem::Version 
-  hash: -30600717246
+  hash: -16163019875
   prerelease: 6
   segments: 
   - 6
@@ -9,11 +9,9 @@ version: !ruby/object:Gem::Version
   - 0
   - beta
   - 200
-  - 650
-  - 7
-  - c
-  - 93155
-  version: 6.8.0.beta.200.650.7c93155
+  - 663
+  - ceecdee
+  version: 6.8.0.beta.200.663.ceecdee
 platform: ruby
 authors: 
 - Infopark AG
@@ -21,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-01 00:00:00 +02:00
+date: 2012-06-06 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -62,18 +60,16 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: -30600717246
+        hash: -16163019875
         segments: 
         - 6
         - 8
         - 0
         - beta
         - 200
-        - 650
-        - 7
-        - c
-        - 93155
-        version: 6.8.0.beta.200.650.7c93155
+        - 663
+        - ceecdee
+        version: 6.8.0.beta.200.663.ceecdee
   version_requirements: *id003
   name: kvom
   prerelease: false