Changeset 191

Show
Ignore:
Timestamp:
12/30/05 03:46:37 (3 years ago)
Author:
lazyatom
Message:

Removed other entry-version stuff

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • wiki_engine/branches/JGA-entry_version_back_to_version/app/controllers/versions_controller.rb

    r98 r191  
    66  def show 
    77    @page    = @book.pages.find_by_title(params[:page_title]) 
    8     @version = @page.entry_versions[params[:version_number].to_i - 1] 
     8    @version = @page.versions[params[:version_number].to_i - 1] 
    99  end 
    1010 

  • wiki_engine/branches/JGA-entry_version_back_to_version/app/models/author.rb

    r98 r191  
    11class Author < ActiveRecord::Base 
    22  belongs_to :book 
    3   has_many :entry_versions 
     3  has_many :versions 
    44   
    55  def to_param 

  • wiki_engine/branches/JGA-entry_version_back_to_version/app/models/book.rb

    r98 r191  
    22  has_many :authors, :dependent => true 
    33  has_many :pages, :dependent => true 
    4   has_many :entry_versions, :order => "entry_versions.created_at DESC" 
     4  has_many :versions, :order => "versions.created_at DESC" 
    55   
    66  after_create :create_home_page 
    …… 
    3030    def create_home_page 
    3131      page    = pages.create(:title => "Home Page") 
    32       version = page.entry_versions.build(:body => "Welcome to i2!") 
     32      version = page.versions.build(:body => "Welcome to i2!") 
    3333      author  = version.create_author(:name => "i2", :ip => "127.0.0.1", :book => self) 
    3434      version.save! 

  • wiki_engine/branches/JGA-entry_version_back_to_version/app/models/page.rb

    r189 r191  
    22  belongs_to :book 
    33 
    4   has_many :entry_versions, :order => "created_at", :dependent => true 
     4  has_many :versions, :order => "created_at", :dependent => true 
    55  has_one  :current_version, :class_name => "Version", :order => "created_at DESC" 
    66   
    …… 
    1010   
    1111  def find_or_build_version(number = nil) 
    12     number ? entry_versions[number.to_i - 1] : entry_versions.build(:body => body) 
     12    number ? versions[number.to_i - 1] : versions.build(:body => body) 
    1313  end 
    1414   
    …… 
    3636      version.body = options[:body] 
    3737    else 
    38       version = self.entry_versions.build(options) 
     38      version = self.versions.build(options) 
    3939      version.author = author 
    4040    end 

  • wiki_engine/branches/JGA-entry_version_back_to_version/app/models/version.rb

    r189 r191  
    3434 
    3535  def versions 
    36     page.entry_versions 
     36    page.versions 
    3737  end 
    3838 

  • wiki_engine/branches/JGA-entry_version_back_to_version/app/views/books/feed.rxml

    r98 r191  
    88    xml.ttl "40" 
    99 
    10     @book.entry_versions.find(:all, :limit => 25, :include => :page).each do |version| 
     10    @book.versions.find(:all, :limit => 25, :include => :page).each do |version| 
    1111      xml.item do 
    1212        xml.title(version.page.title) 

  • wiki_engine/branches/JGA-entry_version_back_to_version/app/views/pages/show.rhtml

    r98 r191  
    44 
    55<div class="byline"> 
    6   <%= @page.entry_versions.size == 1 ? "Created" : "Updated" %> 
     6  <%= @page.versions.size == 1 ? "Created" : "Updated" %> 
    77  on <%= @page.current_version.created_at.to_s(:long) %>  
    88  by <%= link_to_author(@page.current_version.author) %> 
    …… 
    1212  <%= link_to("Edit", :controller => "versions", :action => "new") %> 
    1313 
    14   <% if @page.entry_versions.length > 1 %> 
     14  <% if @page.versions.length > 1 %> 
    1515    |  
    1616    <%= link_to("Back in time",  
    17           version_url(:page_title => @page.title, :version_number => @page.entry_versions.size - 1), 
     17          version_url(:page_title => @page.title, :version_number => @page.versions.size - 1), 
    1818          :class => 'navlink') %> 
    19     <small>(<%= @page.entry_versions.size - 1 %> older versions)</small> 
     19    <small>(<%= @page.versions.size - 1 %> older versions)</small> 
    2020  <% end %> 
    2121</div> 

  • wiki_engine/branches/JGA-entry_version_back_to_version/db/migrate/5_page_updated_at.rb

    r98 r191  
    22  def self.up 
    33    add_column :pages, :updated_at, :datetime 
    4     Page.find(:all).each { |page| page.updated_at = page.entry_versions.first.updated_at } 
     4    Page.find(:all).each { |page| page.updated_at = page.versions.first.updated_at } 
    55  end 
    66 

  • wiki_engine/branches/JGA-entry_version_back_to_version/lib/tasks/instiki_importer.rake

    r98 r191  
    1818    Book.transaction do 
    1919      page    = book.find_or_create_page(:title => title) 
    20       version = page.entry_versions.build(:body => convert_wiki_words(content)) 
     20      version = page.versions.build(:body => convert_wiki_words(content)) 
    2121      version.author = import_author 
    2222      version.save 

  • wiki_engine/branches/JGA-entry_version_back_to_version/test/functional/versions_controller_test.rb

    r98 r191  
    2525    assert_response :redirect 
    2626    assert_not_nil page = books(:stories).pages.detect { |page| page.title == "A brave new world" } 
    27     assert_equal "So wonderful!", page.entry_versions.first.body 
    28     assert_equal authors(:david), page.entry_versions.first.author 
     27    assert_equal "So wonderful!", page.versions.first.body 
     28    assert_equal authors(:david), page.versions.first.author 
    2929  end 
    3030   

  • wiki_engine/branches/JGA-entry_version_back_to_version/test/unit/book_test.rb

    r98 r191  
    88    assert_equal 1, book.pages.size 
    99    assert book.reload.existing_page_titles.include?("Home Page") 
    10     assert_equal "Welcome to i2!", book.pages.first.entry_versions.first.body 
    11     assert_equal "i2", book.pages.first.entry_versions.first.author.name 
     10    assert_equal "Welcome to i2!", book.pages.first.versions.first.body 
     11    assert_equal "i2", book.pages.first.versions.first.author.name 
    1212  end 
    1313end 

  • wiki_engine/branches/JGA-entry_version_back_to_version/test/unit/version_test.rb

    r98 r191  
    99   
    1010  def test_belonging_to_book 
    11     version = pages(:pretty_cats).entry_versions.create(:body => "Lovely voices!") 
     11    version = pages(:pretty_cats).versions.create(:body => "Lovely voices!") 
    1212    assert_equal books(:stories), version.book 
    1313  end 
    …… 
    1515  def test_updating_of_page 
    1616    updated_at_before = pages(:pretty_cats).updated_at 
    17     pages(:pretty_cats).entry_versions.create(:body => "Lovely voices!") 
     17    pages(:pretty_cats).versions.create(:body => "Lovely voices!") 
    1818    assert updated_at_before < pages(:pretty_cats, :refresh).updated_at 
    1919  end