redox 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f8779e7746c52bb1e149b95b8a28719fce07048b9b08538ea32841c66e6958a
-  data.tar.gz: fe25242609d42be438e504f719bcdbde764aa7c7c0c47ae1f1cf404012bd2478
+  metadata.gz: b6ab25d3f19478659e8b289237cfc384ac214d2ac2fe880a4e5ea324b16488e0
+  data.tar.gz: 035f903ba8152429b06c1ab2e1a6a17bc7639974bd483440448a391bab7c7763
 SHA512:
-  metadata.gz: 3c9fd7c435756453d2b388c8af01d7664281ffa5c69c7eaaa8a2c9d24ba98746046319fb62f74532e1e19c2e271248f6cd640d24b87c0263939a41d654f803e6
-  data.tar.gz: 721b2e09e0c8e8768ad4f452ee3ae7e7dfc84ccbaeb22d43af80f8c0aefca244395bb5c11f1fc1d991d2175ed1fb181c7fbd6689dd0f1d3a6e5f7b757e4581d2
+  metadata.gz: de4c1669a46c1cc4257d84ae12a8a3243679bf6d264e58383519a57cc405ab71fa870d098903b92edd322a672f6901481e9e824d259c6f1d86e8223d642f25e7
+  data.tar.gz: e98d7dfdfd023b845dcffadfcf46e17f8e21d2f1357f88cc0e0454cb377d2f7e6dad179a9c206f75be9432630cc6ccfcb6ec6ab6d73da8e06f73f43657e88de4

data/.gitignore

@@ -7,3 +7,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+/redox*.gem

data/CHANGELOG.md

@@ -5,7 +5,12 @@ 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).
 
 ## [Unreleased]
-None
+### Added
+- <TBD>
+
+## [0.1.5] - 2019-04-09
+### Added
+- Patient, Demographics, Identities models
 
 ## [0.1.4] - 2019-04-02
 ### Added
@@ -28,7 +33,7 @@ None
 ### Removed
 - rubocop
 
-# [0.1.2] - 2018-03-08
+## [0.1.2] - 2018-03-08
 ### Added
 - CircleCI config
 - .editorconfig
@@ -38,7 +43,7 @@ None
 - Corrected author email
 - Tweaks to pass rubocop
 
-# [0.1.1] - 2017-10-12
+## [0.1.1] - 2017-10-12
 ### Removed
 - Redundant .gem file
 - Fix WeInfuse capitalization
@@ -47,8 +52,9 @@ None
 ### Added
 - Initial Release
 
-[Unreleased]: https://github.com/WeInfuse/redox/compare/0.1.4...HEAD
-[0.1.4]: https://github.com/WeInfuse/redox/compare/0.1.3...0.1.4
+[Unreleased]: https://github.com/WeInfuse/redox/compare/v0.1.5...HEAD
+[0.1.5]: https://github.com/WeInfuse/redox/compare/v0.1.4...v0.1.5
+[0.1.4]: https://github.com/WeInfuse/redox/compare/0.1.3...v0.1.4
 [0.1.3]: https://github.com/WeInfuse/redox/compare/0.1.2...0.1.3
 [0.1.2]: https://github.com/WeInfuse/redox/compare/0.1.1...0.1.2
 [0.1.1]: https://github.com/WeInfuse/redox/compare/0.1.0...0.1.1

data/lib/redox.rb

@@ -1,8 +1,13 @@
-require 'redox/version'
 require 'json'
 require 'net/http'
 require 'uri'
 require 'openssl'
+require 'redox/version'
+require 'redox/redox_exception'
+require 'redox/models/model'
+require 'redox/models/patient'
+require 'redox/models/demographics'
+require 'redox/models/identifiers'
 
 module Redox
   # Redox API client
@@ -82,7 +87,7 @@ module Redox
     # Send PatientSearch query
     #
     # @param [Hash] patient_params data to send in the Patient JSON object
-    # @return [Hash] parsed response object
+    # @return [Hash] Redox Patient object
     # @example
     #   Redox::Redox.new(*connection_params).search_patients(
     #     Identifiers: [],
@@ -91,15 +96,14 @@ module Redox
     #     }
     #   )
     def search_patients(patient_params)
-      patient_request = Net::HTTP::Post.new('/query', auth_header)
-      request_body = request_meta(
-        data_model: 'PatientSearch', event_type: 'Query'
-      ).merge(Patient: patient_params)
+      patient_request = Net::HTTP::Post.new(Models::Patient::SEARCH[:endpoint], auth_header)
+      request_body = request_meta(Models::Patient::SEARCH[:meta])
+        .merge(Patient: patient_params)
       patient_request.body = request_body.to_json
 
       response = connection.request(patient_request)
 
-      JSON.parse(response.body)
+      return Models::Patient.new(JSON.parse(response.body))
     end
 
     private
@@ -116,7 +120,7 @@ module Redox
       response = connection.request(login_request)
 
       if (false == response.is_a?(Net::HTTPOK))
-        raise "Failed to authenticate '#{response.code}' '#{response.body}'."
+        raise RedoxException.from_response(response, msg: 'Authentication')
       end
 
       body = JSON.parse(response.body)

data/lib/redox/models/demographics.rb

@@ -0,0 +1,7 @@
+module Redox
+  module Models
+    class Demographics < Model
+      KEY = 'Demographics'
+    end
+  end
+end

data/lib/redox/models/identifiers.rb

@@ -0,0 +1,7 @@
+module Redox
+  module Models
+    class Identifiers < Model
+      KEY = 'Identifiers'
+    end
+  end
+end

data/lib/redox/models/model.rb

@@ -0,0 +1,49 @@
+module Redox
+  module Models
+    class Model
+      KEY = nil
+
+      def initialize(data)
+        @data = data.freeze
+      end
+
+      def valid?
+        return @data.is_a?(Hash) && @data.include?(self.class::KEY)
+      end
+
+      def raw(key: self.class::KEY)
+        if key.nil?
+          return @data
+        else
+          return @data[key]
+        end
+      end
+
+      def map(mapper: {}, data: self.raw)
+        result = {}
+
+        if (true == mapper.is_a?(Hash))
+          mapper.each do |key, value|
+            if (true == value.is_a?(Hash))
+              result = result.merge(self.map(data: data[key], mapper: value))
+            elsif (true == value.respond_to?(:call))
+              lambda_result = value.call(data[key])
+
+              if (true == lambda_result.is_a?(Hash))
+                result = result.merge(lambda_result)
+              else
+                raise "lambda must return hash"
+              end
+            else
+              result[value] = data[key]
+            end
+          end
+        else
+          raise "mapper must be a hash, got '#{mapper}'"
+        end
+
+        return result
+      end
+    end
+  end
+end

data/lib/redox/models/patient.rb

@@ -0,0 +1,26 @@
+module Redox
+  module Models
+    class Patient < Model
+      attr_reader :demographics, :identifiers
+
+      KEY = 'Patient'
+
+      SEARCH = {
+        meta: {
+          data_model: 'PatientSearch',
+          event_type: 'Query'
+        },
+        endpoint: '/query'
+      }
+
+      def initialize(data)
+        super(data)
+
+        if (self.valid?)
+          @demographics = Demographics.new(self.raw)
+          @identifiers  = Identifiers.new(self.raw)
+        end
+      end
+    end
+  end
+end

data/lib/redox/redox_exception.rb

@@ -0,0 +1,22 @@
+module Redox
+  class RedoxException < Exception
+    def self.from_response(response, msg: nil)
+      exception_msg = "Failed #{msg}:"
+      exception_msg << " HTTP code: #{response.code} MSG: "
+
+      begin
+        error_response = JSON.parse(response.body)
+
+        if (error_response.is_a?(Hash) && error_response.include?("Meta") && error_response["Meta"].include?("Errors"))
+          exception_msg << error_response["Meta"]["Errors"]
+        else
+          exception_msg << error_response
+        end
+      rescue JSON::ParserError
+        exception_msg << response.body
+      end
+
+      return RedoxException.new(exception_msg)
+    end
+  end
+end

data/lib/redox/version.rb

@@ -1,3 +1,3 @@
 module Redox
-  VERSION = '0.1.4'.freeze
+  VERSION = '0.1.5'.freeze
 end

data/redox.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', '~> 1.13'
+  spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'webmock', '~> 3.1'

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: redox
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Alexander Clark
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-03 00:00:00.000000000 Z
+date: 2019-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -98,6 +98,11 @@ files:
 - bin/console
 - bin/setup
 - lib/redox.rb
+- lib/redox/models/demographics.rb
+- lib/redox/models/identifiers.rb
+- lib/redox/models/model.rb
+- lib/redox/models/patient.rb
+- lib/redox/redox_exception.rb
 - lib/redox/version.rb
 - redox.gemspec
 homepage: https://github.com/WeInfuse/redox
@@ -119,7 +124,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Ruby wrapper for the Redox Engine API