lib/scimitar.rb in scimitar-2.4.2 vs lib/scimitar.rb in scimitar-2.4.3
- old
+ new
@@ -2,20 +2,24 @@
require 'scimitar/support/hash_with_indifferent_case_insensitive_access'
require 'scimitar/engine'
module Scimitar
def self.service_provider_configuration=(custom_configuration)
- @service_provider_configuration = custom_configuration
+ if @service_provider_configuration.nil? || ! custom_configuration.uses_defaults
+ @service_provider_configuration = custom_configuration
+ end
end
def self.service_provider_configuration(location:)
@service_provider_configuration ||= ServiceProviderConfiguration.new
@service_provider_configuration.meta.location = location
@service_provider_configuration
end
def self.engine_configuration=(custom_configuration)
- @engine_configuration = custom_configuration
+ if @engine_configuration.nil? || ! custom_configuration.uses_defaults
+ @engine_configuration = custom_configuration
+ end
end
def self.engine_configuration
@engine_configuration ||= EngineConfiguration.new
@engine_configuration