infopark_cloud_connector 6.8.0.beta.200.720.44fbabd → 6.8.0.beta.200.744.99f67fc

data/lib/rails_connector/dict_storage.rb

@@ -29,6 +29,10 @@ module RailsConnector
       end
 
       def s3_storage(config)
+        if config && !config.key?("s3_endpoint") && !config.key?(:s3_endpoint)
+          config = config.merge(:s3_endpoint => "s3-eu-west-1.amazonaws.com")
+        end
+
         bucket = AWS::S3.new(config).buckets[config[:bucket_name]]
         Kvom::Storage::S3Storage.new({
           :bucket => bucket,

data/lib/rails_connector/link.rb

@@ -113,9 +113,12 @@ module RailsConnector
       external? || resolved_internal?
     end
 
-    # Returns the destination object (+Obj+) of this Link.
+    # Returns the destination object (+Obj+) of this Link. May be nil if the
+    # link is external or internal without an existing destination object.
     def destination_object
       @destination_object ||= Obj.find(destination) if resolved_internal?
+    rescue RailsConnector::ResourceNotFound
+      nil
     end
 
     def to_liquid # :nodoc:

data/lib/rails_connector/obj.rb

@@ -497,12 +497,12 @@ module RailsConnector
     # 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
-      @attributes.keys.map(&:to_sym)
+      attributes.keys.map(&:to_sym)
     end
 
     def has_attribute?(name)
       name_as_string = name.to_s
-      @values.has_key?(name_as_string) || @attributes.has_key?(name_as_string)
+      @values.has_key?(name_as_string) || attributes.has_key?(name_as_string)
     end
 
     def self.preview_time=(t) # :nodoc:
@@ -522,11 +522,25 @@ module RailsConnector
     def update_data(values = {}, meta = {})
       @values = values || {}
       meta ||= {}
-      @attributes = meta["attributes"] || {}
+      @rtc_ref = meta["rtc_ref"]
       @ext_ref = meta["ext_ref"]
       @attr_cache = {}
     end
 
+    def attributes
+      @attributes ||= @rtc_ref ? (
+        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 read_attribute(name)
       name = name.to_s
       @attr_cache[name] ||= attribute_value_from_raw_attribute_value(name)
@@ -566,7 +580,7 @@ module RailsConnector
       when "title"
         :html
       else
-        if attr_def = @attributes[key]
+        if attr_def = attributes[key]
           type = attr_def["type"]
           type.to_sym if type
         end

data/lib/rails_connector/revision.rb

@@ -9,8 +9,6 @@ module RailsConnector
     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)
@@ -62,6 +60,14 @@ module RailsConnector
       "<#{self.class} id=\"#{id}\" title=\"#{title}\">"
     end
 
+    def obj_classes
+      rtc['obj_classes']
+    end
+
+    def attributes
+      rtc['attributes']
+    end
+
     private
 
     COMPOUND_KEY_INDICES = [:ppath].freeze
@@ -130,13 +136,16 @@ module RailsConnector
         "values" => data["values"].merge(
           "_id" => data["obj_id"],
           "_obj_type" => data["obj_type"],
-          "_obj_class" => data["obj_class"]["name"]
+          "_obj_class" => data["obj_class_name"]
         ),
-        "attributes" => data["attributes"],
+        "rtc_ref" => data["rtc_ref"],
         "ext_ref" => data["ext_ref"],
       }
     end
 
+    def rtc
+      @rtc ||= DictStorage.get(read_attribute("rtc_ref"))
+    end
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: infopark_cloud_connector
 version: !ruby/object:Gem::Version 
-  hash: -23731721781
+  hash: -71426954407
   prerelease: 6
   segments: 
   - 6
@@ -9,10 +9,12 @@ version: !ruby/object:Gem::Version
   - 0
   - beta
   - 200
-  - 720
-  - 44
-  - fbabd
-  version: 6.8.0.beta.200.720.44fbabd
+  - 744
+  - 99
+  - f
+  - 67
+  - fc
+  version: 6.8.0.beta.200.744.99f67fc
 platform: ruby
 authors: 
 - Infopark AG
@@ -20,7 +22,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-02 00:00:00 +02:00
+date: 2012-07-05 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -61,17 +63,19 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: -23731721781
+        hash: -71426954407
         segments: 
         - 6
         - 8
         - 0
         - beta
         - 200
-        - 720
-        - 44
-        - fbabd
-        version: 6.8.0.beta.200.720.44fbabd
+        - 744
+        - 99
+        - f
+        - 67
+        - fc
+        version: 6.8.0.beta.200.744.99f67fc
   version_requirements: *id003
   name: kvom
   prerelease: false