fhir_models 1.6.1 → 1.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e71a0c8cd83f3871b3f9a1d3c881c9b0d01c64d7
-  data.tar.gz: 7c55e946fbd82fe8accb6a0fc15fd3e34f768143
+  metadata.gz: bee3770940059e03438d83d5796331896b4b00ba
+  data.tar.gz: 2d3d96330595dcc6811da5f9a1f78bdd43af90e0
 SHA512:
-  metadata.gz: 2606c5670d5983a86af5f4b6ddcee9d0ec791be3489325e81b8a9982ea0dd601c9317516be7ed8307c66ed22e59b13af26cae51d1b56d1859bc01ac679296291
-  data.tar.gz: 089670e82c830e365d3ad84655aeaae392854aebf1a5c41aa7907866dc72660c84e65e3b3bc9959384d85626711db4cdb033d8b2583da1770748bf5718bd837b
+  metadata.gz: 8de95c1ddc6a7e064cab82c31226fe2c39027bca2385cabf0fc7251b76b5ba22435da6e60d739f1ab32c4b34c5e0ae1e40ceecae4134d6a5217c2977a7e4c65b
+  data.tar.gz: ce89ad4aca54dc75637f58184ea36bd8baebdef0396f0ee809a9f09ba07b7a8082d87b01df3cb73296dde40a56aa5cd43bfb8cf5e85624d44c62dbb0315d58a6

data/Gemfile

@@ -2,9 +2,9 @@ source "http://rubygems.org"
 gemspec
 
 group :test do
-  gem 'simplecov', :require => false
+  gem 'simplecov'
   gem 'minitest', "~> 4.0"
-  gem 'turn', :require => false
+  gem 'turn'
   gem 'awesome_print', :require => 'ap'
   gem 'nokogiri-diff'
 end

data/fhir_models.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
   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.1'
+  s.version = '1.6.2'
   s.files = s.files = `git ls-files`.split("\n")
   s.add_development_dependency 'pry'
   s.add_dependency 'rake', '>= 0.8.7'

data/lib/bootstrap/model.rb

@@ -132,12 +132,21 @@ module FHIR
       multiple_types = self.class::MULTIPLE_TYPES rescue {}
       multiple_types.each do |prefix,suffixes|
         count = 0
+        present = []
         suffixes.each do |suffix|
-          count += 1 if errors["#{prefix}#{suffix}"]
-          # TODO check if multiple data types are actually present, not just errors
+          typename = "#{prefix}#{suffix[0].upcase}#{suffix[1..-1]}"
+          count += 1 if errors[typename]
+          # check which multiple data types are actually present, not just errors
           # actually, this might be allowed depending on cardinality
+          value = self.instance_variable_get("@#{typename}")
+          present << typename if !value.nil? || (value.is_a?(Array) && !value.empty?)          
         end
         errors[prefix] = ["#{prefix}[x]: more than one type present."] if(count > 1)
+        # remove errors for suffixes that are not present
+        suffixes.each do |suffix|
+          typename = "#{prefix}#{suffix[0].upcase}#{suffix[1..-1]}"
+          errors.delete(typename) if !present.include?(typename)
+        end
       end
       errors.keep_if{|k,v|(v && !v.empty?)}
     end
@@ -245,7 +254,7 @@ module FHIR
           end
         end
       end # value.each
-      errors.delete(field) if value.empty?
+      errors.delete(field) if errors[field].empty?
     end
 
     def is_primitive?(datatype,value)

data/test/test_helper.rb

@@ -0,0 +1,10 @@
+require 'simplecov'
+require_relative '../lib/fhir_models'
+
+require 'fileutils'
+require 'pry'
+require 'nokogiri/diff'
+require 'minitest/autorun'
+require 'bundler/setup'
+require 'test/unit'
+require 'turn'

data/test/unit/contents_test.rb

@@ -1,11 +1,4 @@
-require_relative "../simplecov"
-require_relative '../../lib/fhir_models'
-
-require 'fileutils'
-require 'pry'
-require 'minitest/autorun'
-require 'bundler/setup'
-require 'test/unit'
+require_relative '../test_helper'
 
 class ContentsTest < Test::Unit::TestCase
 

data/test/unit/equality_test.rb

@@ -1,11 +1,4 @@
-require_relative "../simplecov"
-require_relative '../../lib/fhir_models'
-
-require 'fileutils'
-require 'pry'
-require 'minitest/autorun'
-require 'bundler/setup'
-require 'test/unit'
+require_relative '../test_helper'
 
 class EqualityTest < Test::Unit::TestCase
  

data/test/unit/expansions_test.rb

@@ -1,11 +1,4 @@
-require_relative "../simplecov"
-require_relative '../../lib/fhir_models'
-
-require 'fileutils'
-require 'pry'
-require 'minitest/autorun'
-require 'bundler/setup'
-require 'test/unit'
+require_relative '../test_helper'
 
 class ExpansionsTest < Test::Unit::TestCase
 

data/test/unit/extension_by_name_test.rb

@@ -1,11 +1,4 @@
-require_relative "../simplecov"
-require_relative '../../lib/fhir_models'
-
-require 'fileutils'
-require 'pry'
-require 'minitest/autorun'
-require 'bundler/setup'
-require 'test/unit'
+require_relative '../test_helper'
 
 class ExtensionByNameTest < Test::Unit::TestCase
 

data/test/unit/fluentpath/and_or_not_test.rb

@@ -1,11 +1,4 @@
-require_relative "../../simplecov"
-require_relative '../../../lib/fhir_models'
-
-require 'fileutils'
-require 'pry'
-require 'minitest/autorun'
-require 'bundler/setup'
-require 'test/unit'
+require_relative '../../test_helper'
 
 class AndOrNotTest < Test::Unit::TestCase
 

data/test/unit/fluentpath/convert_to_boolean_test.rb

@@ -1,11 +1,4 @@
-require_relative "../../simplecov"
-require_relative '../../../lib/fhir_models'
-
-require 'fileutils'
-require 'pry'
-require 'minitest/autorun'
-require 'bundler/setup'
-require 'test/unit'
+require_relative '../../test_helper'
 
 class ConvertToBooleanTest < Test::Unit::TestCase
 

data/test/unit/fluentpath/existence_test.rb

@@ -1,11 +1,4 @@
-require_relative "../../simplecov"
-require_relative '../../../lib/fhir_models'
-
-require 'fileutils'
-require 'pry'
-require 'minitest/autorun'
-require 'bundler/setup'
-require 'test/unit'
+require_relative '../../test_helper'
 
 class ExistenceTest < Test::Unit::TestCase
 

data/test/unit/fluentpath/extension_test.rb

@@ -1,11 +1,4 @@
-require_relative "../../simplecov"
-require_relative '../../../lib/fhir_models'
-
-require 'fileutils'
-require 'pry'
-require 'minitest/autorun'
-require 'bundler/setup'
-require 'test/unit'
+require_relative '../../test_helper'
 
 class ExtensionTest < Test::Unit::TestCase
 

data/test/unit/fluentpath/fluent_equality_test.rb

@@ -1,11 +1,4 @@
-require_relative "../../simplecov"
-require_relative '../../../lib/fhir_models'
-
-require 'fileutils'
-require 'pry'
-require 'minitest/autorun'
-require 'bundler/setup'
-require 'test/unit'
+require_relative '../../test_helper'
 
 class FluentEqualityTest < Test::Unit::TestCase
 

data/test/unit/fluentpath/invariants_test.rb

@@ -1,11 +1,4 @@
-require_relative "../../simplecov"
-require_relative '../../../lib/fhir_models'
-
-require 'fileutils'
-require 'pry'
-require 'minitest/autorun'
-require 'bundler/setup'
-require 'test/unit'
+require_relative '../../test_helper'
 
 class InvariantsTest < Test::Unit::TestCase
 

data/test/unit/fluentpath/math_test.rb

@@ -1,11 +1,4 @@
-require_relative "../../simplecov"
-require_relative '../../../lib/fhir_models'
-
-require 'fileutils'
-require 'pry'
-require 'minitest/autorun'
-require 'bundler/setup'
-require 'test/unit'
+require_relative '../../test_helper'
 
 class MathTest < Test::Unit::TestCase
 

data/test/unit/fluentpath/path_test.rb

@@ -1,11 +1,4 @@
-require_relative "../../simplecov"
-require_relative '../../../lib/fhir_models'
-
-require 'fileutils'
-require 'pry'
-require 'minitest/autorun'
-require 'bundler/setup'
-require 'test/unit'
+require_relative '../../test_helper'
 
 class PathTest < Test::Unit::TestCase
 

data/test/unit/fluentpath/string_test.rb

@@ -1,11 +1,4 @@
-require_relative "../../simplecov"
-require_relative '../../../lib/fhir_models'
-
-require 'fileutils'
-require 'pry'
-require 'minitest/autorun'
-require 'bundler/setup'
-require 'test/unit'
+require_relative '../../test_helper'
 
 class StringTest < Test::Unit::TestCase
 

data/test/unit/json_format_test.rb

@@ -1,11 +1,4 @@
-require_relative "../simplecov"
-require_relative '../../lib/fhir_models'
-
-require 'fileutils'
-require 'pry'
-require 'minitest/autorun'
-require 'bundler/setup'
-require 'test/unit'
+require_relative '../test_helper'
 
 class JsonFormatTest < Test::Unit::TestCase
  

data/test/unit/json_validation_test.rb

@@ -1,11 +1,4 @@
-require_relative "../simplecov"
-require_relative '../../lib/fhir_models'
-
-require 'fileutils'
-require 'pry'
-require 'minitest/autorun'
-require 'bundler/setup'
-require 'test/unit'
+require_relative '../test_helper'
 
 class JsonValidationTest < Test::Unit::TestCase
  

data/test/unit/multiple_types_test.rb

@@ -1,11 +1,4 @@
-require_relative "../simplecov"
-require_relative '../../lib/fhir_models'
-
-require 'fileutils'
-require 'pry'
-require 'minitest/autorun'
-require 'bundler/setup'
-require 'test/unit'
+require_relative '../test_helper'
 
 class MultipleTypesTest < Test::Unit::TestCase
 

data/test/unit/profile_validation_test.rb

@@ -1,11 +1,4 @@
-require_relative "../simplecov"
-require_relative '../../lib/fhir_models'
-
-require 'fileutils'
-require 'pry'
-require 'minitest/autorun'
-require 'bundler/setup'
-require 'test/unit'
+require_relative '../test_helper'
 
 class ProfileValidationTest < Test::Unit::TestCase
  

data/test/unit/xml_format_test.rb

@@ -1,12 +1,4 @@
-require_relative "../simplecov"
-require_relative '../../lib/fhir_models'
-
-require 'fileutils'
-require 'pry'
-require 'nokogiri/diff'
-require 'minitest/autorun'
-require 'bundler/setup'
-require 'test/unit'
+require_relative '../test_helper'
 
 class XmlFormatTest < Test::Unit::TestCase
  

data/test/unit/xml_schema_validation_test.rb

@@ -1,12 +1,4 @@
-require_relative "../simplecov"
-require_relative '../../lib/fhir_models'
-
-require 'fileutils'
-require 'pry'
-require 'nokogiri/diff'
-require 'minitest/autorun'
-require 'bundler/setup'
-require 'test/unit'
+require_relative '../test_helper'
 
 class XmlSchemaValidationTest < Test::Unit::TestCase
  

data/test/unit/xml_validation_test.rb

@@ -1,11 +1,4 @@
-require_relative "../simplecov"
-require_relative '../../lib/fhir_models'
-
-require 'fileutils'
-require 'pry'
-require 'minitest/autorun'
-require 'bundler/setup'
-require 'test/unit'
+require_relative '../test_helper'
 
 class XmlValidationTest < Test::Unit::TestCase
  

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fhir_models
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.6.2
 platform: ruby
 authors:
 - Jason Walonoski
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-22 00:00:00.000000000 Z
+date: 2016-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -109,6 +109,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .simplecov
 - .travis.yml
 - Gemfile
 - Gemfile.lock
@@ -1210,7 +1211,7 @@ files:
 - lib/fluentpath/expression.rb
 - lib/fluentpath/parse.rb
 - lib/tasks/tasks.rake
-- test/simplecov.rb
+- test/test_helper.rb
 - test/unit/contents_test.rb
 - test/unit/equality_test.rb
 - test/unit/expansions_test.rb