app/models/authorship.rb db/migrate/20081018183748_create_authorships.rb test/fixtures/authorships.yml test/unit/authorship_test.rb @@ -7,7 +7,7 @@ class BooksController < ApplicationController caches_page :index, :show, :if => Proc.new { |c| !c.request.format.html? } cache_sweeper :book_sweeper, :only => [:create, :update, :destroy] - @@private_book_attrs = [:id, :author_id] + @@private_book_attrs = [:id] def index @books = Book.list_books(params[:page], 20, :order => "created_at DESC") app/controllers/books_controller.rb @@ -93,6 +93,12 @@ module ApplicationHelper def author_page_link(author) link_to sanitize(smartypants(author.name)), author_path(author) end + + def author_pages_link(authors) + authors.map { |author| + link_to sanitize(smartypants(author.name)), author_path(author) + }.join(", ") + end def page_turner(target, options = {}) options.merge! :container => true, :page_links => false, app/helpers/application_helper.rb @@ -2,7 +2,8 @@ require 'urlify' class Author < ActiveRecord::Base attr_accessible :name, :note - has_many :books + has_many :authorships + has_many :books, :through => :authorships before_validation :generate_permalink validates_presence_of :name, :permalink validates_uniqueness_of :name, :permalink @@ -11,6 +12,7 @@ class Author < ActiveRecord::Base # Lists all authors in the database. def self.list_authors(page, per_page, options = {}) + options.merge!({:include => {:authorships => :book}}) with_scope :find => options do paginate :per_page => per_page, :page => page end @@ -29,4 +31,4 @@ class Author < ActiveRecord::Base self.permalink = name.urlify end end -end \ No newline at end of file +end app/models/author.rb @@ -1,11 +1,12 @@ require 'urlify' class Book < ActiveRecord::Base - attr_accessible :title, :comment, :cover_url, :isbn, :author_name - belongs_to :author + attr_accessible :title, :comment, :cover_url, :isbn, :author_names + has_many :authorships + has_many :authors, :through => :authorships before_validation :generate_permalink, :clean_isbn - validates_presence_of :title, :author, :permalink + validates_presence_of :title, :permalink, :authors validates_uniqueness_of :title, :permalink validates_format_of :cover_url, :with => %r{\.(gif|jpg|png)$}i, @@ -18,19 +19,24 @@ class Book < ActiveRecord::Base :message => "must be a valid ISBN with 10 or 13 digits." def self.list_books(page, per_page, options = {}) + options.merge!({:include => {:authorships => :author}}) with_scope :find => options do paginate :per_page => per_page, :page => page end end - def author_name - author.name if author + def author_names + authors.map {|a| a.name}.join(", ") if authors end - def author_name=(name) - self.author = Author.find_or_create_by_name(name) unless name.blank? + def author_names=(names) + self.authors = names.split(/\s*,\s*/).map do |name| + unless name.blank? + Author.find_or_initialize_by_name(name) + end + end end - + def clean_isbn self.isbn = self.isbn.gsub(/\D/, "") end app/models/book.rb @@ -23,6 +23,8 @@ class BookSweeper < ActionController::Caching::Sweeper expire_page "/books/#{book.permalink}.xml" expire_page "/authors.xml" - expire_page "/authors/#{book.author.permalink}.xml" + book.authors.each do |author| + expire_page "/authors/#{author.permalink}.xml" + end end end app/sweepers/book_sweeper.rb @@ -1,7 +1,7 @@ <% editable_content_wrapper :type => "book" do %> <h2 class="title"><%= book_page_link(book) %></h2> - <p class="about clear"><%= edit_link(book) %> By <%= author_page_link(book.author) %>, finished <%= h(nice_date(book.created_at)) %></p> + <p class="about clear"><%= edit_link(book) %> By <%= author_pages_link(book.authors) %>, finished <%= h(nice_date(book.created_at)) %></p> <%= content_tag :div, sanitize(smartypants(markdown(book.comment))), :class => "comment" unless book.comment.blank? %> <% end %> app/views/books/_book.html.erb @@ -7,8 +7,8 @@ </div> <div class="section block wide"> - <%= f.label :author_name, "Author name" %> - <%= f.text_field :author_name, :class => "text" %> + <%= f.label :author_names, "Author names" %> + <%= f.text_field :author_names, :class => "text" %> </div> <div class="section block wide"> app/views/books/_form.html.erb 4ca6156f66115e53a25318ab3e417812da9e5c91 Benedict Eastaugh benedict@eastaugh.net http://github.com/ionfish/papertrail/commit/f56ee5afb1e2d6bdd1e48114ca16611137bc350e f56ee5afb1e2d6bdd1e48114ca16611137bc350e 2008-11-03T16:33:55-08:00 2008-10-19T11:05:40-07:00 Add support for multiple authors 31d310f831ab3f3e9653ca8b292d826ddf778e82 Benedict Eastaugh benedict@eastaugh.net