s3_form_presenter 0.0.3 → 0.0.4

data/Gemfile.lock

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

data/lib/s3_form_presenter/version.rb

@@ -1,3 +1,3 @@
 module S3FormPresenter
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/s3_form_presenter.rb

@@ -7,6 +7,7 @@ module S3FormPresenter
     HIDDEN_FIELD_NAMES = :key, :access_key, :secret_key, :acl, :redirect_url, :policy, :signature
     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
 
     def initialize(key, redirect_url, options={}, &block)
@@ -26,7 +27,7 @@ module S3FormPresenter
     end
 
     def header
-      %Q(<form action="http://#{bucket}.s3.amazonaws.com/" method="post" enctype="multipart/form-data"#{extra_form_attributes}>)
+      %Q(<form action="https://#{bucket}.s3.amazonaws.com/" method="post" enctype="multipart/form-data"#{extra_form_attributes}>)
     end
 
     def footer
@@ -44,6 +45,7 @@ module S3FormPresenter
     end
 
     def to_html
+      validate_required
       content = ""
       content += header
       content += hidden_fields.join
@@ -82,5 +84,11 @@ module S3FormPresenter
         self.class.send(:attr_accessor, field) unless self.class.respond_to?(field)
       end
     end
+
+    def validate_required
+      REQUIRED_ATTRIBUTES.each do |attr|
+        raise "#{attr} has not been specified." unless send(attr)
+      end
+    end
   end
 end

data/test/form_test.rb

@@ -4,6 +4,10 @@ include S3FormPresenter
 
 describe S3FormPresenter::Form do
   before do
+    ENV["AWS_ACCESS_KEY_ID"] = nil
+    ENV["AWS_SECRET_ACCESS_KEY"] = nil
+    ENV["AWS_S3_BUCKET"] = nil
+
     @form = Form.new("some/test/key.ext", "http://www.someurl.com/comeback") do
       %Q(<input name="file" type="file"><input type="submit" value="Upload File" class="btn btn-primary">)
     end
@@ -48,8 +52,8 @@ describe S3FormPresenter::Form do
   end
 
   describe "header" do
-    it "generates a multi-part post form with the correct path" do
-      @form.header.must_equal %Q(<form action="http://test_bucket.s3.amazonaws.com/" method="post" enctype="multipart/form-data">)
+    it "generates a multi-part post form with the correct path (https protocol)" do
+      @form.header.must_equal %Q(<form action="https://test_bucket.s3.amazonaws.com/" method="post" enctype="multipart/form-data">)
     end
   end
 
@@ -76,7 +80,24 @@ describe S3FormPresenter::Form do
 
   describe "hidden_fields" do
     it "generates HTML for each hidden_field" do
-      #@form.hidden_fields.must_equal []
+      fields = @form.hidden_fields
+      {
+        "key" => "some/test/key.ext",
+        "access_key" => "test_access_key",
+        "secret_key" => "test_secret_key",
+        "acl" => "private",
+        "redirect_url" => "http://www.some-test-redirect.com/some/path",
+        "policy" => 332,
+        "signature" => 75
+      }.each_with_index do |field, i|
+        name = field.first
+        value = field.last
+        if value.is_a? String
+          fields[i].must_equal %Q(<input type="hidden" name="#{name}" value="#{value}">)
+        elsif value.is_a? Integer
+          fields[i].length.must_equal value
+        end
+      end
     end
   end
 
@@ -111,6 +132,12 @@ describe S3FormPresenter::Form do
   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
+      proc { Form.new("some/key", "somepath", :bucket => 'test-bucket').to_html }.must_raise RuntimeError
+      proc { Form.new("some/key", "somepath", :bucket => 'test-bucket', :access_key => 'access-key').to_html }.must_raise RuntimeError
+    end
+
     it "generates the full html of the form" do
       content = @form.header + @form.hidden_fields.join + @form.inner_content + @form.footer
       #content = "" # comment out if you want to see real output
@@ -120,7 +147,7 @@ describe S3FormPresenter::Form do
 
   describe "extra_form_attributes" do
     it "generates extra form attributes when provided in options" do
-      Form.new("some/key.ext", "http://www.someurl.com/comeback", :extra_form_attributes => %Q( class="form-horizontal")).header.must_equal %Q(<form action="http://.s3.amazonaws.com/" method="post" enctype="multipart/form-data" class="form-horizontal">)
+      Form.new("some/key.ext", "http://www.someurl.com/comeback", :bucket => "test-bucket", :extra_form_attributes => %Q( class="form-horizontal")).header.must_equal %Q(<form action="https://test-bucket.s3.amazonaws.com/" method="post" enctype="multipart/form-data" class="form-horizontal">)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: s3_form_presenter
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -44,7 +44,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3980563017398046619
+      hash: -656444126701832416
 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: 3980563017398046619
+      hash: -656444126701832416
 requirements: []
 rubyforge_project: s3_form_presenter
 rubygems_version: 1.8.15