Merge branch 'site_file_rename'

tests/api_tests.rb

@@ -241,6 +241,40 @@ describe 'api upload hash' do
   end
 end
 
+describe 'api rename' do
+  before do
+    create_site
+    basic_authorize @user, @pass
+    post '/api/upload', {
+      'testdir/test.jpg' => Rack::Test::UploadedFile.new('./tests/files/test.jpg', 'image/jpeg')
+    }
+  end
+
+  it 'succeeds' do
+    post '/api/rename', path: 'testdir/test.jpg', new_path: 'testdir/test2.jpg'
+    res[:result].must_equal 'success'
+  end
+
+  it 'fails to overwrite index file' do
+    post '/api/rename', path: 'testdir/test.jpg', new_path: 'index.html'
+    res[:result].must_equal 'error'
+    res[:error_type].must_equal 'rename_error'
+    res[:message].must_equal 'file already exists'
+  end
+
+  it 'fails to overwrite existing file' do
+    post '/api/rename', path: 'testdir/test.jpg', new_path: 'not_found.html'
+    res[:result].must_equal 'error'
+    res[:error_type].must_equal 'rename_error'
+  end
+
+  it 'succeeds with directory' do
+    @site.create_directory 'derpiedir'
+    post '/api/rename', path: 'derpiedir', new_path: 'notderpiedir'
+    res[:result].must_equal 'success'
+  end
+end
+
 describe 'api upload' do
   it 'fails with no auth' do
     post '/api/upload'

tests/site_file_tests.rb

@@ -23,6 +23,107 @@ describe 'site_files' do
     ScreenshotWorker.jobs.clear
   end
 
+  describe 'rename' do
+    before do
+      PurgeCacheWorker.jobs.clear
+    end
+
+    it 'renames in same path' do
+      uploaded_file = Rack::Test::UploadedFile.new('./tests/files/test.jpg', 'image/jpeg')
+      upload 'files[]' => uploaded_file
+
+      @site.site_files.last.path.must_equal 'test.jpg'
+      @site.site_files.last.rename('derp.jpg')
+      @site.site_files.last.path.must_equal('derp.jpg')
+      PurgeCacheWorker.jobs.first['args'].last.must_equal '/test.jpg'
+      File.exist?(@site.files_path('derp.jpg')).must_equal true
+    end
+
+    it 'fails for bad extension change' do
+      uploaded_file = Rack::Test::UploadedFile.new('./tests/files/test.jpg', 'image/jpeg')
+      upload 'files[]' => uploaded_file
+
+      @site.site_files.last.path.must_equal 'test.jpg'
+      res = @site.site_files.last.rename('dasharezone.exe')
+      res.must_equal [false, 'unsupported file type']
+      @site.site_files.last.path.must_equal('test.jpg')
+    end
+
+
+    it 'works for directory' do
+      @site.create_directory 'dirone'
+      @site.site_files.last.path.must_equal 'dirone'
+      @site.site_files.last.is_directory.must_equal true
+      res = @site.site_files.last.rename('dasharezone')
+      res.must_equal [true, nil]
+      @site.site_files.last.path.must_equal('dasharezone')
+      @site.site_files.last.is_directory.must_equal true
+
+      PurgeCacheWorker.jobs.first['args'].last.must_equal 'dirone'
+      PurgeCacheWorker.jobs.last['args'].last.must_equal 'dasharezone'
+    end
+
+    it 'changes path of files and dirs within directory when changed' do
+      upload(
+        'dir' => 'test',
+        'files[]' => Rack::Test::UploadedFile.new('./tests/files/test.jpg', 'image/jpeg')
+      )
+      upload(
+        'dir' => 'test',
+        'files[]' => Rack::Test::UploadedFile.new('./tests/files/index.html', 'image/jpeg')
+      )
+
+      @site.site_files.select {|s| s.path == 'test'}.first.rename('test2')
+      @site.site_files.select {|sf| sf.path =~ /test2\/index.html/}.length.must_equal 1
+      @site.site_files.select {|sf| sf.path =~ /test2\/test.jpg/}.length.must_equal 1
+      @site.site_files.select {|sf| sf.path =~ /test\/test.jpg/}.length.must_equal 0
+
+      PurgeCacheWorker.jobs.collect {|p| p['args'].last}.must_equal ["/test/test.jpg", "/test/index.html", "/test/", "test", "test2", "test/test.jpg", "test2/test.jpg", "test/index.html", "test/", "test2/index.html", "test2/"]
+    end
+
+    it 'doesnt wipe out existing file' do
+      upload(
+        'dir' => 'test',
+        'files[]' => Rack::Test::UploadedFile.new('./tests/files/test.jpg', 'image/jpeg')
+      )
+      upload(
+        'dir' => 'test',
+        'files[]' => Rack::Test::UploadedFile.new('./tests/files/index.html', 'image/jpeg')
+      )
+
+      res = @site.site_files.last.rename('test/test.jpg')
+      res.must_equal [false, 'file already exists']
+    end
+
+    it 'doesnt wipe out existing dir' do
+      @site.create_directory 'dirone'
+      @site.create_directory 'dirtwo'
+      res = @site.site_files.last.rename 'dirone'
+      res.must_equal [false, 'directory already exists']
+    end
+
+    it 'refuses to move index.html' do
+      res = @site.site_files.select {|sf| sf.path == 'index.html'}.first.rename('notindex.html')
+      res.must_equal [false, 'cannot rename or move root index.html']
+    end
+
+    it 'works with unicode characters' do
+      uploaded_file = Rack::Test::UploadedFile.new('./tests/files/test.jpg', 'image/jpeg')
+      upload 'files[]' => uploaded_file
+      @site.site_files.last.rename("HELL💩؋.jpg")
+      @site.site_files.last.path.must_equal "HELL💩؋.jpg"
+    end
+
+    it 'scrubs weird carriage return shit characters' do
+      uploaded_file = Rack::Test::UploadedFile.new('./tests/files/test.jpg', 'image/jpeg')
+      upload 'files[]' => uploaded_file
+      proc {
+        @site.site_files.last.rename("\r\n\t.jpg")
+      }.must_raise ArgumentError
+      @site.site_files.last.path.must_equal "test.jpg"
+    end
+  end
+
   describe 'delete' do
     before do
       PurgeCacheWorker.jobs.clear