@@ -20,7 +20,7 @@ class Forum < ActiveRecord::Base belongs_to :last_post, :class_name => "Post" belongs_to :last_post_forum, :class_name => "Forum" - validates_presence_of :title + validates_presence_of :title, :description def to_s title app/models/forum.rb @@ -9,7 +9,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20090916231649) do +ActiveRecord::Schema.define(:version => 1) do create_table "banned_ips", :force => true do |t| t.string "ip" @@ -65,11 +65,9 @@ ActiveRecord::Schema.define(:version => 20090916231649) do t.integer "category_id" t.boolean "active", :default => true t.boolean "open", :default => true - t.integer "old_id" end add_index "forums", ["category_id"], :name => "index_forums_on_category_id" - add_index "forums", ["old_id"], :name => "index_forums_on_old_id" add_index "forums", ["open"], :name => "index_forums_on_open" add_index "forums", ["parent_id"], :name => "index_forums_on_parent_id" add_index "forums", ["posts_count"], :name => "index_forums_on_posts_count" @@ -191,22 +189,17 @@ ActiveRecord::Schema.define(:version => 20090916231649) do t.boolean "delta" t.boolean "deleted", :default => false t.integer "ip_id" - t.integer "old_id" end add_index "posts", ["id", "topic_id"], :name => "index_posts_on_id_and_topic_id" add_index "posts", ["ip_id"], :name => "index_posts_on_ip_id" - add_index "posts", ["old_id"], :name => "index_posts_on_old_id" create_table "ranks", :force => true do |t| t.string "name" t.integer "posts_required" t.boolean "custom", :default => false - t.integer "old_id" end - add_index "ranks", ["old_id"], :name => "index_ranks_on_old_id" - create_table "read_topics", :force => true do |t| t.integer "user_id" t.integer "topic_id" @@ -249,12 +242,10 @@ ActiveRecord::Schema.define(:version => 20090916231649) do t.integer "ip_id" t.boolean "moved", :default => false t.integer "moved_to_id" - t.integer "old_id" end add_index "topics", ["id", "forum_id"], :name => "index_topics_on_id_and_forum_id" add_index "topics", ["ip_id"], :name => "index_topics_on_ip_id" - add_index "topics", ["old_id"], :name => "index_topics_on_old_id" create_table "user_levels", :id => false, :force => true do |t| t.string "name" @@ -296,13 +287,10 @@ ActiveRecord::Schema.define(:version => 20090916231649) do t.string "avatar_content_type" t.integer "avatar_file_size" t.string "identifier" - t.integer "old_id" - t.string "phpbb_crypted_password" end add_index "users", ["id", "user_level_id"], :name => "index_users_on_id_and_user_level_id" add_index "users", ["login"], :name => "index_users_on_login" add_index "users", ["login_time"], :name => "index_users_on_login_time" - add_index "users", ["old_id"], :name => "index_users_on_old_id" end db/schema.rb @@ -2,9 +2,6 @@ Feature: Forums In order to restrict people to the right forums Administrators want to ensure people are shown only the right forums - - Background: - Given there is the usual setup Scenario: Administrators should be able to create new forums Given I am logged in as "administrator" features/admin_forums.feature @@ -2,11 +2,3 @@ Given /^I can see inactive forums$/ do @permission = @user.permissions.global @permission.update_attribute(:can_see_inactive_forums, true) end - - -Given /^"([^\"]*)"'s password is set to nil$/ do |login| - - u = User.find_by_login(login) || User.make(login.to_sym) - u.crypted_password = nil - u.save(false).should be_true -end features/step_definitions/users_steps.rb @@ -5,5 +5,5 @@ end Forum.blueprint(:public_forum) do title "Public Forum" - category { Category.find_by_name("Public Category") || Category.make(:public) } + category { Category.make(:public) } end features/support/blueprints/forums.rb @@ -7,11 +7,6 @@ User.blueprint do groups { Group.ensure("Registered Users") } end -User.blueprint(:phpbb_user) do - old_id 2 - login "phpbb_user" -end - User.blueprint(:anonymous) do group = Group.ensure("Anonymous") features/support/blueprints/users.rb @@ -24,10 +24,8 @@ plebian: #password is only_human salt: 8de4e91a969b7049ab1a53d57afbab578cc78021 crypted_password: a561a12d86ed27a6c6adf52a327979fcf74c1f3c - phpbb_crypted_password: $H$9y6GYdfw18fI9zHpKFbfR3j026K2en. login_time: <%= (Time.now - 5.minutes).to_s(:db) %> permalink: plebian - old_id: 2 banned_noob: id: 4 spec/fixtures/users.yml @@ -56,8 +56,4 @@ describe User, "with users" do @plebian.online?.should be_true end - it "should correctly auth using phpbb's method" do - @plebian.phpbb_authenticated?("password").should be_true - end - end \ No newline at end of file spec/models/user_spec.rb PHPBB_CONVERSION_TODO app/models/phpbb/config.rb app/models/phpbb/connection.rb app/models/phpbb/forum.rb app/models/phpbb/post.rb app/models/phpbb/topic.rb app/models/phpbb/user.rb db/migrate/20090916070834_old_ids.rb db/migrate/20090916231649_add_phpbb_crypted_password_to_users.rb export/forums.yml export/posts.yml export/ranks.yml export/topics.yml export/users.yml features/admin_categories.feature features/phpbb_logging_in.feature lib/rboard/converter.rb lib/tasks/converter.rake rboard spec/converter_spec.rb c38c4affc49d0a6c83350ef713bc75c8f17167c0 Ryan Bigg radarlistener@gmail.com http://github.com/radar/rboard/commit/f2d2cf997df732caaf7cad28ab75eea5622dc840 f2d2cf997df732caaf7cad28ab75eea5622dc840

2009-09-29T13:20:54-07:00

Revert "PHPBB Conversion work in progress... cucumber features are all failing, concerned." This reverts commit c38c4affc49d0a6c83350ef713bc75c8f17167c0. 7b7981a39f48f5a439da8c5991a72a6cebd1cc6f Ryan Bigg radarlistener@gmail.com