allscripts_unity_client 2.2.4 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: adb3d7f5fb0cac264e9ee0e8bcdecef49321ba97
-  data.tar.gz: 4006475b317abf982369272640bacea76444aee4
+  metadata.gz: d45ff82ffa1f0cc9f7e439e29b36a7d41f9508b9
+  data.tar.gz: 78af373698dce39e44131bd8b0492233f84b2e8b
 SHA512:
-  metadata.gz: 8b55859ebfcf46a3324d9f05894dc848227191713735dff741268ba8e3f33a3a195d143940af5e29e1fb69002aceda1c5b324a8605eb70a298365b19fc2b97b0
-  data.tar.gz: 258a046184bcc8abe5b12b99f9dea5fcd91d10f09b4b4cfa733ca26f2dcdf8ac4eeed7b51297b080033e6db38159f82e890b8ce3ab8dedc9c4df553dd5c93be8
+  metadata.gz: 84e1d6cd45ea3a3f370504fbf331dd253a546bf448af2270608590b281cc1c7cc4b93b81388375225561dab6a4fb0b9e9ce91cb71189b1f6ddb981c219fe0207
+  data.tar.gz: 84e593af4e43f27e40bd8954a356f3eaa06a02909dd7c0c162a187465f71ad9bff62726b62624129d1ebae543b8bd8ff9d329d070ffaacbcbe0ba788e4951a1e

data/README.md

@@ -1,7 +1,7 @@
 # Allscripts Unity Client [![Build Status](https://travis-ci.org/healthfinch/allscripts-unity-client.png?branch=master)](https://travis-ci.org/healthfinch/allscripts-unity-client) [![Coverage Status](https://coveralls.io/repos/healthfinch/allscripts-unity-client/badge.png?branch=master)](https://coveralls.io/r/healthfinch/allscripts-unity-client?branch=master)
 
 The `allscripts_unity_client` gem is a Ruby client for the Allscripts Unity API. See http://remotecentral.allscripts.com/UnityAPIReference for more documentation on the API.
- 
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -245,26 +245,6 @@ unity_client = AllscriptsUnityClient.create({
 This gem uses the [american_date](http://rubygems.org/gems/american_date) gem to force `Date.parse` to
 accept USA locale dates by default. There are currently no plans to support other locales. Pull requests welcome.
 
-### New Relic support
-
-New Relic is supported for tracing Unity HTTP requests and the overall time processing the reqeusts takes. To enable
-New Relic, simply require the gem in your project and enable it on the client:
-
-```ruby
-require 'newrelic_rpm'
-NewRelic::Agent.manual_start
-
-unity_client = AllscriptsUnityClient.create({
-  base_unity_url: "http://unity.base.url",
-  appname: "appname",
-  username: "username",
-  password: "password",
-  new_relic: true
-})
-```
-
-For more information on the New Relic gem, go here: (https://github.com/newrelic/rpm)
-
 ## Examples
 
 ### GetServerInfo SOAP
@@ -363,4 +343,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/allscripts_unity_client.gemspec

@@ -8,35 +8,32 @@ Gem::Specification.new do |gem|
   gem.name                  = 'allscripts_unity_client'
   gem.version               = AllscriptsUnityClient::VERSION
   gem.date                  = Date.today
-  gem.required_ruby_version = '> 1.9.3'
+  gem.required_ruby_version = '> 2.0.0'
   gem.license               = 'MIT'
   gem.homepage              = 'https://github.com/healthfinch/allscripts-unity-client'
 
   gem.summary     = 'Allscripts Unity API client'
-  gem.description = 'Provides a simple interface to the Allscripts Unity API using JSON or SOAP. Developed at healthfinch, Inc. http://healthfinch.com'
+  gem.description = 'Provides a simple interface to the Allscripts Unity API using JSON. Developed at healthfinch http://healthfinch.com'
 
-  gem.authors = ['Ash Gupta', 'Neil Goodman']
-  gem.email   = %w(ash.gupta@healthfinch.com neil@healthfinch.com)
+  gem.authors = ['Lucian Cesca']
+  gem.email   = %w(lucian@healthfinch.com)
 
   gem.require_paths = ['lib']
 
   gem.files = `git ls-files`.split("\n").delete_if { |file| /^\.ruby-version$/.match(file) }
 
-  gem.add_runtime_dependency 'savon', '~> 2.6.0'
-  gem.add_runtime_dependency 'faraday', '~> 0.9.0'
-  gem.add_runtime_dependency 'em-http-request', '~> 1.1.2'
-  gem.add_runtime_dependency 'activesupport', '>= 0'
-  gem.add_runtime_dependency 'nokogiri', '< 1.6', '>= 1.4.0'
-  gem.add_runtime_dependency 'nori', '~> 2.4.0'
-  gem.add_runtime_dependency 'american_date', '~> 1.1.0'
-  gem.add_runtime_dependency 'oj', '~> 2.9.8'
-  gem.add_runtime_dependency 'rubyntlm', '~> 0.4.0'
+  gem.add_dependency 'httpclient', '~> 2.6'
+  gem.add_dependency 'activesupport', '>= 3'
+  gem.add_dependency 'nokogiri', '< 1.6', '>= 1.4.0'
+  gem.add_dependency 'nori', '~> 2.4.0'
+  gem.add_dependency 'american_date', '~> 1.1.0'
+  gem.add_dependency 'multi_json', '~> 1.0'
+  gem.add_dependency 'rubyntlm', '~> 0.4.0'
 
   gem.add_development_dependency 'factory_girl', '~> 4.4.0'
   gem.add_development_dependency 'rake', '~> 10.3.1'
   gem.add_development_dependency 'faker', '~> 1.4.2'
   gem.add_development_dependency 'rspec', '~> 3.0.0'
-  gem.add_development_dependency 'simplecov', '~> 0.8.2'
   gem.add_development_dependency 'webmock', '~> 1.18.0'
-  gem.add_development_dependency 'coveralls', '~> 0.7.0'
+  gem.add_development_dependency 'simplecov', '~> 0.7.1'
 end

data/lib/allscripts_unity_client/client_driver.rb

@@ -14,17 +14,6 @@ module AllscriptsUnityClient
     # options:: See ClientOptions.
     def initialize(options)
       @options = ClientOptions.new(options)
-
-      # If New Relic support is enabled, setup method tracing
-      if @options.new_relic
-        NewRelicSupport.enable_method_tracer(self)
-
-        class << self
-          add_method_tracer :magic
-          add_method_tracer :get_security_token!
-          add_method_tracer :retire_security_token!
-        end
-      end
     end
 
     # Returns true if security token is not nil.
@@ -87,4 +76,4 @@ module AllscriptsUnityClient
       @timer = @end_time - @start_time
     end
   end
-end
+end

data/lib/allscripts_unity_client/client_options.rb

@@ -2,7 +2,7 @@ module AllscriptsUnityClient
 
   # Contains various options for Unity configuration.
   class ClientOptions
-    attr_accessor :proxy, :logger, :ca_file, :ca_path, :timeout, :new_relic
+    attr_accessor :proxy, :logger, :ca_file, :ca_path, :timeout
     attr_reader :base_unity_url, :username, :password, :appname, :timezone
 
     # Constructor.
@@ -17,7 +17,6 @@ module AllscriptsUnityClient
     #   - :ca_file - A string path for a CA File on the OS (JSON only).
     #   - :cs_path - A string path for a CA directory (JSON only).
     #   - :timeout - The number of seconds to set the HTTP response timeout and keepalive timeout (JSON only).
-    #   - :new_relc - If set to true then New Relic mixins will be applied.
     #   - :base_unity_url - The URL where a Unity server is located (i.e. https://unity.server.com) __(required)__
     def initialize(options = {})
       @username = options[:username]
@@ -28,7 +27,6 @@ module AllscriptsUnityClient
       @ca_file = options[:ca_file]
       @ca_path = options[:ca_path]
       @timeout = options[:timeout]
-      @new_relic = options[:new_relic]
 
       self.timezone = options[:timezone]
       self.base_unity_url = options[:base_unity_url]
@@ -118,10 +116,5 @@ module AllscriptsUnityClient
     def timeout?
       !@timeout.to_s.strip.empty?
     end
-
-    # Return true if new_relic is not nil.
-    def new_relic?
-      !@new_relic.nil?
-    end
   end
-end
+end

data/lib/allscripts_unity_client/json_client_driver.rb

@@ -1,6 +1,5 @@
-require 'oj'
-require 'faraday'
-require 'em-http-request'
+require 'multi_json'
+require 'httpclient'
 
 module AllscriptsUnityClient
 
@@ -10,39 +9,52 @@ module AllscriptsUnityClient
 
     UNITY_JSON_ENDPOINT = '/Unity/UnityService.svc/json'
 
-    # Constructor.
-    #
-    # options:: See ClientOptions.
     def initialize(options)
       super
-      @connection = Faraday.new(build_faraday_options) do |conn|
-        conn.adapter :em_http
-      end
+
+
+      @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"
+    end
+
+    def build_uri(request_location)
+      "#{@options.base_unity_url}#{[UNITY_JSON_ENDPOINT, request_location].join('/')}"
     end
 
-    # Returns :json.
     def client_type
       :json
     end
 
-    # See Client#magic.
     def magic(parameters = {})
       request_data = JSONUnityRequest.new(parameters, @options.timezone, @options.appname, @security_token)
 
-      response = nil
-      NewRelicSupport.trace_execution_scoped_if_available(self.class, ["Custom/UnityJSON/#{parameters[:action]}"]) do
-        response = @connection.post do |request|
-          request.url "#{UNITY_JSON_ENDPOINT}/MagicJson"
-          request.headers['Content-Type'] = 'application/json'
-          request.body = Oj.dump(request_data.to_hash, mode: :compat)
-          set_request_timeout(request)
-
-          start_timer
-        end
-        end_timer
-      end
+      start_timer
+      response = @connection.post(build_uri('MagicJson'), MultiJson.dump(request_data.to_hash))
+      end_timer
 
-      response = Oj.load(response.body, mode: :strict)
+      response = MultiJson.load(response.body)
 
       raise_if_response_error(response)
       log_magic(request_data)
@@ -63,18 +75,9 @@ module AllscriptsUnityClient
         'Appname' => appname
       }
 
-      response = nil
-      NewRelicSupport.trace_execution_scoped_if_available(self.class, ["Custom/UnityJSON/GetToken"]) do
-        response = @connection.post do |request|
-          request.url "#{UNITY_JSON_ENDPOINT}/GetToken"
-          request.headers['Content-Type'] = 'application/json'
-          request.body = Oj.dump(request_data, mode: :compat)
-          set_request_timeout(request)
-
-          start_timer
-        end
-        end_timer
-      end
+      start_timer
+      response = @connection.post(build_uri('GetToken'), MultiJson.dump(request_data.to_hash))
+      end_timer
 
       raise_if_response_error(response.body)
       log_get_security_token
@@ -92,18 +95,9 @@ module AllscriptsUnityClient
         'Appname' => appname
       }
 
-      response = nil
-      NewRelicSupport.trace_execution_scoped_if_available(self.class, ["Custom/UnityJSON/RetireSecurityToken"]) do
-        response = @connection.post do |request|
-          request.url "#{UNITY_JSON_ENDPOINT}/RetireSecurityToken"
-          request.headers['Content-Type'] = 'application/json'
-          request.body = Oj.dump(request_data, mode: :compat)
-          set_request_timeout(request)
-
-          start_timer
-        end
-        end_timer
-      end
+      start_timer
+      response = @connection.post(build_uri('RetireSecurityToken'), MultiJson.dump(request_data.to_hash))
+      end_timer
 
       raise_if_response_error(response.body)
       log_retire_security_token
@@ -122,64 +116,5 @@ module AllscriptsUnityClient
         raise APIError, response
       end
     end
-
-    def build_faraday_options
-      options = {}
-
-      # Configure Faraday base url
-      options[:url] = @options.base_unity_url
-
-      # Configure root certificates for Faraday using options or via auto-detection
-      if @options.ca_file?
-        options[:ssl] = { ca_file: @options.ca_file }
-      elsif @options.ca_path?
-        options[:ssl] = { ca_path: @options.ca_path }
-      elsif ca_file = JSONClientDriver.find_ca_file
-        options[:ssl] = { ca_file: ca_file }
-      elsif ca_path = JSONClientDriver.find_ca_path
-        options[:ssl] = { ca_path: ca_path }
-      end
-
-      # Configure proxy
-      if @options.proxy?
-        options[:proxy] = @options.proxy
-      end
-
-      options
-    end
-
-    def self.find_ca_path
-      if File.directory?('/usr/lib/ssl/certs')
-        return '/usr/lib/ssl/certs'
-      end
-
-      nil
-    end
-
-    def self.find_ca_file
-      if File.exists?('/opt/boxen/homebrew/opt/curl-ca-bundle/share/ca-bundle.crt')
-        return '/opt/boxen/homebrew/opt/curl-ca-bundle/share/ca-bundle.crt'
-      end
-
-      if File.exists?('/opt/local/share/curl/curl-ca-bundle.crt')
-        return '/opt/local/share/curl/curl-ca-bundle.crt'
-      end
-
-      if File.exists?('/usr/lib/ssl/certs/ca-certificates.crt')
-        return '/usr/lib/ssl/certs/ca-certificates.crt'
-      end
-
-      nil
-    end
-
-    def set_request_timeout(request)
-      if @options.timeout?
-        request.options[:timeout] = @options.timeout
-        request.options[:open_timeout] = @options.timeout
-      else
-        request.options[:timeout] = 90
-        request.options[:open_timeout] = 90
-      end
-    end
   end
-end
+end

data/lib/allscripts_unity_client/utilities.rb

@@ -9,7 +9,7 @@ module AllscriptsUnityClient
     DATETIME_REGEX = /^((\d{1,2}[-\/]\d{1,2}[-\/]\d{4})|(\d{4}[-\/]\d{1,2}[-\/]\d{1,2})|(\d{1,2}-[A-Za-z]{3,4}-\d{4})|([A-Za-z]{3,4} +\d{1,2} \d{2,4}))(T| +)(\d{1,2}:\d{2}(:\d{2})?(\.\d+)? ?(PM|AM|pm|am)?((-|\+)\d{2}:?\d{2})?Z?)$/
     DATE_REGEX = /^((\d{1,2}[-\/]\d{1,2}[-\/]\d{4})|(\d{4}[-\/]\d{1,2}[-\/]\d{1,2})|(\d{1,2}-[A-Za-z]{3,4}-\d{4})|([A-Za-z]{3,4} +\d{1,2} \d{2,4}))$/
 
-    # Try to encode a string into a Data or ActiveSupport::TimeWithZone object.
+    # Try to encode a string into a Date or ActiveSupport::TimeWithZone object.
     #
     # Uses DATETIME_REGEX and DATE_REGEX to match possible date string.
     #
@@ -85,4 +85,4 @@ module AllscriptsUnityClient
       hash
     end
   end
-end
+end

data/lib/allscripts_unity_client/version.rb

@@ -1,3 +1,3 @@
 module AllscriptsUnityClient
-  VERSION = '2.2.4'
+  VERSION = '3.0.0'
 end

data/lib/allscripts_unity_client.rb

@@ -7,9 +7,7 @@ require 'allscripts_unity_client/json_unity_response'
 require 'allscripts_unity_client/client'
 require 'allscripts_unity_client/client_driver'
 require 'allscripts_unity_client/client_options'
-require 'allscripts_unity_client/soap_client_driver'
 require 'allscripts_unity_client/json_client_driver'
-require 'allscripts_unity_client/new_relic_support'
 
 # A library for consuming Allscripts Unity web services.
 module AllscriptsUnityClient
@@ -25,22 +23,17 @@ module AllscriptsUnityClient
   #
   # Returns an instance of Client.
   def self.create(options = {})
-    options[:mode] ||= :soap
-    options[:log] = true unless options[:log] === false
-    raise_if_options_invalid options
+    options[:mode] ||= :json
+    if options[:log] != false # explictly
+      options[:log] = true
+    end
 
     if options[:mode] == :json
       client_driver = JSONClientDriver.new(options)
     else
-      client_driver = SOAPClientDriver.new(options)
+      raise ArgumentError, ':mode must be :json' unless options[:mode] == :json
     end
 
     Client.new(client_driver)
   end
-
-  private
-
-  def self.raise_if_options_invalid(options)
-    raise ArgumentError, ':mode must be :json or :soap' unless [:json, :soap].include?(options[:mode])
-  end
-end
+end

data/spec/allscripts_unity_client_spec.rb

@@ -1,18 +1,9 @@
 require 'spec_helper'
 
 describe AllscriptsUnityClient do
-  include Savon::SpecHelper
-
   subject { described_class }
 
   describe '.create' do
-    context 'when given mode: :soap' do
-      it 'returns a SOAPClient' do
-        parameters = build(:allscripts_unity_client_parameters, mode: :soap)
-        expect(subject.create(parameters).client_type).to be(:soap)
-      end
-    end
-
     context 'when given mode: :json' do
       it 'returns a client with client_type :json' do
         parameters = build(:allscripts_unity_client_parameters, mode: :json)
@@ -21,25 +12,19 @@ describe AllscriptsUnityClient do
     end
 
     context 'when not given :mode' do
-      it 'returns a client with client_type :soap' do
+      it 'returns a client with client_type :json' do
         parameters = build(:allscripts_unity_client_parameters)
         parameters[:mode] = nil
-        expect(subject.create(parameters).client_type).to be(:soap)
+        expect(subject.create(parameters).client_type).to be(:json)
       end
     end
-  end
 
-  describe '.raise_if_options_invalid' do
-    context 'when not given :mode' do
-      it { expect { subject.send(:raise_if_options_invalid, build(:allscripts_unity_client_parameters, mode: nil)) }.to raise_error(ArgumentError) }
-    end
-
-    context 'when given mode: :json' do
-      it { expect { subject.send(:raise_if_options_invalid, build(:allscripts_unity_client_parameters, mode: :json)) }.not_to raise_error }
-    end
-
-    context 'when given mode: :soap' do
-      it { expect { subject.send(:raise_if_options_invalid, build(:allscripts_unity_client_parameters, mode: :soap)) }.not_to raise_error }
+    context 'when given an invalid :mode' do
+      it 'raises an argument error' do
+        parameters = build(:allscripts_unity_client_parameters)
+        parameters[:mode] = :cheese
+        expect { subject.create(parameters) }.to raise_error(ArgumentError, ':mode must be :json')
+      end
     end
   end
-end
+end

data/spec/client_driver_spec.rb

@@ -4,7 +4,6 @@ describe AllscriptsUnityClient::ClientDriver do
   it_behaves_like 'a client driver'
 
   subject { build(:client_driver) }
-  let(:new_relic_client_driver) { build(:client_driver, new_relic: true) }
 
   describe '#client_type' do
     it { expect(subject.client_type).to be(:none) }
@@ -21,4 +20,4 @@ describe AllscriptsUnityClient::ClientDriver do
   describe '#retire_security_token!' do
     it { expect { subject.retire_security_token! }.to raise_error(NotImplementedError) }
   end
-end
+end

data/spec/client_options_spec.rb

@@ -182,20 +182,4 @@ describe AllscriptsUnityClient::ClientOptions do
       end
     end
   end
-
-  describe '#new_relic?' do
-    context 'when new_relic is nil' do
-      it 'returns false' do
-        subject.new_relic = nil
-        expect(subject.new_relic?).to be_falsey
-      end
-    end
-
-    context 'when timeout is not nil' do
-      it 'returns true' do
-        subject.new_relic = true
-        expect(subject.new_relic?).to be_truthy
-      end
-    end
-  end
-end
+end

data/spec/factories/client_driver_factory.rb

@@ -12,9 +12,7 @@ FactoryGirl.define do
     ca_file nil
     ca_path nil
     timeout nil
-    new_relic nil
 
     factory :json_client_driver, class: AllscriptsUnityClient::JSONClientDriver
-    factory :soap_client_driver, class: AllscriptsUnityClient::SOAPClientDriver
   end
-end
+end

data/spec/factories/client_options.rb

@@ -12,6 +12,5 @@ FactoryGirl.define do
     ca_file nil
     ca_path nil
     timeout nil
-    new_relic nil
   end
-end
+end