| <%= link_to(post_version.post_id, post_path(post_version.post_id)) %> |
- <%= post_version.updated_at.strftime("%Y-%m-%d %H:%M") %> |
+ <%= compact_time(post_version.updated_at) %> |
<%= link_to(post_version.updater.name, user_path(post_version.updater_id)) %> |
<%= post_version.rating %> |
<%= post_version.parent_id %> |
@@ -25,15 +25,7 @@
<%= post_version.updater_ip_addr %>
<% end %>
-
- <% post_version.add_tag_array.each do |tag| %>
- <%= tag %>
- <% end %>
-
- <% post_version.del_tag_array.each do |tag| %>
- <%= tag %>
- <% end %>
- |
+ <%= post_version_diff(post_version) %> |
<%= link_to "Revert", revert_post_path(post_version.post_id, :version_id => post_version.id), :method => :put, :remote => true %>
|
diff --git a/db/development_structure.sql b/db/development_structure.sql
index eefeac9be..c52c61a53 100644
--- a/db/development_structure.sql
+++ b/db/development_structure.sql
@@ -2142,8 +2142,7 @@ CREATE TABLE post_versions (
created_at timestamp without time zone,
updated_at timestamp without time zone,
post_id integer NOT NULL,
- add_tags text DEFAULT ''::text NOT NULL,
- del_tags text DEFAULT ''::text NOT NULL,
+ tags text DEFAULT ''::text NOT NULL,
rating character(1),
parent_id integer,
source text,
diff --git a/db/migrate/20100205163027_create_post_versions.rb b/db/migrate/20100205163027_create_post_versions.rb
index d764004ce..6e78af561 100644
--- a/db/migrate/20100205163027_create_post_versions.rb
+++ b/db/migrate/20100205163027_create_post_versions.rb
@@ -4,8 +4,7 @@ class CreatePostVersions < ActiveRecord::Migration
t.timestamps
t.column :post_id, :integer, :null => false
- t.column :add_tags, :text, :null => false, :default => ""
- t.column :del_tags, :text, :null => false, :default => ""
+ t.column :tags, :text, :null => false, :default => ""
t.column :rating, :char
t.column :parent_id, :integer
t.column :source, :text
diff --git a/script/upgrade_schema.sql b/script/upgrade_schema.sql
index b7015bac4..9079beb6b 100644
--- a/script/upgrade_schema.sql
+++ b/script/upgrade_schema.sql
@@ -250,15 +250,11 @@ alter table post_versions rename column created_at to updated_at;
alter table post_versions rename column user_id to updater_id;
alter table post_versions rename column ip_addr to updater_ip_addr;
alter table post_versions add column source text;
-alter table post_versions add column add_tags text not null default '';
-alter table post_versions add column del_tags text not null default '';
alter index idx_post_tag_histories__post rename to index_post_versions_on_post_id;
alter index index_post_tag_histories_on_user_id rename to index_post_versions_on_updater_id;
create index index_post_versions_on_updater_ip_addr on post_versions (updater_ip_addr);
alter table post_versions drop column id;
alter table post_versions add column id serial primary key;
--- update post_versions.add_tags
--- update post_versions.del_tags
alter table post_votes drop constraint post_votes_post_id_fkey;
alter table post_votes drop constraint post_votes_user_id_fkey;
@@ -412,5 +408,4 @@ alter table wiki_pages drop constraint fk_wiki_pages__user;
drop table dmails_orig;
drop table favorites_orig;
drop table pools_posts;
-alter table post_versions drop column tags;
alter table users drop column show_samples;
\ No newline at end of file
diff --git a/test/functional/posts_controller_test.rb b/test/functional/posts_controller_test.rb
index 3dffe25cf..6bbf2919f 100644
--- a/test/functional/posts_controller_test.rb
+++ b/test/functional/posts_controller_test.rb
@@ -53,7 +53,7 @@ class PostsControllerTest < ActionController::TestCase
should "work" do
@version = @post.versions(true).first
- assert_equal("aaaa", @version.add_tags)
+ assert_equal("aaaa", @version.tags)
post :revert, {:id => @post.id, :version_id => @version.id}, {:user_id => @user.id}
assert_redirected_to post_path(@post)
@post.reload
diff --git a/test/unit/post_version_test.rb b/test/unit/post_version_test.rb
index 77bf760d4..2b6997979 100644
--- a/test/unit/post_version_test.rb
+++ b/test/unit/post_version_test.rb
@@ -14,6 +14,31 @@ class PostVersionTest < ActiveSupport::TestCase
CurrentUser.ip_addr = nil
end
+ context "that has multiple versions: " do
+ setup do
+ @post = Factory.create(:post, :tag_string => "1")
+ @post.update_attributes(:tag_string => "1 2")
+ @post.update_attributes(:tag_string => "2 3")
+ end
+
+ context "a version record" do
+ setup do
+ @version = PostVersion.last
+ end
+
+ should "know its previous version" do
+ assert_not_nil(@version.previous)
+ assert_equal("1 2", @version.previous.tags)
+ end
+
+ should "know the seuqence of all versions for the post" do
+ assert_equal(2, @version.sequence_for_post.size)
+ assert_equal(%w(3), @version.sequence_for_post[0][:added_tags])
+ assert_equal(%w(2), @version.sequence_for_post[1][:added_tags])
+ end
+ end
+ end
+
context "that has been created" do
setup do
@parent = Factory.create(:post)
@@ -23,8 +48,7 @@ class PostVersionTest < ActiveSupport::TestCase
should "also create a version" do
assert_equal(1, @post.versions.size)
@version = @post.versions.last
- assert_equal("aaa bbb ccc", @version.add_tags)
- assert_equal("", @version.del_tags)
+ assert_equal("aaa bbb ccc", @version.tags)
assert_equal(@post.rating, @version.rating)
assert_equal(@post.parent_id, @version.parent_id)
assert_equal(@post.source, @version.source)
@@ -41,8 +65,7 @@ class PostVersionTest < ActiveSupport::TestCase
should "also create a version" do
assert_equal(2, @post.versions.size)
@version = @post.versions.last
- assert_equal("xxx", @version.add_tags)
- assert_equal("aaa", @version.del_tags)
+ assert_equal("bbb ccc xxx", @version.tags)
assert_nil(@version.rating)
assert_equal("", @version.source)
assert_nil(@version.parent_id)