el_finder 1.1.4 → 1.1.5

data/lib/el_finder/connector.rb

@@ -2,6 +2,14 @@
 # http://elrte.org/redmine/projects/elfinder/wiki/Client-Server_Protocol_EN
 #
 
+if RUBY_VERSION < '1.9'
+  class String
+    def force_encoding(enc)
+      self
+    end
+  end
+end
+
 require 'base64'
 
 module ElFinder
@@ -238,18 +246,18 @@ module ElFinder
       end
       select = []
       @params[:upload].to_a.each do |file|
-        if upload_max_size_in_bytes > 0 && file.size > upload_max_size_in_bytes
+        if file.respond_to?(:tempfile)
+          the_file = file.tempfile
+        else
+          the_file = file
+        end
+        if upload_max_size_in_bytes > 0 && File.size(the_file.path) > 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)
-          if file.respond_to?(:tempfile)
-            file.tempfile.close
-            src = file.tempfile.path
-          else
-            file.close
-            src = file.path
-          end
+          the_file.close
+          src = the_file.path
           FileUtils.mv(src, dst.fullpath)
           FileUtils.chmod @options[:upload_file_mode], dst
           select << to_hash(dst)

data/lib/el_finder/version.rb

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

metadata

@@ -1,72 +1,80 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: el_finder
-version: !ruby/object:Gem::Version
-  version: 1.1.4
+version: !ruby/object:Gem::Version 
+  hash: 25
   prerelease: 
+  segments: 
+  - 1
+  - 1
+  - 5
+  version: 1.1.5
 platform: ruby
-authors:
+authors: 
 - Philip Hallstrom
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-11 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2013-01-17 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: image_size
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
         version: 1.0.0
-- !ruby/object:Gem::Dependency
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: yard
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.8.1
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 61
+        segments: 
+        - 0
+        - 8
+        - 1
         version: 0.8.1
-- !ruby/object:Gem::Dependency
-  name: redcarpet
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.1.1
   type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: redcarpet
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 2
+        - 1
+        - 1
         version: 2.1.1
-description: Ruby library to provide server side functionality for elFinder.  elFinder
-  is an open-source file manager for web, written in JavaScript using jQuery UI.
-email:
+  type: :development
+  version_requirements: *id003
+description: Ruby library to provide server side functionality for elFinder.  elFinder is an open-source file manager for web, written in JavaScript using jQuery UI.
+email: 
 - philip@pjkh.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .autotest
 - .gitignore
 - .yardopts
@@ -106,30 +114,38 @@ files:
 - test/test_el_finder_thumbs.rb
 homepage: http://github.com/phallstrom/el_finder
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-requirements:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+requirements: 
 - ImageMagick
 rubyforge_project: el_finder
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: elFinder server side connector for Ruby.
-test_files:
+test_files: 
 - test/el_finder/test_image.rb
 - test/el_finder/test_mime_type.rb
 - test/el_finder/test_pathname.rb