anaconda 0.13.1 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0759b09ee2db44658f9cd59b0b6a2a093c3fc668
-  data.tar.gz: 15735e51e3373536e940e5e16265f2ffec9b04fd
+  metadata.gz: c8e43e86824ee752934096b93a75dec0677d7c25
+  data.tar.gz: 53fb76dfe71116cec739ce274896a5bf4bc04a3f
 SHA512:
-  metadata.gz: 1cb38146118e3b88ae021ba36296a9ebed795028c52a20173c16d51ac4cd129885cbf38b8d49d56b449f5d03e19814b7b595e2d9f1c095b5ba2e329f818f1b0e
-  data.tar.gz: a6788cafd904bc2adfa806a0200789c2e5a96e4fe8f6b07cfd13ff1a0b86b507df70cbc050b8e093c42a6a61de38b1aa29da1e18228b7f70a6713b73541b7c90
+  metadata.gz: 6c4f6a74a9c8ea7b1721d6265021082e38d1309d5177733bc740e117448b41fe3e5e1e4ba21f4f2b648eeb6d9437bb7b2b809f3100e6edfa46b7b734b59a2b3f
+  data.tar.gz: c5187169a46d096c765eaf784d319002684c37a8d6b213be4b37f020952974b2d5e82fe99cab7da56a299612de7c4987517799d4df561e62029cce5462830424

data/README.markdown

@@ -176,9 +176,14 @@ We highly recommend the `figaro` gem [https://github.com/laserlemon/figaro](http
     
     `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.
     
+    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.
 
 ## Changelog
+* 0.14.0
+  * Add ability to specify protocol in the magic `asset_url` method
+
 * 0.13.1
   * Use UTC for timestamp in migration files.
   

data/lib/anaconda/anaconda_for.rb

@@ -75,7 +75,7 @@ module Anaconda
           end
           case checking_method
           when :url
-            anaconda_url(checking_column)
+            anaconda_url(checking_column, *args)
           when :download_url
             anaconda_download_url(checking_column)          
           else
@@ -87,16 +87,19 @@ module Anaconda
       end
 
       private
-      def anaconda_url(column_name)
+      def anaconda_url(column_name, *args)
         return nil unless send("#{column_name}_file_path").present?
+        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 => true})
           aws.get_object_https_url(Anaconda.aws[:aws_bucket], send("#{column_name}_file_path"), 1.hour.from_now)
         elsif self.anaconda_options[column_name.to_sym][:host]
-          "#{anaconda_protocol(column_name)}#{self.anaconda_options[column_name.to_sym][:host]}/#{send("#{column_name}_file_path")}"
+          "#{anaconda_protocol(column_name, options[:protocol])}#{self.anaconda_options[column_name.to_sym][:host]}/#{send("#{column_name}_file_path")}"
         else
-          "#{anaconda_protocol(column_name)}s3.amazonaws.com/#{Anaconda.aws[:aws_bucket]}/#{send("#{column_name}_file_path")}"
+          "#{anaconda_protocol(column_name, options[:protocol])}s3.amazonaws.com/#{Anaconda.aws[:aws_bucket]}/#{send("#{column_name}_file_path")}"
         end
       end
       
@@ -109,7 +112,8 @@ module Anaconda
 
       end
       
-      def anaconda_protocol(column_name)
+      def anaconda_protocol(column_name, override = nil)
+        return override if override
         case self.anaconda_options[column_name.to_sym][:protocol]
         when :auto
           "//"

data/lib/anaconda/version.rb

@@ -1,5 +1,5 @@
 module Anaconda
   module Rails
-    VERSION = "0.13.1"
+    VERSION = "0.14.0"
   end
 end

metadata

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