hoodoo 2.3.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e8b58918454743aba0a3c4b64ed5b16dded3369ce27868c4344386c83286c84
-  data.tar.gz: 37d7dc316771890f1ff8021420d34a6c12caeb9f7e6928f0d424700734d353c6
+  metadata.gz: 28c5549a689e0e841a9c435f0c6a5bfe502f4b592b4bdcec929d0680818e5d3c
+  data.tar.gz: c41b08c154c94b959c674b4c5acf3da3e9174b83fd3ab7b210adcc51aeaa8991
 SHA512:
-  metadata.gz: 8908060c76f8dd1de5c031d4143a1c3f1e3481c1124d081a0b33c700330aa6a9bd903e811185f7a1beb8f14d5fe29b816acddd684d669eb3ecbf8a27848a6822
-  data.tar.gz: c5d7c0f1b3a00e1be635f5c10fc3c9b4a075bb76da1506cc4587d0d8a329a161c3ff935a370be941707eb75a5649fa1a1e666fa24bca07e23333f352df0f4552
+  metadata.gz: 271dbaf036afd87732ff3f702fc82b0a1e8abc334531f9b62f2bac266f9b258b65e8fe42c8bc865a70f39e6624e7e15611ed17ca158cc8b59ecd4ef501a8a77a
+  data.tar.gz: f3355e88dabae561eaf7ef72adccb57606f33df0f2593e0ef0963aa7c85c3526831bdc95012bf6a4f0954bd1e9d5fed9f89d0c6aaca69447afffc75df1d1f237

data/lib/hoodoo/monkey/patch/datadog_traced_amqp.rb

@@ -48,6 +48,7 @@ module Hoodoo
                 span.span_type = 'alchemy'
                 span.resource  = http_message[ 'verb' ]
                 span.set_tag( 'target.path', http_message[ 'path'] )
+                span.set_tag( 'interaction.id', http_message[ 'headers' ][ 'X-Interaction-ID' ] )
 
                 # Add Datadog trace IDs to the HTTP message. For compatibility
                 # with Hoodoo V1 services using a fork of DDTrace, we send both

data/lib/hoodoo/presenters/base.rb

@@ -202,7 +202,7 @@ module Hoodoo
 
         target = self.render( data, uuid, created_at, language, created_by )
 
-        if secured_with.is_a?( ::ActiveRecord::Base )
+        if defined?( ::ActiveRecord ) && secured_with.is_a?( ::ActiveRecord::Base )
           result_hash     = {}
           extra_scope_map = secured_with.class.secured_with()
 

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

@@ -538,12 +538,12 @@ module Hoodoo; module Services
         # everything else.
         #
         custom_path   = "/v#{ interface.version }/#{ interface.endpoint }"
-        custom_regexp = /\/v#{ interface.version }\/#{ interface.endpoint }(\.|\/|$)(.*)/
+        custom_regexp = /^\/v#{ interface.version }\/#{ interface.endpoint }(\.|\/|$)(.*)/
 
         # Same as above, but for the de facto routing.
         #
         de_facto_path   = self.class.de_facto_path_for( interface.resource, interface.version )
-        de_facto_regexp = /\/#{ interface.version }\/#{ interface.resource }(\.|\/|$)(.*)/
+        de_facto_regexp = /^\/#{ interface.version }\/#{ interface.resource }(\.|\/|$)(.*)/
 
         Hoodoo::Services::Discovery::ForLocal.new(
           :resource                => interface.resource,

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.3.0'
+  VERSION = '2.4.0'
 
   # The Hoodoo gem date. If this changes, be sure to re-run
   # <tt>bundle install</tt> or <tt>bundle update</tt>.
   #
-  DATE = '2018-02-22'
+  DATE = '2018-03-21'
 
 end

data/spec/presenters/base_spec.rb

@@ -931,6 +931,24 @@ describe '#schema' do
       })
     end
 
+    context 'without ActiveRecord' do
+      before :each do
+        @old_ar = ::ActiveRecord
+        Object.send( :remove_const, :ActiveRecord )
+      end
+
+      after :each do
+        Object.send( :const_set, :ActiveRecord, @old_ar )
+      end
+
+      it 'renders' do
+        data = {}
+        expect(TestPresenter5.render_in(@con, data)).to eq({
+          'three' => 'default_three'
+        })
+      end
+    end
+
     # The "secured_with" option is tested in "secure_spec.rb" as lots of
     # tricky related setup is done there that would only end up being
     # coped in here otherwise.

data/spec/services/middleware/middleware_spec.rb

@@ -1717,7 +1717,7 @@ class RSpecTestServiceAltStubImplementation < Hoodoo::Services::Implementation
 end
 
 class RSpecTestServiceAltStubInterface < Hoodoo::Services::Interface
-  interface :RSpecTestResource do
+  interface :RSpecTestResourceAlt do
     version 2
     endpoint :rspec_test_service_alt_stub, RSpecTestServiceAltStubImplementation
   end
@@ -1744,22 +1744,148 @@ describe Hoodoo::Services::Middleware do
       expect(last_response.status).to eq(404)
     end
 
-    it 'should route to the V1 endpoint' do
-      expect_any_instance_of(RSpecTestServiceV1StubImplementation).to receive(:list)
-      get '/v1/rspec_test_service_stub/', nil, { 'CONTENT_TYPE' => 'application/json; charset=utf-8' }
-      expect(last_response.status).to eq(200)
+    context 'should route to the V1 endpoint' do
+      before :each do
+        expect_any_instance_of(RSpecTestServiceV1StubImplementation).to receive(:list)
+      end
+
+      after :each do
+        expect(last_response.status).to eq(200)
+      end
+
+      it 'with custom route and no trailing slash' do
+        get '/v1/rspec_test_service_stub', nil, { 'CONTENT_TYPE' => 'application/json; charset=utf-8' }
+      end
+
+      it 'with custom route and trailing slash' do
+        get '/v1/rspec_test_service_stub/', nil, { 'CONTENT_TYPE' => 'application/json; charset=utf-8' }
+      end
+
+      it 'with de facto route and no trailing slash' do
+        get '/1/RSpecTestResource', nil, { 'CONTENT_TYPE' => 'application/json; charset=utf-8' }
+      end
+
+      it 'with de facto route and trailing slash' do
+        get '/1/RSpecTestResource/', nil, { 'CONTENT_TYPE' => 'application/json; charset=utf-8' }
+      end
     end
 
-    it 'should route to the V2 endpoint' do
-      expect_any_instance_of(RSpecTestServiceStubImplementation).to receive(:list)
-      get '/v2/rspec_test_service_stub/', nil, { 'CONTENT_TYPE' => 'application/json; charset=utf-8' }
-      expect(last_response.status).to eq(200)
+    context 'should route to the V2 endpoint' do
+      before :each do
+        expect_any_instance_of(RSpecTestServiceStubImplementation).to receive(:list)
+      end
+
+      after :each do
+        expect(last_response.status).to eq(200)
+      end
+
+      it 'with custom route and no trailing slash' do
+        get '/v2/rspec_test_service_stub', nil, { 'CONTENT_TYPE' => 'application/json; charset=utf-8' }
+      end
+
+      it 'with custom route and trailing slash' do
+        get '/v2/rspec_test_service_stub/', nil, { 'CONTENT_TYPE' => 'application/json; charset=utf-8' }
+      end
+
+      it 'with de facto route and no trailing slash' do
+        get '/2/RSpecTestResource', nil, { 'CONTENT_TYPE' => 'application/json; charset=utf-8' }
+      end
+
+      it 'with de facto route and trailing slash' do
+        get '/2/RSpecTestResource/', nil, { 'CONTENT_TYPE' => 'application/json; charset=utf-8' }
+      end
     end
 
-    it 'should route to the V2 alternative endpoint' do
-      expect_any_instance_of(RSpecTestServiceAltStubImplementation).to receive(:list)
-      get '/v2/rspec_test_service_alt_stub/', nil, { 'CONTENT_TYPE' => 'application/json; charset=utf-8' }
-      expect(last_response.status).to eq(200)
+    context 'should route to the V2 alternative endpoint' do
+      before :each do
+        expect_any_instance_of(RSpecTestServiceAltStubImplementation).to receive(:list)
+      end
+
+      it 'with custom route and no trailing slash' do
+        get '/v2/rspec_test_service_alt_stub', nil, { 'CONTENT_TYPE' => 'application/json; charset=utf-8' }
+      end
+
+      it 'with custom route and trailing slash' do
+        get '/v2/rspec_test_service_alt_stub/', nil, { 'CONTENT_TYPE' => 'application/json; charset=utf-8' }
+      end
+
+      it 'with de facto route and no trailing slash' do
+        get '/2/RSpecTestResourceAlt', nil, { 'CONTENT_TYPE' => 'application/json; charset=utf-8' }
+      end
+
+      it 'with de facto route and trailing slash' do
+        get '/2/RSpecTestResourceAlt/', nil, { 'CONTENT_TYPE' => 'application/json; charset=utf-8' }
+      end
+    end
+
+    context 'with trailing route matches' do
+      context 'should not mis-match' do
+        it 'custom routes with a junk lead-in' do
+          expect_any_instance_of(RSpecTestServiceV1StubImplementation).to_not receive(:list)
+          get '/v1/junk/v1/rspec_test_service_stub/', nil, { 'CONTENT_TYPE' => 'application/json; charset=utf-8' }
+          expect(last_response.status).to eq(404)
+        end
+
+        it 'custom routes with a resource match lead-in' do
+          expect_any_instance_of(RSpecTestServiceAltStubImplementation).to receive(:show)
+          get '/v2/rspec_test_service_alt_stub/v1/rspec_test_service_stub/', nil, { 'CONTENT_TYPE' => 'application/json; charset=utf-8' }
+          expect(last_response.status).to eq(200)
+        end
+
+        it 'de facto routes with a junk lead-in' do
+          expect_any_instance_of(RSpecTestServiceV1StubImplementation).to_not receive(:list)
+          get '/1/Junk/1/RSpecTestResource/', nil, { 'CONTENT_TYPE' => 'application/json; charset=utf-8' }
+          expect(last_response.status).to eq(404)
+        end
+
+        it 'de facto routes with a resource match lead-in' do
+          expect_any_instance_of(RSpecTestServiceAltStubImplementation).to receive(:show)
+          get '/2/RSpecTestResourceAlt/1/RSpecTestResource/', nil, { 'CONTENT_TYPE' => 'application/json; charset=utf-8' }
+          expect(last_response.status).to eq(200)
+        end
+      end
+
+      context 'should pass the remainder as the "ident"' do
+        after :each do
+          expect(last_response.status).to eq(200)
+        end
+
+        it 'on custom routes' do
+          expect_any_instance_of(RSpecTestServiceV1StubImplementation).to receive(:update) do | instance, context |
+            expect(context.request.ident).to eq('v2')
+            expect(context.request.uri_path_components).to eq(['v2', 'rspec_test_service_alt_stub'])
+          end
+
+          patch '/v1/rspec_test_service_stub/v2/rspec_test_service_alt_stub', '{}', { 'CONTENT_TYPE' => 'application/json; charset=utf-8' }
+        end
+
+        it 'on de facto routes' do
+          expect_any_instance_of(RSpecTestServiceV1StubImplementation).to receive(:update) do | instance, context |
+            expect(context.request.ident).to eq('2')
+            expect(context.request.uri_path_components).to eq(['2', 'RSpecTestResourceAlt'])
+          end
+
+          patch '/1/RSpecTestResource/2/RSpecTestResourceAlt', '{}', { 'CONTENT_TYPE' => 'application/json; charset=utf-8' }
+        end
+
+        it 'on mixed routes (1)' do
+          expect_any_instance_of(RSpecTestServiceV1StubImplementation).to receive(:update) do | instance, context |
+            expect(context.request.ident).to eq('v2')
+            expect(context.request.uri_path_components).to eq(['v2', 'rspec_test_service_alt_stub'])
+          end
+
+          patch '/1/RSpecTestResource/v2/rspec_test_service_alt_stub', '{}', { 'CONTENT_TYPE' => 'application/json; charset=utf-8' }
+        end
+
+        it 'on mixed routes (2)' do
+          expect_any_instance_of(RSpecTestServiceV1StubImplementation).to receive(:update) do | instance, context |
+            expect(context.request.ident).to eq('2')
+            expect(context.request.uri_path_components).to eq(['2', 'RSpecTestResourceAlt'])
+          end
+
+          patch '/v1/rspec_test_service_stub/2/RSpecTestResourceAlt', '{}', { 'CONTENT_TYPE' => 'application/json; charset=utf-8' }
+        end
+      end
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hoodoo
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.0
 platform: ruby
 authors:
 - Loyalty New Zealand
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-22 00:00:00.000000000 Z
+date: 2018-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dalli
@@ -184,14 +184,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.21'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.21'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement