allscripts_unity_client 5.1.4 → 6.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a993add7d05fe2cffd3826d074b8f81a01e5a31e5c1614f953a9d9e1d543bb6e
-  data.tar.gz: 90f10242dcf1aff22295dad3c2ef65a3b183e078abb30d2a729a6022ed51d220
+  metadata.gz: 15063864b86d6ee4b600250f7c593ec695e5483e97389b19fd4441880829077d
+  data.tar.gz: 8c7623b827e5880d0e52b0c998678632de9f57bf0c882ed7a611b51354b45033
 SHA512:
-  metadata.gz: 5eb80f009dbbb38a4f4a037a3f7f15abe6116fe1612aa532ad1103f91ceb4e083ec6e7016d35ef5df04f85fb3ccff0345345eaf3a1c7e7ea16cf4dadefb798cb
-  data.tar.gz: f1d76441b1418cc92239a4e5b49e961b78c2cc2283e32ee7f1a6d049d3586a423dfa1d503be3f4819068fa5f0e270a50c478ab140ee6f3263b56475681dde482
+  metadata.gz: 3cd757580de6e749389231034ae911e36b2eddb734c775f082ae7199eddf2b1b0dd18da341bb02e0ecb1c69e1c062b7842ea2bb8dea22ede8ccd5290bb509715
+  data.tar.gz: 9f521855e3f67495ec4d2f7c361d040a7ca9d28cc88cbf74dc2275b98d907677090ec5c133106ca96ebedf043152dc1c42856d8dd4d0e383a39d152b06c71cc9

data/lib/allscripts_unity_client/client_options.rb

@@ -3,7 +3,8 @@ module AllscriptsUnityClient
   # Contains various options for Unity configuration.
   class ClientOptions
     attr_accessor :proxy, :logger, :ca_file, :ca_path, :timeout, :ehr_userid, :ehr_password
-    attr_reader :base_unity_url, :username, :password, :appname, :timezone, :raw_dates, :use_ubiquity
+    attr_reader :base_unity_url, :username, :password, :appname, :timezone, :raw_dates, :use_ubiquity,
+                :ubiquity_id, :ubiquity_client_id
 
     # Constructor.
     #
@@ -33,6 +34,8 @@ module AllscriptsUnityClient
       @ehr_userid = options[:ehr_userid]
       @ehr_password = options[:ehr_password]
       @use_ubiquity = options[:use_ubiquity] || false
+      @ubiquity_id = options[:ubiquity_id]
+      @ubiquity_client_id = options[:ubiquity_client_id]
 
       self.timezone = options[:timezone]
       self.base_unity_url = options[:base_unity_url]

data/lib/allscripts_unity_client/json_client_driver.rb

@@ -1,11 +1,11 @@
 require 'multi_json'
-require 'httpclient'
+require 'faraday'
 
 module AllscriptsUnityClient
 
   # A ClientDriver that supports Unity's JSON endpoints.
   class JSONClientDriver < ClientDriver
-    attr_accessor :json_base_url, :connection, :security_token
+    attr_accessor :json_base_url, :connection, :security_token, :use_ubiquity, :ubiquity_id, :ubiquity_client_id
 
     UNITY_JSON_ENDPOINT = '/Unity/UnityService.svc/json'
     UBIQUITY_JSON_ENDPOINT = '/UnityService.svc/json'
@@ -14,30 +14,13 @@ module AllscriptsUnityClient
     def initialize(options)
       super
 
-      @connection = HTTPClient.new(
-        proxy: @options.proxy,
-        default_header: {'Content-Type' => 'application/json'}
-      )
-
-      set_http_client_ssl_config
-      set_http_client_timeouts
-    end
-
-    def set_http_client_timeouts
-      @connection.connect_timeout = @options.timeout || 90
-      @connection.send_timeout = @options.timeout || 90
-      @connection.receive_timeout = @options.timeout || 90
-    end
-
-    def set_http_client_ssl_config
-      ssl_options = OpenSSL::SSL::OP_ALL
-      ssl_options &= ~OpenSSL::SSL::OP_DONT_INSERT_EMPTY_FRAGMENTS if defined?(OpenSSL::SSL::OP_DONT_INSERT_EMPTY_FRAGMENTS)
-      ssl_options |= OpenSSL::SSL::OP_NO_COMPRESSION if defined?(OpenSSL::SSL::OP_NO_COMPRESSION)
-      ssl_options |= OpenSSL::SSL::OP_NO_SSLv2 if defined?(OpenSSL::SSL::OP_NO_SSLv2)
-      ssl_options |= OpenSSL::SSL::OP_NO_SSLv3 if defined?(OpenSSL::SSL::OP_NO_SSLv3)
-
-      @connection.ssl_config.options = ssl_options
-      @connection.ssl_config.ciphers = "ALL:!aNULL:!eNULL:!SSLv2"
+      @connection = Faraday.new do |conn|
+        conn.request :json
+        conn.adapter Faraday.default_adapter
+        conn.options.timeout = @options.timeout || 90
+        conn.options.open_timeout = @options.timeout || 90
+        conn.proxy = @options.proxy if @options.proxy
+      end
     end
 
     def build_uri(request_location)
@@ -95,7 +78,7 @@ module AllscriptsUnityClient
 
     # See Client#get_security_token!.
     def get_security_token!(parameters = {})
-      username = parameters[:username] || @options.username
+      username = get_username(parameters)
       password = parameters[:password] || @options.password
       appname = parameters[:appname] || @options.appname
 
@@ -169,5 +152,13 @@ module AllscriptsUnityClient
         raise APIError, response
       end
     end
+
+    def get_username(parameters = {})
+      username = parameters[:username] || @options.username
+      if @options.use_ubiquity
+        username = "#{@options.ubiquity_id}:#{@options.ubiquity_client_id}:#{username}"
+      end
+      username
+    end
   end
 end

data/lib/allscripts_unity_client/version.rb

@@ -1,3 +1,3 @@
 module AllscriptsUnityClient
-  VERSION = '5.1.4'.freeze
+  VERSION = '6.0.0'.freeze
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: allscripts_unity_client
 version: !ruby/object:Gem::Version
-  version: 5.1.4
+  version: 6.0.0
 platform: ruby
 authors:
 - healthfinch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-10-11 00:00:00.000000000 Z
+date: 2024-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: httpclient
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement