active_cmis 0.1.6 → 0.1.7

data/VERSION

@@ -1 +1 @@
-0.1.6
+0.1.7

data/lib/active_cmis/document.rb

@@ -207,34 +207,19 @@ module ActiveCMIS
     private
     attr_reader :updated_contents
 
-    # Optional parameters:
-    #   - properties: a hash key/definition pairs of properties to be rendered (defaults to all attributes)
-    #   - attributes: a hash key/value pairs used to determine the values rendered (defaults to self.attributes)
     def render_atom_entry(properties = self.class.attributes, attributes = self.attributes, options = {})
-      builder = Nokogiri::XML::Builder.new do |xml|
-        xml.entry(NS::COMBINED) do
-          xml.parent.namespace = xml.parent.namespace_definitions.detect {|ns| ns.prefix == "at"}
-          xml["at"].author do
-            xml["at"].name conn.user # FIXME: find reliable way to set author?
-          end
-          if updated_contents && (options[:create] || options[:checkin])
-            xml["cra"].content do
-              xml["cra"].mediatype(updated_contents[:mime_type] || "application/binary")
-              data = updated_contents[:data] || File.read(updated_contents[:file])
-              xml["cra"].base64 [data].pack("m")
-            end
-          end
-          xml["cra"].object do
-            xml["c"].properties do
-              properties.each do |key, definition|
-                definition.render_property(xml, attributes[key])
-              end
-            end
+      super(properties, attributes, options) do |entry|
+        if updated_contents && (options[:create] || options[:checkin])
+          entry["cra"].content do
+            entry["cra"].mediatype(updated_contents[:mime_type] || "application/binary")
+            data = updated_contents[:data] || File.read(updated_contents[:file])
+            entry["cra"].base64 [data].pack("m")
           end
         end
+        if block_given?
+          yield(entry)
+        end
       end
-      conn.logger.debug builder.to_xml
-      builder.to_xml
     end
 
 

data/lib/active_cmis/folder.rb

@@ -9,12 +9,27 @@ module ActiveCMIS
     end
     cache :items
 
+    def allowed_object_types
+      if attributes["cmis:allowedChildObjectTypeIds"].empty?
+        repository.types.select { |type| type.fileable }
+      else
+        # TODO: it is repository specific if subtypes of the allowed types MAY be filed (line 976)
+        #
+        # There is as far as I can see no other mention of this possibility in the spec, no way to
+        # check if this is so for any specific repository. In addition there is in a few places a
+        # requirement that an error is thrown if the cmis:objectTypeId is not in the list of allowed
+        # values. So for now this is not supported at all.
+        attributes["cmis:allowedChildObjectTypeIds"].map { |type_id| repository.type_by_id(type_id) }
+      end
+    end
+    cache :allowed_object_types
+
     private
     def create_url
       if f = parent_folders.first
         f.items.url
       else
-        raise "Not possible"
+        raise "Not possible to create folder without parent folder"
       end
     end
   end

data/lib/active_cmis/object.rb

@@ -332,6 +332,8 @@ module ActiveCMIS
     # @param properties a hash key/definition pairs of properties to be rendered (defaults to all attributes)
     # @param attributes a hash key/value pairs used to determine the values rendered (defaults to self.attributes)
     # @param options
+    # @yield [entry] Optional block to customize the rendered atom entry
+    # @yieldparam [Nokogiri::XML::Builder] entry The entry XML builder element on which you can add additional tags (uses the NS::COMBINED namespaces)
     def render_atom_entry(properties = self.class.attributes, attributes = self.attributes, options = {})
       builder = Nokogiri::XML::Builder.new do |xml|
         xml.entry(NS::COMBINED) do
@@ -339,6 +341,12 @@ module ActiveCMIS
           xml["at"].author do
             xml["at"].name conn.user # FIXME: find reliable way to set author?
           end
+          xml["at"].title attributes["cmis:name"]
+          if attributes["cmis:objectId"]
+            xml["at"].id attributes["cmis:objectId"]
+          else
+            xml["at"].id "random-garbage"
+          end
           xml["cra"].object do
             xml["c"].properties do
               properties.each do |key, definition|
@@ -346,8 +354,10 @@ module ActiveCMIS
               end
             end
           end
+          yield(xml) if block_given?
         end
       end
+      conn.logger.debug builder.to_xml
       builder.to_xml
     end
 
@@ -391,7 +401,8 @@ module ActiveCMIS
       end
 
       properties = self.class.attributes.reject do |key, definition|
-        !updated_attributes.include?(key) && !definition.required
+        # !updated_attributes.include?(key) && !definition.required
+        attributes[key].nil? or definition.updatability == "readonly"
       end
       body = render_atom_entry(properties, attributes, :create => true)
 

data/lib/active_cmis/property_definition.rb

@@ -51,10 +51,14 @@ module ActiveCMIS
         end
       end
 
-      if required && updatability == "readonly"
+      if required and updatability == "readonly"
         logger.warn "The server behaved strange: attribute #{self.inspect} required but readonly, will set required to false"
         @required = false
       end
+      if id == "cmis:objectTypeId" and updatability != "oncreate"
+        logger.warn "The server behaved strange: cmis:objectTypeId should be updatable on create but #{updatability}"
+        @updatability = "oncreate"
+      end
 
       @property_type = case property_type.downcase
       when "string"

data/lib/active_cmis/type.rb

@@ -186,6 +186,13 @@ module ActiveCMIS
             @attributes[attr.id] = attr
           end
         end
+        if %w(cmis:folder cmis:document).include? @baseId and not @fileable
+          logger.warn "The server behaved strange: #{@id}, with basetype #{@baseId} MUST be fileable"
+          @fileable = true
+        elsif @baseId == "cmis:relationship" and @fileable
+          logger.warn "The server behaved strange: #{@id}, with basetype #{@baseId} MUST NOT be fileable"
+          @fileable = false
+        end
         @attributes.freeze
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_cmis
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-03-01 00:00:00.000000000 +01:00
+date: 2011-03-08 00:00:00.000000000 +01:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &67303860 !ruby/object:Gem::Requirement
+  requirement: &69488280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,7 +22,7 @@ dependencies:
         version: 1.4.1
   type: :runtime
   prerelease: false
-  version_requirements: *67303860
+  version_requirements: *69488280
 description: A CMIS library implementing both reading and updating capabilities through
   the AtomPub/REST binding to CMIS.
 email: joeri@xaop.com