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

@@ -15,18 +15,14 @@
 
           @fedora_config = parse_config(@options[:fedora_config])
           @host = @fedora_config[:host]
           @port = @fedora_config[:port]
           @context = @fedora_config[:context]
+          @custom_namespace = @options[:fedora_pid]
 
-          @custom_pid = @options[:fedora_pid]
-
           @server_url = "http\://#{@host}\:#{@port}/#{@context}"
 
-          @path = ":basename_clean\::id"
-          @url = "#{@server_url}/objects/#{@path}/datastreams/:style/content"
-          
           Paperclip.interpolates(:basename_clean) do |attachment, style|
             s = File.basename(attachment.original_filename, File.extname(attachment.original_filename))
             s.downcase!
             s.gsub!(/'/, '')
             s.gsub!(/[^A-Za-z0-9:\-]+/, ' ')
@@ -78,10 +74,12 @@
         @@repo ||= Rubydora.connect url: @server_url, user: @fedora_config[:user], password: @fedora_config[:password] 
         @@repo
       end
       
       def fedora_object
-        @object_id = @custom_pid || path()
+        @object_id = instance.uuid || @custom_pid || path()
+        @path = @object_id
+        @url = "#{@server_url}/objects/#{@path}/datastreams/:style/content"
         object = fedora.find(@object_id)
         object.label = @object_id
         saved_object = object.save
         saved_object
       end