lib/paperclip-fedora.rb in paperclip-fedora-0.2.4 vs lib/paperclip-fedora.rb in paperclip-fedora-0.2.5

@@ -16,10 +16,12 @@
           @fedora_config = parse_config(@options[:fedora_config])
           @host = @fedora_config[:host]
           @port = @fedora_config[:port]
           @context = @fedora_config[:context]
 
+          @custom_pid = @options[:fedora_pid]
+
           @server_url = "http\://#{@host}\:#{@port}/#{@context}"
 
           @path = ":basename_clean\::id"
           @url = "#{@server_url}/objects/#{@path}/datastreams/:style/content"
           
@@ -76,11 +78,11 @@
         @@repo ||= Rubydora.connect url: @server_url, user: @fedora_config[:user], password: @fedora_config[:password] 
         @@repo
       end
       
       def fedora_object
-        @object_id = path()
+        @object_id = @custom_pid || path()
         object = fedora.find(@object_id)
         object.label = @object_id
         saved_object = object.save
         saved_object
       end
@@ -89,14 +91,14 @@
         config = find_credentials(config).stringify_keys
         (config[Rails.env] || config).symbolize_keys
       end
 
       def setup!
-        FileUtils.cp(File.dirname(__FILE__) + "/../config/paperclip-fedora.yml", config_file) unless config?
+        FileUtils.cp(File.dirname(__FILE__) + "/../config/fedora.yml", config_file) unless config?
       end
 
       def config_file
-        Rails.root.join("config", "paperclip-fedora.yml").to_s
+        Rails.root.join("config", "fedora.yml").to_s
       end
       
       def config?
         File.file? config_file
       end