allscripts_unity_client 2.1.6 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f780daefb7aced7b5f887ff5cbe0338d3fbbc15
-  data.tar.gz: 3f1ce4fe75714faa52fbfa768b52185dbbd176fb
+  metadata.gz: 259866bfe6fed08cf45b403f0b6d84c7a3149413
+  data.tar.gz: bcdf989b15bb39140e4b724904272f4d23a34125
 SHA512:
-  metadata.gz: a0d36d96dae75e62fe1e4505af37f6255cd3cece14a91c3eea9209c200c95839548c297dc936ef0b2b2936261ab7a5670c696aef05bb7bcad5082627328d6557
-  data.tar.gz: 28729d3cef4439338ad5a83b9887416de96f50eaaa92d2d8da24d3332222a3fd9b103457726eb373a643055777db243d32fa765cb4ff742e3aa969c3f0a7698a
+  metadata.gz: 323d5275934799ce108a744bca885a3dbcccd1a523e1a5eb5a83d5a07e7bf3fc868d8203748a39f40d1d7b30a41e93e7643f1b2f1324cfcb9d310d8c8f05bbc5
+  data.tar.gz: 6d845cd670527219ee24476349cd2581e886969d4fd8d41a636ac39d1a5879b1d8667024ba3e55ee29756598e4e22b01e547d89784f12f19d8a55b0b739d4fe9

data/allscripts_unity_client.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |gem|
   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 'tzinfo', '>= 0'
+  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'

data/lib/allscripts_unity_client.rb

@@ -1,5 +1,5 @@
+require 'active_support/time'
 require 'allscripts_unity_client/utilities'
-require 'allscripts_unity_client/timezone'
 require 'allscripts_unity_client/unity_request'
 require 'allscripts_unity_client/json_unity_request'
 require 'allscripts_unity_client/unity_response'
@@ -26,8 +26,7 @@ module AllscriptsUnityClient
       client_driver = SOAPClientDriver.new(options)
     end
 
-    client = Client.new(client_driver)
-    client
+    Client.new(client_driver)
   end
 
   private
@@ -35,5 +34,4 @@ module AllscriptsUnityClient
   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/lib/allscripts_unity_client/client_options.rb

@@ -54,9 +54,9 @@ module AllscriptsUnityClient
 
     def timezone=(timezone)
       if !timezone.nil?
-        @timezone = Timezone.new(timezone)
+        @timezone = ActiveSupport::TimeZone[timezone]
       else
-        @timezone = Timezone.new('UTC')
+        @timezone = ActiveSupport::TimeZone['Etc/UTC']
       end
     end
 

data/lib/allscripts_unity_client/unity_request.rb

@@ -47,17 +47,19 @@ module AllscriptsUnityClient
     protected
 
     def process_date(value)
-      if value.nil?
-        return nil
+      if value && (value.is_a?(Time) || value.is_a?(DateTime) || value.is_a?(ActiveSupport::TimeWithZone))
+        return value.in_time_zone(@timezone).iso8601
       end
 
-      result = Utilities::try_to_encode_as_date(value)
+      date = Utilities::try_to_encode_as_date(ActiveSupport::TimeZone['Etc/UTC'], value)
 
-      if result.instance_of?(Time) || result.instance_of?(Date) || result.instance_of?(DateTime)
-        return @timezone.utc_to_local(result)
+      if date && date.is_a?(ActiveSupport::TimeWithZone)
+        date.in_time_zone(@timezone).iso8601
+      elsif date && date.is_a?(Date)
+        date.iso8601
+      else
+        value
       end
-
-      value
     end
   end
 end

data/lib/allscripts_unity_client/unity_response.rb

@@ -96,11 +96,11 @@ module AllscriptsUnityClient
       end
 
       # Attempt to parse a Date or DateTime from a string
-      response = Utilities::try_to_encode_as_date(response)
+      response = Utilities::try_to_encode_as_date(@timezone, response)
 
       # Base case: convert date object to UTC
-      if response.instance_of?(Time) || response.instance_of?(DateTime) || response.instance_of?(Date)
-        return @timezone.local_to_utc(response)
+      if response.instance_of?(ActiveSupport::TimeWithZone)
+        return response.utc
       end
 
       # Base case: value is not a date

data/lib/allscripts_unity_client/utilities.rb

@@ -7,7 +7,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}))$/
 
-    def self.try_to_encode_as_date(possible_date)
+    def self.try_to_encode_as_date(timezone, possible_date)
       if possible_date.nil?
         return nil
       end
@@ -17,7 +17,7 @@ module AllscriptsUnityClient
       end
 
       if possible_date.is_a?(String) && possible_date =~ DATETIME_REGEX
-        return DateTime.parse(possible_date)
+        return timezone.parse(possible_date)
       end
 
       possible_date

data/lib/allscripts_unity_client/version.rb

@@ -1,3 +1,3 @@
 module AllscriptsUnityClient
-  VERSION = '2.1.6'
+  VERSION = '2.2.0'
 end

data/spec/client_options_spec.rb

@@ -5,9 +5,9 @@ describe AllscriptsUnityClient::ClientOptions do
 
   let(:url_with_slash) { 'http://www.example.com/' }
   let(:url_without_slash) { 'http://www.example.com' }
-  let(:utc_timezone) { AllscriptsUnityClient::Timezone.new('UTC') }
+  let(:utc_timezone) { ActiveSupport::TimeZone['Etc/UTC'] }
   let(:america_los_angeles) { 'America/Los_Angeles' }
-  let(:america_los_angeles_timezone) { AllscriptsUnityClient::Timezone.new('America/Los_Angeles') }
+  let(:america_los_angeles_timezone) { ActiveSupport::TimeZone['America/Los_Angeles'] }
   let(:client_options_hash) { { base_unity_url: 'http://www.example.com', username: 'username', password: 'password', appname: 'appname', proxy: 'proxy', timezone: 'UTC', logger: nil } }
 
   describe '#validate_options' do

data/spec/factories/unity_request_factory.rb

@@ -3,10 +3,9 @@ FactoryGirl.define do
     initialize_with { new(parameters, timezone, appname, security_token) }
 
     parameters { build(:magic_request) }
-    timezone { build(:timezone) }
+    timezone ActiveSupport::TimeZone['Etc/UTC']
     appname Faker::Name.name
     security_token SecureRandom.uuid
-
     factory :json_unity_request, class: AllscriptsUnityClient::JSONUnityRequest
   end
 end

data/spec/factories/unity_response_factory.rb

@@ -3,7 +3,7 @@ FactoryGirl.define do
     initialize_with { new(response, timezone) }
 
     response Hash.new
-    timezone { build(:timezone) }
+    timezone ActiveSupport::TimeZone['Etc/UTC']
 
     factory :json_unity_response, class: AllscriptsUnityClient::JSONUnityResponse
   end

data/spec/json_client_driver_spec.rb

@@ -54,7 +54,7 @@ describe AllscriptsUnityClient::JSONClientDriver do
 
     it 'should serialize DateTime to iso8601 when given' do
       subject.magic(parameter1: DateTime.now)
-      expect(WebMock).to have_requested(:post, 'http://www.example.com/Unity/UnityService.svc/json/MagicJson').with(body: /\{"Action":(null|"[^"]*"),"AppUserID":(null|"[^"]*"),"Appname":(null|"[^"]*"),"PatientID":(null|"[^"]*"),"Token":(null|"[^"]*"),"Parameter1":"\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(-|\+)\d{2}:\d{2}","Parameter2":(null|"[^"]*"),"Parameter3":(null|"[^"]*"),"Parameter4":(null|"[^"]*"),"Parameter5":(null|"[^"]*"),"Parameter6":(null|"[^"]*"),"Data":(null|"[^"]*")\}/, headers: { 'Content-Type' => 'application/json' })
+      expect(WebMock).to have_requested(:post, 'http://www.example.com/Unity/UnityService.svc/json/MagicJson').with(body: /\{"Action":(null|"[^"]*"),"AppUserID":(null|"[^"]*"),"Appname":(null|"[^"]*"),"PatientID":(null|"[^"]*"),"Token":(null|"[^"]*"),"Parameter1":"\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(\.\d+)?(-|\+)\d{2}:\d{2}","Parameter2":(null|"[^"]*"),"Parameter3":(null|"[^"]*"),"Parameter4":(null|"[^"]*"),"Parameter5":(null|"[^"]*"),"Parameter6":(null|"[^"]*"),"Data":(null|"[^"]*")\}/, headers: { 'Content-Type' => 'application/json' })
     end
 
     it 'should call start_timer' do

data/spec/support/shared_examples_for_unity_request.rb

@@ -73,22 +73,41 @@ shared_examples 'a unity request' do
     end
 
     context 'when given a date string' do
-      it do
-        date = '2013-10-24'
-        expect(subject.send(:process_date, date)).to be_instance_of(Date)
+      it 'returns an ISO8601 string' do
+        date = '10/24/2013'
+        expect(subject.send(:process_date, date)).to eq('2013-10-24')
+      end
+    end
+
+    context 'when given a UTC date time string' do
+      it 'returns an ISO8601 string' do
+        now_iso8601 = DateTime.now.utc.iso8601
+        expect(subject.send(:process_date, now_iso8601)).to eq(now_iso8601)
       end
     end
 
     context 'when given a Date' do
-      it { expect(subject.send(:process_date, Date.today)).to be_instance_of(Date) }
+      it 'returns an ISO8601 string' do
+        today = Date.today
+        today_iso8601 = Date.today.iso8601
+        expect(subject.send(:process_date, today)).to eq(today_iso8601)
+      end
     end
 
-    context 'when given a Time' do
-      it { expect(subject.send(:process_date, Time.now)).to be_instance_of(Time) }
+    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')
+        expect(subject.send(:process_date, now)).to eq(now_iso8601)
+      end
     end
 
-    context 'when given a DateTime' do
-      it { expect(subject.send(:process_date, DateTime.now)).to be_instance_of(DateTime) }
+    context 'when given a UTC DateTime' do
+      it 'returns an ISO8601 string' do
+        now = DateTime.now.utc
+        now_iso8601 = now.iso8601
+        expect(subject.send(:process_date, now)).to eq(now_iso8601)
+      end
     end
   end
 end

data/spec/utilities_spec.rb

@@ -6,7 +6,8 @@ describe AllscriptsUnityClient::Utilities do
   let(:date_string) { '2013-02-15' }
   let(:date) { Date.parse(date_string) }
   let(:datetime_string) { '2013-02-15T00:00:00Z' }
-  let(:datetime) { DateTime.parse(datetime_string) }
+  let(:datetime) { timezone.parse(datetime_string) }
+  let(:timezone) { ActiveSupport::TimeZone['Etc/UTC'] }
 
   let(:string) { 'string' }
   let(:string_array) { ['string'] }
@@ -19,10 +20,10 @@ describe AllscriptsUnityClient::Utilities do
   let(:datetime_string_two) { 'Feb 28 2013  1:34PM' }
   let(:datetime_string_three) { '12/25/2013 12:37 PM' }
   let(:datetime_string_four) { 'Nov  1 2011 11:31AM' }
-  let(:datetime_one) { DateTime.parse(datetime_string_one) }
-  let(:datetime_two) { DateTime.parse(datetime_string_two) }
-  let(:datetime_three) { DateTime.parse(datetime_string_three) }
-  let(:datetime_four) { DateTime.parse(datetime_string_four) }
+  let(:datetime_one) { timezone.parse(datetime_string_one) }
+  let(:datetime_two) { timezone.parse(datetime_string_two) }
+  let(:datetime_three) { timezone.parse(datetime_string_three) }
+  let(:datetime_four) { timezone.parse(datetime_string_four) }
   let(:date_string_one) { '20-Jul-2014' }
   let(:date_string_two) { '12/25/2013' }
   let(:date_string_three) { 'Nov  1 2011' }
@@ -32,66 +33,66 @@ describe AllscriptsUnityClient::Utilities do
 
   describe '.try_to_encode_as_date' do
     context 'when given nil' do
-      it { expect(subject.try_to_encode_as_date(nil)).to be_nil }
+      it { expect(subject.try_to_encode_as_date(timezone, nil)).to be_nil }
     end
 
     context 'when given date string' do
       it 'returns the string as a Date' do
-        expect(subject.try_to_encode_as_date(date_string)).to eq(date)
+        expect(subject.try_to_encode_as_date(timezone, date_string)).to eq(date)
       end
     end
 
     context 'when given date time string' do
       it 'returns the string as a DateTime' do
-        expect(subject.try_to_encode_as_date(datetime_string)).to eq(datetime)
+        expect(subject.try_to_encode_as_date(timezone, datetime_string)).to eq(datetime)
       end
     end
 
     context 'when given datetime_string_one' do
       it 'returns the string as a DateTime' do
-        expect(subject.try_to_encode_as_date(datetime_string_one)).to eq(datetime_one)
+        expect(subject.try_to_encode_as_date(timezone, datetime_string_one)).to eq(datetime_one)
       end
     end
 
     context 'when given datetime_string_two' do
       it 'returns the string as a DateTime' do
-        expect(subject.try_to_encode_as_date(datetime_string_two)).to eq(datetime_two)
+        expect(subject.try_to_encode_as_date(timezone, datetime_string_two)).to eq(datetime_two)
       end
     end
 
     context 'when given datetime_string_three' do
       it 'returns the string as a DateTime' do
-        expect(subject.try_to_encode_as_date(datetime_string_three)).to eq(datetime_three)
+        expect(subject.try_to_encode_as_date(timezone, datetime_string_three)).to eq(datetime_three)
       end
     end
 
     context 'when given datetime_string_four' do
       it 'returns the string as a DateTime' do
-        expect(subject.try_to_encode_as_date(datetime_string_four)).to eq(datetime_four)
+        expect(subject.try_to_encode_as_date(timezone, datetime_string_four)).to eq(datetime_four)
       end
     end
 
     context 'when given date_string_one' do
       it 'returns the string as a Date' do
-        expect(subject.try_to_encode_as_date(date_string_one)).to eq(date_one)
+        expect(subject.try_to_encode_as_date(timezone, date_string_one)).to eq(date_one)
       end
     end
 
     context 'when given date_string_two' do
       it 'returns the string as a Date' do
-        expect(subject.try_to_encode_as_date(date_string_two)).to eq(date_two)
+        expect(subject.try_to_encode_as_date(timezone, date_string_two)).to eq(date_two)
       end
     end
 
     context 'when given date_string_three' do
       it 'returns the string as a Date' do
-        expect(subject.try_to_encode_as_date(date_string_three)).to eq(date_three)
+        expect(subject.try_to_encode_as_date(timezone, date_string_three)).to eq(date_three)
       end
     end
 
     context 'when given a non-date string' do
       it 'returns that string' do
-        expect(subject.try_to_encode_as_date(string)).to eq(string)
+        expect(subject.try_to_encode_as_date(timezone, string)).to eq(string)
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: allscripts_unity_client
 version: !ruby/object:Gem::Version
-  version: 2.1.6
+  version: 2.2.0
 platform: ruby
 authors:
 - Ash Gupta
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-25 00:00:00.000000000 Z
+date: 2014-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: savon
@@ -54,7 +54,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.1.2
 - !ruby/object:Gem::Dependency
-  name: tzinfo
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -267,7 +267,6 @@ files:
 - lib/allscripts_unity_client/json_unity_response.rb
 - lib/allscripts_unity_client/new_relic_support.rb
 - lib/allscripts_unity_client/soap_client_driver.rb
-- lib/allscripts_unity_client/timezone.rb
 - lib/allscripts_unity_client/unity_request.rb
 - lib/allscripts_unity_client/unity_response.rb
 - lib/allscripts_unity_client/utilities.rb
@@ -281,7 +280,6 @@ files:
 - spec/factories/client_factory.rb
 - spec/factories/client_options.rb
 - spec/factories/magic_request_factory.rb
-- spec/factories/timezone_factory.rb
 - spec/factories/unity_request_factory.rb
 - spec/factories/unity_response_factory.rb
 - spec/fixtures/attributes_hash.yml
@@ -316,7 +314,6 @@ files:
 - spec/support/shared_examples_for_client_driver.rb
 - spec/support/shared_examples_for_unity_request.rb
 - spec/support/shared_examples_for_unity_response.rb
-- spec/timezone_spec.rb
 - spec/unity_request_spec.rb
 - spec/unity_response_spec.rb
 - spec/utilities_spec.rb

data/lib/allscripts_unity_client/timezone.rb

@@ -1,104 +0,0 @@
-require 'date'
-require 'tzinfo'
-
-module AllscriptsUnityClient
-  class Timezone
-    attr_accessor :tzinfo
-
-    def initialize(zone_identifier)
-      raise ArgumentError, 'zone_identifier can not be nil' if zone_identifier.nil?
-
-      @tzinfo = TZInfo::Timezone.get(zone_identifier)
-    end
-
-    # Use TZInfo to convert a given UTC datetime into
-    # a local
-    def local_to_utc(datetime)
-      convert_with_timezone(:local_to_utc, datetime)
-    end
-
-    def utc_to_local(datetime = nil)
-      convert_with_timezone(:utc_to_local, datetime)
-    end
-
-    def ==(timezone)
-      return false if !timezone.is_a?(Timezone)
-      @tzinfo == timezone.tzinfo
-    end
-
-    private
-
-    # Direction can be :utc_to_local or :local_to_utc
-    def convert_with_timezone(direction, datetime = nil)
-      if datetime.nil?
-        return nil
-      end
-
-      # Dates have no time information and so timezone conversion
-      # doesn't make sense. Just return the date in this case.
-      if datetime.instance_of?(Date)
-        return datetime
-      end
-
-      if datetime.instance_of?(String)
-        datetime = DateTime.parse(datetime.to_s)
-      end
-
-      is_datetime = datetime.instance_of?(DateTime)
-
-      if direction == :local_to_utc
-        if is_datetime
-          # DateTime can do UTC conversions reliably, so use that instead of
-          # TZInfo
-          datetime = datetime.new_offset(0)
-        else
-          datetime = @tzinfo.local_to_utc(datetime)
-        end
-
-        if is_datetime
-          # Convert to a DateTime with a UTC offset
-          datetime = DateTime.parse("#{datetime.strftime('%FT%T')}Z")
-        end
-      end
-
-      if direction == :utc_to_local
-        datetime = @tzinfo.utc_to_local(datetime)
-
-        if is_datetime
-          # Convert to a DateTime with the correct timezone offset
-          datetime = DateTime.parse(iso8601_with_offset(datetime))
-        end
-      end
-
-      datetime
-    end
-
-    # TZInfo does not correctly update a DateTime's
-    # offset, so we manually format a ISO8601 with
-    # the correct format
-    def iso8601_with_offset(datetime)
-      if datetime.nil?
-        return nil
-      end
-
-      offset = @tzinfo.current_period.utc_offset
-      negative_offset = false
-      datetime_string = datetime.strftime('%FT%T')
-
-      if offset < 0
-        offset *= -1
-        negative_offset = true
-      end
-
-      if offset == 0
-        offset_string = 'Z'
-      else
-        offset_string = Time.at(offset).utc.strftime('%H:%M')
-        offset_string = '-' + offset_string if negative_offset
-        offset_string = '+' + offset_string unless negative_offset
-      end
-
-      "#{datetime_string}#{offset_string}"
-    end
-  end
-end

data/spec/factories/timezone_factory.rb

@@ -1,7 +0,0 @@
-FactoryGirl.define do
-  factory :timezone, class: AllscriptsUnityClient::Timezone do
-    initialize_with { new(zone_identifier) }
-
-    zone_identifier 'America/Phoenix'
-  end
-end

data/spec/timezone_spec.rb

@@ -1,181 +0,0 @@
-require 'spec_helper'
-
-describe AllscriptsUnityClient::Timezone do
-  subject { build(:timezone) }
-
-  let(:positive_timezone) { build(:timezone, zone_identifier: 'Asia/Jakarta') }
-  let(:utc_timezone) { build(:timezone, zone_identifier: 'UTC') }
-  let(:local_string) { '2013-10-19T17:00:00-07:00' }
-  let(:date) { Date.parse(local_string) }
-  let(:local_time) { Time.parse('2013-10-19T17:00:00') }
-  let(:local_datetime) { DateTime.parse(local_string) }
-  let(:utc_string) { '2013-10-20T00:00:00+00:00' }
-  let(:utc_time) { Time.parse('2013-10-20T00:00:00') }
-  let(:utc_datetime) { DateTime.parse(utc_string) }
-
-  def time_to_s(time)
-    time.strftime('%FT%T')
-  end
-
-  describe '#initialize' do
-    context 'when nil is given' do
-      it 'raises ArgumentError' do
-        expect { build(:timezone, zone_identifier: nil) }.to raise_error(ArgumentError)
-      end
-    end
-
-    context 'when an invalid TZInfo zone is given' do
-      it 'rasies TZInfo::InvalidTimezoneIdentifier' do
-        expect { build(:timezone, zone_identifier: '') }.to raise_error(TZInfo::InvalidTimezoneIdentifier)
-      end
-    end
-  end
-
-  describe '#local_to_utc' do
-    it 'calls #convert_with_timezone with :local_to_utc' do
-      allow(subject).to receive(:convert_with_timezone).and_return(local_string)
-      subject.local_to_utc(local_string)
-      expect(subject).to have_received(:convert_with_timezone).with(:local_to_utc, local_string)
-    end
-  end
-
-  describe '#utc_to_local' do
-    it 'calls #convert_with_timezone with :utc_to_local' do
-      allow(subject).to receive(:convert_with_timezone).and_return(local_string)
-      subject.utc_to_local(local_string)
-      expect(subject).to have_received(:convert_with_timezone).with(:utc_to_local, local_string)
-    end
-  end
-
-  describe '#==' do
-    context 'when given an object other than Timezone' do
-      it 'returns false' do
-        expect(subject == 'not a timezone').to be_falsey
-      end
-    end
-
-    context 'when given a Timezone that has an equivalent @tzinfo' do
-      it 'returns true' do
-        expect(utc_timezone == utc_timezone).to be_truthy
-      end
-    end
-
-    context 'when given a Timezone that has a different @tzinfo' do
-      it 'returns false' do
-        expect(subject == utc_timezone).to be_falsey
-      end
-    end
-  end
-
-  describe '#convert_with_timezone' do
-    context 'when given nil' do
-      it { expect(subject.send(:convert_with_timezone, nil)).to be_nil }
-    end
-
-    context 'when given :local_to_utc and a Date' do
-      it 'returns a Date' do
-        expect(subject.send(:convert_with_timezone, :local_to_utc, date)).to be_an_instance_of(Date)
-      end
-    end
-
-    context 'when given :local_to_utc and a Time' do
-      it 'returns a Date' do
-        expect(subject.send(:convert_with_timezone, :local_to_utc, local_time)).to be_an_instance_of(Time)
-      end
-    end
-
-    context 'when given :local_to_utc and a DateTime' do
-      it 'returns a DateTime' do
-        expect(subject.send(:convert_with_timezone, :local_to_utc, local_datetime)).to be_an_instance_of(DateTime)
-      end
-    end
-
-    context 'when given :local_to_utc and a String' do
-      it 'returns a DateTime' do
-        expect(subject.send(:convert_with_timezone, :local_to_utc, local_string)).to be_an_instance_of(DateTime)
-      end
-    end
-
-    context 'when given :utc_to_local and a Date' do
-      it 'returns a Date' do
-        expect(subject.send(:convert_with_timezone, :utc_to_local, date)).to be_an_instance_of(Date)
-      end
-    end
-
-    context 'when given :utc_to_local and a Time' do
-      it 'returns a Date' do
-        expect(subject.send(:convert_with_timezone, :utc_to_local, utc_time)).to be_an_instance_of(Time)
-      end
-    end
-
-    context 'when given :utc_to_local and a DateTime' do
-      it 'returns a DateTime' do
-        expect(subject.send(:convert_with_timezone, :utc_to_local, utc_datetime)).to be_an_instance_of(DateTime)
-      end
-    end
-
-    context 'when given :utc_to_local and a String' do
-      it 'returns a DateTime' do
-        expect(subject.send(:convert_with_timezone, :utc_to_local, utc_string)).to be_an_instance_of(DateTime)
-      end
-    end
-
-    describe 'converts local time to UTC' do
-      context 'when given an ISO8601 date string' do
-        it { expect(subject.send(:convert_with_timezone, :local_to_utc, local_string)).to eq(utc_datetime) }
-      end
-
-      context 'when given a Date' do
-        it { expect(subject.send(:convert_with_timezone, :local_to_utc, date)).to eq(date) }
-      end
-
-      context 'when given a local Time' do
-        it { expect(time_to_s(subject.send(:convert_with_timezone, :local_to_utc, local_time))).to eq(time_to_s(utc_time)) }
-      end
-
-      context 'when given a local DateTime' do
-        it { expect(subject.send(:convert_with_timezone, :local_to_utc, local_datetime)).to eq(utc_datetime) }
-      end
-    end
-
-    describe 'converts UTC time to local' do
-      context 'when given an ISO8601 date string' do
-        it { expect(subject.send(:convert_with_timezone, :utc_to_local, utc_string)).to eq(local_datetime) }
-      end
-
-      context 'when given a Date' do
-        it { expect(subject.send(:convert_with_timezone, :utc_to_local, date)).to eq(date) }
-      end
-
-      context 'when given a local Time' do
-        it { expect(time_to_s(subject.send(:convert_with_timezone, :utc_to_local, utc_time))).to eq(time_to_s(local_time)) }
-      end
-
-      context 'when given a local DateTime' do
-        it { expect(subject.send(:convert_with_timezone, :utc_to_local, utc_datetime)).to eq(local_datetime) }
-      end
-    end
-  end
-
-  describe '#iso8601_with_offset' do
-    context 'when given nil' do
-      it 'returns nil' do
-        expect(subject.send(:iso8601_with_offset, nil)).to be_nil
-      end
-    end
-
-    describe 'appends correct ISO8601 timezone offset string' do
-      context 'when UTC' do
-        it { expect(utc_timezone.send(:iso8601_with_offset, utc_datetime)).to match(/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}Z$/) }
-      end
-
-      context 'when timezone offset is negative' do
-        it { expect(subject.send(:iso8601_with_offset, utc_datetime)).to match(/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}-07:00$/) }
-      end
-
-      context 'when timezone offset is positive' do
-        it { expect(positive_timezone.send(:iso8601_with_offset, utc_datetime)).to match(/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\+07:00$/) }
-      end
-    end
-  end
-end