allscripts_unity_client 3.3.0 → 3.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 318d72c20fb76dddb339df2816c74e13ff94e212
-  data.tar.gz: cf380ce84440281cb5474214fea46b24b43705f8
+  metadata.gz: 26d2a1e44edd1f0566f998f0d6a0a458be686621
+  data.tar.gz: 8a8e6d47cdcba9fe7cd5bcf775d40055eca85d13
 SHA512:
-  metadata.gz: 296d617eead2d1cc0e638ae8ea4247bf6f4c4d0bb033ebc4c551dff6d84f8040d118f7990bbf26686c2c4b41c367a1efd9aafe2f5f3a822b31a98ec656a1fe59
-  data.tar.gz: 630a7653aaf3f9d99ba477bdf275e31581a177ed6995bdd90fa6388f556a20911a4a21ecfb9f1002fef88ae0163461ceb0895d3a611eba7ae314db1db9dae382
+  metadata.gz: 7caa5e1b1a0e0bc6fd40f5331cc48bbe4b4ba8421d795a873670cacd2742270889b611d5e0604a96ca09a3027324d771043036b18373e762b856af5376de14a6
+  data.tar.gz: 9115bca3320748180f5c39423763fc75e9c7e45c7032e3ebb45657795d7d899a0aacb51155147e4850afcfada554f0a2bd40ed7f3c502512670837a978adda5c

data/.travis.yml

@@ -1,7 +1,5 @@
 language: ruby
 rvm:
-  - 1.9.3
-  - 2.0.0
   - 2.1.2
   - 2.2.2
 before_install:

data/lib/allscripts_unity_client/json_client_driver.rb

@@ -49,17 +49,21 @@ module AllscriptsUnityClient
 
     def magic(parameters = {})
       request = JSONUnityRequest.new(parameters, @options.timezone, @options.appname, @security_token)
-      log_magic(request)
-
       request_hash = request.to_hash
-      log_info("Request Data: #{request_hash}")
       request_data = MultiJson.dump(request_hash)
 
       start_timer
       response = @connection.post(build_uri('MagicJson'), request_data)
-      log_info("Response Status: #{response.status}")
       end_timer
 
+      # NOTE: ClientDriver#log_magic uses ClientDriver#log_info, which
+      # appends timing info (if end_timer has been called previously),
+      # and then resets the timer.
+      #
+      # It would be nice if future work made this less stateful.
+      log_magic(request)
+      log_info("Response Status: #{response.status}")
+
       response = MultiJson.load(response.body)
       raise_if_response_error(response)
 
@@ -83,8 +87,10 @@ module AllscriptsUnityClient
       response = @connection.post(build_uri('GetToken'), MultiJson.dump(request_data.to_hash))
       end_timer
 
-      raise_if_response_error(response.body)
       log_get_security_token
+      log_info("Response Status: #{response.status}")
+
+      raise_if_response_error(response.body)
 
       @security_token = response.body
     end

data/lib/allscripts_unity_client/version.rb

@@ -1,3 +1,3 @@
 module AllscriptsUnityClient
-  VERSION = '3.3.0'
+  VERSION = '3.3.1'
 end

data/spec/json_client_driver_spec.rb

@@ -3,8 +3,16 @@ require 'spec_helper'
 describe AllscriptsUnityClient::JSONClientDriver do
   it_behaves_like 'a client driver'
 
+  let(:fake_logger) do
+    double(Logger)
+  end
+
+  before do
+    allow(fake_logger).to receive(:info)
+  end
+
   subject do
-    client_driver = build(:json_client_driver)
+    client_driver = build(:json_client_driver, logger: fake_logger)
     client_driver.security_token = SecureRandom.uuid
     client_driver
   end
@@ -42,11 +50,6 @@ describe AllscriptsUnityClient::JSONClientDriver do
     before do
       stub_request(:post, "http://www.example.com/Unity/UnityService.svc/json/MagicJson").
                to_return(status: 200, body: get_server_info, headers: {})
-
-      allow(subject).to receive(:start_timer)
-      allow(subject).to receive(:end_timer)
-      allow(subject).to receive(:log_magic)
-      allow(subject).to receive(:log_info).twice
     end
 
     it 'should POST to /Unity/UnityService.svc/json/MagicJson' do
@@ -65,33 +68,22 @@ describe AllscriptsUnityClient::JSONClientDriver do
             )
     end
 
-    it 'should call start_timer' do
-      subject.magic
-      expect(subject).to have_received(:start_timer)
-    end
+    it 'should log the request duration' do
+      expect(fake_logger).to receive(:info).with(/Unity API Magic request to [^ ]+ \[SomeRequest\] [0-9.]+ seconds/)
 
-    it 'should call end_timer' do
-      subject.magic
-      expect(subject).to have_received(:start_timer)
+      subject.magic(action: 'SomeRequest')
     end
 
-    it 'should call log_magic' do
-      subject.magic
-      expect(subject).to have_received(:log_magic)
-    end
+    it 'should log the response code' do
+      expect(fake_logger).to receive(:info).with(/Response Status: 200/)
 
-    it 'should call log_info for recording request data and response status' do
-      subject.magic
-      expect(subject).to have_received(:log_info).twice
+      subject.magic(action: 'SomeRequest')
     end
   end
 
   describe '#get_security_token!' do
     before(:each) {
       stub_request(:post, 'http://www.example.com/Unity/UnityService.svc/json/GetToken').to_return(body: get_security_token)
-      allow(subject).to receive(:start_timer)
-      allow(subject).to receive(:end_timer)
-      allow(subject).to receive(:log_get_security_token)
     }
 
     it 'should POST to /Unity/UnityService.svc/json/GetToken with username, password, and appname' do
@@ -99,27 +91,22 @@ describe AllscriptsUnityClient::JSONClientDriver do
       expect(WebMock).to have_requested(:post, 'http://www.example.com/Unity/UnityService.svc/json/GetToken').with(body: /\{"Username":"[^"]+","Password":"[^"]+","Appname":"[^"]+"\}/, headers: { 'Content-Type' => 'application/json' })
     end
 
-    it 'should call start_timer' do
-      subject.get_security_token!
-      expect(subject).to have_received(:start_timer)
-    end
+    it 'log the request to get a security token' do
+      expect(fake_logger).to receive(:info).with(/Unity API GetSecurityToken request to [^ ]+ [0-9.]+ seconds/)
 
-    it 'should call end_timer' do
       subject.get_security_token!
-      expect(subject).to have_received(:start_timer)
     end
 
-    it 'should call log_get_security_token' do
+    it 'logs the response code from getting a security token' do
+      expect(fake_logger).to receive(:info).with(/Response Status: 200/)
+
       subject.get_security_token!
-      expect(subject).to have_received(:log_get_security_token)
     end
   end
 
   describe '#retire_security_token!' do
     before(:each) {
       stub_request(:post, 'http://www.example.com/Unity/UnityService.svc/json/RetireSecurityToken').to_return(body: retire_security_token)
-      allow(subject).to receive(:start_timer)
-      allow(subject).to receive(:end_timer)
       allow(subject).to receive(:log_retire_security_token)
     }
 
@@ -128,16 +115,6 @@ describe AllscriptsUnityClient::JSONClientDriver do
       expect(WebMock).to have_requested(:post, 'http://www.example.com/Unity/UnityService.svc/json/RetireSecurityToken').with(body: /\{"Token":"[^"]+","Appname":"[^"]+"\}/, headers: { 'Content-Type' => 'application/json' })
     end
 
-    it 'should call start_timer' do
-      subject.retire_security_token!
-      expect(subject).to have_received(:start_timer)
-    end
-
-    it 'should call end_timer' do
-      subject.retire_security_token!
-      expect(subject).to have_received(:start_timer)
-    end
-
     it 'should call log_retire_security_token' do
       subject.retire_security_token!
       expect(subject).to have_received(:log_retire_security_token)

data/spec/support/shared_examples_for_unity_request.rb

@@ -81,7 +81,8 @@ shared_examples 'a unity request' do
 
     context 'when given a UTC date time string' do
       it 'returns an ISO8601 string' do
-        now_iso8601 = DateTime.now.utc.iso8601
+        now = DateTime.now.utc
+        now_iso8601 = now.strftime('%Y-%m-%dT%H:%M:%S%:z')
         expect(subject.send(:process_date, now_iso8601)).to eq(now_iso8601)
       end
     end
@@ -97,7 +98,7 @@ shared_examples 'a unity request' do
     context 'when given a UTC Time' do
       it 'returns an ISO8601 string' do
         now = Time.now.utc
-        now_iso8601 = now.strftime('%Y-%m-%dT%H:%M:%S+00:00')
+        now_iso8601 = now.strftime('%Y-%m-%dT%H:%M:%S%:z')
         expect(subject.send(:process_date, now)).to eq(now_iso8601)
       end
     end
@@ -105,9 +106,9 @@ shared_examples 'a unity request' do
     context 'when given a UTC DateTime' do
       it 'returns an ISO8601 string' do
         now = DateTime.now.utc
-        now_iso8601 = now.iso8601
+        now_iso8601 = now.strftime('%Y-%m-%dT%H:%M:%S%:z')
         expect(subject.send(:process_date, now)).to eq(now_iso8601)
       end
     end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: allscripts_unity_client
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.3.1
 platform: ruby
 authors:
 - healthfinch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-18 00:00:00.000000000 Z
+date: 2017-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient