carrierwave_direct 0.0.13 → 0.0.17

data/spec/orm/activerecord_spec.rb

@@ -15,10 +15,18 @@ describe CarrierWaveDirect::ActiveRecord do
       create_table :parties, :force => true do |t|
         t.column :video, :string
       end
+
+      create_table :dances, :force => true do |t|
+        t.column :location, :string
+      end
+      create_table :resources, :force => true do |t|
+        t.column :file, :string
+      end
     end
 
     def self.down
       drop_table :parties
+      drop_table :dances
     end
   end
 
@@ -26,6 +34,13 @@ describe CarrierWaveDirect::ActiveRecord do
     mount_uploader :video, DirectUploader
   end
 
+  class Dance < ActiveRecord::Base
+  end
+
+  class Resource < ActiveRecord::Base
+    mount_uploader :file, DirectUploader
+  end
+
   ActiveRecord::Base.establish_connection(dbconfig)
 
   # turn off migration output
@@ -61,17 +76,17 @@ describe CarrierWaveDirect::ActiveRecord do
 
     shared_examples_for "an invalid filename" do
       it "should not be valid on create" do
-        subject.should_not be_valid
+        expect(subject).to_not be_valid
       end
 
       it "should be valid on update" do
         subject.save(:validate => false)
-        subject.should be_valid
+        expect(subject).to be_valid
       end
 
       it "should use i18n for the error messages" do
         subject.valid?
-        subject.errors[:video].should == [
+        expect(subject.errors[:video]).to eq [
           I18n.t("errors.messages.carrierwave_direct_filename_invalid") +
           I18n.t("errors.messages.carrierwave_direct_allowed_extensions", :extensions => %w{avi mp4}.to_sentence)
         ]
@@ -96,14 +111,14 @@ describe CarrierWaveDirect::ActiveRecord do
           end
         end
 
-        subject.errors[:remote_video_net_url].should == [ messages ]
+        expect(subject.errors[:remote_video_net_url]).to eq [ messages ]
       end
     end
 
     shared_examples_for "without an upload" do
       before do
         subject.remote_video_net_url = remote_video_net_url
-        subject.key = upload_path
+        subject.video_key = upload_path
       end
 
       it "should not be valid on create" do
@@ -146,10 +161,21 @@ describe CarrierWaveDirect::ActiveRecord do
 
     describe ".validates_filename_uniqueness_of" do
       it "should be turned on by default" do
-        party_class.should_receive(:validates_filename_uniqueness_of).with(:video)
+        party_class.should_receive(:validates_filename_uniqueness_of).with(:video, on: :create)
         mount_uploader
       end
 
+      context "mount_on: option is used" do
+        let(:dance) { Dance.new }
+
+        before { Dance.mount_uploader(:non_existing_column, DirectUploader, mount_on: :location)    }
+        before { dance.non_existing_column_key = sample_key}
+
+        it "uses the column it's mounted on for checking uniqueness" do
+          expect { dance.valid? }.to_not raise_error
+        end
+      end
+
       context "another Party with a duplicate video filename" do
         before do
           subject.video.key = sample_key
@@ -186,14 +212,14 @@ describe CarrierWaveDirect::ActiveRecord do
 
     describe ".validates_filename_format_of" do
       it "should be turned on by default" do
-        party_class.should_receive(:validates_filename_format_of).with(:video)
+        party_class.should_receive(:validates_filename_format_of).with(:video, on: :create)
         mount_uploader
       end
 
       context "where the file upload is" do
         context "nil" do
           before do
-            subject.key = nil
+            subject.video_key = nil
           end
 
           it "should be valid" do
@@ -203,7 +229,7 @@ describe CarrierWaveDirect::ActiveRecord do
 
         context "blank" do
           before do
-            subject.key = ""
+            subject.video_key = ""
           end
 
           it "should be valid" do
@@ -219,7 +245,7 @@ describe CarrierWaveDirect::ActiveRecord do
 
         context "and the uploaded file's extension is included in the list" do
           before do
-            subject.key = sample_key(:extension => "avi")
+            subject.video_key = sample_key(:extension => "avi")
           end
 
           it "should be valid" do
@@ -229,7 +255,7 @@ describe CarrierWaveDirect::ActiveRecord do
 
         context "but uploaded file's extension is not included in the list" do
           before do
-            subject.key = sample_key(:extension => "mp3")
+            subject.video_key = sample_key(:extension => "mp3")
           end
 
           it_should_behave_like "an invalid filename"
@@ -263,7 +289,7 @@ describe CarrierWaveDirect::ActiveRecord do
 
     describe ".validates_remote_net_url_format_of" do
       it "should be turned on by default" do
-        party_class.should_receive(:validates_remote_net_url_format_of).with(:video)
+        party_class.should_receive(:validates_remote_net_url_format_of).with(:video, on: :create)
         mount_uploader
       end
 
@@ -449,7 +475,7 @@ describe CarrierWaveDirect::ActiveRecord do
 
         context "with an upload by file" do
           before do
-            subject.key = sample_key
+            subject.video_key = sample_key
           end
 
           it "should be valid" do
@@ -501,7 +527,7 @@ describe CarrierWaveDirect::ActiveRecord do
 
     describe "#key" do
       it "should be accessible" do
-        party_class.new(:key => "some key").key.should == "some key"
+        party_class.new(:video_key => "some key").video_key.should == "some key"
       end
     end
 
@@ -526,7 +552,7 @@ describe CarrierWaveDirect::ActiveRecord do
 
       context "does not have an upload" do
         it "should be true" do
-          subject.filename_valid?.should be_true
+          subject.filename_valid?.should be true
         end
 
         it_should_behave_like "having empty errors"
@@ -535,21 +561,21 @@ describe CarrierWaveDirect::ActiveRecord do
       context "has an upload" do
         context "with a valid filename" do
           before do
-            subject.key = sample_key(:model_class => subject.class)
+            subject.video_key = sample_key(:model_class => subject.class)
           end
 
           it "should be true" do
-            subject.filename_valid?.should be_true
+            subject.filename_valid?.should be true
           end
 
           it_should_behave_like "having empty errors"
         end
 
         context "with an invalid filename" do
-          before { subject.key = sample_key(:model_class => subject.class, :valid => false) }
+          before { subject.video_key = sample_key(:model_class => subject.class, :valid => false) }
 
           it "should be false" do
-            subject.filename_valid?.should be_false
+            subject.filename_valid?.should be false
           end
 
           context "after the call, #errors" do
@@ -563,4 +589,28 @@ describe CarrierWaveDirect::ActiveRecord do
       end
     end
   end
+
+  describe "class Resource < ActiveRecord::Base; mount_uploader :file, DirectUploader; end" do
+    include UploaderHelpers
+    include ModelHelpers
+
+    let(:resource_class) do
+      Class.new(Resource)
+    end
+
+    let(:subject) do
+      resource = resource_class.new
+    end
+
+    def mount_uploader
+      resource_class.mount_uploader :file, DirectUploader
+    end
+
+    #See resource table migration
+    it "should be valid still when a file column exists in table" do
+      expect(subject).to be_valid
+    end
+
+
+  end
 end

data/spec/spec_helper.rb

@@ -8,6 +8,20 @@ require File.dirname(__FILE__) << '/support/view_helpers' # Catch dependency ord
 
 Dir[ File.dirname(__FILE__) << "/support/**/*.rb"].each {|file| require file }
 
-RSpec.configure do |c|
-  c.treat_symbols_as_metadata_keys_with_true_values = true
+module Rails
+  def self.env
+    ActiveSupport::StringInquirer.new("test")
+  end
+end
+
+RSpec.configure do |config|
+  config.expect_with :rspec do |c|
+    c.syntax = [:expect, :should]
+  end
+end
+
+RSpec.configure do |config|
+  config.mock_with :rspec do |mocks|
+    mocks.syntax = [:expect, :should]
+  end
 end

data/spec/support/form_builder_helpers.rb

@@ -12,6 +12,7 @@ require 'carrierwave_direct/action_view_extensions/form_helper'
 
 module FormBuilderHelpers
   include ActionView::Helpers::FormHelper
+  include ActionView::Helpers::FormOptionsHelper
   include CarrierWaveDirect::ActionViewExtensions::FormHelper
   include ActionView::Context
 

data/spec/support/model_helpers.rb

@@ -16,16 +16,16 @@ module ModelHelpers
         if options[:accessible]
           if options[:accessible] == true
             it "should == '#{sample_data}'" do
-              accessor_value.should == sample_data
+              expect(accessor_value).to eq sample_data
             end
           else
             it "##{options[:accessible].keys.first} should be #{options[:accessible].values.first}" do
-              subject.send(options[:accessible].keys.first).should == options[:accessible].values.first
+              expect(subject.send(options[:accessible].keys.first)).to eq options[:accessible].values.first
             end
           end
         else
           it "should be nil" do
-            accessor_value.should be_nil
+            expect(accessor_value).to be_nil
           end
         end
       end
@@ -38,14 +38,14 @@ module ModelHelpers
       describe "##{name} = '#{sample_data}'" do
         it "should set the #{delegation_object}'s #{delegation_method}" do
           subject.send("#{name}=", sample_data)
-          subject.send(delegation_object).send(delegation_method).should == sample_data
+          expect(subject.send(delegation_object).send(delegation_method)).to eq sample_data
         end
       end
 
       describe "##{name}" do
         it "should return the #{delegation_method} from the #{delegation_object}" do
           subject.send(delegation_object).send("#{delegation_method}=", sample_data)
-          subject.send(name).should == sample_data
+          expect(subject.send(name)).to eq sample_data
         end
 
         it_should_be_accessible(name, sample_data, options)
@@ -62,7 +62,7 @@ module ModelHelpers
       end
 
       it "should respond to ##{name}=" do
-        subject.should respond_to("#{name}=")
+        expect(subject).to respond_to("#{name}=")
       end
 
       describe "##{name}" do
@@ -70,7 +70,7 @@ module ModelHelpers
           before { subject.send("#{name}=", sample_data) }
 
           it "should == '#{sample_data}'" do
-            subject.send(name).should == sample_data
+            expect(subject.send(name)).to eq sample_data
           end
         end
 

data/spec/support/view_helpers.rb

@@ -10,7 +10,7 @@ module ViewHelpers
   end
 
   def have_parent_selector(options = {})
-    have_selector(:xpath, parent_selector_xpath, options)
+    have_selector(:xpath, parent_selector_xpath, options.merge(visible: false))
   end
 
   def parent_selector_xpath
@@ -36,12 +36,22 @@ module ViewHelpers
   end
 
   def have_input(resource_name, input, options = {})
+    count = (options.delete :count).to_i
+    selector_options = count > 0 ? {:count => count} : {}
+
     options[:type] ||= input
     options[:id] ||= "#{resource_name}_#{input}"
     options[:name] ||= "#{resource_name}[#{input}]"
     options[:required] ||= "required" unless options[:required] == false
     parent_selector << "input[#{to_xpath_attributes(options)}]"
-    have_parent_selector
+    have_parent_selector selector_options
+  end
+
+  def have_content_type(content_type,selected=nil)
+    options = {:value => content_type}
+    options[:selected] = 'selected' if selected
+
+    have_selector :xpath, ".//select[@name=\"Content-Type\"]/option[#{to_xpath_attributes(options)}]"
   end
 end
 

data/spec/test/capybara_helpers_spec.rb

@@ -8,22 +8,26 @@ describe CarrierWaveDirect::Test::CapybaraHelpers do
   end
 
   let(:subject) { ExampleSpec.new }
-  let(:page) { mock("Page").as_null_object }
-  let(:selector) { mock("Selector") }
+  let(:page) { double("Page").as_null_object }
+  let(:selector) { double("Selector") }
 
   def stub_page
-    subject.stub(:page).and_return(page)
+    allow(subject).to receive(:page).and_return(page)
   end
 
-  def find_element_value(css, value)
-    page.stub(:find).with(css).and_return(selector)
-    selector.stub(:value).and_return(value)
+  def find_element_value(css, value, options = nil)
+    if options
+      allow(page).to receive(:find).with(css, options).and_return(selector)
+    else
+      allow(page).to receive(:find).with(css).and_return(selector)
+    end
+    allow(selector).to receive(:value).and_return(value)
   end
 
   describe "#attach_file_for_direct_upload" do
     context "'path/to/file.ext'" do
       it "should attach a file with the locator => 'file'" do
-        subject.should_receive(:attach_file).with("file", "path/to/file.ext")
+        expect(subject).to receive(:attach_file).with("file", "path/to/file.ext")
         subject.attach_file_for_direct_upload "path/to/file.ext"
       end
     end
@@ -40,19 +44,19 @@ describe CarrierWaveDirect::Test::CapybaraHelpers do
 
     def stub_common
       stub_page
-      find_element_value("input[@name='success_action_redirect']", "http://example.com")
-      subject.stub(:visit)
+      find_element_value("input[name='success_action_redirect']", "http://example.com?custom_param=value", visible: false)
+      allow(subject).to receive(:visit)
     end
 
     before do
-      subject.stub(:click_button)
+      allow(subject).to receive(:click_button)
     end
 
     shared_examples_for "submitting the form" do
       let(:options) { {} }
 
       it "should submit the form" do
-        subject.should_receive(:click_button).with("Upload!")
+        expect(subject).to receive(:click_button).with("Upload!")
         upload_directly(options.merge(:button_locator => "Upload!"))
       end
     end
@@ -61,7 +65,7 @@ describe CarrierWaveDirect::Test::CapybaraHelpers do
       let(:options) { { :success => false } }
 
       it "should not redirect" do
-        subject.should_not_receive(:visit)
+        expect(subject).to_not receive(:visit)
         upload_directly(options)
       end
     end
@@ -69,30 +73,30 @@ describe CarrierWaveDirect::Test::CapybaraHelpers do
     context "passing no options" do
       before do
         stub_common
-        subject.stub(:find_key).and_return("upload_dir/guid/$filename")
-        subject.stub(:find_upload_path).and_return("path/to/file.ext")
+        allow(subject).to receive(:find_key).and_return("upload_dir/guid/$filename")
+        allow(subject).to receive(:find_upload_path).and_return("path/to/file.ext")
       end
 
       it_should_behave_like "submitting the form"
 
-      it "should redirect to the page's success_action_redirect url" do
-        subject.should_receive(:visit).with(/^http:\/\/example.com/)
+      it "should redirect to the page's success_action_redirect url and preserve custom parameters" do
+        expect(subject).to receive(:visit).with(/^http:\/\/example.com\?.*custom_param=value/)
         upload_directly
       end
 
       context "the redirect url's params" do
         it "should include the bucket name" do
-          subject.should_receive(:visit).with(/bucket=/)
+          expect(subject).to receive(:visit).with(/bucket=/)
           upload_directly
         end
 
         it "should include an etag" do
-          subject.should_receive(:visit).with(/etag=/)
+          expect(subject).to receive(:visit).with(/etag=/)
           upload_directly
         end
 
         it "should include the key derived from the form" do
-          subject.should_receive(:visit).with(/key=upload_dir%2Fguid%2Ffile.ext/)
+          expect(subject).to receive(:visit).with(/key=upload_dir%2Fguid%2Ffile.ext/)
           upload_directly
         end
       end
@@ -106,7 +110,7 @@ describe CarrierWaveDirect::Test::CapybaraHelpers do
 
         context "the redirect url's params" do
           it "should include the key from the :redirect_key option" do
-            subject.should_receive(:visit).with(/key=some\+redirect\+key/)
+            expect(subject).to receive(:visit).with(/key=some\+redirect\+key/)
             upload_directly(:redirect_key => "some redirect key")
           end
         end
@@ -137,24 +141,22 @@ describe CarrierWaveDirect::Test::CapybaraHelpers do
   describe "#find_key" do
     before do
       stub_page
-      find_element_value("input[@name='key']", "key")
+      find_element_value("input[name='key']", "key", visible: false)
     end
 
     it "should try to find the key on the page" do
-      subject.find_key.should == "key"
+      expect(subject.find_key).to eq "key"
     end
   end
 
   describe "#find_upload_path" do
     before do
       stub_page
-      find_element_value("input[@name='file']", "upload path")
+      find_element_value("input[name='file']", "upload path", visible: false)
     end
 
     it "should try to find the upload path on the page" do
-      subject.find_upload_path.should == "upload path"
+      expect(subject.find_upload_path).to eq "upload path"
     end
   end
-
 end
-

data/spec/test/helpers_spec.rb

@@ -13,23 +13,23 @@ describe CarrierWaveDirect::Test::Helpers do
 
         shared_examples_for "returning the default extension" do
           it "should return '*/guid/filename.extension'" do
-            sample_key(direct_uploader).should =~ /#{GUID_REGEXP}\/filename\.extension$/
+            expect(sample_key(direct_uploader)).to match /#{GUID_REGEXP}\/filename\.extension$/
           end
         end
 
         context "['exe', 'bmp']" do
           before do
-            direct_uploader.stub(:extension_white_list).and_return(%w{exe bmp})
+            allow(direct_uploader).to receive(:extension_white_list).and_return(%w{exe bmp})
           end
 
           it "should return '*/guid/filename.exe'" do
-            sample_key(direct_uploader).should =~ /#{GUID_REGEXP}\/filename\.exe$/
+            expect(sample_key(direct_uploader)).to match /#{GUID_REGEXP}\/filename\.exe$/
           end
         end
 
         context "[]" do
           before do
-            direct_uploader.stub(:extension_white_list).and_return([])
+            allow(direct_uploader).to receive(:extension_white_list).and_return([])
           end
 
           it_should_behave_like "returning the default extension"
@@ -37,7 +37,7 @@ describe CarrierWaveDirect::Test::Helpers do
 
         context "nil" do
           before do
-            direct_uploader.stub(:extension_white_list).and_return(nil)
+            allow(direct_uploader).to receive(:extension_white_list).and_return(nil)
           end
 
           it_should_behave_like "returning the default extension"
@@ -47,9 +47,7 @@ describe CarrierWaveDirect::Test::Helpers do
 
       context "with no options" do
         it "should return '*/guid/filename.extension'" do
-          sample_key(
-            direct_uploader
-          ).should =~ /#{GUID_REGEXP}\/filename\.extension$/
+          expect(sample_key(direct_uploader)).to match /#{GUID_REGEXP}\/filename\.extension$/
         end
       end
 
@@ -64,7 +62,7 @@ describe CarrierWaveDirect::Test::Helpers do
 
         shared_examples_for "a custom filename" do
           it "should return '*/guid/some_file.reg'" do
-            sample_key(direct_uploader, options).should =~ /#{GUID_REGEXP}\/some_file\.reg$/
+            expect(sample_key(direct_uploader, options)).to match /#{GUID_REGEXP}\/some_file\.reg$/
           end
         end
 
@@ -82,10 +80,10 @@ describe CarrierWaveDirect::Test::Helpers do
 
         context ":base => 'upload_dir/porno/movie/${filename}'" do
           it "should return 'upload_dir/porno/movie/guid/filename.extension'" do
-            sample_key(
+            expect(sample_key(
               direct_uploader,
               :base => "upload_dir/porno/movie/${filename}"
-            ).should == "upload_dir/porno/movie/filename.extension"
+            )).to eq "upload_dir/porno/movie/filename.extension"
           end
         end
         context ":filename => 'some_file.reg'" do

data/spec/uploader/configuration_spec.rb

@@ -0,0 +1,46 @@
+require 'spec_helper'
+
+describe CarrierWaveDirect::Uploader::Configuration do
+  include UploaderHelpers
+  include ModelHelpers
+
+  let(:subject) { DirectUploader }
+
+  before do
+    subject.reset_direct_config
+  end
+
+  describe "default configuration" do
+    it "returns false for validate_is_attached" do
+      expect(subject.validate_is_attached).to be false
+    end
+
+    it "returns false for validate_is_uploaded" do
+      expect(subject.validate_is_uploaded).to be false
+    end
+
+    it "return true for validate_unique_filename" do
+      expect(subject.validate_unique_filename).to be true
+    end
+
+    it "returns true for validate_remote_net_url_format" do
+      expect(subject.validate_remote_net_url_format).to be true
+    end
+
+    it "has upload_expiration of 10 hours" do
+      expect(subject.upload_expiration).to eq 36000
+    end
+
+    it "has min_file_size of 1 byte" do
+      expect(subject.min_file_size).to eq 1
+    end
+
+    it "has max_file_size of 5 MB" do
+      expect(subject.max_file_size).to eq 5242880
+    end
+
+    it "returns false for use_action_status" do
+      expect(subject.use_action_status).to be false
+    end
+  end
+end

data/spec/uploader/content_type_spec.rb

@@ -0,0 +1,40 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+describe CarrierWaveDirect::Uploader::ContentType do
+  subject { DirectUploader.new }
+
+  describe "#content_type" do
+    it "defaults to binary/octet-stream when there is no default_content_type" do
+      allow(subject.class).to receive(:default_content_type).and_return(nil)
+      expect(subject.content_type).to eq 'binary/octet-stream'
+    end
+
+    it "returns the default_content_type if set" do
+      allow(subject.class).to receive(:default_content_type).and_return('video/mp4')
+      expect(subject.content_type).to eq 'video/mp4'
+    end
+  end
+
+  describe "#content_types" do
+    it "should default to common media types" do
+      expect(subject.content_types).to eq %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
+
+    it "should be the configured value" do
+      allow(subject.class).to receive(:allowed_content_types).and_return(['audio/ogg'])
+      expect(subject.content_types).to eq ['audio/ogg']
+    end
+  end
+end

data/spec/uploader/direct_url_spec.rb

@@ -0,0 +1,26 @@
+# encoding: utf-8
+#
+require 'spec_helper'
+require 'data/sample_data'
+
+describe CarrierWaveDirect::Uploader::DirectUrl do
+
+  let(:subject) { DirectUploader.new }
+
+  let(:mounted_subject) { DirectUploader.new(mounted_model, sample(:mounted_as)) }
+
+  describe "#direct_fog_url" do
+    it "should return the result from CarrierWave::Storage::Fog::File#public_url" do
+      expect(subject.direct_fog_url).to eq CarrierWave::Storage::Fog::File.new(
+        subject, nil, nil
+      ).public_url
+    end
+
+    context ":with_path => true" do
+      it "should return the full url set by carrierwave" do
+        allow(subject).to receive(:url).and_return("url")
+        expect(subject.direct_fog_url(:with_path => true)).to eq "url"
+      end
+    end
+  end
+end