fix: noop filename cleaner for paperclip

abak-press · Feb 9, 2016 · 95ec32a · 95ec32a
1 parent 72238a2
commit 95ec32a
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -26,3 +26,7 @@ bundler/install:
 
 appraisal/install:
 	${BUNDLE} exec ${APPRAISAL} install
+
+clean:
+	-rm -rf gemfiles
+	-rm -rf Gemfile.lock
diff --git a/app/models/apress/amazon_assets/private_asset.rb b/app/models/apress/amazon_assets/private_asset.rb
@@ -9,7 +9,8 @@ class PrivateAsset < ActiveRecord::Base
       has_attached_file :local,
                         :path => ":rails_root/public/system/assets/:id_partition/:basename.:extension",
                         :url => "#{ActionController::Base.asset_host}/system/assets/:id_partition/:basename.:extension",
-                        :use_timestamp => false
+                        :use_timestamp => false,
+                        :filename_cleaner => ->(filename) { filename }
 
       has_attached_file :remote,
                         :storage => :s3,
@@ -19,7 +20,8 @@ class PrivateAsset < ActiveRecord::Base
                         :bucket => S3_BUCKET,
                         :path => "assets/:id_partition/:basename.:extension",
                         :url => "https://s3.amazonaws.com/#{S3_BUCKET}/assets/:id_partition/:basename.:extension",
-                        :use_timestamp => false
+                        :use_timestamp => false,
+                        :filename_cleaner => ->(filename) { filename }
 
       include ::Apress::AmazonAssets::Concerns::BaseAsset
     end

diff --git a/app/models/apress/amazon_assets/public_asset.rb b/app/models/apress/amazon_assets/public_asset.rb
@@ -9,7 +9,8 @@ class PublicAsset < ActiveRecord::Base
       has_attached_file :local,
                         :path => ":rails_root/public/system/public_assets/:id_partition/:basename.:extension",
                         :url => "#{ActionController::Base.asset_host}/system/public_assets/:id_partition/:basename.:extension",
-                        :use_timestamp => false
+                        :use_timestamp => false,
+                        :filename_cleaner => ->(filename) { filename }
 
       has_attached_file :remote,
                         :storage => :s3,
@@ -19,7 +20,8 @@ class PublicAsset < ActiveRecord::Base
                         :bucket => S3_BUCKET,
                         :path => "public_assets/:id_partition/:basename.:extension",
                         :url => "https://s3.amazonaws.com/#{S3_BUCKET}/public_assets/:id_partition/:basename.:extension",
-                        :use_timestamp => false
+                        :use_timestamp => false,
+                        :filename_cleaner => ->(filename) { filename }
 
       include ::Apress::AmazonAssets::Concerns::BaseAsset
     end

diff --git a/spec/fixtures/assets/картинка.jpg b/spec/fixtures/assets/картинка.jpg