From 7640f27b9e183c6e9a00249c352e3515d3f90c75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20Ankarstr=C3=B6m?= Date: Tue, 2 Mar 2021 00:10:03 +0100 Subject: Rename db directory to models --- db.rb | 11 +++++++++++ db/comment.rb | 20 -------------------- db/config.rb | 17 ----------------- db/init.rb | 11 ----------- db/post.rb | 18 ------------------ db/tag.rb | 26 -------------------------- models/comment.rb | 20 ++++++++++++++++++++ models/config.rb | 17 +++++++++++++++++ models/post.rb | 18 ++++++++++++++++++ models/tag.rb | 26 ++++++++++++++++++++++++++ 10 files changed, 92 insertions(+), 92 deletions(-) create mode 100644 db.rb delete mode 100644 db/comment.rb delete mode 100644 db/config.rb delete mode 100644 db/init.rb delete mode 100644 db/post.rb delete mode 100644 db/tag.rb create mode 100644 models/comment.rb create mode 100644 models/config.rb create mode 100644 models/post.rb create mode 100644 models/tag.rb diff --git a/db.rb b/db.rb new file mode 100644 index 0000000..4c18111 --- /dev/null +++ b/db.rb @@ -0,0 +1,11 @@ +require 'active_record' + +ActiveRecord::Base.establish_connection( + adapter: 'sqlite3', + database: 'db.sqlite3' +) + +require_relative 'models/config' +require_relative 'models/comment' +require_relative 'models/post' +require_relative 'models/tag' diff --git a/db/comment.rb b/db/comment.rb deleted file mode 100644 index b3977f6..0000000 --- a/db/comment.rb +++ /dev/null @@ -1,20 +0,0 @@ -class Comment < ActiveRecord::Base - belongs_to :post - validates_presence_of :date - validates_presence_of :author - validates_presence_of :email - validates_format_of :email, with: /@/ - validates_presence_of :body -end - -class CreateCommentTable < ActiveRecord::Migration[6.0] - def change - create_table :comments do |t| - t.references :post, foreign_key: true, index: true - t.string :author, null: false - t.string :email, null: false - t.string :body, null: false - t.timestamps - end - end -end diff --git a/db/config.rb b/db/config.rb deleted file mode 100644 index 55b4106..0000000 --- a/db/config.rb +++ /dev/null @@ -1,17 +0,0 @@ -class Config < ActiveRecord::Base - self.table_name = 'config' - validates_presence_of :title - validates_presence_of :timezone - validates_presence_of :postsperpage -end - -class CreateConfigTable < ActiveRecord::Migration[6.0] - def change - create_table :config do |t| - t.string :title, null: false - t.string :subtitle - t.string :timezone, null: false - t.integer :postsperpage, null: false - end - end -end diff --git a/db/init.rb b/db/init.rb deleted file mode 100644 index 7c08faf..0000000 --- a/db/init.rb +++ /dev/null @@ -1,11 +0,0 @@ -require 'active_record' - -ActiveRecord::Base.establish_connection( - adapter: 'sqlite3', - database: 'db.sqlite3' -) - -require_relative 'config' -require_relative 'comment' -require_relative 'post' -require_relative 'tag' diff --git a/db/post.rb b/db/post.rb deleted file mode 100644 index 1d44051..0000000 --- a/db/post.rb +++ /dev/null @@ -1,18 +0,0 @@ -class Post < ActiveRecord::Base - has_many :comments - has_many :tags, through: :post_tag_links - - validates_presence_of :title - validates_presence_of :body -end - -class CreatePostTable < ActiveRecord::Migration[6.0] - def change - create_table :posts do |t| - t.string :title, null: false - t.string :body, null: false - t.boolean :locked, default: false - t.timestamps - end - end -end diff --git a/db/tag.rb b/db/tag.rb deleted file mode 100644 index 7f3446c..0000000 --- a/db/tag.rb +++ /dev/null @@ -1,26 +0,0 @@ -class PostTagLink < Active::Base - belongs_to :post - belongs_to :tag -end - -class CreatePostTagLinkTable < ActiveRecord::Migration[6.0] - def change - create_table :post_tag_links do |t| - t.references :post, foreign_key: true, index: true - t.references :tag, foreign_key: true, index: true - end - end -end - -class Tag < ActiveRecord::Base - belongs_to :post - validates_presence_of :name -end - -class CreateTagTable < ActiveRecord::Migration[6.0] - def change - create_table :tags do |t| - t.string :name, null: false - end - end -end diff --git a/models/comment.rb b/models/comment.rb new file mode 100644 index 0000000..b3977f6 --- /dev/null +++ b/models/comment.rb @@ -0,0 +1,20 @@ +class Comment < ActiveRecord::Base + belongs_to :post + validates_presence_of :date + validates_presence_of :author + validates_presence_of :email + validates_format_of :email, with: /@/ + validates_presence_of :body +end + +class CreateCommentTable < ActiveRecord::Migration[6.0] + def change + create_table :comments do |t| + t.references :post, foreign_key: true, index: true + t.string :author, null: false + t.string :email, null: false + t.string :body, null: false + t.timestamps + end + end +end diff --git a/models/config.rb b/models/config.rb new file mode 100644 index 0000000..55b4106 --- /dev/null +++ b/models/config.rb @@ -0,0 +1,17 @@ +class Config < ActiveRecord::Base + self.table_name = 'config' + validates_presence_of :title + validates_presence_of :timezone + validates_presence_of :postsperpage +end + +class CreateConfigTable < ActiveRecord::Migration[6.0] + def change + create_table :config do |t| + t.string :title, null: false + t.string :subtitle + t.string :timezone, null: false + t.integer :postsperpage, null: false + end + end +end diff --git a/models/post.rb b/models/post.rb new file mode 100644 index 0000000..1d44051 --- /dev/null +++ b/models/post.rb @@ -0,0 +1,18 @@ +class Post < ActiveRecord::Base + has_many :comments + has_many :tags, through: :post_tag_links + + validates_presence_of :title + validates_presence_of :body +end + +class CreatePostTable < ActiveRecord::Migration[6.0] + def change + create_table :posts do |t| + t.string :title, null: false + t.string :body, null: false + t.boolean :locked, default: false + t.timestamps + end + end +end diff --git a/models/tag.rb b/models/tag.rb new file mode 100644 index 0000000..9c24b6c --- /dev/null +++ b/models/tag.rb @@ -0,0 +1,26 @@ +class PostTagLink < ActiveRecord::Base + belongs_to :post + belongs_to :tag +end + +class CreatePostTagLinkTable < ActiveRecord::Migration[6.0] + def change + create_table :post_tag_links do |t| + t.references :post, foreign_key: true, index: true + t.references :tag, foreign_key: true, index: true + end + end +end + +class Tag < ActiveRecord::Base + belongs_to :post + validates_presence_of :name +end + +class CreateTagTable < ActiveRecord::Migration[6.0] + def change + create_table :tags do |t| + t.string :name, null: false + end + end +end -- cgit v1.2.3