el_finder 1.1.0 → 1.1.1

data/lib/el_finder/connector.rb

@@ -18,7 +18,7 @@ module ElFinder
     DEFAULT_OPTIONS = {
       :mime_handler => ElFinder::MimeType,
       :image_handler => ElFinder::Image,
-      :original_filename_method => lambda { |file| file.original_filename },
+      :original_filename_method => lambda { |file| file.original_filename.force_encoding('utf-8') },
       :disabled_commands => [],
       :allow_dot_files => true,
       :upload_max_size => '50M',
@@ -236,15 +236,19 @@ module ElFinder
         @response[:error] = 'Access Denied'
         return
       end
-
       select = []
       @params[:upload].to_a.each do |file|
-        dst = @current + @options[:original_filename_method].call(file)
-        FileUtils.mv(file.path, dst.fullpath)
-        FileUtils.chmod @options[:upload_file_mode], dst
-        select << to_hash(dst)
+        if upload_max_size_in_bytes > 0 && file.size > upload_max_size_in_bytes
+          @response[:error] ||= "Some files were not uploaded"
+          @response[:errorData][@options[:original_filename_method].call(file)] = 'File exceeds the maximum allowed filesize'
+        else
+          dst = @current + @options[:original_filename_method].call(file)
+          FileUtils.mv(file.path, dst.fullpath)
+          FileUtils.chmod @options[:upload_file_mode], dst
+          select << to_hash(dst)
+        end
       end
-      @response[:select] = select
+      @response[:select] = select unless select.empty?
       _open(@current)
     end # of upload
 
@@ -421,6 +425,24 @@ module ElFinder
     ################################################################################
     private
 
+    #
+    def upload_max_size_in_bytes
+      bytes = @options[:upload_max_size]
+      if bytes.is_a?(String) && bytes.strip =~ /(\d+)([KMG]?)/
+        bytes = $1.to_i
+        unit = $2
+        case unit
+          when 'K'
+            bytes *= 1024
+          when 'M'
+            bytes *= 1024 * 1024
+          when 'G'
+            bytes *= 1024 * 1024 * 1024
+        end
+      end
+      bytes.to_i
+    end
+
     #
     def thumbnail_for(pathname)
       @thumb_directory + "#{to_hash(pathname)}.png"

data/lib/el_finder/version.rb

@@ -1,5 +1,5 @@
 # Represents ElFinder namespace.
 module ElFinder
   # Gem version.
-  VERSION = '1.1.0'
+  VERSION = '1.1.1'
 end 

data/test/test_el_finder.rb

@@ -141,6 +141,19 @@ class TestElFinder < Test::Unit::TestCase
     assert_not_nil r[:select]
   end
 
+  def test_upload_too_big
+    @elfinder.options = {:upload_max_size => 5}
+    h, r = @elfinder.run(:cmd => 'open', :init => 'true', :target => '')
+    uploads = []
+    uploads << File.open(File.join(@vroot, 'foo/philip.txt'))
+    uploads << File.open(File.join(@vroot, 'foo/sam.txt'))
+    h, r = @elfinder.run(:cmd => 'upload', :upload => uploads, :current => r[:cwd][:hash])
+    assert !File.exist?(File.join(@vroot, 'philip.txt'))
+    assert File.exist?(File.join(@vroot, 'sam.txt'))
+    assert_not_nil r[:select]
+    assert_match(/some files were not uploaded/i, r[:error])
+  end
+
   def test_ping
     h, r = @elfinder.run(:cmd => 'ping')
     assert r.empty?

data/test/test_el_finder_options.rb

@@ -0,0 +1,43 @@
+# encoding: utf-8
+require 'el_finder_test_case'
+
+class TestElFinder < Test::Unit::TestCase
+
+  include ElFinderTestCase
+
+  ################################################################################
+
+  def test_to_hash_method
+    @elfinder.options = {} # default is '50M'
+    assert_equal (50 * 1024 * 1024), @elfinder.send(:upload_max_size_in_bytes)
+  end
+
+  def test_from_hash_method
+    @elfinder.options = {
+      :upload_max_size => 1
+    }
+    assert_equal 1, @elfinder.send(:upload_max_size_in_bytes)
+  end
+
+  def test_from_hash_method
+    @elfinder.options = {
+      :upload_max_size => '1'
+    }
+    assert_equal 1, @elfinder.send(:upload_max_size_in_bytes)
+  end
+
+  def test_from_hash_method
+    @elfinder.options = {
+      :upload_max_size => '1K'
+    }
+    assert_equal 1024, @elfinder.send(:upload_max_size_in_bytes)
+  end
+
+  def test_from_hash_method
+    @elfinder.options = {
+      :upload_max_size => '1G'
+    }
+    assert_equal 1073741824, @elfinder.send(:upload_max_size_in_bytes)
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: el_finder
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-15 00:00:00.000000000 Z
+date: 2012-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: image_size
@@ -100,6 +100,7 @@ files:
 - test/test_el_finder_archivers.rb
 - test/test_el_finder_extractors.rb
 - test/test_el_finder_hash.rb
+- test/test_el_finder_options.rb
 - test/test_el_finder_permissions.rb
 - test/test_el_finder_symlink.rb
 - test/test_el_finder_thumbs.rb
@@ -146,6 +147,7 @@ test_files:
 - test/test_el_finder_archivers.rb
 - test/test_el_finder_extractors.rb
 - test/test_el_finder_hash.rb
+- test/test_el_finder_options.rb
 - test/test_el_finder_permissions.rb
 - test/test_el_finder_symlink.rb
 - test/test_el_finder_thumbs.rb