app/controllers/bookmark_accounts_controller.rb app/helpers/bookmark_accounts_helper.rb app/models/bookmark_account.rb app/views/bookmark_accounts/index.html.erb db/migrate/20080613115813_create_bookmark_accounts.rb test/fixtures/bookmark_accounts.yml test/functional/bookmark_accounts_controller_test.rb test/unit/bookmark_account_test.rb @@ -1,9 +1,11 @@ class Site < ActiveRecord::Base attr_protected :user_id, :published, :featured - has_many :comments, :class_name => 'Site::Comment', :dependent => :destroy belongs_to :user - has_many :assets, :class_name => 'Site::Asset', :conditions => 'thumbnail IS NULL', :order => "site_assets.position ASC, site_assets.id ASC" + belongs_to :bookmark_account + + has_many :comments, :class_name => 'Site::Comment', :dependent => :destroy + has_many :assets, :class_name => 'Site::Asset', :conditions => 'thumbnail IS NULL', :order => "site_assets.position ASC, site_assets.id ASC", :dependent => :delete_all has_one :screenshot, :class_name => 'Site::Asset', :conditions => 'thumbnail IS NULL', :order => "site_assets.position ASC, site_assets.id ASC" acts_as_taggable @@ -12,9 +14,9 @@ class Site < ActiveRecord::Base validates_presence_of :title validates_presence_of :permalink validates_presence_of :url - validates_presence_of :description +# validates_presence_of :description validates_presence_of :user_id - validates_length_of :description, :minimum => 40 +# validates_length_of :description, :minimum => 40 def before_validation self.permalink = PermalinkFu.escape(self.url_short) if self.permalink.blank? app/models/site.rb @@ -1,8 +1,9 @@ class User < Goldberg::User - has_many :sites - has_many :posts - has_many :comments - has_many :assets + has_many :sites, :dependent => :destroy + has_many :posts, :dependent => :destroy + has_many :comments, :dependent => :delete_all + has_many :assets, :dependent => :delete_all + has_many :bookmark_accounts, :dependent => :destroy def guest? self.role.name.downcase == 'guest' app/models/user.rb @@ -1,4 +1,6 @@ ActionController::Routing::Routes.draw do |map| + map.resources :bookmark_accounts + map.resources :sites, config/routes.rb @@ -1,5 +1,5 @@ # This file is auto-generated from the current state of the database. Instead of editing this file, -# please use the migrations feature of ActiveRecord to incrementally modify your database, and +# please use the migrations feature of Active Record to incrementally modify your database, and # then regenerate this schema definition. # # Note that this schema.rb definition is the authoritative source for your database schema. If you need @@ -9,29 +9,39 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 12) do +ActiveRecord::Schema.define(:version => 20080613115813) do + + create_table "bookmark_accounts", :force => true do |t| + t.integer "user_id", :limit => 11, :null => false + t.string "service" + t.string "login" + t.string "tags" + t.datetime "created_at" + t.datetime "updated_at" + end create_table "comments", :force => true do |t| - t.integer "post_id", :null => false - t.integer "parent_comment_id" - t.text "body", :default => "", :null => false - t.integer "user_id" + t.integer "post_id", :limit => 11 + t.integer "parent_comment_id", :limit => 11 + t.text "body", :null => false + t.integer "user_id", :limit => 11 t.string "user_email" t.string "user_website" - t.boolean "published", :default => false + t.boolean "published", :default => false t.datetime "created_at" t.datetime "updated_at" t.string "type" t.string "user_name" - t.boolean "subscribed", :default => false + t.boolean "subscribed", :default => false + t.integer "site_id", :limit => 11 end create_table "goldberg_content_pages", :force => true do |t| t.string "title" t.string "name" - t.integer "markup_style_id" + t.integer "markup_style_id", :limit => 11 t.text "content" - t.integer "permission_id" + t.integer "permission_id", :limit => 11 t.datetime "created_at" t.datetime "updated_at" t.text "content_cache" @@ -42,9 +52,9 @@ ActiveRecord::Schema.define(:version => 12) do add_index "goldberg_content_pages", ["markup_style_id"], :name => "fk_content_page_markup_style_id" create_table "goldberg_controller_actions", :force => true do |t| - t.integer "site_controller_id" + t.integer "site_controller_id", :limit => 11 t.string "name" - t.integer "permission_id" + t.integer "permission_id", :limit => 11 t.string "url_to_use" end @@ -52,12 +62,12 @@ ActiveRecord::Schema.define(:version => 12) do add_index "goldberg_controller_actions", ["site_controller_id"], :name => "fk_controller_action_site_controller_id" create_table "goldberg_menu_items", :force => true do |t| - t.integer "parent_id" + t.integer "parent_id", :limit => 11 t.string "name" t.string "label" - t.integer "seq" - t.integer "controller_action_id" - t.integer "content_page_id" + t.integer "seq", :limit => 11 + t.integer "controller_action_id", :limit => 11 + t.integer "content_page_id", :limit => 11 end add_index "goldberg_menu_items", ["controller_action_id"], :name => "fk_menu_item_controller_action_id" @@ -70,9 +80,9 @@ ActiveRecord::Schema.define(:version => 12) do create_table "goldberg_roles", :force => true do |t| t.string "name" - t.integer "parent_id" - t.string "description", :default => "", :null => false - t.integer "default_page_id" + t.integer "parent_id", :limit => 11 + t.string "description", :default => "", :null => false + t.integer "default_page_id", :limit => 11 t.text "cache" t.datetime "created_at" t.datetime "updated_at" @@ -83,8 +93,8 @@ ActiveRecord::Schema.define(:version => 12) do add_index "goldberg_roles", ["default_page_id"], :name => "fk_role_default_page_id" create_table "goldberg_roles_permissions", :force => true do |t| - t.integer "role_id" - t.integer "permission_id" + t.integer "role_id", :limit => 11 + t.integer "permission_id", :limit => 11 end add_index "goldberg_roles_permissions", ["role_id"], :name => "fk_roles_permission_role_id" @@ -92,8 +102,8 @@ ActiveRecord::Schema.define(:version => 12) do create_table "goldberg_site_controllers", :force => true do |t| t.string "name" - t.integer "permission_id" - t.integer "builtin", :default => 0 + t.integer "permission_id", :limit => 11 + t.integer "builtin", :limit => 11, :default => 0 end add_index "goldberg_site_controllers", ["permission_id"], :name => "fk_site_controller_permission_id" @@ -101,20 +111,20 @@ ActiveRecord::Schema.define(:version => 12) do create_table "goldberg_system_settings", :force => true do |t| t.string "site_name" t.string "site_subtitle" - t.string "footer_message", :default => "" - t.integer "public_role_id" - t.integer "session_timeout", :default => 0, :null => false - t.integer "site_default_page_id" - t.integer "not_found_page_id" - t.integer "permission_denied_page_id" - t.integer "session_expired_page_id" - t.integer "menu_depth", :default => 0, :null => false + t.string "footer_message", :default => "" + t.integer "public_role_id", :limit => 11 + t.integer "session_timeout", :limit => 11, :default => 0, :null => false + t.integer "site_default_page_id", :limit => 11 + t.integer "not_found_page_id", :limit => 11 + t.integer "permission_denied_page_id", :limit => 11 + t.integer "session_expired_page_id", :limit => 11 + t.integer "menu_depth", :limit => 11, :default => 0, :null => false t.string "start_path" t.string "site_url_prefix" t.boolean "self_reg_enabled" - t.integer "self_reg_role_id" + t.integer "self_reg_role_id", :limit => 11 t.boolean "self_reg_confirmation_required" - t.integer "self_reg_confirmation_error_page_id" + t.integer "self_reg_confirmation_error_page_id", :limit => 11 t.boolean "self_reg_send_confirmation_email" end @@ -127,7 +137,7 @@ ActiveRecord::Schema.define(:version => 12) do create_table "goldberg_users", :force => true do |t| t.string "name" t.string "password" - t.integer "role_id" + t.integer "role_id", :limit => 11 t.string "password_salt" t.string "fullname" t.string "email" @@ -141,51 +151,86 @@ ActiveRecord::Schema.define(:version => 12) do add_index "goldberg_users", ["role_id"], :name => "fk_user_role_id" + create_table "newsletter_users", :force => true do |t| + t.integer "user_id", :limit => 11, :null => false + t.integer "newsletter_id", :limit => 11, :null => false + t.datetime "created_at" + t.datetime "updated_at" + end + + add_index "newsletter_users", ["user_id", "newsletter_id"], :name => "index_newsletter_users_on_user_id_and_newsletter_id", :unique => true + + create_table "newsletters", :force => true do |t| + t.string "title", :default => "", :null => false + t.text "description" + t.datetime "created_at" + t.datetime "updated_at" + end + create_table "plugin_schema_info", :id => false, :force => true do |t| t.string "plugin_name" - t.integer "version" + t.integer "version", :limit => 11 end create_table "posts", :force => true do |t| - t.string "title", :default => "", :null => false - t.string "excerpt", :default => "", :null => false - t.text "body", :default => "", :null => false - t.datetime "published_at", :null => false - t.boolean "published", :default => false - t.string "permalink", :default => "", :null => false - t.integer "user_id", :null => false + t.string "title", :default => "", :null => false + t.string "excerpt", :default => "", :null => false + t.text "body", :null => false + t.datetime "published_at", :null => false + t.boolean "published", :default => false + t.string "permalink", :default => "", :null => false + t.integer "user_id", :limit => 11, :null => false t.datetime "created_at" t.datetime "updated_at" - t.integer "comments_count", :default => 0 + t.integer "comments_count", :limit => 11, :default => 0 + t.string "cached_tag_list", :default => "" end create_table "site_assets", :force => true do |t| - t.integer "size" + t.integer "size", :limit => 11 t.string "content_type" - t.string "filename", :default => "", :null => false - t.integer "height" - t.integer "width" - t.integer "parent_id" + t.string "filename", :default => "", :null => false + t.integer "height", :limit => 11 + t.integer "width", :limit => 11 + t.integer "parent_id", :limit => 11 t.string "thumbnail" - t.integer "user_id", :null => false - t.integer "site_id" - t.integer "position", :default => 0 + t.integer "user_id", :limit => 11, :null => false + t.integer "site_id", :limit => 11 + t.integer "position", :limit => 11, :default => 0 t.datetime "created_at" t.datetime "updated_at" end + add_index "site_assets", ["site_id"], :name => "site_id" + create_table "sites", :force => true do |t| - t.string "title", :default => "", :null => false - t.string "url", :default => "", :null => false - t.string "owner", :default => "", :null => false - t.text "description", :default => "", :null => false - t.integer "user_id", :null => false + t.string "title", :default => "", :null => false + t.string "url", :default => "", :null => false + t.string "owner", :default => "", :null => false + t.text "description", :null => false + t.integer "user_id", :limit => 11, :null => false t.datetime "created_at" t.datetime "updated_at" - t.integer "comments_count", :default => 0 + t.integer "comments_count", :limit => 11, :default => 0 t.string "permalink" - t.boolean "published", :default => false + t.boolean "published", :default => false t.string "thumbnail_filename" + t.boolean "featured", :default => false + t.string "cached_tag_list", :default => "" + end + + create_table "taggings", :force => true do |t| + t.integer "tag_id", :limit => 11 + t.integer "taggable_id", :limit => 11 + t.string "taggable_type" + t.datetime "created_at" + end + + add_index "taggings", ["tag_id"], :name => "index_taggings_on_tag_id" + add_index "taggings", ["taggable_id", "taggable_type"], :name => "index_taggings_on_taggable_id_and_taggable_type" + + create_table "tags", :force => true do |t| + t.string "name" end end db/schema.rb script/rails_spec 8c40fbbf3a6f8c765c352467b0392abeef27056d TomK32 tomk32@tomk32.de http://github.com/TomK32/plasticairships/commit/094be3bdf9741d4712c3a6ff5e13c53897a3ddbb 094be3bdf9741d4712c3a6ff5e13c53897a3ddbb 2008-06-13T06:30:02-07:00 2008-06-13T06:30:02-07:00 added bookmark_account model and unit tests. started with views e05087c2f6487bfc3c72eae5214c1be429bc99c0 TomK32 tomk32@tomk32.de