model_attachment 0.0.7 → 0.0.8

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.7"
+  VERSION = "0.0.8"
   
   class << self
     
@@ -132,8 +132,9 @@ module ModelAttachment
       server_name += ":" + port.to_s if port
       type_string = "?type=#{type}" if type
       
-      unless self.class.attachment_options[:aws]
-        bucket = nil
+      # if we aren't using aws set @bucket to nil
+      if !self.class.attachment_options[:aws]
+        @bucket = nil
       end
       
       # if files are public, serve public url
@@ -141,12 +142,12 @@ module ModelAttachment
         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
+      elsif bucket.nil?
         # otherwise use private url with deliver
         url = "#{proto}://#{server_name}#{url_path}#{id}#{type_string}"
+      else
+        # if bucket is set, then use aws url
+        url = aws_url(type)
       end
       
       log("Providing URL: #{url}")
@@ -162,7 +163,7 @@ module ModelAttachment
       if (self.class.attachment_options[:path]) 
         return interpolate(self.class.attachment_options[:path])
       else 
-        return "/public/#{self.class.to_s.downcase.pluralize}/" + sprintf("%04d", id) + "/"
+        return "/public/system/#{self.class.to_s.downcase.pluralize}/" + sprintf("%04d", id) + "/"
       end
     end
     
@@ -197,10 +198,15 @@ module ModelAttachment
       content_type =~ /^image\//
     end
     
+    def valid_methods
+      # reject any methods that will cause issues
+      self.class.instance_methods.sort.reverse.reject {|m| m =~ /\W+/ }
+    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|
+      valid_methods.inject( path.dup ) do |result, tag|
         #$stderr.puts("Result: #{result} Tag: #{tag}")
         result.gsub(/:#{tag}/) do |match|
           send( tag, *args )

data/lib/model_attachment/amazon.rb

@@ -26,12 +26,12 @@ module ModelAttachment
       
     # connect to aws, uses access_key_id and secret_access_key in config/amazon.yml
     def aws_connect
+      log("aws_connect")
       return if AWS::S3::Base.connected?
     
       begin
         config = YAML.load_file(self.class.attachment_options[:aws]) 
         if config
-          log("Connect to Amazon")
           AWS::S3::Base.establish_connection!(
             :access_key_id     => config['access_key_id'],
             :secret_access_key => config['secret_access_key'],
@@ -48,9 +48,9 @@ module ModelAttachment
   
     # moves file to amazon along with modified images, removes local images once object existence is confirmed
     def move_to_amazon
+      log("Move #{aws_key} to Amazon.")
       aws_connect
       
-      log("Move #{aws_key} to Amazon.")
       begin
         AWS::S3::S3Object.store(aws_key, open(full_filename), default_bucket, :content_type => content_type)
         

data/test/model_attachment_test.rb

@@ -68,18 +68,18 @@ class DocumentDefault < Document
 end
 
 class DocumentNoResize < Document
-  has_attachment :path => "/:domain/:folder/:document/:version/"
+  has_attachment :path => "/system/:domain/:folder/:document/:version/"
 end
 
 class DocumentWithResize < Document
-  has_attachment :path => "/:domain/:folder/:document/:version/",
+  has_attachment :path => "/system/:domain/:folder/:document/:version/",
     :types => {
       :small => { :command => '/opt/local/bin/convert -geometry 100x100' } 
     }
 end
 
 class DocumentWithAWS < Document
-  has_attachment :path => "/:domain/:folder/:document/:version/", 
+  has_attachment :path => "/system/:domain/:folder/:document/:version/", 
     :aws => File.join(File.dirname(__FILE__), "amazon.yml"),
     :types => {
       :small => { :command => '/opt/local/bin/convert -geometry 100x100' } 
@@ -122,10 +122,10 @@ class ModelAttachmentTest < Test::Unit::TestCase
     assert_equal "test1.jpg", document.file_name
     assert_equal "image/jpeg", document.content_type
     
-    assert File.exists?(RAILS_ROOT + "/system/0001/test1.jpg")
+    assert File.exists?(RAILS_ROOT + "/public/system/documentdefaults/0001/test1.jpg")
     
     document.destroy
-    assert !File.exists?(RAILS_ROOT + "/system/0001/test1.jpg")
+    assert !File.exists?(RAILS_ROOT + "/public/system/documentdefaults/0001/test1.jpg")
   end
   
   def test_save_with_no_resize
@@ -161,7 +161,7 @@ class ModelAttachmentTest < Test::Unit::TestCase
     assert !File.exists?(RAILS_ROOT + "/system/bbs/1/1/0/test2.jpg")
     assert !File.exists?(RAILS_ROOT + "/system/bbs/1/1/0/test2_small.jpg")  
   end
-
+  
   def test_save_with_aws
     FileUtils.cp(RAILS_ROOT + "/assets/test.jpg", RAILS_ROOT + "/assets/test3.jpg")
     file = File.open(RAILS_ROOT + "/assets/test3.jpg")
@@ -170,17 +170,17 @@ class ModelAttachmentTest < Test::Unit::TestCase
     document.save
     assert File.exist?(RAILS_ROOT + "/system/bbs/1/1/0/test3.jpg")
     
-    assert_equal "http://localhost:3000/documents/send?id=1", document.url(:port => "3000")
+    assert_equal "http://localhost:3000/documentwithaws/deliver/1", document.url(:port => "3000")
     assert_equal "test3.jpg", document.file_name
     assert_equal String, document.file_name.class
     assert_equal "image/jpeg", document.content_type
     
     document.move_to_amazon
+    assert_equal 'globalfolders', document.bucket
     
     assert_match /https:\/\/s3.amazonaws.com\/globalfolders\/system\/bbs\/1\/1\/0\/test3\.jpg/, document.url
     assert_match /https:\/\/s3.amazonaws.com\/globalfolders\/system\/bbs\/1\/1\/0\/test3_small\.jpg/, document.url(:type => "small")
     
-    assert_equal 'globalfolders', document.bucket
     assert !File.exists?(RAILS_ROOT + "/system/bbs/1/1/0/test3.jpg")
     assert !File.exists?(RAILS_ROOT + "/system/bbs/1/1/0/test3_small.jpg")
     

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 7
-  version: 0.0.7
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - Steve Walker
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-04 00:00:00 -04:00
+date: 2010-05-05 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency