infopark_cloud_connector 6.8.0.beta.200.744.99f67fc → 6.8.0.beta.200.785.05d4af9

data/lib/rails_connector/obj.rb

@@ -163,7 +163,7 @@ module RailsConnector
     end
 
     def path_list # :nodoc:
-      read_attribute(:_path) || []
+      read_attribute_value('_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_value('_permalink')
     end
 
     # This method determines the controller that should be invoked when the Obj is requested.
@@ -240,12 +240,12 @@ module RailsConnector
     end
 
     def title
-      read_attribute(:title)
+      read_attribute_value('title')
     end
 
     # Returns the type of the object: :document, :publication, :image or :generic
     def object_type
-      read_attribute(:_obj_type).to_sym
+      read_attribute_value('_obj_type').to_sym
     end
 
     # Returns true if image? or generic?
@@ -364,31 +364,31 @@ module RailsConnector
     end
 
     def sort_order # :nodoc:
-      read_attribute(:_sort_order) == 1 ? "descending" : "ascending"
+      read_attribute_value('_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,13 +399,15 @@ module RailsConnector
       parent.find_nearest(name) unless self.root?
     end
 
-    OLD_INTERNAL_KEYS = Set.new(%w(
+    # This should be a SET, because it's faster in this particular case.
+    OLD_INTERNAL_KEYS = Set.new(%w[
       body
       id
       last_changed
       name
       obj_class
       obj_type
+      object_type
       path
       permalink
       sort_key1
@@ -417,20 +419,24 @@ module RailsConnector
       sort_type3
       suppress_export
       text_links
+      title
       valid_from
       valid_until
-    ))
-    # Returns the value of the attribute specified by its name.
-    #
+    ])
+
+    # Returns the value of an internal or external 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
+    def [](key)
+      key = key.to_s
       if OLD_INTERNAL_KEYS.include?(key)
         send(key)
-      elsif key.start_with?('_')
-        send(key.slice(1..-1))
-      else
+      elsif key.start_with?('_') && OLD_INTERNAL_KEYS.include?(internal_key = key[1..-1])
+        # For backwards compatibility reasons
+        send(internal_key)
+      elsif has_attribute?(key)
         read_attribute(key)
+      else
+        nil
       end
     end
 
@@ -443,23 +449,23 @@ module RailsConnector
     end
 
     def text_links
-      read_attribute(:_text_links)
+      read_attribute_value('_text_links')
     end
 
     def obj_class
-      read_attribute(:_obj_class)
+      read_attribute_value('_obj_class')
     end
 
     def last_changed
-      read_attribute(:_last_changed)
+      read_attribute_value('_last_changed')
     end
 
     def valid_from
-      read_attribute(:_valid_from)
+      read_attribute_value('_valid_from')
     end
 
     def valid_until
-      read_attribute(:_valid_until)
+      read_attribute_value('_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).
@@ -497,12 +503,7 @@ 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)
-    end
-
-    def has_attribute?(name)
-      name_as_string = name.to_s
-      @values.has_key?(name_as_string) || attributes.has_key?(name_as_string)
+      obj_class_instance.attributes.map(&:to_sym)
     end
 
     def self.preview_time=(t) # :nodoc:
@@ -517,52 +518,85 @@ module RailsConnector
       "<#{self.class} id=\"#{id}\" path=\"#{path}\">"
     end
 
+    def has_attribute?(name)
+      obj_class_instance.has_attribute?(name)
+    end
+
     private
 
+    def obj_class_instance
+      ObjClass.by_name(obj_class)
+    end
+
     def update_data(values = {}, meta = {})
       @values = values || {}
       meta ||= {}
-      @rtc_ref = meta["rtc_ref"]
-      @ext_ref = meta["ext_ref"]
-      @attr_cache = {}
+      @rtc_ref = meta['rtc_ref']
+      @ext_ref = meta['ext_ref']
+      @attribute_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
-      ) : {}
+    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(name)
-      name = name.to_s
-      @attr_cache[name] ||= attribute_value_from_raw_attribute_value(name)
+    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)
+        @attribute_cache[attribute_name] =
+            prepare_attribute_value(attribute_name, attribute_type, attribute_value)
+      end
     end
 
-    def attribute_value_from_raw_attribute_value(name)
-      raw = read_raw_attribute_value(name)
-      case type_of(name)
+    def prepare_attribute_value(attribute_name, attribute_type, attribute_value)
+      case attribute_type
       when :markdown
-        StringTagging.tag_as_markdown(raw, self)
+        StringTagging.tag_as_markdown(attribute_value, self)
       when :html
-        StringTagging.tag_as_html(raw, self)
+        StringTagging.tag_as_html(attribute_value, self)
       when :date
-        DateAttribute.parse raw if raw
+        DateAttribute.parse(attribute_value) if attribute_value
       when :linklist
-        if name == "_text_links"
-          LinkList.new(raw && raw.values)
+        if attribute_name == '_text_links'
+          LinkList.new(attribute_value && attribute_value.values)
         else
-          LinkList.new(raw)
+          LinkList.new(attribute_value)
+        end
+      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
-        raw
+        {}
       end
     end
 
@@ -591,9 +625,9 @@ module RailsConnector
       DateAttribute.parse(value) unless value.nil?
     end
 
-    def method_missing(method_id, *args) # :nodoc:
-      if has_attribute?(method_id)
-        read_attribute(method_id)
+    def method_missing(method_name, *args) # :nodoc:
+      if has_attribute?(method_name)
+        read_attribute(method_name.to_s)
       else
         super
       end
@@ -620,11 +654,11 @@ module RailsConnector
     end
 
     def converted_sort_type(attribute)
-      read_attribute(attribute) == 1 ? "numeric" : "alphaNumeric"
+      read_attribute_value(attribute) == 1 ? "numeric" : "alphaNumeric"
     end
 
     def converted_sort_key(attribute)
-      key = read_attribute(attribute)
+      key = read_attribute_value(attribute)
       case key
       when "_valid_until"
         "_valid_until"

data/lib/rails_connector/obj_body.rb

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

data/lib/rails_connector/obj_class.rb

@@ -1,15 +1,18 @@
 #:enddoc:
 module RailsConnector
   class ObjClass
-    attr_reader :name
+    attr_reader :name, :attributes
 
     def initialize(data)
-      @name, @attributes = data['name'], data['attributes']
+      @name, @attributes = data['name'], data['attributes'] || []
     end
 
     def self.by_name(name)
-      data = Revision.current.obj_classes[name.to_s]
-      new(data) if data
+      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)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: infopark_cloud_connector
 version: !ruby/object:Gem::Version 
-  hash: -71426954407
+  hash: 77657614921
   prerelease: 6
   segments: 
   - 6
@@ -9,12 +9,13 @@ version: !ruby/object:Gem::Version
   - 0
   - beta
   - 200
-  - 744
-  - 99
-  - f
-  - 67
-  - fc
-  version: 6.8.0.beta.200.744.99f67fc
+  - 785
+  - 5
+  - d
+  - 4
+  - af
+  - 9
+  version: 6.8.0.beta.200.785.05d4af9
 platform: ruby
 authors: 
 - Infopark AG
@@ -22,7 +23,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-05 00:00:00 +02:00
+date: 2012-07-18 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -63,19 +64,20 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: -71426954407
+        hash: 77657614921
         segments: 
         - 6
         - 8
         - 0
         - beta
         - 200
-        - 744
-        - 99
-        - f
-        - 67
-        - fc
-        version: 6.8.0.beta.200.744.99f67fc
+        - 785
+        - 5
+        - d
+        - 4
+        - af
+        - 9
+        version: 6.8.0.beta.200.785.05d4af9
   version_requirements: *id003
   name: kvom
   prerelease: false