EliteJournal 1.9.403 → 1.9.480

data/app/helpers/tags_helper.rb

@@ -1,7 +1,7 @@
 module TagsHelper
   def show_tags(tags)
     links = []
-    tags.each { |t| links << link_to(t.tag, :controller => 'journal', :action => 'tag', :params => {'tag' => t.tag})}
+    tags.each { |t| links << link_to(t.tag, :controller => 'tags', :action => 'show', :tag => t.tag)}
     links.join(', ')
   end
 end

data/app/models/post.rb

@@ -17,6 +17,8 @@ class Post < ActiveRecord::Base
       RedCloth.new(section).to_html.gsub(/\t/, '')
     end
     self.rendered = @sections.join(SECTION_DELIMITER)
+
+    self.slug = self.subject.downcase.gsub(/[^a-z0-9 _-]+/, '').gsub(/ +/, '-').gsub(/-+/, '-')
   end
 
   def updated?

data/app/models/user.rb

@@ -11,6 +11,7 @@ class User < ActiveRecord::Base
   validates_presence_of     :username, :name
   validates_uniqueness_of   :username
   validates_confirmation_of :password
+  validates_inclusion_of    :posts_per_page, :in => 1..25
   
   def before_save
     self.password = password.empty? ? self.class.find(id).password : Digest::MD5.hexdigest(password)
@@ -22,10 +23,9 @@ class User < ActiveRecord::Base
     end
     
     def top_posters(n=5)
-      posters = find_by_sql("SELECT u.id FROM users u, posts p "    +
-                            "WHERE u.id = p.user_id GROUP BY u.id " +
-                            "ORDER BY COUNT(p.id) DESC LIMIT #{n}").flatten
-      posters.map { |p| find(p) }
+      find_by_sql ["SELECT u.*, COUNT(p.id) FROM #{table_name} u, " +
+                   "#{Post.table_name} p WHERE u.id = p.user_id "   +
+                   "GROUP BY u.id ORDER_BY post_count DESC LIMIT ?", n]
     end
   end
   

data/app/views/account/info.rhtml

@@ -12,6 +12,10 @@
 
     <p><label for="user_subtitle">Journal Subtitle</label><br /><%= text_field('user', 'subtitle') %></p>
 
+    <p><label>Show the &nbsp;
+      <%= text_field 'user', 'posts_per_page', :size => 2, :style => 'width: auto' %>
+    &nbsp; most recent posts on my user page</label></p>
+
     <p><label for="user_allows_comments">Allow Commenting?</label>&nbsp;&nbsp;<%= check_box('user', 'allows_comment', 'style' => 'width: auto;') %></p>
     <p><label for="user_password">Password</label><br />
     <input type="password" name="user[password]" id="user_password" size="30" /></p>

data/app/views/atom/feed.rxml

@@ -5,8 +5,8 @@ xml.feed('version' => '0.3', 'xmlns' => 'http://purl.org/atom/ns#') do
   @posts.each do |p|
     xml.entry do
       xml.title p.subject
-      xml.link 'rel' => 'alternate', 'type' => 'text/html', 'href' => "http://#{@request.host}#{@app_config['main']['app_base']}view/#{p.id}"
-      xml.author { xml.name p.user.name }
+      xml.link 'rel' => 'alternate', 'type' => 'text/html', 'href' => "#{@request.protocol}#{@request.host_with_port}/user/#{@user ? @user.name : p.user.username}/#{p.slug}"
+      xml.author { xml.name @user ? @user.name : p.user.name }
       xml.issued p.created_at.xmlschema
       xml.modified p.updated_at.xmlschema
       xml.content({'type' => 'text/html', 'mode' => 'escaped'}, p.rendered)

data/app/views/css/edit.rhtml

@@ -2,7 +2,7 @@
 <h1>Editing stylesheet</h1>
 
 <div id="example_post">
-  <%= render_partial 'journal/post', @lastpost %>
+  <%= render_partial 'post/post', @lastpost %>
 </div>
 
 <%= error_messages_for 'stylesheet' %>

data/app/views/layouts/application.rhtml

@@ -29,7 +29,7 @@
     <ul id="menu">
       <% if logged_in? -%>
       <li id="logout"><%= current_user.name %> | <%= link_to 'Log Out', :controller => 'auth', :action => 'logout' %></li>
-      <li><%= link_to('Home',       :controller => 'journal',  :action => 'index' ) %></li>
+      <li><%= link_to('Home',       :controller => 'post',     :action => 'index' ) %></li>
       <li><%= link_to('Users',      :controller => 'users',    :action => 'index'  ) %></li>
       <li><%= link_to('Post',       :controller => 'post',     :action => 'new'   ) %></li>
       <li><%= link_to('My Drafts',  :controller => 'draft',    :action => 'list'  ) %></li>
@@ -41,7 +41,7 @@
       <% end -%>
     <% else -%>
       <li id="logout"><%= link_to 'Log In', :controller => 'auth', :action => 'login' %></li>
-      <li><%= link_to 'Home',       :controller => 'journal', :action => 'index'    %></li>
+      <li><%= link_to 'Home',       :controller => 'post', :action => 'index'    %></li>
       <li><%= link_to('Users',     :controller => 'users',    :action => 'index'  ) %></li>
     <% end -%>
     </ul>
@@ -61,8 +61,8 @@
       <% if user_page? -%>
       <h2>Links</h2>
       <ul>
-        <li><%= link_to 'Atom', :controller => 'atom', :action => @user.username %></li>
-        <li><%= link_to 'RSS', :controller =>  'rss',  :action => @user.username %></li>
+        <li><%= link_to 'Atom', :controller => 'atom', :action => 'feed',  :user => @user.username %></li>
+        <li><%= link_to 'RSS', :controller =>  'rss',  :action => 'index', :user => @user.username %></li>
         <% @user.links.each do |l| -%>
         <li><a href="<%= l.link_url %>"><%= l.link_text %></a></li>
         <% end -%>
@@ -73,7 +73,7 @@
       <h2>Related Tags</h2>
       <ul>
         <% @tag.related_tags.each do |t| -%>
-        <li><%= link_to t.tag, :controller => 'tags', :action => 'show', :params => {'tag', CGI.escape(t.tag)} %></li>
+        <li><%= link_to t.tag, :controller => 'tags', :action => 'show', :tag => CGI.escape(t.tag) %></li>
         <% end -%>
       </ul>
       

data/app/views/{journal → post}/_comment.rhtml

@@ -1,6 +1,6 @@
 <div class="comment">
   <a name="comment_<%= comment.id %>"></a>
-  <b><%= comment.subject %></b> (<%= link_to('Reply', :controller => 'post', :action => 'reply', :id => comment.post_id, :params => {'comment_id' => comment.id }) %>) <% if owns_post?(comment.post) %>(<%= link_to 'Delete', :controller => 'post', :action => 'destroy_comment', :id => comment.id %>)<% end %><br />
+  <b><%= comment.subject %></b> (<%= link_to('Reply', :controller => 'post', :action => 'reply', :user => comment.post.user.username, :id => comment.id, :slug => comment.post.slug) %>) <% if owns_post?(comment.post) %>(<%= link_to 'Delete', :controller => 'post', :action => 'destroy_comment', :id => comment.id %>)<% end %><br />
   Posted <%= distance_of_time_in_words comment.post.created_at, comment.created_at %> later by <em><%= comment.posted_by %></em><br /><br />
   <%= comment.rendered %>
 

data/app/views/{journal → post}/_post.rhtml

@@ -3,8 +3,8 @@
 xmlns:dc="http://purl.org/dc/elements/1.1/"
 xmlns:trackback="http://madskills.com/public/xml/rss/module/trackback/">
 <rdf:Description
-rdf:about="<%= url_for :controller => 'journal', :action => 'view', :id => post.id %>"
-dc:identifier="<%= url_for :controller => 'journal', :action => 'view', :id => post.id %>"
+rdf:about="<%= url_for :controller => 'post', :action => 'view', :user => post.user.username, :slug => post.slug %>"
+dc:identifier="<%= url_for :controller => 'post', :action => 'view', :user => post.user.username, :slug => post.slug %>"
 dc:title="<%= post.subject %>"
 trackback:ping="<%= url_for :controller => 'ping', :action => 'trackback', :id => post.id, :only_path => false %>" />
 </rdf:RDF>
@@ -14,7 +14,7 @@ trackback:ping="<%= url_for :controller => 'ping', :action => 'trackback', :id =
   <div class="face"><%= user_face(post.user) %></div>
   
   <ul class="postdata" id="postdata_<%= post.id %>">
-    <li>Posted by <%= link_user(post.user) %> on <%= sexifytime post.created_at %>.</li>
+    <li>Posted by <%= link_user(post.user) %> on <%= sexifytime post.created_at, post.user.username %>.</li>
     <% if post.has_tags? %><li id="posttags_<%= post.id %>">Tags: <%= tag_links(post) %></li><% end %>  
     <li>Trackback URL: <%= url_for :controller => 'ping', :action => 'trackback', :id => post.id, :only_path => false %></li>
     <% if owns_post?(post) -%>

data/app/views/post/index.rhtml

@@ -0,0 +1,5 @@
+<%= render_collection_of_partials 'post/post', @posts %>
+
+<% if @post_pages %>
+<%= @post_pages.basic_html(self) %>
+<% end %>

data/app/views/post/reply.rhtml

@@ -1,22 +1,31 @@
-<div class="post">
-  <h2><%= @post.subject %></h2>
-  <ul class="postdata">
-    <li>Posted On <%= @post.created_at %></li>
+<div class="postsubject" id="postsubject_<%= @post.id %>"><h2><%= @post.subject %></h2></div>
+<div id="postdiv_<%= @post.id %>" class="post">
+  <div class="face"><%= user_face(@post.user) %></div>
+  
+  <ul class="postdata" id="postdata_<%= @post.id %>">
+    <li>Posted by <%= link_user(@post.user) %> on <%= sexifytime @post.created_at, @post.user.username %>.</li>
+    <% if @post.has_tags? %><li id="posttags_<%= @post.id %>">Tags: <%= tag_links(@post) %></li><% end %>  
     <li>Trackback URL: <%= url_for :controller => 'ping', :action => 'trackback', :id => @post.id, :only_path => false %></li>
-    <% if @post.updated? -%>
-    <li>Update On <%= @post.updated_at %></li>
-    <% end -%>
+    <% if owns_post?(@post) -%>
+    <li>Admin &nbsp;&nbsp;&nbsp;<%= link_to('Edit', {:controller => 'post', :action => 'edit', :id => @post.id}, {'onclick' => "return setupEditInPlace('#{@post.id}')"}) %>&nbsp;&nbsp;&nbsp;<%= link_to('Delete', {:controller => 'post', :action => 'destroy', :id => @post.id}, {'onclick' => "return deletePost('#{@post.id}')"}) %></li>
+    <li id="togglecomment_<%= @post.id %>"><%= comment_toggle_link(@post) %></li>
+  <% end -%>
   </ul>
+  
+  <div class="postbody" id="postbody_<%= @post.id %>">
   <%= render_body(@post) %>
+  </div>
 
   <% if @comment -%>
-  <b><%= @comment.subject %></b><br />
-  Posted On <%= @comment.created_at %> By <%= @comment.posted_by %><br />
-  <%= @comment.rendered %>
-  <br />
+  <div class="commentreply">
+    <b><%= @comment.subject %></b><br />
+    Posted On <%= @comment.created_at %> By <%= @comment.posted_by %><br />
+    <%= @comment.rendered %>
+    <br />
+  </div>
   <% end -%>
 
-  <form id="postreply" action="<%= url_for :controller => 'post', :action => 'reply', :id => @post.id %>" method="post">
+  <form id="postreply" action="<%= url_for :controller => 'post', :action => 'reply', :user => @post.user.username, :slug => @post.slug %>" method="post">
     <div style="visibility: hidden;">
       <% if @comment -%>
       <input type="hidden" name="newcomment[comment_id]" value="<%= @comment.id %>" />

data/app/views/post/replyxml.rxml

@@ -1,5 +1,5 @@
 xml.result do
   xml.postid @post.id
   xml.comments @post.comments.count
-  xml.message link_to("Reply Posted (View)", :controller => 'journal', :action => 'view', :id => @post.id, :anchor => "comment_#{@comment.id}")
-end
+  xml.message link_to("Reply Posted (View)", :controller => 'post', :action => 'view', :user => post.user.username, :slug => post.slug, :anchor => "comment_#{@comment.id}")
+end

data/app/views/rss/{index.rxml → feed.rxml}

@@ -6,7 +6,7 @@ xml.rss('version' => '2.0') do
     @posts.each { |p|
       xml.item do 
         xml.title(p.subject)
-        xml.link("#{@request.protocol}#{@request.host_with_port}/journal/view/#{p.id}")
+        xml.link("#{@request.protocol}#{@request.host_with_port}/user/#{@user ? @user.username : p.user.username}/#{p.slug}")
         xml.description(p.rendered)
         xml.pubDate(p.updated_at)
       end

data/app/views/users/index.rhtml

@@ -1,6 +1,6 @@
 <dl>
   <% @users.each do |u| -%>
   <dt><%= link_to u.username, :controller => 'users', :action => u.username %></dt>
-  <dd><%= u.name %>, <%= u.posts.count %> posts. <% if u.posts.first %>Last posted on <%= link_to u.posts.first.created_at.strftime('%D'), :controller => 'journal', :action => 'view', :id => u.posts.first.id %>.<% end %></dd>
+  <dd><%= u.name %>, <%= u.posts.count %> posts. <% if u.posts.first %>Last posted on <%= link_to u.posts.first.created_at.strftime('%D'), :controller => 'post', :action => 'view', :user => u.username, :slug => u.posts.first.slug %>.<% end %></dd>
   <% end -%>
 </dl>

data/config/environment.rb

@@ -1,4 +1,4 @@
-RAILS_ROOT = File.expand_path(File.dirname(__FILE__) + "/../")
+RAILS_ROOT = File.dirname(__FILE__) + "/../"
 RAILS_ENV  = ENV['RAILS_ENV'] || 'development'
 
 
@@ -14,6 +14,7 @@ ADDITIONAL_LOAD_PATHS.concat %w(
   app/models
   app/controllers
   app/helpers
+  app/apis
   config
   lib
   vendor
@@ -25,9 +26,11 @@ ADDITIONAL_LOAD_PATHS.reverse.each { |dir| $:.unshift(dir) if File.directory?(di
 
 # Require Rails gems.
 require 'rubygems'
+require_gem 'activesupport'
 require_gem 'activerecord'
 require_gem 'actionpack'
 require_gem 'actionmailer'
+require_gem 'actionwebservice'
 require_gem 'rails'
 
 
@@ -40,19 +43,29 @@ if RAILS_ENV == 'geminstall'
 else
   ActiveRecord::Base.configurations = YAML::load(File.open("#{RAILS_ROOT}/config/database.yml"))
 end
-
 ActiveRecord::Base.establish_connection
 
-
 # Configure defaults if the included environment did not.
-RAILS_DEFAULT_LOGGER = Logger.new("#{RAILS_ROOT}/log/#{RAILS_ENV}.log") unless RAILS_ENV == 'geminstall'
-[ActiveRecord::Base, ActionController::Base, ActionMailer::Base].each do |klass|
-  klass.logger ||= RAILS_DEFAULT_LOGGER
-end
-[ActionController::Base, ActionMailer::Base].each do |klass|
-  klass.template_root ||= "#{RAILS_ROOT}/app/views/"
+begin
+  RAILS_DEFAULT_LOGGER = Logger.new("#{RAILS_ROOT}/log/#{RAILS_ENV}.log") unless RAILS_ENV == 'geminstall'
+rescue StandardError
+  RAILS_DEFAULT_LOGGER = Logger.new(STDERR)
+  RAILS_DEFAULT_LOGGER.level = Logger::WARN
+  RAILS_DEFAULT_LOGGER.warn(
+  "Rails Error: Unable to access log file. Please ensure that log/#{RAILS_ENV}.log exists and is chmod 0666. " +
+  "The log level has been raised to WARN and the output directed to STDERR until the problem is fixed."
+  )
 end
 
+[ActiveRecord, ActionController, ActionMailer].each { |mod| mod::Base.logger ||= RAILS_DEFAULT_LOGGER }
+[ActionController, ActionMailer].each { |mod| mod::Base.template_root ||= "#{RAILS_ROOT}/app/views/" }
+ActionController::Routing::Routes.reload
+
+Controllers = Dependencies::LoadingModule.root(
+  File.expand_path(File.join(RAILS_ROOT, 'app', 'controllers')),
+  File.expand_path(File.join(RAILS_ROOT, 'components'))
+)
+
 
 # Include your app's configuration here:
 #ActionController::CgiRequest::DEFAULT_SESSION_OPTIONS.update(:database_manager => CGI::Session::ActiveRecordStore)

data/config/routes.rb

@@ -0,0 +1,36 @@
+ActionController::Routing::Routes.draw do |map|
+  map.connect '', :controller => 'post', :action => 'index'
+
+  map.connect ':user/:slug/view', :controller => 'post', :action => 'view'
+
+  map.connect ':year/:month/:day', :controller => 'post', :action => 'range', :year => /\d{4}/, :month => /\d{1,2}/, :day => /\d{1,2}/, :defaults => {:month => nil, :day => nil}
+
+  map.connect ':user/:year/:month/:day', :controller => 'post', :action => 'range', :year => /\d{4}/, :month => /\d{1,2}/, :day => /\d{1,2}/, :defaults => {:month => nil, :day => nil }
+
+  map.connect ':user/rss', :controller => 'rss', :action => 'feed'
+
+  map.connect ':user/atom', :controller => 'atom', :action => 'feed'
+
+  map.connect 'rss/master', :controller => 'rss', :action => 'feed'
+
+  map.connect 'atom/master', :controller => 'atom', :action => 'feed'
+	
+  map.connect 'tag/:tag', :controller => 'tags', :action => 'show'
+
+  map.connect ':user/:slug/reply', :controller => 'post', :action => 'reply'
+
+  map.connect ':user/:slug/comment/:id/reply', :controller => 'post', :action => 'reply'
+
+  map.connect ':user/:slug/tag', :controller => 'post', :action => 'tag'
+
+  map.connect 'drafts', :controller => 'draft',   :action => 'list'
+
+  map.connect 'me',     :controller => 'account', :action => 'info'
+
+  map.connect 'links',  :controller => 'link',    :action => 'index'
+
+  map.connect 'css',    :controller => 'css',     :action => 'edit'
+  
+  map.connect ':controller/:action/:id'
+
+end

data/db/db-mysql.sql

@@ -4,6 +4,7 @@ CREATE TABLE posts (
     created_at  DATETIME,
     updated_at  DATETIME,
     subject     VARCHAR(255) NOT NULL,
+    slug        VARCHAR(255) NOT NULL,
     body        TEXT         NOT NULL,
     rendered    TEXT         NOT NULL DEFAULT '',
     allows_comment TINYINT   NOT NULL DEFAULT 1,
@@ -51,6 +52,7 @@ CREATE TABLE users (
     name        VARCHAR(255) NOT NULL,
     is_admin    TINYINT      NOT NULL DEFAULT 0,
     allows_comment TINYINT   NOT NULL DEFAULT 1,
+    posts_per_page INT       NOT NULL DEFAULT 10,
     title       VARCHAR(255)          DEFAULT '',
     subtitle    VARCHAR(255)          DEFAULT '',
     PRIMARY KEY (id)

data/db/db-postgresql.sql

@@ -4,6 +4,7 @@ CREATE TABLE posts (
     created_at  TIMESTAMP,
     updated_at  TIMESTAMP,
     subject     VARCHAR(255) NOT NULL,
+    slug        VARCHAR(255) NOT NULL,
     body        TEXT         NOT NULL,
     rendered    TEXT         NOT NULL DEFAULT '',
     allows_comment BOOLEAN   NOT NULL DEFAULT 't',
@@ -51,6 +52,7 @@ CREATE TABLE users (
     name        VARCHAR(255) NOT NULL,
     is_admin    BOOLEAN      NOT NULL DEFAULT 'f',
     allows_comment BOOLEAN   NOT NULL DEFAULT 't',
+    posts_per_page INT       NOT NULL DEFAULT 10,
     title       VARCHAR(255)          DEFAULT '',
     subtitle    VARCHAR(255)          DEFAULT '',
     PRIMARY KEY (id)

data/db/db-sqlite.sql

@@ -4,6 +4,7 @@ CREATE TABLE posts (
     created_at  DATETIME,
     updated_at  DATETIME,
     subject     VARCHAR(255) NOT NULL,
+    slug        VARCHAR(255) NOT NULL,
     body        TEXT         NOT NULL,
     rendered    TEXT         NOT NULL DEFAULT '',
     allows_comment TINYINT   NOT NULL DEFAULT '1',
@@ -51,6 +52,7 @@ CREATE TABLE users (
     name        VARCHAR(255) NOT NULL,
     is_admin    TINYINT      NOT NULL DEFAULT '0',
     allows_comment TINYINT   NOT NULL DEFAULT '1',
+    posts_per_page INTEGER   NOT NULL DEFAULT 10,
     title       VARCHAR(255)          DEFAULT '',
     subtitle    VARCHAR(255)          DEFAULT '',
     PRIMARY KEY (id)

data/db/development_structure.sql

@@ -21,7 +21,7 @@ SET SESSION AUTHORIZATION 'scott';
 SET search_path = public, pg_catalog;
 
 --
--- TOC entry 5 (OID 520573)
+-- TOC entry 5 (OID 731131)
 -- Name: posts; Type: TABLE; Schema: public; Owner: scott
 --
 
@@ -31,6 +31,7 @@ CREATE TABLE posts (
     created_at timestamp without time zone,
     updated_at timestamp without time zone,
     subject character varying(255) NOT NULL,
+    slug character varying(255) NOT NULL,
     body text NOT NULL,
     rendered text DEFAULT ''::text NOT NULL,
     allows_comment boolean DEFAULT true NOT NULL
@@ -38,7 +39,7 @@ CREATE TABLE posts (
 
 
 --
--- TOC entry 6 (OID 520585)
+-- TOC entry 6 (OID 731143)
 -- Name: tags; Type: TABLE; Schema: public; Owner: scott
 --
 
@@ -50,7 +51,7 @@ CREATE TABLE tags (
 
 
 --
--- TOC entry 7 (OID 520591)
+-- TOC entry 7 (OID 731149)
 -- Name: posts_tags; Type: TABLE; Schema: public; Owner: scott
 --
 
@@ -61,7 +62,7 @@ CREATE TABLE posts_tags (
 
 
 --
--- TOC entry 8 (OID 520595)
+-- TOC entry 8 (OID 731153)
 -- Name: drafts; Type: TABLE; Schema: public; Owner: scott
 --
 
@@ -76,7 +77,7 @@ CREATE TABLE drafts (
 
 
 --
--- TOC entry 9 (OID 520606)
+-- TOC entry 9 (OID 731164)
 -- Name: comments; Type: TABLE; Schema: public; Owner: scott
 --
 
@@ -93,81 +94,82 @@ CREATE TABLE comments (
 
 
 --
--- TOC entry 10 (OID 520642)
--- Name: pings; Type: TABLE; Schema: public; Owner: scott
+-- TOC entry 10 (OID 731179)
+-- Name: users; Type: TABLE; Schema: public; Owner: scott
 --
 
-CREATE TABLE pings (
+CREATE TABLE users (
     id serial NOT NULL,
-    post_id integer DEFAULT 0 NOT NULL,
+    username character varying(255) NOT NULL,
+    "password" character varying(255) NOT NULL,
+    name character varying(255) NOT NULL,
+    is_admin boolean DEFAULT false NOT NULL,
+    allows_comment boolean DEFAULT true NOT NULL,
+    posts_per_page integer DEFAULT 10 NOT NULL,
     title character varying(255) DEFAULT ''::character varying,
-    excerpt character varying(255) DEFAULT ''::character varying,
-    url character varying(255) DEFAULT ''::character varying,
-    blog_name character varying(255) DEFAULT ''::character varying
+    subtitle character varying(255) DEFAULT ''::character varying
 );
 
 
 --
--- TOC entry 11 (OID 520654)
--- Name: links; Type: TABLE; Schema: public; Owner: scott
+-- TOC entry 11 (OID 731191)
+-- Name: images; Type: TABLE; Schema: public; Owner: scott
 --
 
-CREATE TABLE links (
+CREATE TABLE images (
     id serial NOT NULL,
+    "type" character varying(25) NOT NULL,
     user_id integer NOT NULL,
-    link_text character varying(255) NOT NULL,
-    link_url character varying(255) NOT NULL
+    picture bytea NOT NULL,
+    content_type character varying(255) NOT NULL,
+    height character varying(4) NOT NULL,
+    width character varying(4) NOT NULL,
+    updated_at timestamp without time zone
 );
 
 
 --
--- TOC entry 12 (OID 520661)
--- Name: stylesheets; Type: TABLE; Schema: public; Owner: scott
+-- TOC entry 12 (OID 731201)
+-- Name: pings; Type: TABLE; Schema: public; Owner: scott
 --
 
-CREATE TABLE stylesheets (
+CREATE TABLE pings (
     id serial NOT NULL,
-    user_id integer NOT NULL,
-    data text DEFAULT ''::text NOT NULL
+    post_id integer DEFAULT 0 NOT NULL,
+    title character varying(255) DEFAULT ''::character varying,
+    excerpt character varying(255) DEFAULT ''::character varying,
+    url character varying(255) DEFAULT ''::character varying,
+    blog_name character varying(255) DEFAULT ''::character varying
 );
 
 
 --
--- TOC entry 13 (OID 520674)
--- Name: images; Type: TABLE; Schema: public; Owner: scott
+-- TOC entry 13 (OID 731213)
+-- Name: links; Type: TABLE; Schema: public; Owner: scott
 --
 
-CREATE TABLE images (
+CREATE TABLE links (
     id serial NOT NULL,
-    "type" character varying(25) NOT NULL,
     user_id integer NOT NULL,
-    picture bytea NOT NULL,
-    content_type character varying(255) NOT NULL,
-    height character varying(4) NOT NULL,
-    width character varying(4) NOT NULL,
-    updated_at timestamp without time zone
+    link_text character varying(255) NOT NULL,
+    link_url character varying(255) NOT NULL
 );
 
 
 --
--- TOC entry 14 (OID 584889)
--- Name: users; Type: TABLE; Schema: public; Owner: scott
+-- TOC entry 14 (OID 731220)
+-- Name: stylesheets; Type: TABLE; Schema: public; Owner: scott
 --
 
-CREATE TABLE users (
+CREATE TABLE stylesheets (
     id serial NOT NULL,
-    username character varying(255) NOT NULL,
-    "password" character varying(255) NOT NULL,
-    name character varying(255) NOT NULL,
-    is_admin boolean DEFAULT false NOT NULL,
-    allows_comment boolean DEFAULT true NOT NULL,
-    title character varying(255) DEFAULT ''::character varying,
-    subtitle character varying(255) DEFAULT ''::character varying
+    user_id integer NOT NULL,
+    data text DEFAULT ''::text NOT NULL
 );
 
 
 --
--- TOC entry 15 (OID 520581)
+-- TOC entry 15 (OID 731139)
 -- Name: posts_pkey; Type: CONSTRAINT; Schema: public; Owner: scott
 --
 
@@ -176,7 +178,7 @@ ALTER TABLE ONLY posts
 
 
 --
--- TOC entry 16 (OID 520589)
+-- TOC entry 16 (OID 731147)
 -- Name: tags_pkey; Type: CONSTRAINT; Schema: public; Owner: scott
 --
 
@@ -185,7 +187,7 @@ ALTER TABLE ONLY tags
 
 
 --
--- TOC entry 17 (OID 520602)
+-- TOC entry 17 (OID 731160)
 -- Name: drafts_pkey; Type: CONSTRAINT; Schema: public; Owner: scott
 --
 
@@ -194,7 +196,7 @@ ALTER TABLE ONLY drafts
 
 
 --
--- TOC entry 18 (OID 520617)
+-- TOC entry 18 (OID 731175)
 -- Name: comments_pkey; Type: CONSTRAINT; Schema: public; Owner: scott
 --
 
@@ -203,48 +205,48 @@ ALTER TABLE ONLY comments
 
 
 --
--- TOC entry 19 (OID 520650)
--- Name: pings_pkey; Type: CONSTRAINT; Schema: public; Owner: scott
+-- TOC entry 19 (OID 731187)
+-- Name: users_pkey; Type: CONSTRAINT; Schema: public; Owner: scott
 --
 
-ALTER TABLE ONLY pings
-    ADD CONSTRAINT pings_pkey PRIMARY KEY (id);
+ALTER TABLE ONLY users
+    ADD CONSTRAINT users_pkey PRIMARY KEY (id);
 
 
 --
--- TOC entry 20 (OID 520657)
--- Name: links_pkey; Type: CONSTRAINT; Schema: public; Owner: scott
+-- TOC entry 20 (OID 731197)
+-- Name: images_pkey; Type: CONSTRAINT; Schema: public; Owner: scott
 --
 
-ALTER TABLE ONLY links
-    ADD CONSTRAINT links_pkey PRIMARY KEY (id);
+ALTER TABLE ONLY images
+    ADD CONSTRAINT images_pkey PRIMARY KEY (id);
 
 
 --
--- TOC entry 21 (OID 520668)
--- Name: stylesheets_pkey; Type: CONSTRAINT; Schema: public; Owner: scott
+-- TOC entry 21 (OID 731209)
+-- Name: pings_pkey; Type: CONSTRAINT; Schema: public; Owner: scott
 --
 
-ALTER TABLE ONLY stylesheets
-    ADD CONSTRAINT stylesheets_pkey PRIMARY KEY (id);
+ALTER TABLE ONLY pings
+    ADD CONSTRAINT pings_pkey PRIMARY KEY (id);
 
 
 --
--- TOC entry 22 (OID 520680)
--- Name: images_pkey; Type: CONSTRAINT; Schema: public; Owner: scott
+-- TOC entry 22 (OID 731216)
+-- Name: links_pkey; Type: CONSTRAINT; Schema: public; Owner: scott
 --
 
-ALTER TABLE ONLY images
-    ADD CONSTRAINT images_pkey PRIMARY KEY (id);
+ALTER TABLE ONLY links
+    ADD CONSTRAINT links_pkey PRIMARY KEY (id);
 
 
 --
--- TOC entry 23 (OID 584896)
--- Name: users_pkey; Type: CONSTRAINT; Schema: public; Owner: scott
+-- TOC entry 23 (OID 731227)
+-- Name: stylesheets_pkey; Type: CONSTRAINT; Schema: public; Owner: scott
 --
 
-ALTER TABLE ONLY users
-    ADD CONSTRAINT users_pkey PRIMARY KEY (id);
+ALTER TABLE ONLY stylesheets
+    ADD CONSTRAINT stylesheets_pkey PRIMARY KEY (id);
 
 
 --