radiant-page_attachments-extension 1.0.0 → 1.0.2

data/public/javascripts/admin/page_attachments.js

@@ -23,7 +23,7 @@ Event.addBehavior({
       var attachment = event.findElement('.attachment');
       attachment.addClassName('deleted');
       attachment.insert("<em>Attachment will be deleted when page is saved.</em>");
-      attachment.down('input[name*="_delete"]').setValue('true');
+      attachment.down('input[name*="_destroy"]').setValue('true');
     }
   }
 

data/public/stylesheets/page_attachments.css

@@ -0,0 +1,98 @@
+.gridded, .gridded li { margin: 0; padding: 0;}
+.gridded { overflow: hidden;}
+.gridded li { background: #000; display: block; float: left; height: 230px; width: 180px; margin: 0 1em 1em 0;}
+.sample { background: #fff; display: block; width: 180px; height: 120px; margin: 0 10px 10px 0; overflow: hidden;}
+.pageTitle { background: #000; color: #fff; padding: 2px; }
+.pageTitle a { color: #fff;}
+#attachments {
+  clear: both;
+  border: 1px solid #d4cba4;
+  background: white;
+  margin: 10px 0;
+}
+#attachments .toolbar {
+  float: right;
+  padding: 10px;
+  width: 50px;
+  text-align: right;
+}
+#attachments .toolbar img {
+  padding: 5px;
+  cursor: pointer;
+}
+#attachments h3, #attachments p.notice {
+  background: #eae3c5;
+  margin: 0;
+  padding: 0.5em;
+}
+#attachments .attachment-upload {
+  padding: 0 0.8em 0.8em 0.8em;
+}
+#attachments p.notice {
+  padding: .5em .8em;
+  font-style: italic;
+  font-size: 90%;
+  color: red;
+}
+#attachments .attachment-upload img,
+#attachments .attachment img.delete {
+  cursor: pointer;
+  padding: 2px;
+  margin-left:7px;
+}
+#attachments .attachment img.higher,
+#attachments .attachment img.lower {
+  cursor: pointer;
+  padding: 2px;
+  margin-left:6px;
+}
+#attachments ol {
+  list-style-position:outside;
+  padding: 10px 10px 0 10px;
+  margin: 0;
+}
+#attachments ol li
+{
+  margin-left:20px;
+}
+#attachments ol li div
+{
+  float:left;width:25px;
+}
+#attachments ol li a.thumbnail
+{
+  float:left;margin:0 10px 0 10px;
+}
+#attachments ol li p
+{
+  margin:0 0 5px 0;
+}
+#attachments ol li
+{
+  margin-bottom:10px;border-bottom:1px dashed #cccccc;width:66%;padding-bottom:3px;
+}
+
+#attachments .attachment .thumbnail img {
+ border: 2px solid #d4cba4;
+}
+
+#attachments p.title
+{
+        border-bottom:1px #EAE3C5 solid;width:66%;font-size:17px;font-weight:bold;
+}
+#attachments table th
+{
+  font-weight:bold;text-align:right;padding-right:10px;width:120px;padding-bottom:5px;
+}
+#attachments table td
+{
+ padding-bottom:5px;
+}
+#attachments p#reorder_notice
+{
+  color:#FF0000;margin:0 0 10px 20px;
+}
+.clearfix:after                 {content:".";display:block;height:0;clear:both;visibility:hidden;}
+.clearfix                       {display:inline-block;}
+.clearfix                       {display:block;}
+li.clearfix                     {display:list-item;}

data/radiant-page_attachments-extension.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{radiant-page_attachments-extension}
-  s.version = "1.0.0"
+  s.version = "1.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sean Cribbs"]
-  s.date = %q{2010-04-29}
+  s.date = %q{2010-06-28}
   s.description = %q{Page Attachments adds support for file uploads realized as attachments to individual pages. Attachments can have an order via acts_as_list, a title, a description and various metadata fields as provided by AttachmentFu.}
   s.email = %q{radiant@radiantcms.org}
   s.extra_rdoc_files = [
@@ -18,15 +18,21 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".gitignore",
+     "HELP.md",
      "LICENSE",
      "README.md",
      "Rakefile",
      "VERSION",
-     "app/models/observe_page_attachments.rb",
+     "app/controllers/admin/page_attachments_controller.rb",
+     "app/helpers/admin/page_attachments_helper.rb",
      "app/models/page_attachment.rb",
      "app/models/page_attachment_associations.rb",
      "app/models/page_attachment_tags.rb",
      "app/models/page_attachments_interface.rb",
+     "app/views/admin/page_attachments/edit.html.haml",
+     "app/views/admin/page_attachments/grid.html.haml",
+     "app/views/admin/page_attachments/index.html.haml",
+     "app/views/admin/pages/_attachment.html.erb",
      "app/views/admin/pages/_attachment.html.haml",
      "app/views/admin/pages/_attachments_box.html.haml",
      "db/migrate/001_create_page_attachments_extension_schema.rb",
@@ -40,8 +46,13 @@ Gem::Specification.new do |s|
      "lib/tasks/page_attachments_extension_tasks.rake",
      "page_attachments_extension.rb",
      "public/images/admin/drag_order.png",
+     "public/images/admin/page_attachments/move_higher.png",
+     "public/images/admin/page_attachments/move_lower.png",
+     "public/images/admin/page_attachments/pdf-icon.png",
+     "public/javascripts/admin/lowpro.js",
      "public/javascripts/admin/page_attachments.js",
      "public/stylesheets/admin/page_attachments.css",
+     "public/stylesheets/page_attachments.css",
      "radiant-page_attachments-extension.gemspec",
      "spec/controllers/pages_controller_spec.rb",
      "spec/datasets/page_attachments_dataset.rb",
@@ -108,7 +119,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/radiant/radiant-page-attachments-extension}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Adds page-attachment-style asset management.}
   s.test_files = [
     "spec/controllers/pages_controller_spec.rb",
@@ -124,7 +135,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_development_dependency(%q<cucumber>, [">= 0"])
     else

data/vendor/plugins/attachment_fu/README

@@ -9,13 +9,12 @@ attachment_fu functionality
 
 attachment_fu facilitates file uploads in Ruby on Rails.  There are a few storage options for the actual file data, but the plugin always at a minimum stores metadata for each file in the database.
 
-There are four storage options for files uploaded through attachment_fu:
+There are three storage options for files uploaded through attachment_fu:
   File system
   Database file
   Amazon S3
-  Rackspace (Mosso) Cloud Files
 
-Each method of storage many options associated with it that will be covered in the following section.  Something to note, however, is that the Amazon S3 storage requires you to modify config/amazon_s3.yml, the Rackspace Cloud Files storage requires you to modify config/rackspace_cloudfiles.yml, and the Database file storage requires an extra table.
+Each method of storage many options associated with it that will be covered in the following section.  Something to note, however, is that the Amazon S3 storage requires you to modify config/amazon_s3.yml and the Database file storage requires an extra table.
 
 
 attachment_fu models
@@ -42,18 +41,14 @@ has_attachment(options = {})
                       # This option need only be included if you want thumbnailing.
     :thumbnail_class  # Set which model class to use for thumbnails.
                       # This current attachment class is used by default.
-    :path_prefix      # Path to store the uploaded files in.
-                      # Uses public/#{table_name} by default for the filesystem, and just #{table_name} for the S3 and Cloud Files backend.  
+    :path_prefix      # path to store the uploaded files.
+                      # Uses public/#{table_name} by default for the filesystem, and just #{table_name} for the S3 backend.  
                       # Setting this sets the :storage to :file_system.
-    :partition        # Whether to partiton files in directories like /0000/0001/image.jpg. Default is true. Only applicable to the :file_system backend.
+    :partition        # Partiton files in directories like /0000/0001/image.jpg. Default is true. 
     :storage          # Specifies the storage system to use..
-                      # Defaults to :db_file.  Options are :file_system, :db_file, :s3, and :cloud_files.
-    :cloudfront       # If using S3 for storage, this option allows for serving the files via Amazon CloudFront.
-                      # Defaults to false.
+                      # Defaults to :db_file.  Options are :file_system, :db_file, and :s3.
     :processor        # Sets the image processor to use for resizing of the attached image.
                       # Options include ImageScience, Rmagick, and MiniMagick.  Default is whatever is installed.
-    :uuid_primary_key # If your model's primary key is a 128-bit UUID in hexadecimal format, then set this to true.
-    :association_options  # attachment_fu automatically defines associations with thumbnails with has_many and belongs_to. If there are any additional options that you want to pass to these methods, then specify them here.
     
 
   Examples:
@@ -70,8 +65,6 @@ has_attachment(options = {})
     has_attachment :storage => :file_system, :path_prefix => 'public/files',
                    :thumbnails => { :thumb => [50, 50], :geometry => 'x50' }
     has_attachment :storage => :s3
-    has_attachment :store => :s3, :cloudfront => true
-    has_attachment :storage => :cloud_files
 
 validates_as_attachment
   This method prevents files outside of the valid range (:min_size to :max_size, or the :size range) from being saved.  It does not however, halt the upload of such files.  They will be uploaded into memory regardless of size before validation.
@@ -127,7 +120,7 @@ There are two parts of the upload form that differ from typical usage.
     Example:
       <%= form.file_field :uploaded_data %>
 
-Displaying uploaded images is made easy by the public_filename method of the ActiveRecord attachment objects using file system, s3, and Cloud Files storage.
+Displaying uploaded images is made easy by the public_filename method of the ActiveRecord attachment objects using file system and s3 storage.
 
 public_filename(thumbnail = nil)
   Returns the public path to the file.  If a thumbnail prefix is specified it will return the public file path to the corresponding thumbnail.

data/vendor/plugins/attachment_fu/amazon_s3.yml.tpl

@@ -2,16 +2,13 @@ development:
   bucket_name: appname_development
   access_key_id: 
   secret_access_key: 
-  distribution_domain: XXXX.cloudfront.net
 
 test:
   bucket_name: appname_test
   access_key_id: 
   secret_access_key: 
-  distribution_domain: XXXX.cloudfront.net
 
 production:
   bucket_name: appname
   access_key_id: 
   secret_access_key: 
-  distribution_domain: XXXX.cloudfront.net

data/vendor/plugins/attachment_fu/install.rb

@@ -2,6 +2,4 @@ require 'fileutils'
 
 s3_config = File.dirname(__FILE__) + '/../../../config/amazon_s3.yml'
 FileUtils.cp File.dirname(__FILE__) + '/amazon_s3.yml.tpl', s3_config unless File.exist?(s3_config)
-cloudfiles_config = File.dirname(__FILE__) + '/../../../config/rackspace_cloudfiles.yml'
-FileUtils.cp File.dirname(__FILE__) + '/rackspace_cloudfiles.yml.tpl', cloudfiles_config unless File.exist?(cloudfiles_config)
 puts IO.read(File.join(File.dirname(__FILE__), 'README'))

data/vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu.rb

@@ -52,8 +52,6 @@ module Technoweenie # :nodoc:
       #      for the S3 backend.  Setting this sets the :storage to :file_system.
 
       # *  <tt>:storage</tt> - Use :file_system to specify the attachment data is stored with the file system.  Defaults to :db_system.
-      # *  <tt>:cloundfront</tt> - Set to true if you are using S3 storage and want to serve the files through CloudFront.  You will need to
-      #      set a distribution domain in the amazon_s3.yml config file. Defaults to false
       # *  <tt>:bucket_key</tt> - Use this to specify a different bucket key other than :bucket_name in the amazon_s3.yml file.  This allows you to use
       #      different buckets for different models. An example setting would be :image_bucket and the you would need to define the name of the corresponding
       #      bucket in the amazon_s3.yml file.
@@ -82,13 +80,17 @@ module Technoweenie # :nodoc:
         options[:thumbnails]       ||= {}
         options[:thumbnail_class]  ||= self
         options[:s3_access]        ||= :public_read
-        options[:cloudfront]       ||= false
+        options[:s3_options]       ||= {}
         options[:content_type] = [options[:content_type]].flatten.collect! { |t| t == :image ? Technoweenie::AttachmentFu.content_types : t }.flatten unless options[:content_type].nil?
 
         unless options[:thumbnails].is_a?(Hash)
           raise ArgumentError, ":thumbnails option should be a hash: e.g. :thumbnails => { :foo => '50x50' }"
         end
 
+        unless options[:s3_options].is_a?(Hash)
+          raise ArgumentError, ":s3_options option should be a hash: e.g. :s3_options => { :cache_control => 'max-age=2592000' }"
+        end
+
         extend ClassMethods unless (class << self; included_modules; end).include?(ClassMethods)
         include InstanceMethods unless included_modules.include?(InstanceMethods)
 
@@ -102,19 +104,11 @@ module Technoweenie # :nodoc:
         attachment_options[:storage]     ||= parent_options[:storage]
         attachment_options[:path_prefix] ||= attachment_options[:file_system_path]
         if attachment_options[:path_prefix].nil?
-          attachment_options[:path_prefix] = case attachment_options[:storage]
-            when :s3 then table_name
-            when :cloud_files then table_name
-            else File.join("public", table_name)
-          end
+          attachment_options[:path_prefix] = attachment_options[:storage] == :s3 ? table_name : File.join("public", table_name)
         end
         attachment_options[:path_prefix]   = attachment_options[:path_prefix][1..-1] if options[:path_prefix].first == '/'
 
-        association_options = { :foreign_key => 'parent_id' }
-        if attachment_options[:association_options]
-          association_options.merge!(attachment_options[:association_options])
-        end
-        with_options(association_options) do |m|
+        with_options :foreign_key => 'parent_id' do |m|
           m.has_many   :thumbnails, :class_name => "::#{attachment_options[:thumbnail_class]}"
           m.belongs_to :parent, :class_name => "::#{base_class}" unless options[:thumbnails].empty?
         end
@@ -183,6 +177,7 @@ module Technoweenie # :nodoc:
         base.after_save :after_process_attachment
         base.after_destroy :destroy_file
         base.after_validation :process_attachment
+        base.attr_accessible :uploaded_data
         if defined?(::ActiveSupport::Callbacks)
           base.define_callbacks :after_resize, :after_attachment_saved, :before_thumbnail_saved
         end
@@ -428,11 +423,7 @@ module Technoweenie # :nodoc:
         def attachment_attributes_valid?
           [:size, :content_type].each do |attr_name|
             enum = attachment_options[attr_name]
-            if Object.const_defined?(:I18n) # Rails >= 2.2
-              errors.add attr_name, I18n.translate("activerecord.errors.messages.inclusion", attr_name => enum) unless enum.nil? || enum.include?(send(attr_name))
-            else
-              errors.add attr_name, ActiveRecord::Errors.default_error_messages[:inclusion] unless enum.nil? || enum.include?(send(attr_name))
-            end
+            errors.add attr_name, ActiveRecord::Errors.default_error_messages[:inclusion] unless enum.nil? || enum.include?(send(attr_name))
           end
         end
 

data/vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu/backends/file_system_backend.rb

@@ -1,6 +1,4 @@
-require 'fileutils'
-require 'digest/sha2'
-
+require 'ftools'
 module Technoweenie # :nodoc:
   module AttachmentFu # :nodoc:
     module Backends
@@ -30,39 +28,16 @@ module Technoweenie # :nodoc:
       
         # The attachment ID used in the full path of a file
         def attachment_path_id
-          ((respond_to?(:parent_id) && parent_id) || id) || 0
+          ((respond_to?(:parent_id) && parent_id) || id).to_i
         end
       
-        # Partitions the given path into an array of path components.
-        #
-        # For example, given an <tt>*args</tt> of ["foo", "bar"], it will return
-        # <tt>["0000", "0001", "foo", "bar"]</tt> (assuming that that id returns 1).
-        #
-        # If the id is not an integer, then path partitioning will be performed by
-        # hashing the string value of the id with SHA-512, and splitting the result
-        # into 4 components. If the id a 128-bit UUID (as set by :uuid_primary_key => true)
-        # then it will be split into 2 components.
-        # 
-        # To turn this off entirely, set :partition => false.
+        # by default paritions files into directories e.g. 0000/0001/image.jpg
+        # to turn this off set :partition => false
         def partitioned_path(*args)
           if respond_to?(:attachment_options) && attachment_options[:partition] == false 
             args
-          elsif attachment_options[:uuid_primary_key]
-            # Primary key is a 128-bit UUID in hex format. Split it into 2 components.
-            path_id = attachment_path_id.to_s
-            component1 = path_id[0..15] || "-"
-            component2 = path_id[16..-1] || "-"
-            [component1, component2] + args
-          else
-            path_id = attachment_path_id
-            if path_id.is_a?(Integer)
-              # Primary key is an integer. Split it after padding it with 0.
-              ("%08d" % path_id).scan(/..../) + args
-            else
-              # Primary key is a String. Hash it, then split it into 4 components.
-              hash = Digest::SHA512.hexdigest(path_id.to_s)
-              [hash[0..31], hash[32..63], hash[64..95], hash[96..127]] + args
-            end
+          else 
+            ("%08d" % attachment_path_id).scan(/..../) + args
           end
         end
       
@@ -110,8 +85,8 @@ module Technoweenie # :nodoc:
             if save_attachment?
               # TODO: This overwrites the file if it exists, maybe have an allow_overwrite option?
               FileUtils.mkdir_p(File.dirname(full_filename))
-              FileUtils.cp(temp_path, full_filename)
-              FileUtils.chmod(attachment_options[:chmod] || 0644, full_filename)
+              File.cp(temp_path, full_filename)
+              File.chmod(attachment_options[:chmod] || 0644, full_filename)
             end
             @old_filename = nil
             true

data/vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu/backends/s3_backend.rb

@@ -17,28 +17,22 @@ module Technoweenie # :nodoc:
       # If you don't already have your access keys, all you need to sign up for the S3 service is an account at Amazon.
       # You can sign up for S3 and get access keys by visiting http://aws.amazon.com/s3.
       #
-      # If you wish to use Amazon CloudFront to serve the files, you can also specify a distibution domain for the bucket.
-      # To read more about CloudFront, visit http://aws.amazon.com/cloudfront
-      #
       # Example configuration (RAILS_ROOT/config/amazon_s3.yml)
       #
       #   development:
       #     bucket_name: appname_development
       #     access_key_id: <your key>
       #     secret_access_key: <your key>
-      #     distribution_domain: XXXX.cloudfront.net
       #
       #   test:
       #     bucket_name: appname_test
       #     access_key_id: <your key>
       #     secret_access_key: <your key>
-      #     distribution_domain: XXXX.cloudfront.net
       #
       #   production:
       #     bucket_name: appname
       #     access_key_id: <your key>
       #     secret_access_key: <your key>
-      #     distribution_domain: XXXX.cloudfront.net
       #
       # You can change the location of the config path by passing a full path to the :s3_config_path option.
       #
@@ -65,8 +59,6 @@ module Technoweenie # :nodoc:
       # * <tt>:server</tt> - The server to make requests to. Defaults to <tt>s3.amazonaws.com</tt>.
       # * <tt>:port</tt> - The port to the requests should be made on. Defaults to 80 or 443 if <tt>:use_ssl</tt> is set.
       # * <tt>:use_ssl</tt> - If set to true, <tt>:port</tt> will be implicitly set to 443, unless specified otherwise. Defaults to false.
-      # * <tt>:distribution_domain</tt> - The CloudFront distribution domain for the bucket.  This can either be the assigned
-      #     distribution domain (ie. XXX.cloudfront.net) or a chosen domain using a CNAME. See CloudFront for more details.
       #
       # == Usage
       #
@@ -122,6 +114,14 @@ module Technoweenie # :nodoc:
       #  default to the <tt>bucket_name</tt> key.  This way you only have to create special buckets
       #  this can be helpful if you only need special buckets in certain environments.
       #
+      # === S3 Header Options
+      # 
+      # You can pass options to pass along to S3 via :s3_options as follows
+      #
+      #   class Photo < ActiveRecord::Base
+      #     has_attachment :storage => :s3, :s3_options => { :cache_control => "max-age=2592000" }
+      #   end
+      #
       # === Permissions
       #
       # By default, files are stored on S3 with public access permissions. You can customize this using
@@ -158,16 +158,6 @@ module Technoweenie # :nodoc:
       #
       # Niether <tt>base_path</tt> or <tt>full_filename</tt> include the bucket name as part of the path.
       # You can retrieve the bucket name using the <tt>bucket_name</tt> method.
-      # 
-      # === Accessing CloudFront URLs
-      # 
-      # You can get an object's CloudFront URL using the cloudfront_url accessor.  Using the example from above:
-      # @postcard.cloudfront_url # => http://XXXX.cloudfront.net/photos/1/mexico.jpg
-      #
-      # The resulting url is in the form: http://:distribution_domain/:table_name/:id/:file
-      #
-      # If you set :cloudfront to true in your model, the public_filename will be the CloudFront
-      # URL, not the S3 URL.
       module S3Backend
         class RequiredLibraryNotFoundError < StandardError; end
         class ConfigFileNotFoundError < StandardError; end
@@ -192,11 +182,10 @@ module Technoweenie # :nodoc:
           bucket_key = base.attachment_options[:bucket_key]
 
           if bucket_key and s3_config[bucket_key.to_sym]
-            eval_string = "def bucket_name()\n  \"#{s3_config[bucket_key.to_sym]}\"\nend"
+            @@bucket_name =  s3_config[bucket_key.to_sym]
           else
-            eval_string = "def bucket_name()\n  \"#{s3_config[:bucket_name]}\"\nend"
+            @@bucket_name = s3_config[:bucket_name]
           end
-          base.class_eval(eval_string, __FILE__, __LINE__)
 
           Base.establish_connection!(s3_config.slice(:access_key_id, :secret_access_key, :server, :port, :use_ssl, :persistent, :proxy))
 
@@ -216,10 +205,6 @@ module Technoweenie # :nodoc:
         def self.port_string
           @port_string ||= (s3_config[:port].nil? || s3_config[:port] == (s3_config[:use_ssl] ? 443 : 80)) ? '' : ":#{s3_config[:port]}"
         end
-        
-        def self.distribution_domain
-          @distribution_domain = s3_config[:distribution_domain]
-        end
 
         module ClassMethods
           def s3_protocol
@@ -233,10 +218,6 @@ module Technoweenie # :nodoc:
           def s3_port_string
             Technoweenie::AttachmentFu::Backends::S3Backend.port_string
           end
-          
-          def cloudfront_distribution_domain
-            Technoweenie::AttachmentFu::Backends::S3Backend.distribution_domain
-          end
         end
 
         # Overwrites the base filename writer in order to store the old filename
@@ -275,27 +256,7 @@ module Technoweenie # :nodoc:
         def s3_url(thumbnail = nil)
           File.join(s3_protocol + s3_hostname + s3_port_string, bucket_name, full_filename(thumbnail))
         end
-        
-        # All public objects are accessible via a GET request to CloudFront. You can generate a
-        # url for an object using the cloudfront_url method.
-        #
-        #   @photo.cloudfront_url
-        #
-        # The resulting url is in the form: <tt>http://:distribution_domain/:table_name/:id/:file</tt> using
-        # the <tt>:distribution_domain</tt> variable set in the configuration parameters in <tt>RAILS_ROOT/config/amazon_s3.yml</tt>.
-        #
-        # The optional thumbnail argument will output the thumbnail's filename (if any).
-        def cloudfront_url(thumbnail = nil)
-          "http://" + cloudfront_distribution_domain + "/" + full_filename(thumbnail)
-        end
-        
-        def public_filename(*args)
-          if attachment_options[:cloudfront]
-            cloudfront_url(args)
-          else
-            s3_url(args)
-          end
-        end
+        alias :public_filename :s3_url
 
         # All private objects are accessible via an authenticated GET request to the S3 servers. You can generate an
         # authenticated url for an object like this:
@@ -323,7 +284,6 @@ module Technoweenie # :nodoc:
         #   @photo.authenticated_s3_url('thumbnail', :expires_in => 5.hours, :use_ssl => true)
         def authenticated_s3_url(*args)
           options   = args.extract_options!
-          options[:expires_in] = options[:expires_in].to_i if options[:expires_in]
           thumbnail = args.shift
           S3Object.url_for(full_filename(thumbnail), bucket_name, options)
         end
@@ -347,10 +307,6 @@ module Technoweenie # :nodoc:
         def s3_port_string
           Technoweenie::AttachmentFu::Backends::S3Backend.port_string
         end
-        
-        def cloudfront_distribution_domain
-          Technoweenie::AttachmentFu::Backends::S3Backend.distribution_domain
-        end
 
         protected
           # Called in the after_destroy callback
@@ -367,7 +323,9 @@ module Technoweenie # :nodoc:
               old_full_filename,
               full_filename,
               bucket_name,
+              attachment_options[:s3_options].merge(
               :access => attachment_options[:s3_access]
+              )
             )
 
             @old_filename = nil
@@ -380,8 +338,10 @@ module Technoweenie # :nodoc:
                 full_filename,
                 (temp_path ? File.open(temp_path) : temp_data),
                 bucket_name,
+                attachment_options[:s3_options].merge(
                 :content_type => content_type,
                 :access => attachment_options[:s3_access]
+                )
               )
             end