anaconda 1.0.11 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d26bc908c337bafa06a9bb5cea0a047aea6f937e
-  data.tar.gz: ced6b894ed0763d15cd32120df4a5da01fef10d5
+  metadata.gz: 57868170a368b59a870fd5cd967b553e13b65583
+  data.tar.gz: 2c2cc0aae3cb3b388fae8a251d43dcb28e06524d
 SHA512:
-  metadata.gz: c144bca62db52b765c134433d8b184047b7870947987bd6fab77d08c05e774f64f83f51f2969d457c898d5a4e2c589a3a2baf4a9f0a6320ae41302ed79d79634
-  data.tar.gz: 376a296c42df3a99ad1b84e6e76c8b93716e1f496cb058a372a297306d6ec367e03d39e5fe2e44699444e3ccc0528bac295f3977758daeb43a377489ce996735
+  metadata.gz: 852057515f6e9b772a4b39dd6bc73f812f058e4234884945744f0a8016db7c88751f429336aac94df4cc4a922c15a1fc04118dbfa55f827601c3585e970b9c46
+  data.tar.gz: 2cdfad1b498549f0fe7f268e3a0ec44fdcd967361dfd582b7712e77640aac0cc73856f7e0532b3631195099a07e381319bc036b2c4e73cfc9be639f28931afd6

data/README.markdown

@@ -126,17 +126,20 @@ We highly recommend the `figaro` gem [https://github.com/laserlemon/figaro](http
 	
 	At this time the available options on anaconda_for are:
 	* `base_key` default: _%{plural model}/%{plural column}/%{random string}_
-	* `aws_access_key_id` default: _aws_access_key_ specified in Anaconda config
-	* `aws_secret_access_key` default: _aws_secret_key_ specified in Anaconda config
-	* `bucket` default: _aws_bucket_ specified in Anaconda config
+	* `aws_access_key` default: _aws_access_key_ specified in Anaconda config
+	* `aws_secret_key` default: _aws_secret_key_ specified in Anaconda config
+	* `aws_bucket` default: _aws_bucket_ specified in Anaconda config
+  * `aws_endpoint` default: _aws_endpoint_ specified in Anaconda config
 	* `acl` default _public-read_
 	* `max_file_size` default: `500.megabytes`
 	* `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`
-  	* `expiry_length` - If supplied, this is the length in seconds that a signed URL is valid for. Default: `1.hour`
+	* `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`
+  
+  Any `anaconda_for` option may also be a proc that will be evaluated in the context of the current instance.
 
 *  Form setup
 
@@ -219,6 +222,20 @@ 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
+* 2.0.2
+  * Fix `asset_url` method. There's tests coming. I swear.
+
+* 2.0.1
+  YANKED
+  * Fix `asset_download_url` method
+  
+* 2.0.0
+  YANKED
+  *Breaking Changes!*
+  * The options you can pass to `anaconda_for` have changed.
+  * Add ability for `anaconda_for` options to be procs so we can have instance specific data there.
+  * Clean the `filename` that is passed to the `asset_download_url` method
+
 * 1.0.11
   * Add ability to pass `filename` to the `asset_download_url` method.
 

data/lib/anaconda.rb

@@ -32,8 +32,15 @@ module Anaconda
   def self.config
     yield self
     
-    @@aws[:aws_endpoint] = "s3.amazonaws.com/#{@@aws[:aws_bucket]}" unless @@aws[:aws_endpoint].present?
-    @@aws[:path_style] = !@@aws[:aws_endpoint].starts_with?(@@aws[:aws_bucket])
+    if @@aws[:aws_bucket].present?
+      @@aws[:aws_endpoint] = "s3.amazonaws.com/#{@@aws[:aws_bucket]}" unless @@aws[:aws_endpoint].present?
+    end
+    
+    if @@aws[:aws_endpoint].present? && @@aws[:aws_bucket].present?
+      @@aws[:path_style] = !@@aws[:aws_endpoint].starts_with?(@@aws[:aws_bucket])
+    else
+      @@aws[:path_style] = false
+    end
   end
   
   def self.js_file_types
@@ -55,8 +62,8 @@ module Anaconda
     return js_file_types
   end
   
-  def self.remove_s3_object_in_bucket_with_file_path(bucket, file_path)
-    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 => @@aws[:path_style]})
-    aws.delete_object(bucket, file_path)
+  def self.remove_s3_object(file_path, options)
+    aws = Fog::Storage.new({:provider => 'AWS', :aws_access_key_id => options[:aws_access_key], :aws_secret_access_key => options[:aws_secret_key], :path_style => options[:aws_use_path_style]})
+    aws.delete_object(options[:aws_bucket], file_path)
   end
 end

data/lib/anaconda/anaconda_for.rb

@@ -30,9 +30,11 @@ module Anaconda
         end
         self.anaconda_options = Hash.new unless self.anaconda_options.kind_of? Hash
         self.anaconda_options[anaconda_column.to_sym] = options.reverse_merge(
-          aws_access_key_id: Anaconda.aws[:aws_access_key],
-          aws_secret_access_key: Anaconda.aws[:aws_secret_key],
-          bucket: Anaconda.aws[:aws_bucket],
+          aws_access_key: Anaconda.aws[:aws_access_key],
+          aws_secret_key: Anaconda.aws[:aws_secret_key],
+          aws_bucket: Anaconda.aws[:aws_bucket],
+          aws_endpoint: Anaconda.aws[:aws_endpoint],
+          aws_use_path_style: Anaconda.aws[:path_style],
           acl: "public-read",
           max_file_size: 500.megabytes,
           allowed_file_types: [],
@@ -112,52 +114,73 @@ module Anaconda
         end
       end
 
+      def anaconda_options_for( anaconda_column )
+        if self.class.anaconda_columns.include? anaconda_column.to_sym
+          self.anaconda_options[anaconda_column].inject({}) do |hash, (k, v)|
+            if v.kind_of? Proc
+              hash[k] = self.instance_exec(&v)
+            else
+              hash[k] = v
+            end
+            hash
+          end
+        else
+          raise "#{anaconda_column} not configured for anaconda. Misspelling or did you forget to add the anaconda_for call for this field?"
+        end
+      end
+
       private
       def anaconda_url(column_name, *args)
         return nil unless send("#{column_name}_file_path").present?
         options = args.extract_options!
-        logger.debug "Extracted Options:"
+        options = options.reverse_merge(self.anaconda_options_for( column_name ))
+        logger.debug "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"), anaconda_expiry_length(column_name, options[:expires]))
-        elsif self.anaconda_options[column_name.to_sym][:host]
+          aws = Fog::Storage.new({:provider => 'AWS', :aws_access_key_id => options[:aws_access_key], :aws_secret_access_key => options[:aws_secret_key], :path_style => options[:aws_use_path_style]})
+          aws.get_object_https_url(options[:aws_bucket], send("#{column_name}_file_path"), anaconda_expiry_length(column_name, options[:expires]))
+        elsif options[:host]
           "#{anaconda_protocol(column_name, options[:protocol])}#{self.anaconda_options[column_name.to_sym][:host]}/#{send("#{column_name}_file_path")}"
         else
-          "#{anaconda_protocol(column_name, options[:protocol])}#{Anaconda.aws[:aws_endpoint]}/#{send("#{column_name}_file_path")}"
+          "#{anaconda_protocol(column_name, options[:protocol])}#{options[:aws_endpoint]}/#{send("#{column_name}_file_path")}"
         end
       end
       
       def anaconda_download_url(column_name, *args)
         return nil unless send("#{column_name}_file_path").present?
         options = args.extract_options!
-        logger.debug "Extracted Options:"
+        options = options.reverse_merge(self.anaconda_options_for( column_name ))
+        logger.debug "Options:"
         logger.debug(options)
+        
         filename = nil
         if options[:filename].present?
-          filename = "filename=#{options[:filename]}"
+          clean_filename = options[:filename].gsub(/[^0-9A-Za-z.\-\ \(\)]/, '-')
+          logger.debug "Cleaned Filename: #{clean_filename}"
+          filename = "filename=#{clean_filename}"
         end
         
         aws_options = {query: {"response-content-disposition" => "attachment;#{filename}"}}
-        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"), anaconda_expiry_length(column_name, options[:expires]), aws_options)
+        aws = Fog::Storage.new({:provider => 'AWS', :aws_access_key_id => options[:aws_access_key], :aws_secret_access_key => options[:aws_secret_key], :path_style => options[:aws_use_path_style]})
+        aws.get_object_https_url(options[:aws_bucket], send("#{column_name}_file_path"), anaconda_expiry_length(column_name, options[:expires]), aws_options)
 
       end
       
       def anaconda_protocol(column_name, override = nil)
-        return override if override
-        case self.anaconda_options[column_name.to_sym][:protocol]
+        return "#{override}://" if override
+        
+        case self.anaconda_options_for( column_name )[:protocol]
         when :auto
           "//"
         else
-          "#{self.anaconda_options[column_name.to_sym][:protocol]}://"
+          "#{self.anaconda_options_for( column_name )[:protocol]}://"
         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
+        self.anaconda_options_for( column_name )[:expiry_length].seconds.from_now
       end
       
       def anaconda_default_base_key_for(column_name)
@@ -168,21 +191,21 @@ module Anaconda
         
         if self.destroyed?
           self.class.anaconda_columns.each do |column_name|
-            next unless self.anaconda_options[column_name.to_sym][:remove_previous_s3_files_on_destroy]
+            next unless self.anaconda_options_for( column_name )[:remove_previous_s3_files_on_destroy]
             if self.send("#{column_name}_file_path").present?
-              Anaconda.remove_s3_object_in_bucket_with_file_path(Anaconda.aws[:aws_bucket], self.send("#{column_name}_file_path"))
+              Anaconda.remove_s3_object(self.send("#{column_name}_file_path"), self.anaconda_options_for( column_name ))
             end
           end
         else
           self.class.anaconda_columns.each do |column_name|
-            next unless self.anaconda_options[column_name.to_sym][:remove_previous_s3_files_on_change]
+            next unless self.anaconda_options_for( column_name )[:remove_previous_s3_files_on_change]
             if self.previous_changes["#{column_name}_file_path"].present?
               # Looks like this field was edited.
               if self.previous_changes["#{column_name}_file_path"][0].present? &&
                 self.previous_changes["#{column_name}_file_path"][0] != self.previous_changes["#{column_name}_file_path"][1]
                 # It's not a new entry ([0] would be nil), and it really did change, wasn't just committed for no reason
                 # So let's delete the previous file from S3
-                Anaconda.remove_s3_object_in_bucket_with_file_path(Anaconda.aws[:aws_bucket], self.previous_changes["#{column_name}_file_path"][0])
+                Anaconda.remove_s3_object(self.previous_changes["#{column_name}_file_path"][0], self.anaconda_options_for( column_name ))
               end
             end
           end

data/lib/anaconda/version.rb

@@ -1,5 +1,5 @@
 module Anaconda
   module Rails
-    VERSION = "1.0.11"
+    VERSION = "2.0.2"
   end
 end

metadata

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