hoodoo 1.16.1 → 1.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c9903a7189fc118fdbc3deae1277da2602c64b9
-  data.tar.gz: b5b04be6a1c82e1958cf70863270a282256a51bc
+  metadata.gz: a11d0bed3dc977f5aab127f4ed139e715a9f2431
+  data.tar.gz: 42706658a33e920162e734ad3f0891a8e703e845
 SHA512:
-  metadata.gz: 333ed5e667ade4ab94ee3f16dfb37e84351ab8678a09d5ffc325021b07e56e6bd3c95f820cec9ede6586c542de8abcad1746418f99e17c1ded693afb873efc51
-  data.tar.gz: 912f44dce0110b695c2815f969aa3a6a00e5ad88caf48e65578cb6097ef45f91446b59748523a8d8a65770b0d60f203f462ad5b479382feee4058e5e7a96d2a7
+  metadata.gz: d3f795bff6b580fe090f46a624461fac52939941e18564074e68c37e5d3fc757c5da9a34efbbad6ce3c435e0701c021e07c8a157f77f0e268541bbe78180c1f9
+  data.tar.gz: f3fec8a2305e6c815d309c0442724f4fee7a6541606058421a1e473797f50e666dbe40b7540cc34cbb12baa1e8af2cdaa2052c13601e69b182a303feca31bc7e

data/lib/hoodoo/logger/flattener_mixin.rb

@@ -29,7 +29,7 @@ module Hoodoo
       # return a single line string representing the "flattened" log data.
       #
       def flatten( log_level, component, code, data )
-        "#{ log_level.to_s.upcase } [#{ Time.now.iso8601( 6 ) }] #{ component } - #{ code }: #{ data.inspect }"
+        "#{ log_level.to_s.upcase } [#{ Hoodoo::Utilities.standard_datetime( Time.now ) }] #{ component } - #{ code }: #{ data.inspect }"
       end
     end
   end

data/lib/hoodoo/presenters/base.rb

@@ -114,7 +114,7 @@ module Hoodoo
           target.merge!( {
             'id'         => uuid,
             'kind'       => kind,
-            'created_at' => Time.parse( created_at.to_s ).utc.iso8601
+            'created_at' => Hoodoo::Utilities.standard_datetime( created_at.to_datetime )
           } )
 
           target[ 'language' ] = language if self.is_internationalised?()

data/lib/hoodoo/services/middleware/middleware.rb

@@ -160,7 +160,7 @@ module Hoodoo; module Services
     #
     DEFAULT_TEST_SESSION.from_h!( {
       'session_id'           => '01234567890123456789012345678901',
-      'expires_at'           => ( Time.now + 172800 ).utc.iso8601,
+      'expires_at'           => Hoodoo::Utilities.standard_datetime( Time.now + 172800 ),
       'caller_version'       => 1,
       'caller_id'            =>                  'c5ea12fb7f414a46850e73ee1bf6d95e',
       'caller_identity_name' =>                  'c5ea12fb7f414a46850e73ee1bf6d95e',

data/lib/hoodoo/services/services/session.rb

@@ -484,7 +484,7 @@ module Hoodoo
 
         ).each do | property |
           value = self.send( property )
-          hash[ property ] = value.iso8601() unless value.nil?
+          hash[ property ] = Hoodoo::Utilities.standard_datetime( value ) unless value.nil?
         end
 
         %w(

data/lib/hoodoo/utilities/utilities.rb

@@ -340,6 +340,16 @@ module Hoodoo
       return value.is_a?( ::Date ) && value
     end
 
+    # Returns an ISO 8601 String equivalent of the given Time, Date or
+    # DateTime instance as a full date-time with UTC timezone, with
+    # "standard high precision" (for rendeirng consistency), subject to
+    # Ruby port / OS support abilities. At the time of writing, 6 decimal
+    # places are included.
+    #
+    def self.standard_datetime( date_or_time_or_date_time )
+      date_or_time_or_date_time.to_time.utc.iso8601( 6 )
+    end
+
     # Returns an ISO 8601 String equivalent of the given Time or DateTime
     # instance, with nanosecond precision (subject to Ruby port / OS support).
     # This is nothing more than a standardised central interface on calling

data/lib/hoodoo/version.rb

@@ -12,6 +12,6 @@ module Hoodoo
   # The Hoodoo gem version. If this changes, ensure that the date in
   # "hoodoo.gemspec" is correct and run "bundle install" (or "update").
   #
-  VERSION = '1.16.1'
+  VERSION = '1.17.0'
 
 end

data/spec/active/active_record/secure_spec.rb

@@ -382,7 +382,7 @@ describe Hoodoo::ActiveRecord::Secure do
       expect(TestPresenterSecure.render_in(@context, data, options)).to eq({
         'id'           => u,
         'kind'         => 'TestPresenterSecure',
-        'created_at'   => t.iso8601,
+        'created_at'   => Hoodoo::Utilities.standard_datetime( t ),
         'language'     => 'en-nz',
         'three'        => 'default_three',
         'secured_with' => {
@@ -403,7 +403,7 @@ describe Hoodoo::ActiveRecord::Secure do
       expect(TestPresenterSecure.render_in(@context, data, options)).to eq({
         'id'           => u,
         'kind'         => 'TestPresenterSecure',
-        'created_at'   => t.iso8601,
+        'created_at'   => Hoodoo::Utilities.standard_datetime( t ),
         'language'     => 'en-nz',
         'three'        => 'default_three',
         'secured_with' => {
@@ -423,7 +423,7 @@ describe Hoodoo::ActiveRecord::Secure do
       expect(TestPresenterSecure.render_in(@context, data, options)).to eq({
         'id'           => u,
         'kind'         => 'TestPresenterSecure',
-        'created_at'   => t.iso8601,
+        'created_at'   => Hoodoo::Utilities.standard_datetime( t ),
         'language'     => 'en-nz',
         'three'        => 'default_three',
         'secured_with' => {

data/spec/client/client_spec.rb

@@ -28,10 +28,10 @@ class RSpecClientTestSessionImplementation < Hoodoo::Services::Implementation
     #
     context.response.set_resource(
       'id'         => session_id,
-      'created_at' => Time.now.utc.iso8601,
+      'created_at' => Hoodoo::Utilities.standard_datetime( Time.now ),
       'kind'       => 'RSpecClientTestSession',
       'caller_id'  => context.request.body[ 'caller_id' ],
-      'expires_at' => ( Time.now.utc + 24*60*60 ).iso8601
+      'expires_at' => Hoodoo::Utilities.standard_datetime( Time.now + 24 * 60 * 60 )
     )
   end
 end
@@ -153,7 +153,7 @@ class RSpecClientTestTargetImplementation < Hoodoo::Services::Implementation
                                 context.request.body.try( :[], 'id' ) ||
                                 Hoodoo::UUID.generate(),
 
-        'created_at'         => Time.now.utc.iso8601,
+        'created_at'         => Hoodoo::Utilities.standard_datetime( Time.now ),
         'kind'               => 'RSpecClientTestTarget',
         'language'           => context.request.locale,
 

data/spec/data/resources/caller_spec.rb

@@ -95,7 +95,7 @@ describe Hoodoo::Data::Resources::Caller do
     expect(json).to eq(
       {
         'id'         => id,
-        'created_at' => created_at.utc.iso8601,
+        'created_at' => Hoodoo::Utilities.standard_datetime( created_at ),
         'kind'       => 'Caller',
         "name"       => "Test Caller",
         "identity"   => {
@@ -144,7 +144,7 @@ describe Hoodoo::Data::Resources::Caller do
     expect(json).to eq(
       {
         'id'          => id,
-        'created_at'  => created_at.utc.iso8601,
+        'created_at'  => Hoodoo::Utilities.standard_datetime( created_at ),
         'kind'        => 'Caller',
         "identity"    => {},
         "permissions" => { "resources" => {} },

data/spec/presenters/base_spec.rb

@@ -681,7 +681,7 @@ describe '#schema' do
       )).to eq({
         'id' => uuid,
         'kind' => 'World',
-        'created_at' => time.utc.iso8601,
+        'created_at' => Hoodoo::Utilities.standard_datetime( time ),
         'language' => 'en-gb',
         'errors_id' => data['errors_id'],
         'test_tags' => 'foo,bar,baz',
@@ -797,7 +797,7 @@ describe '#schema' do
       expect(TestPresenter5.render_in(@con, data, options)).to eq({
         'id'         => u,
         'kind'       => 'TestPresenter5',
-        'created_at' => t.iso8601,
+        'created_at' => Hoodoo::Utilities.standard_datetime( t ),
         'language'   => 'de',
         'three'      => 'default_three'
       })
@@ -811,7 +811,7 @@ describe '#schema' do
       expect(TestPresenter5.render_in(@con, data, options)).to eq({
         'id'         => u,
         'kind'       => 'TestPresenter5',
-        'created_at' => t.iso8601,
+        'created_at' => Hoodoo::Utilities.standard_datetime( t ),
         'language'   => 'fr',
         'three'      => 'default_three'
       })
@@ -830,7 +830,7 @@ describe '#schema' do
       expect(TestPresenter5.render_in(@con, data, options)).to eq({
         'id'         => u,
         'kind'       => 'TestPresenter5',
-        'created_at' => t.iso8601,
+        'created_at' => Hoodoo::Utilities.standard_datetime( t ),
         'language'   => 'de',
         'three'      => 'default_three',
         '_embed'     => {
@@ -853,7 +853,7 @@ describe '#schema' do
       expect(TestPresenter5.render_in(@con, data, options)).to eq({
         'id'         => u,
         'kind'       => 'TestPresenter5',
-        'created_at' => t.iso8601,
+        'created_at' => Hoodoo::Utilities.standard_datetime( t ),
         'language'   => 'de',
         'three'      => 'default_three',
         '_reference' => {

data/spec/presenters/types/array_spec.rb

@@ -87,7 +87,7 @@ describe Hoodoo::Presenters::Array do
         'an_array' => [
           {},
           { 'an_integer' => 2 },
-          { 'a_datetime' => Time.now.iso8601 }
+          { 'a_datetime' => DateTime.now.iso8601 }
         ]
       }
 

data/spec/services/services/session_spec.rb

@@ -63,7 +63,7 @@ describe Hoodoo::Services::Session do
         'caller_id'      => '0987',
         'caller_version' => 2,
 
-        'created_at'     => s.created_at.iso8601,
+        'created_at'     => Hoodoo::Utilities.standard_datetime( s.created_at ),
 
         'identity'       => { 'foo' => 'foo', 'bar' => 'bar' },
         'scoping'        => { 'baz' => [ 'foo', 'bar', 'baz' ] },
@@ -81,8 +81,8 @@ describe Hoodoo::Services::Session do
         'caller_id'      => '0987',
         'caller_version' => 2,
 
-        'created_at'     => c.iso8601,
-        'expires_at'     => e.iso8601,
+        'created_at'     => Hoodoo::Utilities.standard_datetime( c ),
+        'expires_at'     => Hoodoo::Utilities.standard_datetime( e ),
 
         'identity'       => { 'foo' => 'foo', 'bar' => 'bar' },
         'scoping'        => { 'baz' => [ 'foo', 'bar', 'baz' ] },
@@ -94,8 +94,8 @@ describe Hoodoo::Services::Session do
       expect( s.session_id ).to eq( '1234' )
       expect( s.caller_id ).to eq( '0987' )
       expect( s.caller_version ).to eq( 2 )
-      expect( s.created_at ).to eq( Time.parse( c.iso8601 ) )
-      expect( s.expires_at ).to eq( Time.parse( e.iso8601 ) )
+      expect( s.created_at ).to eq( Time.parse( Hoodoo::Utilities.standard_datetime( c ) ) )
+      expect( s.expires_at ).to eq( Time.parse( Hoodoo::Utilities.standard_datetime( e ) ) )
       expect( s.identity.foo ).to eq( 'foo' )
       expect( s.identity.bar ).to eq( 'bar' )
       expect( s.scoping.baz ).to eq( [ 'foo', 'bar', 'baz' ] )
@@ -131,8 +131,8 @@ describe Hoodoo::Services::Session do
       s2 = described_class.new
       expect( s2.load_from_store!( s1.session_id ) ).to eq( :ok )
 
-      expect( s2.created_at ).to eq( Time.parse( s1.created_at.iso8601 ) )
-      expect( s2.expires_at ).to eq( Time.parse( s1.expires_at.iso8601 ) )
+      expect( s2.created_at ).to eq( Time.parse( Hoodoo::Utilities.standard_datetime( s1.created_at ) ) )
+      expect( s2.expires_at ).to eq( Time.parse( Hoodoo::Utilities.standard_datetime( s1.expires_at ) ) )
       expect( s2.session_id ).to eq( s1.session_id )
       expect( s2.memcached_host ).to be_nil
       expect( s2.caller_id ).to eq( s1.caller_id )
@@ -321,7 +321,7 @@ describe Hoodoo::Services::Session do
 
       expect( s ).to receive( :to_h ).and_wrap_original do | obj, args |
         h = obj.call( *args )
-        h[ 'expires_at' ] = ( Time.now - 1 ).utc.iso8601
+        h[ 'expires_at' ] = Hoodoo::Utilities.standard_datetime( Time.now - 1 )
         h
       end
 

data/spec/utilities/utilities_spec.rb

@@ -485,6 +485,38 @@ describe Hoodoo::Utilities do
     end
   end
 
+  describe '#standard_iso8601' do
+    before :each do
+      @old_tz = ENV[ 'TZ' ]
+      ENV[ 'TZ' ] = 'EST'
+    end
+
+    after :each do
+      @old_tz.blank? ? ENV.delete( 'TZ' ) : ENV[ 'TZ' ] = @old_tz
+    end
+
+    it 'accepts a non-UTC Time and renders a UTC date-time' do
+      now = Time.new( 2017, 7, 28, 8, 41, 15 ) + 0.123456789
+      iso = now.utc.iso8601( 6 )
+
+      expect( Hoodoo::Utilities.standard_datetime( now ) ).to eq( iso )
+    end
+
+    it 'accepts a non-UTC Date and renders a UTC date-time' do
+      now = Date.new( 2017, 7, 28 )
+      iso = now.to_time.utc.iso8601( 6 )
+
+      expect( Hoodoo::Utilities.standard_datetime( now ) ).to eq( iso )
+    end
+
+    it 'accepts a non-UTC DateTime and renders a UTC date-time' do
+      now = DateTime.new( 2017, 7, 28, 8, 41, 15 ) + 0.123456789
+      iso = now.to_time.utc.iso8601( 6 )
+
+      expect( Hoodoo::Utilities.standard_datetime( now ) ).to eq( iso )
+    end
+  end
+
   describe '#nanosecond_iso8601' do
     it 'should convert DateTime to a nanosecond precision String' do
       now  = DateTime.now()

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hoodoo
 version: !ruby/object:Gem::Version
-  version: 1.16.1
+  version: 1.17.0
 platform: ruby
 authors:
 - Loyalty New Zealand
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-11 00:00:00.000000000 Z
+date: 2017-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dalli