model_attachment 0.0.6 → 0.0.7

data/lib/model_attachment.rb

@@ -14,7 +14,7 @@ require 'model_attachment/amazon'
 
 # The base module that gets included in ActiveRecord::Base.
 module ModelAttachment
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
   
   class << self
     
@@ -70,6 +70,7 @@ module ModelAttachment
       before_destroy :destroy_attached_files
       
     end
+
     
     # Places ActiveRecord-style validations on the size of the file assigned. The
     # possible options are:
@@ -126,21 +127,42 @@ module ModelAttachment
       proto       = options[:proto]        || "http"
       port        = options[:port]
       server_name = options[:server_name]  || "localhost"
-      url_path    = options[:path]         || "/documents/send"
+      url_path    = options[:path]         || "/#{self.class.to_s.downcase.pluralize}/deliver/"
       type        = options[:type]
-      server_name += ":" + port if port
+      server_name += ":" + port.to_s if port
+      type_string = "?type=#{type}" if type
+      
+      unless self.class.attachment_options[:aws]
+        bucket = nil
+      end
+      
+      # if files are public, serve public url
+      if public?
+        url_path = path.gsub(/^\/public(.*)/, '\1')
+        type_string = "_#{type}" if type
+        url = "#{proto}://#{server_name}#{url_path}#{basename}#{type_string}#{extension}"
+      elsif !bucket.nil?
+        # if bucket is set, then use aws url
+        aws_url(type)
+      else
+        # otherwise use private url with deliver
+        url = "#{proto}://#{server_name}#{url_path}#{id}#{type_string}"
+      end
       
-      url = (bucket.nil? ? "#{proto}://#{server_name}#{url_path}?id=#{id}" : aws_url(type))
       log("Providing URL: #{url}")
       return url
     end
     
+    def public?
+      (path =~ /^\/public/)
+    end
+    
     # returns the rails path of the file
     def path 
       if (self.class.attachment_options[:path]) 
-        return "/system" + interpolate(self.class.attachment_options[:path])
+        return interpolate(self.class.attachment_options[:path])
       else 
-        return "/system/" + sprintf("%04d", id) + "/"
+        return "/public/#{self.class.to_s.downcase.pluralize}/" + sprintf("%04d", id) + "/"
       end
     end
     
@@ -175,6 +197,17 @@ module ModelAttachment
       content_type =~ /^image\//
     end
     
+    # create the path based on the template
+    def interpolate(path, *args)
+      #methods = ["domain", "folder", "document", "version", "user", "account"]
+      self.class.instance_methods(false).sort.reverse.inject( path.dup ) do |result, tag|
+        #$stderr.puts("Result: #{result} Tag: #{tag}")
+        result.gsub(/:#{tag}/) do |match|
+          send( tag, *args )
+        end
+      end
+    end
+    
     private
     
     def process_image_types #:nodoc:
@@ -236,16 +269,6 @@ module ModelAttachment
       end
     end
     
-    # create the path based on the template
-    def interpolate(path, *args)
-      methods = ["domain", "folder", "document", "version"]
-      methods.reverse.inject( path.dup ) do |result, tag|
-        result.gsub(/:#{tag}/) do |match|
-          send( tag, *args )
-        end
-      end
-    end
-    
     # removes any files associated with this instance
     def destroy_attached_files
       begin

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: model_attachment
 version: !ruby/object:Gem::Version 
-  version: 0.0.6
+  prerelease: false
+  segments: 
+  - 0
+  - 0
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - Steve Walker
@@ -9,29 +14,33 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-03 00:00:00 -04:00
+date: 2010-05-04 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sqlite3-ruby
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: activerecord
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id002
 description: Simple file attachment for ActiveRecord models
 email: steve@blackboxweb.com
 executables: []
@@ -65,18 +74,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: 
 - ImageMagick
 rubyforge_project: model_attachment
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Attach files to ActiveRecord models and run commands on images