infopark_cloud_connector 6.8.0.beta.200.663.ceecdee → 6.8.0.beta.200.681.7c84f4a

data/lib/rails_connector/attribute.rb

@@ -1,35 +1,20 @@
 #:enddoc:
 module RailsConnector
+  class Attribute
+    attr_reader :name, :type
 
-  class Attribute < CmsBaseModel
-    def self.type_of(name)
-      attribute = attribute_cache[name.to_s]
-      attribute.type if attribute
-    end
-
-    def self.reset_cache
-      @attribute_cache = nil
-    end
-
-    def name
-      attribute_name
+    def initialize(data)
+      @name, @type = data['name'], data['type'].to_sym
     end
 
-    def type
-      attribute_type.to_sym
+    def self.by_name(name)
+      data = Workspace.current.attributes[name.to_s]
+      new(data) if data
     end
 
-    module ClassMethods
-      private
-
-      def attribute_cache
-        @attribute_cache ||= find(:all).each_with_object({}) do |attr, map|
-          map[attr.name] = attr
-        end
-      end
+    def self.type_of(name)
+      attribute = by_name(name)
+      attribute.type if attribute
     end
-
-    extend ClassMethods
   end
-
 end

data/lib/rails_connector/obj.rb

@@ -33,7 +33,7 @@ module RailsConnector
     end
 
     def id
-      @values["_id"]
+      read_raw_attribute_value('_id')
     end
 
     ### FINDERS ####################
@@ -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
+      read_raw_attribute_value('_suppress_export') ? true : false
     end
 
     # Returns true if the export of the object is not suppressed and the content is active?
@@ -527,7 +527,7 @@ module RailsConnector
 
     def read_attribute(name)
       name = name.to_s
-      raw = @values[name]
+      raw = read_raw_attribute_value(name)
       @attr_cache[name] ||= case type_of(name)
         when :markdown
           StringTagging.tag_as_markdown(raw, self)
@@ -606,17 +606,21 @@ module RailsConnector
     def converted_sort_key(attribute)
       key = read_attribute(attribute)
       case key
-      when "_validUntil"
+      when "_valid_until"
         "_valid_until"
-      when "_validFrom"
+      when "_valid_from"
         "_valid_from"
-      when "_lastChanged"
+      when "_last_changed"
         "_last_changed"
       else
         key
       end
     end
 
+    def read_raw_attribute_value(attribute_name)
+      @values[attribute_name]
+    end
+
     class << self
       private
 

data/lib/rails_connector/obj_body.rb

@@ -7,7 +7,7 @@ module ObjBody
     if binary?
       nil
     else
-      StringTagging.tag_as_html(read_attribute(:blob), self)
+      StringTagging.tag_as_html(read_attribute(:body), self)
     end
   end
 

data/lib/rails_connector/obj_class.rb

@@ -1,35 +1,19 @@
 #:enddoc:
 module RailsConnector
+  class ObjClass
+    attr_reader :name
 
-  class ObjClass < CmsBaseModel
-    def self.by_name(name)
-      obj_class_cache[name]
-    end
-
-    def self.reset_cache
-      @obj_class_cache = nil
-    end
-
-    def name
-      obj_class_name
+    def initialize(data)
+      @name, @attributes = data['name'], data['attributes']
     end
 
-    def has_attribute?(name)
-      @custom_attribute_names ||= custom_attributes.map(&:name)
-      @custom_attribute_names.include?(name.to_s)
+    def self.by_name(name)
+      data = Workspace.current.obj_classes[name.to_s]
+      new(data) if data
     end
 
-    module ClassMethods
-      private
-
-      def obj_class_cache
-        @obj_class_cache ||= find(:all).each_with_object({}) do |objclass, map|
-          map[objclass.name] = objclass
-        end
-      end
+    def has_attribute?(attribute_name)
+      @attributes.include?(attribute_name.to_s)
     end
-
-    extend ClassMethods
   end
-
 end

data/lib/rails_connector/workspace.rb

@@ -9,6 +9,8 @@ module RailsConnector
     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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: infopark_cloud_connector
 version: !ruby/object:Gem::Version 
-  hash: -16163019875
+  hash: -177875434235
   prerelease: 6
   segments: 
   - 6
@@ -9,9 +9,14 @@ version: !ruby/object:Gem::Version
   - 0
   - beta
   - 200
-  - 663
-  - ceecdee
-  version: 6.8.0.beta.200.663.ceecdee
+  - 681
+  - 7
+  - c
+  - 84
+  - f
+  - 4
+  - a
+  version: 6.8.0.beta.200.681.7c84f4a
 platform: ruby
 authors: 
 - Infopark AG
@@ -19,7 +24,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-06 00:00:00 +02:00
+date: 2012-06-26 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -60,16 +65,21 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: -16163019875
+        hash: -177875434235
         segments: 
         - 6
         - 8
         - 0
         - beta
         - 200
-        - 663
-        - ceecdee
-        version: 6.8.0.beta.200.663.ceecdee
+        - 681
+        - 7
+        - c
+        - 84
+        - f
+        - 4
+        - a
+        version: 6.8.0.beta.200.681.7c84f4a
   version_requirements: *id003
   name: kvom
   prerelease: false