lib/symmetric_encryption.rb in symmetric-encryption-3.7.2 vs lib/symmetric_encryption.rb in symmetric-encryption-3.8.0
- old
+ new
@@ -6,17 +6,23 @@
require 'symmetric_encryption/version'
require 'symmetric_encryption/cipher'
require 'symmetric_encryption/symmetric_encryption'
require 'symmetric_encryption/exception'
+#@formatter:off
module SymmetricEncryption
+ autoload :Coerce, 'symmetric_encryption/coerce'
+ autoload :Config, 'symmetric_encryption/config'
autoload :Reader, 'symmetric_encryption/reader'
autoload :Writer, 'symmetric_encryption/writer'
autoload :Generator, 'symmetric_encryption/generator'
end
+#@formatter:on
# Add support for other libraries only if they have already been loaded
require 'symmetric_encryption/railtie' if defined?(Rails)
-require 'symmetric_encryption/extensions/active_record/base' if defined?(ActiveRecord::Base)
+if defined?(ActiveRecord::Base) && !defined?(AttrEncrypted::Version)
+ require 'symmetric_encryption/extensions/active_record/base'
+end
require 'symmetric_encryption/railties/symmetric_encryption_validator' if defined?(ActiveModel)
require 'symmetric_encryption/extensions/mongoid/encrypted' if defined?(Mongoid)
require 'symmetric_encryption/extensions/mongo_mapper/plugins/encrypted_key' if defined?(MongoMapper)