olek-paperclipftp 0.1.0.1 → 0.1.0.2

data/VERSION

@@ -1 +1 @@
-0.1.0.1
+0.1.0.2

data/lib/paperclipftp.rb

@@ -4,7 +4,7 @@ module Paperclip
       def self.extended base
         require 'net/ftp'
         base.instance_eval do
-          @ftp_credentials = parse_credentials
+          @ftp_credentials = parse_credentials(@options[:ftp_credentials])
         end
       end
 
@@ -84,12 +84,6 @@ module Paperclip
 
       private
 
-      def parse_credentials
-        creds = YAML.load_file(File.join(RAILS_ROOT,"config","paperclipftp.yml"))
-        creds = creds.stringify_keys
-        (creds[RAILS_ENV] || creds).symbolize_keys
-      end
-
       def file_size(remote_path)
         ftp.size(remote_path)
       rescue Net::FTPPermError => e
@@ -100,6 +94,25 @@ module Paperclip
         raise e
       end
 
+      def parse_credentials creds
+        creds = find_credentials(creds).stringify_keys
+        (creds[Rails.env] || creds).symbolize_keys
+      end
+
+      def find_credentials creds
+        case creds
+        when File
+          YAML::load(ERB.new(File.read(creds.path)).result)
+        when String, Pathname
+          YAML::load(ERB.new(File.read(creds)).result)
+        when Hash
+          creds
+        else
+          raise ArgumentError, "Credentials are not a path, file, or hash."
+        end
+      end
+
+
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: olek-paperclipftp
 version: !ruby/object:Gem::Version 
-  hash: 69
+  hash: 67
   prerelease: 
   segments: 
   - 0
   - 1
   - 0
-  - 1
-  version: 0.1.0.1
+  - 2
+  version: 0.1.0.2
 platform: ruby
 authors: 
 - Damian Caruso
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-20 00:00:00 -04:00
+date: 2011-04-21 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency