github-mirror/discourse
github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-04-03 05:39:41 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

proper column naming

Browse Source 
silly schemaless database habits are hard to kill
This commit is contained in:
Régis Hanol 2013-06-17 04:02:17 +02:00
parent 454636abf1
commit af45b5a11e
3 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/models/optimized_image.rb
View File

@ -16,8 +16,8 @@ class OptimizedImage < ActiveRecord::Base
image_info = FastImage.new(temp_path) image_info = FastImage.new(temp_path)
thumbnail = OptimizedImage.new({ thumbnail = OptimizedImage.new({
upload_id: upload.id, upload_id: upload.id,
sha: Digest::SHA1.file(temp_path).hexdigest, sha1: Digest::SHA1.file(temp_path).hexdigest,
ext: File.extname(temp_path), extension: File.extname(temp_path),
width: image_info.size[0], width: image_info.size[0],
height: image_info.size[1] height: image_info.size[1]
}) })
@ -49,11 +49,11 @@ class OptimizedImage < ActiveRecord::Base
end end
def optimized_path def optimized_path
"uploads/#{RailsMultisite::ConnectionManagement.current_db}/_optimized/#{sha[0..2]}/#{sha[3..5]}" "uploads/#{RailsMultisite::ConnectionManagement.current_db}/_optimized/#{sha1[0..2]}/#{sha1[3..5]}"
end end
def filename def filename
"#{sha[6..16]}_#{width}x#{height}#{ext}" "#{sha1[6..16]}_#{width}x#{height}#{extension}"
end end
end end
@ -63,8 +63,8 @@ end
# Table name: optimized_images # Table name: optimized_images
# #
# id :integer not null, primary key # id :integer not null, primary key
# sha :string(255) not null # sha1 :string(40) not null
# ext :string(255) not null # extension :string(10) not null
# width :integer not null # width :integer not null
# height :integer not null # height :integer not null
# upload_id :integer not null # upload_id :integer not null

15
db/migrate/20130617014127_rename_sha_and_ext_columns.rb Normal file
View File

@ -0,0 +1,15 @@
class RenameShaAndExtColumns < ActiveRecord::Migration
def up
rename_column :optimized_images, :sha, :sha1
change_column :optimized_images, :sha1, :string, limit: 40
rename_column :optimized_images, :ext, :extension
change_column :optimized_images, :extension, :string, limit: 10
end
def down
change_column :optimized_images, :extension, :string, limit: 255
rename_column :optimized_images, :extension, :ext
change_column :optimized_images, :sha1, :string, limit: 255
rename_column :optimized_images, :sha1, :sha
end
end

4
spec/models/optimized_image_spec.rb
View File

@ -20,8 +20,8 @@ describe OptimizedImage do
it "works" do it "works" do
Tempfile.any_instance.expects(:close).once Tempfile.any_instance.expects(:close).once
Tempfile.any_instance.expects(:unlink).once Tempfile.any_instance.expects(:unlink).once
oi.sha.should == "da39a3ee5e6b4b0d3255bfef95601890afd80709" oi.sha1.should == "da39a3ee5e6b4b0d3255bfef95601890afd80709"
oi.ext.should == ".jpg" oi.extension.should == ".jpg"
oi.width.should == 244 oi.width.should == 244
oi.height.should == 66 oi.height.should == 66
end end