anaconda 2.1.0 → 2.1.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/README.markdown +6 -0
- data/lib/anaconda/anaconda_for.rb +2 -2
- data/lib/anaconda/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: b404bafc0d7c8e17d8100489db15b3362c2af825
|
4
|
+
data.tar.gz: 2cbd6cecd8095d8aa24721ae74c8ab4ea6d1bd4d
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 1e4d987728779936ca7e28010a2ee9b236b8fc6a635ba897df816013afd62c7d39e25f9c341f27ccbd9ea3de613e155f827adca937c9e4a09836fdf356f799d0
|
7
|
+
data.tar.gz: 48bbb3160614bc85e3ebf14be739c368f2a304d0f2e57a08f1db5be86835bf07cd2524174624dda459d5afc0f739791c6de672e42a0b596b36b82c717881d5eb
|
data/README.markdown
CHANGED
@@ -222,6 +222,12 @@ If you return false to the following events it will prevent the default behavior
|
|
222
222
|
From version 1.0.0 on we have used [Semantic Versioning](http://semver.org/).
|
223
223
|
|
224
224
|
## Changelog
|
225
|
+
* 2.1.1
|
226
|
+
* Handle passing "://" as part of the protocol in `asset_download_url` magic method
|
227
|
+
|
228
|
+
* 2.1.0
|
229
|
+
* Add `import_file_to_anaconda_column(file, column_name)` method. Needs documenting.
|
230
|
+
|
225
231
|
* 2.0.2
|
226
232
|
* Fix `asset_url` method. There's tests coming. I swear.
|
227
233
|
|
@@ -168,9 +168,9 @@ module Anaconda
|
|
168
168
|
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]})
|
169
169
|
aws.get_object_https_url(options[:aws_bucket], send("#{column_name}_file_path"), anaconda_expiry_length(column_name, options[:expires]))
|
170
170
|
elsif options[:host]
|
171
|
-
"#{anaconda_protocol(column_name, options[:protocol])}#{self.anaconda_options[column_name.to_sym][:host]}/#{send("#{column_name}_file_path")}"
|
171
|
+
"#{anaconda_protocol(column_name, options[:protocol]).gsub("://://", "://")}#{self.anaconda_options[column_name.to_sym][:host]}/#{send("#{column_name}_file_path")}"
|
172
172
|
else
|
173
|
-
"#{anaconda_protocol(column_name, options[:protocol])}#{options[:aws_endpoint]}/#{send("#{column_name}_file_path")}"
|
173
|
+
"#{anaconda_protocol(column_name, options[:protocol]).gsub("://://", "://")}#{options[:aws_endpoint]}/#{send("#{column_name}_file_path")}"
|
174
174
|
end
|
175
175
|
end
|
176
176
|
|
data/lib/anaconda/version.rb
CHANGED