Changeset 381

Timestamp:

Dec 21, 2009, 3:15:43 PM (14 years ago)

Author:

KOBAYASHI, Shinji

Message:

refs #74

Location:

ruby/trunk

Files:

• lib/open_ehr/am/archetype/constraint_model.rb (modified) (2 diffs)
• spec/lib/open_ehr/am/archetype/constraint_model/c_complex_object_spec.rb (added)
• spec/lib/open_ehr/am/archetype/constraint_model/c_domain_type_spec.rb (added)
• spec/lib/open_ehr/am/archetype/constraint_model/c_primitive_object_spec.rb (modified) (1 diff)

ruby/trunk/lib/open_ehr/am/archetype/constraint_model.rb

@@ -183 +183 @@
 
           def any_allowed?
-            return !item.nil?
+            return item.nil?
           end
         end
 
         class CComplexObject < CDefinedObject
-          attr_accessor :attributes, :attributes_valid
-
-          def initialize(args = { })
-            @attributes = args[:attributes] ? args[:attributes] : []
-            super
+          attr_accessor :attributes
+
+          def initialize(args = { })
+            super
+            self.attributes = args[:attributes]
+          end
+
+          def any_allowed?
+            return (@attributes.nil? or @attributes.empty?)
           end
 
@@ -205 +209 @@
 
         class CDomainType < CDefinedObject
-          
+          def standard_equivalent
+            raise NotImplementedError, 'subclass should be defined'
+          end
         end
 

ruby/trunk/spec/lib/open_ehr/am/archetype/constraint_model/c_primitive_object_spec.rb

@@ -24 +24 @@
 
   it 'should allowed any' do
-    @c_primitive_object.should be_any_allowed
+    @c_primitive_object.should_not be_any_allowed
   end
 
   it 'should not any allowed' do
     @c_primitive_object.item = nil
-    @c_primitive_object.should_not be_any_allowed
+    @c_primitive_object.should be_any_allowed
   end
 end