hoodoo 1.4.1 → 1.5.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Mjc4OGM2NmE0N2Y0Zjg1ZjIzNWIyM2IzMThhYTdjNjZhYzIwNjRmZQ==
+    MDhkYWM2MjczODEyMTY0ZmUzM2JmNTE2NDNhNDI0ODVmMzRiNjk2Mg==
   data.tar.gz: !binary |-
-    MDJjY2M3YzFhOTVkYmQ4NDNhMmM5ODFhMTVkNDU2ZjU1NTliMzE0ZA==
+    N2U4NzAwMTg2YTMwZWFmYjcxMmEwMjM2MWUwOGUxZjJjNTVlOWY3NA==
 SHA512:
   metadata.gz: !binary |-
-    OGY0YzZiM2RkOWY2MDlhM2U2OGYzMGZjZGJhYTEyNDk3NGU0YTZhZTRmYTA3
-    Nzk3YmJlMzdiNDNkZTM2NDc4ZGI5MDlkOWZlMDgyODU2NDQ2MGQ1MGFmYWZh
-    M2Q3ZGRjNGE2YzY0ZmFlY2U3NzkxNTJmZTI4OTNjNzVlNjA2N2U=
+    MWJlMThiNzJhMzQwMmJiNGUwMDJlNjc0ZTE5MTgyYTA5ZjU4MGQ4YzQ0Yzg2
+    M2VhODY0YTkwNmYxZDJjYjM5NzI3M2VlZTYwN2MxYjQ0ZGM3OTEzNjNiYjRl
+    MjE0YWQwOTIwZDJmMzUyMTVmODZlZDc1NWE5NjA5YTA3MDQxMDE=
   data.tar.gz: !binary |-
-    NTE3NTdhNjAxZTA0NmI3YWQ3OTNmNDgzMTliODVmZTI0NWRmYmE0YTBiZWNm
-    MjEyY2FiZTRjYTY4NDQ2ZmIyZDgyYjFiYzcwMTJhNWExNmVlZWQxMDYyYjM5
-    ZWU0N2UwZTRkNWYzNmMxNzhkNTEwMThjMzI2Y2ZmMjY2NGE5NWY=
+    OWNkYTUyNmY1MGJhYzNlNWY5NmZhNWZiZjc3NjhjODYwODAzMDY5NjRjZmQz
+    OGE3OTQ1NTNmYmRjOTA4ZTRmZTgyODNlMGMyZDQ4ZjViYjBhOGYwZGM5ODZl
+    OGFlMjIzMTc4YzJmM2ZlNTFhODZjMTVkYzQ3YTViMzg1NmVjYWI=

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

@@ -164,7 +164,7 @@ module Hoodoo
               http_message[ 'session_id' ] = self.session_id()
             end
 
-            amqp_response = self.alchemy().send_message_to_resource( http_message )
+            amqp_response = self.alchemy().send_request_to_resource( http_message )
 
             description_of_response              = DescriptionOfResponse.new
             description_of_response.action       = action

data/lib/hoodoo/middleware.rb

@@ -20,7 +20,6 @@ require 'hoodoo/presenters'
 # Middleware
 
 require 'hoodoo/services/middleware/rack_monkey_patch'
-require 'hoodoo/services/middleware/amqp_log_message'
 require 'hoodoo/services/middleware/amqp_log_writer'
 require 'hoodoo/services/middleware/interaction'
 require 'hoodoo/services/middleware/endpoints/inter_resource_remote'

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

@@ -70,13 +70,13 @@ module Hoodoo; module Services
         data[ :id ] ||= Hoodoo::UUID.generate()
 
         session = data[ :session ] || {}
-        message = Hoodoo::Services::Middleware::AMQPLogMessage.new( {
+        message = {
 
           :id             => data[ :id ],
           :level          => level,
           :component      => component,
           :code           => code,
-          :reported_at    => Time.now,
+          :reported_at    => Time.now.iso8601( 12 ),
 
           :data           => data,
 
@@ -84,9 +84,9 @@ module Hoodoo; module Services
           :caller_id      => session[ 'caller_id' ],
           :identity       => ( session[ 'identity' ] || {} ).to_h
 
-        } ).to_h()
+        }.to_json()
 
-        @alchemy.send_message_to_queue( @routing_key, message )
+        @alchemy.send_message_to_service( @routing_key, { "body" => message } )
       end
     end
 

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.4.1'
+  VERSION = '1.5.0'
 
 end

data/spec/services/middleware/amqp_log_writer_spec.rb

@@ -60,7 +60,7 @@ describe Hoodoo::Services::Middleware::AMQPLogWriter do
       level          = 'warn'
       component      = 'test_component'
       code           = 'test_code'
-      reported_at    = Time.now
+      reported_at    = Time.now.iso8601( 12 )
       id             = Hoodoo::UUID.generate
       interaction_id = Hoodoo::UUID.generate
       data           = {
@@ -83,8 +83,7 @@ describe Hoodoo::Services::Middleware::AMQPLogWriter do
         :identity       => Hoodoo::Utilities.stringify( @session.identity.to_h )
       }
 
-      expect( Hoodoo::Services::Middleware::AMQPLogMessage ).to receive( :new ).with( expected_hash ).and_return( {} )
-      expect( @alchemy ).to receive( :send_message_to_queue ).with( @queue, {} ).once
+      expect( @alchemy ).to receive( :send_message_to_service ).with( @queue, { "body" => expected_hash.to_json } ).once
 
       @logger.report( level, component, code, data )
     end

data/spec/services/middleware/middleware_exotic_communication_spec.rb

@@ -102,7 +102,7 @@ describe Hoodoo::Services::Middleware do
           mock_query[ 'filter' ] = URI.encode_www_form( mock_query[ 'filter' ] ) if ( mock_query[ 'filter' ].is_a?( ::Hash ) )
         end
 
-        expect( @mock_alchemy ).to receive( :send_message_to_resource ).once do | message |
+        expect( @mock_alchemy ).to receive( :send_request_to_resource ).once do | message |
           expect( message ).to eq( {
             'scheme'     => 'http',
             'verb'       => mock_method,

data/spec/services/middleware/middleware_logging_spec.rb

@@ -214,7 +214,7 @@ describe Hoodoo::Services::Middleware do
     it 'has the expected "development" mode loggers' do
       force_logging_to( 'development' )
 
-      expect_any_instance_of(FakeAlchemy).to receive(:send_message_to_queue).at_least(:once)
+      expect_any_instance_of(FakeAlchemy).to receive(:send_message_to_service).at_least(:once)
       spec_helper_silence_stdout() do
         get '/v1/test_log/hello', nil, { 'CONTENT_TYPE' => 'application/json; charset=utf-8' }
       end
@@ -228,7 +228,7 @@ describe Hoodoo::Services::Middleware do
     it 'has the expected "production" mode loggers' do
       force_logging_to( 'production' )
 
-      expect_any_instance_of(FakeAlchemy).to receive(:send_message_to_queue).at_least(:once)
+      expect_any_instance_of(FakeAlchemy).to receive(:send_message_to_service).at_least(:once)
       get '/v1/test_log/hello', nil, { 'CONTENT_TYPE' => 'application/json; charset=utf-8' }
 
       instances = Hoodoo::Services::Middleware.logger.instances

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hoodoo
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.5.0
 platform: ruby
 authors:
 - Loyalty New Zealand
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-25 00:00:00.000000000 Z
+date: 2016-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kgio
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -359,7 +359,6 @@ files:
 - lib/hoodoo/services/discovery/results/for_http.rb
 - lib/hoodoo/services/discovery/results/for_local.rb
 - lib/hoodoo/services/discovery/results/for_remote.rb
-- lib/hoodoo/services/middleware/amqp_log_message.rb
 - lib/hoodoo/services/middleware/amqp_log_writer.rb
 - lib/hoodoo/services/middleware/endpoints/inter_resource_local.rb
 - lib/hoodoo/services/middleware/endpoints/inter_resource_remote.rb
@@ -456,7 +455,6 @@ files:
 - spec/services/discovery/results/for_http_spec.rb
 - spec/services/discovery/results/for_local_spec.rb
 - spec/services/discovery/results/for_remote_spec.rb
-- spec/services/middleware/amqp_log_message_spec.rb
 - spec/services/middleware/amqp_log_writer_spec.rb
 - spec/services/middleware/endpoints/inter_resource_local_spec.rb
 - spec/services/middleware/endpoints/inter_resource_remote_spec.rb
@@ -585,7 +583,6 @@ test_files:
 - spec/services/discovery/results/for_http_spec.rb
 - spec/services/discovery/results/for_local_spec.rb
 - spec/services/discovery/results/for_remote_spec.rb
-- spec/services/middleware/amqp_log_message_spec.rb
 - spec/services/middleware/amqp_log_writer_spec.rb
 - spec/services/middleware/endpoints/inter_resource_local_spec.rb
 - spec/services/middleware/endpoints/inter_resource_remote_spec.rb

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

@@ -1,124 +0,0 @@
-########################################################################
-# File::    amqp_log_message.rb
-# (C)::     Loyalty New Zealand 2014
-#
-# Purpose:: Structured logging onto an AMQP-based queue, via the
-#           Alchemy Flux gem. This class just exists to rationalise
-#           any parameters inbound in order to generate a clean
-#           representation for Flux.
-#
-#           The middleware uses this to put log and error messages
-#           on the queue. Interested services use this to read such
-#           messages from the queue.
-# ----------------------------------------------------------------------
-#           20-Nov-2014 (ADH): Created.
-########################################################################
-
-module Hoodoo; module Services
-  class Middleware
-
-    # A representation of a log message placed on an AMQP-based queue.
-    # The primary expected communications interface is Alchemy Flux at
-    # the time of writing.
-    #
-    class AMQPLogMessage
-
-      # The Time +strftime+ formatter used for string conversions in this
-      # class.
-      #
-      TIME_FORMATTER = '%Y-%m-%d %H:%M:%S.%12N %Z'
-
-      # A UUID to assign to this log message. See Hoodoo::UUID::generate.
-      #
-      attr_accessor :id
-
-      # Logging level. See Hoodoo::Logger.
-      #
-      attr_accessor :level
-
-      # Logging component. See Hoodoo::Logger.
-      #
-      attr_accessor :component
-
-      # Component log code. See Hoodoo::Logger.
-      #
-      attr_accessor :code
-
-      # The time at which this log message is being reported to the Logger
-      # instance. This is a formatted *String* to high accuracy. See also
-      # #reported_at=.
-      #
-      attr_reader :reported_at
-
-      # Set the time read back by #reported_at using a Time instance. This
-      # is formatted internally as a String via TIME_FORMATTER and reported
-      # as such in subsequent calls to #reported_at.
-      #
-      # Conversion from Time to String is done here, rather than by the
-      # caller setting this instance's variables, so that we can internally
-      # enforce the accuracy required for this field.
-      #
-      # +time+:: The Time instance to set (and process into a string
-      #          internally via TIME_FORMATTER), *or* a String instance
-      #          already so formatted, *or* +nil+ to clear the value.
-      #
-      def reported_at=( time )
-        if time.is_a?( String )
-          @reported_at = time
-        elsif time.is_a?( Time )
-          @reported_at = time.strftime( TIME_FORMATTER )
-        else
-          @reported_at = nil
-        end
-      end
-
-      # Log payload. See Hoodoo::Logger.
-      #
-      attr_accessor :data
-
-      # Optional calling Caller ID, via session data inside the payload - see
-      # Hoodoo::Logger.
-      #
-      attr_accessor :caller_id
-
-      # Optional interaction UUID, via session data inside the payload - see
-      # Hoodoo::Logger.
-      #
-      attr_accessor :interaction_id
-
-      # Optional hash of identity properties from the session data inside the
-      # payload - see Hoodoo::Logger.
-      #
-      attr_accessor :identity
-
-      # Create an instance with options keyed on the attributes defined for
-      # the class. Option keys may be Strings or Symbols but must only match
-      # defined attribute names.
-      #
-      def initialize( options = {} )
-        options.each do | name, value |
-          send( "#{ name }=", value )
-        end
-      end
-
-      # Retrieve a simple Hash representation of this instance.
-      #
-      def to_h
-        {
-          'id'             => @id,
-          'level'          => @level,
-          'component'      => @component,
-          'code'           => @code,
-          'reported_at'    => @reported_at,
-
-          'data'           => @data,
-
-          'interaction_id' => @interaction_id,
-          'caller_id'      => @caller_id,
-          'identity'       => Hoodoo::Utilities.stringify( @identity )
-        }
-      end
-    end
-
-  end
-end; end

data/spec/services/middleware/amqp_log_message_spec.rb

@@ -1,58 +0,0 @@
-require 'spec_helper.rb'
-
-describe Hoodoo::Services::Middleware::AMQPLogMessage do
-
-  let( :now       ) { Time.now }
-  let( :base_hash ) {
-    {
-      :id => '1',
-      :level => 'info',
-      :component => 'RSpec',
-      :code => 'hello',
-
-      :data => { 'this' => 'that' },
-
-      :interaction_id => '3',
-      :caller_id => '2',
-      :identity => { :foo => '4', :bar => '5' },
-    }
-  }
-
-  ############################################################################
-  # All tests must use 'let' to define values for 'reported_at' and
-  # 'expected_reported_at'.
-  ############################################################################
-
-  let( :hash            ) { base_hash().merge( :reported_at => reported_at() ) }
-  let( :expected_result ) {
-    Hoodoo::Utilities.stringify( hash() ).merge( 'reported_at' => expected_reported_at() )
-  }
-
-  shared_examples 'a well formed logger' do
-    it 'and canonicalises the fields' do
-      obj = described_class.new( hash() )
-      expect( obj.to_h ).to eq( expected_result() )
-    end
-  end
-
-  context 'with a Time object in "reported_at"' do
-    let( :reported_at          ) { Time.now }
-    let( :expected_reported_at ) { reported_at().strftime( Hoodoo::Services::Middleware::AMQPLogMessage::TIME_FORMATTER ) }
-
-    it_behaves_like 'a well formed logger'
-  end
-
-  context 'with a String object in "reported_at"' do
-    let( :reported_at          ) { Time.now.iso8601 }
-    let( :expected_reported_at ) { reported_at()    }
-
-    it_behaves_like 'a well formed logger'
-  end
-
-  context 'with "nil" in "reported_at"' do
-    let( :reported_at          ) { nil           }
-    let( :expected_reported_at ) { reported_at() }
-
-    it_behaves_like 'a well formed logger'
-  end
-end