cqm-parsers 4.1.0.2 → 4.1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e60a708b2788c37979d5e9d7ce7f70bb32787792d58fd073737a827789778804
-  data.tar.gz: a7cc6b5ddf58d94b5ae5228670a8eb5a37f31c00d9837bce0a4f6b5d44343ad4
+  metadata.gz: 5ab2f0fafb17c1c9415e34a3732ed3c941c57c5efe3efc87509baa866b1df0cb
+  data.tar.gz: 821f980170ae280b0bb604a2cb8fe6b577ac1f4d21d6b23ec9deb3bc31c1dcfa
 SHA512:
-  metadata.gz: f18c068ea67e2429f6783410c311b7fb8494bc4a08fcc03397c061b95fea31ec1b2339cbe0396916498d53d35a7db8482d1d4cebffe5d45b59e5265514bfd9c6
-  data.tar.gz: 2af99fdf0c20dd579724d08cda966db616f96e16b02bc93c276043c730e345e5e970b1b3ca8fb8878213a0fab80d97d13c39b94601ece3ab2ce7891a7b34ce90
+  metadata.gz: 6ef8af2c1fa8bdd7a6e3abcffb6a01c0ff531a6540cb04bf2a362dc8065d75caf682c0c95efa559ec3e926cdd1ecc52411d65df85e66f6724212da9e63678304
+  data.tar.gz: 441a018ffe31ead27d482d0fa70c019739de1ac96dab583cd0c317553af0e4c118c0c4f5e1c9ab62160c052e36630a40c7d45de0db6f99b5a6678eb56978969f

data/Gemfile

@@ -2,15 +2,15 @@ source 'https://rubygems.org'
 
 gemspec :development_group => :test
 
-gem 'mongoid', '> 6.0.5', '< 8.0.0'
+gem 'mongoid', '> 6.0.5', '< 9.0.0'
 
 # gem 'cqm-models', git: 'https://github.com/projecttacoma/cqm-models.git', branch: 'master'
 # gem 'cqm-models', :path => '../cqm-models'
 
 group :development, :test do
   gem 'bundler-audit'
-  gem 'rubocop', '~> 0.52.1', require: false
-  gem 'byebug', '~> 6.0.2',  platforms: [:ruby_20, :ruby_21, :ruby_22, :ruby_23]
+  gem 'rubocop', '~> 0.63.0', require: false
+  gem 'byebug'
   gem 'pry'
   gem 'pry-nav'
 end
@@ -20,7 +20,7 @@ group :development do
 end
 
 group :test do
-  gem 'factory_girl', '~> 4.1.0'
+  gem 'factory_bot'
   gem 'tailor', '~> 1.1.2'
   gem 'cane', '~> 2.3.0'
   gem 'codecov'

data/lib/measure-loader/vsac_value_set_loader.rb

@@ -6,8 +6,7 @@ module Measures
     def initialize(options)
       options.symbolize_keys!
       @vsac_options = options[:options]
-      @vsac_ticket_granting_ticket = options[:ticket_granting_ticket]
-      @vsac_api_key = options[:api_key]
+      @vsac_api_key = options[:vsac_api_key]
       @vs_model_cache = {}
     end
 
@@ -47,7 +46,7 @@ module Measures
 
     def load_api
       return @api if @api.present?
-      @api = Util::VSAC::VSACAPI.new(config: APP_CONFIG['vsac'], ticket_granting_ticket: @vsac_ticket_granting_ticket, api_key: @vsac_api_key)
+      @api = Util::VSAC::VSACAPI.new(config: APP_CONFIG['vsac'], api_key: @vsac_api_key)
       return @api
     end
 

data/lib/util/vsac_api.rb

@@ -40,13 +40,6 @@ module Util
       end
     end
 
-    # Raised when the ticket granting ticket has expired.
-    class VSACTicketExpiredError < VSACError
-      def initialize
-        super('VSAC session expired. Please re-enter credentials and try again.')
-      end
-    end
-
     # Raised when the user credentials were invalid.
     class VSACInvalidCredentialsError < VSACError
       def initialize
@@ -69,14 +62,13 @@ module Util
       # The default program to use for get_program_details and get_program_release_names calls.
       # This can be overriden by providing a :program in the config or by the single optional parameter for those
       # methods.
-      DEFAULT_PROGRAM = "CMS eCQM"
+      DEFAULT_PROGRAM = "CMS eCQM and Hybrid Measure"
 
       # This is the value of the service parameter passed when getting a ticket. This never changes.
       TICKET_SERVICE_PARAM = "http://umlsks.nlm.nih.gov"
 
-      # The ticket granting that will be obtained if needed. Accessible so it may be stored in user session.
-      # Is a hash of the :ticket and time it :expires.
-      attr_reader :ticket_granting_ticket
+      # Requester UMLS API KEY
+      attr_reader :api_key
 
       ##
       # Creates a new VSACAPI. If credentials were provided they are checked now. If no credentials
@@ -91,24 +83,17 @@ module Util
         unless check_config @config
           raise VSACArgumentError.new("Required param :config is missing required URLs.")
         end
+        @api_key = options[:api_key]
+        validate_api_key_vsac unless options[:api_key].nil?
+      end
 
-        # if a ticket_granting_ticket was passed in, check it and raise errors if found
-        # VSAC API Key will be ignored
-        if !options[:ticket_granting_ticket].nil?
-          provided_ticket_granting_ticket = options[:ticket_granting_ticket]
-          if provided_ticket_granting_ticket[:ticket].nil? || provided_ticket_granting_ticket[:expires].nil?
-            raise VSACArgumentError.new("Optional param :ticket_granting_ticket is missing :ticket or :expires")
-          end
-
-          raise VSACTicketExpiredError.new if Time.now > provided_ticket_granting_ticket[:expires]
-
-          @ticket_granting_ticket = { ticket: provided_ticket_granting_ticket[:ticket],
-                                      expires: provided_ticket_granting_ticket[:expires] }
-
-          # if api key was provided use it to get a ticket granting ticket
-        elsif !options[:api_key].nil?
-          @ticket_granting_ticket = get_ticket_granting_ticket(options[:api_key])
-        end
+      ##
+      # Attempt to retrieve the ONC Admin Sex VS to verify
+      # VSAC connectivity with the supplied UMLS API Key.
+      def validate_api_key_vsac
+        response = get_multiple_valueset_raw_responses([{value_set: {oid: "2.16.840.1.113762.1.4.1"}, vs_vsac_options: {}}])[0]
+        raise VSACInvalidCredentialsError.new if !response.body || response.response_code == 401
+        validate_http_status(response.response_code)
       end
 
       ##
@@ -204,8 +189,7 @@ module Util
       # hash = {vs_vsac_options: ___, value_set: {oid: ___} }
       #
       def get_multiple_valuesets(needed_value_sets)
-        raise VSACNoCredentialsError.new unless @ticket_granting_ticket
-        raise VSACTicketExpiredError.new if Time.now > @ticket_granting_ticket[:expires]
+        raise VSACNoCredentialsError.new unless @api_key
 
         vs_responses = get_multiple_valueset_raw_responses(needed_value_sets)
         vs_datas = [needed_value_sets,vs_responses].transpose.map do |needed_vs,vs_response|
@@ -221,7 +205,7 @@ module Util
       # Given a raw valueset response, process and validate
       def process_and_validate_vsac_response(vs_response, expected_oid)
         raise VSNotFoundError.new(expected_oid) if vs_response.response_code == 404
-        validate_http_status_for_ticket_based_request(vs_response.response_code)
+        validate_http_status_for_apikey_based_request(vs_response.response_code)
 
         vs_data = vs_response.body.force_encoding("utf-8")
         begin
@@ -240,11 +224,9 @@ module Util
 
       # Execute bulk requests for valuesets, return the raw Typheous responses (requests executed in parallel)
       def get_multiple_valueset_raw_responses(needed_value_sets)
-        service_tickets = get_service_tickets(needed_value_sets.size)
-
         hydra = Typhoeus::Hydra.new(max_concurrency: 1) # Hydra executes multiple HTTP requests at once
         requests = needed_value_sets.map do |n|
-          request = create_valueset_request(n[:value_set][:oid], service_tickets.pop, n[:vs_vsac_options])
+          request = create_valueset_request(n[:value_set][:oid], n[:vs_vsac_options])
           hydra.queue(request)
           request
         end
@@ -254,28 +236,8 @@ module Util
         return responses
       end
 
-      # Bulk get an amount of service tickets (requests executed in parallel)
-      def get_service_tickets(amount)
-        raise VSACNoCredentialsError.new unless @ticket_granting_ticket
-        raise VSACTicketExpiredError.new if Time.now > @ticket_granting_ticket[:expires]
-
-        hydra = Typhoeus::Hydra.new # Hydra executes multiple HTTP requests at once
-        requests = amount.times.map do
-          request = create_service_ticket_request
-          hydra.queue(request)
-          request
-        end
-
-        hydra.run
-        tickets = requests.map do |request|
-          validate_http_status_for_ticket_based_request(request.response.response_code)
-          request.response.body
-        end
-        return tickets
-      end
-
       # Create a typheous request for a valueset (this must be executed later)
-      def create_valueset_request(oid, ticket, options = {})
+      def create_valueset_request(oid, options = {})
         # base parameter oid is always needed
         params = { id: oid }
         # release parameter, should be used moving forward
@@ -292,34 +254,16 @@ module Util
 
         # version parameter, rarely used
         params[:version] = options[:version] unless options[:version].nil?
-        params[:ticket] = ticket
 
-        return Typhoeus::Request.new("#{@config[:content_url]}/RetrieveMultipleValueSets", params: params)
+        return Typhoeus::Request.new("#{@config[:content_url]}/RetrieveMultipleValueSets",
+                                     params: params,
+                                     userpwd: "apikey:#{@api_key}")
       end
 
-      # Create a typheous request for a service ticket (this must be executed later)
-      def create_service_ticket_request
-        return Typhoeus::Request.new("#{@config[:auth_url]}/Ticket/#{@ticket_granting_ticket[:ticket]}",
-                                     method: :post,
-                                     params: { service: TICKET_SERVICE_PARAM})
-      end
-
-      # Use your API Key to retrive a ticket granting ticket from VSAC
-      def get_ticket_granting_ticket(api_key)
-        response = Typhoeus.post(
-          "#{@config[:auth_url]}/Ticket",
-          body: URI.encode_www_form(apikey: api_key)
-        )
-        raise VSACInvalidCredentialsError.new if response.response_code == 401
-        validate_http_status(response.response_code)
-        return { ticket: String.new(response.body), expires: Time.now + 8.hours }
-      end
-
-      # Raise errors if http_status is not OK (200), and expire TGT if auth fails
-      def validate_http_status_for_ticket_based_request(http_status)
+      # Raise errors if http_status is not OK (200)
+      def validate_http_status_for_apikey_based_request(http_status)
         if http_status == 401
-          @ticket_granting_ticket[:expires] = Time.now
-          raise VSACTicketExpiredError.new
+          raise VSACInvalidCredentialsError.new
         end
         validate_http_status(http_status)
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cqm-parsers
 version: !ruby/object:Gem::Version
-  version: 4.1.0.2
+  version: 4.1.1.0
 platform: ruby
 authors:
 - The MITRE Corporation
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-13 00:00:00.000000000 Z
+date: 2024-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cqm-models
@@ -61,7 +61,7 @@ dependencies:
         version: 6.0.5
     - - "<"
       - !ruby/object:Gem::Version
-        version: 8.0.0
+        version: 9.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -71,21 +71,21 @@ dependencies:
         version: 6.0.5
     - - "<"
       - !ruby/object:Gem::Version
-        version: 8.0.0
+        version: 9.0.0
 - !ruby/object:Gem::Dependency
   name: mongoid-tree
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -134,20 +134,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.5
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 1.15.0
+        version: 1.16.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.5
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 1.15.0
+        version: 1.16.2
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
@@ -335,7 +329,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: A library for parsing HQMF documents.