carrierwave_direct 0.0.2 → 0.0.3

data/.travis.yml

@@ -1,3 +1,4 @@
 rvm:
+ - 1.8.7
  - 1.9.2
 

data/README.md

@@ -10,6 +10,8 @@
 
 Right now, CarrierWaveDirect works with [Amazon S3](http://aws.amazon.com/s3/). Adding support for [Google Storage for Developers](http://code.google.com/apis/storage/) should be fairly straight forward since the direct upload form is essentially the same. Please see the contributing section if you would like support for Google Storage for Developers or any other service that provides direct upload capabilities.
 
+Please be aware that this gem (and S3 in general) only support single file uploads. If you want to upload multiple files simultaneously you'll have to use a javascript or flash uploader.
+
 ## Information
 
 More information, and how-tos [available on the wiki](https://github.com/dwilkie/carrierwave_direct/wiki)
@@ -67,7 +69,7 @@ Remove the line `storage :file` and replace it with `include CarrierWaveDirect::
 
 This adds the extra functionality for direct uploading.
 
-If you're *not* using Rails you can generate a direct upload form to S3 similar to this:
+If you're *not* using Rails you can generate a direct upload form to S3 similar to this (see also [http://doc.s3.amazonaws.com/proposals/post.html#A_Sample_Form](http://doc.s3.amazonaws.com/proposals/post.html#A_Sample_Form)):
 
     <form action="https://s3-bucket.s3.amazonaws.com/" method="post" enctype="multipart/form-data">
       <input type="hidden" name="key" value="uploads/${filename}">
@@ -113,6 +115,13 @@ things just got a whole lot easier. You can generate a direct upload form like t
       <%= f.submit %>
     <% end %>
 
+You can also pass html options like this:
+
+    <%= direct_upload_form_for @uploader, :html => { :target => "_blank_iframe" } do |f| %>
+      <%= f.file_field :avatar %>
+      <%= f.submit %>
+    <% end %>
+
 Note if `User` is not an ActiveRecord object e.g.
 
     class User
@@ -128,6 +137,11 @@ you can still use the form helper by including the ActiveModel modules your uplo
       extend ActiveModel::Naming
     end
 
+Note if you're using Rails 3.0.x you'll also need to disable forgery protection
+
+    # config/application.rb
+    config.action_controller.allow_forgery_protection = false
+
 Once you've uploaded your file directly to the cloud you'll probably need a way to reference it with an ORM and process it.
 
 ## Processing and referencing files in a background process
@@ -356,3 +370,7 @@ You should now be able to run the tests
 
     bundle exec rake
 
+## Contributors
+
+* cblunt (Chris Blunt) - Support for passing html options
+* robyurkowski (Rob Yurkowski) - Fix deprecation warnings for Rails 3.2

data/lib/carrierwave_direct.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+
 require "carrierwave_direct/version"
 
 require "carrierwave"

data/lib/carrierwave_direct/action_view_extensions/form_helper.rb

@@ -16,12 +16,17 @@ module CarrierWaveDirect
 
       def direct_upload_form_for(record, *args, &block)
         options = args.extract_options!
+
+        html_options = {
+          :multipart => true 
+        }.update(options[:html] || {})
+
         form_for(
           record,
           *(args << options.merge(
             :builder => CarrierWaveDirect::FormBuilder,
             :url => record.direct_fog_url,
-            :html => {:multipart => true},
+            :html => html_options,
             :authenticity_token => false,
             :include_id => false
           )),

data/lib/carrierwave_direct/locale/en.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 {
   :en => {
     :errors => {

data/lib/carrierwave_direct/mount.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module CarrierWaveDirect
 
   module Mount

data/lib/carrierwave_direct/uploader.rb

@@ -19,117 +19,113 @@ module CarrierWaveDirect
       end
     end
 
-    module InstanceMethods
-      def direct_fog_url(options = {})
-        fog_uri = CarrierWave::Storage::Fog::File.new(self, CarrierWave::Storage::Fog.new(self), nil).public_url
-        if options[:with_path]
-          uri = URI.parse(fog_uri)
-          path = "/#{key}"
-          uri.path = path
-          fog_uri = uri.to_s
-        end
-        fog_uri
-      end
-
-      def guid
-        UUID.generate
-      end
+    def direct_fog_url(options = {})
+      fog_uri = CarrierWave::Storage::Fog::File.new(self, CarrierWave::Storage::Fog.new(self), nil).public_url
+      if options[:with_path]
+        uri = URI.parse(fog_uri)
+        path = "/#{key}"
+        uri.path = path
+        fog_uri = uri.to_s
+      end
+      fog_uri
+    end
 
-      def key=(k)
-        @key = k
-        update_version_keys(:with => @key)
-      end
+    def guid
+      UUID.generate
+    end
 
-      def key
-        @key ||= "#{store_dir}/#{guid}/#{FILENAME_WILDCARD}"
-      end
+    def key=(k)
+      @key = k
+      update_version_keys(:with => @key)
+    end
 
-      def has_key?
-        @key.present? && !(@key =~ /#{Regexp.escape(FILENAME_WILDCARD)}\z/)
-      end
+    def key
+      @key ||= "#{store_dir}/#{guid}/#{FILENAME_WILDCARD}"
+    end
 
-      def acl
-        s3_access_policy.to_s.gsub('_', '-')
-      end
+    def has_key?
+      @key.present? && !(@key =~ /#{Regexp.escape(FILENAME_WILDCARD)}\z/)
+    end
 
-      def policy(options = {})
-        options[:expiration] ||= self.class.upload_expiration
-        options[:max_file_size] ||= self.class.max_file_size
-
-        Base64.encode64(
-          {
-            'expiration' => Time.now.utc + options[:expiration],
-            'conditions' => [
-              ["starts-with", "$utf8", ""],
-              ["starts-with", "$key", store_dir],
-              {"bucket" => fog_directory},
-              {"acl" => acl},
-              {"success_action_redirect" => success_action_redirect},
-              ["content-length-range", 1, options[:max_file_size]]
-            ]
-          }.to_json
-        ).gsub("\n","")
-      end
+    def acl
+      s3_access_policy.to_s.gsub('_', '-')
+    end
 
-      def signature
-        Base64.encode64(
-          OpenSSL::HMAC.digest(
-            OpenSSL::Digest::Digest.new('sha1'),
-            aws_secret_access_key, policy
-          )
-        ).gsub("\n","")
-      end
+    def policy(options = {})
+      options[:expiration] ||= self.class.upload_expiration
+      options[:max_file_size] ||= self.class.max_file_size
+
+      Base64.encode64(
+        {
+          'expiration' => Time.now.utc + options[:expiration],
+          'conditions' => [
+            ["starts-with", "$utf8", ""],
+            ["starts-with", "$key", store_dir],
+            {"bucket" => fog_directory},
+            {"acl" => acl},
+            {"success_action_redirect" => success_action_redirect},
+            ["content-length-range", 1, options[:max_file_size]]
+          ]
+        }.to_json
+      ).gsub("\n","")
+    end
 
-      def persisted?
-        false
-      end
+    def signature
+      Base64.encode64(
+        OpenSSL::HMAC.digest(
+          OpenSSL::Digest::Digest.new('sha1'),
+          aws_secret_access_key, policy
+        )
+      ).gsub("\n","")
+    end
 
-      def filename
-        unless has_key?
-          # Use the attached models remote url to generate a new key otherwise return nil
-          remote_url = model.send("remote_#{mounted_as}_url")
-          remote_url ? key_from_file(remote_url.split("/").pop) : return
-        end
+    def persisted?
+      false
+    end
 
-        key_path = key.split("/")
-        filename_parts = []
-        filename_parts.unshift(key_path.pop)
-        unique_key = key_path.pop
-        filename_parts.unshift(unique_key) if unique_key
-        filename_parts.join("/")
+    def filename
+      unless has_key?
+        # Use the attached models remote url to generate a new key otherwise return nil
+        remote_url = model.send("remote_#{mounted_as}_url")
+        remote_url ? key_from_file(remote_url.split("/").pop) : return
       end
 
-      def key_regexp
-        /\A#{store_dir}\/[a-f\d\-]+\/.+\.#{extension_regexp}\z/
-      end
+      key_path = key.split("/")
+      filename_parts = []
+      filename_parts.unshift(key_path.pop)
+      unique_key = key_path.pop
+      filename_parts.unshift(unique_key) if unique_key
+      filename_parts.join("/")
+    end
 
-      def extension_regexp
-        allowed_file_types = extension_white_list
-        extension_regexp = allowed_file_types.present? && allowed_file_types.any? ?  "(#{allowed_file_types.join("|")})" : "\\w+"
-      end
+    def key_regexp
+      /\A#{store_dir}\/[a-f\d\-]+\/.+\.#{extension_regexp}\z/
+    end
 
-      def url_scheme_white_list
-        nil
-      end
+    def extension_regexp
+      allowed_file_types = extension_white_list
+      extension_regexp = allowed_file_types.present? && allowed_file_types.any? ?  "(#{allowed_file_types.join("|")})" : "\\w+"
+    end
 
-      private
+    def url_scheme_white_list
+      nil
+    end
 
-      def key_from_file(fname)
-        new_key_parts = key.split("/")
-        new_key_parts.pop
-        new_key_parts << fname
-        self.key = new_key_parts.join("/")
-      end
+    private
 
-      # Update the versions to use this key
-      def update_version_keys(options)
-        versions.each do |name, uploader|
-          uploader.key = options[:with]
-        end
-      end
-    end # InstanceMethods
+    def key_from_file(fname)
+      new_key_parts = key.split("/")
+      new_key_parts.pop
+      new_key_parts << fname
+      self.key = new_key_parts.join("/")
+    end
 
-    private
+    # Update the versions to use this key
+    def update_version_keys(options)
+      versions.each do |name, uploader|
+        uploader.key = options[:with]
+      end
+    end
 
     # Put the version name at the end of the filename since the guid is also stored
     # e.g. guid/filename_thumb.jpg instead of CarrierWave's default: thumb_guid/filename.jpg

data/lib/carrierwave_direct/version.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
 module CarrierwaveDirect
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end
 

data/spec/action_view_extensions/form_helper_spec.rb

@@ -22,7 +22,14 @@ describe CarrierWaveDirect::ActionViewExtensions::FormHelper do
           :action => "http://example.com", :method => "post", :enctype => "multipart/form-data"
         )
       end
+
+      it "should include any html options passed as through :html" do
+        form(:html => { :target => "_blank_iframe" }).should submit_to(
+          :action => "http://example.com", :method => "post", :enctype => "multipart/form-data", :target => "_blank_iframe"
+        )
+      end
     end
   end
+
 end
 

data/spec/mount_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe CarrierWaveDirect::Mount do

data/spec/spec_helper.rb

@@ -1,5 +1,10 @@
+# encoding: utf-8
+
 require 'carrierwave_direct'
 require 'json'
 require 'timecop'
+
+require File.dirname(__FILE__) << '/support/view_helpers' # Catch dependency order
+
 Dir[ File.dirname(__FILE__) << "/support/**/*.rb"].each {|file| require file }
 

data/spec/support/carrier_wave_config.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 CarrierWave.configure do |config|
   config.fog_credentials = {
     :provider               => 'AWS',

data/spec/support/direct_uploader.rb

@@ -1,3 +1,7 @@
+# encoding: utf-8
+
+require File.dirname(__FILE__) << "/carrier_wave_config"
+
 class DirectUploader < CarrierWave::Uploader::Base
   include CarrierWaveDirect::Uploader
 end

data/spec/support/form_builder_helpers.rb

@@ -3,6 +3,8 @@
 require 'action_view'
 require 'action_view/template'
 
+require File.join(File.dirname(__FILE__), 'view_helpers') 
+
 require 'carrierwave_direct/form_builder'
 require 'carrierwave_direct/action_view_extensions/form_helper'
 
@@ -12,7 +14,7 @@ module FormBuilderHelpers
   include ActionView::Context
   include ActionController::RecordIdentifier
 
-  include ViewHelpers
+  include ::ViewHelpers
 
   def direct_uploader
     defined?(super) ? super : @direct_uploader ||= MountedClass.new.video
@@ -27,10 +29,9 @@ module FormBuilderHelpers
     false
   end
 
-  def form(&block)
+  def form(options = {}, &block)
     blk = block_given? ? block : Proc.new {|f|}
-    direct_upload_form_for(direct_uploader, &blk)
+    direct_upload_form_for(direct_uploader, options, &blk)
   end
-
 end
 

data/spec/support/global_helpers.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 GUID_REGEXP = "[a-f\\d\\-]+"
 
 def sample(data)

data/spec/support/model_helpers.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module ModelHelpers
   def self.included(base)
     base.extend ClassMethods

data/spec/support/mounted_class.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require File.dirname(__FILE__) << "/direct_uploader"
 
 class MountedClass

data/spec/support/uploader_helpers.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require File.dirname(__FILE__) << "/mounted_class"
 
 module UploaderHelpers

data/spec/support/view_helpers.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'capybara/rspec'
 
 module ViewHelpers

data/spec/uploader_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe CarrierWaveDirect::Uploader do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave_direct
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-13 00:00:00.000000000Z
+date: 2012-02-06 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
-  requirement: &74846810 !ruby/object:Gem::Requirement
+  requirement: &85732130 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *74846810
+  version_requirements: *85732130
 - !ruby/object:Gem::Dependency
   name: uuid
-  requirement: &74846570 !ruby/object:Gem::Requirement
+  requirement: &85731800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *74846570
+  version_requirements: *85731800
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &74846360 !ruby/object:Gem::Requirement
+  requirement: &85731490 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *74846360
+  version_requirements: *85731490
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &74846140 !ruby/object:Gem::Requirement
+  requirement: &85731170 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *74846140
+  version_requirements: *85731170
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &74845930 !ruby/object:Gem::Requirement
+  requirement: &85730900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *74845930
+  version_requirements: *85730900
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &74845710 !ruby/object:Gem::Requirement
+  requirement: &85730610 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *74845710
+  version_requirements: *85730610
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &74845480 !ruby/object:Gem::Requirement
+  requirement: &85730290 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *74845480
+  version_requirements: *85730290
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &74845250 !ruby/object:Gem::Requirement
+  requirement: &85729900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *74845250
+  version_requirements: *85729900
 description: Process your uploads in the background by uploading directly to S3
 email:
 - dwilkie@gmail.com
@@ -154,15 +154,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -831805485
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -831805485
 requirements: []
 rubyforge_project: carrierwave_direct
-rubygems_version: 1.8.5
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Upload direct to S3 using CarrierWave