From 2b47848da9451033f7792d6dbb9580076ddaa01d Mon Sep 17 00:00:00 2001
From: Steven Hancock <stevenh512@gmail.com>
Date: Mon, 11 Jun 2012 15:08:30 -0700
Subject: [PATCH] Autoload needs a string, not a Pathname
fixes #3373
---
lib/salmon/salmon.rb | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/lib/salmon/salmon.rb b/lib/salmon/salmon.rb
index 54fb3eaec2..c3ce02ae6f 100644
--- a/lib/salmon/salmon.rb
+++ b/lib/salmon/salmon.rb
@@ -24,7 +24,7 @@ end
# Verify documents secured with Magic Signatures
module Salmon
- autoload :Slap, Rails.root.join("lib", "salmon", "slap")
- autoload :EncryptedSlap, Rails.root.join("lib", "salmon", "encrypted_slap")
- autoload :MagicSigEnvelope, Rails.root.join("lib", "salmon", "magic_sig_envelope")
+ autoload :Slap, File.join(Rails.root, "lib", "salmon", "slap").to_s
+ autoload :EncryptedSlap, File.join(Rails.root, "lib", "salmon", "encrypted_slap").to_s
+ autoload :MagicSigEnvelope, File.join(Rails.root, "lib", "salmon", "magic_sig_envelope").to_s
end
--
GitLab