el_finder 1.1.5 → 1.1.6

data/lib/el_finder/connector.rb

@@ -2,14 +2,6 @@
 # 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
@@ -26,7 +18,7 @@ module ElFinder
     DEFAULT_OPTIONS = {
       :mime_handler => ElFinder::MimeType,
       :image_handler => ElFinder::Image,
-      :original_filename_method => lambda { |file| file.original_filename.force_encoding('utf-8') },
+      :original_filename_method => lambda { |file| file.original_filename.respond_to?(:force_encoding) ? file.original_filename.force_encoding('utf-8') : file.original_filename },
       :disabled_commands => [],
       :allow_dot_files => true,
       :upload_max_size => '50M',
@@ -108,7 +100,9 @@ module ElFinder
       hash += '==' if len == 1 or len == 2
       hash += '='  if len == 3
 
-      pathname = @root + Base64.urlsafe_decode64(hash).force_encoding('utf-8')
+      decoded_hash = Base64.urlsafe_decode64(hash)
+      decoded_hash = decoded_hash.respond_to?(:force_encoding) ? decoded_hash.force_encoding('utf-8') : decoded_hash
+      pathname = @root + decoded_hash
     rescue ArgumentError => e
       if e.message != 'invalid base64'
         raise

data/lib/el_finder/version.rb

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

metadata

@@ -1,80 +1,72 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: el_finder
-version: !ruby/object:Gem::Version 
-  hash: 25
+version: !ruby/object:Gem::Version
+  version: 1.1.6
   prerelease: 
-  segments: 
-  - 1
-  - 1
-  - 5
-  version: 1.1.5
 platform: ruby
-authors: 
+authors:
 - Philip Hallstrom
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-01-17 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-01-17 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: image_size
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: yard
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 61
-        segments: 
-        - 0
-        - 8
-        - 1
+      - !ruby/object:Gem::Version
         version: 0.8.1
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: redcarpet
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.8.1
+- !ruby/object:Gem::Dependency
+  name: redcarpet
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 2
-        - 1
-        - 1
+      - !ruby/object:Gem::Version
         version: 2.1.1
   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: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        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:
 - philip@pjkh.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .autotest
 - .gitignore
 - .yardopts
@@ -114,38 +106,30 @@ 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 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-requirements: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      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