s3_file_field 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef07352fc0b375de126dd7c8a7ce16c49b795a21
-  data.tar.gz: 879af5858f21cf7d2786fa61bca981fad2d83f86
+  metadata.gz: 834aede7c4a79df6f4904aff97935bcb1fd62a21
+  data.tar.gz: 1a2cf2be6867f2b38e29c848841f949599bd5ff0
 SHA512:
-  metadata.gz: cb1fa63304886f3b2942984b5f0d026ff5c49f4221713dd1d30fe8d1499a23cbb9b35a5e169cc52721fbc139e6ea083810e0fc5270859c2181381ca1fa81429a
-  data.tar.gz: 2e08953e3a376cfceea449b584630bbc16227f9d0ec7c730ddacbc8968d611d328f9c78914f418a8088e0031c330b03a5d47264188ad5253f2f535fa4f34a2ae
+  metadata.gz: de5f03bc8f889e79965610ef29e6617c79b4e912b7d67859334db82b7bd6f9a03aa725cab5d7517cabddb57ef3f0c0af9e17bd72ab110cae8e26f4d7c5e42879
+  data.tar.gz: 13c57184bd54a499aa16ac41f38df6ee2ce137ffaa3f17aca28ee7aceeb6a7bb2020ddaefbfce49702cc5e13fb87f5bc163d881c1bd4bda1bf3c4c5d17488bce

data/README.md

@@ -32,6 +32,7 @@ S3FileField.config do |c|
   # c.max_file_size = 500.megabytes
   # c.conditions = []
   # c.key_starts_with = 'uploads/
+  # c.ssl = true # if unset or false, will default to current server settings
 end
 ```
 

data/lib/s3_file_field/config_aws.rb

@@ -4,7 +4,16 @@ module S3FileField
   class Config
     include Singleton
 
-    ATTRIBUTES = [:access_key_id, :secret_access_key, :bucket, :prefix_to_clean, :region, :url, :key_starts_with]
+    ATTRIBUTES = [
+      :access_key_id,
+      :secret_access_key,
+      :bucket,
+      :prefix_to_clean,
+      :region,
+      :key_starts_with,
+      :ssl,
+      :url
+    ]
 
     attr_accessor *ATTRIBUTES
   end
@@ -13,6 +22,7 @@ module S3FileField
     if block_given?
       yield Config.instance
     end
+
     Config.instance
   end
 end

data/lib/s3_file_field/s3_uploader.rb

@@ -13,7 +13,9 @@ module S3FileField
         max_file_size: 500.megabytes,
         conditions: [],
         key_starts_with: S3FileField.config.key_starts_with || 'uploads/',
-        region: S3FileField.config.region || 's3'
+        region: S3FileField.config.region || 's3',
+        url: S3FileField.config.url,
+        ssl: S3FileField.config.ssl
       }
 
       @key = original_options[:key]
@@ -33,8 +35,8 @@ module S3FileField
         raise Error.new("Please configure secret_access_key option.")
       end
 
-      unless @options[:bucket]
-        raise Error.new("Please configure bucket name.")
+      if @options[:bucket].nil? && @options[:url].nil?
+        raise Error.new("Please configure bucket name or url.")
       end
     end
 
@@ -60,7 +62,15 @@ module S3FileField
     end
 
     def url
-      "//#{@options[:bucket]}.#{@options[:region]}.amazonaws.com/"
+      @url ||=
+        if @options[:url]
+          @options[:url]
+        else
+          protocol = @options[:ssl] == true ? "https" : @options[:ssl] == false ? "http" : nil
+          subdomain = "#{@options[:bucket]}.#{@options[:region]}"
+          domain = "//#{subdomain}.amazonaws.com/"
+          [protocol, domain].compact.join(":")
+        end
     end
 
     def policy

data/lib/s3_file_field/version.rb

@@ -1,3 +1,3 @@
 module S3FileField
-  VERSION = "1.2.1"
+  VERSION = "1.3.0"
 end

metadata

@@ -1,125 +1,125 @@
 --- !ruby/object:Gem::Specification
 name: s3_file_field
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Adam Stankiewicz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-13 00:00:00.000000000 Z
+date: 2014-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
   name: coffee-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.1
 - !ruby/object:Gem::Dependency
   name: sass-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.5
 - !ruby/object:Gem::Dependency
   name: jquery-fileupload-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.4.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: jQuery File Upload extension for direct uploading to Amazon S3 using
@@ -149,17 +149,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: jQuery File Upload extension for direct uploading to Amazon S3 using CORS