image_fu 0.1.0.beta1 → 0.1.0.beta2

data/image_fu.gemspec

@@ -21,4 +21,5 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency "uuidtools"
   s.add_runtime_dependency "httparty", "~> 0.8.1"
+  s.add_runtime_dependency "aws-sdk"
 end

data/lib/image_fu/version.rb

@@ -1,3 +1,3 @@
 module ImageFu
-  VERSION = "0.1.0.beta1"
+  VERSION = "0.1.0.beta2"
 end

data/lib/image_fu.rb

@@ -4,6 +4,7 @@ require 'base64'
 require 'openssl'
 require 'uuidtools'
 require 'rack/utils'
+require 'aws-sdk'
 
 module ImageFu
   CONFIG = {
@@ -17,6 +18,10 @@ module ImageFu
     CONFIG.merge!(options)
   end
 
+  def self.s3
+    AWS::S3.new(:access_key_id => CONFIG[:access_key_id], :secret_access_key => CONFIG[:secret_access_key])
+  end
+
   def self.signed_upload_params(options = {})
     options.reverse_merge!(
       :acl      => 'private',
@@ -27,35 +32,21 @@ module ImageFu
 
     key = UUIDTools::UUID.random_create.to_s
 
-    policy = {
-      'expiration' => Time.now.in(options[:expiry]).utc,
-      'conditions' => [
-        {'bucket' => options[:bucket]},
-        {'acl'    => options[:acl]},
-        {'success_action_status' => '201'},
-        # {'key' => key},
-        ['content-length-range', 0, options[:max_size] || DEFAULT_PARAMS[:max_size]],
-        ['starts-with', '$key', ''],
-        ['starts-with', '$Filename', '']
-      ]
-    }
+    bucket = s3.buckets[options[:bucket]]
 
-    policy = Base64.encode64(policy.to_json).gsub("\n","")
-    policy_hash = OpenSSL::HMAC.digest( OpenSSL::Digest::Digest.new('sha1'), CONFIG[:secret_access_key], policy)
-
-    signature = Base64.encode64(policy_hash).gsub("\n","")
+    form = bucket.presigned_post(
+      :key                   => key,
+      :expires               => options[:expiry].to_i,
+      :acl                   => options[:acl],
+      :success_action_status => 201,
+      :content_length        => 0..(options[:max_size]),
+      :ignore                => ['Filename']
+    )
 
     {
       :server     => CONFIG[:server],
       :bucket     => options[:bucket],
-      :parameters => {
-        :key                   => key,
-        :AWSAccessKeyId        => CONFIG[:access_key_id],
-        :acl                   => options[:acl],
-        :success_action_status => "201",
-        :policy                => policy,
-        :signature             => Rack::Utils.escape_path(signature)
-      }
+      :parameters => form.fields
     }
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: image_fu
 version: !ruby/object:Gem::Version
-  version: 0.1.0.beta1
+  version: 0.1.0.beta2
   prerelease: 6
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-16 00:00:00.000000000 Z
+date: 2012-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uuidtools
-  requirement: &70249931547220 !ruby/object:Gem::Requirement
+  requirement: &70324335341240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70249931547220
+  version_requirements: *70324335341240
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &70249931546620 !ruby/object:Gem::Requirement
+  requirement: &70324335340740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +32,18 @@ dependencies:
         version: 0.8.1
   type: :runtime
   prerelease: false
-  version_requirements: *70249931546620
+  version_requirements: *70324335340740
+- !ruby/object:Gem::Dependency
+  name: aws-sdk
+  requirement: &70324335340140 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70324335340140
 description: 
 email:
 - mick@staugaard.com