hoodoo 1.5.1 → 1.5.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MDM2MDNlMzc0OTRiNzc1YzkyNjExODg4YTVlZWE5YmViOTMzMzcxNw==
+    ODRjNTI3Y2YyMGU1NThkYTVlNmI0YzZjMzJiNzE3MDg3NGU1Zjg4OQ==
   data.tar.gz: !binary |-
-    ZmFhZTRmYjU1NDg4YWE2NDM3NjU0OGIxNDFmNDJmNDAzYjEwNDIxOA==
+    ZTljMjA0NWU4ZTY0NjU4OGNiNTg5NDBiNzU5OWU4ZTA2MmYwNzJjNQ==
 SHA512:
   metadata.gz: !binary |-
-    ZTI1YTcyMDE1ZjI2YWI0ZjRhNTRhNmY5MzgwM2FiZDY5YjYwYWVlZTQ0YjBi
-    NjY1ODA5ZTdiMTc0MjZmZmJjZjAwNDRmY2IwNzU3OGMzMmI2NDA1NWYyZmY4
-    MjA3YTQxMWYzNzg2MjFkYjgyNGVmNzY4NjM3MDhhZDYzM2E0YTM=
+    YWI1MDQwNzgzMjVmMTExM2JmM2QwYTI2YmI1OWU1ZjM2ZmE3ZWVkZWViMmE0
+    MzBiN2MxYThiYzNlYjcyY2ZlNmY0YmEzNzg4NjIwMDQyYWQ5ZmUwOWMzZWJj
+    YjkxMGNjNDA2MjdmM2FhODg0OWZkNzUwOGJkNmIyNTQ5YjQ0N2U=
   data.tar.gz: !binary |-
-    ZjYwMjFmNmI0YTlhNDMzMGNhNTlmYzcyYjE2YTY3M2ZjMzI1MDJhY2U0MTU1
-    NDU4ODE0MDcyNzc2Y2FlOTJhYWQyYjUyYjEyZTA2NDFiZTBmNzJiOTJkYWU0
-    Mjg3ZGUwZTZlOGNlMjZmMDJjZjAyNzgyMDE1MzNhMmNiYTYxOTE=
+    YzUzY2M0M2U4OWMyNWY1ZGQzYjU5YjAwM2EwZjY2OTU4ZDA0NTc1OThmZDI2
+    ODVhMTFjZDkwYTEwOTZhYzk1Zjk5MzAyMzRlY2FjOTlmZmI0NGIxZDAwN2E5
+    MmIwNDMwYTNiZDY5NTc5YjgzNzA1OTk4ZTQ2ZmZmMzNlZDJmMjA=

data/lib/hoodoo/active/active_record/error_mapping.rb

@@ -92,7 +92,7 @@ module Hoodoo
       #       model         = SomeModel.new
       #       model.param_1 = 'something based on inbound creation data'
       #
-      #       unless model.persist_in( context ) === :success
+      #       unless model.persist_in( context ).equal?( :success )
       #         context.response.add_errors( model.platform_errors )
       #         return
       #       end
@@ -323,7 +323,7 @@ module Hoodoo
             reached_field = field
           end
 
-          if reached_field === fields.last
+          if reached_field == fields.last
             attribute_name  = leaf_field
             target_instance = leaf_instance
           end

data/lib/hoodoo/active/active_record/manually_dated.rb

@@ -611,6 +611,9 @@ module Hoodoo
         #                +assign_attributes+ method) in order to perform the
         #                update. If omitted, +context.request.body+ is used.
         #
+        # If both +ident+ _and_ +attributes+ are supplied then the first
+        # parameter providing +context+ may be +nil+.
+        #
         # +scope+::      ActiveRecord::Relation instance providing the scope
         #                to use for database locks and acquiring the record
         #                to update. Defaults to #acquisition_scope for the

data/lib/hoodoo/active/active_record/writer.rb

@@ -94,7 +94,7 @@ module Hoodoo
       #
       #       # ...maybe make other changes to model_instance, then...
       #
-      #       unless model_instance.persist_in( context ) === :success
+      #       unless model_instance.persist_in( context ).equal?( :success )
       #
       #         # Error condition. If you're using the error handler mixin
       #         # in Hoodoo::ActiveRecord::ErrorMapping, do this:

data/lib/hoodoo/client/endpoint/endpoint.rb

@@ -264,7 +264,7 @@ module Hoodoo
         #            Hoodoo::Services::Middleware::ALLOWED_ACTIONS.
         #
         def response_class_for( action )
-          return action === :list ? Hoodoo::Client::AugmentedArray : Hoodoo::Client::AugmentedHash
+          return action.equal?( :list ) ? Hoodoo::Client::AugmentedArray : Hoodoo::Client::AugmentedHash
         end
 
         # Utility method to aid subclass authors. Not usually overridden.

data/lib/hoodoo/client/endpoint/endpoints/auto_session.rb

@@ -128,26 +128,31 @@ module Hoodoo
 
             if @session_endpoint.session_id.nil?
               session_creation_result = acquire_session_for( action )
-              return session_creation_result unless session_creation_result.nil?
+              return session_creation_result unless session_creation_result.equal?( :success )
             else
               @wrapped_endpoint.session_id = @session_endpoint.session_id
             end
 
-            result = @wrapped_endpoint.send( action, *args )
+            result      = @wrapped_endpoint.send( action, *args )
+            bad_session = result.platform_errors.has_errors? &&
+                          result.platform_errors.errors.find do | error_hash |
+                            error_hash[ 'code' ] == 'platform.invalid_session'
+                          end
 
-            if result.platform_errors.has_errors? &&
-               result.platform_errors.errors.size == 1 &&
-               result.platform_errors.errors[ 0 ][ 'code' ] == 'platform.invalid_session'
-
-              session_creation_result = acquire_session_for( action )
-              return session_creation_result unless session_creation_result.nil?
-              return @wrapped_endpoint.send( action, *args )
-            else
+            if bad_session == false
               return result
+            else
+              session_creation_result = acquire_session_for( action )
+
+              if session_creation_result.equal?( :success )
+                return @wrapped_endpoint.send( action, *args )
+              else
+                return session_creation_result
+              end
             end
           end
 
-          # Acquire a sessino using the configured session endpoint. If this
+          # Acquire a session using the configured session endpoint. If this
           # fails, the failure result is returned. If it seems to succeed but
           # a session ID cannot be found, an internal 'generic.malformed'
           # result is generated and returned.
@@ -156,11 +161,12 @@ module Hoodoo
           # action at hand - an augmented array for lists, else an augmented
           # hash. It can be returned directly up to the calling layer.
           #
-          # Returns +nil+ if all goes well; #session_id will be updated.
+          # Returns +:success+ if all goes well; #session_id will be updated.
           #
           # +action+:: As given to #auto_retry.
           #
           def acquire_session_for( action )
+
             session_creation_result = @session_endpoint.create(
               'caller_id'             => @caller_id,
               'authentication_secret' => @caller_secret
@@ -184,7 +190,7 @@ module Hoodoo
               return data
             else
               @wrapped_endpoint.session_id = @session_endpoint.session_id
-              return nil
+              return :success
             end
           end
 

data/lib/hoodoo/client/endpoint/endpoints/http_based.rb

@@ -292,7 +292,7 @@ module Hoodoo
                 when 200
                   data.platform_errors.add_error(
                     'platform.fault',
-                    :message   => 'Could not parse body data returned from inter-resource call despite receiving HTTP status code 200',
+                    :message   => 'Could not parse retrieved body data despite receiving HTTP status code 200',
                     :reference => { :exception => RuntimeError.new( "#{ body }" ) }
                   )
                 when 204

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

@@ -72,7 +72,7 @@ module Hoodoo; module Services; class Middleware
       # Returns +true+ if Hoodoo has previously called #using_test_session.
       #
       def using_test_session?
-        @using_test_session === true
+        @using_test_session == true
       end
 
       # Create a new Interaction instance, acquiring a new interaction

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

@@ -169,7 +169,7 @@ module Hoodoo; module Services
       } ).to_h,
       'scoping'        => {
         'authorised_http_headers' => Hoodoo::Client::Headers::HEADER_TO_PROPERTY.map() { | key, sub_hash |
-          sub_hash[ :header ] if sub_hash[ :secured ] === true
+          sub_hash[ :header ] if sub_hash[ :secured ] == true
         }.compact
       }
     } )
@@ -2318,7 +2318,7 @@ module Hoodoo; module Services
         extension = match_data[ 2 ]
 
       elsif ( match_data[ 1 ] == '/' )
-        remaining_path_components = match_data[ 2 ].split( '/' ).reject { | str | str === '' }
+        remaining_path_components = match_data[ 2 ].split( '/' ).reject { | str | str == '' }
         last_item                 = remaining_path_components.last
 
         unless ( last_item.nil? )

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

@@ -179,7 +179,7 @@ module Hoodoo
                                                        self.caller_version,
                                                        mclient )
 
-          return result unless result === :ok
+          return result unless result.equal?( :ok )
 
           # Must set this before saving, even though the delay between
           # setting this value and Memcached actually saving the value

data/lib/hoodoo/utilities/utilities.rb

@@ -125,7 +125,7 @@ module Hoodoo
       # http://stackoverflow.com/questions/9381553/ruby-merge-nested-hash
       #
       merger = proc { | key, v1, v2 |
-        Hash === v1 && Hash === v2 ? v1.merge( v2, &merger ) : v2.nil? ? v1 : v2
+        v1.is_a?( Hash ) && v2.is_a?( Hash ) ? v1.merge( v2, &merger ) : v2.nil? ? v1 : v2
       }
 
       return target_hash.merge( inbound_hash, &merger )

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.5.1'
+  VERSION = '1.5.2'
 
 end

data/spec/client/client_spec.rb

@@ -239,9 +239,9 @@ describe Hoodoo::Client do
   # (or not) and a dated-at date/time (or not) given to the Endpoint.
   #
   def set_vars_for( opts )
-    @locale              = rand( 2 ) == 0 ? nil : SecureRandom.urlsafe_base64(2)
-    @expected_locale     = @locale.nil? ? 'en-nz' : @locale.downcase
-    @client              = Hoodoo::Client.new( opts.merge( :locale => @locale ) )
+    @locale          = rand( 2 ) == 0 ? nil : SecureRandom.urlsafe_base64(2)
+    @expected_locale = @locale.nil? ? 'en-nz' : @locale.downcase
+    @client          = Hoodoo::Client.new( opts.merge( :locale => @locale ) )
 
     endpoint_opts = {}
 
@@ -833,6 +833,10 @@ describe Hoodoo::Client do
   ##############################################################################
 
   context 'with auto-session' do
+    before :each do
+      Hoodoo::Services::Middleware.set_test_session( nil )
+    end
+
     shared_examples Hoodoo::Client do
       it '(public actions allowed)' do
         mock_ident = Hoodoo::UUID.generate()
@@ -910,6 +914,42 @@ describe Hoodoo::Client do
         expect( result.platform_errors.has_errors? ).to eq( false )
       end
 
+      it 'automatically retries with more than just "platform.invalid_session" present' do
+
+        # When we list first, Client has no session so will acquire one. The
+        # wrapping endpoint is asked to list, it pushes that through the
+        # session mechanism, gets the session and then calls the wrapped
+        # endpoint.
+
+        expect( @endpoint ).to receive( :acquire_session_for ).once.with( :list ).and_call_original
+        expect( @endpoint.instance_variable_get( '@wrapped_endpoint' ) ).to receive( :list ).once.and_call_original
+
+        result = @endpoint.list()
+        expect( result.platform_errors.has_errors? ).to eq( false )
+
+        # When we list the second time, the wrapping endpoint has a session
+        # but we fake a complex 'invalid session' response from the wrapped
+        # endpoint, as if the session had (say) expired at the server end,
+        # but other errors were being reported too.
+
+        expect( @endpoint.instance_variable_get( '@wrapped_endpoint' ) ).to receive( :list ).once do
+          array = Hoodoo::Client::AugmentedArray.new
+          array.platform_errors.add_error( 'platform.forbidden' )
+          array.platform_errors.add_error( 'platform.invalid_session' )
+          array.platform_errors.add_error( 'platform.method_not_allowed' )
+          array
+        end
+
+        # This means we expect another session acquisition attempt, which is
+        # allowed to succeed, then the wrapped endpoint should be called.
+
+        expect( @endpoint ).to receive( :acquire_session_for ).once.with( :list ).and_call_original
+        expect( @endpoint.instance_variable_get( '@wrapped_endpoint' ) ).to receive( :list ).once.and_call_original
+
+        result = @endpoint.list()
+        expect( result.platform_errors.has_errors? ).to eq( false )
+      end
+
       it 'handles errors from the session resource' do
         expect_any_instance_of( RSpecClientTestSessionImplementation ).to receive( :create ).and_raise( "boo!" )
 
@@ -928,6 +968,23 @@ describe Hoodoo::Client do
         Hoodoo::Services::Middleware.set_test_session( nil )
 
         result = @endpoint.list()
+
+        expect( result.platform_errors.has_errors? ).to eq( true )
+        expect( result.platform_errors.errors[ 0 ][ 'code' ] ).to eq( 'generic.malformed' )
+      end
+
+      it 'handles malformed sessions when retrying' do
+        result = @endpoint.list()
+        expect( result.platform_errors.has_errors? ).to eq( false )
+
+        Hoodoo::Services::Middleware.set_test_session( nil )
+
+        expect_any_instance_of( RSpecClientTestSessionImplementation ).to receive( :create ) { | ignored, context |
+          context.response.body = { 'not' => 'a session' }
+        }
+
+        result = @endpoint.list()
+
         expect( result.platform_errors.has_errors? ).to eq( true )
         expect( result.platform_errors.errors[ 0 ][ 'code' ] ).to eq( 'generic.malformed' )
       end
@@ -954,10 +1011,6 @@ describe Hoodoo::Client do
       end
     end
 
-    before :each do
-      Hoodoo::Services::Middleware.set_test_session( nil )
-    end
-
     context 'and by DRb' do
       before :each do
         set_vars_for(

data/spec/services/middleware/middleware_exotic_communication_spec.rb

@@ -456,7 +456,7 @@ describe Hoodoo::Services::Middleware do
         expect( errors[ 'errors' ][ 0 ] ).to_not be_nil
 
         expect( errors[ 'errors' ][ 0 ][ 'code'      ] ).to eq( 'platform.fault' )
-        expect( errors[ 'errors' ][ 0 ][ 'message'   ] ).to eq( 'Could not parse body data returned from inter-resource call despite receiving HTTP status code 200' )
+        expect( errors[ 'errors' ][ 0 ][ 'message'   ] ).to eq( 'Could not parse retrieved body data despite receiving HTTP status code 200' )
         expect( errors[ 'errors' ][ 0 ][ 'reference' ] ).to eq( "#{ bad_body_data }" )
       end
     end

data/spec/services/middleware/middleware_multi_remote_spec.rb

@@ -1091,7 +1091,7 @@ describe Hoodoo::Services::Middleware do
 
       result = JSON.parse(last_response.body)
       expect(result['errors'][0]['code']).to eq('platform.fault')
-      expect(result['errors'][0]['message']).to eq('Could not parse body data returned from inter-resource call despite receiving HTTP status code 200')
+      expect(result['errors'][0]['message']).to eq('Could not parse retrieved body data despite receiving HTTP status code 200')
     end
 
     context 'X-Assume-Identity-Of' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hoodoo
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.2
 platform: ruby
 authors:
 - Loyalty New Zealand
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-09 00:00:00.000000000 Z
+date: 2016-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kgio