hoodoo 2.12.2 → 2.12.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97098d14a63ca3169567bec32d623914a8e04389c0b26a1c513ccfcd3069e101
-  data.tar.gz: 0d673e879ca169f1dbcecd0d1c03bba5c8ec138f377abe99fc7aeccb3c39713d
+  metadata.gz: 430542c918e33830c23d09b1d4d6116f9d948bdca2d43f60c7b65c3a6d8be4f9
+  data.tar.gz: add79127d4fcc1ffa7a99a83c59bcdc47f6a766ce27c96fe3bd9f18f07874f8e
 SHA512:
-  metadata.gz: a626927fcbd049c377698fe423550c78cd2feaf1225a54281e63dcc16cfa61093f7d03fbadfa01ef9739ca6987e6a1737fc0e29460a0734ee01536311479dd27
-  data.tar.gz: 056a00f6fb6e7d171a3228d20e931f27e4e95aad9c5813dc91999666e1472b2f379964d87edf34e40adb2bfcb0692bd33fa0db091a6244a25c35b57297abde1e
+  metadata.gz: 1464c30acc087565f5c609ce1fbf6f9048dd9c3f995f2094ecdf7e6328b43d2c952e013feec8550ba253c820f0fd70946d52b40e1a57a2ecdf98138ba4a8a0a0
+  data.tar.gz: 5bfbf36ce4b624de24ef07bd64ba12462e471e3755ee23ce891370535e63382b986efdd2716a7caf25d365d36e8a800cad46c371935d59dbaf9384210b56099b

data/lib/hoodoo/communicators/pool.rb

@@ -9,6 +9,8 @@
 #           15-Dec-2014 (ADH): Created.
 ########################################################################
 
+require 'pp'
+
 module Hoodoo
   module Communicators
 
@@ -151,7 +153,7 @@ module Hoodoo
             begin
               communicator.communicate( object )
             rescue => exception
-              handle_exception( exception, communicator )
+              handle_exception( exception, communicator, object )
             end
 
           else
@@ -333,6 +335,7 @@ module Hoodoo
           #
           loop do
 
+            obj = nil
             # Exception handler block.
             #
             begin
@@ -342,20 +345,23 @@ module Hoodoo
               #
               loop do
                 entry = work_queue.shift() # ".shift" => FIFO, ".pop" would be LIFO
+                obj = nil
 
                 if entry.terminate?
                   ::Thread.exit
                 elsif entry.sync?
+
                   sync_queue << :sync
                 elsif entry.dropped?
                   communicator.dropped( entry.dropped )
                 else
+                  obj = entry.payload
                   communicator.communicate( entry.payload )
                 end
               end
 
             rescue => exception
-              handle_exception( exception, communicator )
+              handle_exception( exception, communicator, obj )
 
             end
           end
@@ -453,12 +459,14 @@ module Hoodoo
       #
       # +exception+::    Exception (or Exception subclass) instance to print.
       # +communicator+:: Communicator instance that raised the exception.
+      # +obj+::          Parameter passed to the communicator subclass instance
+      #                  #communicate methods
       #
-      def handle_exception( exception, communicator )
+      def handle_exception( exception, communicator, obj )
         begin
           report = "Communicator class #{ communicator.class.name } raised exception '#{ exception }': #{ exception.backtrace }"
           $stderr.puts( report )
-
+          pp( obj, $stderr )
         rescue
           # If the above fails then everything else is probably about to
           # collapse, but optimistically try to ignore the error and keep

data/lib/hoodoo/presenters/base.rb

@@ -90,12 +90,16 @@ module Hoodoo
       #                were used to create the Session under which the
       #                resource instance was created. Absent if omitted.
       #
+      # +updated_at+:: Optional Date/Time of instance update. This is a Ruby
+      #                DateTime instance or similar, _NOT_ a string!
+      #
       def self.render( data,
                        uuid       = nil,
                        created_at = nil,
                        language   = 'en-nz',
-                       created_by = nil )
-
+                       created_by = nil,
+                       updated_at = nil
+                      )
         target = {}
         data   = data || {}
 
@@ -126,6 +130,7 @@ module Hoodoo
             'created_at' => Hoodoo::Utilities.standard_datetime( created_at.to_datetime )
           } )
 
+          target[ 'updated_at' ] = Hoodoo::Utilities.standard_datetime( updated_at.to_datetime ) unless updated_at.nil?
           target[ 'created_by' ] = created_by unless created_by.nil?
           target[ 'language'   ] = language if self.is_internationalised?()
 
@@ -167,6 +172,9 @@ module Hoodoo
       # +created_at+::   Same as the +created_at+ parameter to ::render, except
       #                  mandatory.
       #
+      # +updated_at+::   Optional value expressing the time the resource was last
+      #                  updated.
+      #
       # +created_by+::   Optional fingerprint of the Caller whose credentials
       #                  were used to create the Session under which the
       #                  resource instance was created.
@@ -194,13 +202,14 @@ module Hoodoo
       def self.render_in( context, data, options = {} )
         uuid         = options[ :uuid         ]
         created_at   = options[ :created_at   ]
+        updated_at   = options[ :updated_at   ]
         created_by   = options[ :created_by   ]
         language     = options[ :language     ] || context.request.locale
         secured_with = options[ :secured_with ]
         embeds       = options[ :embeds       ]
         references   = options[ :references   ]
 
-        target = self.render( data, uuid, created_at, language, created_by )
+        target = self.render( data, uuid, created_at, language, created_by, updated_at )
 
         if defined?( ::ActiveRecord ) && secured_with.is_a?( ::ActiveRecord::Base )
           result_hash     = {}
@@ -251,6 +260,9 @@ module Hoodoo
           created_by = data[ :created_by ]
           common_fields[ 'created_by' ] = created_by unless created_by.nil?
 
+          updated_at = data[ :updated_at ]
+          common_fields[ 'updated_at' ] = updated_at unless updated_at.nil?
+
           if self.is_internationalised?
             common_fields[ 'internationalised' ] = data[ 'internationalised' ]
             Hoodoo::Presenters::CommonResourceFields.get_schema.properties[ 'language' ].required = true

data/lib/hoodoo/presenters/common_resource_fields.rb

@@ -18,6 +18,7 @@ module Hoodoo
       schema do
         uuid     :id,         :required => true
         datetime :created_at, :required => true
+        datetime :updated_at, :required => false
         text     :kind,       :required => true
         text     :language
 

data/lib/hoodoo/presenters/types/hash.rb

@@ -62,7 +62,7 @@ module Hoodoo
         # If an explicit type is given, use that. Otherwise, default to Field
         # if no block is given, or Object is a block is given.
         #
-        value_klass = !options[:type].blank? ? type_option_to_class( options.delete( :type ) ) :
+        value_klass = !(options[:type].nil? || options[:type] == '') ? type_option_to_class( options.delete( :type ) ) :
                         (block_given? ? Hoodoo::Presenters::Object : Hoodoo::Presenters::Field)
 
         # If we're defining specific keys and some of those keys have fields

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

@@ -132,12 +132,14 @@ module Hoodoo; module Services
     MAXIMUM_PAYLOAD_SIZE = 1048576 # 1MB Should Be Enough For Anyone
 
     # Maximum *logged* payload (inbound data) size.
+    # Keep consistent with max payload size so data is not lost from the logs.
     #
-    MAXIMUM_LOGGED_PAYLOAD_SIZE = 1024
+    MAXIMUM_LOGGED_PAYLOAD_SIZE = MAXIMUM_PAYLOAD_SIZE
 
     # Maximum *logged* response (outbound data) size.
+    # Keep consistent with max payload size so data is not lost from the logs.
     #
-    MAXIMUM_LOGGED_RESPONSE_SIZE = 1024
+    MAXIMUM_LOGGED_RESPONSE_SIZE = MAXIMUM_PAYLOAD_SIZE
 
     # The default test session; a Hoodoo::Services::Session instance with the
     # following characteristics:

data/lib/hoodoo/version.rb

@@ -12,11 +12,11 @@ module Hoodoo
   # The Hoodoo gem version. If this changes, be sure to re-run
   # <tt>bundle install</tt> or <tt>bundle update</tt>.
   #
-  VERSION = '2.12.2'
+  VERSION = '2.12.7'
 
   # The Hoodoo gem date. If this changes, be sure to re-run
   # <tt>bundle install</tt> or <tt>bundle update</tt>.
   #
-  DATE = '2019-07-11'
+  DATE = '2021-02-12'
 
 end

data/spec/presenters/base_spec.rb

@@ -362,7 +362,8 @@ describe '#schema' do
           Hoodoo::UUID.generate,
           Time.now,
           'en-gb',
-          Hoodoo::UUID.generate
+          Hoodoo::UUID.generate,
+          Time.now
         )
 
         expect(Hoodoo::Data::Resources::World.validate(rendered, true).errors).to eq([])
@@ -707,6 +708,7 @@ describe '#schema' do
           'id' => @uuid,
           'kind' => 'World',
           'created_at' => Hoodoo::Utilities.standard_datetime( @time ),
+          'updated_at' => Hoodoo::Utilities.standard_datetime( @time ),
           'language' => 'en-gb',
           'errors_id' => @input['errors_id'],
           'test_tags' => 'foo,bar,baz',
@@ -729,7 +731,9 @@ describe '#schema' do
             @input,
             @uuid,
             @time,
-            'en-gb'
+            'en-gb',
+            nil,
+            @time
           )
         ).to( eq( @output ) )
       end
@@ -744,7 +748,8 @@ describe '#schema' do
             @uuid,
             @time,
             'en-gb',
-            fingerprint
+            fingerprint,
+            @time
           )
         ).to( eq( @output ) )
       end

data/spec/presenters/common_resource_fields_spec.rb

@@ -6,13 +6,15 @@ describe Hoodoo::Presenters::CommonResourceFields do
 
     expect(schema.is_internationalised?()).to eq(false)
 
-    expect(schema.properties.count).to eq(7)
+    expect(schema.properties.count).to eq(8)
 
     expect(schema.properties['id']).to be_a(Hoodoo::Presenters::UUID)
     expect(schema.properties['id'].required).to eq(true)
     expect(schema.properties['id'].resource).to be_nil
     expect(schema.properties['created_at']).to be_a(Hoodoo::Presenters::DateTime)
     expect(schema.properties['created_at'].required).to eq(true)
+    expect(schema.properties['updated_at']).to be_a(Hoodoo::Presenters::DateTime)
+    expect(schema.properties['updated_at'].required).to eq(false)
     expect(schema.properties['kind']).to be_a(Hoodoo::Presenters::Text)
     expect(schema.properties['kind'].required).to eq(true)
     expect(schema.properties['language']).to be_a(Hoodoo::Presenters::Text)

data/spec/services/services/response_spec.rb

@@ -160,7 +160,7 @@ describe Hoodoo::Services::Response do
       expected = JSON.generate({})
       expect(status).to eq(200)
       expect(headers).to eq({'Content-Length' => expected.length.to_s})
-      expect(body.body).to eq([expected])
+      expect(body).to eq([expected])
     end
 
     it 'should return header data correctly' do
@@ -172,7 +172,7 @@ describe Hoodoo::Services::Response do
       expected = JSON.generate({})
       expect(status).to eq(200)
       expect(headers).to eq({'X-Foo' => 'baz', 'X-Bar' => 'boo', 'Content-Length' => expected.length.to_s})
-      expect(body.body).to eq([expected])
+      expect(body).to eq([expected])
     end
 
     it 'should return error condition Rack data correctly' do
@@ -187,7 +187,7 @@ describe Hoodoo::Services::Response do
       expected = JSON.generate(errors_hash)
       expect(status).to eq(422) # From the first error we stored, not the second
       expect(headers).to eq({'Content-Length' => expected.length.to_s})
-      expect(body.body).to eq([expected])
+      expect(body).to eq([expected])
     end
 
     it 'should return non-error condition Rack data correctly with a Hash body' do
@@ -199,7 +199,7 @@ describe Hoodoo::Services::Response do
       expected = JSON.generate(response_hash)
       expect(status).to eq(200) # From the first error we stored, not the second
       expect(headers).to eq({'Content-Length' => expected.length.to_s})
-      expect(body.body).to eq([expected])
+      expect(body).to eq([expected])
     end
 
     it 'returns non-error condition Rack data correctly with an Array body' do
@@ -211,7 +211,7 @@ describe Hoodoo::Services::Response do
       expected = JSON.generate({'_data' => response_array})
       expect(status).to eq(200) # From the first error we stored, not the second
       expect(headers).to eq({'Content-Length' => expected.length.to_s})
-      expect(body.body).to eq([expected])
+      expect(body).to eq([expected])
     end
 
     it 'returns non-error condition Rack data correctly with a dataset size' do
@@ -223,7 +223,7 @@ describe Hoodoo::Services::Response do
       expected = JSON.generate( { '_data' => response_array, '_dataset_size' => response_array.count } )
       expect( status    ).to eq( 200 )
       expect( headers   ).to eq( { 'Content-Length' => expected.length.to_s } )
-      expect( body.body ).to eq( [ expected ] )
+      expect( body ).to eq( [ expected ] )
     end
 
     it 'returns non-error condition Rack data correctly with an estimated dataset size' do
@@ -235,7 +235,7 @@ describe Hoodoo::Services::Response do
       expected = JSON.generate( { '_data' => response_array, '_estimated_dataset_size' => response_array.count } )
       expect( status    ).to eq( 200 )
       expect( headers   ).to eq( { 'Content-Length' => expected.length.to_s } )
-      expect( body.body ).to eq( [ expected ] )
+      expect( body ).to eq( [ expected ] )
     end
 
     it 'returns non-error condition Rack data correctly with both an accurate and an estimated dataset size' do
@@ -252,7 +252,7 @@ describe Hoodoo::Services::Response do
 
       expect( status    ).to eq( 200 )
       expect( headers   ).to eq( { 'Content-Length' => expected.length.to_s } )
-      expect( body.body ).to eq( [ expected ] )
+      expect( body ).to eq( [ expected ] )
     end
 
     it 'should allow pre-encoded strings in the body' do
@@ -261,7 +261,7 @@ describe Hoodoo::Services::Response do
       status, headers, body = @r.for_rack
 
       expect(status).to eq(200)
-      expect(body.body).to eq(['Hello World!'])
+      expect(body).to eq(['Hello World!'])
     end
 
     it 'should raise an exception when the body is in an unsupported format' do

data/spec/utilities/utilities_spec.rb

@@ -604,7 +604,7 @@ describe Hoodoo::Utilities do
     end
 
     after :each do
-      @old_tz.blank? ? ENV.delete( 'TZ' ) : ENV[ 'TZ' ] = @old_tz
+      (@old_tz.nil? || @old_tz == '') ? ENV.delete( 'TZ' ) : ENV[ 'TZ' ] = @old_tz
     end
 
     it 'accepts a non-UTC Time and renders a UTC date-time' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hoodoo
 version: !ruby/object:Gem::Version
-  version: 2.12.2
+  version: 2.12.7
 platform: ruby
 authors:
 - Loyalty New Zealand
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-11 00:00:00.000000000 Z
+date: 2021-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -184,28 +184,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: 5.2.4.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: 5.2.4.3
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: 5.2.4.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: 5.2.4.3
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
@@ -598,8 +598,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.2.9
 signing_key: 
 specification_version: 4
 summary: Opinionated APIs