openehr 1.2.11 → 1.2.12

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

@@ -7,7 +7,7 @@ module OpenEHR
           attr_accessor :parent
 
           def initialize(args = { })
-            self.path = args[:path]
+            self.path = args[:path] if args[:path]
             self.parent = args[:parent]
           end
 
@@ -18,26 +18,24 @@ module OpenEHR
             @path = path
           end
 
-          def has_path?(path)
-            return @path.include?(path)
+          def has_path?(search_path)
+            path.include?(search_path)
           end
 
           def congruent?
-            if @path.index(@parent.path) == 0
-              return true
-            else
-              return false
-            end
+            path.index(@parent.path) == 0
           end
 
           alias is_congruent? congruent?
 
           def node_conforms_to?(other)
-            if @path.index(other.path) == 0
-              return true
-            else
-              return false
-            end
+            path.index(other.path) == 0
+          end
+
+          protected
+
+          def parent_path
+            parent ? parent.path : ''
           end
         end
 
@@ -111,6 +109,12 @@ module OpenEHR
             end
             @occurrences = occurrences
           end
+
+          def path
+            super || (left = (parent_path == '' ? '/' : parent_path);
+                      right = (node_id && left != '/' ? '[' + node_id + ']' : '');
+                      left + right)
+          end
         end
 
         class CAttribute < ArchetypeConstraint
@@ -139,10 +143,15 @@ module OpenEHR
 
           def children=(children)
             @children = children.inject([]) do |array, child|
-              child.parent=self
+              child.parent = self
               array << child
             end if children
           end
+
+          def path
+            super || (left = (parent_path == '/' ? '/' : parent_path + '/');
+                      left + rm_attribute_name)
+          end
         end
 
         class CDefinedObject < CObject
@@ -206,6 +215,14 @@ module OpenEHR
             self.attributes = args[:attributes]
           end
 
+          def attributes=(attributes)
+            @attributes = attributes.inject([]) do |array, child|
+              child.parent = self
+              array << child
+            end if attributes
+            @attributes = [] if attributes.nil?
+          end
+
           def any_allowed?
             return (@attributes.nil? or @attributes.empty?)
           end

data/lib/openehr/parser/adl_parser.rb

@@ -25,7 +25,6 @@ module OpenEHR
 
       def parse
         archetype_id = OpenEHR::RM::Support::Identification::ArchetypeID.new(:value => @result.archetype_id)
-        definition = @result.definition
         ontology = @result.ontology
         original_language = nil
         if @result.original_language

data/lib/openehr/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openehr
 version: !ruby/object:Gem::Version
-  version: 1.2.11
+  version: 1.2.12
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-23 00:00:00.000000000 Z
+date: 2013-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -159,38 +159,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: activerecord
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement