openehr 1.2.10 → 1.2.11

data/lib/openehr/am/archetype/constraint_model.rb

@@ -111,19 +111,10 @@ module OpenEHR
             end
             @occurrences = occurrences
           end
-
-          def self.create(args = { }, &block)
-            c_object = new(args)
-            if block_given?
-              yield c_object
-            end
-            return c_object
-          end
         end
 
         class CAttribute < ArchetypeConstraint
-          attr_reader :rm_attribute_name, :existence
-          attr_accessor :children
+          attr_reader :rm_attribute_name, :existence, :children
 
           def initialize(args = { })
             super(args)
@@ -145,6 +136,13 @@ module OpenEHR
             end
             @existence = existence
           end
+
+          def children=(children)
+            @children = children.inject([]) do |array, child|
+              child.parent=self
+              array << child
+            end if children
+          end
         end
 
         class CDefinedObject < CObject
@@ -211,14 +209,6 @@ module OpenEHR
           def any_allowed?
             return (@attributes.nil? or @attributes.empty?)
           end
-
-          def self.create(args = { }, &block)
-            c_complex_object = new(args)
-            if block_given?
-              yield c_complex_object
-            end
-            return c_complex_object
-          end
         end
 
         class CDomainType < CDefinedObject
@@ -273,16 +263,6 @@ module OpenEHR
           def any_allowed?
             return includes.nil? && excludes.nil?
           end
-
-          def self.create(args = { }, &block)
-            archetype_slot = new(args)
-            archetype_slot.includes = args[:includes]
-            archetype_slot.excludes = args[:excludes]
-            if block_given?
-              yield archetype_slot
-            end
-            return archetype_slot
-          end
         end
 
         class ConstraintRef < CReferenceObject
@@ -299,15 +279,6 @@ module OpenEHR
             end
             @reference = reference
           end
-
-          def self.create(args = { }, &block)
-            constraint_ref = new(args)
-            constraint_ref.reference = args[:reference]
-            if block_given?
-              yield constraint_ref
-            end
-            return constraint_ref
-          end
         end
 
         class CSingleAttribute < CAttribute
@@ -336,4 +307,3 @@ module OpenEHR
     end # of Archetype
   end # of AM
 end # of OpenEHR
-  

data/lib/openehr/parser/adl_grammar.tt

@@ -550,7 +550,7 @@ module OpenEHR
             child_node = ArchetypeNode.new(node)
             child_node.path = val.path
             val.children = c_attr_body.value(child_node)
-            val
+	    val
           end
         }
       end

data/lib/openehr/version.rb

@@ -1,3 +1,3 @@
 module OpenEHR
-  VERSION = "1.2.10"
+  VERSION = "1.2.11"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openehr
 version: !ruby/object:Gem::Version
-  version: 1.2.10
+  version: 1.2.11
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-22 00:00:00.000000000 Z
+date: 2013-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake