anaconda 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c7cbd46c8a54f1460ab2f8ef0c3d3742d100938
-  data.tar.gz: 9a8ecdddccff63cdcbbfe5584a1031f418f3009a
+  metadata.gz: 911805ae124cc803fe5b8b0bb0a83d33f57bffe8
+  data.tar.gz: 9d0dab201af413c396fd6dd8f2a2bb53e4f67d12
 SHA512:
-  metadata.gz: 100a0f6e07ab2c95a3a56e4dbe4ee23a81fb5ebe98b1987d0f9a36f7d90abb09f8423f5deee9c111d598bb9d20e02469a10eb5f89b46d2103c8a9b869e243cb2
-  data.tar.gz: 56943ca4dc3d75f739e3157defec071616dab407bf7c493d6a82082f3ec5c5a4617b40a6615684452ca3a6ba9e295b0fd66d919efb30bb339c719c5dfb627a83
+  metadata.gz: c419a1acb382d201e2e92094cbfc06a075ca96bd7297dcf1e82c96e5b167dbf5c501874ffb4343aa7a3161b556a6074f71721bd9de6e122b777a63dc4679ab7d
+  data.tar.gz: 8638e2cc7119df3e65e3b1a8daff553d2e1862e2bf2d43333e158c962e1dc272182c014db1a19ef872f77ae6152c3c9b584b0d3412bd9c5b6fd2f8a281073285

data/README.markdown

@@ -134,8 +134,9 @@ We highly recommend the `figaro` gem [https://github.com/laserlemon/figaro](http
 	* `allowed_file_types` default: _all_
 	* `host` String. If specified, this will be used to access publically stored objects instead of the S3 bucket. Useful for CloudFront integration. Note: At this time privately stored objects will still be requested via S3. Default: _false_
 	* `protocol` `https`, `http`, or `:auto`. If `:auto`, `//` will be used as the protocol. Note: At this time, all privately stored objects are requested over https. Default: `http`
-  * `remove_previous_s3_files_on_change` Boolean. If true, files will be removed from S3 when a new file is uploaded. Default: `true`
-  * `remove_previous_s3_files_on_destroy` Boolean. If true, files will be removed from S3 when a record is destroyed. Default: `true`
+  	* `remove_previous_s3_files_on_change` Boolean. If true, files will be removed from S3 when a new file is uploaded. Default: `true`
+  	* `remove_previous_s3_files_on_destroy` Boolean. If true, files will be removed from S3 when a record is destroyed. Default: `true`
+  	* `expiry_length` - If supplied, this is the length in seconds that a signed URL is valid for. Default: `1.hour`
 
 *  Form setup
 
@@ -154,7 +155,7 @@ We highly recommend the `figaro` gem [https://github.com/laserlemon/figaro](http
 	* `upload_details_container` - An element id you would like the upload details located in. Defaults to `<resource>_<attribtue>_details`  ex: `post_media_asset_details`
 	* `auto_upload` - If set to true, upload will begin as soon as a file is selected. Default: *false*
 	* `auto_submit` - If set to true, form will submit automatically when upload is completed. Useful when mixed with `auto_upload: true`, especially if the file field is the only field on the form. Default: *true* when auto_upload is false; *false* when auto_upload is true.
-  * `base_key` - If supplied, this will be the base_key used for this upload
+  	* `base_key` - If supplied, this will be the base_key used for this upload
 
 *  Fields
 	
@@ -168,14 +169,30 @@ We highly recommend the `figaro` gem [https://github.com/laserlemon/figaro](http
     * :asset_url
     * :asset_download_url
     
-    The magic methods are asset_url and asset_download_url.
+    The magic methods are `asset_url` and `asset_download_url`.
     
-    `asset_url` will return a signed S3 URL if the file is stored with an ACL of `private` and will return a non-signed URL if the file is stored with public access.
+    `asset_url` will return a signed S3 URL if the file is stored with an ACL of `private` and will return a non-signed URL if the file is stored with public access.  This accepts a single optional hash argument with possible parameters `protocol` and `expires`.
     
-    You may pass an options hash to the `asset_url` magic method. At this time, the only supported option is :protocol. Example: `asset_url({protocol: 'http'})`  This will override the `protocol` option set in the model.
+    `asset_download_url` will return a signed S3 URL with content-disposition set to attachment so the file will be downloaded instead of opened in the browser. This accepts a single optional hash argument. The only supported parameter in this hash is `expires`.
+    
+    `protocol`, if specified here, will override the default value set in the model.  
+    `expires` is a DateTime object when a signed URL will be valid until. On a file stored publically, this has no effect.
+    
+    
+    Example usages:
+    	
+    	# Assuming the files are stored privately.
+    	
+    	asset_url(expires: 3.hours.from_now)
+    	# Generates a URL that is valid for 3 hours
+    	
+    	asset_url(protocol: "https", expires: 5.minutes.from_now)
+    	# Generates a URL that is valid for 5 minutes, and uses the https protocol
+    	
+    	asset_download_url(expires: 5.minutes.from_now)
+    	# Generates a URL that is valid for 5 minutes, and will cause the browser to download the object.
+    	# This is most useful for things like images that most browsers try to display.
     
-    `asset_download_url` will return a signed S3 URL with content-disposition set to attachment so the file will be downloaded instead of opened in the browser.
-
 ### Advanced Usage
 
 #### Events
@@ -202,6 +219,10 @@ If you return false to the following events it will prevent the default behavior
 From version 1.0.0 on we have used [Semantic Versioning](http://semver.org/).
 
 ## Changelog
+* 1.0.7
+  * Add support for `expires` option in signed AWS URLs.
+  * Add option for setting default `expiry_length` for signed AWS URLs.
+
 * 1.0.6
   * Loosen dependency requirement on `simple_form`
   

data/lib/anaconda/anaconda_for.rb

@@ -39,6 +39,7 @@ module Anaconda
           base_key: "#{anaconda_column}_anaconda_default_base_key".to_sym,
           host: false,
           protocol: "http",
+          expiry_length: 1.hour,
           remove_previous_s3_files_on_change: true,
           remove_previous_s3_files_on_destroy: true
         )
@@ -117,10 +118,10 @@ module Anaconda
         options = args.extract_options!
         logger.debug "Extracted Options:"
         logger.debug(options)
-
+        
         if send("#{column_name}_stored_privately")
           aws = Fog::Storage.new({:provider => 'AWS', :aws_access_key_id => Anaconda.aws[:aws_access_key], :aws_secret_access_key => Anaconda.aws[:aws_secret_key], :path_style => Anaconda.aws[:path_style]})
-          aws.get_object_https_url(Anaconda.aws[:aws_bucket], send("#{column_name}_file_path"), 1.hour.from_now)
+          aws.get_object_https_url(Anaconda.aws[:aws_bucket], send("#{column_name}_file_path"), anaconda_expiry_length(column_name, options[:expires]))
         elsif self.anaconda_options[column_name.to_sym][:host]
           "#{anaconda_protocol(column_name, options[:protocol])}#{self.anaconda_options[column_name.to_sym][:host]}/#{send("#{column_name}_file_path")}"
         else
@@ -130,10 +131,13 @@ module Anaconda
       
       def anaconda_download_url(column_name)
         return nil unless send("#{column_name}_file_path").present?
+        options = args.extract_options!
+        logger.debug "Extracted Options:"
+        logger.debug(options)
         
-        options = {query: {"response-content-disposition" => "attachment;"}}
+        aws_options = {query: {"response-content-disposition" => "attachment;"}}
         aws = Fog::Storage.new({:provider => 'AWS', :aws_access_key_id => Anaconda.aws[:aws_access_key], :aws_secret_access_key => Anaconda.aws[:aws_secret_key], :path_style => Anaconda.aws[:path_style]})
-        aws.get_object_https_url(Anaconda.aws[:aws_bucket], send("#{column_name}_file_path"), 1.hour.from_now, options)
+        aws.get_object_https_url(Anaconda.aws[:aws_bucket], send("#{column_name}_file_path"), anaconda_expiry_length(column_name, options[:expires]), aws_options)
 
       end
       
@@ -147,6 +151,11 @@ module Anaconda
         end
       end
       
+      def anaconda_expiry_length(column_name, override = nil)
+        return override if override
+        self.anaconda_options[column_name.to_sym][:expiry_length].seconds.from_now
+      end
+      
       def anaconda_default_base_key_for(column_name)
         "#{self.class.to_s.pluralize.downcase}/#{column_name.to_s.pluralize}/#{(0...32).map{(65+rand(26)).chr}.join.downcase}"
       end

data/lib/anaconda/version.rb

@@ -1,5 +1,5 @@
 module Anaconda
   module Rails
-    VERSION = "1.0.6"
+    VERSION = "1.0.7"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: anaconda
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - Ben McFadden