fhir_dstu2_models 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17f75c40fac3b9924eccf4b9078838e0911a7265
-  data.tar.gz: 9592de33a306dbb50e9d3bc7dde374641f339ddb
+  metadata.gz: a1140fc77a44dcf10b01c38ef6513f08641eac65
+  data.tar.gz: 802d339f92786c05b707528184df1a782728264d
 SHA512:
-  metadata.gz: 4c24bb9a06e8a599b9d9890cffe14fe2d26a49f5cb5a310e45c46a5fcc79501e6b8501262633a20beaca0993e3cf7fc3e64e61b2740bc65f3f4dc4ffcbd31326
-  data.tar.gz: 1ef197009d8a23edd3297e382f698da57403c8184e2e33ba2410ac0571d8f1a23524578e48600be5188213cd6d4f76de801857730f95d34408b43055412f6a36
+  metadata.gz: 472ccacf205f9270cee8859250e62dda8283ea3d2ba21096a992ab46bb9e81e3f8315b7a70432c6b7eba0764cc8d2d9d64afdcc85e36b08418152ce6038370db
+  data.tar.gz: ba36e569e66c5cb18b9dfeef4fef0c78fa256ea3f25710fc505a8cb2b2e9e609b1460478fcb8cec4bdb7bbf7b844c354f5562caf60f4258c2be377c6d4474259

data/.travis.yml

@@ -2,20 +2,20 @@ language: ruby
 env:
   - TESTMEMORY=0 GCDELAY=2.0
 rvm:
-  - "2.2.6"
-  - "2.3.3"
-  - "2.4.0"
+  - 2.2
+  - 2.3
+  - 2.4
+  - 2.5
 script:
   - bundle exec rake
   - bundle exec codeclimate-test-reporter
 notifications:
   email:
     recipients:
-      - healthcare-ci@googlegroups.com
+      - fhir-testing-list@lists.mitre.org
     on_failure: change
 addons:
   code_climate:
     repo_token: 0230b3379581b30743b7b4355d7394e427648e604d19a2aba987956201eee290
 before_install:
-  - gem update --system
-  - gem update bundler
+  - gem install bundler

data/Gemfile.lock

@@ -1,30 +1,31 @@
 PATH
   remote: .
   specs:
-    fhir_dstu2_models (1.0.3)
+    fhir_dstu2_models (1.0.4)
       bcp47 (>= 0.3)
       date_time_precision (>= 0.8)
       mime-types (>= 1.16, < 3)
-      nokogiri (>= 1.7)
+      nokogiri (>= 1.8.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    ast (2.3.0)
+    ast (2.4.0)
     bcp47 (0.3.3)
       i18n
     codeclimate-test-reporter (1.0.8)
       simplecov (<= 0.13)
-    coderay (1.1.1)
+    coderay (1.1.2)
+    concurrent-ruby (1.0.5)
     date_time_precision (0.8.1)
     diff-lcs (1.3)
     docile (1.1.5)
-    ffi (1.9.18)
+    ffi (1.9.23)
     formatador (0.2.5)
-    guard (2.14.1)
+    guard (2.14.2)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
-      lumberjack (~> 1.0)
+      lumberjack (>= 1.0.12, < 2.0)
       nenv (~> 0.1)
       notiffany (~> 0.0)
       pry (>= 0.9.12)
@@ -38,53 +39,53 @@ GEM
     guard-test (2.0.8)
       guard-compat (~> 1.2)
       test-unit (~> 3.0)
-    i18n (0.8.6)
+    i18n (1.0.1)
+      concurrent-ruby (~> 1.0)
     json (2.1.0)
     listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
       ruby_dep (~> 1.2)
-    lumberjack (1.0.12)
-    method_source (0.8.2)
+    lumberjack (1.0.13)
+    method_source (0.9.0)
     mime-types (2.99.3)
-    mini_portile2 (2.1.0)
+    mini_portile2 (2.3.0)
     nenv (0.3.0)
-    nokogiri (1.7.2)
-      mini_portile2 (~> 2.1.0)
+    nokogiri (1.8.2)
+      mini_portile2 (~> 2.3.0)
     nokogiri-diff (0.2.0)
       nokogiri (~> 1.5)
       tdiff (~> 0.3, >= 0.3.2)
     notiffany (0.1.1)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    parallel (1.11.2)
-    parser (2.4.0.0)
-      ast (~> 2.2)
-    power_assert (1.0.2)
+    parallel (1.12.1)
+    parser (2.5.1.0)
+      ast (~> 2.4.0)
+    power_assert (1.1.1)
     powerpack (0.1.1)
-    pry (0.10.4)
+    pry (0.11.3)
       coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
+      method_source (~> 0.9.0)
     rainbow (2.2.2)
       rake
-    rake (12.0.0)
-    rb-fsevent (0.9.8)
-    rb-inotify (0.9.8)
-      ffi (>= 0.5.0)
-    rspec (3.6.0)
-      rspec-core (~> 3.6.0)
-      rspec-expectations (~> 3.6.0)
-      rspec-mocks (~> 3.6.0)
-    rspec-core (3.6.0)
-      rspec-support (~> 3.6.0)
-    rspec-expectations (3.6.0)
+    rake (12.3.1)
+    rb-fsevent (0.10.3)
+    rb-inotify (0.9.10)
+      ffi (>= 0.5.0, < 2)
+    rspec (3.7.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+    rspec-core (3.7.1)
+      rspec-support (~> 3.7.0)
+    rspec-expectations (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
-    rspec-mocks (3.6.0)
+      rspec-support (~> 3.7.0)
+    rspec-mocks (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
-    rspec-support (3.6.0)
+      rspec-support (~> 3.7.0)
+    rspec-support (3.7.1)
     rubocop (0.49.0)
       parallel (~> 1.10)
       parser (>= 2.3.3.1, < 3.0)
@@ -92,20 +93,19 @@ GEM
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.8.1)
+    ruby-progressbar (1.9.0)
     ruby_dep (1.5.0)
     shellany (0.0.1)
     simplecov (0.13.0)
       docile (~> 1.1.0)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.1)
-    slop (3.6.0)
+    simplecov-html (0.10.2)
     tdiff (0.3.3)
-    test-unit (3.2.4)
+    test-unit (3.2.7)
       power_assert
-    thor (0.19.4)
-    unicode-display_width (1.2.1)
+    thor (0.20.0)
+    unicode-display_width (1.3.2)
 
 PLATFORMS
   ruby
@@ -120,12 +120,12 @@ DEPENDENCIES
   pry
   rake
   rspec
-  rubocop
+  rubocop (= 0.49)
   simplecov
   test-unit
 
 RUBY VERSION
-   ruby 2.4.1p111
+   ruby 2.2.7p470
 
 BUNDLED WITH
-   1.15.1
+   1.16.1

data/README.md

@@ -28,21 +28,48 @@ json = File.read('patient-example.json')
 patient = FHIR::DSTU2.from_contents(json)
 puts patient.to_json
 ```
+
+Creating an `Observation` by hand...
+```ruby
+obs = FHIR::DSTU2::Observation.new(
+  'status' => 'final',
+  'code' => {
+    'coding' => [{ 'system' => 'http://loinc.org', 'code' => '3141-9', 'display' => 'Weight Measured' }],
+    'text' => 'Weight Measured'
+  },
+  'category' => {
+    'coding' => [{ 'system' => 'http://hl7.org/fhir/observation-category', 'code' => 'vital-signs' }]
+  },
+  'subject' => { 'reference' => 'Patient/example' },
+  'encounter' => { 'reference' => 'Encounter/example' }
+)
+obs.valueQuantity = FHIR::DSTU2::Quantity.new(
+  'value' => 185,
+  'unit' => 'lbs',
+  'code' => '[lb_av]',
+  'system' => 'http://unitsofmeasure.org'
+)
+```
+
 ### Validation
 
-Using a base resource definition...
+Using built in validation...
 ```ruby
-sd = FHIR::DSTU2::Definitions.resource_definition('Patient')
-sd.validates_resource?(patient) # passing in FHIR::DSTU2::Patient
+patient.valid? # returns true or false
+patient.validate # returns Hash of errors, empty if valid
 ```
-Validation failed? Get the errors and warnings...
+
+Using a profile or structure definition...
 ```ruby
+sd = FHIR::DSTU2::Definitions.resource_definition('Patient')
+sd.validates_resource?(patient) # passing in FHIR::DSTU2::Patient
+# Validation failed? Get the errors and warnings...
 puts sd.errors
 puts sd.warnings
 ```
 # License
 
-Copyright 2014-2017 The MITRE Corporation
+Copyright 2014-2018 The MITRE Corporation
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

data/fhir_dstu2_models.gemspec

@@ -6,7 +6,7 @@ require 'fhir_dstu2_models/version'
 Gem::Specification.new do |spec|
   spec.name          = 'fhir_dstu2_models'
   spec.version       = FHIR::DSTU2::Models::VERSION
-  spec.authors       = ['Jason Walonoski', 'Andre Quina', "Michael O'Keefe"]
+  spec.authors       = ['Jason Walonoski', 'Andre Quina', "Michael O'Keefe", 'Robert Scanlon']
   spec.email         = ['jwalonoski@mitre.org']
 
   spec.summary       = %q{A Gem for handling FHIR DSTU2 models in ruby}
@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'nokogiri', '>= 1.7'
+  spec.add_dependency 'nokogiri', '>= 1.8.2'
   spec.add_dependency 'date_time_precision', '>= 0.8'
   spec.add_dependency 'bcp47', '>= 0.3'
   spec.add_dependency 'mime-types', '>= 1.16', '< 3'
@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'simplecov'
   spec.add_development_dependency 'nokogiri-diff'
-  spec.add_development_dependency 'rubocop'
+  spec.add_development_dependency 'rubocop', '0.49'
   spec.add_development_dependency 'codeclimate-test-reporter'
   spec.add_development_dependency 'guard-rspec'
   spec.add_development_dependency 'guard-test'

data/lib/fhir_dstu2_models/bootstrap/hashable.rb

@@ -17,28 +17,14 @@ module FHIR
             end
           end
         end
-        hash = prune(hash)
-        hash['resourceType'] = resourceType if respond_to?(:resourceType) && hash
-        hash
-      end
-
-      def prune(thing)
-        if thing.is_a?(Array)
-          return nil if thing.empty?
-          thing.map! { |i| prune(i) }
-          thing.compact!
-          return nil if thing.empty?
-        elsif thing.is_a?(Hash)
-          return nil if thing.empty?
-          thing.each do |key, value|
-            thing[key] = prune(value)
-          end
-          thing.delete_if do |_key, value|
-            value.nil?
-          end
-          return nil if thing.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
-        thing
+        hash['resourceType'] = resourceType if respond_to?(:resourceType)
+        hash
       end
 
       def from_hash(hash)
@@ -131,7 +117,7 @@ module FHIR
         rval
       end
 
-      private :prune, :make_child, :convert_primitive
+      private :make_child, :convert_primitive
     end
   end
 end

data/lib/fhir_dstu2_models/version.rb

@@ -1,7 +1,7 @@
 module FHIR
   module DSTU2
     module Models
-      VERSION = '1.0.3'.freeze
+      VERSION = '1.0.4'.freeze
     end
   end
 end

metadata

@@ -1,16 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: fhir_dstu2_models
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Jason Walonoski
 - Andre Quina
 - Michael O'Keefe
+- Robert Scanlon
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-10 00:00:00.000000000 Z
+date: 2018-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -18,14 +19,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: 1.8.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: 1.8.2
 - !ruby/object:Gem::Dependency
   name: date_time_precision
   requirement: !ruby/object:Gem::Requirement
@@ -176,16 +177,16 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.49'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.49'
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement