redox 1.0.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64ed984d8f77ebf8b4d713e14e86eb09065449ab0d970ab3994c876acc765216
-  data.tar.gz: 8661675122be3a20a6b0f1168dc898f99d128e43864769161cf5c3c1511f830f
+  metadata.gz: 0666bbb5152f4d34f3966dad512c2b1c6bb62cd661235516ad2a123eca63e653
+  data.tar.gz: ec535077633c70fa241a3ee5a8af81812791e53e36f72dfcfcb87900b96a9fe5
 SHA512:
-  metadata.gz: 51f8612124e1ada3e96eea2b3b4a8c885c356a74db04620121cb95eacffecd2502ba5bb1189c641de2e7ccce3bab04e4446c67aedd524287a649260f08126a81
-  data.tar.gz: 822abcdb744b627ef21138e65efa19101706a234639fc70fee2a9052098b9a0e550974640acda4ec1e6cab1d7114d2d670939843de5a742c26f4766f2dd24b40
+  metadata.gz: 844d30e49f7d57e5ca0dd7acc91d3bbc0aac672213e7016de5f5f52cac6e77e1123f1cb94613c5521d90c2f0a7445e0174af223c1e5b93c092386f6be5d2f9d6
+  data.tar.gz: 1d09377d50c8729f7e3698bd2de877b3b4c081a8ec21a3b9997e0da6dbc9c5bab7f58fb6cb1da273e062443b41168bdb7178c872c8beeda77e24f8239cd7636f

data/CHANGELOG.md

@@ -4,7 +4,41 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
-## [1.0.1] - Unreleased
+## [1.3.0] - 2020-09-17
+### Added 
+- Transaction model
+- Financial#create
+
+## [1.2.0] - 2020-07-30
+### Added 
+- Visit model
+- Model#insurances helper for Patient.Insurances || Visit.Insurances
+
+## [1.1.1] - 2020-06-15
+### Changed
+- Bugfix with patient param in update
+
+## [1.1.0] - 2020-06-15
+### Changed
+- Moving to Requst classes instead of mixing in logic to models (kept backwards compatibility)
+- Added potential matches to responses and implemented for patient search
+
+=======
+### Added
+- PotentialMatches class
+
+## [1.0.2] - 2019-06-04
+### Changed
+- Added Extensions to all Redox models
+- Fixed warnings in gemspec
+- Fixed author emails in gemspec
+- Removed packaging of bin and files starting with '.'
+- Added helper file to translate Redox JSON to Hashie model.
+
+### Removed
+- Unused response model.
+
+## [1.0.1] - 2019-05-02
 ### Changed
 - Check for high-level key as symbol
 
@@ -74,7 +108,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Added
 - Initial Release
 
-[Unreleased]: https://github.com/WeInfuse/redox/compare/v1.0.0...HEAD
+[1.3.0]: https://github.com/WeInfuse/redox/compare/v1.2.0...v1.3.0
+[1.2.0]: https://github.com/WeInfuse/redox/compare/v1.1.1...v1.2.0
+[1.1.1]: https://github.com/WeInfuse/redox/compare/v1.1.0...v1.1.1
+[1.1.0]: https://github.com/WeInfuse/redox/compare/v1.0.2...v1.1.0
+[1.0.2]: https://github.com/WeInfuse/redox/compare/v1.0.1...v1.0.2
+[1.0.1]: https://github.com/WeInfuse/redox/compare/v1.0.0...v1.0.1
 [1.0.0]: https://github.com/WeInfuse/redox/compare/v0.1.6...v1.0.0
 [0.1.6]: https://github.com/WeInfuse/redox/compare/v0.1.5...v0.1.6
 [0.1.5]: https://github.com/WeInfuse/redox/compare/v0.1.4...v0.1.5

data/lib/redox.rb

@@ -7,10 +7,18 @@ require 'redox/authentication'
 require 'redox/models/model'
 require 'redox/models/meta'
 require 'redox/models/patient'
+require 'redox/models/visit'
+require 'redox/models/transaction'
+require 'redox/models/financial'
 require 'redox/models/patient/demographics'
 require 'redox/models/patient/identifier'
 require 'redox/models/patient/insurance'
 require 'redox/models/patient/p_c_p'
+require 'redox/models/potential_matches'
+require 'redox/request/request'
+require 'redox/request/financial'
+require 'redox/request/patient_admin'
+require 'redox/request/patient_search'
 
 module Redox
   class Configuration

data/lib/redox/models/financial.rb

@@ -0,0 +1,16 @@
+module Redox
+  module Models
+    class Financial < Hashie::Trash
+      include Hashie::Extensions::IgnoreUndeclared
+      include Hashie::Extensions::IndifferentAccess
+
+      property :Visit, required: false, from: :visit, default: Redox::Models::Visit.new
+      property :Patient, required: false, from: :patient, default: Redox::Models::Patient.new
+      property :Transactions, required: false, from: :transactions, default: []
+
+      alias_method :patient, :Patient
+      alias_method :visit, :Visit
+      alias_method :transactions, :Transactions
+    end
+  end
+end

data/lib/redox/models/model.rb

@@ -1,14 +1,27 @@
 module Redox
   module Models
+    def self.format_datetime(d)
+      if d.respond_to?(:strftime)
+        d.strftime(Redox::Models::Meta::TO_DATETIME_FORMAT)
+      else
+        d
+      end
+    end
+
     class Model < Hashie::Trash
       include Hashie::Extensions::IgnoreUndeclared
       include Hashie::Extensions::IndifferentAccess
 
       property :Meta, from: :meta, required: false
       property :Patient, from: :patient, required: false
+      property :Visit, from: :visit, required: false
+      property :PotentialMatches, from: :potential_matches, required: false
+      property :Extensions, from: :extensions, required: false
       property :response, required: false
 
+      alias_method :potential_matches, :PotentialMatches
       alias_method :patient, :Patient
+      alias_method :visit, :Visit
       alias_method :meta, :Meta
 
       def initialize(data = {})
@@ -27,16 +40,20 @@ module Redox
         return { key => super.to_h }
       end
 
-      def to_json
+      def to_json(args = {})
         return self.to_h.to_json
       end
 
+      def insurances
+        (self.patient&.insurances || []) + (self.visit&.insurances || [])
+      end
+
       class << self
         def from_response(response)
           model = Model.new
           model.response = response
 
-          %w[Meta Patient].each do |k|
+          %w[Meta Patient Visit PotentialMatches].each do |k|
             begin
               model.send("#{k}=", Module.const_get("Redox::Models::#{k}").new(response[k])) if response[k]
             rescue

data/lib/redox/models/patient.rb

@@ -1,11 +1,6 @@
 module Redox
   module Models
     class Patient < Model
-      QUERY_ENDPOINT = '/query'.freeze
-      QUERY_META     = Meta.new(EventType: 'Query', DataModel: 'PatientSearch')
-      CREATE_META    = Meta.new(EventType: 'NewPatient', DataModel: 'PatientAdmin')
-      UPDATE_META    = Meta.new(EventType: 'PatientUpdate', DataModel: 'PatientAdmin')
-
       property :Identifiers, from: :identifiers, required: false, default: []
       property :Insurances, from: :insurances, required: false, default: []
       property :Demographics, from: :demographics, required: false
@@ -19,6 +14,10 @@ module Redox
         self[:Demographics] ||= Demographics.new
       end
 
+      def insurances
+        self[:Insurances] = self[:Insurances].map {|ins| ins.is_a?(Redox::Models::Insurance) ? ins : Insurance.new(ins) }
+      end
+
       def primary_care_provider
         self[:PCP] ||= PCP.new
       end
@@ -36,25 +35,16 @@ module Redox
       end
 
       def update(meta: Meta.new)
-        meta = UPDATE_META.merge(meta)
-        return Model.from_response((RedoxClient.connection.request(body: Patient.body(self, meta))))
+        Redox::Request::PatientAdmin.update(patient: self, meta: meta)
       end
 
       def create(meta: Meta.new)
-        meta = CREATE_META.merge(meta)
-        return Model.from_response((RedoxClient.connection.request(body: Patient.body(self, meta))))
+        Redox::Request::PatientAdmin.create(patient: self, meta: meta)
       end
 
       class << self
         def query(params, meta: Meta.new)
-          meta = QUERY_META.merge(meta)
-          return Model.from_response((RedoxClient.connection.request(endpoint: QUERY_ENDPOINT, body: Patient.body(params, meta))))
-        end
-
-        def body(params, meta)
-          meta = Meta.new.merge(meta)
-
-          return meta.to_h.merge(params.to_h)
+          return Redox::Request::PatientSearch.query(params, meta: meta)
         end
       end
     end

data/lib/redox/models/potential_matches.rb

@@ -0,0 +1,13 @@
+module Redox
+  module Models
+    class PotentialMatches < Array
+      def initialize(data = [])
+        if false == data.nil?
+          super(data.map {|patient| Redox::Models::Patient.new(patient) })
+        else
+          super([])
+        end
+      end
+    end
+  end
+end

data/lib/redox/models/transaction.rb

@@ -0,0 +1,62 @@
+module Redox
+  module Models
+    class Transaction < Hashie::Trash
+      include Hashie::Extensions::IgnoreUndeclared
+      include Hashie::Extensions::IndifferentAccess
+
+      property :Chargeable, required: false, from: :chargeable, default: {}
+      property :DateTimeOfService, required: false, from: :start
+      property :Department, required: false, from: :department, default: {}
+      property :Diagnoses, required: false, from: :diagnoses, default: []
+      property :EndDateTime, required: false, from: :end
+      property :Extensions, required: false, from: :extensions, default: {}
+      property :ID, required: false, from: :id
+      property :NDC, required: false, from: :ndc, default: {}
+      property :OrderID, required: false, from: :order_id
+      property :OrderingProviders, required: false, from: :ordering_providers, default: []
+      property :Performers, required: false, from: :performers, default: []
+      property :Procedure, required: false, from: :procedure, default: {}
+      property :Type, required: false, from: :type
+
+      alias_method :chargeable, :Chargeable
+      alias_method :start, :DateTimeOfService
+      alias_method :department, :Department
+      alias_method :diagnoses, :Diagnoses
+      alias_method :end, :EndDateTime
+      alias_method :extensions, :Extensions
+      alias_method :id, :ID
+      alias_method :ndc, :NDC
+      alias_method :order_id, :OrderID
+      alias_method :ordering_providers, :OrderingProviders
+      alias_method :performers, :Performers
+      alias_method :procedure, :Procedure
+      alias_method :type, :Type
+
+      def add_medication(ndc_code: nil, quantity: nil, magnitude: nil, unit: nil, description: nil)
+        self[:NDC] = { Code: ndc_code, Description: description }
+        self[:Extensions] = {
+          'ndc-quantity' => {
+            integer: quantity&.to_s
+          },
+          'ndc-units-measure' => {
+            coding: {
+              code: magnitude&.to_s,
+              display: unit
+            }
+          }
+        }
+        self
+      end
+
+      def to_json(args = nil)
+        d = self.dup
+
+        [:EndDateTime, :DateTimeOfService].each do |k|
+          d[k] = Redox::Models.format_datetime(d[k])
+        end
+
+        d.to_h.to_json
+      end
+    end
+  end
+end

data/lib/redox/models/visit.rb

@@ -0,0 +1,41 @@
+module Redox
+  module Models
+    class Visit < Model
+      DEFAULT_LOCATION = {
+        Department: nil,
+        Facility: nil
+      }
+
+      property :Insurances, from: :insurances, required: false, default: []
+      property :Location, from: :location, required: false, default: DEFAULT_LOCATION
+      property :VisitDateTime, from: :start, required: false
+      property :VisitNumber, from: :visit_number, required: false
+      property :AccountNumber, from: :account_number, required: false
+
+      alias_method :insurances, :Insurances
+      alias_method :start, :VisitDateTime
+
+      def department=(v)
+        self[:Location] ||= DEFAULT_LOCATION
+        self[:Location][:Department] = v
+        self
+      end
+
+      def facility=(v)
+        self[:Location] ||= DEFAULT_LOCATION
+        self[:Location][:Facility] = v
+        self
+      end
+
+      def insurances
+        self[:Insurances] = self[:Insurances].map {|ins| ins.is_a?(Redox::Models::Insurance) ? ins : Insurance.new(ins) }
+      end
+
+      def to_json(args = nil)
+        d = self.dup
+        d[:VisitDateTime] = Redox::Models.format_datetime(d[:VisitDateTime])
+        d.to_h.to_json
+      end
+    end
+  end
+end

data/lib/redox/request/financial.rb

@@ -0,0 +1,12 @@
+module Redox
+  module Request
+    class Financial
+      TRANSACTION_META = Redox::Models::Meta.new(EventType: 'Transaction', DataModel: 'Financial')
+
+      def self.create(financial, meta: Redox::Models::Meta.new)
+        meta = TRANSACTION_META.merge(meta)
+        return Redox::Models::Model.from_response((RedoxClient.connection.request(body: Redox::Request.build_body(financial, meta))))
+      end
+    end
+  end
+end

data/lib/redox/request/patient_admin.rb

@@ -0,0 +1,18 @@
+module Redox
+  module Request
+    class PatientAdmin
+      CREATE_META    = Redox::Models::Meta.new(EventType: 'NewPatient', DataModel: 'PatientAdmin')
+      UPDATE_META    = Redox::Models::Meta.new(EventType: 'PatientUpdate', DataModel: 'PatientAdmin')
+
+      def self.create(patient: , meta: Redox::Models::Meta.new)
+        meta = CREATE_META.merge(meta)
+        return Redox::Models::Model.from_response((RedoxClient.connection.request(body: Redox::Request.build_body(patient, meta))))
+      end
+
+      def self.update(patient: , meta: Redox::Models::Meta.new)
+        meta = UPDATE_META.merge(meta)
+        return Redox::Models::Model.from_response((RedoxClient.connection.request(body: Redox::Request.build_body(patient, meta))))
+      end
+    end
+  end
+end

data/lib/redox/request/patient_search.rb

@@ -0,0 +1,13 @@
+module Redox
+  module Request
+    class PatientSearch
+      QUERY_ENDPOINT = '/query'.freeze
+      QUERY_META     = Redox::Models::Meta.new(EventType: 'Query', DataModel: 'PatientSearch')
+
+      def self.query(params, meta: Redox::Models::Meta.new)
+        meta = QUERY_META.merge(meta)
+        return Redox::Models::Model.from_response((RedoxClient.connection.request(endpoint: QUERY_ENDPOINT, body: Redox::Request.build_body(params, meta))))
+      end
+    end
+  end
+end

data/lib/redox/request/request.rb

@@ -0,0 +1,9 @@
+module Redox
+  module Request
+    def self.build_body(params, meta)
+      meta = Redox::Models::Meta.new.merge(meta)
+
+      return meta.to_h.merge(params.to_h)
+    end
+  end
+end

data/lib/redox/version.rb

@@ -1,3 +1,3 @@
 module Redox
-  VERSION = '1.0.1'.freeze
+  VERSION = '1.3.0'.freeze
 end

data/redox.gemspec

@@ -5,8 +5,8 @@ require 'redox/version'
 Gem::Specification.new do |spec|
   spec.name          = 'redox'
   spec.version       = Redox::VERSION
-  spec.authors       = ['Alexander Clark']
-  spec.email         = ['sasha.jackal@gmail.com']
+  spec.authors       = ['Alexander Clark', 'Mike Crockett', 'Mike Carr']
+  spec.email         = ['alexander.clark@weinfuse.com', 'mike.crockett@weinfuse.com', 'michael.carr@weinfuse.com']
 
   spec.summary       = 'Ruby wrapper for the Redox Engine API'
   spec.homepage      = 'https://github.com/WeInfuse/redox'
@@ -20,16 +20,18 @@ Gem::Specification.new do |spec|
   end
 
   spec.files = `git ls-files -z`.split("\x0").reject do |f|
-    f.match(%r{^(test|spec|features)/})
+    f.match?(%r{^(test|spec|features|bin|helpers|)/}) || f.match?(%r{^(\.[[:alnum:]]+)})
   end
+
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
+  spec.licenses      = ['MIT']
 
-  spec.add_dependency 'httparty'
-  spec.add_dependency 'hashie'
-  spec.add_development_dependency 'bundler'
-  spec.add_development_dependency 'byebug'
+  spec.add_dependency 'httparty', '~> 0.18'
+  spec.add_dependency 'hashie', '~> 3.5'
+  spec.add_development_dependency 'bundler', '>=1', '<3'
+  spec.add_development_dependency 'byebug', '~> 11'
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'webmock', '~> 3.1'

metadata

@@ -1,71 +1,79 @@
 --- !ruby/object:Gem::Specification
 name: redox
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Alexander Clark
-autorequire: 
+- Mike Crockett
+- Mike Carr
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-05-02 00:00:00.000000000 Z
+date: 2020-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.18'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.18'
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.5'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '11'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -122,26 +130,24 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
-description: 
+description:
 email:
-- sasha.jackal@gmail.com
+- alexander.clark@weinfuse.com
+- mike.crockett@weinfuse.com
+- michael.carr@weinfuse.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".circleci/config.yml"
-- ".editorconfig"
-- ".gitignore"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
 - README.md
 - Rakefile
-- bin/console
-- bin/setup
 - lib/redox.rb
 - lib/redox/authentication.rb
 - lib/redox/connection.rb
+- lib/redox/models/financial.rb
 - lib/redox/models/meta.rb
 - lib/redox/models/model.rb
 - lib/redox/models/patient.rb
@@ -149,15 +155,22 @@ files:
 - lib/redox/models/patient/identifier.rb
 - lib/redox/models/patient/insurance.rb
 - lib/redox/models/patient/p_c_p.rb
+- lib/redox/models/potential_matches.rb
+- lib/redox/models/transaction.rb
+- lib/redox/models/visit.rb
 - lib/redox/redox_exception.rb
-- lib/redox/response.rb
+- lib/redox/request/financial.rb
+- lib/redox/request/patient_admin.rb
+- lib/redox/request/patient_search.rb
+- lib/redox/request/request.rb
 - lib/redox/version.rb
 - redox.gemspec
 homepage: https://github.com/WeInfuse/redox
-licenses: []
+licenses:
+- MIT
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -172,9 +185,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
+rubyforge_project:
 rubygems_version: 2.7.6
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Ruby wrapper for the Redox Engine API
 test_files: []

data/.circleci/config.yml

@@ -1,23 +0,0 @@
-version: 2
-jobs:
-  build:
-    working_directory: ~/weinfuse_api
-    docker:
-      - image: circleci/ruby:2.4
-    steps:
-      - checkout
-      - type: restore-cache
-        key: redox_{{ checksum "Gemfile.lock" }}
-        key: redox
-      - run: bundle install --path vendor/bundle --jobs 20 --retry 5
-      - type: cache-save
-        key: redox_{{ checksum "Gemfile.lock" }}
-        key: redox
-        paths:
-          - vendor/bundle
-      - type: shell
-        command: |
-          bundle exec rake test
-      - type: store_test_results
-        path: /tmp/test-results
-

data/.editorconfig

@@ -1,10 +0,0 @@
-root=true
-
-[*]
-indent_style = space
-indent_size = 2
-end_of_line = lf
-charset = utf-8
-trim_trailing_whitespace = true
-insert_final_newline = true
-

data/.gitignore

@@ -1,10 +0,0 @@
-/.bundle/
-/.yardoc
-/Gemfile.lock
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/
-/redox*.gem

data/bin/console

@@ -1,15 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'bundler/setup'
-require 'json'
-require 'redox'
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require 'irb'
-IRB.start

data/bin/setup

@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-IFS=$'\n\t'
-set -vx
-
-bundle install
-
-# Do any other automated setup that you need to do here

data/lib/redox/response.rb

@@ -1,14 +0,0 @@
-module Redox
-  class Response
-    attr_reader :model, :http_response
-
-    def initialize(response, model_class = nil)
-      @http_response = response
-      @model    = model_class.new(JSON.parse(response.body)) if !model_class.nil? && self.success?
-    end
-
-    def success?
-      return @http_response.is_a?(Net::HTTPOK)
-    end
-  end
-end