paperclip-fedora 0.2.3 → 0.2.4

data/README.md

@@ -19,7 +19,9 @@ For server connection options, you should have a file titled paperclip-fedora.ym
 
 `rake paperclip:fedora:setup`
 
-After that, go edit the yaml file with your server settings per rails environment (They default to a server on the localhost).
+After that, go edit the yaml file with your server settings per rails environment (They default to a Fedora Commons server on the localhost).
+The settings will reflect the default Fedora Commons settings: host (in form localhost or example.com), port, and context (Fedora Commons context,
+based on your Fedora Commons setup).
 
 ## Overview
 

data/config/paperclip-fedora.yml

@@ -1,14 +1,20 @@
 test:
   user: 'fedoraAdmin'
   password: 'fedoraAdmin'
-  host: 'http://localhost:8983/fedora'
+  host: 'localhost'
+  port: 8983
+  context: 'fedora'
 
 development:
   user: 'fedoraAdmin'
   password: 'fedoraAdmin'
-  host: 'http://localhost:8983/fedora'
+  host: 'localhost'
+  port: 8983
+  context: 'fedora'
 
 production:
   user: 'fedoraAdmin'
   password: 'fedoraAdmin'
-  host: 'http://localhost:8983/fedora'
+  host: 'localhost'
+  port: 8983
+  context: 'fedora'

data/lib/paperclip-fedora.rb

@@ -14,8 +14,14 @@ module Paperclip
           end
 
           @fedora_config = parse_config(@options[:fedora_config])
+          @host = @fedora_config[:host]
+          @port = @fedora_config[:port]
+          @context = @fedora_config[:context]
+
+          @server_url = "http\://#{@host}\:#{@port}/#{@context}"
+
           @path = ":basename_clean\::id"
-          @url = @fedora_config[:host] + "/objects/#{@path}/datastreams/:style/content"
+          @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))
@@ -67,7 +73,7 @@ module Paperclip
       end
 
       def fedora
-        @@repo ||= Rubydora.connect url: @fedora_config[:host], user: @fedora_config[:user], password: @fedora_config[:password] 
+        @@repo ||= Rubydora.connect url: @server_url, user: @fedora_config[:user], password: @fedora_config[:password] 
         @@repo
       end
       

data/lib/paperclip-fedora/version.rb

@@ -1,5 +1,5 @@
 module Paperclip
   module Fedora
-    VERSION = "0.2.3"
+    VERSION = "0.2.4"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: paperclip-fedora
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-16 00:00:00.000000000Z
+date: 2011-09-19 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &2160437080 !ruby/object:Gem::Requirement
+  requirement: &2156500140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160437080
+  version_requirements: *2156500140
 - !ruby/object:Gem::Dependency
   name: rubydora
-  requirement: &2160436540 !ruby/object:Gem::Requirement
+  requirement: &2156499720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160436540
+  version_requirements: *2156499720
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2160436000 !ruby/object:Gem::Requirement
+  requirement: &2156499260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160436000
+  version_requirements: *2156499260
 description: Adds Fedora Commons storage support for the Paperclip gem.
 email:
 - jaredsartin@gmail.com