dock_health_api 0.5.5 → 0.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 16bead509bc4ac6ce1933a1556fa99bdfcfcfa74983fa6746a9a1db128192f34
-  data.tar.gz: 8addd57bd9d99fd89805abc37a00d85ff6fc04c34fa2ae23e11da20a1dd3127d
+  metadata.gz: 6d06240d8efd2c2ac6c4b49cb3d6525379498665991a0c873efdb72707bd489d
+  data.tar.gz: c082a4f60607579cc01a7e4f10655e0b954c6b4bb1641f981c663b7bc569b920
 SHA512:
-  metadata.gz: ab9842ad4661c0ddc4f14c09c666a482eeaf0b5b71cbc2b7a6241738b5acff4c18d1be4a7642ec07e1f9338d8105ce28b7e7b2e1177dc28613f2a1a14f503689
-  data.tar.gz: c395ad1e5ece0e1e394039b15adfd6ab309fef3c002f8178b3a939b6e1c5fad7049b0abb6517a6db63112edd18da0138f43cc09b9932018b59bc9f2cd0e35f6f
+  metadata.gz: b4ed56ce48bd425eb26d9e96daa60f37ca13fdcc16f95340662d0a62db14e1f5d535a033f4bfcc57561d5c9eb4bd5d5c8cc7df2701a044c92a0084e62d92f955
+  data.tar.gz: 77b3bbd488d916dec0ac6f77364cd5d2949e24112d53ba16a7ca1768f680d1c711a7cf91ee9358c2b1c24d10f9000b8f4206348af0245dad2573b54ef5a17437

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dock_health_api (0.5.5)
+    dock_health_api (0.5.6)
       oauth2 (~> 1.4)
       ostruct
       rspec (~> 3.0)
@@ -48,6 +48,7 @@ GEM
 
 PLATFORMS
   arm64-darwin-21
+  ruby
   x86_64-linux
 
 DEPENDENCIES

data/lib/dock_health_api/client.rb

@@ -1,15 +1,20 @@
 require "oauth2"
+require 'singleton'
 
 module DockHealthApi
   class Client
+    BUFFER = 120
+
+    include Singleton
+    
     attr_reader :config
 
-    def initialize(config = {})
-      @config = config
+    def initialize
+      @config = DockHealthApi.config
     end
 
-    def self.active_client
-      new(DockHealthApi.config)
+    def active_client
+      instance
     end
 
     def connection
@@ -17,14 +22,18 @@ module DockHealthApi
     end
 
     def token_connection
-      unless @token_connection
-        get_token
-      else
-        get_token if token_expired?(DockHealthApi.token_expires_at)
-      end
+      get_token if @token_connection.nil? || token_about_to_expire?
       @token_connection
     end
 
+    def token_expiration_time
+      @token_expiration_time ||= Time.now + @token_connection.expires_in
+    end
+
+    def token_about_to_expire?
+      Time.now + BUFFER > token_expiration_time
+    end
+
     def iframe_token_connection
       get_iframe_token
       @iframe_token_connection
@@ -38,25 +47,17 @@ module DockHealthApi
       @iframe_token ||= iframe_token_connection.token
     end
 
-    def token_expired?(expires_at)
-      Time.now > expires_at
-    end
-
     def get_token
       @token_connection = connection.client_credentials.get_token(scope:"dockhealth/system.developer.read dockhealth/user.all.write dockhealth/user.all.read dockhealth/system.developer.write dockhealth/patient.all.read dockhealth/patient.all.write")
-      DockHealthApi.token = @token_connection.token
-      DockHealthApi.token_expires_at = token_expiration_time(@token_connection.expires_in)
+      @token_expiration_time = Time.now + @token_connection.expires_in
+      @token_connection
     end
 
     def get_iframe_token
       @iframe_token_connection = connection.client_credentials.get_token(scope:"dockhealth/system.embedded.launch")
       return @iframe_token_connection if @iframe_token_connection.nil?
       DockHealthApi.iframe_token = @iframe_token_connection.token
-      DockHealthApi.iframe_token_expires_at = token_expiration_time(@iframe_token_connection.expires_in)
-    end
-
-    def token_expiration_time(expires_in)
-      Time.now + expires_in
+      DockHealthApi.iframe_token_expires_at = Time.now + @iframe_token_connection.expires_in
     end
   end
 end

data/lib/dock_health_api/resource.rb

@@ -9,7 +9,7 @@ module DockHealthApi
     end
 
     def self.client
-      @client ||= DockHealthApi::Client.active_client
+      DockHealthApi::Client.instance
     end
 
     def self.resource_url

data/lib/dock_health_api/version.rb

@@ -1,3 +1,3 @@
 module DockHealthApi
-  VERSION = "0.5.5"
+  VERSION = "0.5.6"
 end

data/spec/client_spec.rb

@@ -4,25 +4,20 @@ require 'spec_helper'
 RSpec.describe DockHealthApi::Client do
   let(:config) { DockHealthApi::Config.new }
 
-  it 'should be able to be initialized with a Config object' do
-    client = DockHealthApi::Client.new(config)
-    expect(client.config).to eq(config)
-  end
-
-  describe '#active_client' do
+  describe '#instance' do
     it 'should config new client with standard config' do
-      expect(DockHealthApi::Client.active_client.config).to eq(DockHealthApi.config)
+      expect(DockHealthApi::Client.instance.config).to eq(DockHealthApi.config)
     end
   end
 
   describe "#connection" do
     it 'should initialize an OAuth2::Client object' do
-      expect(DockHealthApi::Client.active_client.connection.is_a?(OAuth2::Client))
+      expect(DockHealthApi::Client.instance.connection.is_a?(OAuth2::Client))
     end
   end
 
   describe "#token_connection" do
-    let (:token_connection) { DockHealthApi::Client.active_client.token_connection }
+    let (:token_connection) { DockHealthApi::Client.instance.token_connection }
 
     it 'should return a OAuth2::AccessToken object' do
       expect(token_connection.is_a?(OAuth2::AccessToken))
@@ -34,7 +29,7 @@ RSpec.describe DockHealthApi::Client do
   end
 
   describe "#get_iframe_token" do
-    let (:iframe_token_connection) { DockHealthApi::Client.active_client.iframe_token_connection }
+    let (:iframe_token_connection) { DockHealthApi::Client.instance.iframe_token_connection }
 
     it 'should return a OAuth2::AccessToken object for iframe' do
       expect(iframe_token_connection.is_a?(OAuth2::AccessToken))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dock_health_api
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.6
 platform: ruby
 authors:
 - Robert Magomero
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-04 00:00:00.000000000 Z
+date: 2023-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth2