diff --git a/app/models/post.rb b/app/models/post.rb index af9fb82f3..dd9631d39 100644 --- a/app/models/post.rb +++ b/app/models/post.rb @@ -1,8 +1,4 @@ class Post < ActiveRecord::Base - class Deletion < ActiveRecord::Base - set_table_name "deleted_posts" - end - def file_path prefix = Rails.env == "test" ? "test." : "" "#{Rails.root}/public/data/original/#{prefix}#{md5}.#{file_ext}" diff --git a/db/migrate/20100204214746_create_posts.rb b/db/migrate/20100204214746_create_posts.rb index 9a732cd1c..06be418f4 100644 --- a/db/migrate/20100204214746_create_posts.rb +++ b/db/migrate/20100204214746_create_posts.rb @@ -11,6 +11,7 @@ class CreatePosts < ActiveRecord::Migration t.column :is_rating_locked, :boolean, :null => false, :default => false t.column :is_pending, :boolean, :null => false, :default => false t.column :is_flagged, :boolean, :null => false, :default => false + t.column :is_deleted, :boolean, :null => false, :default => false t.column :approver_id, :integer t.column :change_seq, :integer, :default => "nextval('post_change_seq'::regclass)" @@ -19,6 +20,7 @@ class CreatePosts < ActiveRecord::Migration t.column :uploader_ip_addr, "inet", :null => false # Cached + t.column :fav_count, :integer t.column :last_noted_at, :datetime t.column :last_commented_at, :datetime diff --git a/test/unit/pending_post_test.rb b/test/unit/pending_post_test.rb index d1d0bad83..7b3ab866e 100644 --- a/test/unit/pending_post_test.rb +++ b/test/unit/pending_post_test.rb @@ -149,6 +149,7 @@ class PendingPostTest < ActiveSupport::TestCase assert_equal(@pending_post.md5, post.md5) assert_equal("jpg", post.file_ext) assert(File.exists?(post.file_path)) + assert_equal(28086, File.size(post.file_path)) assert_equal(post.id, @pending_post.post_id) assert_equal("finished", @pending_post.status) end diff --git a/vendor/cache/abstract-1.0.0.gem b/vendor/cache/abstract-1.0.0.gem deleted file mode 100644 index a9be232aa..000000000 Binary files a/vendor/cache/abstract-1.0.0.gem and /dev/null differ diff --git a/vendor/cache/arel-0.2.0.gem b/vendor/cache/arel-0.2.0.gem deleted file mode 100644 index a9edd3c68..000000000 Binary files a/vendor/cache/arel-0.2.0.gem and /dev/null differ diff --git a/vendor/cache/aws-s3-0.6.2.gem b/vendor/cache/aws-s3-0.6.2.gem deleted file mode 100644 index 00fc3083b..000000000 Binary files a/vendor/cache/aws-s3-0.6.2.gem and /dev/null differ diff --git a/vendor/cache/builder-2.1.2.gem b/vendor/cache/builder-2.1.2.gem deleted file mode 100644 index c90169723..000000000 Binary files a/vendor/cache/builder-2.1.2.gem and /dev/null differ diff --git a/vendor/cache/bundler-0.9.2.gem b/vendor/cache/bundler-0.9.2.gem deleted file mode 100644 index d31c2e816..000000000 Binary files a/vendor/cache/bundler-0.9.2.gem and /dev/null differ diff --git a/vendor/cache/chardet-0.9.0.gem b/vendor/cache/chardet-0.9.0.gem deleted file mode 100644 index 2c7ad52ef..000000000 Binary files a/vendor/cache/chardet-0.9.0.gem and /dev/null differ diff --git a/vendor/cache/diff-lcs-1.1.2.gem b/vendor/cache/diff-lcs-1.1.2.gem deleted file mode 100644 index aa0be73b2..000000000 Binary files a/vendor/cache/diff-lcs-1.1.2.gem and /dev/null differ diff --git a/vendor/cache/erubis-2.6.5.gem b/vendor/cache/erubis-2.6.5.gem deleted file mode 100644 index 95bdb17cc..000000000 Binary files a/vendor/cache/erubis-2.6.5.gem and /dev/null differ diff --git a/vendor/cache/gemcutter-0.3.0.gem b/vendor/cache/gemcutter-0.3.0.gem deleted file mode 100644 index dccbb248b..000000000 Binary files a/vendor/cache/gemcutter-0.3.0.gem and /dev/null differ diff --git a/vendor/cache/hoe-2.5.0.gem b/vendor/cache/hoe-2.5.0.gem deleted file mode 100644 index 96c245d17..000000000 Binary files a/vendor/cache/hoe-2.5.0.gem and /dev/null differ diff --git a/vendor/cache/html5-0.10.0.gem b/vendor/cache/html5-0.10.0.gem deleted file mode 100644 index 81ee7d0b6..000000000 Binary files a/vendor/cache/html5-0.10.0.gem and /dev/null differ diff --git a/vendor/cache/i18n-0.3.3.gem b/vendor/cache/i18n-0.3.3.gem deleted file mode 100644 index 4746979a6..000000000 Binary files a/vendor/cache/i18n-0.3.3.gem and /dev/null differ diff --git a/vendor/cache/json-1.2.0.gem b/vendor/cache/json-1.2.0.gem deleted file mode 100644 index 0fefc67cb..000000000 Binary files a/vendor/cache/json-1.2.0.gem and /dev/null differ diff --git a/vendor/cache/json_pure-1.2.0.gem b/vendor/cache/json_pure-1.2.0.gem deleted file mode 100644 index f9e2535e9..000000000 Binary files a/vendor/cache/json_pure-1.2.0.gem and /dev/null differ diff --git a/vendor/cache/mail-2.1.2.gem b/vendor/cache/mail-2.1.2.gem deleted file mode 100644 index 4cf07fa6f..000000000 Binary files a/vendor/cache/mail-2.1.2.gem and /dev/null differ diff --git a/vendor/cache/mechanize-0.9.3.gem b/vendor/cache/mechanize-0.9.3.gem deleted file mode 100644 index a15f2dc9b..000000000 Binary files a/vendor/cache/mechanize-0.9.3.gem and /dev/null differ diff --git a/vendor/cache/memcache-client-1.7.8.gem b/vendor/cache/memcache-client-1.7.8.gem deleted file mode 100644 index 3f745071f..000000000 Binary files a/vendor/cache/memcache-client-1.7.8.gem and /dev/null differ diff --git a/vendor/cache/mime-types-1.16.gem b/vendor/cache/mime-types-1.16.gem deleted file mode 100644 index 49f1ef203..000000000 Binary files a/vendor/cache/mime-types-1.16.gem and /dev/null differ diff --git a/vendor/cache/nokogiri-1.4.1.gem b/vendor/cache/nokogiri-1.4.1.gem deleted file mode 100644 index 6a3a88800..000000000 Binary files a/vendor/cache/nokogiri-1.4.1.gem and /dev/null differ diff --git a/vendor/cache/pg-0.8.0.gem b/vendor/cache/pg-0.8.0.gem deleted file mode 100644 index 5fa38d755..000000000 Binary files a/vendor/cache/pg-0.8.0.gem and /dev/null differ diff --git a/vendor/cache/rack-1.1.0.gem b/vendor/cache/rack-1.1.0.gem deleted file mode 100644 index 4a73511e8..000000000 Binary files a/vendor/cache/rack-1.1.0.gem and /dev/null differ diff --git a/vendor/cache/rack-mount-0.4.5.gem b/vendor/cache/rack-mount-0.4.5.gem deleted file mode 100644 index dcbca2973..000000000 Binary files a/vendor/cache/rack-mount-0.4.5.gem and /dev/null differ diff --git a/vendor/cache/rack-test-0.5.3.gem b/vendor/cache/rack-test-0.5.3.gem deleted file mode 100644 index 98180f9f9..000000000 Binary files a/vendor/cache/rack-test-0.5.3.gem and /dev/null differ diff --git a/vendor/cache/rake-0.8.7.gem b/vendor/cache/rake-0.8.7.gem deleted file mode 100644 index 0740cec7b..000000000 Binary files a/vendor/cache/rake-0.8.7.gem and /dev/null differ diff --git a/vendor/cache/rubyforge-2.0.3.gem b/vendor/cache/rubyforge-2.0.3.gem deleted file mode 100644 index 0a516c5ad..000000000 Binary files a/vendor/cache/rubyforge-2.0.3.gem and /dev/null differ diff --git a/vendor/cache/text-format-1.0.0.gem b/vendor/cache/text-format-1.0.0.gem deleted file mode 100644 index 1c46df34f..000000000 Binary files a/vendor/cache/text-format-1.0.0.gem and /dev/null differ diff --git a/vendor/cache/text-hyphen-1.0.0.gem b/vendor/cache/text-hyphen-1.0.0.gem deleted file mode 100644 index 739889b0c..000000000 Binary files a/vendor/cache/text-hyphen-1.0.0.gem and /dev/null differ diff --git a/vendor/cache/thor-0.13.0.gem b/vendor/cache/thor-0.13.0.gem deleted file mode 100644 index 71b5730e0..000000000 Binary files a/vendor/cache/thor-0.13.0.gem and /dev/null differ diff --git a/vendor/cache/tzinfo-0.3.16.gem b/vendor/cache/tzinfo-0.3.16.gem deleted file mode 100644 index a0978aad6..000000000 Binary files a/vendor/cache/tzinfo-0.3.16.gem and /dev/null differ diff --git a/vendor/cache/xml-simple-1.0.12.gem b/vendor/cache/xml-simple-1.0.12.gem deleted file mode 100644 index 675e5c8f6..000000000 Binary files a/vendor/cache/xml-simple-1.0.12.gem and /dev/null differ