fhir_models 1.6.3 → 1.6.4

data/.travis.yml

@@ -1,6 +1,8 @@
 language: ruby
 rvm:
-  - "2.0.0"
+  - "2.1.10"
+  - "2.2.5"
+  - "2.3.1"
 script:
   - bundle exec rake test
 notifications:
@@ -8,3 +10,6 @@ notifications:
     recipients:
       - healthcare-ci@googlegroups.com
     on_failure: change
+addons:
+    code_climate:
+        repo_token: 0230b3379581b30743b7b4355d7394e427648e604d19a2aba987956201eee290

data/Gemfile

@@ -1,10 +1,4 @@
-source "http://rubygems.org"
-gemspec
+source 'https://rubygems.org'
 
-group :test do
-  gem 'simplecov'
-  gem 'minitest', "~> 4.0"
-  gem 'turn'
-  gem 'awesome_print', :require => 'ap'
-  gem 'nokogiri-diff'
-end
+# Specify your gem's dependencies in fhir_models.gemspec
+gemspec

data/Rakefile

@@ -1,25 +1,24 @@
-require 'rake'
+require 'bundler/gem_tasks'
 require 'rake/testtask'
-require 'fileutils'
-require 'pry'
+require 'rubocop/rake_task'
 
-require_relative 'lib/fhir_models'
-
-# Pull in any rake task defined in lib/tasks
-Dir['lib/tasks/**/*.rake'].sort.each do |ext|
-  load ext
+Dir['lib/fhir_models/tasks/**/*.rake'].each do |file|
+  load file
 end
 
-desc "Run basic tests"
-Rake::TestTask.new(:test_unit) do |t|
-  t.libs << "test"
+desc 'Run basic tests'
+Rake::TestTask.new(:test) do |t|
+  t.libs << 'test'
   t.test_files = FileList['test/**/*_test.rb']
   t.verbose = true
   t.warning = false
 end
 
-task :test => [:test_unit] do
-  system("open coverage/index.html")
+desc 'Run rubocop'
+task :rubocop do
+  RuboCop::RakeTask.new
 end
 
-task :default => [:test]
+task default: [:test, :rubocop] do
+  system('open coverage/index.html')
+end

data/bin/console

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+
+require 'bundler/setup'
+require 'fhir_models'
+
+# You can add fixtures and/or initialization code here to make experimenting
+# with your gem easier. You can also use a different console, if you like.
+
+# (If you use this, don't forget to add pry to your Gemfile!)
+# require "pry"
+# Pry.start
+
+require 'irb'
+IRB.start

data/bin/setup

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+set -euo pipefail
+IFS=$'\n\t'
+set -vx
+
+bundle install
+
+# Do any other automated setup that you need to do here

data/fhir_models.gemspec

@@ -1,20 +1,36 @@
-# -*- encoding: utf-8 -*-
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'fhir_models/version'
 
-Gem::Specification.new do |s|
-  s.name = "fhir_models"
-  s.summary = "A Gem for handling FHIR models in ruby"
-  s.description = "A Gem for handling FHIR models in ruby"
-  s.email = "jwalonoski@mitre.org"
-  s.homepage = "https://github.com/fhir-crucible/fhir_models"
-  s.authors = ["Jason Walonoski", "Andre Quina", "Michael O'Keefe"]
-  s.version = '1.6.3'
-  s.files = s.files = `git ls-files`.split("\n")
-  s.add_development_dependency 'pry'
-  s.add_development_dependency 'minitest'
-  s.add_development_dependency 'test-unit'
-  s.add_dependency 'rake', '>= 0.8.7'
-  s.add_dependency 'nokogiri', '>= 1.6'
-  s.add_dependency 'date_time_precision', '>= 0.8'
-  s.add_dependency 'bcp47', '>= 0.3'
-  s.add_dependency 'mime-types', '>= 1.16', '< 3'
+Gem::Specification.new do |spec|
+  spec.name          = 'fhir_models'
+  spec.version       = FHIR::Models::VERSION
+  spec.authors       = ['Jason Walonoski', 'Andre Quina', "Michael O'Keefe"]
+  spec.email         = ['jwalonoski@mitre.org']
+
+  spec.summary       = %q{A Gem for handling FHIR models in ruby}
+  spec.description   = %q{A Gem for handling FHIR models in ruby}
+  spec.homepage      = 'https://github.com/fhir-crucible/fhir_models'
+
+  spec.files         = `git ls-files -z`.split("\x0").reject do |f|
+    f.match(%r{^(test|spec|features)/})
+  end
+  spec.bindir        = 'exe'
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ['lib']
+
+  spec.add_dependency 'nokogiri', '>= 1.6'
+  spec.add_dependency 'date_time_precision', '>= 0.8'
+  spec.add_dependency 'bcp47', '>= 0.3'
+  spec.add_dependency 'mime-types', '>= 1.16', '< 3'
+
+  spec.add_development_dependency 'bundler', '~> 1.13'
+  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'pry'
+  spec.add_development_dependency 'test-unit'
+  spec.add_development_dependency 'simplecov'
+  spec.add_development_dependency 'nokogiri-diff'
+  spec.add_development_dependency 'rubocop', '~> 0.43.0'
+  spec.add_development_dependency 'codeclimate-test-reporter'
 end

data/lib/fhir_models.rb

@@ -1,44 +1,32 @@
-# Top level include file that brings in all the necessary code
-require 'bundler/setup'
+require 'fhir_models/version'
+
+# TODO what are these for?  Nothing seems to use them.
 require 'yaml'
-require 'nokogiri'
 require 'date_time_precision'
 require 'date_time_precision/format/iso8601'
-require 'mime/types'
-require 'bcp47'
-require 'bigdecimal'
-require 'logger'
-require 'tempfile'
-
-root = File.expand_path '..', File.dirname(File.absolute_path(__FILE__))
 
-# Need to require Hashable first
-require File.join(root,'lib','bootstrap','hashable.rb')
-require File.join(root,'lib','bootstrap','json.rb')
-
-Dir.glob(File.join(root, 'lib','bootstrap','*.rb')).each do |file|
-  require file
-end
-Dir.glob(File.join(root, 'lib','bootstrap','**','*.rb')).each do |file|
-  require file
-end
+Dir.chdir('lib') do
+  # Need to require Hashable first
+  require_relative 'fhir_models/bootstrap/hashable'
+  require_relative 'fhir_models/bootstrap/json'
+  Dir['fhir_models/bootstrap/*.rb'].each do |file|
+    require_relative file
+  end
 
-require File.join(root, 'lib','fhir.rb')
+  require_relative 'fhir_models/fhir'
 
-# Require the generated code
-Dir.glob(File.join(root, 'lib','fhir','*.rb')).each do |file|
-  require file
-end
-Dir.glob(File.join(root, 'lib','fhir','**','*.rb')).each do |file|
-  require file
-end
+  # require generated models
+  Dir['fhir_models/fhir/**/*.rb'].each do |file|
+    require_relative file
+  end
 
-# Require the fluentpath code
-Dir.glob(File.join(root, 'lib','fluentpath','*.rb')).each do |file|
-  require file
-end
+  # require fluentpath code
+  Dir['fhir_models/fluentpath/*.rb'].each do |file|
+    require_relative file
+  end
 
-# Require the fhir_ext code
-Dir.glob(File.join(root, 'lib','fhir_ext','*.rb')).each do |file|
-  require file
+  # require fhir_ext code
+  Dir['fhir_models/fhir_ext/*.rb'].each do |file|
+    require_relative file
+  end
 end

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

@@ -1,7 +1,8 @@
+require 'tempfile'
 module FHIR
   class Definitions
 
-    @@defns = File.expand_path '../../definitions',File.dirname(File.absolute_path(__FILE__))
+    @@defns = File.expand_path '../definitions', File.dirname(File.absolute_path(__FILE__))
     @@types = nil
     @@resources = nil
     @@profiles = nil
@@ -17,8 +18,8 @@ module FHIR
     def self.load_types
       if @@types.nil?
         # load the types
-        filename = File.join(@@defns,'structures','profiles-types.json')
-        raw = File.open(filename,'r:UTF-8',&:read)
+        filename = File.join(@@defns, 'structures', 'profiles-types.json')
+        raw = File.open(filename, 'r:UTF-8', &:read)
         @@types = JSON.parse(raw)['entry'].map{|e|e['resource']}
       end
     end
@@ -51,8 +52,8 @@ module FHIR
     def self.load_resources
       if @@resources.nil?
         # load the resources
-        filename = File.join(@@defns,'structures','profiles-resources.json')
-        raw = File.open(filename,'r:UTF-8',&:read)
+        filename = File.join(@@defns, 'structures', 'profiles-resources.json')
+        raw = File.open(filename, 'r:UTF-8', &:read)
         @@resources = JSON.parse(raw)['entry'].map{|e|e['resource']}
       end
     end
@@ -73,8 +74,8 @@ module FHIR
     def self.load_profiles
       if @@profiles.nil?
         # load the built-in profiles
-        filename = File.join(@@defns,'structures','profiles-others.json')
-        raw = File.open(filename,'r:UTF-8',&:read)
+        filename = File.join(@@defns, 'structures', 'profiles-others.json')
+        raw = File.open(filename, 'r:UTF-8', &:read)
         @@profiles = JSON.parse(raw)['entry'].map{|e|e['resource']}
       end
     end
@@ -82,8 +83,8 @@ module FHIR
     def self.load_extensions
       if @@extensions.nil?
         # load the built-in extensions
-        filename = File.join(@@defns,'structures','extension-definitions.json')
-        raw = File.open(filename,'r:UTF-8',&:read)
+        filename = File.join(@@defns, 'structures', 'extension-definitions.json')
+        raw = File.open(filename, 'r:UTF-8', &:read)
         @@extensions = JSON.parse(raw)['entry'].map{|e|e['resource']}
       end
     end
@@ -143,10 +144,10 @@ module FHIR
       if !defn.nil?
         generator = FHIR::Boot::Generator.new(false)
         type = defn['baseType']
-        id = defn['id'].gsub(/-|_/,'').capitalize
+        id = defn['id'].gsub(/-|_/, '').capitalize
         defn['id'] = type # override profile id with baseType name for generator
-        template = generator.generate_class([ type ],defn)
-        f = Tempfile.new(["profile-#{id}",'.rb'])
+        template = generator.generate_class([ type ], defn)
+        f = Tempfile.new(["profile-#{id}", '.rb'])
         f.write("module FHIR\n")
         f.write("module Profile\n")
         f.write("module #{id}\n")
@@ -158,7 +159,7 @@ module FHIR
           load f
           # set the return class type
           klass = Object.const_get("FHIR::Profile::#{id}::#{type}")
-        rescue Exception => e
+        rescue
           FHIR.logger.error "Failed to generate class for profile #{uri}"
         end
         # unlink the file so it can be garbage collected
@@ -174,14 +175,14 @@ module FHIR
     def self.load_expansions
       if @@expansions.nil?
         # load the expansions
-        filename = File.join(@@defns,'valuesets','expansions.json')
-        raw = File.open(filename,'r:UTF-8',&:read)
+        filename = File.join(@@defns, 'valuesets', 'expansions.json')
+        raw = File.open(filename, 'r:UTF-8', &:read)
         @@expansions = JSON.parse(raw)['entry'].map{|e|e['resource']}
       end
       if @@valuesets.nil?
         # load the valuesets
-        filename = File.join(@@defns,'valuesets','valuesets.json')
-        raw = File.open(filename,'r:UTF-8',&:read)
+        filename = File.join(@@defns, 'valuesets', 'valuesets.json')
+        raw = File.open(filename, 'r:UTF-8', &:read)
         @@valuesets = JSON.parse(raw)['entry'].map{|e|e['resource']}
       end
     end
@@ -203,7 +204,7 @@ module FHIR
           included_systems = valueset['compose']['include'].map{|x|x['system']}.uniq
           included_systems.each{|x| codes[x]=[] if !codes.keys.include?(x) }
           systems = @@valuesets.select{|x|x['resourceType']=='CodeSystem' && included_systems.include?(x['url'])}
-          systems.each do |x| 
+          systems.each do |x|
             x['concept'].each{|y| codes[x['url']] << y['code']}
           end
         end
@@ -218,16 +219,16 @@ module FHIR
     def self.load_search_params
       if @@search_params.nil?
         # load the search parameters
-        filename = File.join(@@defns,'structures','search-parameters.json')
-        raw = File.open(filename,'r:UTF-8',&:read)
-        @@search_params = JSON.parse(raw)['entry'].map{|e|e['resource']}        
+        filename = File.join(@@defns, 'structures', 'search-parameters.json')
+        raw = File.open(filename, 'r:UTF-8', &:read)
+        @@search_params = JSON.parse(raw)['entry'].map{|e|e['resource']}
       end
     end
 
-    def self.get_search_parameters(typeName)
-      return nil if typeName.nil?
+    def self.get_search_parameters(type_name)
+      return nil if type_name.nil?
       load_search_params
-      @@search_params.select{|p|p['base']==typeName && p['xpath'] && !p['xpath'].include?('extension')}.map{|p|p['code']}
+      @@search_params.select{|p|p['base']==type_name && p['xpath'] && !p['xpath'].include?('extension')}.map{|p|p['code']}
     end
 
     private_class_method :load_types, :load_extensions, :load_expansions, :load_profiles, :load_resources, :load_search_params

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

@@ -26,9 +26,9 @@ module FHIR
         hash[v.to_s[1..-1]] = self.instance_variable_get(v)
       end
       hash.delete('name')
-      hash.keep_if do |key,value|
-        !value.nil? && (  (value.is_a?(Hash) && !value.empty?) || 
-                          (value.is_a?(Array) && !value.empty?) || 
+      hash.keep_if do |_key, value|
+        !value.nil? && (  (value.is_a?(Hash) && !value.empty?) ||
+                          (value.is_a?(Array) && !value.empty?) ||
                           (!value.is_a?(Hash) && !value.is_a?(Array))
                        )
       end
@@ -37,9 +37,9 @@ module FHIR
 
     def fix_name(name)
       fix = nil
-      fix = "local_#{name}" if ['class','method','resourceType'].include?(name)
+      fix = "local_#{name}" if ['class', 'method', 'resourceType'].include?(name)
       fix
     end
 
   end
-end
+end

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

@@ -7,7 +7,7 @@ module FHIR
       # templates keeps track of all the templates in context within a given StructureDefinition
       attr_accessor :templates
 
-      def initialize(auto_setup=true)   
+      def initialize(auto_setup=true)
         # load the valueset expansions
         @defn = FHIR::Definitions
         # templates is an array
@@ -18,18 +18,18 @@ module FHIR
       def setup
         # make folders for generated content if they do not exist
         @lib = File.expand_path '..', File.dirname(File.absolute_path(__FILE__))
-        Dir.mkdir(File.join(@lib,'fhir')) if !Dir.exists?(File.join(@lib,'fhir'))
-        Dir.mkdir(File.join(@lib,'fhir','types')) if !Dir.exists?(File.join(@lib,'fhir','types'))
-        Dir.mkdir(File.join(@lib,'fhir','resources')) if !Dir.exists?(File.join(@lib,'fhir','resources'))
+        Dir.mkdir(File.join(@lib, 'fhir')) if !Dir.exist?(File.join(@lib, 'fhir'))
+        Dir.mkdir(File.join(@lib, 'fhir', 'types')) if !Dir.exist?(File.join(@lib, 'fhir', 'types'))
+        Dir.mkdir(File.join(@lib, 'fhir', 'resources')) if !Dir.exist?(File.join(@lib, 'fhir', 'resources'))
 
         # delete previously generated folder contents
-        Dir.glob(File.join(@lib,'fhir','*')).each{|f|File.delete(f) if !File.directory?(f)}
-        Dir.glob(File.join(@lib,'fhir','**','*')).each{|f|File.delete(f) if !File.directory?(f)}
+        Dir.glob(File.join(@lib, 'fhir', '*')).each{|f|File.delete(f) if !File.directory?(f)}
+        Dir.glob(File.join(@lib, 'fhir', '**', '*')).each{|f|File.delete(f) if !File.directory?(f)}
       end
 
       def generate_metadata
-        template = FHIR::Boot::Template.new([],true)
-        
+        template = FHIR::Boot::Template.new([], true)
+
         primitives = @defn.get_primitive_types
         hash = {}
         primitives.each do |p|
@@ -40,18 +40,17 @@ module FHIR
           type = p['snapshot']['element'].select{|e| e['path'].end_with?('.value')}.first['type'].first
 
           # try to find the JSON data type
-          begin
-            ext = type['_code']['extension'].select{|e| e['url']=='http://hl7.org/fhir/StructureDefinition/structuredefinition-json-type'}.first
+          ext = type['_code']['extension'].find{|e| e['url']=='http://hl7.org/fhir/StructureDefinition/structuredefinition-json-type'}
+          if ext
             field.type = ext['valueString']
-          rescue 
+          else
             field.type = 'string'
           end
 
           # try to find a regex
-          begin
-            ext = type['extension'].select{|e| e['url']=='http://hl7.org/fhir/StructureDefinition/structuredefinition-regex'}.first
-            field.regex = ext['valueString']
-          rescue 
+          if type['extension']
+            ext = type['extension'].find{|e| e['url']=='http://hl7.org/fhir/StructureDefinition/structuredefinition-regex'}
+            field.regex = ext['valueString'] if ext
           end
 
           hash[ p['id' ] ] = field.serialize
@@ -63,67 +62,67 @@ module FHIR
         # resources
         template.constants['RESOURCES'] = @defn.get_resource_definitions.map{|r|r['id']}
 
-        filename = File.join(@lib,'fhir','metadata.rb')
-        file = File.open(filename,'w:UTF-8')
+        filename = File.join(@lib, 'fhir', 'metadata.rb')
+        file = File.open(filename, 'w:UTF-8')
         file.write(template.to_s)
         file.close
       end
 
       def generate_types
-        folder = File.join @lib,'fhir','types'
+        folder = File.join @lib, 'fhir', 'types'
         # complex data types start with an uppercase letter
         # and we'll filter out profiles on types (for example, Age is a profile on Quantity)
-        complexTypes = @defn.get_complex_types
-        generate_class_files(folder,complexTypes)
+        complex_types = @defn.get_complex_types
+        generate_class_files(folder, complex_types)
       end
 
       def generate_resources
-        folder = File.join @lib,'fhir','resources'
-        generate_class_files(folder,@defn.get_resource_definitions)
+        folder = File.join @lib, 'fhir', 'resources'
+        generate_class_files(folder, @defn.get_resource_definitions)
       end
 
-      def generate_class_files(folder=@lib,structureDefs)
-        structureDefs.each do |structureDef|
+      def generate_class_files(folder=@lib, structure_defs)
+        structure_defs.each do |structure_def|
           @templates.clear
-          typeName = structureDef['id']
-          template = generate_class([ typeName ],structureDef,true)
-          params = @defn.get_search_parameters(typeName)
+          type_name = structure_def['id']
+          template = generate_class([ type_name ], structure_def, true)
+          params = @defn.get_search_parameters(type_name)
           template.constants['SEARCH_PARAMS'] = params if !params.nil?
-          filename = File.join(folder,"#{typeName}.rb")
-          file = File.open(filename,'w:UTF-8')
+          filename = File.join(folder, "#{type_name}.rb")
+          file = File.open(filename, 'w:UTF-8')
           file.write(template.to_s)
           file.close
         end
       end
 
-      def capFirst(string)
+      def cap_first(string)
         t = String.new(string)
         t[0] = t[0].upcase
         t
       end
 
-      def generate_class(hierarchy,structureDef,top_level=false)
-        typeName = structureDef['id']
-        constrainedType = structureDef['constrainedType']
-        pathType = typeName
-        pathType = constrainedType if constrainedType
+      def generate_class(hierarchy, structure_def, top_level=false)
+        type_name = structure_def['id']
+        constrained_type = structure_def['constrained_type']
+        path_type = type_name
+        path_type = constrained_type if constrained_type
 
-        template = FHIR::Boot::Template.new([ typeName ],top_level)
+        template = FHIR::Boot::Template.new([ type_name ], top_level)
         template.hierarchy = hierarchy
-        template.kind = structureDef['kind']
-        return template if structureDef['snapshot'].nil? || structureDef['snapshot']['element'].nil?
+        template.kind = structure_def['kind']
+        return template if structure_def['snapshot'].nil? || structure_def['snapshot']['element'].nil?
 
-        multipleDataTypes = {}
+        multiple_data_types = {}
 
-        # examine the snapshot.elements... move the Element and BackboneElements, 
+        # examine the snapshot.elements... move the Element and BackboneElements,
         # and their children, into separate StructureDefiniton hashes and process as
         # child templates.
-        child_templates = [] 
-        structureDef['snapshot']['element'].each do |element|
+        child_templates = []
+        structure_def['snapshot']['element'].each do |element|
           # skip the first element
-          next if element['path']==pathType
+          next if element['path']==path_type
           if element['type']
-            unique_types = element['type'].map{|t|t['code']}.uniq 
+            unique_types = element['type'].map{|t|t['code']}.uniq
             if unique_types.include?('Element') || unique_types.include?('BackboneElement')
               child_templates << element['path']
             end
@@ -131,69 +130,69 @@ module FHIR
         end
         # now build the child templates...
         child_templates.each do |child_name|
-          child_fixed_name = capFirst(child_name.gsub("#{typeName}.",''))
+          child_fixed_name = cap_first(child_name.gsub("#{type_name}.", ''))
           next if child_fixed_name.include?('.')
-          child_def = { 'id'=> child_fixed_name, 'snapshot'=>{'element'=>[]} }
+          child_def = { 'id'=> child_fixed_name, 'snapshot'=>{ 'element'=>[] } }
           # Copy the element definitions for the child structure
-          structureDef['snapshot']['element'].each do |element|
+          structure_def['snapshot']['element'].each do |element|
             child_def['snapshot']['element'] << element.clone if element['path'].start_with?("#{child_name}.")
           end
           # Remove the child elements
           child_paths = child_def['snapshot']['element'].map{|e|e['path']}
           # child_paths = child_paths.drop(1)
-          structureDef['snapshot']['element'].keep_if do |element|
+          structure_def['snapshot']['element'].keep_if do |element|
             !child_paths.include?(element['path'])
           end
           # Rename the child paths
           child_def['snapshot']['element'].each do |element|
-            element['path'] = element['path'].gsub(child_name,child_fixed_name)
+            element['path'] = element['path'].gsub(child_name, child_fixed_name)
           end
           # add the child
           child_hierarchy = hierarchy + [ child_fixed_name ]
-          child_klass = generate_class(child_hierarchy,child_def)
+          child_klass = generate_class(child_hierarchy, child_def)
           template.templates << child_klass
           @templates << child_klass
         end
 
         # Process the remaining attributes (none of which are Elements or BackboneElements)
-        structureDef['snapshot']['element'].each do |element|
+        structure_def['snapshot']['element'].each do |element|
           # skip the first element
-          next if element['path']==pathType
+          next if element['path']==path_type
 
-          field_base_name = element['path'].gsub("#{pathType}.",'')
+          field_base_name = element['path'].gsub("#{path_type}.", '')
           # If the element has a type, treat it as a datatype or resource
           # If not, treat it as a reference to an already declared internal class
           if !element['type'].nil?
             # profiles contains a list of profiles if the datatype is Reference or Extension
             profiles = []
-            element['type'].select{|t|t['code']=='Reference' || t['code']=='Extension'}.each do |dataType|
-              profiles << dataType['profile']
+            element['type'].select{|t|t['code']=='Reference' || t['code']=='Extension'}.each do |data_type|
+              profiles << data_type['profile']
             end
             profiles.select!{|p|!p.nil?}
             profiles.flatten!
 
             # Calculate fields that have multiple data types
             if element['type'].length > 1
-              fieldname = field_base_name.gsub('[x]','')
+              fieldname = field_base_name.gsub('[x]', '')
               unique_types = element['type'].map{|t|t['code']}.uniq
-              multipleDataTypes[fieldname] = unique_types if(unique_types.length>1)
+              multiple_data_types[fieldname] = unique_types if(unique_types.length>1)
             end
 
             # generate a field for each valid datatype... this is for things like Resource.attribute[x]
-            element['type'].map{|t|t['code']}.uniq.each do |dataType|
-              capitalized = capFirst(dataType)
-              fieldname = field_base_name.gsub('[x]',capitalized)
+            element['type'].map{|t|t['code']}.uniq.each do |data_type|
+              capitalized = cap_first(data_type)
+              fieldname = field_base_name.gsub('[x]', capitalized)
               field = FHIR::Field.new(fieldname)
-              field.path = element['path'].gsub(pathType,typeName)
-              field.type = dataType
+              field.path = element['path'].gsub(path_type, type_name)
+              field.type = data_type
               field.type = 'Extension' if field.path.end_with?('extension')
-              field.type_profiles = profiles if(dataType=='Reference' || dataType=='Extension')
+              field.type_profiles = profiles if(data_type=='Reference' || data_type=='Extension')
               field.min = element['min']
               field.max = element['max']
               field.max = field.max.to_i
               field.max = '*' if element['max']=='*'
 
-              if ['code','Coding','CodeableConcept'].include?(dataType) && element['binding']
+              if ['code', 'Coding', 'CodeableConcept'].include?(data_type) && element['binding']
                 field.binding = element['binding']
                 field.binding['uri'] = field.binding['valueSetUri']
                 field.binding['uri'] = field.binding['valueSetReference'] if field.binding['uri'].nil?
@@ -206,16 +205,16 @@ module FHIR
                 codes = @defn.get_codes( field.binding['uri'] )
                 field.valid_codes = codes if !codes.nil?
                 FHIR.logger.warn "  MISSING EXPANSION -- #{field.path} #{field.min}..#{field.max}: #{field.binding['uri']} (#{field.binding['strength']})" if field.valid_codes.empty? && field.binding['uri'] && !field.binding['uri'].end_with?('bcp47') && !field.binding['uri'].end_with?('bcp13.txt')
-              elsif ['Element','BackboneElement'].include?(dataType)
+              elsif ['Element', 'BackboneElement'].include?(data_type)
                 # This is a nested structure or class
-                field.type = "#{hierarchy.join('::')}::#{capFirst(field.name)}"
+                field.type = "#{hierarchy.join('::')}::#{cap_first(field.name)}"
               end
 
               template.fields << field
             end
           else # If there is no data type, treat the type as a reference to an already declared internal class
             field = FHIR::Field.new(field_base_name)
-            field.path = element['path'].gsub(pathType,typeName)
+            field.path = element['path'].gsub(path_type, type_name)
             field.type = element['contentReference']
             field.type = field.type[1..-1] if field.type[0]=='#'
             if (hierarchy.last==field.type)
@@ -229,7 +228,7 @@ module FHIR
                 field.type = klass.hierarchy.join('::')
               else
                 # the template/child is a direct ancester (it isn't in @templates yet because it is being defined now)
-                field.type = field.type.split('.').map{|x| capFirst(x) }.join('::')
+                field.type = field.type.split('.').map{|x| cap_first(x) }.join('::')
               end
             end
             field.min = element['min']
@@ -240,7 +239,7 @@ module FHIR
           end
         end
 
-        template.constants['MULTIPLE_TYPES'] = multipleDataTypes if !multipleDataTypes.empty?
+        template.constants['MULTIPLE_TYPES'] = multiple_data_types if !multiple_data_types.empty?
         template
       end