s3_form_presenter 0.0.5 → 0.0.6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    s3_form_presenter (0.0.5)
+    s3_form_presenter (0.0.6)
 
 GEM
   remote: http://rubygems.org/

data/lib/s3_form_presenter.rb

@@ -8,7 +8,7 @@ module S3FormPresenter
     ACCESSOR_FIELDS = HIDDEN_FIELD_NAMES - [:policy, :signature]
     RENAMED_FIELDS = {:redirect_url => "success_action_redirect", :access_key => "AWSAccessKeyId"}
     REQUIRED_ATTRIBUTES = [:bucket] + HIDDEN_FIELD_NAMES
-    attr_accessor :bucket, :inner_content, :extra_form_attributes
+    attr_accessor :bucket, :inner_content, :extra_form_attributes, :starts_with
 
     def initialize(key, redirect_url, options={}, &block)
       @key = key
@@ -67,13 +67,19 @@ module S3FormPresenter
         "expiration" => policy_expiration,
         "conditions" => [
                          {"bucket" => bucket},
-                         ["starts-with", "$key", "#{key}"],
+                         ["starts-with", "$key", "#{starts_with}"],
                          {"acl" => acl},
                          {"success_action_redirect" => redirect_url}
                         ]
       }
     end
 
+    def starts_with
+      dirs = key.split("/")
+      dirs.pop
+      dirs.join("/")
+    end
+
     private
 
     def policy_expiration

data/lib/s3_form_presenter/version.rb

@@ -1,3 +1,3 @@
 module S3FormPresenter
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/test/form_test.rb

@@ -87,7 +87,7 @@ describe S3FormPresenter::Form do
         "secret_key" => "test_secret_key",
         "acl" => "private",
         "success_action_redirect" => "http://www.some-test-redirect.com/some/path",
-        "policy" => 332,
+        "policy" => 324,
         "signature" => 75
       }.each_with_index do |field, i|
         name = field.first
@@ -107,7 +107,7 @@ describe S3FormPresenter::Form do
       conditions = obj["conditions"]
       obj["expiration"].must_equal (Time.now + (10*60*60)).utc.strftime('%Y-%m-%dT%H:%M:%S.000Z')
       conditions[0]["bucket"].must_equal "test_bucket"
-      conditions[1].must_equal ["starts-with", "$key", "some/test/key.ext"]
+      conditions[1].must_equal ["starts-with", "$key", "some/test"]
       conditions[2]["acl"].must_equal :private
       conditions[3]["success_action_redirect"].must_equal "http://www.some-test-redirect.com/some/path"
     end
@@ -115,7 +115,7 @@ describe S3FormPresenter::Form do
 
   describe "policy" do
     it "generates the base64 encoded policy used in the form" do
-      @form.policy.length.must_equal 288
+      @form.policy.length.must_equal 280
     end
   end
 
@@ -131,6 +131,18 @@ describe S3FormPresenter::Form do
     end
   end
 
+  describe "starts_with" do
+    it "returns the key's path only when a dollar sign is passed" do
+      @form.key = "some/key/path/${filename}"
+      @form.starts_with.must_equal "some/key/path"
+    end
+
+    it "returns the key's path only when an explicit path is passed" do
+      @form.key = "some/key/path/filename"
+      @form.starts_with.must_equal "some/key/path"
+    end
+  end
+
   describe "to_html" do
     it "raise an exception if required attributes are not specified" do
       proc { Form.new("some/key", "somepath").to_html }.must_raise RuntimeError

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: s3_form_presenter
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -44,7 +44,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1757766881589126739
+      hash: -1143773170301607079
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -53,7 +53,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1757766881589126739
+      hash: -1143773170301607079
 requirements: []
 rubyforge_project: s3_form_presenter
 rubygems_version: 1.8.15