lib/carrierwave/storage/aliyun_file.rb in carrierwave-aliyun-1.2.1 vs lib/carrierwave/storage/aliyun_file.rb in carrierwave-aliyun-1.2.2

@@ -4,39 +4,39 @@
   module Storage
     class AliyunFile
       attr_writer :file
       attr_reader :uploader, :path
 
-      alias_method :filename, :path
-      alias_method :identifier, :filename
+      alias filename path
+      alias identifier filename
 
       def initialize(uploader, base, path)
-        @uploader, @path, @base = uploader, escape(path), base
+        @uploader = uploader
+        @path = path
+        @base = base
       end
 
       def file
         @file ||= bucket.get(path).try(:first)
       end
 
       def size
-        file.headers[:content_length].to_i rescue nil
+        file.headers[:content_length].to_i
+      rescue StandardError
+        nil
       end
 
-      def escape(path)
-        CGI.escape(path).gsub("%2F", "/")
-      end
-
       def read
         object, body = bucket.get(path)
         @headers = object.headers
         body
       end
 
       def delete
         bucket.delete(path)
         true
-      rescue => e
+      rescue StandardError => e
         # If the file's not there, don't panic
         puts "carrierwave-aliyun delete file failed: #{e}"
         nil
       end
 
@@ -93,20 +93,21 @@
         path_elements.last if path_elements.size > 1
       end
 
       def original_filename
         return @original_filename if @original_filename
-        if @file && @file.respond_to?(:original_filename)
+
+        if @file&.respond_to?(:original_filename)
           @file.original_filename
         elsif path
           ::File.basename(path)
         end
       end
 
       private
 
-        def bucket
-          @bucket ||= CarrierWave::Aliyun::Bucket.new(uploader)
-        end
+      def bucket
+        @bucket ||= CarrierWave::Aliyun::Bucket.new(uploader)
+      end
     end
   end
 end