hoodoo 1.0.5 → 1.1.0

data/spec/services/middleware/middleware_logging_spec.rb

@@ -1,5 +1,5 @@
 # service_middleware_spec.rb is too large. This file covers logging
-# extentions around StructuredLogger and AMQPLogMessage.
+# extentions around StructuredLogger.
 
 require 'spec_helper'
 
@@ -101,8 +101,8 @@ describe Hoodoo::Services::Middleware do
 
   context 'off queue' do
     before :each do
-      @old_queue = ENV[ 'AMQ_ENDPOINT' ]
-      ENV[ 'AMQ_ENDPOINT' ] = nil
+      @old_queue = ENV[ 'AMQ_URI' ]
+      ENV[ 'AMQ_URI' ] = nil
 
       @cvar = false
       if Hoodoo::Services::Middleware.class_variable_defined?( '@@alchemy' )
@@ -112,7 +112,7 @@ describe Hoodoo::Services::Middleware do
     end
 
     after :each do
-      ENV[ 'AMQ_ENDPOINT' ] = @old_queue
+      ENV[ 'AMQ_URI' ] = @old_queue
 
       if Hoodoo::Services::Middleware.class_variable_defined?( '@@alchemy' )
         if @cvar == true
@@ -155,8 +155,8 @@ describe Hoodoo::Services::Middleware do
 
   context 'on queue' do
     before :each do
-      @old_queue = ENV[ 'AMQ_ENDPOINT' ]
-      ENV[ 'AMQ_ENDPOINT' ] = 'amqp://test:test@127.0.0.1'
+      @old_queue = ENV[ 'AMQ_URI' ]
+      ENV[ 'AMQ_URI' ] = 'amqp://test:test@127.0.0.1'
 
       @cvar = false
       if Hoodoo::Services::Middleware.class_variable_defined?( '@@alchemy' )
@@ -166,7 +166,7 @@ describe Hoodoo::Services::Middleware do
     end
 
     after :each do
-      ENV[ 'AMQ_ENDPOINT' ] = @old_queue
+      ENV[ 'AMQ_URI' ] = @old_queue
 
       if Hoodoo::Services::Middleware.class_variable_defined?( '@@alchemy' )
         if @cvar == true
@@ -182,7 +182,7 @@ describe Hoodoo::Services::Middleware do
         @app = app
       end
       def call(env)
-        env['rack.alchemy'] = self
+        env['alchemy.service'] = self
         @app.call(env)
       end
       def send_message(*args)
@@ -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).at_least(:once)
+      expect_any_instance_of(FakeAlchemy).to receive(:send_message_to_queue).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).at_least(:once)
+      expect_any_instance_of(FakeAlchemy).to receive(:send_message_to_queue).at_least(:once)
       get '/v1/test_log/hello', nil, { 'CONTENT_TYPE' => 'application/json; charset=utf-8' }
 
       instances = Hoodoo::Services::Middleware.logger.instances

data/spec/services/middleware/middleware_multi_remote_spec.rb

@@ -403,7 +403,7 @@ describe Hoodoo::Services::Middleware do
 
       response = spec_helper_http(
         port:    @port,
-        path:    '/v2/test_some_echoes.tar.gz?limit=25&offset=75&_reference=embed_one,embed_two',
+        path:    '/2/TestEcho.tar.gz?limit=25&offset=75&_reference=embed_one,embed_two',
         headers: headers
       )
 

data/spec/services/middleware/middleware_public_spec.rb

@@ -59,9 +59,16 @@ end
 
 describe Hoodoo::Services::Middleware do
 
-  def try_to_call( endpoint, ident = nil )
+  def try_to_call( endpoint: nil,
+                   resource: nil,
+                   ident: nil )
+
+    path = resource.nil?                  ?
+           "/v1/#{ endpoint }/#{ ident }" :
+           "/1/#{ resource }/#{ ident }"
+
     get(
-      "/v1/#{ endpoint }/#{ ident }",
+      path,
       nil,
       { 'CONTENT_TYPE' => 'application/json; charset=utf-8' }
     )
@@ -102,24 +109,36 @@ describe Hoodoo::Services::Middleware do
 
     context '#list' do
       it 'prohibits actions without session', :without_session => true do
-        try_to_call( 'no_public_action' )
+        try_to_call( endpoint: 'no_public_action' )
+        expect( last_response.status ).to eq( 401 )
+
+        try_to_call( resource: 'NoPublicAction' )
         expect( last_response.status ).to eq( 401 )
       end
 
       it 'allows actions with session' do
-        try_to_call( 'no_public_action' )
+        try_to_call( endpoint: 'no_public_action' )
+        expect( last_response.status ).to eq( 200 )
+
+        try_to_call( resource: 'NoPublicAction' )
         expect( last_response.status ).to eq( 200 )
       end
     end
 
     context '#show' do
       it 'prohibits actions without session', :without_session => true do
-        try_to_call( 'no_public_action', 'some_uuid' )
+        try_to_call( endpoint: 'no_public_action', ident: 'some_uuid' )
+        expect( last_response.status ).to eq( 401 )
+
+        try_to_call( resource: 'NoPublicAction', ident: 'some_uuid' )
         expect( last_response.status ).to eq( 401 )
       end
 
       it 'allows actions with session' do
-        try_to_call( 'no_public_action', 'some_uuid' )
+        try_to_call( endpoint: 'no_public_action', ident: 'some_uuid' )
+        expect( last_response.status ).to eq( 200 )
+
+        try_to_call( resource: 'NoPublicAction', ident: 'some_uuid' )
         expect( last_response.status ).to eq( 200 )
       end
     end
@@ -145,22 +164,34 @@ describe Hoodoo::Services::Middleware do
     end
 
     it 'prohibits secure actions without session', :without_session => true do
-      try_to_call( 'public_action', 'some_uuid' )
+      try_to_call( endpoint: 'public_action', ident: 'some_uuid' )
+      expect( last_response.status ).to eq( 401 )
+
+      try_to_call( resource: 'PublicAction', ident: 'some_uuid' )
       expect( last_response.status ).to eq( 401 )
     end
 
     it 'allows secure actions with session' do
-      try_to_call( 'public_action', 'some_uuid' )
+      try_to_call( endpoint: 'public_action', ident: 'some_uuid' )
+      expect( last_response.status ).to eq( 200 )
+
+      try_to_call( resource: 'PublicAction', ident: 'some_uuid' )
       expect( last_response.status ).to eq( 200 )
     end
 
     it 'allows public actions without session', :without_session => true do
-      try_to_call( 'public_action' )
+      try_to_call( endpoint: 'public_action' )
+      expect( last_response.status ).to eq( 200 )
+
+      try_to_call( resource: 'PublicAction' )
       expect( last_response.status ).to eq( 200 )
     end
 
     it 'allows public actions with session' do
-      try_to_call( 'public_action' )
+      try_to_call( endpoint: 'public_action' )
+      expect( last_response.status ).to eq( 200 )
+
+      try_to_call( resource: 'PublicAction' )
       expect( last_response.status ).to eq( 200 )
     end
   end
@@ -187,24 +218,36 @@ describe Hoodoo::Services::Middleware do
     context 'in interface with no public actions' do
       context '#list' do
         it 'prohibits actions without session', :without_session => true do
-          try_to_call( 'no_public_action' )
+          try_to_call( endpoint: 'no_public_action' )
+          expect( last_response.status ).to eq( 401 )
+
+          try_to_call( resource: 'NoPublicAction' )
           expect( last_response.status ).to eq( 401 )
         end
 
         it 'allows actions with session' do
-          try_to_call( 'no_public_action' )
+          try_to_call( endpoint: 'no_public_action' )
+          expect( last_response.status ).to eq( 200 )
+
+          try_to_call( resource: 'NoPublicAction' )
           expect( last_response.status ).to eq( 200 )
         end
       end
 
       context '#show' do
         it 'prohibits actions without session', :without_session => true do
-          try_to_call( 'no_public_action', 'some_uuid' )
+          try_to_call( endpoint: 'no_public_action', ident: 'some_uuid' )
+          expect( last_response.status ).to eq( 401 )
+
+          try_to_call( resource: 'NoPublicAction', ident: 'some_uuid' )
           expect( last_response.status ).to eq( 401 )
         end
 
         it 'allows actions with session' do
-          try_to_call( 'no_public_action', 'some_uuid' )
+          try_to_call( endpoint: 'no_public_action', ident: 'some_uuid' )
+          expect( last_response.status ).to eq( 200 )
+
+          try_to_call( resource: 'NoPublicAction', ident: 'some_uuid' )
           expect( last_response.status ).to eq( 200 )
         end
       end
@@ -212,22 +255,34 @@ describe Hoodoo::Services::Middleware do
 
     context 'in interface with public actions' do
       it 'prohibits secure actions without session', :without_session => true do
-        try_to_call( 'public_action', 'some_uuid' )
+        try_to_call( endpoint: 'public_action', ident: 'some_uuid' )
+        expect( last_response.status ).to eq( 401 )
+
+        try_to_call( resource: 'PublicAction', ident: 'some_uuid' )
         expect( last_response.status ).to eq( 401 )
       end
 
       it 'allows secure actions with session' do
-        try_to_call( 'public_action', 'some_uuid' )
+        try_to_call( endpoint: 'public_action', ident: 'some_uuid' )
+        expect( last_response.status ).to eq( 200 )
+
+        try_to_call( resource: 'PublicAction', ident: 'some_uuid' )
         expect( last_response.status ).to eq( 200 )
       end
 
       it 'allows public actions without session', :without_session => true do
-        try_to_call( 'public_action' )
+        try_to_call( endpoint: 'public_action' )
+        expect( last_response.status ).to eq( 200 )
+
+        try_to_call( resource: 'PublicAction' )
         expect( last_response.status ).to eq( 200 )
       end
 
       it 'allows public actions with session' do
-        try_to_call( 'public_action' )
+        try_to_call( endpoint: 'public_action' )
+        expect( last_response.status ).to eq( 200 )
+
+        try_to_call( resource: 'PublicAction' )
         expect( last_response.status ).to eq( 200 )
       end
     end

data/spec/services/middleware/middleware_spec.rb

@@ -194,12 +194,12 @@ describe Hoodoo::Services::Middleware do
     end
 
     it 'should know about a queue' do
-      old = ENV[ 'AMQ_ENDPOINT' ]
-      ENV[ 'AMQ_ENDPOINT' ] = nil
+      old = ENV[ 'AMQ_URI' ]
+      ENV[ 'AMQ_URI' ] = nil
       expect(Hoodoo::Services::Middleware.on_queue?).to eq(false)
-      ENV[ 'AMQ_ENDPOINT' ] = 'foo'
+      ENV[ 'AMQ_URI' ] = 'foo'
       expect(Hoodoo::Services::Middleware.on_queue?).to eq(true)
-      ENV[ 'AMQ_ENDPOINT' ] = old
+      ENV[ 'AMQ_URI' ] = old
     end
   end
 

data/spec/services/services/application_spec.rb

@@ -28,17 +28,17 @@ describe Hoodoo::Services::Service do
   it 'should complain about incorrect interface classes' do
     expect {
       RSpecTestService.comprised_of( Hash )
-    }.to raise_error(RuntimeError, "Hoodoo::Services::Implementation::comprised_of expects Hoodoo::Services::Interface subclasses only - got 'Hash'")
+    }.to raise_error(RuntimeError, "Hoodoo::Services::Service::comprised_of expects Hoodoo::Services::Interface subclasses only - got 'Hash'")
 
     expect {
       RSpecTestService.comprised_of( Hoodoo::Services::Interface )
-    }.to raise_error(RuntimeError, "Hoodoo::Services::Implementation::comprised_of expects Hoodoo::Services::Interface subclasses only - got 'Hoodoo::Services::Interface'")
+    }.to raise_error(RuntimeError, "Hoodoo::Services::Service::comprised_of expects Hoodoo::Services::Interface subclasses only - got 'Hoodoo::Services::Interface'")
   end
 
   it 'should complain if called directly' do
     expect {
       RSpecTestService.new.call( nil )
-    }.to raise_error(RuntimeError, "Hoodoo::Services::Implementation subclasses should only be called through the middleware - add 'use Hoodoo::Services::Middleware' to (e.g.) config.ru")
+    }.to raise_error(RuntimeError, "Hoodoo::Services::Service subclasses should only be called through the middleware - add 'use Hoodoo::Services::Middleware' to (e.g.) config.ru")
   end
 
   it 'should correctly report its component classes' do

data/spec/spec_helper.rb

@@ -30,17 +30,12 @@ require 'database_cleaner'
 require 'active_record'
 require 'logger'
 
-# Include AlchemyAMQ for testing only.
-
-# TODO: See spec/alchemy/alchemy-amq.rb. Remove this once 'real' Alchemy
-#       is opened.
-#
-$LOAD_PATH.unshift File.join( File.dirname( __FILE__ ), 'alchemy' )
+# Include Alchemy Flux for testing only.
 
 begin
-  require 'alchemy-amq'
+  require 'alchemy-flux'
 rescue LoadError
-  raise 'Cannot load alchemy-amq; did you run me with "bundle exec..." ?'
+  raise 'Cannot load alchemy-flux; did you run me with "bundle exec..." ?'
 end
 
 # Now it's safe to require Rack test code and Hoodoo itself.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hoodoo
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.1.0
 platform: ruby
 authors:
 - Loyalty New Zealand
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-14 00:00:00.000000000 Z
+date: 2016-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uuidtools
@@ -108,6 +108,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.6'
+- !ruby/object:Gem::Dependency
+  name: alchemy-flux
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -348,11 +362,11 @@ files:
 - lib/hoodoo/presenters/types/text.rb
 - lib/hoodoo/presenters/types/uuid.rb
 - lib/hoodoo/services.rb
-- lib/hoodoo/services/discovery/discoverers/by_consul.rb
 - lib/hoodoo/services/discovery/discoverers/by_convention.rb
 - lib/hoodoo/services/discovery/discoverers/by_drb/by_drb.rb
 - lib/hoodoo/services/discovery/discoverers/by_drb/drb_server.rb
 - lib/hoodoo/services/discovery/discoverers/by_drb/drb_server_start.rb
+- lib/hoodoo/services/discovery/discoverers/by_flux.rb
 - lib/hoodoo/services/discovery/discovery.rb
 - lib/hoodoo/services/discovery/results/for_amqp.rb
 - lib/hoodoo/services/discovery/results/for_http.rb
@@ -393,7 +407,6 @@ files:
 - spec/active/active_record/translated_spec.rb
 - spec/active/active_record/uuid_spec.rb
 - spec/active/active_record/writer_spec.rb
-- spec/alchemy/alchemy-amq.rb
 - spec/client/augmented_array_spec.rb
 - spec/client/augmented_base_spec.rb
 - spec/client/augmented_hash_spec.rb
@@ -446,10 +459,10 @@ files:
 - spec/presenters/types/text_spec.rb
 - spec/presenters/types/uuid_spec.rb
 - spec/presenters/walk_spec.rb
-- spec/services/discovery/discoverers/by_consul_spec.rb
 - spec/services/discovery/discoverers/by_convention_spec.rb
 - spec/services/discovery/discoverers/by_drb/by_drb_spec.rb
 - spec/services/discovery/discoverers/by_drb/drb_server_spec.rb
+- spec/services/discovery/discoverers/by_flux_spec.rb
 - spec/services/discovery/discovery_spec.rb
 - spec/services/discovery/results/for_amqp_spec.rb
 - spec/services/discovery/results/for_http_spec.rb
@@ -522,7 +535,6 @@ test_files:
 - spec/active/active_record/translated_spec.rb
 - spec/active/active_record/uuid_spec.rb
 - spec/active/active_record/writer_spec.rb
-- spec/alchemy/alchemy-amq.rb
 - spec/client/augmented_array_spec.rb
 - spec/client/augmented_base_spec.rb
 - spec/client/augmented_hash_spec.rb
@@ -575,10 +587,10 @@ test_files:
 - spec/presenters/types/text_spec.rb
 - spec/presenters/types/uuid_spec.rb
 - spec/presenters/walk_spec.rb
-- spec/services/discovery/discoverers/by_consul_spec.rb
 - spec/services/discovery/discoverers/by_convention_spec.rb
 - spec/services/discovery/discoverers/by_drb/by_drb_spec.rb
 - spec/services/discovery/discoverers/by_drb/drb_server_spec.rb
+- spec/services/discovery/discoverers/by_flux_spec.rb
 - spec/services/discovery/discovery_spec.rb
 - spec/services/discovery/results/for_amqp_spec.rb
 - spec/services/discovery/results/for_http_spec.rb

data/lib/hoodoo/services/discovery/discoverers/by_consul.rb

@@ -1,66 +0,0 @@
-########################################################################
-# File::    by_consul.rb
-# (C)::     Loyalty New Zealand 2015
-#
-# Purpose:: Discover resource endpoint locations via a registry held in
-#           Consul. For AMQP-based endpoints; maps paths to queue names.
-#           PLACEHOLDER: NOT YET IMPLEMENTED.
-# ----------------------------------------------------------------------
-#           03-Mar-2015 (ADH): Created.
-########################################################################
-
-module Hoodoo
-  module Services
-    class Discovery # Just used as a namespace here
-
-      # Discover resource endpoint locations via a registry held in
-      # Consul. For AMQP-based endpoints; maps paths to queue names.
-      #
-      class ByConsul < Hoodoo::Services::Discovery
-
-        protected
-
-          # Announce the location of an instance to Consul.
-          #
-          # Call via Hoodoo::Services::Discovery::Base#announce.
-          #
-          # TODO: NOT YET IMPLEMENTED. Placeholder only.
-          #
-          # +resource+:: Passed to #discover_remote.
-          # +version+::  Passed to #discover_remote.
-          # +options+::  Ignored. TODO: Queue name, equivalent path.
-          #
-          def announce_remote( resource, version, options = {} )
-            return discover_remote( resource, version ) # TODO: Replace
-          end
-
-          # Discover the location of an instance using Consul.
-          #
-          # TODO: This currently doesn't use Consul at all! It has a
-          # TODO: hard-coded mapping.
-          #
-          # Returns a Hoodoo::Services::Discovery::ForAMQP instance if
-          # the endpoint is found, else +nil+.
-          #
-          # Call via Hoodoo::Services::Discovery::Base#announce.
-          #
-          # +resource+:: Passed to #discover_remote.
-          # +version+::  Passed to #discover_remote.
-          #
-          def discover_remote( resource, version )
-
-            queue = "service.#{ resource.to_s.downcase }"
-            path  = "/v#{ version }/#{ resource.to_s.downcase.pluralize }"
-
-            return Hoodoo::Services::Discovery::ForAMQP.new(
-              resource:        resource,
-              version:         version,
-              queue_name:      queue,
-              equivalent_path: path
-            )
-          end
-
-      end
-    end
-  end
-end