anaconda 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 15005913b55226589abb23fbe8830d98c1e6e18f
-  data.tar.gz: e58a9d025a944d40b81f4d910a7d3a5dc11d5a72
+  metadata.gz: b404bafc0d7c8e17d8100489db15b3362c2af825
+  data.tar.gz: 2cbd6cecd8095d8aa24721ae74c8ab4ea6d1bd4d
 SHA512:
-  metadata.gz: b74bb6e022b6ba452309a63162c772a0d98dd09caadbbbb3bae699d5d4a32370b81171c55cf95370a8b9c8c61dcd8a2f1b892fbfacfa87f12443425f43dcd770
-  data.tar.gz: e3bbb7b70c367e9c0adb8ccca970bb127e377440cccbd9f9aef219b89935c1ca5136a8c411e09d4ef8f0a5550cbe9573b986f165bdd2b6ddce920395f8dada2f
+  metadata.gz: 1e4d987728779936ca7e28010a2ee9b236b8fc6a635ba897df816013afd62c7d39e25f9c341f27ccbd9ea3de613e155f827adca937c9e4a09836fdf356f799d0
+  data.tar.gz: 48bbb3160614bc85e3ebf14be739c368f2a304d0f2e57a08f1db5be86835bf07cd2524174624dda459d5afc0f739791c6de672e42a0b596b36b82c717881d5eb

data/README.markdown

@@ -222,6 +222,12 @@ 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.1.1
+  * Handle passing "://" as part of the protocol in `asset_download_url` magic method
+
+* 2.1.0
+  * Add `import_file_to_anaconda_column(file, column_name)` method. Needs documenting.
+
 * 2.0.2
   * Fix `asset_url` method. There's tests coming. I swear.
 

data/lib/anaconda/anaconda_for.rb

@@ -168,9 +168,9 @@ module Anaconda
           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")}"
+          "#{anaconda_protocol(column_name, options[:protocol]).gsub("://://", "://")}#{self.anaconda_options[column_name.to_sym][:host]}/#{send("#{column_name}_file_path")}"
         else
-          "#{anaconda_protocol(column_name, options[:protocol])}#{options[:aws_endpoint]}/#{send("#{column_name}_file_path")}"
+          "#{anaconda_protocol(column_name, options[:protocol]).gsub("://://", "://")}#{options[:aws_endpoint]}/#{send("#{column_name}_file_path")}"
         end
       end
       

data/lib/anaconda/version.rb

@@ -1,5 +1,5 @@
 module Anaconda
   module Rails
-    VERSION = "2.1.0"
+    VERSION = "2.1.1"
   end
 end

metadata

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