redox 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 723ef1a6761a8bc29b184b6ce436cab1efd9bc397bc51b7907fa8692421ba8ba
-  data.tar.gz: e45806f7bd77025ee3d060ee4c4663aa462cc0b2554042b33110f1df76f85b27
+  metadata.gz: 451221082b696c7421fa2feacde94c0235bbd78348c416d904cba8df3d1ff67b
+  data.tar.gz: 9934ade2a99d85628444a8845b15bf14c79cb595f1307da196d57d1faa2a2668
 SHA512:
-  metadata.gz: ea1863fe78f915a3ae082963dbd56dbb2501759e2f2a0ab99b622b7925febe209f33a212a700c0a48415b1464b46715941d8f95869c6811fc0cb1fddceb7ddb2
-  data.tar.gz: d4ed45942181735d43c458193a5cc39890d222f07168cbeec593531b0b7647c3c222686f1f738c4d80b5d091f3aa4c6a1df16186d22662bec6e951f650dca092
+  metadata.gz: 192db714b76ee2a5d197577e21c2907f50d211667b1d16f7ee468af71196655da67fc593771e1f713419bc5a382e8b196b315660dba62c4563ee553bc9581e8d
+  data.tar.gz: 2f72e880e360b4d74e6b8b27b25baf0f9a4bb867615723afa9c40089d1a4debaf42c96aa6ee5997f2bc432d315bcbd6c02d9612c9f73aa096dffed1e6cb18cb9

data/CHANGELOG.md

@@ -4,11 +4,16 @@ 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.x.x] - UNRELEASED
+## [1.1.0] - 2020-06-15
 ### Changed
-- None
+- Moving to Requst classes instead of mixing in logic to models (kept backwards compatibility)
+- Added potential matches to responses and implemented for patient search
 
-## [1.0.2] - UNRELEASED
+=======
+### Added
+- PotentialMatches class
+
+## [1.0.2] - 2019-06-04
 ### Changed
 - Added Extensions to all Redox models
 - Fixed warnings in gemspec
@@ -89,7 +94,7 @@ 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.2...HEAD
+[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

data/lib/redox.rb

@@ -11,6 +11,9 @@ 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/patient_admin'
+require 'redox/request/patient_search'
 
 module Redox
   class Configuration

data/lib/redox/models/model.rb

@@ -6,9 +6,11 @@ module Redox
 
       property :Meta, from: :meta, required: false
       property :Patient, from: :patient, 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 :meta, :Meta
 
@@ -37,7 +39,7 @@ module Redox
           model = Model.new
           model.response = response
 
-          %w[Meta Patient].each do |k|
+          %w[Meta Patient 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
@@ -40,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/request/patient_admin.rb

@@ -0,0 +1,24 @@
+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: p, meta: Redox::Models::Meta.new)
+        meta = CREATE_META.merge(meta)
+        return Redox::Models::Model.from_response((RedoxClient.connection.request(body: Redox::Request::PatientAdmin.build_body(p, meta))))
+      end
+
+      def self.update(patient: p, meta: Redox::Models::Meta.new)
+        meta = UPDATE_META.merge(meta)
+        return Redox::Models::Model.from_response((RedoxClient.connection.request(body: Redox::Request::PatientAdmin.build_body(p, meta))))
+      end
+
+      def self.build_body(params, meta)
+        meta = Redox::Models::Meta.new.merge(meta)
+
+        return meta.to_h.merge(params.to_h)
+      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::PatientAdmin.build_body(params, meta))))
+      end
+    end
+  end
+end

data/lib/redox/version.rb

@@ -1,3 +1,3 @@
 module Redox
-  VERSION = '1.0.2'.freeze
+  VERSION = '1.1.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redox
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Alexander Clark
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-06-04 00:00:00.000000000 Z
+date: 2020-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -152,7 +152,10 @@ 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/redox_exception.rb
+- lib/redox/request/patient_admin.rb
+- lib/redox/request/patient_search.rb
 - lib/redox/version.rb
 - redox.gemspec
 homepage: https://github.com/WeInfuse/redox