fhir_models 4.1.2 → 4.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 68f887e4edac39b8eaa531ab225b2a33753b6048f08e3ebfa047299494754d96
-  data.tar.gz: dee551b676cdefe72315ce96bef9fbf87192b17f2fbd9549ff37fbd526a8a3d1
+  metadata.gz: 1519a66581a704c52e44ce3aa98f23528fe691ecf3af22bce5b0eaa8b45af05f
+  data.tar.gz: ed8c1093325205391c68b9f71ab81e2c80d6515660aaf59e4d51bbf4ebd80ba0
 SHA512:
-  metadata.gz: 1147f42000517894330092a862e16a5419b02362d3ad49f31cff326d73ec600f1b43a83dab789cee039d8c263d1fcc0e4d1c57e0bdcf6f3e107d1bea6cc8bd62
-  data.tar.gz: b2d33004faa1027461ca9baebaff8ec1e3d086156e55ab98b013c3e7498a8c279e0f9023559d59399ff250ee017a4dfbfb8aa1d588b1c876f457c7d308917892
+  metadata.gz: 886b58b3631c5a7ba06f10b40f5721d12ededddc20ad692b830c88a1ea370e635fe6dae144ec90746588fc33415045936aed6f04cc803a1ec3275751d615caab
+  data.tar.gz: 2f29ad97d1f8b68a3f7e3631d7e06d6656982eff5efff162f560cd7dc715860c6d6a46d7f86b8da606bbf0e61dcec89eb80a5c732c26489c690d24d95b037939

data/.github/workflows/ruby.yml

@@ -0,0 +1,26 @@
+name: Ruby
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: ['2.6', '2.7']
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+    - name: Run tests
+      run: bundle exec rake
+    - name: Rubocop
+      run: bundle exec rubocop

data/Gemfile.lock

@@ -1,11 +1,11 @@
 PATH
   remote: .
   specs:
-    fhir_models (4.1.2)
+    fhir_models (4.2.2)
       bcp47 (>= 0.3)
       date_time_precision (>= 0.8)
       mime-types (>= 3.0)
-      nokogiri (>= 1.10.4)
+      nokogiri (>= 1.11.4)
 
 GEM
   remote: https://rubygems.org/
@@ -14,7 +14,7 @@ GEM
     bcp47 (0.3.3)
       i18n
     coderay (1.1.3)
-    concurrent-ruby (1.1.8)
+    concurrent-ruby (1.1.10)
     coolline (0.5.0)
       unicode_utils (~> 1.4)
     date_time_precision (0.8.1)
@@ -39,7 +39,7 @@ GEM
     guard-test (2.0.8)
       guard-compat (~> 1.2)
       test-unit (~> 3.0)
-    i18n (1.8.9)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
     jaro_winkler (1.5.4)
     json (2.3.1)
@@ -48,12 +48,12 @@ GEM
       rb-inotify (~> 0.9, >= 0.9.10)
     lumberjack (1.2.8)
     method_source (1.0.0)
-    mime-types (3.3.1)
+    mime-types (3.4.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2021.0225)
-    mini_portile2 (2.5.0)
+    mime-types-data (3.2022.0105)
+    mini_portile2 (2.5.3)
     nenv (0.3.0)
-    nokogiri (1.11.2)
+    nokogiri (1.11.7)
       mini_portile2 (~> 2.5.0)
       racc (~> 1.4)
     nokogiri-diff (0.2.0)
@@ -77,7 +77,7 @@ GEM
     rb-fsevent (0.10.4)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rexml (3.2.4)
+    rexml (3.2.5)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
       rspec-expectations (~> 3.10.0)
@@ -131,7 +131,7 @@ DEPENDENCIES
   test-unit
 
 RUBY VERSION
-   ruby 2.7.2p137
+   ruby 2.7.4p191
 
 BUNDLED WITH
-   2.1.4
+   2.2.21

data/README.md

@@ -54,6 +54,16 @@ $ bundle exec rake fhir:console
     'system' => 'http://unitsofmeasure.org'
   )
   ```
+  
+  Iterating over all elements in a resource, including nested elements...
+  ```ruby
+  patient.each_element do |value, metadata, path|
+    puts "Info for #{path}:"
+    puts "- value: #{value}"
+    puts "- type: #{metadata['type']}"
+    puts "- cardinality: #{metadata['min']}..#{metadata['max']}"
+  end
+  ```
 
   ### Validation
 

data/fhir_models.gemspec

@@ -21,7 +21,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.10.4'
+  spec.add_dependency 'nokogiri', '>= 1.11.4'
   spec.add_dependency 'date_time_precision', '>= 0.8'
   spec.add_dependency 'bcp47', '>= 0.3'
   spec.add_dependency 'mime-types', '>= 3.0'

data/lib/fhir_models/bootstrap/hashable.rb

@@ -27,23 +27,26 @@ module FHIR
       blank = ->(obj) { obj.respond_to?(:empty?) ? obj.empty? : obj.nil? }
       if thing.is_a?(Array)
         return nil if thing.empty?
-        thing.map! { |i| prune(i) }
-        thing.reject!(&blank)
+
+        thing
+          .map { |i| prune(i) }
+          .reject(&blank)
       elsif thing.is_a?(Hash)
         return {} if thing.empty?
+
+        new_thing = {}
         thing.each do |key, value|
-          thing[key] = prune(value)
-        end
-        thing.delete_if do |_key, value|
-          blank.call(value)
+          new_thing[key] = prune(value) unless blank.call(value)
         end
+        new_thing
+      else
+        thing
       end
-      thing
     end
 
-    def from_hash(hash)
+    def from_hash(original_hash)
       # eliminate empty stuff
-      hash = prune(hash) unless hash.empty?
+      pruned_hash = prune(original_hash) unless original_hash.empty?
       # clear the existing variables
       self.class::METADATA.each do |key, value|
         local_name = key
@@ -51,7 +54,8 @@ module FHIR
         instance_variable_set("@#{local_name}", nil)
       end
       # set the variables to the hash values
-      hash.each do |key, value|
+      pruned_hash&.each_key do |key|
+        value = original_hash[key]
         key = key.to_s
         meta = self.class::METADATA[key]
         next if meta.nil?

data/lib/fhir_models/bootstrap/json.rb

@@ -6,8 +6,8 @@ module FHIR
     #  This module includes methods to serialize or deserialize FHIR resources to and from JSON.
     #
 
-    def to_json
-      JSON.pretty_unparse(to_hash)
+    def to_json(opts = nil)
+      JSON.pretty_generate(to_hash, opts)
     end
 
     def self.from_json(json)

data/lib/fhir_models/bootstrap/model.rb

@@ -55,7 +55,7 @@ module FHIR
           return ext.first.value.nil? ? ext.first : ext.first.value
         end
       end
-      raise NoMethodError.new("undefined method `#{method}' for #{inspect}", method)
+      raise NoMethodError.new("undefined method `#{method}' for #{self.class.name}", method)
     end
 
     def to_reference
@@ -300,6 +300,27 @@ module FHIR
       valid
     end
 
+    def each_element(path = nil, &block)
+      self.class::METADATA.each do |element_name, metadata|
+        local_name = metadata.fetch :local_name, element_name
+        values = [instance_variable_get("@#{local_name}")].flatten.compact
+        next if values.empty?
+
+        values.each_with_index do |value, i|
+          child_path =
+            if path.nil?
+              element_name
+            else
+              "#{path}.#{element_name}"
+            end
+          child_path += "[#{i}]" if metadata['max'] > 1
+          yield value, metadata, child_path
+          value.each_element child_path, &block unless FHIR::PRIMITIVES.include? metadata['type']
+        end
+      end
+      self
+    end
+
     private :validate_reference_type, :check_binding_uri, :validate_field
   end
 end

data/lib/fhir_models/version.rb

@@ -1,5 +1,5 @@
 module FHIR
   module Models
-    VERSION = '4.1.2'.freeze
+    VERSION = '4.2.2'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fhir_models
 version: !ruby/object:Gem::Version
-  version: 4.1.2
+  version: 4.2.2
 platform: ruby
 authors:
 - Jason Walonoski
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-03-31 00:00:00.000000000 Z
+date: 2022-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -20,14 +20,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.10.4
+        version: 1.11.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.10.4
+        version: 1.11.4
 - !ruby/object:Gem::Dependency
   name: date_time_precision
   requirement: !ruby/object:Gem::Requirement
@@ -233,12 +233,12 @@ extra_rdoc_files: []
 files:
 - ".codeclimate.yml"
 - ".gitattributes"
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
 - ".simplecov"
-- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - Guardfile
@@ -3974,7 +3974,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: A Gem for handling FHIR models in ruby

data/.travis.yml

@@ -1,22 +0,0 @@
-language: ruby
-env:
-  - TESTMEMORY=0 GCDELAY=2.0
-rvm:
-  - 2.6
-  - 2.7
-before_script:
-  - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
-  - chmod +x ./cc-test-reporter
-  - ./cc-test-reporter before-build
-script:
-  - travis_wait bundle exec rake
-after_script:
-  - ./cc-test-reporter after-build -t simplecov --exit-code $TRAVIS_TEST_RESULT
-notifications:
-  email:
-    recipients:
-      - fhir-testing-list@lists.mitre.org
-    on_failure: change
-before_install:
-  - gem update --system
-  - gem update bundler