anaconda 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7212d183f2965554be4f43394ea2dc65b396500b
-  data.tar.gz: bb52c4c5f4c1dd7ded8004f825a43de5eb460c1d
+  metadata.gz: 901f5ceb0f88e31aff2a378a77a43846998338d9
+  data.tar.gz: af0d6a7cc3f4d573422916bc93ccc924ed84b4a8
 SHA512:
-  metadata.gz: 80631dfd8a009772117b8fcd33aaa89b20fa0fe2f8ec82be36ec8378222f6f7baa723cddeaca084e22c87627f674937ef78400cfb6749e68d44a74701fd50dc2
-  data.tar.gz: 5ea78f6fbc7867a8722780bdc76c5143865de7430f30b3e651917e8fa68fb476de0d34fe71ac451ce976252c65260662299c4b0018ca68b1f96411eb502b15b7
+  metadata.gz: 682cbdb2248ab87614384ed94272d51fc63d546bd3c37a42da9b9bec3ae2a773f464f76be9bf4836d830c3e224d1f9aa5ef70a64425d79ad71654ed0a37024e2
+  data.tar.gz: 5909013183d5bef236972edd7d38d36906cfb3f6cff6e7d3874b526071b98d7546336980915d21f98e8e05e97265b39c116fd99587162062396b97225d739e58

data/README.markdown

@@ -2,7 +2,7 @@
 
 Dead simple direct-to-s3 file uploading for your rails app.
 
-Current Version: 1.0.3
+Current Version: 1.0.4
 
 ## Installation
 
@@ -202,6 +202,9 @@ 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.5
+  * Fix bug where we were generating the same base_key for all instances if you didn't define a custom method
+  
 * 1.0.4
   * Add `anaconda_form_data_for()` and `anaconda_form_data_for_all_columns` instance methods that return the raw data needed to upload to AWS
   

data/lib/anaconda/anaconda.rb

@@ -1,5 +1,5 @@
 module Anaconda
-  MagicMethods = [:url, :download_url]
+  MagicMethods = [:url, :download_url, :anaconda_default_base_key]
   FieldSuffixes = [
     :filename,
     :file_path,

data/lib/anaconda/anaconda_for.rb

@@ -36,7 +36,7 @@ module Anaconda
           acl: "public-read",
           max_file_size: 500.megabytes,
           allowed_file_types: [],
-          base_key: "#{self.to_s.pluralize.downcase}/#{anaconda_column.to_s.pluralize}/#{(0...32).map{(65+rand(26)).chr}.join.downcase}",
+          base_key: "#{anaconda_column}_anaconda_default_base_key".to_sym,
           host: false,
           protocol: "http",
           remove_previous_s3_files_on_change: true,
@@ -77,7 +77,9 @@ module Anaconda
           when :url
             anaconda_url(checking_column, *args)
           when :download_url
-            anaconda_download_url(checking_column)          
+            anaconda_download_url(checking_column)
+          when :anaconda_default_base_key
+            anaconda_default_base_key_for(checking_column)
           else
             super
           end
@@ -145,6 +147,10 @@ module Anaconda
         end
       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
+      
       def anaconda_remove_previous_s3_files_on_change_or_destroy
         
         if self.destroyed?

data/lib/anaconda/version.rb

@@ -1,5 +1,5 @@
 module Anaconda
   module Rails
-    VERSION = "1.0.4"
+    VERSION = "1.0.5"
   end
 end

metadata

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