s3lurp 0.4.4 → 0.4.5

data/CHANGELOG

@@ -1,3 +1,8 @@
+v0.4.5
+
+* add file_fields_only option and s3_direct_form_fields method
+* add no_file_input option
+
 v0.4.4
 
 * add multiple_files option to add multiple=true attribute to the file input

data/README.md

@@ -135,6 +135,8 @@ to the helper in a hash.
 |__:submit\_tag__          | HTML string containing code for the input or button that will handle form submission. This is optional and if not included a basic submit tag will be generated for the form. |
 |__:submit\_tag\_value__   | Override the value of the standard generated submit tag. _Default:_ "Upload" |
 |__:submit\_tag\_options__ | Hash of options passed to the submit_tag generator. |
+|__:no\_file\_input__      | When set to true, will not generate ae file field input. Useful when combined with form_fields_only |
+|__:form\_fields\_only__   | Will generate only the form fields and not the form tag or the submit tag. Useful for customization. |
 
 
 ### Examples

data/lib/s3lurp.rb

@@ -10,7 +10,7 @@ module S3lurp
       :success_action_redirect, :success_action_status,
       :min_file_size, :max_file_size,
       :amz_meta_tags, :minutes_valid,
-      :form_html_options, :file_field_tag_accept, :multiple_files,
+      :form_html_options, :file_field_tag_accept, :multiple_files, :form_fields_only, :no_file_input,
       :submit_tag, :submit_tag_value, :submit_tag_options,
       :file, :key].freeze
   class << self

data/lib/s3lurp/version.rb

@@ -1,3 +1,3 @@
 module S3lurp
-  VERSION = "0.4.4"
+  VERSION = "0.4.5"
 end

data/lib/s3lurp/view_helpers.rb

@@ -19,9 +19,14 @@ module S3lurp
     NON_FIELD_OPTIONS = %w( s3_bucket aws_secret_key
                            max_file_size min_file_size
                            amz_meta_tags minutes_valid
-                           form_html_options file_field_tag_accept multiple_files
+                           form_html_options file_field_tag_accept multiple_files form_fields_only no_file_input
                            submit_tag submit_tag_value submit_tag_options).map(&:to_sym)
 
+    def s3_direct_form_fields(opt ={})
+      s3_direct_form_tag(opt.merge!({:form_fields_only => true}))
+    end
+
+
     def s3_direct_form_tag(opt = {})
       options = (NON_FIELD_OPTIONS + HIDDEN_FIELD_MAP.keys).each_with_object({}) do |i, h|
         h[i] = opt[i] || S3lurp.config.send(i)
@@ -60,13 +65,18 @@ module S3lurp
       amz_meta_tags.merge! security_fields
       submit = s3_generate_submit_tag(options)
       file = s3_generate_file_field_tag(options)
-      form_tag("http://s3.amazonaws.com/#{options[:s3_bucket]}",  {:authenticity_token => false, :method => 'POST', :multipart => true}.merge(options[:form_html_options])) do
-        (
+      form_content = (
         hidden_fields.map{|k,v| hidden_field_tag(HIDDEN_FIELD_MAP[k],v, {:id => nil})}.join.html_safe +
-        amz_meta_tags.map{|k,v| hidden_field_tag(k,v,{:id => nil})}.join.html_safe +
-        field_set_tag(nil,:class=>"s3lurp_file") {file} +
-        field_set_tag(nil,:class=>"s3lurp_submit") {submit.html_safe}
-        )
+        amz_meta_tags.map{|k,v| hidden_field_tag(k,v,{:id => nil})}.join.html_safe
+      )
+      form_content << field_set_tag(nil,:class=>"s3lurp_file") {file} unless options[:no_file_input]
+      if options[:form_fields_only]
+        form_content
+      else
+        form_tag("http://s3.amazonaws.com/#{options[:s3_bucket]}",  {:authenticity_token => false, :method => 'POST', :multipart => true}.merge(options[:form_html_options])) do
+          ( form_content +
+            field_set_tag(nil,:class=>"s3lurp_submit") {submit.html_safe} )
+        end
       end
     end
 

data/spec/s3lurp_spec.rb

@@ -23,6 +23,40 @@ describe S3lurp::ViewHelpers do
     form.should include(%(name="file"), %(type="file"))
   end
 
+  it "should return just fields and no form tag when form_fields_only is set" do
+    S3lurp.configure do |config|
+      config.aws_access_key = nil
+      config.aws_secret_key = nil
+    end
+    form = view.s3_direct_form_tag({:key => '/files/s3lurp/lib/s3lurp.rb', :form_fields_only => true})
+    (!!form.match(/<form.*?>/)).should be_false
+    form.should include(%(name="key"), %(type="hidden"))
+    form.should include(%(name="file"), %(type="file"))
+  end
+
+ it "should return just fields and no form tag when s3_direct_form_fields is called" do
+    S3lurp.configure do |config|
+      config.aws_access_key = nil
+      config.aws_secret_key = nil
+    end
+    form = view.s3_direct_form_fields({:key => '/files/s3lurp/lib/s3lurp.rb'})
+    (!!form.match(/<form.*?>/)).should be_false
+    form.should include(%(name="key"), %(type="hidden"))
+    form.should include(%(name="file"), %(type="file"))
+  end
+
+ it "should return a form without a file input when no_file_input is set" do
+    S3lurp.configure do |config|
+      config.aws_access_key = nil
+      config.aws_secret_key = nil
+    end
+    form = view.s3_direct_form_tag({:key => '/files/s3lurp/lib/s3lurp.rb', :no_file_input => true})
+    (!!form.match(/<form.*?>/)).should be_true
+    form.should include(%(name="key"), %(type="hidden"))
+    form.should_not include(%(name="file"), %(type="file"))
+  end
+
+
   it "should return a form with a policy and signature and my meta tags" do
     S3lurp.configure do |config|
       config.s3_bucket = "bucket_o_stuff"
@@ -57,6 +91,41 @@ describe S3lurp::ViewHelpers do
 
   end
 
+  it "should return fields with a policy and signature and my meta tags" do
+    S3lurp.configure do |config|
+      config.s3_bucket = "bucket_o_stuff"
+      config.aws_access_key = 'oingoboingo'
+      config.aws_secret_key = "qwerty5678_"
+    end
+    form = view.s3_direct_form_fields({
+      :key => '/some/key.pl',
+      :acl => 'public-read',
+      :success_action_redirect => 'http://foobar.com/thanks',
+      :success_action_status => 204,
+      :content_disposition => "attachment",
+      :min_file_size => 1024,
+      :max_file_size => 6291456,
+      :minutes_valid => 333,
+      :amz_meta_tags => {
+        :foo => "bar",
+        :parent_id => 42
+      },
+      :form_html_options => {:class => "myclass", :id => "s3lurp_form"}
+    })
+    (!!form.match(/<form.*?>/)).should be_false
+    form.should_not include(%(class="myclass"))
+    form.should_not include(%(id="s3lurp_form"))
+    form.should include(%(name="key"), %(value="/some/key.pl"))
+    form.should include(%(name="AWSAccessKeyId"), %(value="oingoboingo"))
+    form.should include(%(name="file"), %(type="file"))
+    form.should include(%(name="policy"), %(type="hidden"))
+    form.should include(%(name="x-amz-meta-foo"), %(value="bar"))
+    form.should include(%(name="x-amz-meta-parent_id"), %(value="42"))
+    form.should include(%(name="Content-Disposition"), %(type="hidden"), %(value="attachment"))
+
+  end
+
+
   it 'should return valid json from the generate policy method and should have the keys I send it' do
     json = view.s3_generate_policy({:key => "/foo/bar/${filename}", :acl => 'public-read'}, 
                                    {:bucket => 'mybucket', 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: s3lurp
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-08 00:00:00.000000000 Z
+date: 2013-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -128,7 +128,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2497482005412700173
+      hash: 914430202827229729
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -137,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2497482005412700173
+      hash: 914430202827229729
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25