carrierwave_direct 0.0.13 → 0.0.17

data/lib/carrierwave_direct/uploader/content_type.rb

@@ -0,0 +1,28 @@
+module CarrierWaveDirect
+  module Uploader
+    module ContentType
+
+      def content_type
+        default_content_type ? default_content_type : 'binary/octet-stream'
+      end
+
+      def content_types
+        types = allowed_content_types
+
+        return types if types.is_a? Array
+
+        %w(application/atom+xml application/ecmascript application/json
+          application/javascript application/octet-stream application/ogg
+          application/pdf application/postscript application/rss+xml
+          application/font-woff application/xhtml+xml application/xml
+          application/xml-dtd application/zip application/gzip audio/basic
+          audio/mp4 audio/mpeg audio/ogg audio/vorbis audio/vnd.rn-realaudio
+          audio/vnd.wave audio/webm image/gif image/jpeg image/pjpeg
+          image/png image/svg+xml image/tiff text/cmd text/css text/csv
+          text/html text/javascript text/plain text/vcard text/xml video/mpeg
+          video/mp4 video/ogg video/quicktime video/webm video/x-matroska
+          video/x-ms-wmv video/x-flv)
+      end
+    end
+  end
+end

data/lib/carrierwave_direct/uploader/direct_url.rb

@@ -0,0 +1,15 @@
+module CarrierWaveDirect
+  module Uploader
+    module DirectUrl
+
+      def direct_fog_url(options = {})
+        if options[:with_path]
+          url
+        else
+          CarrierWave::Storage::Fog::File.new(self, CarrierWave::Storage::Fog.new(self), nil).public_url
+        end
+      end
+
+    end
+  end
+end

data/lib/carrierwave_direct/uploader.rb

@@ -1,8 +1,11 @@
 # encoding: utf-8
 
+require "securerandom"
+require "carrierwave_direct/uploader/content_type"
+require "carrierwave_direct/uploader/direct_url"
+
 module CarrierWaveDirect
   module Uploader
-
     extend ActiveSupport::Concern
 
     FILENAME_WILDCARD = "${filename}"
@@ -20,84 +23,73 @@ module CarrierWaveDirect
       end
     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.chomp('/'))
-        path = "/#{key}"
-        uri.path += URI.escape(path)
-        fog_uri = uri.to_s
-      end
-      fog_uri
+    include CarrierWaveDirect::Uploader::ContentType
+    include CarrierWaveDirect::Uploader::DirectUrl
+
+    def acl
+      fog_public ? 'public-read' : 'private'
     end
 
-    def guid
-      UUIDTools::UUID.random_create
+    def policy(options = {}, &block)
+      options[:expiration] ||= upload_expiration
+      options[:min_file_size] ||= min_file_size
+      options[:max_file_size] ||= max_file_size
+
+      @policy ||= generate_policy(options, &block)
     end
 
-    def key=(k)
-      @key = k
-      update_version_keys(:with => @key)
+    def clear_policy!
+      @policy = nil
+    end
+
+    def signature
+      Base64.encode64(
+        OpenSSL::HMAC.digest(
+          OpenSSL::Digest.new('sha1'),
+          aws_secret_access_key, policy
+        )
+      ).gsub("\n","")
+    end
+
+    def url_scheme_white_list
+      nil
+    end
+
+    def persisted?
+      false
     end
 
     def key
       return @key if @key.present?
       if present?
-        self.key = URI.parse(URI.encode(url)).path[1 .. -1] # explicitly set key
+        identifier = model.send("#{mounted_as}_identifier")
+        self.key = "#{store_dir}/#{identifier}"
       else
         @key = "#{store_dir}/#{guid}/#{FILENAME_WILDCARD}"
       end
       @key
     end
 
-    def has_key?
-      key !~ /#{Regexp.escape(FILENAME_WILDCARD)}\z/
+    def key=(k)
+      @key = k
+      update_version_keys(:with => @key)
     end
 
-    def acl
-      fog_public ? 'public-read' : 'private'
+    def guid
+      SecureRandom.uuid
     end
 
-    def policy(options = {})
-      options[:expiration] ||= self.class.upload_expiration
-      options[:min_file_size] ||= self.class.min_file_size
-      options[:max_file_size] ||= self.class.max_file_size
-
-      conditions = [
-        ["starts-with", "$utf8", ""],
-        ["starts-with", "$key", key.sub(/#{Regexp.escape(FILENAME_WILDCARD)}\z/, "")]
-      ]
-      conditions << ["starts-with", "$Content-Type", ""] if self.class.will_include_content_type
-      conditions << {"bucket" => fog_directory}
-      conditions << {"acl" => acl}
-
-      if self.class.use_action_status
-        conditions << {"success_action_status" => success_action_status}
-      else
-        conditions << {"success_action_redirect" => success_action_redirect}
-      end
-
-      conditions << ["content-length-range", options[:min_file_size], options[:max_file_size]]
-
-      Base64.encode64(
-        {
-          'expiration' => Time.now.utc + options[:expiration],
-          'conditions' => conditions
-        }.to_json
-      ).gsub("\n","")
+    def has_key?
+      key !~ /#{Regexp.escape(FILENAME_WILDCARD)}\z/
     end
 
-    def signature
-      Base64.encode64(
-        OpenSSL::HMAC.digest(
-          OpenSSL::Digest::Digest.new('sha1'),
-          aws_secret_access_key, policy
-        )
-      ).gsub("\n","")
+    def key_regexp
+      /\A(#{store_dir}|#{cache_dir})\/[a-f\d\-]+\/.+\.(?i)#{extension_regexp}(?-i)\z/
     end
 
-    def persisted?
-      false
+    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 filename
@@ -115,21 +107,12 @@ module CarrierWaveDirect
       filename_parts.join("/")
     end
 
-    def key_regexp
-      /\A#{store_dir}\/[a-f\d\-]+\/.+\.(?i)#{extension_regexp}(?-i)\z/
-    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
+    def decoded_key
+      URI.decode(URI.parse(url).path[1 .. -1])
     end
 
-    private
-
     def key_from_file(fname)
       new_key_parts = key.split("/")
       new_key_parts.pop
@@ -150,5 +133,33 @@ module CarrierWaveDirect
       extname = File.extname(for_file)
       [for_file.chomp(extname), version_name].compact.join('_') << extname
     end
+
+    def generate_policy(options)
+      conditions = []
+
+      conditions << ["starts-with", "$utf8", ""] if options[:enforce_utf8]
+      conditions << ["starts-with", "$key", key.sub(/#{Regexp.escape(FILENAME_WILDCARD)}\z/, "")]
+
+      conditions << ["starts-with", "$Content-Type", ""] if will_include_content_type
+      conditions << {"bucket" => fog_directory}
+      conditions << {"acl" => acl}
+
+      if use_action_status
+        conditions << {"success_action_status" => success_action_status}
+      else
+        conditions << {"success_action_redirect" => success_action_redirect}
+      end
+
+      conditions << ["content-length-range", options[:min_file_size], options[:max_file_size]]
+
+      yield conditions if block_given?
+
+      Base64.encode64(
+        {
+          'expiration' => (Time.now + options[:expiration]).utc.iso8601,
+          'conditions' => conditions
+        }.to_json
+      ).gsub("\n","")
+    end
   end
 end

data/lib/carrierwave_direct/validations/active_model.rb

@@ -11,8 +11,9 @@ module CarrierWaveDirect
 
       class UniqueFilenameValidator < ::ActiveModel::EachValidator
         def validate_each(record, attribute, value)
-          if record.new_record? && record.errors[attribute].empty? && (record.send("has_#{attribute}_upload?") || record.send("has_remote_#{attribute}_net_url?"))
-            if record.class.where(attribute => record.send(attribute).filename).exists?
+          if record.errors[attribute].empty? && (record.send("has_#{attribute}_upload?") || record.send("has_remote_#{attribute}_net_url?"))
+            column = record.class.uploader_options[attribute].fetch(:mount_on, attribute)
+            if record.class.where(column => record.send(attribute).filename).exists?
               record.errors.add(attribute, :carrierwave_direct_filename_taken)
             end
           end
@@ -21,7 +22,7 @@ module CarrierWaveDirect
 
       class FilenameFormatValidator < ::ActiveModel::EachValidator
         def validate_each(record, attribute, value)
-          if record.new_record? && record.send("has_#{attribute}_upload?") && record.key !~ record.send(attribute).key_regexp
+          if record.send("has_#{attribute}_upload?") && record.send("#{attribute}_key") !~ record.send(attribute).key_regexp
             extensions = record.send(attribute).extension_white_list
             message = I18n.t("errors.messages.carrierwave_direct_filename_invalid")
 
@@ -36,7 +37,7 @@ module CarrierWaveDirect
 
       class RemoteNetUrlFormatValidator < ::ActiveModel::EachValidator
         def validate_each(record, attribute, value)
-          if record.new_record? && record.send("has_remote_#{attribute}_net_url?")
+          if record.send("has_remote_#{attribute}_net_url?")
             remote_net_url = record.send("remote_#{attribute}_net_url")
             uploader = record.send(attribute)
             url_scheme_white_list = uploader.url_scheme_white_list

data/lib/carrierwave_direct/version.rb

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

data/lib/carrierwave_direct.rb

@@ -1,18 +1,12 @@
 # encoding: utf-8
 
-require "carrierwave_direct/version"
-
 require "carrierwave"
-require "uuidtools"
-require "fog"
+require "fog/aws"
 
 module CarrierWaveDirect
 
-  autoload :Uploader, "carrierwave_direct/uploader"
-  autoload :Mount, "carrierwave_direct/mount"
-
   module Uploader
-    autoload :Configuration, 'carrierwave_direct/uploader/configuration'
+    require "carrierwave_direct/uploader/configuration"
 
     CarrierWave::Uploader::Base.send(:include, Configuration)
   end
@@ -43,3 +37,7 @@ if defined?(Rails)
   end
 end
 
+require "carrierwave_direct/mount"
+require "carrierwave_direct/uploader"
+require "carrierwave_direct/version"
+

data/spec/action_view_extensions/form_helper_spec.rb

@@ -8,28 +8,27 @@ describe CarrierWaveDirect::ActionViewExtensions::FormHelper do
   describe "#direct_upload_form_for" do
     it "should yield an instance of CarrierWaveDirect::FormBuilder" do
       direct_upload_form_for(direct_uploader) do |f|
-        f.should be_instance_of(CarrierWaveDirect::FormBuilder)
+        expect(f).to be_instance_of(CarrierWaveDirect::FormBuilder)
       end
     end
 
     context "the form" do
       before do
-        direct_uploader.stub(:direct_fog_url).and_return("http://example.com")
+        allow(direct_uploader).to receive(:direct_fog_url).and_return("http://example.com")
       end
 
       it "should post to the uploader's #direct_fog_url as a multipart form" do
-        form.should submit_to(
+        expect(form).to submit_to(
           :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(
+        expect(form(:html => { :target => "_blank_iframe" })).to submit_to(
           :action => "http://example.com", :method => "post", :enctype => "multipart/form-data", :target => "_blank_iframe"
         )
       end
     end
   end
-
 end
 

data/spec/data/sample_data.rb

@@ -0,0 +1,41 @@
+SAMPLE_DATA = {
+  :path => "upload_dir/bliind.exe",
+  :path_with_special_chars => "upload_dir/some file & blah.exe",
+  :path_with_escaped_chars => "upload_dir/some%20file%20&%20blah.exe",
+  :key => "some key",
+  :guid => "guid",
+  :store_dir => "store_dir",
+  :cache_dir => "cache_dir",
+  :extension_regexp => "(avi)",
+  :url => "http://example.com/some_url",
+  :expiration => 60,
+  :min_file_size => 1024,
+  :max_file_size => 10485760,
+  :file_url => "http://anyurl.com/any_path/video_dir/filename.avi",
+  :mounted_model_name => "Porno",
+  :mounted_as => :video,
+  :filename => "filename",
+  :extension => ".avi",
+  :version => :thumb,
+  :s3_bucket_url => "https://s3-bucket.s3.amazonaws.com"
+}
+
+SAMPLE_DATA.merge!(
+  :stored_filename_base => "#{sample(:guid)}/#{sample(:filename)}"
+)
+
+SAMPLE_DATA.merge!(
+  :stored_filename => "#{sample(:stored_filename_base)}#{sample(:extension)}",
+  :stored_version_filename => "#{sample(:stored_filename_base)}_#{sample(:version)}#{sample(:extension)}"
+)
+
+SAMPLE_DATA.merge!(
+  :s3_key => "#{sample(:store_dir)}/#{sample(:stored_filename)}"
+)
+
+SAMPLE_DATA.merge!(
+  :s3_file_url => "#{sample(:s3_bucket_url)}/#{sample(:s3_key)}"
+)
+
+SAMPLE_DATA.freeze
+

data/spec/form_builder_spec.rb

@@ -1,6 +1,45 @@
 # encoding: utf-8
 
 require 'spec_helper'
+require 'erb'
+
+class CarrierWaveDirect::FormBuilder
+  attr_accessor :template, :object
+
+  public :content_choices_options
+end
+
+shared_examples_for 'hidden values form' do
+  hidden_fields = [
+                    :key,
+                    {:aws_access_key_id => "AWSAccessKeyId"},
+                    :acl,
+                    :success_action_redirect,
+                    :policy,
+                    :signature
+                  ]
+
+  hidden_fields.each do |input|
+    if input.is_a?(Hash)
+      key = input.keys.first
+      name = input[key]
+    else
+      key = name = input
+    end
+
+    it "should have a hidden field for '#{name}'" do
+      allow(direct_uploader).to receive(key).and_return(key.to_s)
+      expect(subject).to have_input(
+        :direct_uploader,
+        key,
+        :type => :hidden,
+        :name => name,
+        :value => key,
+        :required => false
+      )
+    end
+  end
+end
 
 describe CarrierWaveDirect::FormBuilder do
   include FormBuilderHelpers
@@ -12,7 +51,11 @@ describe CarrierWaveDirect::FormBuilder do
     end
 
     def form_with_file_field_and_no_redirect
-      form {|f| f.file_field :video, use_action_status: true }
+      allow(@direct_uploader.class).to receive(:use_action_status).and_return(true)
+
+      form do |f|
+        f.file_field :video
+      end
     end
 
     default_hidden_fields = [
@@ -34,6 +77,8 @@ describe CarrierWaveDirect::FormBuilder do
 
     # http://aws.amazon.com/articles/1434?_encoding=UTF8
     context "form" do
+      let(:subject) {form_with_default_file_field}
+      it_should_behave_like 'hidden values form'
 
       default_hidden_fields.each do |input|
         if input.is_a?(Hash)
@@ -44,8 +89,8 @@ describe CarrierWaveDirect::FormBuilder do
         end
 
         it "should have a hidden field for '#{name}'" do
-          direct_uploader.stub(key).and_return(key.to_s)
-          form_with_default_file_field.should have_input(
+          allow(direct_uploader).to receive(key).and_return(key.to_s)
+          expect(form_with_default_file_field).to have_input(
             :direct_uploader,
             key,
             :type => :hidden,
@@ -65,8 +110,8 @@ describe CarrierWaveDirect::FormBuilder do
         end
 
         it "should have a hidden field for '#{name}'" do
-          direct_uploader.stub(key).and_return(key.to_s)
-          form_with_file_field_and_no_redirect.should have_input(
+          allow(direct_uploader).to receive(key).and_return(key.to_s)
+          expect(form_with_file_field_and_no_redirect).to have_input(
             :direct_uploader,
             key,
             :type => :hidden,
@@ -78,7 +123,7 @@ describe CarrierWaveDirect::FormBuilder do
       end
 
       it "should have an input for a file to upload" do
-        form_with_default_file_field.should have_input(
+        expect(form_with_default_file_field).to have_input(
           :direct_uploader,
           :video,
           :type => :file,
@@ -88,4 +133,92 @@ describe CarrierWaveDirect::FormBuilder do
       end
     end
   end
+
+  describe "#content_type_select" do
+    context "form" do
+      let(:subject) do
+        form do |f|
+          f.content_type_select
+        end
+      end
+
+      before do
+        allow(direct_uploader.class).to receive(:will_include_content_type).and_return(true)
+      end
+
+      it 'should select the default content type' do
+        allow(direct_uploader).to receive(:content_type).and_return('video/mp4')
+        expect(subject).to have_content_type 'video/mp4', true
+      end
+
+      it 'should include the default content types' do
+        allow(direct_uploader).to receive(:content_types).and_return(['text/foo','text/bar'])
+        expect(subject).to have_content_type 'text/foo', false
+        expect(subject).to have_content_type 'text/bar', false
+      end
+
+      it 'should select the passed in content type' do
+        dom = form {|f| f.content_type_select nil, 'video/mp4'}
+        expect(dom).to have_content_type 'video/mp4', true
+      end
+
+      it 'should include most content types' do
+        %w(application/atom+xml application/ecmascript application/json application/javascript application/octet-stream application/ogg application/pdf application/postscript application/rss+xml application/font-woff application/xhtml+xml application/xml application/xml-dtd application/zip application/gzip audio/basic audio/mp4 audio/mpeg audio/ogg audio/vorbis audio/vnd.rn-realaudio audio/vnd.wave audio/webm image/gif image/jpeg image/pjpeg image/png image/svg+xml image/tiff text/cmd text/css text/csv text/html text/javascript text/plain text/vcard text/xml video/mpeg video/mp4 video/ogg video/quicktime video/webm video/x-matroska video/x-ms-wmv video/x-flv).each do |type|
+          expect(subject).to have_content_type type
+        end
+      end
+    end
+  end
+
+  describe "#content_type_label" do
+    context "form" do
+      let(:subject) do
+        form do |f|
+          f.content_type_label
+        end
+      end
+
+    end
+  end
+
+  describe 'full form' do
+    let(:dom) do
+      form do |f|
+        f.content_type_label <<
+        f.content_type_select <<
+        f.file_field(:video)
+      end
+    end
+
+    before do
+      allow(direct_uploader).to receive('key').and_return('foo')
+      allow(direct_uploader.class).to receive(:will_include_content_type).and_return(true)
+    end
+
+    it 'should only include the hidden values once' do
+      expect(dom).to have_input(
+                   :direct_uploader,
+                   'key',
+                   :type => :hidden,
+                   :name => 'key',
+                   :value => 'foo',
+                   :required => false,
+                   :count => 1
+                 )
+    end
+
+    it 'should include Content-Type twice' do
+      expect(dom).to have_input(
+                   :direct_uploader,
+                   :content_type,
+                   :type => :hidden,
+                   :name => 'Content-Type',
+                   :value => 'binary/octet-stream',
+                   :required => false,
+                   :count => 1
+                 )
+
+      expect(dom).to have_selector :xpath, './/select[@name="Content-Type"]', :count => 1
+    end
+  end
 end

data/spec/mount_spec.rb

@@ -17,43 +17,30 @@ describe CarrierWaveDirect::Mount do
     it_should_have_accessor(:remote_video_net_url)
 
     describe "#has_video_upload?" do
-      context "video does not have a key" do
-        before { subject.video.stub(:has_key?).and_return(false) }
-
-        it "should return false" do
-          subject.should_not have_video_upload
-        end
+      it "returns false when video does not have a key" do
+        allow(subject.video).to receive(:has_key?).and_return(false)
+        expect(subject).to_not have_video_upload
       end
 
-      context "video has a key" do
-        before { subject.video.stub(:has_key?).and_return(true) }
-
-        it "should return true" do
-          subject.should have_video_upload
-        end
+      it "returns true when video has a key" do
+        allow(subject.video).to receive(:has_key?).and_return(true)
+        expect(subject).to have_video_upload
       end
     end
 
     describe "#has_remote_video_net_url?" do
-      context "remote_video_net_url is nil" do
-        before { subject.remote_video_net_url = nil }
-
-        it "should return false" do
-          subject.should_not have_remote_video_net_url
-        end
+      it "returns false when remote_video_net_url is nil" do
+        subject.remote_video_net_url = nil
+        expect(subject).to_not have_remote_video_net_url
       end
 
-      context "remote_video_net_url is not nil" do
-        before { subject.remote_video_net_url = "something" }
-
-        it "should return true" do
-          subject.should have_remote_video_net_url
-        end
+      it "returns true when remote_video_net_url is not nil" do
+        subject.remote_video_net_url = :not_nil
+        expect(subject).to have_remote_video_net_url
       end
     end
 
-    it_should_delegate(:key, :to => "video#key", :accessible => {"has_video_upload?" => false})
-
+    it_should_delegate(:video_key, :to => "video#key", :accessible => { "has_video_upload?" => false })
   end
 end