redox-client 0.1.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 53dfc6df68fed6190ae088a12a689b9864e46f5cb812981e6451ab445c94f48c
-  data.tar.gz: f124f85e16be4d4554b7398a1a137145b814c8101178e882c193edad6ba6e09d
+  metadata.gz: 2fb1842a350bb3d66e94a4bb186cbbd321c0fb6ef338e79a6e59746969c7c823
+  data.tar.gz: 0cb76bbd62d9f9cd5971d6e7b85b6a82f7bc756755e400ebaf2ffc94aa4e1c5b
 SHA512:
-  metadata.gz: 34d2faae6fb174994243251972416dcc89c9031124524a593d61a4a696e3d552fb7cac67a595f33a2a1b28d3297683d3822cfed713271db8c38f90178629cff5
-  data.tar.gz: 6f5dd991677497f7dcd0e1c14b1732198eae288a06fac0d0980356850d660a8a8699aeb963b40190c1b02509042f955817caa9b5411276f8f0ce565c14ce32cd
+  metadata.gz: ebc36de5be79b0c6ad0ee7a45529d1d2ab92dfb37771cd21392fd9ef54565c02b8972a16cb741039d3cd07c14249a12b4924796621a8cf31ffdc21254a2db6f2
+  data.tar.gz: cf9ae7791cf26e89e3eaffec71fb8b05376c1a8d67ba0d0677f7f1eea58f14e1a76c3d4aee5bd2dc7797638311ed98041477de7f11e32922cffdd1308c9b78ba

data/CHANGELOG.md

@@ -2,14 +2,56 @@
 
 ## [Unreleased]
 ### Added
+- Flowsheet.New data model
 
 ### Changed
 
 ### Removed
 
+## [0.6.0] - 2020-11-02
+### Added
+- Flowsheet.New data model
+
+### Changed
+
+### Removed
+
+## [0.5.0] - 2020-10-29
+### Added
+- File Upload
+- Media.New
+
+### Changed
+- fixed: source was re-authenticating every request (DateTime math was incorrect)
+
+### Removed
+- remove SchedulingBooked.Query Patient property. It is not present on the corresponding redox model and was never used.
+
+## [0.4.0] - 2020-09-04
+### Added
+- add email and phone to demographics
+- add patient contacts
+
+## [0.3.0] - 2020-08-27
+### Added
+- _body attribute containing raw response text on query results
+- SchedulingBooked.Query
+
+## [0.2.0] - 2020-08-16
+### Added
+- improve release process
+
+### Changed
+- fixed CHANGELOG url in gemspec
+
 ## [0.1.0] - 2020-08-14
 ### Added
 - implement PatientSearch.Query
 
-[Unreleased]: https://github.com/patient-discovery/redox-client/compare/v1.0.0...HEAD
 [0.1.0]: https://github.com/patient-discovery/redox-client/releases/tag/v0.1.0
+[0.2.0]: https://github.com/patient-discovery/redox-client/releases/tag/v0.2.0
+[0.3.0]: https://github.com/patient-discovery/redox-client/releases/tag/v0.3.0
+[0.4.0]: https://github.com/patient-discovery/redox-client/releases/tag/v0.4.0
+[0.5.0]: https://github.com/patient-discovery/redox-client/releases/tag/v0.5.0
+[0.6.0]: https://github.com/patient-discovery/redox-client/releases/tag/v0.6.0
+[Unreleased]: https://github.com/patient-discovery/redox-client/compare/v0.6.0...HEAD

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    redox-client (0.1.0)
+    redox-client (0.6.0)
       faraday (~> 1.0, >= 1.0.1)
       hashie (~> 4.1)
 
@@ -11,8 +11,9 @@ GEM
     ast (2.4.1)
     diff-lcs (1.4.4)
     docile (1.3.2)
-    faraday (1.0.1)
+    faraday (1.1.0)
       multipart-post (>= 1.2, < 3)
+      ruby2_keywords
     hashie (4.1.0)
     multipart-post (2.1.1)
     parallel (1.19.2)
@@ -26,6 +27,8 @@ GEM
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
       rspec-mocks (~> 3.9.0)
+    rspec-collection_matchers (1.2.0)
+      rspec-expectations (>= 2.99.0.beta1)
     rspec-core (3.9.2)
       rspec-support (~> 3.9.3)
     rspec-expectations (3.9.2)
@@ -49,6 +52,7 @@ GEM
     rubocop-performance (1.6.1)
       rubocop (>= 0.71.0)
     ruby-progressbar (1.10.1)
+    ruby2_keywords (0.0.2)
     simplecov (0.18.5)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
@@ -66,6 +70,7 @@ DEPENDENCIES
   rake (~> 12.0)
   redox-client!
   rspec (~> 3.9)
+  rspec-collection_matchers (~> 1.2)
   simplecov (~> 0.18.5)
   standard (~> 0.4.7)
   vcr (~> 6.0)

data/README.md

@@ -1,5 +1,6 @@
 [![Gem Version](https://img.shields.io/gem/v/redox-client.svg)](https://badge.fury.io/rb/redox-client)
 [![Ruby Style Guide](https://img.shields.io/badge/code_style-standard-brightgreen.svg)](https://github.com/testdouble/standard)
+![Test](https://github.com/patient-discovery/redox-client/workflows/Test/badge.svg)
 
 # redox-client - Ruby gem facade for Redox APIs
 
@@ -77,6 +78,9 @@ Since `Redox::Source` has shared state, i.e., the access token and its expiratio
 ## Supported APIs
 
 - PatientSearch.Query
+- Scheduling.Booked
+- Media.New
+- File Upload
 
 ## Development
 ***Nota Bene**: This project uses [VCR](https://relishapp.com/vcr/vcr/docs) to record HTTP requests and responses and play them back during tests. Do NOT use Redox production credentials when developing tests.*
@@ -87,6 +91,29 @@ After checking out the repo, run `bin/setup` to install gem dependencies and a g
 ### Testing
 This project uses `rspec` and [VCR](https://relishapp.com/vcr/vcr/docs). VCR provides fast deterministic testing of HTTP APIs. It also makes it possible to set up any server response you want to test by authoring the server responses directly. This comes in handy when trying to test edge cases that might occur but are hard to reproduce.
 
+Some effort has been made to filter credentials from recorded HTTP interactions, but you should always carefully review all your changes before pushing them to avoid credential exposure.
+
+### Recording and Playing Back Cassettes
+The `VCR_MODE` environment variable controls whether VCR is recording cassettes or playing them back. When recoding cassettes the following environment variables are used to call Redox APIs:
+
+- `REDOX_ENDPOINT`: base URL of Redox API endpoint (e.g., https://api.redoxengine.com/)
+- `REDOX_API_KEY`: Redox `apiKey` used by /auth/authenticate
+- `REDOX_SECRET`: Redox `secret` used by /auth/authenticate
+
+Set these to the credentials for the Redox environment you are using for testing.
+
+When playing back cassettes these environment variables are ignored and no API requests are made to Redox.
+
+To make a new test with a new recording, set environment variables above then:
+
+```bash
+env VCR_MODE=record rspec spec/my_new_spec.rb
+```
+
+This will record all API requests made by the test. Be **careful**: if you run all the tests with `VCR_MODE=record` it will re-record all the cassettes.
+
+The default mode is playback, so to playback cassettes just run `rspec`.
+
 ### Coding Style
 This project adheres to [StandardRB](https://github.com/testdouble/standard/blob/master/README.md). Additionally
 [# frozen_string_literal](https://bugs.ruby-lang.org/issues/8976#note-30) is required in Ruby source files, and is enforced by Rubocop.
@@ -96,14 +123,17 @@ Run `rake` to run the style checks. Run `rake fix` to fix violations.
 ### Useful commands
 - `rake` - run all tests (lint, Redox cred scan, rspec)
 - `rake fix` - Fix RuboCop and StandardRB violations
-- `bin/check-vcr-cassettes --scrub` - attempt to replace real looking credentials in VCR cassettes with dummy test values.
+- `rake vcr:fix` - attempt to replace real looking credentials in VCR cassettes with dummy test values.
 - `rake -T` - see available rake tasks
 - `bin/console` - get an interactive prompt for experimenting
 
 ### Release Process
-- This project uses [Semantic Versioning](https://semver.org)
-- Prepare release on master branch
-- Update [CHANGELOG](CHANGELOG.md) and [version.rb](lib/redox/version.rb)
-  - git commit -m 'Release ...'
-- Merge master branch to release and push release branch
-- Github action tags the release and pushes the gem to rubygems
+This project uses [Semantic Versioning](https://semver.org)
+
+Prepare release on master branch, then run:
+
+```
+rake prepare:release
+```
+
+and follow the instructions.

data/Rakefile

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require "date"
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 require "standard/rake"
@@ -14,15 +15,57 @@ desc "Run all checks and tests"
 task default: :test
 
 desc "Run all checks and tests"
-task test: [:rubocop, :standard, :check_vcr_cassettes, :spec]
+task test: [:rubocop, :standard, :vcr, :spec]
 
 desc "Fix RuboCop and StandardRB violations"
 task fix: ["rubocop:auto_correct", "standard:fix"]
 
+# TODO: Make these a proper lib/rake_tasks.rb task and avoid exec'ing out
 desc "Check VCR cassettes for Redox credential leak"
-task :check_vcr_cassettes do
-  # TODO: Make this a proper lib/rake_tasks.rb task and avoid exec'ing out
-  raise "Possible credential leak" unless system "bin/check-vcr-cassettes"
+task "vcr" do
+  raise "Possible credential leak, run rake vcr:fix" unless system "bin/check-vcr-cassettes"
+end
+
+desc "Scrub VCR cassettes, replacing suspected real creds with test ones"
+task "vcr:fix" do
+  system "bin/check-vcr-cassettes --scrub"
+end
+
+task "prepare:changelog" do
+  repo = "https://github.com/patient-discovery/redox-client"
+  changelog = IO.readlines("CHANGELOG.md").map(&:chomp)
+  entries = [
+    "## [#{Redox::VERSION}] - #{Date.today}",
+    "[#{Redox::VERSION}]: #{repo}/releases/tag/v#{Redox::VERSION}",
+    "[Unreleased]: #{repo}/compare/v#{Redox::VERSION}...HEAD"
+  ]
+  unless entries.all? { |x| changelog.include? x }
+    puts "\nAdd these to CHANGELOG.md:\n\n"
+    puts entries.join("\n")
+    puts "\n\n"
+    abort "ERROR: CHANGELOG version entries needed"
+  end
+  puts "CHANGELOG looks good"
+end
+
+task "prepare:version" do
+  if system("git show-ref --tags v#{Redox::VERSION}")
+    abort("ERROR: Tag already exists. Check version.rb")
+  end
+end
+
+task "prepare:tag" do
+  unless system("git tag -m 'Version #{Redox::VERSION}' v#{Redox::VERSION}")
+    abort("ERROR: Unable to tag")
+  end
+end
+
+desc "Prepare a gem release"
+task "prepare:release": [
+  "release:guard_clean", "test", "prepare:version", "prepare:changelog", "prepare:tag"
+] do
+  puts "Release tagged. To create release run:\n\n"
+  puts "git push --follow-tags"
 end
 
 CLEAN.include "coverage"

data/lib/redox.rb

@@ -4,18 +4,44 @@ require_relative "redox/version"
 
 require_relative "redox/model"
 require_relative "redox/models/address"
+require_relative "redox/models/contact"
 require_relative "redox/models/demographics"
 require_relative "redox/models/destination"
+require_relative "redox/models/error"
+require_relative "redox/models/location"
+require_relative "redox/models/media"
 require_relative "redox/models/message"
 require_relative "redox/models/meta"
-require_relative "redox/models/patient"
+require_relative "redox/models/observation"
+require_relative "redox/models/observer"
 require_relative "redox/models/patient_identifier"
+require_relative "redox/models/patient"
+require_relative "redox/models/phone_number"
+require_relative "redox/models/provider"
+require_relative "redox/models/reference_range"
+require_relative "redox/models/visit"
 
-require_relative "redox/query"
 require_relative "redox/source"
+require_relative "redox/query"
+require_relative "redox/file_upload"
+
 require_relative "redox/patient_search/query.rb"
+require_relative "redox/scheduling/booked.rb"
+require_relative "redox/media/new.rb"
+require_relative "redox/flowsheet/new.rb"
 
 module Redox
-  class Error < StandardError; end
+  class Error < StandardError
+    attr_accessor :status
+    attr_accessor :body
+    attr_accessor :message
+
+    def initialize(status: nil, body: nil, message: nil)
+      self.status = status
+      self.body = body
+      self.message = message
+    end
+  end
+
   class AuthenticationError < Error; end
 end

data/lib/redox/file_upload.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+module Redox
+  class FileUpload
+    ENDPOINT = "https://blob.redoxengine.com/upload"
+
+    # Create a multipart file upload.
+    #
+    # @param filename_or_io [String, IO] Either a String filename of a local file
+    # or an open IO object
+    # @param content_type [String] String content type of the file data
+    # @param upload_as_filename [String] (optional) Name to use for uploaded file
+    def initialize(filename_or_io, content_type, upload_as_filename = nil)
+      @file_part = Faraday::FilePart.new(filename_or_io, content_type, upload_as_filename)
+    end
+
+    # Upload the file.
+    #
+    # @param [Redox::Source] source to use for authentication
+    def perform(source)
+      source.ensure_access_token
+
+      connection = Faraday.new { |f|
+        f.authorization :Bearer, source.access_token
+        f.request :multipart
+        f.headers[:accept] = "application/json"
+      }
+      res = connection.post ENDPOINT, {file: @file_part}
+
+      raise Redox::Error.new(status: res.status, body: res.body) unless res.success?
+
+      uri =
+        begin
+          JSON.parse(res.body)["URI"]
+        rescue
+        end
+      raise Redox::Error.new(status: res.status, body: res.body) unless uri
+
+      uri
+    end
+  end
+end

data/lib/redox/flowsheet/new.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+require "redox"
+
+module Redox
+  module Flowsheet
+    class New < Models::Message
+      redox_property :Patient, coerce: Models::Patient
+      redox_property :Visit, coerce: Models::Visit
+      redox_property :Observations, coerce: Array[Models::Observation]
+    end
+  end
+end

data/lib/redox/media/new.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require "redox"
+
+module Redox
+  module Media
+    class New < Redox::Query
+      redox_property :Patient, coerce: Models::Patient
+      redox_property :Visit, coerce: Models::Visit
+      redox_property :Media, coerce: Models::Media
+
+      def response_type
+        NewResponse
+      end
+    end
+
+    class NewResponse < Models::Message
+    end
+  end
+end

data/lib/redox/model.rb

@@ -55,7 +55,7 @@ class Redox::Model < Hashie::Trash
   # rails `String.underscore` method with the following simplications:
   #
   # - any word in all caps is assumed to be an acronym (ZIP -> zip)
-  # - only alphabetic characters and modified
+  # - only alphabetic characters are modified
   #
   # Note: this function does not have an inverse. Both "Zip" and "ZIP"
   # map to "zip".

data/lib/redox/models/contact.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require_relative "address"
+require_relative "phone_number"
+
+module Redox
+  module Models
+    class Contact < Redox::Model
+      redox_property :FirstName
+      redox_property :MiddleName
+      redox_property :LastName
+      redox_property :Address, coerce: Address
+      redox_property :PhoneNumber, coerce: PhoneNumber
+      redox_property :EmailAddresses, coerce: Array[String]
+      redox_property :RelationToPatient
+      redox_property :Roles, coerce: Array[String]
+    end
+  end
+end

data/lib/redox/models/demographics.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_relative "address"
+require_relative "phone_number"
 
 module Redox
   module Models
@@ -12,6 +13,8 @@ module Redox
       redox_property :SSN
       redox_property :Sex
       redox_property :Address, coerce: Address
+      redox_property :PhoneNumber, coerce: PhoneNumber
+      redox_property :EmailAddresses, coerce: Array[String]
     end
   end
 end

data/lib/redox/models/error.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Redox
+  module Models
+    class Error < Redox::Model
+      redox_property :ID
+      redox_property :Text
+      redox_property :Type
+      redox_property :Module
+    end
+  end
+end

data/lib/redox/models/location.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Redox
+  module Models
+    class Location < Redox::Model
+      redox_property :Type
+      redox_property :Facility
+      redox_property :Department
+      redox_property :Room
+    end
+  end
+end

data/lib/redox/models/media.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require_relative "provider"
+
+module Redox
+  module Models
+    class Media < Redox::Model
+      redox_property :FileType
+      redox_property :FileName
+      redox_property :FileContents
+      redox_property :DocumentType
+      redox_property :DocumentID
+      redox_property :DocumentDescription
+      redox_property :CreationDateTime
+      redox_property :ServiceDateTime
+      redox_property :Provider, coerce: Provider
+      redox_property :Authenticated
+      redox_property :Authenticator, coerce: Provider
+      redox_property :Availability
+      redox_property :Notifications, coerce: Array[Provider]
+    end
+  end
+end

data/lib/redox/models/message.rb

@@ -5,6 +5,7 @@ require_relative "meta"
 module Redox
   module Models
     class Message < Redox::Model
+      attr_accessor :_body
       redox_property :Meta, coerce: Redox::Models::Meta
     end
   end

data/lib/redox/models/meta.rb

@@ -4,12 +4,18 @@ require_relative "destination"
 
 module Redox
   module Models
+    # Redox::Message is already taken: it refers to an entire response
+    class MetaMessage < Redox::Model
+      redox_property :ID
+    end
     class Meta < Redox::Model
       redox_property :DataModel
       redox_property :EventType
       redox_property :EventDateTime
       redox_property :Test
       redox_property :Destinations, coerce: Array[Redox::Models::Destination]
+      redox_property :Message, coerce: MetaMessage
+      redox_property :Errors, coerce: Array[Redox::Models::Error]
     end
   end
 end

data/lib/redox/models/observation.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require_relative "observer"
+require_relative "reference_range"
+
+module Redox
+  module Models
+    class Observation < Redox::Model
+      redox_property :DateTime
+      redox_property :Value
+      redox_property :ValueType
+      redox_property :Units
+      redox_property :Code
+      redox_property :Codeset
+      redox_property :Description
+      redox_property :Status
+      redox_property :Notes, coerce: Array[String]
+      redox_property :Observer, coerce: Observer
+      redox_property :ReferenceRange, coerce: ReferenceRange
+      redox_property :AbnormalFlag
+    end
+  end
+end

data/lib/redox/models/observer.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Redox
+  module Models
+    class Observer < Redox::Model
+      redox_property :ID
+      redox_property :IDType
+      redox_property :FirstName
+      redox_property :LastName
+    end
+  end
+end

data/lib/redox/models/patient.rb

@@ -2,8 +2,14 @@
 
 require_relative "patient_identifier"
 require_relative "demographics"
+require_relative "contact"
 
-class Redox::Models::Patient < Redox::Model
-  redox_property :Identifiers, coerce: Array[Redox::Models::PatientIdentifier]
-  redox_property :Demographics, coerce: Redox::Models::Demographics
+module Redox
+  module Models
+    class Patient < Redox::Model
+      redox_property :Identifiers, coerce: Array[PatientIdentifier]
+      redox_property :Demographics, coerce: Demographics
+      redox_property :Contacts, coerce: Array[Contact]
+    end
+  end
 end

data/lib/redox/models/patient_identifier.rb

@@ -1,6 +1,10 @@
 # frozen_string_literal: true
 
-class Redox::Models::PatientIdentifier < Redox::Model
-  redox_property :IDType
-  redox_property :ID
+module Redox
+  module Models
+    class PatientIdentifier < Redox::Model
+      redox_property :IDType
+      redox_property :ID
+    end
+  end
 end

data/lib/redox/models/phone_number.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Redox
+  module Models
+    class PhoneNumber < Redox::Model
+      redox_property :Home
+      redox_property :Office
+      redox_property :Mobile
+    end
+  end
+end

data/lib/redox/models/provider.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require_relative "address"
+require_relative "location"
+require_relative "phone_number"
+
+module Redox
+  module Models
+    class Provider < Redox::Model
+      redox_property :ID
+      redox_property :IDType
+      redox_property :FirstName
+      redox_property :LastName
+      redox_property :Credentials, coerce: Array[String]
+      redox_property :Address, coerce: Address
+      redox_property :EmailAddresses, coerce: Array[String]
+      redox_property :PhoneNumber, coerce: PhoneNumber
+      redox_property :Location, coerce: Location
+    end
+  end
+end

data/lib/redox/models/reference_range.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Redox
+  module Models
+    class ReferenceRange < Redox::Model
+      redox_property :Low
+      redox_property :High
+      redox_property :Text
+    end
+  end
+end

data/lib/redox/models/visit.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require_relative "location"
+require_relative "patient"
+require_relative "provider"
+
+module Redox
+  module Models
+    class Visit < Redox::Model
+      redox_property :VisitNumber
+      redox_property :AccountNumber
+      redox_property :VisitDateTime
+      redox_property :PatientClass
+      redox_property :Status
+      redox_property :Duration
+      redox_property :Reason
+      redox_property :CancelReason
+      redox_property :LastUpdated
+      redox_property :ScheduledDateTime
+      redox_property :CancelDateTime
+      redox_property :Type
+      redox_property :Instructions
+      redox_property :Patient, coerce: Patient
+      redox_property :AttendingProvider, coerce: Provider
+      redox_property :ConsultingProvider, coerce: Provider
+      redox_property :ReferringProvider, coerce: Provider
+      redox_property :VisitProvider, coerce: Provider
+      redox_property :Location, coerce: Location
+    end
+  end
+end

data/lib/redox/query.rb

@@ -12,7 +12,10 @@ module Redox
         event_date_time: DateTime.now.iso8601,
         destinations: [Redox::Models::Destination.new(id: destination_id)]
       }
-      response_type.from_redox_json source.execute_query self
+      result_body = source.execute_query self
+      response = response_type.from_redox_json result_body
+      response._body = result_body
+      response
     end
   end
 end

data/lib/redox/scheduling/booked.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require "redox"
+
+module Redox
+  module Scheduling
+    class Booked < Redox::Query
+      redox_property :StartDateTime, coerce: ->(v) {
+        v.respond_to?(:iso8601) ? v.iso8601 : v.to_s
+      }
+      redox_property :EndDateTime, coerce: ->(v) {
+        v.respond_to?(:iso8601) ? v.iso8601 : v.to_s
+      }
+
+      def response_type
+        BookedResponse
+      end
+    end
+
+    class BookedResponse < Models::Message
+      redox_property :Visits, coerce: Array[Models::Visit]
+    end
+  end
+end

data/lib/redox/source.rb

@@ -7,9 +7,10 @@ require "faraday"
 class Redox::Source
   include MonitorMixin
 
-  ACCESS_TOKEN_EXPIRATION_BUFFER_SECONDS = 300
+  SECONDS_PER_DAY = 60 * 60 * 24
+  ACCESS_TOKEN_EXPIRATION_BUFFER = Rational(300, SECONDS_PER_DAY)
 
-  attr_reader :access_token_expires_at
+  attr_reader :endpoint, :api_key, :access_token_expires_at
 
   def initialize(endpoint:, api_key:, secret:, test_mode: true)
     super()
@@ -20,6 +21,7 @@ class Redox::Source
         content_type: "application/json"
       }
     )
+    @endpoint = endpoint
     @api_key = api_key
     @secret = secret
     @test_mode = test_mode
@@ -28,8 +30,21 @@ class Redox::Source
   def execute_query(model)
     ensure_access_token
     res = @connection.post("/endpoint", model.to_redox_json)
-    raise Redox::Error.new "#{res.status} #{res.body}" unless res.success?
-    JSON.parse(res.body)
+    message =
+      begin
+        JSON.parse(res.body)
+      rescue
+        nil
+      end
+
+    unless res.success?
+      raise Redox::Error.new(
+        status: res.status,
+        body: res.body,
+        message: Redox::Models::Message.from_redox_json(message)
+      )
+    end
+    message
   end
 
   def ensure_access_token
@@ -50,16 +65,16 @@ class Redox::Source
     end
   end
 
-  private
-
   def token_expiring_soon?
-    DateTime.now > @access_token_expires_at - ACCESS_TOKEN_EXPIRATION_BUFFER_SECONDS
+    DateTime.now > @access_token_expires_at - ACCESS_TOKEN_EXPIRATION_BUFFER
   end
 
+  private
+
   def authenticate
     self.access_token = nil
     res = @connection.post("/auth/authenticate", {apiKey: @api_key, secret: @secret}.to_json)
-    raise Redox::AuthenticationError.new "#{res.status} #{res.body}" unless res.success?
+    raise Redox::AuthenticationError.new status: res.status, body: res.body unless res.success?
     data = JSON.parse(res.body)
     self.access_token = data["accessToken"]
     @access_token_expires_at = DateTime.parse(data["expires"])

data/lib/redox/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Redox
-  VERSION = "0.1.0"
+  VERSION = "0.6.0"
 end

data/redox-client.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |gem|
   gem.summary = "Ruby library for consuming Redox JSON APIs"
   gem.required_ruby_version = Gem::Requirement.new(">= 2.6.0")
   gem.metadata["source_code_uri"] = gem.homepage
-  gem.metadata["changelog_uri"] = "#{gem.homepage}/CHANGELOG.md"
+  gem.metadata["changelog_uri"] = "#{gem.homepage}/blob/master/CHANGELOG.md"
 
   gem.license = "MIT"
   gem.files = Dir.chdir(File.expand_path(__dir__)) do
@@ -22,6 +22,7 @@ Gem::Specification.new do |gem|
 
   gem.add_development_dependency "rake", "~> 12.0"
   gem.add_development_dependency "rspec", "~> 3.9"
+  gem.add_development_dependency "rspec-collection_matchers", "~> 1.2"
   gem.add_development_dependency "simplecov", "~> 0.18.5"
   gem.add_development_dependency "standard", "~> 0.4.7"
   gem.add_development_dependency "vcr", "~> 6.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redox-client
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Michael Keirnan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-13 00:00:00.000000000 Z
+date: 2020-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.9'
+- !ruby/object:Gem::Dependency
+  name: rspec-collection_matchers
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -128,16 +142,30 @@ files:
 - README.md
 - Rakefile
 - lib/redox.rb
+- lib/redox/file_upload.rb
+- lib/redox/flowsheet/new.rb
+- lib/redox/media/new.rb
 - lib/redox/model.rb
 - lib/redox/models/address.rb
+- lib/redox/models/contact.rb
 - lib/redox/models/demographics.rb
 - lib/redox/models/destination.rb
+- lib/redox/models/error.rb
+- lib/redox/models/location.rb
+- lib/redox/models/media.rb
 - lib/redox/models/message.rb
 - lib/redox/models/meta.rb
+- lib/redox/models/observation.rb
+- lib/redox/models/observer.rb
 - lib/redox/models/patient.rb
 - lib/redox/models/patient_identifier.rb
+- lib/redox/models/phone_number.rb
+- lib/redox/models/provider.rb
+- lib/redox/models/reference_range.rb
+- lib/redox/models/visit.rb
 - lib/redox/patient_search/query.rb
 - lib/redox/query.rb
+- lib/redox/scheduling/booked.rb
 - lib/redox/source.rb
 - lib/redox/version.rb
 - redox-client.gemspec
@@ -146,7 +174,7 @@ licenses:
 - MIT
 metadata:
   source_code_uri: https://github.com/patient-discovery/redox-client
-  changelog_uri: https://github.com/patient-discovery/redox-client/CHANGELOG.md
+  changelog_uri: https://github.com/patient-discovery/redox-client/blob/master/CHANGELOG.md
 post_install_message: 
 rdoc_options: []
 require_paths: