fhir_models 4.2.2 → 4.3.0

data/lib/fhir_models/fhir_ext/structure_definition_compare.rb

@@ -56,8 +56,9 @@ module FHIR
       # generate warnings for missing fields (ignoring extensions)
       left_missing.each do |e|
         next if e.include? 'extension'
+
         elem = get_element_by_path(e, right_elements)
-        if !elem.min.nil? && elem.min > 0
+        if !elem.min.nil? && elem.min.positive?
           @errors << @finding.error(e, 'min', 'Missing REQUIRED element', 'Missing', elem.min.to_s)
         elsif elem.isModifier == true
           @errors << @finding.error(e, 'isModifier', 'Missing MODIFIER element', 'Missing', elem.isModifier.to_s)
@@ -67,8 +68,9 @@ module FHIR
       end
       right_missing.each do |e|
         next if e.include? 'extension'
+
         elem = get_element_by_path(e, left_elements)
-        if !elem.min.nil? && elem.min > 0
+        if !elem.min.nil? && elem.min.positive?
           @errors << @finding.error(e, 'min', 'Missing REQUIRED element', elem.min.to_s, 'Missing')
         elsif elem.isModifier == true
           @errors << @finding.error(e, 'isModifier', 'Missing MODIFIER element', elem.isModifier.to_s, 'Missing')
@@ -113,6 +115,7 @@ module FHIR
         end
         y = get_extension(x.type[0].profile, right_extensions)
         next unless !y.nil? && x.name != y.name
+
         # both profiles share the same extension definition but with a different name
         checked_extensions << x.name
         checked_extensions << y.name
@@ -120,6 +123,7 @@ module FHIR
       end
       right_extensions.each do |y|
         next if checked_extensions.include?(y.name)
+
         x = get_extension(y.name, left_extensions)
         unless x.nil?
           # both profiles share an extension with the same name
@@ -128,6 +132,7 @@ module FHIR
         end
         x = get_extension(y.type[0].profile, left_extensions)
         next unless !x.nil? && x.name != y.name && !checked_extensions.include?(x.name)
+
         # both profiles share the same extension definition but with a different name
         checked_extensions << x.name
         checked_extensions << y.name
@@ -179,13 +184,16 @@ module FHIR
         x = path.split('.')
         root = x.first(x.size - 1).join('.')
         next unless root.include? '.'
+
         # get the root element to fill in the details
         elem = get_element_by_path(root, elements)
         # get the data type definition to fill in the details
         # assume missing elements are from first data type (gross)
         next if elem.type.nil? || elem.type.empty?
+
         type_def = FHIR::Definitions.type_definition(elem.type[0].code)
         next if type_def.nil?
+
         type_elements = Array.new(type_def.snapshot.element)
         # _DEEP_ copy
         type_elements.map! do |e| # {|e| FHIR::ElementDefinition.from_fhir_json(e.to_fhir_json) }
@@ -199,6 +207,7 @@ module FHIR
         type_elements.each do |z|
           y = get_element_by_path(z.path, elements)
           next unless y.nil?
+
           elements << z
           # else
           #   @warnings << "StructureDefinition #{name} already contains #{z.path}"
@@ -367,6 +376,7 @@ module FHIR
 
       # isModifier
       return unless x.isModifier != y.isModifier
+
       @errors << @finding.error(x.path.to_s, 'isModifier', 'Incompatible isModifier', (x.isModifier || false).to_s, (y.isModifier || false).to_s)
     end
 

data/lib/fhir_models/fhir_ext/structure_definition_finding.rb

@@ -15,7 +15,7 @@ module FHIR
       "#{resourceType},#{profileIdA},#{profileIdB},#{path},#{attribute},#{status},#{message},#{valueA},#{valueB}"
     end
 
-    def to_json
+    def to_json(*_args)
       JSON.pretty_unparse(as_json)
     end
 
@@ -30,7 +30,7 @@ module FHIR
           hash.each do |key, value|
             obj.send("#{key}=".to_sym, value) if value
           end
-        rescue => e
+        rescue StandardError => e
           FHIR.logger.error "Failed to parse JSON: #{e.message}"
           return nil
         end

data/lib/fhir_models/fhirpath/expression.rb

@@ -16,12 +16,10 @@ module FHIRPath
 
     def clone
       clone_tree = @tree.map do |x|
-        begin
-          x.clone
-        rescue
-          # TODO: This appears to be dead code
-          x
-        end
+        x.clone
+      rescue StandardError
+        # TODO: This appears to be dead code
+        x
       end
       FHIRPath::Expression.new(clone_tree)
     end

data/lib/fhir_models/fhirpath/parse.rb

@@ -7,7 +7,7 @@ module FHIRPath
 
   # This method tokenizes the expression into a flat array of tokens
   def self.tokenize(expression)
-    raw_tokens = expression.gsub('()', '').split(%r{(\(|\)|\s|>=|<=|>|<|=|!=|\+|-|\/|\*)})
+    raw_tokens = expression.gsub('()', '').split(%r{(\(|\)|\s|>=|<=|>|<|=|!=|\+|-|/|\*)})
     # recreate strings if they were split
     size = nil
     while raw_tokens.include?("'") && size != raw_tokens.length
@@ -44,13 +44,15 @@ module FHIRPath
   def self.reassemble_strings(tokens)
     tokens.each_with_index do |token, index|
       next unless token.is_a?(String)
+
       e_index = nil
       if token.start_with?('"') && !token.end_with?('"')
-        e_index = tokens[index..-1].index { |t| t.end_with?('"') }
+        e_index = tokens[index..].index { |t| t.end_with?('"') }
       elsif token.start_with?("'") && !token.end_with?("'")
-        e_index = tokens[index..-1].index { |t| t.end_with?("'") }
+        e_index = tokens[index..].index { |t| t.end_with?("'") }
       end
       next unless e_index
+
       i = index + 1
       while i <= index + e_index
         tokens[index] += tokens[i]
@@ -63,14 +65,15 @@ module FHIRPath
   # This method builds an Abstract Syntax Tree (AST) from a flat list of tokens
   def self.build_tree(tokens)
     return if tokens.empty?
+
     tree = []
     until tokens.empty?
       token = tokens.delete_at(0)
-      if '(' == token # sub expression
+      if token == '(' # sub expression
         tree << FHIRPath::Expression.new(build_tree(tokens))
-      elsif ')' == token
+      elsif token == ')'
         return tree
-      elsif '.' != token
+      elsif token != '.'
         tree << atom(token)
       end
     end
@@ -91,7 +94,7 @@ module FHIRPath
     value = token
     begin
       value = Float(token)
-    rescue
+    rescue StandardError
       value = token
       value = token.to_sym if @@reserved.include?(token)
       value = true if token == 'true'

data/lib/fhir_models/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fhir_models
 version: !ruby/object:Gem::Version
-  version: 4.2.2
+  version: 4.3.0
 platform: ruby
 authors:
 - Jason Walonoski
@@ -9,10 +9,10 @@ authors:
 - Michael O'Keefe
 - Robert Scanlon
 - Reece Adamson
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-09-12 00:00:00.000000000 Z
+date: 2024-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -188,14 +188,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '0.80'
+        version: 1.23.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '0.80'
+        version: 1.23.0
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -238,7 +238,9 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
+- ".ruby-version"
 - ".simplecov"
+- ".tool-versions"
 - Gemfile
 - Gemfile.lock
 - Guardfile
@@ -3959,7 +3961,7 @@ homepage: https://github.com/fhir-crucible/fhir_models
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -3967,15 +3969,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.5.9
+signing_key:
 specification_version: 4
 summary: A Gem for handling FHIR models in ruby
 test_files: []