anaconda 0.9.4 → 0.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 41b78076d96d6575112497147272ed19f16fbcc3
-  data.tar.gz: 3078b8a288c4e51ba7cf345b2ec289411f99ecf8
+  metadata.gz: 727ecb3cc6b44aed50ca4c56b309a0e0bf6846dc
+  data.tar.gz: 2192a007591dc147975a90346e3cb5ed9ef9bd94
 SHA512:
-  metadata.gz: 14237951c90193befe07b5a22aa123061712fec7045517050b9013dd6c35599060a6694c79d2af885fd6a0e5305617c1554b2eb3d0e2e08e5983093258c22a0c
-  data.tar.gz: 85875e215787fcd52bc0dff686f167db259936efe2395d3531d62a050950294bb15243663ab30d352ac5f3275ac38099e8a0e13c11b1dcdf125e14773952d302
+  metadata.gz: fba2e3e944129fdee8ba065d3ab95af61949418bbf2f5a24b9367011f15fcf7e48d23bb1860649fc109382f46d20ce3113211b6469037d286d7c5231ff8b9615
+  data.tar.gz: 14a384f8e00452993c1db28e3177b4d126a77ef224eae4de628ca5d6029a956f6d5f406564d4d973cf0c09150b8013c3c5323e49b6b155f31976e75bab634136

data/README.markdown

@@ -94,18 +94,29 @@ We highly recommend the `figaro` gem [https://github.com/laserlemon/figaro](http
         $ rails g anaconda:migration PostMedia asset
 
 *  Model setup
-
-        class PostMedia < ActiveRecord::Base
-          belongs_to :post
-
-          anaconda_for :asset, base_key: :asset_key
-
-          def asset_key
-			  o = [('a'..'z'), ('A'..'Z')].map { |i| i.to_a }.flatten
-			  s = (0...24).map { o[rand(o.length)] }.join
-			  "post_media/#{s}"
-			end
-
+	
+		class PostMedia < ActiveRecord::Base
+		  belongs_to :post
+			
+		  anaconda_for :asset, base_key: :asset_key
+			
+		  def asset_key
+			o = [('a'..'z'), ('A'..'Z')].map { |i| i.to_a }.flatten
+			s = (0...24).map { o[rand(o.length)] }.join
+			"post_media/#{s}"
+		  end
+		end
+	
+	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
+	* `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`
 
 
 *  Form setup
@@ -140,6 +151,9 @@ We highly recommend the `figaro` gem [https://github.com/laserlemon/figaro](http
     The magic method is asset_url which 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.
 
 ## Changelog
+* 0.9.5
+  * add `host` and `protocol` options to `anaconda_for`
+
 * 0.9.4
 	* 	Fix uploads. Previous version broke them completely.
 	

data/lib/anaconda/anaconda_for.rb

@@ -36,7 +36,9 @@ 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: "#{self.to_s.pluralize.downcase}/#{anaconda_column.to_s.pluralize}/#{(0...32).map{(65+rand(26)).chr}.join.downcase}",
+          host: false,
+          protocol: "http"
         )
       end
     end
@@ -52,7 +54,7 @@ module Anaconda
           end
           case checking_method
           when :url
-            magic_url(checking_column)
+            anaconda_url(checking_column)
           else
             super
           end
@@ -62,14 +64,25 @@ module Anaconda
       end
 
       private
-      def magic_url(column_name)
+      def anaconda_url(column_name)
         return nil unless send("#{column_name}_file_path").present?
 
         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]})
           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")}"
         else
-          "https://s3.amazonaws.com/#{Anaconda.aws[:aws_bucket]}/#{send("#{column_name}_file_path")}"
+          "#{anaconda_protocol(column_name)}s3.amazonaws.com/#{Anaconda.aws[:aws_bucket]}/#{send("#{column_name}_file_path")}"
+        end
+      end
+      
+      def anaconda_protocol(column_name)
+        case self.anaconda_options[column_name.to_sym][:protocol]
+        when :auto
+          "//"
+        else
+          "#{self.anaconda_options[column_name.to_sym][:protocol]}://"
         end
       end
     end

data/lib/anaconda/version.rb

@@ -1,5 +1,5 @@
 module Anaconda
   module Rails
-    VERSION = "0.9.4"
+    VERSION = "0.9.5"
   end
 end

metadata

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