hoodoo 2.12.10 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 30bf5e509bdb3b77d138232a8c747b7af491f784d2bf6151d58b5911d2a1de32
-  data.tar.gz: 50024b0acdc5959e04637b301c8c39729f18bd23a7d5a64ebcaf96c929eb07be
+  metadata.gz: 1c072388050450a0f03e3956b313c1a58b5a29eaec761ceb5098f81ee2ea7d2f
+  data.tar.gz: e78949d826d84ce23b84e6d024955403278f72bf161d12771a703664b53e1c7c
 SHA512:
-  metadata.gz: de8c9c12dec808ee0b8d5b05c45bd2c6c31175f04fb2d5cb96f37112fd7b51fa8600016f82c44934677a7f913b19f472cf16d2bcd3603817f3eae54073a88e3e
-  data.tar.gz: fd80735a9d0c4e74a38f3f2c2ad5a30ae913ec6fbcd84ce9cc83da6b545164ef4b1022ccdca32305e62a40693a8a25e9ff95a76eda9f3ccf27318ad084b4d28d
+  metadata.gz: 65f5ba41ed0210152f9ad5784dfa587745ce403d6695a56eb440d1ed47f98c03fbba861f1f7815378487532a763f59f22c2e462c1c69c84041e9fa73d77bb7f5
+  data.tar.gz: 66d79b81ec7a9bc431bf5f7c9a3f934b840a9e172547402389d4b4d9a66c35c2660d2ad1f83e4ed6b39f8d8a3f453e99a01fe7aef79de1924463f260065d7694

data/lib/hoodoo/active/active_model/uuid_validator.rb

@@ -30,9 +30,8 @@ module Hoodoo
         #     end
         #
         def validate_each( record, attribute, value )
-
           unless value.nil? || Hoodoo::UUID.valid?( value )
-            record.errors[ attribute ] << ( options[ :message ] || 'is invalid' )
+            record.errors.add(attribute, options[ :message ] || 'is invalid' )
           end
 
         end

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

@@ -123,10 +123,8 @@ module Hoodoo
       def self.included( model )
         model.class_attribute(
           :nz_co_loyalty_hoodoo_dated_with,
-          {
-            :instance_predicate => false,
-            :instance_accessor  => false
-          }
+          :instance_predicate => false,
+          :instance_accessor  => false
         )
 
         instantiate( model ) unless model == Hoodoo::ActiveRecord::Base

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

@@ -56,10 +56,8 @@ module Hoodoo
           :nz_co_loyalty_hoodoo_estimate_counts_with,
           :nz_co_loyalty_hoodoo_search_with,
           :nz_co_loyalty_hoodoo_filter_with,
-          {
-            :instance_predicate => false,
-            :instance_accessor  => false
-          }
+          :instance_predicate => false,
+          :instance_accessor  => false
         )
 
         unless model == Hoodoo::ActiveRecord::Base

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

@@ -386,10 +386,8 @@ module Hoodoo
       def self.included( model )
         model.class_attribute(
           :nz_co_loyalty_hoodoo_manually_dated,
-          {
-            :instance_predicate => false,
-            :instance_accessor  => false
-          }
+          :instance_predicate => false,
+          :instance_accessor  => false
         )
 
         unless model == Hoodoo::ActiveRecord::Base

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

@@ -39,10 +39,8 @@ module Hoodoo
       def self.included( model )
         model.class_attribute(
           :nz_co_loyalty_hoodoo_secure_with,
-          {
-            :instance_predicate => false,
-            :instance_accessor  => false
-          }
+          :instance_predicate => false,
+          :instance_accessor  => false
         )
 
         instantiate( model ) unless model == Hoodoo::ActiveRecord::Base

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

@@ -41,18 +41,6 @@ module Hoodoo
       #
       class SecurityHelper
 
-        # Internally used by ::matches_wildcard for Ruby 2.4.0+ performance.
-        #
-        RUBY_FAST_WILDCARD_PROC_CONTENTS = %q{
-          security_value.match?( wildcard_regexp ) rescue false
-        }
-
-        # Internally used by ::matches_wildcard for Ruby < 2.4 compatibility.
-        #
-        RUBY_SLOW_WILDCARD_PROC_CONTENTS = %q{
-          wildcard_regexp.match( security_value ) != nil rescue false
-        }
-
         # Match a given wildcard, typically a String, to a single value
         # via <tt>#eql?</tt>.
         #
@@ -94,21 +82,8 @@ module Hoodoo
         def self.matches_wildcard( wildcard_regexp )
           wildcard_regexp = Regexp.new( wildcard_regexp ) unless wildcard_regexp.is_a?( Regexp )
 
-          # Use security_value's #match? (if present) to ensure that we have
-          # an expected "matchable" type. This is only available in Ruby 2.4
-          # or later, so a patch is performed below for earlier Rubies.
-          #
           Proc.new do | security_value |
-
-            # Ruby 2.4.0 and later introduce the Regexp#match? family, which
-            # is the fastest way to determine a simple does-or-does-not match
-            # condition. Ruby 2.3.x and earlier need different, slower code.
-            #
-            if ''.respond_to?( :match? )
-              eval( RUBY_FAST_WILDCARD_PROC_CONTENTS )
-            else
-              eval( RUBY_SLOW_WILDCARD_PROC_CONTENTS )
-            end
+            security_value.match?( wildcard_regexp ) rescue false
           end
         end
 

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

@@ -36,10 +36,8 @@ module Hoodoo
       def self.included( model )
         model.class_attribute(
           :nz_co_loyalty_hoodoo_translate_with,
-          {
-            :instance_predicate => false,
-            :instance_accessor  => false
-          }
+          :instance_predicate => false,
+          :instance_accessor  => false
         )
 
         instantiate( model ) unless model == Hoodoo::ActiveRecord::Base

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

@@ -218,7 +218,7 @@ module Hoodoo
             # Now we've a copy, we can use high level URI methods to manipulate
             # it to form the full request URI.
 
-            remote_uri.path << "/#{ URI::escape( ident ) }" unless ident.nil?
+            remote_uri.path << "/#{ CGI::escape( ident ) }" unless ident.nil?
 
             # Grey area over whether this encodes spaces as "%20" or "+", but
             # so long as the middleware consistently uses the URI encode/decode

data/lib/hoodoo/middleware.rb

@@ -29,4 +29,3 @@ require 'hoodoo/services/middleware/middleware'
 require 'hoodoo/services/middleware/exception_reporting/exception_reporting'
 require 'hoodoo/services/middleware/exception_reporting/base_reporter'
 require 'hoodoo/services/middleware/exception_reporting/reporters/airbrake_reporter'
-require 'hoodoo/services/middleware/exception_reporting/reporters/raygun_reporter'

data/lib/hoodoo/monkey/monkey.rb

@@ -261,7 +261,7 @@ module Hoodoo
     #
     # Disabling the same extension multiple times has no side effects.
     #
-    def self.disable( target_unit: nil, extension_module: )
+    def self.disable( extension_module:, target_unit: nil )
       if ( target_units_hash = @@modules[ extension_module ] ).nil?
         raise "Hoodoo::Monkey::disable: Extension module '#{ extension_module.inspect }' is not registered"
       end

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

@@ -17,7 +17,6 @@ module Hoodoo; module Services
       # Subclass this method to create a custom class used to contact external
       # exception monitoring / reporting engine. Examples include:
       #
-      # * Raygun:      https://raygun.io
       # * Honeybadger: https://www.honeybadger.io
       # * Exceptional: http://www.exceptional.io
       # * Airbrake:    https://airbrake.io

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.12.10'
+  VERSION = '3.1.1'
 
   # The Hoodoo gem date. If this changes, be sure to re-run
   # <tt>bundle install</tt> or <tt>bundle update</tt>.
   #
-  DATE = '2021-09-27'
+  DATE = '2022-02-02'
 
 end

data/spec/active/active_record/creator_spec.rb

@@ -46,7 +46,6 @@ describe Hoodoo::ActiveRecord::Creator do
         @interaction.context.response,
         @interaction
       )
-
       @context = @interaction.context
       @session = @interaction.context.session
     end
@@ -65,8 +64,8 @@ describe Hoodoo::ActiveRecord::Creator do
 
         instance = klass.new_in( @context )
 
-        expect( instance.created_at ).to eq( @time )
-        expect( instance.updated_at ).to eq( @time )
+        expect( Hoodoo::Utilities.standard_datetime(instance.created_at) ).to eq( Hoodoo::Utilities.standard_datetime(@time) )
+        expect( Hoodoo::Utilities.standard_datetime(instance.updated_at) ).to eq( Hoodoo::Utilities.standard_datetime(@time) )
       end
 
       it 'creates with provided attributes' do

data/spec/active/active_record/error_mapping_spec.rb

@@ -152,7 +152,7 @@ describe Hoodoo::ActiveRecord::ErrorMapping do
     } )
 
     array_col = RSpecModelErrorMappingTest.columns_hash[ 'array' ]
-    expect( array_col ).to receive( :array ).once.and_return( true )
+    expect(array_col.array).to eq( true )
 
     m.adds_errors_to?( @errors )
 

data/spec/active/active_record/security_helper_spec.rb

@@ -79,13 +79,6 @@ describe Hoodoo::ActiveRecord::Secure::SecurityHelper do
       it 'and matches when it should' do
         expect( proc().call( '12!' ) ).to eql( true )
         expect( proc().call( '12!3' ) ).to eql( true )
-
-        if ''.respond_to?( :match? )
-          expect( proc().call( TestAllMatchersObject.new ) ).to eql( true )
-        else
-          expect_any_instance_of( Regexp ).to receive( :match ).and_return( true )
-          proc().call( TestAllMatchersObject.new )
-        end
       end
 
       it 'and misses when it should' do
@@ -95,59 +88,15 @@ describe Hoodoo::ActiveRecord::Secure::SecurityHelper do
         expect( proc().call( { :hello => :world } ) ).to eql( false )
         expect( proc().call( [ 1, 2, 3, 4 ] ) ).to eql( false )
       end
-
-      it 'and rescues' do
-        if ''.respond_to?( :match? )
-          expect( proc().call( TestRescueAllMatchersObject.new ) ).to eql( false )
-        else
-          expect_any_instance_of( Regexp ).to receive( :match ).and_raise( RuntimeError )
-          proc().call( TestRescueAllMatchersObject.new )
-        end
-      end
     end
-
-    # Tests running on Ruby >= 2.4 need String#match? knocking out for a
-    # while, for code coverage.
-    #
-    context 'with slow matcher' do
-      before :each do
-        @unbound_method = nil
-
-        if ''.respond_to?( :match? )
-          @unbound_method = String.instance_method( :match? )
-          String.send( :remove_method, :match? )
-        end
-      end
-
-      after :each do
-        unless @unbound_method.nil?
-          String.send( :define_method, :match?, @unbound_method )
-        end
-      end
-
-      context 'constructed with a String' do
-        it_behaves_like 'a ::matches_wildcard Proc'
-      end
-
-      context 'constructed with a Regexp' do
-        let( :param ) { /^..!.*/ }
-        it_behaves_like 'a ::matches_wildcard Proc'
-      end
+    
+    context 'constructed with a String' do
+      it_behaves_like 'a ::matches_wildcard Proc'
     end
 
-    # Tests running on Ruby < 2.4 can't do the fast match tests.
-    #
-    if ''.respond_to?( :match? )
-      context 'with fast matcher' do
-        context 'constructed with a String' do
-          it_behaves_like 'a ::matches_wildcard Proc'
-        end
-
-        context 'constructed with a Regexp' do
-          let( :param ) { /^..!.*/ }
-          it_behaves_like 'a ::matches_wildcard Proc'
-        end
-      end
+    context 'constructed with a Regexp' do
+      let( :param ) { /^..!.*/ }
+      it_behaves_like 'a ::matches_wildcard Proc'
     end
   end
 

data/spec/active/active_record/support_spec.rb

@@ -461,7 +461,7 @@ describe Hoodoo::ActiveRecord::Support do
       } )
 
       array_col = RSpecModelErrorMappingTest.columns_hash[ 'array' ]
-      expect( array_col ).to receive( :array ).once.and_return( true )
+      expect(array_col.array).to eq( true )
 
       m.validate()
       expect( described_class.translate_errors_on( m ).errors ).to eq( [

data/spec/active/active_record/uuid_spec.rb

@@ -28,7 +28,7 @@ describe Hoodoo::ActiveRecord::UUID do
   it 'should complain about a bad UUID' do
     m = RSpecModelUUIDTest.new
     m.id = "hello"
-
+    
     expect( m.save ).to eq( false )
     expect( Hoodoo::UUID.valid?( m.id ) ).to eq( false )
     expect( m.errors ).to_not be_empty

data/spec/client/client_spec.rb

@@ -271,7 +271,7 @@ describe Hoodoo::Client do
   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 ) )
+    @client          = Hoodoo::Client.new( **opts.merge( :locale => @locale ) )
 
     endpoint_opts = {}
 
@@ -567,7 +567,7 @@ describe Hoodoo::Client do
         )
 
         expect_any_instance_of( Net::HTTP ).to receive( :open_timeout= ).with( timeout ).and_call_original
-        expect( Timeout ).to receive( :timeout ).with( timeout, Net::OpenTimeout ).once do
+        allow_any_instance_of( Net::HTTP ).to receive( :connect ) do
           raise Net::OpenTimeout
         end
       end
@@ -575,7 +575,6 @@ describe Hoodoo::Client do
       it 'times out elegantly' do
         mock_ident = Hoodoo::UUID.generate()
         result     = @endpoint.show( mock_ident )
-
         expect( result.platform_errors.has_errors? ).to eq( true )
         expect( result.platform_errors.errors[ 0 ][ 'code' ] ).to eq( 'platform.timeout' )
       end

data/spec/client/paginated_enumeration_spec.rb

@@ -222,11 +222,10 @@ describe Hoodoo::Client do
   end
 
   before :each do
-
-    @client = Hoodoo::Client.new({
+    @client = Hoodoo::Client.new(
       drb_port:     URI.parse( Hoodoo::Services::Discovery::ByDRb::DRbServer.uri() ).port,
       auto_session: false
-    })
+    )
 
   end
 

data/spec/files/regenerate.rb

@@ -29,7 +29,7 @@ cert.extensions = [
 cert.add_extension ef.create_extension("authorityKeyIdentifier",
                                        "keyid:always,issuer:always")
 
-cert.sign key, OpenSSL::Digest::SHA256.new
+cert.sign key, OpenSSL::Digest.new('SHA256')
 
 open  keyd, 'w' do |io| io.write  key.to_pem end
 open certd, 'w' do |io| io.write cert.to_pem end

data/spec/monkey/patch/datadog_traced_amqp_spec.rb

@@ -14,8 +14,8 @@ describe Hoodoo::Monkey::Patch::DatadogTracedAMQP, :order => :defined do
   # count them.
   #
   before :all do
-    @@endpoint_do_amqp_count  = 0
-    @@datadog_trace_count     = 0
+    CounterAMQ.endpoint_do_amqp_count  = 0
+    CounterAMQ.datadog_trace_count     = 0
 
     # Stub Datadog
     class Datadog
@@ -39,14 +39,14 @@ describe Hoodoo::Monkey::Patch::DatadogTracedAMQP, :order => :defined do
 
     allow_any_instance_of( Hoodoo::Client::Endpoint::AMQP ).to receive( :do_amqp ) do | instance, description_of_request |
       result = original_do_amqp.bind( instance ).call( description_of_request )
-      @@endpoint_do_amqp_count += 1
+      CounterAMQ.endpoint_do_amqp_count += 1
       result
     end
 
     allow_any_instance_of( Datadog ).to receive( :trace ) do | &block |
       # Datadog Trace method responds with a yielded span this is here to mock tha
       span = double('span', trace_id: 'trace_id', span_id: 'span_id').as_null_object
-      @@datadog_trace_count += 1
+      CounterAMQ.datadog_trace_count += 1
       block.call(span)
     end
   end
@@ -64,8 +64,15 @@ describe Hoodoo::Monkey::Patch::DatadogTracedAMQP, :order => :defined do
 
   context 'afterwards' do
     it 'has non-zero NewRelic method call counts' do
-      expect( @@endpoint_do_amqp_count ).to be > 5
-      expect( @@datadog_trace_count ).to eq( @@endpoint_do_amqp_count )
+      expect( CounterAMQ.endpoint_do_amqp_count ).to be > 5
+      expect( CounterAMQ.datadog_trace_count ).to eq( CounterAMQ.endpoint_do_amqp_count )
     end
   end
+end
+
+# Hits accumulator
+class CounterAMQ
+  class << self
+    attr_accessor :endpoint_do_amqp_count, :datadog_trace_count
+  end
 end

data/spec/monkey/patch/newrelic_traced_amqp_spec.rb

@@ -14,9 +14,9 @@ describe Hoodoo::Monkey::Patch::NewRelicTracedAMQP, :order => :defined do
   # count them.
   #
   before :all do
-    @@endpoint_do_amqp_count       = 0
-    @@newrelic_crossapp_count      = 0
-    @@newrelic_agent_disable_count = 0
+    CounterAMQ.endpoint_do_amqp_count = 0
+    CounterAMQ.newrelic_crossapp_count = 0
+    CounterAMQ.newrelic_agent_disable_count = 0
 
     Hoodoo::Monkey.enable( extension_module: Hoodoo::Monkey::Patch::NewRelicTracedAMQP )
 
@@ -44,14 +44,14 @@ describe Hoodoo::Monkey::Patch::NewRelicTracedAMQP, :order => :defined do
     #
     allow_any_instance_of( Hoodoo::Client::Endpoint::AMQP ).to receive( :do_amqp ) do | instance, description_of_request |
       result = original_do_amqp.bind( instance ).call( description_of_request )
-      @@endpoint_do_amqp_count += 1
+      CounterAMQ.endpoint_do_amqp_count += 1
       result
     end
 
     # We should always start a new Segment...
     #
     allow( ::NewRelic::Agent::Transaction ).to receive( :start_external_request_segment ) do | type, uri, method |
-      @@newrelic_crossapp_count += 1
+      CounterAMQ.newrelic_crossapp_count += 1
 
       expect( type   ).to   eq( 'AlchemyFlux' )
       expect( uri    ).to be_a( URI           )
@@ -64,7 +64,7 @@ describe Hoodoo::Monkey::Patch::NewRelicTracedAMQP, :order => :defined do
     # that segment.
     #
     allow_any_instance_of( ::NewRelic::Agent::Transaction::Segment ).to receive( :finish ) do
-      @@newrelic_agent_disable_count += 1
+      CounterAMQ.newrelic_agent_disable_count += 1
     end
   end
 
@@ -72,9 +72,9 @@ describe Hoodoo::Monkey::Patch::NewRelicTracedAMQP, :order => :defined do
 
   context 'afterwards' do
     it 'has non-zero NewRelic method call counts' do
-      expect( @@endpoint_do_amqp_count       ).to be > 5
-      expect( @@newrelic_crossapp_count      ).to eq( @@endpoint_do_amqp_count )
-      expect( @@newrelic_agent_disable_count ).to eq( @@endpoint_do_amqp_count )
+      expect( CounterAMQ.endpoint_do_amqp_count       ).to be > 5
+      expect( CounterAMQ.newrelic_crossapp_count      ).to eq( CounterAMQ.endpoint_do_amqp_count )
+      expect( CounterAMQ.newrelic_agent_disable_count ).to eq( CounterAMQ.endpoint_do_amqp_count )
     end
   end
 end
@@ -191,3 +191,10 @@ describe Hoodoo::Monkey::Patch::NewRelicTracedAMQP::AlchemyFluxHTTPResponseWrapp
     expect( @wrapper.to_hash ).to eq( @http_response[ 'headers' ] )
   end
 end
+
+# Hits accumulator
+class CounterAMQ
+  class << self
+    attr_accessor :endpoint_do_amqp_count, :newrelic_crossapp_count, :newrelic_agent_disable_count
+  end
+end

data/spec/spec_helper.rb

@@ -199,6 +199,8 @@ def spec_helper_connect_to_postgres( database_name = 'postgres' )
   ActiveRecord::Base.establish_connection(
     :adapter  => 'postgresql',
     :username => ENV[ 'DATABASE_USER' ],
+    :host     => '127.0.0.1',
+    :port     => ENV[ 'DATABASE_PORT' ] || 5432,
     :database => database_name
   )
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hoodoo
 version: !ruby/object:Gem::Version
-  version: 2.12.10
+  version: 3.1.1
 platform: ruby
 authors:
 - Loyalty New Zealand
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-27 00:00:00.000000000 Z
+date: 2022-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dalli
@@ -44,28 +44,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.4.3
+        version: 7.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.4.3
+        version: 7.0.1
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.4.3
+        version: 7.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.4.3
+        version: 7.0.1
 - !ruby/object:Gem::Dependency
   name: airbrake
   requirement: !ruby/object:Gem::Requirement
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: le
   requirement: !ruby/object:Gem::Requirement
@@ -207,75 +207,75 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '12.0'
 - !ruby/object:Gem::Dependency
-  name: raygun4ruby
+  name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
-  name: redis
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.11'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '3.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '3.11'
 - !ruby/object:Gem::Dependency
-  name: rspec-mocks
+  name: simplecov-rcov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '0.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
-  name: simplecov-rcov
+  name: webrick
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
@@ -416,7 +416,6 @@ files:
 - lib/hoodoo/services/middleware/exception_reporting/base_reporter.rb
 - lib/hoodoo/services/middleware/exception_reporting/exception_reporting.rb
 - lib/hoodoo/services/middleware/exception_reporting/reporters/airbrake_reporter.rb
-- lib/hoodoo/services/middleware/exception_reporting/reporters/raygun_reporter.rb
 - lib/hoodoo/services/middleware/interaction.rb
 - lib/hoodoo/services/middleware/middleware.rb
 - lib/hoodoo/services/middleware/rack_monkey_patch.rb
@@ -533,7 +532,6 @@ files:
 - spec/services/middleware/exception_reporting/base_reporter_spec.rb
 - spec/services/middleware/exception_reporting/exception_reporting_spec.rb
 - spec/services/middleware/exception_reporting/reporters/airbrake_reporter_spec.rb
-- spec/services/middleware/exception_reporting/reporters/raygun_reporter_spec.rb
 - spec/services/middleware/middleware_assumed_identity_spec.rb
 - spec/services/middleware/middleware_cors_spec.rb
 - spec/services/middleware/middleware_create_update_spec.rb
@@ -577,139 +575,138 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.5
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.28
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Opinionated APIs
 test_files:
 - spec/shared_examples/middleware_amqp.rb
+- spec/logger/writers/file_writer_spec.rb
+- spec/logger/writers/stream_writer_spec.rb
+- spec/logger/writers/log_entries_dot_com_writer_spec.rb
+- spec/logger/slow_writer_spec.rb
+- spec/logger/logger_spec.rb
+- spec/logger/fast_writer_spec.rb
+- spec/integration/service_actions_spec.rb
+- spec/new_relic/agent/transaction.rb
+- spec/new_relic/agent/method_tracer.rb
+- spec/new_relic/agent/logger.rb
+- spec/utilities/utilities_spec.rb
+- spec/utilities/uuid_spec.rb
 - spec/newrelic_rpm.rb
-- spec/errors/error_descriptions_spec.rb
 - spec/errors/errors_spec.rb
-- spec/ddtrace.rb
-- spec/services/services/interface_spec.rb
-- spec/services/services/application_spec.rb
-- spec/services/services/session_spec.rb
+- spec/errors/error_descriptions_spec.rb
+- spec/active/active_record/dated_spec.rb
+- spec/active/active_record/error_mapping_spec.rb
+- spec/active/active_record/translated_spec.rb
+- spec/active/active_record/security_helper_spec.rb
+- spec/active/active_record/uuid_spec.rb
+- spec/active/active_record/base_spec.rb
+- spec/active/active_record/manually_dated_spec.rb
+- spec/active/active_record/writer_spec.rb
+- spec/active/active_record/creator_spec.rb
+- spec/active/active_record/finder_spec.rb
+- spec/active/active_record/search_helper_spec.rb
+- spec/active/active_record/error_mapping_shared_context.rb
+- spec/active/active_record/support_spec.rb
+- spec/active/active_record/secure_spec.rb
+- spec/data/resources/errors_spec.rb
+- spec/data/resources/caller_spec.rb
+- spec/data/resources/log_spec.rb
+- spec/data/resources/session_spec.rb
+- spec/data/types/error_primitive_spec.rb
+- spec/data/types/permissions_resources_spec.rb
+- spec/data/types/permissions_spec.rb
+- spec/data/types/permissions_defaults_spec.rb
+- spec/data/types/permissions_full_spec.rb
+- spec/communicators/pool_spec.rb
+- spec/communicators/fast_spec.rb
+- spec/communicators/slow_spec.rb
+- spec/monkey/monkey_spec.rb
+- spec/monkey/patch/newrelic_traced_amqp_spec.rb
+- spec/monkey/patch/newrelic_middleware_analytics_spec.rb
+- spec/monkey/patch/datadog_traced_amqp_spec.rb
 - spec/services/services/response_spec.rb
-- spec/services/services/permissions_spec.rb
 - spec/services/services/request_spec.rb
+- spec/services/services/permissions_spec.rb
 - spec/services/services/implementation_spec.rb
 - spec/services/services/context_spec.rb
-- spec/services/discovery/discovery_spec.rb
-- spec/services/discovery/results/for_remote_spec.rb
-- spec/services/discovery/results/for_http_spec.rb
-- spec/services/discovery/results/for_amqp_spec.rb
-- spec/services/discovery/results/for_local_spec.rb
-- spec/services/discovery/discoverers/by_convention_spec.rb
-- spec/services/discovery/discoverers/by_flux_spec.rb
-- spec/services/discovery/discoverers/by_drb/by_drb_spec.rb
-- spec/services/discovery/discoverers/by_drb/drb_server_spec.rb
-- spec/services/middleware/endpoints/inter_resource_remote_spec.rb
-- spec/services/middleware/endpoints/inter_resource_local_spec.rb
-- spec/services/middleware/middleware_assumed_identity_spec.rb
-- spec/services/middleware/middleware_create_update_spec.rb
-- spec/services/middleware/middleware_spec.rb
-- spec/services/middleware/middleware_exotic_communication_spec.rb
+- spec/services/services/application_spec.rb
+- spec/services/services/session_spec.rb
+- spec/services/services/interface_spec.rb
 - spec/services/middleware/string_inquirer_spec.rb
-- spec/services/middleware/middleware_public_spec.rb
+- spec/services/middleware/amqp_log_writer_spec.rb
 - spec/services/middleware/middleware_logging_spec.rb
 - spec/services/middleware/middleware_dated_at_spec.rb
 - spec/services/middleware/middleware_multi_local_spec.rb
-- spec/services/middleware/amqp_log_writer_spec.rb
-- spec/services/middleware/middleware_cors_spec.rb
+- spec/services/middleware/middleware_exotic_communication_spec.rb
+- spec/services/middleware/middleware_spec.rb
 - spec/services/middleware/middleware_permissions_spec.rb
-- spec/services/middleware/exception_reporting/exception_reporting_spec.rb
+- spec/services/middleware/middleware_assumed_identity_spec.rb
+- spec/services/middleware/endpoints/inter_resource_remote_spec.rb
+- spec/services/middleware/endpoints/inter_resource_local_spec.rb
 - spec/services/middleware/exception_reporting/reporters/airbrake_reporter_spec.rb
-- spec/services/middleware/exception_reporting/reporters/raygun_reporter_spec.rb
 - spec/services/middleware/exception_reporting/base_reporter_spec.rb
+- spec/services/middleware/exception_reporting/exception_reporting_spec.rb
+- spec/services/middleware/middleware_create_update_spec.rb
+- spec/services/middleware/middleware_cors_spec.rb
 - spec/services/middleware/middleware_multi_remote_spec.rb
-- spec/files/regenerate.rb
-- spec/integration/service_actions_spec.rb
-- spec/new_relic/agent/transaction.rb
-- spec/new_relic/agent/method_tracer.rb
-- spec/new_relic/agent/logger.rb
-- spec/communicators/pool_spec.rb
-- spec/communicators/slow_spec.rb
-- spec/communicators/fast_spec.rb
-- spec/transient_store/transient_store/mocks/dalli_client_spec.rb
-- spec/transient_store/transient_store/mocks/redis_spec.rb
-- spec/transient_store/transient_store/memcached_redis_mirror_spec.rb
+- spec/services/middleware/middleware_public_spec.rb
+- spec/services/discovery/discoverers/by_convention_spec.rb
+- spec/services/discovery/discoverers/by_flux_spec.rb
+- spec/services/discovery/discoverers/by_drb/drb_server_spec.rb
+- spec/services/discovery/discoverers/by_drb/by_drb_spec.rb
+- spec/services/discovery/results/for_local_spec.rb
+- spec/services/discovery/results/for_http_spec.rb
+- spec/services/discovery/results/for_remote_spec.rb
+- spec/services/discovery/results/for_amqp_spec.rb
+- spec/services/discovery/discovery_spec.rb
+- spec/client/augmented_array_spec.rb
+- spec/client/client_spec.rb
+- spec/client/paginated_enumeration_spec.rb
+- spec/client/headers_spec.rb
+- spec/client/endpoint/endpoint_spec.rb
+- spec/client/endpoint/endpoints/http_based_spec.rb
+- spec/client/endpoint/endpoints/auto_session_spec.rb
+- spec/client/endpoint/endpoints/amqp_spec.rb
+- spec/client/endpoint/endpoints/not_found_spec.rb
+- spec/client/endpoint/endpoints/http_spec.rb
+- spec/client/augmented_base_spec.rb
+- spec/client/augmented_hash_spec.rb
+- spec/transient_store/transient_store/memcached_spec.rb
 - spec/transient_store/transient_store/base_spec.rb
 - spec/transient_store/transient_store/redis_spec.rb
-- spec/transient_store/transient_store/memcached_spec.rb
+- spec/transient_store/transient_store/memcached_redis_mirror_spec.rb
+- spec/transient_store/transient_store/mocks/redis_spec.rb
+- spec/transient_store/transient_store/mocks/dalli_client_spec.rb
 - spec/transient_store/transient_store_spec.rb
-- spec/spec_helper.rb
-- spec/utilities/uuid_spec.rb
-- spec/utilities/utilities_spec.rb
-- spec/presenters/common_resource_fields_spec.rb
 - spec/presenters/embedding_spec.rb
 - spec/presenters/base_spec.rb
 - spec/presenters/walk_spec.rb
-- spec/presenters/types/float_spec.rb
+- spec/presenters/common_resource_fields_spec.rb
+- spec/presenters/base_dsl_spec.rb
+- spec/presenters/types/field_spec.rb
 - spec/presenters/types/text_spec.rb
 - spec/presenters/types/date_spec.rb
+- spec/presenters/types/date_time_spec.rb
+- spec/presenters/types/boolean_spec.rb
 - spec/presenters/types/uuid_spec.rb
-- spec/presenters/types/object_spec.rb
+- spec/presenters/types/float_spec.rb
+- spec/presenters/types/string_spec.rb
 - spec/presenters/types/hash_spec.rb
-- spec/presenters/types/field_spec.rb
 - spec/presenters/types/array_spec.rb
 - spec/presenters/types/decimal_spec.rb
-- spec/presenters/types/string_spec.rb
-- spec/presenters/types/enum_spec.rb
-- spec/presenters/types/boolean_spec.rb
-- spec/presenters/types/date_time_spec.rb
 - spec/presenters/types/integer_spec.rb
+- spec/presenters/types/object_spec.rb
 - spec/presenters/types/tags_spec.rb
-- spec/presenters/base_dsl_spec.rb
-- spec/monkey/patch/newrelic_traced_amqp_spec.rb
-- spec/monkey/patch/datadog_traced_amqp_spec.rb
-- spec/monkey/patch/newrelic_middleware_analytics_spec.rb
-- spec/monkey/monkey_spec.rb
-- spec/logger/slow_writer_spec.rb
-- spec/logger/logger_spec.rb
-- spec/logger/fast_writer_spec.rb
-- spec/logger/writers/stream_writer_spec.rb
-- spec/logger/writers/file_writer_spec.rb
-- spec/logger/writers/log_entries_dot_com_writer_spec.rb
-- spec/client/augmented_array_spec.rb
-- spec/client/paginated_enumeration_spec.rb
-- spec/client/endpoint/endpoints/http_spec.rb
-- spec/client/endpoint/endpoints/http_based_spec.rb
-- spec/client/endpoint/endpoints/amqp_spec.rb
-- spec/client/endpoint/endpoints/not_found_spec.rb
-- spec/client/endpoint/endpoints/auto_session_spec.rb
-- spec/client/endpoint/endpoint_spec.rb
-- spec/client/headers_spec.rb
-- spec/client/augmented_hash_spec.rb
-- spec/client/augmented_base_spec.rb
-- spec/client/client_spec.rb
-- spec/active/active_record/translated_spec.rb
-- spec/active/active_record/secure_spec.rb
-- spec/active/active_record/support_spec.rb
-- spec/active/active_record/search_helper_spec.rb
-- spec/active/active_record/uuid_spec.rb
-- spec/active/active_record/security_helper_spec.rb
-- spec/active/active_record/dated_spec.rb
-- spec/active/active_record/base_spec.rb
-- spec/active/active_record/manually_dated_spec.rb
-- spec/active/active_record/error_mapping_shared_context.rb
-- spec/active/active_record/writer_spec.rb
-- spec/active/active_record/error_mapping_spec.rb
-- spec/active/active_record/finder_spec.rb
-- spec/active/active_record/creator_spec.rb
-- spec/data/resources/log_spec.rb
-- spec/data/resources/errors_spec.rb
-- spec/data/resources/session_spec.rb
-- spec/data/resources/caller_spec.rb
-- spec/data/types/error_primitive_spec.rb
-- spec/data/types/permissions_defaults_spec.rb
-- spec/data/types/permissions_resources_spec.rb
-- spec/data/types/permissions_full_spec.rb
-- spec/data/types/permissions_spec.rb
+- spec/presenters/types/enum_spec.rb
+- spec/spec_helper.rb
+- spec/files/regenerate.rb
+- spec/ddtrace.rb

data/lib/hoodoo/services/middleware/exception_reporting/reporters/raygun_reporter.rb

@@ -1,79 +0,0 @@
-########################################################################
-# File::    raygun_reporter.rb
-# (C)::     Loyalty New Zealand 2014
-#
-# Purpose:: Send exception details to Raygun.
-# ----------------------------------------------------------------------
-#           08-Dec-2014 (ADH): Created.
-########################################################################
-
-module Hoodoo; module Services
-  class Middleware
-
-    class ExceptionReporting
-
-      # Hoodoo::Services::Middleware::ExceptionReporting::BaseReporter subclass
-      # giving Hoodoo::Services::Middleware::ExceptionReporting access to
-      # Raygun for error reporting. See https://raygun.io.
-      #
-      # Your application must include the Raygun gem 'raygun4ruby' via Gemfile
-      # (+gem 'raygun4ruby'+ / +bundle install) or direct installation (+gem
-      # install raygun4ruby+).
-      #
-      # The API key must be set during your application initialization and the
-      # class must be added to Hoodoo for use as an error reporter, e.g.
-      # through a 'config/initializers' folder, as follows:
-      #
-      #     require 'raygun4ruby'
-      #
-      #     Raygun.setup do | config |
-      #       config.api_key = 'YOUR_RAYGUN_API_KEY'
-      #     end
-      #
-      #     Hoodoo::Services::Middleware::ExceptionReporting.add(
-      #       Hoodoo::Services::Middleware::ExceptionReporting::RaygunReporter
-      #     ) unless Service.config.env.test? || Service.config.env.development?
-      #
-      # Services and the Hoodoo middleware do not pass Rails-like params
-      # around in forms or query strings, but do beware of search or filter
-      # query data containing sensitive material or POST bodies in e.g. JSON
-      # encoding containing sensitive data. This comes down to the filtering
-      # ability of the Raygun gem:
-      #
-      #   https://github.com/MindscapeHQ/raygun4ruby
-      #
-      class RaygunReporter < Hoodoo::Services::Middleware::ExceptionReporting::BaseReporter
-
-        # Report an exception to Raygun.
-        #
-        # +e+::   Exception (or subclass) instance to be reported.
-        #
-        # +env+:: Optional Rack environment hash for the inbound request,
-        #         for exception reports made in the context of Rack request
-        #         handling.
-        #
-        def report( e, env = nil )
-          Raygun.track_exception( e, env )
-        end
-
-        # Report an exception for errors that occur within a fully handled Rack
-        # request context, with a high level processed Hoodoo representation
-        # available.
-        #
-        # +e+::       Exception (or subclass) instance to be reported.
-        #
-        # +context+:: Hoodoo::Services::Context instance describing an
-        #             in-flight request/response cycle.
-        #
-        def contextual_report( e, context )
-          hash = context.owning_interaction.rack_request.env rescue {}
-          hash = hash.merge( :custom_data => user_data_for( context ) || { 'user_data' => 'unknown' } )
-
-          Raygun.track_exception( e, hash )
-        end
-      end
-
-    end
-
-  end
-end; end

data/spec/services/middleware/exception_reporting/reporters/raygun_reporter_spec.rb

@@ -1,89 +0,0 @@
-require 'spec_helper'
-require 'raygun4ruby'
-
-# This doesn't test the Raygun gem / configuration itself - just check that
-# the appropriate Raygun method gets called.
-
-describe Hoodoo::Services::Middleware::ExceptionReporting::RaygunReporter do
-
-  before :each do
-    Hoodoo::Services::Middleware::ExceptionReporting.add( described_class )
-  end
-
-  after :each do
-    Hoodoo::Services::Middleware::ExceptionReporting.wait()
-    Hoodoo::Services::Middleware::ExceptionReporting.remove( described_class )
-  end
-
-  context '#report' do
-    it 'calls Raygun correctly without an "env"' do
-      ex = RuntimeError.new( 'A' )
-
-      expect( Raygun ).to receive( :track_exception ).once do | e, opts |
-        expect( e ).to be_a( Exception )
-        expect( opts ).to be_nil
-      end
-
-      Hoodoo::Services::Middleware::ExceptionReporting.report( ex )
-    end
-
-    it 'calls Raygun correctly with an "env"' do
-      ex       = RuntimeError.new( 'A' )
-      mock_env = { 'rack' => 'request' }
-
-      expect( Raygun ).to receive( :track_exception ).once do | e, opts |
-        expect( e ).to be_a( Exception )
-
-        expect( opts ).to be_a( Hash )
-        expect( opts ).to eq( mock_env )
-      end
-
-      Hoodoo::Services::Middleware::ExceptionReporting.report( ex, mock_env )
-    end
-  end
-
-  context '#contextual_report' do
-    it 'calls Raygun correctly' do
-      ex             = RuntimeError.new( 'A' )
-      co             = OpenStruct.new
-      mock_user_data = { :foo => :bar }
-      mock_env       = { 'rack' => 'request' }
-
-      co.owning_interaction                  = OpenStruct.new
-      co.owning_interaction.rack_request     = OpenStruct.new
-      co.owning_interaction.rack_request.env = mock_env
-
-      expect( described_class.instance ).to receive( :user_data_for ).once.and_return( mock_user_data )
-
-      expect( Raygun ).to receive( :track_exception ).once do | e, opts |
-        expect( e ).to be_a( Exception )
-
-        expect( opts ).to be_a( Hash )
-        expect( opts ).to eq( mock_env.merge( :custom_data => mock_user_data ) )
-      end
-
-      Hoodoo::Services::Middleware::ExceptionReporting.contextual_report( ex, co )
-    end
-
-    it 'has special case handling for user data recovery failure' do
-      ex       = RuntimeError.new( 'A' )
-      co       = OpenStruct.new
-      mock_env = { 'rack' => 'request' }
-
-      co.owning_interaction                  = OpenStruct.new
-      co.owning_interaction.rack_request     = OpenStruct.new
-      co.owning_interaction.rack_request.env = mock_env
-
-      expect( described_class.instance ).to receive( :user_data_for ).once.and_return( nil )
-
-      expect( Raygun ).to receive( :track_exception ).once do | e, opts |
-        expect( e ).to be_a( Exception )
-
-        expect( opts ).to be_a( Hash )
-        expect( opts ).to eq( mock_env.merge( :custom_data => { 'user_data' => 'unknown' } ) )
-      end
-
-      Hoodoo::Services::Middleware::ExceptionReporting.contextual_report( ex, co )
-    end
-  end
-end