0
@@ -1,9 +1,11 @@
0
 class Site < ActiveRecord::Base
0
 
0
   attr_protected :user_id, :published, :featured
0
-  has_many :comments, :class_name => 'Site::Comment', :dependent => :destroy
0
   belongs_to :user
0
-  has_many :assets, :class_name => 'Site::Asset', :conditions => 'thumbnail IS NULL', :order => "site_assets.position ASC, site_assets.id ASC"
0
+  belongs_to :bookmark_account
0
+
0
+  has_many :comments, :class_name => 'Site::Comment', :dependent => :destroy
0
+  has_many :assets, :class_name => 'Site::Asset', :conditions => 'thumbnail IS NULL', :order => "site_assets.position ASC, site_assets.id ASC", :dependent => :delete_all
0
   has_one :screenshot, :class_name => 'Site::Asset', :conditions => 'thumbnail IS NULL', :order => "site_assets.position ASC, site_assets.id ASC"
0
 
0
   acts_as_taggable
0
@@ -12,9 +14,9 @@ class Site < ActiveRecord::Base
0
   validates_presence_of :title
0
   validates_presence_of :permalink
0
   validates_presence_of :url
0
-  validates_presence_of :description
0
+#  validates_presence_of :description
0
   validates_presence_of :user_id
0
-  validates_length_of :description, :minimum => 40
0
+#  validates_length_of :description, :minimum => 40
0
   
0
   def before_validation
0
     self.permalink = PermalinkFu.escape(self.url_short) if self.permalink.blank?

0
@@ -1,8 +1,9 @@
0
 class User < Goldberg::User
0
-  has_many :sites
0
-  has_many :posts
0
-  has_many :comments
0
-  has_many :assets
0
+  has_many :sites, :dependent => :destroy
0
+  has_many :posts, :dependent => :destroy
0
+  has_many :comments, :dependent => :delete_all
0
+  has_many :assets, :dependent => :delete_all
0
+  has_many :bookmark_accounts, :dependent => :destroy
0
   
0
   def guest?
0
     self.role.name.downcase == 'guest'

0
@@ -1,4 +1,6 @@
0
 ActionController::Routing::Routes.draw do |map|
0
+  map.resources :bookmark_accounts
0
+
0
 
0
 
0
   map.resources :sites, 

0
@@ -1,5 +1,5 @@
0
 # This file is auto-generated from the current state of the database. Instead of editing this file, 
0
-# please use the migrations feature of ActiveRecord to incrementally modify your database, and
0
+# please use the migrations feature of Active Record to incrementally modify your database, and
0
 # then regenerate this schema definition.
0
 #
0
 # Note that this schema.rb definition is the authoritative source for your database schema. If you need
0
@@ -9,29 +9,39 @@
0
 #
0
 # It's strongly recommended to check this file into your version control system.
0
 
0
-ActiveRecord::Schema.define(:version => 12) do
0
+ActiveRecord::Schema.define(:version => 20080613115813) do
0
+
0
+  create_table "bookmark_accounts", :force => true do |t|
0
+    t.integer  "user_id",    :limit => 11, :null => false
0
+    t.string   "service"
0
+    t.string   "login"
0
+    t.string   "tags"
0
+    t.datetime "created_at"
0
+    t.datetime "updated_at"
0
+  end
0
 
0
   create_table "comments", :force => true do |t|
0
-    t.integer  "post_id",                              :null => false
0
-    t.integer  "parent_comment_id"
0
-    t.text     "body",              :default => "",    :null => false
0
-    t.integer  "user_id"
0
+    t.integer  "post_id",           :limit => 11
0
+    t.integer  "parent_comment_id", :limit => 11
0
+    t.text     "body",                                               :null => false
0
+    t.integer  "user_id",           :limit => 11
0
     t.string   "user_email"
0
     t.string   "user_website"
0
-    t.boolean  "published",         :default => false
0
+    t.boolean  "published",                       :default => false
0
     t.datetime "created_at"
0
     t.datetime "updated_at"
0
     t.string   "type"
0
     t.string   "user_name"
0
-    t.boolean  "subscribed",        :default => false
0
+    t.boolean  "subscribed",                      :default => false
0
+    t.integer  "site_id",           :limit => 11
0
   end
0
 
0
   create_table "goldberg_content_pages", :force => true do |t|
0
     t.string   "title"
0
     t.string   "name"
0
-    t.integer  "markup_style_id"
0
+    t.integer  "markup_style_id", :limit => 11
0
     t.text     "content"
0
-    t.integer  "permission_id"
0
+    t.integer  "permission_id",   :limit => 11
0
     t.datetime "created_at"
0
     t.datetime "updated_at"
0
     t.text     "content_cache"
0
@@ -42,9 +52,9 @@ ActiveRecord::Schema.define(:version => 12) do
0
   add_index "goldberg_content_pages", ["markup_style_id"], :name => "fk_content_page_markup_style_id"
0
 
0
   create_table "goldberg_controller_actions", :force => true do |t|
0
-    t.integer "site_controller_id"
0
+    t.integer "site_controller_id", :limit => 11
0
     t.string  "name"
0
-    t.integer "permission_id"
0
+    t.integer "permission_id",      :limit => 11
0
     t.string  "url_to_use"
0
   end
0
 
0
@@ -52,12 +62,12 @@ ActiveRecord::Schema.define(:version => 12) do
0
   add_index "goldberg_controller_actions", ["site_controller_id"], :name => "fk_controller_action_site_controller_id"
0
 
0
   create_table "goldberg_menu_items", :force => true do |t|
0
-    t.integer "parent_id"
0
+    t.integer "parent_id",            :limit => 11
0
     t.string  "name"
0
     t.string  "label"
0
-    t.integer "seq"
0
-    t.integer "controller_action_id"
0
-    t.integer "content_page_id"
0
+    t.integer "seq",                  :limit => 11
0
+    t.integer "controller_action_id", :limit => 11
0
+    t.integer "content_page_id",      :limit => 11
0
   end
0
 
0
   add_index "goldberg_menu_items", ["controller_action_id"], :name => "fk_menu_item_controller_action_id"
0
@@ -70,9 +80,9 @@ ActiveRecord::Schema.define(:version => 12) do
0
 
0
   create_table "goldberg_roles", :force => true do |t|
0
     t.string   "name"
0
-    t.integer  "parent_id"
0
-    t.string   "description",     :default => "", :null => false
0
-    t.integer  "default_page_id"
0
+    t.integer  "parent_id",       :limit => 11
0
+    t.string   "description",                   :default => "", :null => false
0
+    t.integer  "default_page_id", :limit => 11
0
     t.text     "cache"
0
     t.datetime "created_at"
0
     t.datetime "updated_at"
0
@@ -83,8 +93,8 @@ ActiveRecord::Schema.define(:version => 12) do
0
   add_index "goldberg_roles", ["default_page_id"], :name => "fk_role_default_page_id"
0
 
0
   create_table "goldberg_roles_permissions", :force => true do |t|
0
-    t.integer "role_id"
0
-    t.integer "permission_id"
0
+    t.integer "role_id",       :limit => 11
0
+    t.integer "permission_id", :limit => 11
0
   end
0
 
0
   add_index "goldberg_roles_permissions", ["role_id"], :name => "fk_roles_permission_role_id"
0
@@ -92,8 +102,8 @@ ActiveRecord::Schema.define(:version => 12) do
0
 
0
   create_table "goldberg_site_controllers", :force => true do |t|
0
     t.string  "name"
0
-    t.integer "permission_id"
0
-    t.integer "builtin",       :default => 0
0
+    t.integer "permission_id", :limit => 11
0
+    t.integer "builtin",       :limit => 11, :default => 0
0
   end
0
 
0
   add_index "goldberg_site_controllers", ["permission_id"], :name => "fk_site_controller_permission_id"
0
@@ -101,20 +111,20 @@ ActiveRecord::Schema.define(:version => 12) do
0
   create_table "goldberg_system_settings", :force => true do |t|
0
     t.string  "site_name"
0
     t.string  "site_subtitle"
0
-    t.string  "footer_message",                      :default => ""
0
-    t.integer "public_role_id"
0
-    t.integer "session_timeout",                     :default => 0,  :null => false
0
-    t.integer "site_default_page_id"
0
-    t.integer "not_found_page_id"
0
-    t.integer "permission_denied_page_id"
0
-    t.integer "session_expired_page_id"
0
-    t.integer "menu_depth",                          :default => 0,  :null => false
0
+    t.string  "footer_message",                                    :default => ""
0
+    t.integer "public_role_id",                      :limit => 11
0
+    t.integer "session_timeout",                     :limit => 11, :default => 0,  :null => false
0
+    t.integer "site_default_page_id",                :limit => 11
0
+    t.integer "not_found_page_id",                   :limit => 11
0
+    t.integer "permission_denied_page_id",           :limit => 11
0
+    t.integer "session_expired_page_id",             :limit => 11
0
+    t.integer "menu_depth",                          :limit => 11, :default => 0,  :null => false
0
     t.string  "start_path"
0
     t.string  "site_url_prefix"
0
     t.boolean "self_reg_enabled"
0
-    t.integer "self_reg_role_id"
0
+    t.integer "self_reg_role_id",                    :limit => 11
0
     t.boolean "self_reg_confirmation_required"
0
-    t.integer "self_reg_confirmation_error_page_id"
0
+    t.integer "self_reg_confirmation_error_page_id", :limit => 11
0
     t.boolean "self_reg_send_confirmation_email"
0
   end
0
 
0
@@ -127,7 +137,7 @@ ActiveRecord::Schema.define(:version => 12) do
0
   create_table "goldberg_users", :force => true do |t|
0
     t.string   "name"
0
     t.string   "password"
0
-    t.integer  "role_id"
0
+    t.integer  "role_id",                        :limit => 11
0
     t.string   "password_salt"
0
     t.string   "fullname"
0
     t.string   "email"
0
@@ -141,51 +151,86 @@ ActiveRecord::Schema.define(:version => 12) do
0
 
0
   add_index "goldberg_users", ["role_id"], :name => "fk_user_role_id"
0
 
0
+  create_table "newsletter_users", :force => true do |t|
0
+    t.integer  "user_id",       :limit => 11, :null => false
0
+    t.integer  "newsletter_id", :limit => 11, :null => false
0
+    t.datetime "created_at"
0
+    t.datetime "updated_at"
0
+  end
0
+
0
+  add_index "newsletter_users", ["user_id", "newsletter_id"], :name => "index_newsletter_users_on_user_id_and_newsletter_id", :unique => true
0
+
0
+  create_table "newsletters", :force => true do |t|
0
+    t.string   "title",       :default => "", :null => false
0
+    t.text     "description"
0
+    t.datetime "created_at"
0
+    t.datetime "updated_at"
0
+  end
0
+
0
   create_table "plugin_schema_info", :id => false, :force => true do |t|
0
     t.string  "plugin_name"
0
-    t.integer "version"
0
+    t.integer "version",     :limit => 11
0
   end
0
 
0
   create_table "posts", :force => true do |t|
0
-    t.string   "title",          :default => "",    :null => false
0
-    t.string   "excerpt",        :default => "",    :null => false
0
-    t.text     "body",           :default => "",    :null => false
0
-    t.datetime "published_at",                      :null => false
0
-    t.boolean  "published",      :default => false
0
-    t.string   "permalink",      :default => "",    :null => false
0
-    t.integer  "user_id",                           :null => false
0
+    t.string   "title",                         :default => "",    :null => false
0
+    t.string   "excerpt",                       :default => "",    :null => false
0
+    t.text     "body",                                             :null => false
0
+    t.datetime "published_at",                                     :null => false
0
+    t.boolean  "published",                     :default => false
0
+    t.string   "permalink",                     :default => "",    :null => false
0
+    t.integer  "user_id",         :limit => 11,                    :null => false
0
     t.datetime "created_at"
0
     t.datetime "updated_at"
0
-    t.integer  "comments_count", :default => 0
0
+    t.integer  "comments_count",  :limit => 11, :default => 0
0
+    t.string   "cached_tag_list",               :default => ""
0
   end
0
 
0
   create_table "site_assets", :force => true do |t|
0
-    t.integer  "size"
0
+    t.integer  "size",         :limit => 11
0
     t.string   "content_type"
0
-    t.string   "filename",     :default => "", :null => false
0
-    t.integer  "height"
0
-    t.integer  "width"
0
-    t.integer  "parent_id"
0
+    t.string   "filename",                   :default => "", :null => false
0
+    t.integer  "height",       :limit => 11
0
+    t.integer  "width",        :limit => 11
0
+    t.integer  "parent_id",    :limit => 11
0
     t.string   "thumbnail"
0
-    t.integer  "user_id",                      :null => false
0
-    t.integer  "site_id"
0
-    t.integer  "position",     :default => 0
0
+    t.integer  "user_id",      :limit => 11,                 :null => false
0
+    t.integer  "site_id",      :limit => 11
0
+    t.integer  "position",     :limit => 11, :default => 0
0
     t.datetime "created_at"
0
     t.datetime "updated_at"
0
   end
0
 
0
+  add_index "site_assets", ["site_id"], :name => "site_id"
0
+
0
   create_table "sites", :force => true do |t|
0
-    t.string   "title",              :default => "",    :null => false
0
-    t.string   "url",                :default => "",    :null => false
0
-    t.string   "owner",              :default => "",    :null => false
0
-    t.text     "description",        :default => "",    :null => false
0
-    t.integer  "user_id",                               :null => false
0
+    t.string   "title",                            :default => "",    :null => false
0
+    t.string   "url",                              :default => "",    :null => false
0
+    t.string   "owner",                            :default => "",    :null => false
0
+    t.text     "description",                                         :null => false
0
+    t.integer  "user_id",            :limit => 11,                    :null => false
0
     t.datetime "created_at"
0
     t.datetime "updated_at"
0
-    t.integer  "comments_count",     :default => 0
0
+    t.integer  "comments_count",     :limit => 11, :default => 0
0
     t.string   "permalink"
0
-    t.boolean  "published",          :default => false
0
+    t.boolean  "published",                        :default => false
0
     t.string   "thumbnail_filename"
0
+    t.boolean  "featured",                         :default => false
0
+    t.string   "cached_tag_list",                  :default => ""
0
+  end
0
+
0
+  create_table "taggings", :force => true do |t|
0
+    t.integer  "tag_id",        :limit => 11
0
+    t.integer  "taggable_id",   :limit => 11
0
+    t.string   "taggable_type"
0
+    t.datetime "created_at"
0
+  end
0
+
0
+  add_index "taggings", ["tag_id"], :name => "index_taggings_on_tag_id"
0
+  add_index "taggings", ["taggable_id", "taggable_type"], :name => "index_taggings_on_taggable_id_and_taggable_type"
0
+
0
+  create_table "tags", :force => true do |t|
0
+    t.string "name"
0
   end
0
 
0
 end