hoodoo 1.19.0 → 2.0.0

data/spec/services/middleware/middleware_spec.rb

@@ -98,7 +98,7 @@ describe Hoodoo::Services::Middleware do
           end
         end
 
-        Hoodoo::Services::Middleware.new( NewRelic::Agent::Instrumentation::MiddlewareProxy.new )
+        Hoodoo::Services::Middleware.new( ::NewRelic::Agent::Instrumentation::MiddlewareProxy.new )
       }.to raise_error(RuntimeError, "Hoodoo::Services::Middleware instance created with NewRelic-wrapped Service entity, but NewRelic API is not as expected by Hoodoo; incompatible NewRelic version.")
 
       Object.send( :remove_const, :NewRelic )
@@ -118,7 +118,7 @@ describe Hoodoo::Services::Middleware do
           end
         end
 
-        Hoodoo::Services::Middleware.new( NewRelic::Agent::Instrumentation::MiddlewareProxy.new )
+        Hoodoo::Services::Middleware.new( ::NewRelic::Agent::Instrumentation::MiddlewareProxy.new )
       }.to raise_error(RuntimeError, "Hoodoo::Services::Middleware instance created with non-Service entity of class 'Hash' - is this the last middleware in the chain via 'use()' and is Rack 'run()'-ing the correct thing?")
 
       Object.send( :remove_const, :NewRelic )
@@ -148,7 +148,7 @@ describe Hoodoo::Services::Middleware do
           end
         end
 
-        Hoodoo::Services::Middleware.new( NewRelic::Agent::Instrumentation::MiddlewareProxy.new )
+        Hoodoo::Services::Middleware.new( ::NewRelic::Agent::Instrumentation::MiddlewareProxy.new )
       }.to raise_error(RuntimeError, "Hoodoo::Services::Middleware encountered invalid interface class RSpecTestServiceStubBadInterface via service class RSpecTestServiceStubBad")
 
       Object.send( :remove_const, :NewRelic )
@@ -267,6 +267,37 @@ describe Hoodoo::Services::Middleware do
       end
     end
 
+    it 'rejects attempts to send body data for HTTP methods that should not have any' do
+
+      # I can't find a way to persuade Rack to send body data instead of query
+      # parameters for GET (it's trying to Do The Right Thing) so instead I'm
+      # forced to write expectations that assume the implementation in the
+      # middleware.
+      #
+      allow_any_instance_of( Rack::Request ).to receive( :body ).and_return( StringIO.new( "hello world" ) )
+      get '/v2/rspec_test_service_stub', nil, { 'CONTENT_TYPE' => 'application/json; charset=utf-8' }
+
+      expect(last_response.status).to eq(422)
+
+      result = JSON.parse(last_response.body)
+      expect(result['errors'][0]['code']).to eq('platform.malformed')
+      expect(result['errors'][0]['message']).to eq('Unexpected body data for this action')
+    end
+
+    it 'rejects oversized payloads' do
+      stub_const('Hoodoo::Services::Middleware::MAXIMUM_PAYLOAD_SIZE', 10)
+
+      post '/v2/rspec_test_service_stub',
+           JSON.fast_generate( { 'key' => 'this is definitely larger than 10 characters as JSON' } ),
+           { 'CONTENT_TYPE' => 'application/json; charset=utf-8' }
+
+      expect(last_response.status).to eq(422)
+
+      result = JSON.parse(last_response.body)
+      expect(result['errors'][0]['code']).to eq('platform.malformed')
+      expect(result['errors'][0]['message']).to eq('Body data exceeds configured maximum size for platform')
+    end
+
     it 'should generate interaction IDs and other standard headers even for error states' do
       get '/v2/rspec_test_service_stub'
 
@@ -853,7 +884,7 @@ describe Hoodoo::Services::Middleware do
         expect(result['errors'][0]['reference']).to eq('search: thing\\, thang')
       end
 
-      it 'should respond to permitted framework search query parameter' do
+      it 'should respond to permitted framework search query parameter "created_after"' do
         dt     = DateTime.parse( Time.now.round.iso8601 )
         str    = dt.iso8601
         encstr = CGI.escape( CGI.escape( str ) ) # Remember, search values within the subquery string must be double escaped
@@ -866,7 +897,7 @@ describe Hoodoo::Services::Middleware do
         expect(last_response.status).to eq(200)
       end
 
-      it 'should reject malformed value in permitted framework search query parameter' do
+      it 'should reject malformed value in permitted framework search query parameter "created_after"' do
         expect_any_instance_of(RSpecTestServiceStubImplementation).to_not receive(:list)
         get "/v2/rspec_test_service_stub?search=created_after%3Dthing", nil, { 'CONTENT_TYPE' => 'application/json; charset=utf-8' }
         expect(last_response.status).to eq(422)
@@ -876,6 +907,27 @@ describe Hoodoo::Services::Middleware do
         expect(result['errors'][0]['reference']).to eq('search: created_after')
       end
 
+      it 'should respond to permitted framework search query parameter "created_by"' do
+        encstr = Hoodoo::UUID.generate()
+
+        expect_any_instance_of(RSpecTestServiceStubImplementation).to receive(:list).once do | ignored_rspec_mock_instance, context |
+          expect(context.request.list.search_data).to eq({'created_by' => encstr})
+        end
+
+        get "/v2/rspec_test_service_stub?search=created_by%3D#{ encstr }", nil, { 'CONTENT_TYPE' => 'application/json; charset=utf-8' }
+        expect(last_response.status).to eq(200)
+      end
+
+      it 'should reject malformed value in permitted framework search query parameter "created_by"' do
+        expect_any_instance_of(RSpecTestServiceStubImplementation).to_not receive(:list)
+        get "/v2/rspec_test_service_stub?search=created_by%3Dnotauuid", nil, { 'CONTENT_TYPE' => 'application/json; charset=utf-8' }
+        expect(last_response.status).to eq(422)
+        result = JSON.parse(last_response.body)
+        expect(result['errors'][0]['code']).to eq('platform.malformed')
+        expect(result['errors'][0]['message']).to eq('One or more malformed or invalid query string parameters')
+        expect(result['errors'][0]['reference']).to eq('search: created_by')
+      end
+
       it 'should reject prohibited framework search query parameter' do
         str    = Time.now.iso8601
         encstr = CGI.escape( CGI.escape( str ) ) # Remember, search values within the subquery string must be double escaped
@@ -946,7 +998,7 @@ describe Hoodoo::Services::Middleware do
         expect(result['errors'][0]['reference']).to eq('filter: thung\\, theng')
       end
 
-      it 'should respond to permitted framework filter query parameter' do
+      it 'should respond to permitted framework filter query parameter "created_before"' do
         dt     = DateTime.parse( Time.now.round.iso8601 )
         str    = dt.iso8601
         encstr = CGI.escape( CGI.escape( str ) ) # Remember, search values within the subquery string must be double escaped
@@ -959,7 +1011,7 @@ describe Hoodoo::Services::Middleware do
         expect(last_response.status).to eq(200)
       end
 
-      it 'should reject malformed value in permitted framework filter query parameter' do
+      it 'should reject malformed value in permitted framework filter query parameter "created_before' do
         expect_any_instance_of(RSpecTestServiceStubImplementation).to_not receive(:list)
         get "/v2/rspec_test_service_stub?filter=created_before%3Dthing", nil, { 'CONTENT_TYPE' => 'application/json; charset=utf-8' }
         expect(last_response.status).to eq(422)
@@ -969,6 +1021,27 @@ describe Hoodoo::Services::Middleware do
         expect(result['errors'][0]['reference']).to eq('filter: created_before')
       end
 
+      it 'should respond to permitted framework filter query parameter "created_by"' do
+        encstr = Hoodoo::UUID.generate()
+
+        expect_any_instance_of(RSpecTestServiceStubImplementation).to receive(:list).once do | ignored_rspec_mock_instance, context |
+          expect(context.request.list.filter_data).to eq({'created_by' => encstr})
+        end
+
+        get "/v2/rspec_test_service_stub?filter=created_by%3D#{ encstr }", nil, { 'CONTENT_TYPE' => 'application/json; charset=utf-8' }
+        expect(last_response.status).to eq(200)
+      end
+
+      it 'should reject malformed value in permitted framework filter query parameter "created_by' do
+        expect_any_instance_of(RSpecTestServiceStubImplementation).to_not receive(:list)
+        get "/v2/rspec_test_service_stub?filter=created_by%3Dnotauuid", nil, { 'CONTENT_TYPE' => 'application/json; charset=utf-8' }
+        expect(last_response.status).to eq(422)
+        result = JSON.parse(last_response.body)
+        expect(result['errors'][0]['code']).to eq('platform.malformed')
+        expect(result['errors'][0]['message']).to eq('One or more malformed or invalid query string parameters')
+        expect(result['errors'][0]['reference']).to eq('filter: created_by')
+      end
+
       it 'should reject prohibited framework filter query parameter' do
         str    = Time.now.iso8601
         encstr = CGI.escape( CGI.escape( str ) ) # Remember, search values within the subquery string must be double escaped

data/spec/services/services/interface_spec.rb

@@ -19,7 +19,7 @@ class RSpecTestInterfaceInterfaceA < Hoodoo::Services::Interface
       search :search_one, :search_two, :search_three
       filter :filter_one, :filter_two, :filter_three
       do_not_search :created_after, :created_before
-      do_not_filter :created_after
+      do_not_filter :created_after, :created_by
     end
 
     to_create do
@@ -99,7 +99,7 @@ describe Hoodoo::Services::Interface do
       expect(RSpecTestInterfaceInterfaceA.to_list.search).to eq(['search_one', 'search_two', 'search_three'])
       expect(RSpecTestInterfaceInterfaceA.to_list.filter).to eq(['filter_one', 'filter_two', 'filter_three'])
       expect(RSpecTestInterfaceInterfaceA.to_list.do_not_search).to eq(['created_after', 'created_before'])
-      expect(RSpecTestInterfaceInterfaceA.to_list.do_not_filter).to eq(['created_after'])
+      expect(RSpecTestInterfaceInterfaceA.to_list.do_not_filter).to eq(['created_after', 'created_by'])
       expect(RSpecTestInterfaceInterfaceA.to_create).to_not be_nil
       expect(RSpecTestInterfaceInterfaceA.to_create.get_schema().properties['foo']).to be_a(Hoodoo::Presenters::Text)
       expect(RSpecTestInterfaceInterfaceA.to_create.get_schema().properties['bar']).to be_a(Hoodoo::Presenters::Enum)

data/spec/transient_store/transient_store/mocks/redis_spec.rb

@@ -25,7 +25,7 @@ describe Hoodoo::TransientStore::Mocks::Redis do
     end
   end
 
-  context 'mimic approcimated old behaviour of its Memcached counterpart by' do
+  context 'approximate old behaviour by' do
     it 'using the mock client in test mode if there is an empty host' do
       expect_any_instance_of( Hoodoo::TransientStore::Mocks::Redis ).to receive( :initialize ).once.and_call_original()
 
@@ -47,17 +47,19 @@ describe Hoodoo::TransientStore::Mocks::Redis do
     it 'using a real client in test mode if there is a defined host' do
       expect_any_instance_of( ::Redis ).to receive( :initialize ).once.and_call_original()
 
-      # Silence 'Errno::ECONNREFUSED' warnings if Memcached is not actually
-      # running at the given URI. That's fine; it's the initializer test
-      # above which is important.
+      # If Redis is missing, Hoodoo raises an exception. Allow that in case no
+      # real Redis server is present, but don't allow other exceptions.
       #
-      spec_helper_silence_stream( $stdout ) do
-        spec_helper_silence_stream( $stderr ) do
+      begin
+        spec_helper_silence_stream( $stdout ) do
           Hoodoo::TransientStore::Redis.new(
             storage_host_uri: 'redis://localhost:6379',
             namespace:        'test_namespace_'
           )
         end
+      rescue => e
+        expect( e         ).to be_a( RuntimeError )
+        expect( e.message ).to include( "Hoodoo::TransientStore::Redis: Cannot connect to Redis at 'redis://localhost:6379': " )
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hoodoo
 version: !ruby/object:Gem::Version
-  version: 1.19.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Loyalty New Zealand
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-17 00:00:00.000000000 Z
+date: 2017-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dalli
@@ -30,28 +30,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.4'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.4'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: simplecov-rcov
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '4.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '4.3'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
@@ -100,56 +100,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '3.5'
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '3.5'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
@@ -170,28 +170,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: '0.21'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: '0.21'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '9.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '9.0'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
@@ -226,28 +226,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.3'
+        version: '6.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.3'
+        version: '6.2'
 - !ruby/object:Gem::Dependency
   name: le
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '2.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '2.7'
 description: Simplify the implementation of consistent services within an API-based
   software platform.
 email:
@@ -433,7 +433,9 @@ files:
 - spec/monkey/patch/datadog_traced_amqp_spec.rb
 - spec/monkey/patch/newrelic_middleware_analytics_spec.rb
 - spec/monkey/patch/newrelic_traced_amqp_spec.rb
+- spec/new_relic/agent/logger.rb
 - spec/new_relic/agent/method_tracer.rb
+- spec/new_relic/agent/transaction.rb
 - spec/newrelic_rpm.rb
 - spec/presenters/base_dsl_spec.rb
 - spec/presenters/base_spec.rb
@@ -514,7 +516,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.1'
+      version: 2.2.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -522,7 +524,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Opinionated APIs
@@ -578,7 +580,9 @@ test_files:
 - spec/monkey/patch/datadog_traced_amqp_spec.rb
 - spec/monkey/patch/newrelic_middleware_analytics_spec.rb
 - spec/monkey/patch/newrelic_traced_amqp_spec.rb
+- spec/new_relic/agent/logger.rb
 - spec/new_relic/agent/method_tracer.rb
+- spec/new_relic/agent/transaction.rb
 - spec/newrelic_rpm.rb
 - spec/presenters/base_dsl_spec.rb
 - spec/presenters/base_spec.rb