anaconda 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a362cf9690829d3184624cbf62dc7a0b91cc555
-  data.tar.gz: e3fed3967d2f2c8eb7adbee4a64a1f2fa35ecd2b
+  metadata.gz: ee4ffc83e23081c0ec4b6d113ade0f8d4cf29ee5
+  data.tar.gz: 2cedf6106ce7add799fa92cedc853aca72fec6d9
 SHA512:
-  metadata.gz: bc25838f832c4fe24971d5c054dd8da3923781ee02ffc0f3f71415a636ca37646b257697970f7764922d2e11722ca1ab042b5337acdd78abcae6302c87536be8
-  data.tar.gz: fe04aefa077d7d1da356b7a8fdbd70dbb304321101ed542e5b779b1939e67a738398010942bf5ea37ab1d1b51cb8863ba28e28e2f89d1d7ea42d59fbe90fd705
+  metadata.gz: 1ed1a97fbb2cc1c39151f68d871411288b967c4cb055b35e7daf6277621407a6a1e99a5aaf063f29b9a38e61462c072bf2f4fdc0fac99acb9caea4d32ec5eb8d
+  data.tar.gz: 3e323b34bcf69aeef2eeea9a71a24c0e959cfa7b590f41aba72a7f76703c9c1a49f897268b977e9b819adbbe5bca97239ac0f3c6d5c8af9087de514368a9ce9e

data/README.markdown

@@ -2,7 +2,7 @@
 
 Dead simple direct-to-s3 file uploading for your rails app.
 
-Current Version: 1.0.2
+Current Version: 1.0.3
 
 ## Installation
 
@@ -202,6 +202,10 @@ 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.3
+  * Properly define dependencies so they are included
+  * Add support for non US Standard region buckets. See new `aws_endpoint` option in the config
+
 * 1.0.2
   * Refactor S3Uploader into it's own class so it can be used outside of the form helper
   

data/anaconda.gemspec

@@ -23,4 +23,6 @@ Gem::Specification.new do |s|
 
   s.add_dependency "jquery-fileupload-rails", "~> 0.4.1"
   s.add_dependency "javascript_dlog-rails", "~> 1.0.1"
+  s.add_dependency "simple_form", "3.0.2"
+  s.add_dependency "fog", "~> 1.21"
 end

data/lib/anaconda.rb

@@ -16,7 +16,8 @@ module Anaconda
   @@aws = {
     aws_access_key: "",
     aws_secret_key: "",
-    aws_bucket:     ""
+    aws_bucket:     "",
+    aws_endpoint:   ""
   }
   
   @@file_types = {
@@ -30,6 +31,9 @@ module Anaconda
   # to create a fresh initializer with all configuration values.
   def self.config
     yield self
+    
+    @@aws[:aws_endpoint] = "s3.amazonaws.com/#{@@aws[:aws_bucket]}" unless @@aws[:aws_endpoint].present?
+    @@aws[:path_style] = !@@aws[:aws_endpoint].starts_with?(@@aws[:aws_bucket])    
   end
   
   def self.js_file_types
@@ -52,7 +56,7 @@ module Anaconda
   end
   
   def self.remove_s3_object_in_bucket_with_file_path(bucket, file_path)
-    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 = 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 => @@aws[:path_style]})
     aws.delete_object(bucket, file_path)
   end
 end

data/lib/anaconda/anaconda_for.rb

@@ -94,12 +94,12 @@ module Anaconda
         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 = 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 => Anaconda.aws[:path_style]})
           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, options[:protocol])}#{self.anaconda_options[column_name.to_sym][:host]}/#{send("#{column_name}_file_path")}"
         else
-          "#{anaconda_protocol(column_name, options[:protocol])}s3.amazonaws.com/#{Anaconda.aws[:aws_bucket]}/#{send("#{column_name}_file_path")}"
+          "#{anaconda_protocol(column_name, options[:protocol])}#{Anaconda.aws[:aws_endpoint]}/#{send("#{column_name}_file_path")}"
         end
       end
       
@@ -107,7 +107,7 @@ module Anaconda
         return nil unless send("#{column_name}_file_path").present?
         
         options = {query: {"response-content-disposition" => "attachment;"}}
-        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 = 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 => Anaconda.aws[:path_style]})
         aws.get_object_https_url(Anaconda.aws[:aws_bucket], send("#{column_name}_file_path"), 1.hour.from_now, options)
 
       end

data/lib/anaconda/railtie.rb

@@ -1,5 +1,7 @@
 require 'rails/railtie'
 require 'anaconda/form_builder_helpers'
+require 'simple_form'
+require 'fog'
 
 module Anaconda
   class Railtie < ::Rails::Railtie

data/lib/anaconda/s3_uploader.rb

@@ -47,7 +47,7 @@ module Anaconda
     end
 
     def url
-      "https://s3.amazonaws.com/#{@options[:bucket]}/"
+      "https://#{Anaconda.aws[:aws_endpoint]}/"
     end
 
     def policy

data/lib/anaconda/version.rb

@@ -1,5 +1,5 @@
 module Anaconda
   module Rails
-    VERSION = "1.0.2"
+    VERSION = "1.0.3"
   end
 end

data/lib/generators/anaconda/templates/config/initializers/anaconda.rb

@@ -3,7 +3,8 @@ Anaconda.config do |config|
   config.aws = {
     aws_access_key: ENV["AWS_ACCESS_KEY"] || nil,
     aws_secret_key: ENV["AWS_SECRET_KEY"] || nil,
-    aws_bucket:     ENV["AWS_BUCKET"]     || nil
+    aws_bucket:     ENV["AWS_BUCKET"]     || nil,
+    aws_endpoint:   ENV["AWS_ENDPOINT"]   || nil, # example: anaconda-demo.s3-us-west-2.amazonaws.com or s3.amazonaws.com/not.dns.friendly.bucket
   }
   config.file_types = {
     audio:    /(\.|\/)(wav|mp3|m4a|aiff|ogg|flac)$/,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: anaconda
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Ben McFadden
@@ -39,6 +39,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.1
+- !ruby/object:Gem::Dependency
+  name: simple_form
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.0.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.0.2
+- !ruby/object:Gem::Dependency
+  name: fog
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.21'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.21'
 description: Dead simple file uploading to S3
 email: ben@forgeapps.com
 executables: []