--- a/app/controllers/admin/base_controller.rb
+++ b/app/controllers/admin/base_controller.rb
@@ -14,7 +14,7 @@ class Admin::BaseController < ApplicationController
   end
 
   def require_login_or_enki_hash
-    unless session[:logged_in] || request.headers['HTTP_X_ENKIHASH'] == hash_request(request)
+    unless logged_in_author || request.headers['HTTP_X_ENKIHASH'] == hash_request(request)
       return render(:text => false.to_yaml, :status => :forbidden) if params[:format] == 'yaml'
       return redirect_to(admin_session_path)
     end
@@ -29,4 +29,8 @@ class Admin::BaseController < ApplicationController
     raise("Invalid request: YAML must specify a hash") unless ret.is_a?(Hash)
     ret
   end
+  
+  def logged_in_author
+    @current_author ||= session[:author_id] && Author.find(session[:author_id])
+  end
 end

--- a/app/controllers/admin/posts_controller.rb
+++ b/app/controllers/admin/posts_controller.rb
@@ -48,7 +48,7 @@ class Admin::PostsController < Admin::BaseController
   end
 
   def build_object
-    @current_object = Post.new(object_parameters) do |post|
+    @current_object = logged_in_author.posts.build(object_parameters) do |post|
       post.published_at = Time.now
     end
   end

--- a/app/controllers/admin/sessions_controller.rb
+++ b/app/controllers/admin/sessions_controller.rb
@@ -15,8 +15,8 @@ class Admin::SessionsController < ApplicationController
   def create
     begin
       return if open_id_authenticate(params[:openid_url]) do |response|
-        if URI.parse(response.identity_url) == URI.parse(config[:author, :open_id])
-          session[:logged_in] = true
+        if author = Author.with_open_id(response.identity_url)
+          session[:author_id] = author.id
           redirect_to(admin_posts_path)
           return
         else
@@ -32,7 +32,7 @@ class Admin::SessionsController < ApplicationController
   end
 
   def destroy
-    session[:logged_in] = false
+    session[:author_id] = nil
     redirect_to('/')
   end
 end

--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1,7 +1,7 @@
 # Methods added to this helper will be available to all templates in the application.
 module ApplicationHelper
   def author
-    Struct.new(:name, :email).new(config[:author][:name], config[:author][:email])
+    Author.find(:first)
   end
 
   def open_id_delegation_link_tags(server, delegate)

--- a/app/models/author.rb
+++ b/app/models/author.rb
@@ -1,3 +1,33 @@
 class Author < ActiveRecord::Base
-  validates_presence_of :name, :email, :open_id
+  validates_presence_of :name, :email
+  validate :open_id_valid
+  
+  has_many :posts
+
+  class << self
+    # Finds the author with open_id matching the given open_id address
+    def with_open_id(open_id)
+      uri = URI.parse(open_id)
+      find(:all).detect {|a| a.open_id == uri}
+    end
+  end
+  
+  def open_id
+    @open_id || URI.parse(read_attribute(:open_id))
+  end
+  def open_id=(uri)
+    @open_id = begin
+      URI.parse(uri)
+    rescue URI::InvalidURIError
+      nil
+    end
+    write_attribute(:open_id, uri.to_s)
+  end
+  
+  private
+    def open_id_valid
+      unless self.open_id && (self.open_id.is_a?(URI::HTTP) || self.open_id.is_a?(URI::HTTPS))
+        errors.add(:open_id, "not a valid OpenID URL")
+      end
+    end
 end

--- a/app/models/post.rb
+++ b/app/models/post.rb
@@ -3,6 +3,7 @@ class Post < ActiveRecord::Base
 
   acts_as_taggable
 
+  belongs_to :author
   has_many :comments, :dependent => :destroy
   has_many :approved_comments, :class_name => 'Comment'
 

--- a/app/views/admin/posts/_post_form.html.erb
+++ b/app/views/admin/posts/_post_form.html.erb
@@ -84,10 +84,10 @@ end
 <%= check_box 'post', 'is_active', :checked => (@post.is_active ? 'checked' : ''), :onchange => "setPingCheck(this, this.form.elements['ping'], '#{(get_pref('PING_BY_DEFAULT') == 'yes' ? '1' : '0')}');" %><label for="post_is_active" class="left">&nbsp;<span class="small gray">If the box is checked, the post appears on your site</span></label></td></tr>
 
 <% if @authors.length < 2 %>
-<%= hidden_field 'post', 'author_id', :value => @authors[0].id.to_s %>
+<%= hidden_field 'post', 'author_id', :value => @post.author.id.to_s %>
 <% else %>
 <tr id="dt2" style="display: none;"><td><label for="post_author_id"><b>Author</b></label></td><td class="fields">
-<%= select_tag 'post[author_id]', create_author_select_options(@authors, (@post.author_id == 0 ? get_author_id(request.cookies[SL_CONFIG[:USER_EMAIL_COOKIE]]) : @post.author_id), false) %></td></tr>
+<%= select_tag 'post[author_id]', create_author_select_options(@authors, ((@post.author && @post.author.id) ? get_author_id(request.cookies[SL_CONFIG[:USER_EMAIL_COOKIE]]) : @post.author.id), false) %></td></tr>
 <% end %>
 
 <tr id="dt3" style="display: none;"><td><label for="post_created_at"><b>Created at</b></label></td><td>

--- a/app/views/layouts/main.html.erb
+++ b/app/views/layouts/main.html.erb
@@ -45,7 +45,7 @@
       </form>
     </div>    
     
-    <div id="footer"><%= config[:title] %> &#169; <%= config[:author, :name] %>. Valid <a href="http://validator.w3.org/check?uri=referer">XHTML</a> and <%= link_to "ATOM", "http://feedvalidator.org/check.cgi?url=#{config[:url]}/posts.atom" %>. Powered by <a href="http://www.enkiblog.com" title="A ruby on rails blogging app for the fashionable developer">Enki</a>.</div>
+    <div id="footer"><%= config[:title] %> &#169; <%= author.name %>. Valid <a href="http://validator.w3.org/check?uri=referer">XHTML</a> and <%= link_to "ATOM", "http://feedvalidator.org/check.cgi?url=#{config[:url]}/posts.atom" %>. Powered by <a href="http://www.enkiblog.com" title="A ruby on rails blogging app for the fashionable developer">Enki</a>.</div>
   </div>
 </body>
 </html>

--- a/config/enki.yml
+++ b/config/enki.yml
@@ -1,9 +1,6 @@
 title: My Enki Blog
 url:   http://enkiblog.com
-author: 
-  name:    Don Alias
-  email:   don@enkiblog.com
-  open_id: http://enkiblog.com
+exception_notifications: don@enkiblog.com
 
 # Delete the following section if your site will not be acting as an OpenID delegate
 open_id_delegation:

--- a/config/initializers/exception_notifier.rb
+++ b/config/initializers/exception_notifier.rb
@@ -1 +1 @@
-ExceptionNotifier.exception_recipients = [Enki::Config.new("config/enki.yml")[:author, :email]]
+ExceptionNotifier.exception_recipients = [Enki::Config.new("config/enki.yml")[:exception_notifications]]

--- /dev/null
+++ b/db/migrate/008_create_author_based_on_enki_yml.rb
@@ -0,0 +1,55 @@
+require 'uri'
+require 'yaml'
+
+class CreateAuthorBasedOnEnkiYml < ActiveRecord::Migration
+
+  # Kept here for old time's sake
+  class Author < ActiveRecord::Base
+    validates_presence_of :name, :email
+    validate :open_id_valid
+
+    class << self
+      # Finds the author with open_id matching the given open_id address
+      def with_open_id(open_id)
+        uri = URI.parse(open_id)
+        find(:all).detect {|a| a.open_id == uri}
+      end
+    end
+
+    def open_id
+      @open_id || URI.parse(read_attribute(:open_id))
+    end
+    def open_id=(uri)
+      @open_id = begin
+        URI.parse(uri)
+      rescue URI::InvalidURIError
+        nil
+      end
+      write_attribute(:open_id, uri.to_s)
+    end
+
+    private
+      def open_id_valid
+        unless self.open_id && (self.open_id.is_a?(URI::HTTP) || self.open_id.is_a?(URI::HTTPS))
+          errors.add(:open_id, "not a valid OpenID URL")
+        end
+      end
+  end
+  
+  def self.up
+    enki_config = YAML.load(File.read(File.join(RAILS_ROOT, "config", "enki.yml")))
+    if author = enki_config["author"]
+      author = Author.new :name    => enki_yml_author["name"],
+                          :email   => enki_yml_author["email"],
+                          :open_id => enki_yml_author["open_id"]
+      author.save!
+      STDERR.puts "You can now remove the author fields from config/enki.yml"
+      STDERR.puts "Dont forget to add an exception_notifications: entry with your email address to config/enki.yml"
+    end
+  rescue ActiveRecord::RecordInvalid
+    raise "Migration from the legacy author fields in your config/enki.yml failed:\n#{author.errors.full_messages.join("\n\t")}"
+  end
+
+  def self.down
+  end
+end

--- a/db/schema.rb
+++ b/db/schema.rb
@@ -9,7 +9,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 7) do
+ActiveRecord::Schema.define(:version => 8) do
 
   create_table "authors", :force => true do |t|
     t.string "name"

--- a/spec/controllers/admin/sessions_controller_spec.rb
+++ b/spec/controllers/admin/sessions_controller_spec.rb
@@ -35,7 +35,7 @@ describe Admin::SessionsController do
     end
 
     it 'logs out the current session' do
-      session[:logged_in].should == false
+      session[:author_id].should == nil
     end
 
     it 'redirects to /' do

--- a/spec/models/authors_spec.rb
+++ b/spec/models/authors_spec.rb
@@ -22,6 +22,42 @@ describe Author, 'validations' do
   end
 
   it 'is invalid with no open_id' do
+    Author.new(valid_author_attributes.merge(:open_id => nil)).should_not be_valid
+  end
+  it 'is invalid with a blank open_id' do
     Author.new(valid_author_attributes.merge(:open_id => '')).should_not be_valid
   end
+  it 'is invalid without a HTTP or HTTPS open_id' do
+    Author.new(valid_author_attributes.merge(:open_id => 'something.com')).should_not be_valid
+    Author.new(valid_author_attributes.merge(:open_id => 'ftp://something.com')).should_not be_valid
+  end
 end
+
+describe 'Author', 'open_id' do
+  setup do
+    @author = Author.new
+  end
+  it 'can be set with a URI string representation' do
+    @author.open_id = "http://enkiblog.com"
+    @author.open_id.should eql(URI.parse("http://enkiblog.com"))
+  end
+  it 'can be set with a URI' do
+    @author.open_id = URI.parse("http://enkiblog.com")
+    @author.open_id.should eql(URI.parse("http://enkiblog.com"))
+  end
+end
+
+describe 'Author', 'with_open_id' do
+  setup do
+    @author = Author.create! :name => "Don Alias",
+                             :email  => "don@enkiblog.com",
+                             :open_id  => "http://enkiblog.com"
+    
+  end
+  it "should return the author with matching open_id" do
+    Author.with_open_id("http://enkiblog.com").should eql(@author)
+  end
+  it "should return nil if there's no author with matching open_id" do
+    Author.with_open_id("http://somesite.com").should be_nil
+  end
+end
\ No newline at end of file