luma 0.1.3 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f722a4bfdbfbdc81d2e9b85e52c8dd78aef2fdd64df668be3424bcbec766876d
-  data.tar.gz: 21be1a31248e6787d5b2b6a272a5d0ef424dcc01564a5a6e2942a880a4108014
+  metadata.gz: 3d3915bbf6dc23b7c8cd06e63ac1e36c6b3a3930f654c9307920dd55077f15b0
+  data.tar.gz: 8852faa9418bbbe6fb3e2b5b8cd9ecfdc91a6349ce298060642667d545ed7473
 SHA512:
-  metadata.gz: 6cfc178b60a519cfe2fec7d61c0aa26e410e5a47dc2c743239cfeb275f97548366ea7e61961cad3d1495df2696e6c66421126f1a98200963c855291cf1653fe1
-  data.tar.gz: d39c57e2e8c78fe22f425fdbf560691907f308b4ae2e4e4553f5f4b362dbc4fc07e1f83ea4d42bc452adfb95e9b5af3470343073e83d6f6b618917ec7fc084c5
+  metadata.gz: 8f5724cf37277996895d9646d4c8e6b5a46411668034b788078e829583781c13742687bf877d6d33808b6d21fe79fe826260adf64a1c8299070f224ccd4f6c43
+  data.tar.gz: 901b3c31e7e98a055136a9ed8d88674735a5a2d92b42e3d49b5c8ebd99491e43b4ee14716b6e6fdcce69c79c4a85b492b0e3b9529df0f4974d4a32971f5b5fdc

data/CHANGELOG.md

@@ -3,6 +3,28 @@ 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).
+
+## [0.2.1] - 2022-05-17
+
+### Changed
+
+- Removed default value for the property active on contact model
+
+## [0.2.0] - 2022-05-04
+
+### Added
+- Luma::ResponseData object with recommend_retry? method
+
+### Changed
+- Updated requests to return Luma::ResponseData object
+
+## [0.1.4] - 2022-02-15
+
+### Changed
+
+- Authentication accounts for token expiration
+- Connection memoizes authentication
+
 ## [0.1.3] - 2022-02-10
 
 ### Changed
@@ -80,6 +102,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 - Initial Create
 
+[0.2.1]: https://github.com/WeInfuse/luma/compare/v0.2.0...v0.2.1
+[0.2.0]: https://github.com/WeInfuse/luma/compare/v0.1.4...v0.2.0
+[0.1.4]: https://github.com/WeInfuse/luma/compare/v0.1.3...v0.1.4
 [0.1.3]: https://github.com/WeInfuse/luma/compare/v0.1.2...v0.1.3
 [0.1.2]: https://github.com/WeInfuse/luma/compare/v0.1.1...v0.1.2
 [0.1.1]: https://github.com/WeInfuse/luma/compare/v0.1.0...v0.1.1

data/lib/luma/appointment.rb

@@ -1,23 +1,15 @@
 module Luma
   class Appointment < Connection
-     APPOINTMENT_ENDPOINT = '/api/appointments'.freeze
+    APPOINTMENT_ENDPOINT = '/api/appointments'.freeze
 
-     base_uri 'https://api.lumahealth.io/'.freeze
+    base_uri 'https://api.lumahealth.io/'.freeze
 
-     def create_appointment(endpoint: APPOINTMENT_ENDPOINT, body: nil, headers: {}, auth: true, verb: :post, debug_output: $stdout)
-        @body = body
-        self.add_headers_and_body if auth
+    def create_appointment(endpoint: APPOINTMENT_ENDPOINT, body: nil, headers: {}, auth: true, verb: :post, debug_output: $stdout)
+      luma_request(auth: auth, body: body, endpoint: endpoint, verb: verb)
+    end
 
-        self.class.send(verb.to_s, endpoint, body: @body, headers: @headers)
-     end
-
-     def update_appointment(appt_identifier, endpoint: APPOINTMENT_ENDPOINT, body: nil, headers: {}, auth: true, verb: :put, debug_output: $stdout)
-        @body = body
-        self.add_headers_and_body if auth
-
-        endpoint = "#{endpoint}/#{appt_identifier}"
-
-        self.class.send(verb.to_s, endpoint, body: @body, headers: @headers)
-     end
+    def update_appointment(appt_identifier, endpoint: APPOINTMENT_ENDPOINT, body: nil, headers: {}, auth: true, verb: :put, debug_output: $stdout)
+      luma_request(auth: auth, body: body, endpoint: endpoint, identifier: appt_identifier, verb: :put)
+    end
   end
 end

data/lib/luma/appointment_type.rb

@@ -1,23 +1,20 @@
 module Luma
-   class AppointmentType < Connection
-      APPOINTMENT_TYPE_ENDPOINT = '/api/appointmentTypes'.freeze
+  class AppointmentType < Connection
+    APPOINTMENT_TYPE_ENDPOINT = '/api/appointmentTypes'.freeze
 
-      base_uri 'https://api.lumahealth.io/'.freeze
+    base_uri 'https://api.lumahealth.io/'.freeze
 
-      def view_appointment_types(endpoint: APPOINTMENT_TYPE_ENDPOINT, auth: true, name: nil, description: nil, debug_output: $stdout)
-         self.add_headers_and_body if auth
+    def view_appointment_types(endpoint: APPOINTMENT_TYPE_ENDPOINT, auth: true, name: nil, description: nil, debug_output: $stdout)
+      self.add_header if auth
 
-         url = "api/appointmentTypes?name=#{name}&description=#{description}"
-         full_url = "https://api.lumahealth.io/" + url
+      url = "api/appointmentTypes?name=#{name}&description=#{description}"
+      full_url = "https://api.lumahealth.io/" + url
 
-         HTTParty.get(full_url.to_str, headers: @headers, debug_output: $stdout)
-      end
+      HTTParty.get(full_url.to_str, headers: @headers, debug_output: $stdout)
+    end
 
-      def create_appointment_type(endpoint: APPOINTMENT_TYPE_ENDPOINT, body: nil, headers: {}, auth: true, verb: :post, debug_output: $stdout)
-         @body = body
-         self.add_headers_and_body if auth
-
-         self.class.send(verb.to_s, endpoint, body: @body, headers: @headers, debug_output: $stdout)
-      end
-   end
+    def create_appointment_type(endpoint: APPOINTMENT_TYPE_ENDPOINT, body: nil, headers: {}, auth: true, verb: :post, debug_output: $stdout)
+      luma_request(auth: auth, body: body, endpoint: endpoint, verb: verb)
+    end
+  end
 end

data/lib/luma/authentication.rb

@@ -14,18 +14,21 @@ module Luma
     end
 
     def authenticate
-      request = {
-        body: { email: email, password: password },
-        endpoint: AUTH_ENDPOINT
-      }
+      if (self.expires?)
+        request = {
+          body: { email: email, password: password },
+          endpoint: AUTH_ENDPOINT
+        }
 
-      response = self.request(**request, auth: false)
+        response = self.request(**request, auth: false)
 
-      if (false == response.ok?)
-        @response = nil
-        raise LumaException.from_response(response, msg: 'Authentication')
-      else
-        @response = response
+        if (false == response.ok?)
+          @response = nil
+          raise LumaException.from_response(response, msg: 'Authentication')
+        else
+          @response = response
+          validate
+        end
       end
 
       return self
@@ -51,6 +54,18 @@ module Luma
       return @response['token'] if @response
     end
 
+    def expiry
+      return @validation_response['exp'] if @validation_response
+    end
+
+    def expires?
+      if (self.expiry)
+        return (self.expiry / 1000) <= Time.now.to_f.floor
+      else
+        return true
+      end
+    end
+
     def access_header
       return {
         'X-Access-Token' => self.access_token,

data/lib/luma/connection.rb

@@ -24,17 +24,23 @@ module Luma
       self.class.send("#{verb}", endpoint, body: body, headers: headers)
     end
 
-    def add_headers_and_body
-      @body = @body.to_json
-      @headers = auth_header.merge(@headers)
+    def add_header
       @headers["Content-Type"] = 'application/json'
     end
 
+    def luma_request(auth:, body:, endpoint:, verb:, identifier: nil)
+      @body = body
+      self.add_header if auth
+
+      endpoint = "#{endpoint}/#{identifier}" unless identifier.nil?
+
+      Luma::ResponseData.new(response: self.request(endpoint: endpoint, body: @body, headers: @headers, auth: auth, verb: verb))
+    end
+
     private
 
     def auth_header
-      @auth = Authentication.new(email: @email, password: @password)
-
+      @auth ||= Authentication.new(email: @email, password: @password)
       return @auth.authenticate.access_header
     end
   end

data/lib/luma/facilities.rb

@@ -1,14 +1,11 @@
 module Luma
-   class Facilities < Connection
-      FACILITY_ENDPOINT = '/api/facilities'.freeze
+  class Facilities < Connection
+    FACILITY_ENDPOINT = '/api/facilities'.freeze
 
-      base_uri 'https://api.lumahealth.io/'.freeze
+    base_uri 'https://api.lumahealth.io/'.freeze
 
-      def create_facility(endpoint: FACILITY_ENDPOINT, body: nil, headers: {}, auth: true, verb: :post, debug_output: $stdout)
-         @body = body
-         self.add_headers_and_body if auth
-
-         self.class.send(verb.to_s, endpoint, body: @body, headers: @headers)
-      end
-   end
+    def create_facility(endpoint: FACILITY_ENDPOINT, body: nil, headers: {}, auth: true, verb: :post, debug_output: $stdout)
+      luma_request(auth: auth, body: body, endpoint: endpoint, verb: verb)
+    end
+  end
 end

data/lib/luma/models/contact.rb

@@ -12,7 +12,7 @@ module Luma
 
       property :type, required: false
       property :value, required: false
-      property :active, required: false, default: false
+      property :active, required: false
     end
   end
 end

data/lib/luma/patient.rb

@@ -5,28 +5,19 @@ module Luma
     base_uri 'https://api.lumahealth.io/'.freeze
 
     def create_patient(endpoint: PATIENT_ENDPOINT, body: nil, headers: {}, auth: true, verb: :post, debug_output: $stdout)
-      @body = body
-      self.add_headers_and_body if auth
-
-      self.class.send(verb.to_s, endpoint, body: @body, headers: @headers)
+      luma_request(auth: auth, body: body, endpoint: endpoint, verb: verb)
     end
 
     def update_patient(identifier:, endpoint: PATIENT_ENDPOINT, body: nil, headers: {}, auth: true, verb: :put, debug_output: $stdout)
-      @body = body
-      self.add_headers_and_body if auth
-
-      endpoint = "#{endpoint}/#{identifier}"
-
-      self.class.send(verb.to_s, endpoint, body: @body, headers: @headers)
+      luma_request(auth: auth, body: body, endpoint: endpoint, identifier: identifier, verb: verb)
     end
 
     def get_patient(identifier:, endpoint: PATIENT_ENDPOINT, headers: {}, auth: true, verb: :get, debug_output: $stdout)
-      self.add_headers_and_body if auth
+      self.add_header if auth
 
       endpoint = "#{endpoint}/#{identifier}"
 
-      response = self.class.send(verb.to_s, endpoint, headers: @headers)
-
+      response = self.request(endpoint: endpoint, headers: @headers, auth: auth, verb: verb)
       Luma::Models::PatientResponse.new(response: response)
     end
   end

data/lib/luma/provider.rb

@@ -1,15 +1,11 @@
 module Luma
-   class Provider < Connection
-      PROVIDER_ENDPOINT = '/api/providers'.freeze
+  class Provider < Connection
+    PROVIDER_ENDPOINT = '/api/providers'.freeze
 
-      base_uri 'https://api.lumahealth.io/'.freeze
+    base_uri 'https://api.lumahealth.io/'.freeze
 
-      def create_provider(endpoint: PROVIDER_ENDPOINT, body: nil, headers: {}, auth: true, verb: :post)
-         @body = body
-
-         self.add_headers_and_body if auth
-
-         self.class.send(verb.to_s, endpoint, body: @body, headers: @headers, debug_output: $stdout)
-      end
-   end
+    def create_provider(endpoint: PROVIDER_ENDPOINT, body: nil, headers: {}, auth: true, verb: :post)
+      luma_request(auth: auth, body: body, endpoint: endpoint, verb: verb)
+    end
+  end
 end

data/lib/luma/response_data.rb

@@ -0,0 +1,23 @@
+module Luma
+  class ResponseData
+    attr_reader :response, :raw
+
+    BAD_GATEWAY_CODE = 502.freeze
+    RETRYABLE_CODES = [BAD_GATEWAY_CODE].freeze
+
+    def initialize(response: nil)
+      @response = response
+
+      begin
+        @raw ||= response&.parsed_response
+      rescue JSON::ParserError
+      end
+
+      @raw ||= {}
+    end
+
+    def recommend_retry?
+      return true if RETRYABLE_CODES.include? response.code
+    end
+  end
+end

data/lib/luma/version.rb

@@ -1,3 +1,3 @@
 module Luma
-  VERSION = '0.1.3'.freeze
+  VERSION = '0.2.1'.freeze
 end

data/lib/luma.rb

@@ -14,6 +14,7 @@ require 'luma/models/patient_response'
 require 'luma/models/patient'
 require 'luma/appointment'
 require 'luma/models/appointment'
+require 'luma/response_data'
 
 module Luma
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: luma
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.1
 platform: ruby
 authors:
 - Angela Rodriguez
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-02-10 00:00:00.000000000 Z
+date: 2022-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -168,6 +168,7 @@ files:
 - lib/luma/models/patient_response.rb
 - lib/luma/patient.rb
 - lib/luma/provider.rb
+- lib/luma/response_data.rb
 - lib/luma/version.rb
 - luma.gemspec
 homepage: https://github.com/WeInfuse/luma