model_attachment 0.0.25 → 0.0.26

data/lib/model_attachment.rb

@@ -59,8 +59,10 @@ module ModelAttachment
       elsif !options[:aws].nil? && File.exist?(options[:aws])
         include AmazonInstanceMethods
       end
-      
-      write_inheritable_attribute(:attachment_options, options)
+
+      class_attribute :attachment_options
+      self.attachment_options = options
+#      write_inheritable_attribute(:attachment_options, options)
         
       # must be before the save to save the attributes
       before_save :save_attributes
@@ -110,7 +112,8 @@ module ModelAttachment
     
     # Returns attachment options defined by each call to acts_as_attachment.
     def attachment_options
-      read_inheritable_attribute(:attachment_options)
+#      read_inheritable_attribute(:attachment_options)
+      self.attachment_options
     end
     
   end

data/lib/model_attachment/amazon.rb

@@ -1,5 +1,6 @@
 module ModelAttachment
   module AmazonInstanceMethods
+    attr_accessor :default_bucket
     
     # returns the aws url
     # +type+: type passed to has_attachment, ex. small, large
@@ -15,12 +16,6 @@ module ModelAttachment
       end
     end
     
-    # sets the default aws bucket
-    # +current_bucket+: set the current bucket, default 'globalfolders'
-    def default_bucket(current_bucket = 'globalfolders')
-      current_bucket
-    end
-
     # creates the aws_key
     # +type+: type passed to has_attachment, ex. small, large
     def aws_key(type = "")
@@ -41,7 +36,8 @@ module ModelAttachment
             :secret_access_key => config['secret_access_key'],
             :use_ssl           => true,
             :persistent        => true  # if issues with disconnections, set to false
-          )
+                                              )
+          self.default_bucket = self.class.attachment_options[:bucket] || 'globalfolders'
         else
           raise "You must provide an amazon.yml config file"
         end
@@ -63,7 +59,7 @@ module ModelAttachment
           AWS::S3::S3Object.store(aws_key(name.to_s), open(full_filename, 'rb'), default_bucket, :content_type => content_type)
         end
         
-        self.bucket = default_bucket
+        self.bucket = self.default_bucket
         @dirty = true
         save!
       rescue AWS::S3::ResponseError => error
@@ -155,4 +151,4 @@ module ModelAttachment
     end
   
   end
-end
+end

data/lib/model_attachment/version.rb

@@ -1,3 +1,3 @@
 module ModelAttachment
-  VERSION = "0.0.25"
+  VERSION = "0.0.26"
 end

data/test/model_attachment/model_attachment_test.rb

@@ -82,7 +82,7 @@ end
 class DocumentWithResize < Document
   has_attachment :path => "/system/:domain/:folder/:document/:version/",
     :types => {
-      :small => { :command => '/opt/local/bin/convert -geometry 100x100' } 
+      :small => { :command => '/usr/local/bin/convert -geometry 100x100' } 
     }
 end
 
@@ -90,8 +90,9 @@ class DocumentWithAWS < Document
   has_attachment :path => "/system/:domain/:folder/:document/:version/", 
     :aws => File.join(Rails.root, "amazon.yml"),
     :types => {
-      :small => { :command => '/opt/local/bin/convert -geometry 100x100' } 
+      :small => { :command => '/usr/local/bin/convert -geometry 100x100' } 
     },
+    :bucket => 'test.globalfolders.com',
     :logging => true
 end
 
@@ -184,10 +185,10 @@ class ModelAttachmentTest < Test::Unit::TestCase
     assert_equal "image/jpeg", document.content_type
     
     document.move_to_amazon
-    assert_equal 'globalfolders', document.bucket
+    assert_equal 'test.globalfolders.com', 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_match /https:\/\/s3.amazonaws.com\/test.globalfolders.com\/system\/bbs\/1\/1\/0\/test3\.jpg/, document.url
+    assert_match /https:\/\/s3.amazonaws.com\/test.globalfolders.com\/system\/bbs\/1\/1\/0\/test3_small\.jpg/, document.url(:type => "small")
     
     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

@@ -2,7 +2,7 @@
 name: model_attachment
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.25
+  version: 0.0.26
 platform: ruby
 authors: 
 - Steve Walker
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-24 00:00:00 -04:00
+date: 2012-06-05 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -58,7 +58,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -4316983688232993659
+      hash: -87829182241577493
       segments: 
       - 0
       version: "0"
@@ -71,7 +71,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: model_attachment
-rubygems_version: 1.5.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A simple file attachment gem