yaccl 0.0.2 → 0.0.3

data/lib/yaccl/model/folder.rb

@@ -24,8 +24,11 @@ module YACCL
       end
 
       def children
-        Services.get_children(repository_id, object_id, nil, nil, nil, nil, nil, nil, nil, nil)[:objects].map do |o|
-          ObjectFactory.create(repository_id, o[:object])
+        children = Services.get_children(repository_id, object_id, nil, nil, nil, nil, nil, nil, nil, nil)
+        if children.has_key?(:objects)
+          children[:objects].map { |o| ObjectFactory.create(repository_id, o[:object]) }
+        else
+          []
         end
       end
 

data/lib/yaccl/model/repository.rb

@@ -72,7 +72,7 @@ module YACCL
       # type
 
       def type(type_id)
-        Type.create(Services.get_type_definition(id, type_id))
+        Type.create(id, Services.get_type_definition(id, type_id))
       end
 
       def types
@@ -81,11 +81,11 @@ module YACCL
 
 
       def create_type(type)
-        Type.create(Services.create_type(id, type.to_hash))
+        Type.create(id, Services.create_type(id, type.to_hash))
       end
 
       def update_type(type)
-        Type.create(Services.update_type(id, type.to_hash))
+        Type.create(id, Services.update_type(id, type.to_hash))
       end
 
       def delete_type(type_id)
@@ -109,7 +109,7 @@ module YACCL
       def _types(arr)
         types = []
         arr.each do |t|
-          types << Type.create(t[:type])
+          types << Type.create(id, t[:type])
           types << _types(t[:children]) if t.has_key?(:children)
         end
         types.flatten

data/lib/yaccl/model/type.rb

@@ -1,6 +1,7 @@
 module YACCL
   module Model
     class Type
+      attr_reader :repository_id
       attr_accessor :id
       attr_accessor :local_name
       attr_accessor :local_namespace
@@ -24,11 +25,13 @@ module YACCL
       attr_accessor :allowed_source_types
       attr_accessor :allowed_target_types
 
-      def self.create(raw)
-        Type.new(raw)
+      def self.create(repository_id, raw)
+        Type.new(repository_id, raw)
       end
 
-      def initialize(hash={})
+      def initialize(repository_id, hash={})
+        @repository_id = repository_id
+
         @id = hash[:id]
         @local_name = hash[:localName]
         @local_namespace = hash[:localNamespace]
@@ -57,6 +60,25 @@ module YACCL
         @property_definitions[property[:id]] = property
       end
 
+      def new_object
+        object = case base_id
+        when 'cmis:document'
+          Document.new(repository_id)
+        when 'cmis:folder'
+          Folder.new(repository_id)
+        when 'cmis:relationship'
+          Relationship.new(repository_id)
+        when 'cmis:policy'
+          Policy.new(repository_id)
+        when 'cmis:item'
+          Item.new(repository_id)
+        else
+          raise "Unsupported base type: #{base_id}"
+        end
+        object.object_type_id = id
+        object
+      end
+
       def to_hash
         hash = {}
         hash[:id] = id

data/lib/yaccl.rb

@@ -1,5 +1,5 @@
 module YACCL
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 
   def self.init(url)
     YACCL.const_set('SERVICE_URL', url)

data/spec/helper.rb

@@ -5,16 +5,25 @@ YACCL.init('http://localhost:8080/upncmis/browser')
 
 def create_repository(id)
   meta = YACCL::Model::Server.repository('meta')
+
+  repo_type = meta.type('repository')
+  property_definitions = repo_type.property_definitions.keys
+
   f = meta.new_folder
   f.name = id
-  f.object_type_id = 'repository'
-  f.properties['supportsRelationships'] = true
-  f.properties['supportsPolicies'] = true
-  f.properties['supportsItem'] = true
+  f.object_type_id = repo_type.id
+  f.properties[:supportsRelationships] = true if property_definitions.include?(:supportsRelationships)
+  f.properties[:supportsPolicies] = true if property_definitions.include?(:supportsPolicies)
+  f.properties[:supportsItem] = true if property_definitions.include?(:supportsItems)
   meta.root.create(f)
+
   YACCL::Model::Server.repository(id)
 end
 
 def delete_repository(id)
   YACCL::Model::Server.repository('meta').object(id).delete
 end
+
+repo = create_repository('lala')
+puts repo.capabilities
+delete_repository('lala')

data/spec/model/folder_spec.rb

@@ -55,13 +55,15 @@ describe YACCL::Model::Folder do
   end
 
   it 'create item' do
-    new_object = @repo.new_item
-    new_object.name = 'item1'
-    new_object.object_type_id = 'cmis:item'
-    object = @repo.root.create(new_object)
-    object.should be_a_kind_of YACCL::Model::Item
-    object.name.should eq 'item1'
-    object.delete
+    begin
+      new_object = @repo.new_item
+      new_object.name = 'item1'
+      new_object.object_type_id = 'cmis:item'
+      object = @repo.root.create(new_object)
+      object.should be_a_kind_of YACCL::Model::Item
+      object.name.should eq 'item1'
+      object.delete
+    end unless @repo.cmis_version_supported < '1.1'
   end
 
   it 'create object' do

data/spec/model/object_spec.rb

@@ -27,7 +27,7 @@ describe YACCL::Model::Object do
   it 'delete' do
     doc = create_document
     doc.delete
-    #TODO check
+    # TODO check
   end
 
   it 'allowable actions' do

data/spec/model/repository_spec.rb

@@ -84,51 +84,55 @@ describe YACCL::Model::Repository do
     end
 
     it 'type - item' do
-      item = @repo.type('cmis:item')
-      item.should be_a_kind_of YACCL::Model::Type
-      item.id.should eq 'cmis:item'
+      begin
+        item = @repo.type('cmis:item')
+        item.should be_a_kind_of YACCL::Model::Type
+        item.id.should eq 'cmis:item'
+      end unless @repo.cmis_version_supported < '1.1'
     end
 
     it 'create, get, delete type - document' do
-      type_id = 'apple'
-
-      type = YACCL::Model::Type.new
-      type.id = type_id
-      type.local_name = 'apple'
-      type.query_name = 'apple'
-      type.display_name = 'apple'
-      type.parent_id = 'cmis:document'
-      type.base_id = 'cmis:document'
-      type.description = 'appel'
-      type.creatable = true
-      type.fileable = true
-      type.queryable = true
-      type.controllable_policy = true
-      type.controllable_acl = true
-      type.fulltext_indexed = true
-      type.included_in_supertype_query = true
-      type.content_stream_allowed = 'allowed'
-      type.versionable = false
-
-      type.add_property_definition(id: 'color',
-                                   localName: 'color',
-                                   queryName: 'color',
-                                   displayName: 'color',
-                                   description: 'color',
-                                   propertyType: 'string',
-                                   cardinality: 'single',
-                                   updatability: 'readwrite',
-                                   inherited: false,
-                                   required: false,
-                                   queryable: true,
-                                   orderable: true)
-
-      @repo.create_type(type)
-      @repo.type(type_id).tap do |t|
-        t.should be_a_kind_of YACCL::Model::Type
-        t.id.should eq type_id
-      end
-      @repo.delete_type(type_id)
+      begin
+        type_id = 'apple'
+
+        type = YACCL::Model::Type.new
+        type.id = type_id
+        type.local_name = 'apple'
+        type.query_name = 'apple'
+        type.display_name = 'apple'
+        type.parent_id = 'cmis:document'
+        type.base_id = 'cmis:document'
+        type.description = 'appel'
+        type.creatable = true
+        type.fileable = true
+        type.queryable = true
+        type.controllable_policy = true
+        type.controllable_acl = true
+        type.fulltext_indexed = true
+        type.included_in_supertype_query = true
+        type.content_stream_allowed = 'allowed'
+        type.versionable = false
+
+        type.add_property_definition(id: 'color',
+                                     localName: 'color',
+                                     queryName: 'color',
+                                     displayName: 'color',
+                                     description: 'color',
+                                     propertyType: 'string',
+                                     cardinality: 'single',
+                                     updatability: 'readwrite',
+                                     inherited: false,
+                                     required: false,
+                                     queryable: true,
+                                     orderable: true)
+
+        @repo.create_type(type)
+        @repo.type(type_id).tap do |t|
+          t.should be_a_kind_of YACCL::Model::Type
+          t.id.should eq type_id
+        end
+        @repo.delete_type(type_id)
+      end unless @repo.cmis_version_supported < '1.1'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yaccl
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors: