fhir_models 1.6.3 → 1.6.4

data/lib/{bootstrap → fhir_models/bootstrap}/template.rb

@@ -11,7 +11,7 @@ module FHIR
       attr_accessor :templates
       attr_accessor :top_level
 
-      def initialize(name=['Template'],top_level=false)
+      def initialize(name=['Template'], top_level=false)
         @name = name
         @hierarchy = []
         @kind = nil
@@ -50,16 +50,16 @@ module FHIR
         s << 'module FHIR' if @top_level
 
         @name.each_with_index do |name, index|
-          space = indent(index+1,offset)
+          space = indent(index+1, offset)
           type = 'module'
           type = 'class' if index==@name.length-1
           classdef = "#{space}#{type} #{name}"
-          classdef += " < FHIR::Model" if type == 'class'
+          classdef += ' < FHIR::Model' if type == 'class'
           s << classdef
         end
 
         # include modules
-        space = indent(@name.length+1,offset)
+        space = indent(@name.length+1, offset)
         s << "#{space}include FHIR::Hashable" if(@name.length > 0)
         s << "#{space}include FHIR::Json" if(@name.length > 0)
         s << "#{space}include FHIR::Xml" if(@name.length > 0)
@@ -70,14 +70,14 @@ module FHIR
         @constants['METADATA'] = metadata if !metadata.empty?
 
         # add constants
-        @constants.each do |constant,value|
+        @constants.each do |constant, value|
           if value.is_a?(Hash)
             s << "#{space}#{constant.upcase} = {"
-            value.each do |k,v|
+            value.each do |k, v|
               s << "#{space}  '#{k}' => #{v},"
               # Replace wildcard string with Infinity constant
-              s[-1].gsub!('"max"=>"*"','"max"=>Float::INFINITY')
-              s[-1].gsub!('"','\'')
+              s[-1].gsub!('"max"=>"*"', '"max"=>Float::INFINITY')
+              s[-1].tr!('"', '\'')
             end
             s[-1] = s[-1][0..-2] # remove the trailing comma
             s << "#{space}}"
@@ -90,12 +90,12 @@ module FHIR
         # add internal nested classes
         @templates.each do |template|
           s << template.to_s(space.length-2)
-          s << ''          
+          s << ''
         end
 
         # calculate the longest field name for whitespace layout
         max_name_size = 0
-        @fields.each do |f| 
+        @fields.each do |f|
           name = f.local_name || f.name
           max_name_size=name.length if(name.length > max_name_size)
         end
@@ -108,12 +108,12 @@ module FHIR
           s[-1] << ("%-#{max_name_size}s" % "#{local_name}")
           # add comment after field declaration
           s[-1] << "# #{field.min}-#{field.max} "
-          s[-1] << "[ " if(field.max.to_i > 1 || field.max=='*')
+          s[-1] << '[ ' if(field.max.to_i > 1 || field.max=='*')
           s[-1] << field.type
           if field.type=='Reference'
             s[-1] << "(#{ field.type_profiles.map{|p|p.split('/').last}.join('|') })"
           end
-          s[-1] << " ]" if(field.max.to_i > 1 || field.max=='*')          
+          s[-1] << ' ]' if(field.max.to_i > 1 || field.max=='*')
         end
 
         if @top_level && @kind=='resource'
@@ -125,14 +125,14 @@ module FHIR
 
         # close all the class and module declarations
         (0..@name.length-1).reverse_each do |index|
-          space = indent(index+1,offset)
-          s << "#{space}end"          
+          space = indent(index+1, offset)
+          s << "#{space}end"
         end
         s << 'end' if @top_level
         s.join("\n")
       end
 
-      def indent(level=0,offset)
+      def indent(level=0, offset)
         ' '*(offset) + '  '*(level)
       end
 

data/lib/{bootstrap → fhir_models/bootstrap}/xml.rb

@@ -1,3 +1,4 @@
+require 'nokogiri'
 module FHIR
   module Xml
 
@@ -6,20 +7,19 @@ module FHIR
     #
 
     def to_xml
-      hash = {}
       hash = self.to_hash
       hash.delete('resourceType')
       doc = Nokogiri::XML::Document.new
       doc.encoding = 'utf-8'
-      doc.root = hash_to_xml_node(self.resourceType,hash,doc)
+      doc.root = hash_to_xml_node(self.resourceType, hash, doc)
       doc.root.default_namespace = 'http://hl7.org/fhir'
       doc.to_xml
     end
 
     # Hash keys are ordered in Ruby 1.9 and later, so we can rely on their order
     # to be the correct order for the XML serialization.
-    def hash_to_xml_node(name,hash,doc)
-      node = Nokogiri::XML::Node.new(name,doc)
+    def hash_to_xml_node(name, hash, doc)
+      node = Nokogiri::XML::Node.new(name, doc)
 
       # if hash contains resourceType
       # create a child node with the name==resourceType
@@ -32,37 +32,37 @@ module FHIR
         return node
       end
 
-      hash.each do |key,value|
-        next if(['extension','modifierExtension'].include?(name) && key=='url')
+      hash.each do |key, value|
+        next if(['extension', 'modifierExtension'].include?(name) && key=='url')
         next if(key == 'id' && !FHIR::RESOURCES.include?(name))
         if value.is_a?(Hash)
-          node.add_child(hash_to_xml_node(key,value,doc))
+          node.add_child(hash_to_xml_node(key, value, doc))
         elsif value.is_a?(Array)
           value.each do |v|
             if v.is_a?(Hash)
-              node.add_child(hash_to_xml_node(key,v,doc))
+              node.add_child(hash_to_xml_node(key, v, doc))
             else
-              child = Nokogiri::XML::Node.new(key,doc)
-              child.set_attribute('value',v)
+              child = Nokogiri::XML::Node.new(key, doc)
+              child.set_attribute('value', v)
               node.add_child(child)
             end
           end
         else
-          child = Nokogiri::XML::Node.new(key,doc)
+          child = Nokogiri::XML::Node.new(key, doc)
           if(name=='text' && key=='div')
-            child.set_attribute('xmlns','http://www.w3.org/1999/xhtml')
+            child.set_attribute('xmlns', 'http://www.w3.org/1999/xhtml')
             html = value.strip
             if html.start_with?('<div') && html.end_with?('</div>')
               html = html[html.index('>')+1..-7]
             end
             child.inner_html = html
           else
-            child.set_attribute('value',value)
+            child.set_attribute('value', value)
           end
           node.add_child(child)
         end
       end
-      node.set_attribute('url', hash['url']) if ['extension','modifierExtension'].include?(name)
+      node.set_attribute('url', hash['url']) if ['extension', 'modifierExtension'].include?(name)
       node.set_attribute('id', hash['id']) if hash['id'] && !FHIR::RESOURCES.include?(name)
       node
     end
@@ -75,10 +75,10 @@ module FHIR
 
       resource = nil
       begin
-        resourceType = doc.root.name
-        klass = Module.const_get("FHIR::#{resourceType}")
+        resource_type = doc.root.name
+        klass = Module.const_get("FHIR::#{resource_type}")
         resource = klass.new(hash)
-      rescue Exception => e
+      rescue => e
         FHIR.logger.error("Failed to deserialize XML:\n#{xml}\n#{e.backtrace}")
         resource = nil
       end
@@ -88,7 +88,7 @@ module FHIR
     def self.xml_node_to_hash(node)
       hash = {}
       node.children.each do |child|
-        next if [Nokogiri::XML::Text,Nokogiri::XML::Comment].include?(child.class)
+        next if [Nokogiri::XML::Text, Nokogiri::XML::Comment].include?(child.class)
 
         key = child.name
         if node.name=='text' && key=='div'
@@ -106,16 +106,16 @@ module FHIR
             hash[key] = value
           end
         end
-       end
-      hash['url'] = node.get_attribute('url') if ['extension','modifierExtension'].include?(node.name)
+      end
+      hash['url'] = node.get_attribute('url') if ['extension', 'modifierExtension'].include?(node.name)
       hash['id'] = node.get_attribute('id') if node.get_attribute('id') # Testscript fixture ids (applies to any BackboneElement)
       hash['resourceType'] = node.name if FHIR::RESOURCES.include?(node.name)
 
       if( # If this hash contains nothing but an embedded resource, we should return that
           # embedded resource without the wrapper
-          hash.keys.length==1 && 
-          FHIR::RESOURCES.include?(hash.keys.first) && 
-          hash.values.first.is_a?(Hash) && 
+          hash.keys.length==1 &&
+          FHIR::RESOURCES.include?(hash.keys.first) &&
+          hash.values.first.is_a?(Hash) &&
           hash.values.first['resourceType']==hash.keys.first
         )
         hash.values.first
@@ -129,8 +129,8 @@ module FHIR
     end
 
     def self.validate(xml)
-      defns = File.expand_path '../../definitions/schema',File.dirname(File.absolute_path(__FILE__))
-      schema = File.join(defns,'fhir-all.xsd')
+      defns = File.expand_path '../definitions/schema', File.dirname(File.absolute_path(__FILE__))
+      schema = File.join(defns, 'fhir-all.xsd')
       xsd = Nokogiri::XML::Schema(File.new(schema))
       xsd.validate(Nokogiri::XML(xml))
     end