junebug-wiki 0.0.21 → 0.0.22

data/History.txt

@@ -1,3 +1,11 @@
+= 0.0.22 2006-11-28
+
+* *EXISTING USERS PLEASE READ THE RELEASE NOTES*
+* Data dump improvements
+* Removed yahoo grids (weren't using them), page structure simplification
+* Changed page naming convention (underscores in url, spaces in title and db) 
+* Changed header format to help avoid title duplication in text
+
 = 0.0.21 2006-11-26
 
 * *EXISTING USERS PLEASE READ THE RELEASE NOTES*

data/Manifest.txt

@@ -10,7 +10,6 @@ deploy/console
 deploy/public/images/feed-icon-14x14.png
 deploy/public/style/base.css
 deploy/public/style/yui/fonts.css
-deploy/public/style/yui/grids.css
 deploy/public/style/yui/reset.css
 deploy/wiki
 dump/junebug_pages.yml

data/RELEASE_NOTES.txt

@@ -1,3 +1,15 @@
+= 0.0.22 2006-11-28
+
+The wikiword syntax has changed slightly.  Starting in this version, wikiwords can not contain underscores. Furthermore, in page urls, spaces will now be replaced by underscores.  Example:
+
+Invalid wikiword link syntax: [[Test_page]]
+
+Valid wikiword link syntax:  [[Test page]]
+Corresponding page url: http://www.wiki.com/Test_page
+
+Also, you will notice that the page title is now presented in the page body rather than the header.  I was finding that the previous location in the header usually led me to rewrite the title in the body for clarity.
+
+
 = 0.0.21 2006-11-26
 
 The database configuration in config.yml has been changed to allow easy support for databases other than sqlite3. Existing junebug installations will need to make the following changes:

data/deploy/config.yml

@@ -1,5 +1,5 @@
 # this what you want to be the default wiki page
-startpage: JunebugWiki
+startpage: Welcome_to_Junebug
 
 # server configuration
 host: 0.0.0.0

data/deploy/public/style/base.css

@@ -48,10 +48,16 @@ ins {
 /* PAGE STRUCTURE */
 body {
     background:#d7d7d7;
+    text-align: center;
+    min-width: 800px;
 }
 
 #doc {
     font-family: 'Lucida Grande', 'Trebuchet MS', Arial, Helvetica, sans-serif;
+    width: 800px;
+    margin-left: auto;
+    margin-right: auto;
+    text-align: left;
 }
 
 #hd {
@@ -59,13 +65,18 @@ body {
     background-color: #6677aa;
     padding: 8px 25px;
     color: #ffffff;
+    margin-bottom: 10px;
+}
+
+#hd #userlinks {
+    float: right;
 }
 
 #hd a {
     color: #ffffff;
 }
 
-#hd h1 a {
+/*#hd h1 a {
     color: #ffffff;
 }
 #hd h1 a:link, #hd h1 a:visited {
@@ -77,7 +88,7 @@ body {
     font-size: 167%;
     padding-bottom: 5px;
     font-weight: normal;
-}
+}*/
 
 #bd {
     background-color: #ffffff;
@@ -85,12 +96,6 @@ body {
 	border-width:0 5px 5px 0;
 }
 
-#yui-main{
-}
-
-.yui-b{
-}
-
 #ft {
     border: 1px solid #eee;
     background-color: #ddd;
@@ -169,6 +174,7 @@ body {
 .content h1 {
     font-size:  182%;
     margin-bottom: 10px;
+    border-bottom: 2px dotted #bbb;
 }
 
 .content h2 {

data/dump/junebug_pages.yml

@@ -1,10 +1,8 @@
 --- 
 - updated_at: 2006-11-23 09:39:25 -08:00
-  title: JunebugWiki
+  title: Welcome to Junebug
   readonly: true
   body: |
-    h1. Welcome to Junebug!
-    
     To complete setup of you new wiki, here are a few things you should do:
     
     
@@ -35,11 +33,9 @@
   user_id: 1
   created_at: 2006-10-29 16:19:34 -08:00
 - updated_at: 2006-11-23 12:08:56 -08:00
-  title: JunebugHelp
+  title: Junebug help
   readonly: 
   body: |
-    h1. Junebug Help
-    
     h2. Wiki Words
     
     Junebug will create a wiki link for any text enclosed in double brackets:
@@ -80,11 +76,9 @@
   user_id: 1
   created_at: 2006-11-01 00:10:07 -08:00
 - updated_at: 2006-11-23 09:42:05 -08:00
-  title: TextileTest
+  title: Textile syntax test
   readonly: 
   body: |-
-    h1. Textile Syntax Test
-    
     See "this page":http://hobix.com/textile/ for the full range of formatting options
     
     h2. Headers

data/lib/junebug/controllers.rb

@@ -9,72 +9,75 @@ module Junebug::Controllers
     end
   end
 
-  class Show < R '/([\w ]+)', '/([\w ]+)/(\d+)'
+  class Show < R '/([0-9A-Za-z_]+)', '/([0-9A-Za-z_]+)/(\d+)'
     def get page_name, version = nil
-      @page_title = page_name
       #redirect(Edit, page_name, 1) and return unless @page = Page.find_by_title(page_name)
-      redirect("#{Junebug.config['url']}/#{page_name.gsub(/ /,'+')}/1/edit") and return unless @page = Page.find_by_title(page_name)
+      redirect("#{Junebug.config['url']}/#{page_name.gsub(/ /,'+')}/1/edit") and return unless @page = Page.find_by_title(page_name.gsub(/_/,' '))
+      @page_title = @page.title
       @version = (version.nil? or version == @page.version.to_s) ? @page : @page.versions.find_by_version(version)
       render :show
     end
   end
 
-  class Edit < R '/([\w ]+)/edit', '/([\w ]+)/(\d+)/edit' 
+  class Edit < R '/([0-9A-Za-z_]+)/edit', '/([0-9A-Za-z_]+)/(\d+)/edit' 
     def get page_name, version = nil
       redirect("#{Junebug.config['url']}/login") and return unless logged_in?
-      @page_title = "Edit #{page_name}"
-      @page = Page.find(:first, :conditions=>['title = ?', page_name])
-      @page = Page.create(:title => page_name, :user_id=>@state.user.id) unless @page
+      page_name_spc = page_name.gsub(/_/,' ')
+      @page = Page.find(:first, :conditions=>['title = ?', page_name_spc])
+      @page = Page.create(:title => page_name_spc, :user_id=>@state.user.id) unless @page
       @page = @page.versions.find_by_version(version) unless version.nil? or version == @page.version.to_s
+      @page_title = "Editing: #{page_name_spc}"
       render :edit
     end
     
     # FIXME: no error checking, also no verify quicksave/readonly rights
     def post page_name
       redirect("#{Junebug.config['url']}/login") and return unless logged_in?
+      page_name_spc = page_name.gsub(/_/,' ')
       if input.submit == 'save'
         if ! input.quicksave
           attrs = { :body => input.post_body, :title => input.post_title, :user_id =>@state.user.id }
           attrs[:readonly] = input.post_readonly if is_admin?
-          Page.find_or_create_by_title(page_name).update_attributes(attrs)
+          Page.find_or_create_by_title(page_name_spc).update_attributes(attrs)
         else
           attrs = { :body => input.post_body }
           attrs[:readonly] = input.post_readonly if is_admin?
-          page = Page.find_by_title(page_name)
+          page = Page.find_by_title(page_name_spc)
           current_version = page.find_version(page.version)
           current_version.update_attributes(attrs)
           page.without_revision { page.update_attributes(attrs) }
         end
         # redirect Show, input.post_title
-        redirect "#{Junebug.config['url']}/#{input.post_title.gsub(/ /,'+')}"
+        redirect "#{Junebug.config['url']}/#{input.post_title.gsub(/ /,'_')}"
       else # cancel
-        redirect "#{Junebug.config['url']}/#{page_name.gsub(/ /,'+')}"
+        redirect "#{Junebug.config['url']}/#{page_name}"
       end
     end
   end
   
-  class Delete < R '/([\w ]+)/delete'
+  class Delete < R '/([0-9A-Za-z_]+)/delete'
     def get page_name
       redirect("#{Junebug.config['url']}/login") and return unless logged_in?
-      Page.find_by_title(page_name).destroy() if is_admin?
+      Page.find_by_title(page_name.gsub(/_/,' ')).destroy() if is_admin?
       redirect Junebug.startpage
     end
     
   end
 
-  class Revert < R '/([\w ]+)/(\d+)/revert'
+  class Revert < R '/([0-9A-Za-z_]+)/(\d+)/revert'
     def get page_name, version
       redirect("#{Junebug.config['url']}/login") and return unless logged_in?
-      Page.find_by_title(page_name).revert_to!(version) if is_admin?
-      redirect "#{Junebug.config['url']}/#{page_name.gsub(/ /,'+')}"
+      Page.find_by_title(page_name.gsub(/_/,' ')).revert_to!(version) if is_admin?
+      redirect "#{Junebug.config['url']}/#{page_name}"
     end
   end
 
-  class Versions < R '/([\w ]+)/versions'
+  class Versions < R '/([0-9A-Za-z_]+)/versions'
     def get page_name
-      @page_title = "Version History: #{page_name}"
-      @page = Page.find_by_title(page_name)
+      page_name_spc = page_name.gsub(/_/,' ')
+      @page = Page.find_by_title(page_name_spc)
       @versions = @page.find_versions(:order => 'version DESC', :include => [:user])
+      @page_title = "Version History: #{page_name_spc}"
       render :versions
     end
   end
@@ -87,11 +90,12 @@ module Junebug::Controllers
     end
   end
 
-  class Backlinks < R '/([\w ]+)/backlinks'
+  class Backlinks < R '/([0-9A-Za-z_]+)/backlinks'
     def get page_name
-      @page = Page.find_by_title(page_name)
-      @page_title = "Backlinks for: #{page_name}"
-      @pages = Page.find(:all, :conditions => ["body LIKE ?", "%#{page_name}%"])
+      page_name_spc = page_name.gsub(/_/,' ')
+      @page = Page.find_by_title(page_name_spc)
+      @page_title = "Backlinks for: #{page_name_spc}"
+      @pages = Page.find(:all, :conditions => ["body LIKE ?", "%#{page_name_spc}%"])
       render :backlinks
     end
   end
@@ -104,11 +108,12 @@ module Junebug::Controllers
     end
   end
   
-  class Diff < R '/([\w ]+)/(\d+)/(\d+)/diff'
+  class Diff < R '/([0-9A-Za-z_]+)/(\d+)/(\d+)/diff'
     include HTMLDiff
     def get page_name, v1, v2
-      @page_title = "Diff: #{page_name}"
-      @page = Page.find_by_title(page_name)    
+      page_name_spc = page_name.gsub(/_/,' ')
+      @page_title = "Diff: #{page_name_spc}"
+      @page = Page.find_by_title(page_name_spc)    
       @v1 = @page.find_version(v1)
       @v2 = @page.find_version(v2)
       

data/lib/junebug/helpers.rb

@@ -27,7 +27,7 @@ module Junebug::Helpers
 
   def diff_link(page, version=nil)
     version = page if version.nil?
-    a 'diff', :href => R(Junebug::Controllers::Diff,page.title,version.version-1,version.version)
+    a 'diff', :href => R(Junebug::Controllers::Diff,page.title_url,version.version-1,version.version)
   end
 
   def auto_link_urls(text)

data/lib/junebug/models.rb

@@ -27,11 +27,11 @@ module Junebug::Models
   class Page < Base
     belongs_to :user
     #PAGE_LINK = /\[\[([^\]|]*)[|]?([^\]]*)\]\]/
-    PAGE_LINK = /\[\[([\w ]+)[|]?([^\]]*)\]\]/
+    PAGE_LINK = /\[\[([0-9A-Za-z ]+)[|]?([^\]]*)\]\]/
     #before_save { |r| r.title = r.title.underscore }
     #PAGE_LINK = /([A-Z][a-z]+[A-Z]\w+)/
     validates_uniqueness_of :title
-    validates_format_of :title, :with => /^[\w ]+$/
+    validates_format_of :title, :with => /^[0-9A-Za-z ]+$/
     validates_presence_of :title
     acts_as_versioned
     non_versioned_fields.push 'title'
@@ -39,6 +39,10 @@ module Junebug::Models
     def title=(text)
       write_attribute(:title, text ? text.strip.squeeze(' ') : text)
     end
+    
+    def title_url
+      title.gsub(' ','_')
+    end
   end
   
   class Page::Version < Base

data/lib/junebug/tasks/dump.rake

@@ -4,31 +4,53 @@ require 'active_record'
 
 namespace :dump do
 
+  desc 'Dump page and user data'
+  task :all => [:pages, :users]
+
   desc 'Dump wiki pages'
   task :pages do
+    Junebug.connect
+    
     fixtures_dir = File.join('.', 'dump')
-  
-    # clean out fixtures dir
-    puts "fixtures_dir: #{fixtures_dir}"
-    Dir[File.join(fixtures_dir, '*')].each { |f| rm_f(f, :verbose => false) }
-  
-    # open db connection
-    ActiveRecord::Base.establish_connection( :adapter => "sqlite3", :database  => "./junebug.db")
-  
+    
     # open fixtures file
     File.open(File.join(fixtures_dir, "junebug_pages.yml"), 'w') do |file|
     
       # grab all pages
-      pages = Junebug::Models::Page.find(:all)
-      page_data = []
-      pages.each do |page|
-        page_data << page.attributes
+      objs = Junebug::Models::Page.find(:all)
+      data = []
+      objs.each do |obj|
+        data << obj.attributes
       end
     
-      file.write page_data.to_yaml
+      file.write data.to_yaml
     end
   
     puts "Got pages and put them in #{fixtures_dir}."
   end
 
+  desc 'Dump user data'
+  task :users do
+    Junebug.connect
+    
+    fixtures_dir = File.join('.', 'dump')
+    
+    # open fixtures file
+    File.open(File.join(fixtures_dir, "junebug_users.yml"), 'w') do |file|
+    
+      # grab all users
+      objs = Junebug::Models::User.find(:all)
+      data = []
+      objs.each do |obj|
+        data << obj.attributes
+      end
+    
+      file.write data.to_yaml
+    end
+  
+    puts "Got users and put them in #{fixtures_dir}."
+  end
+
+
+
 end

data/lib/junebug/version.rb

@@ -2,7 +2,7 @@ module Junebug #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 0
-    TINY  = 21
+    TINY  = 22
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/junebug/views.rb

@@ -1,33 +1,34 @@
 require 'redcloth'
 
 module Junebug::Views
+  
   def layout
     html {
       head {
         title @page_title ? @page_title : @page.title
         link :href=>'/style/yui/reset.css', :type=>'text/css', :rel=>'stylesheet'
         link :href=>'/style/yui/fonts.css', :type=>'text/css', :rel=>'stylesheet'
-        link :href=>'/style/yui/grids.css', :type=>'text/css', :rel=>'stylesheet'
         link :href=>'/style/base.css',      :type=>'text/css', :rel=>'stylesheet'
         link :href=>Junebug.config['feed'], :rel => "alternate", :title => "Recently Updated Pages", :type => "application/atom+xml"
-        
       }
       body {
-        div :id=>'doc', :class=>'yui-t7' do
+        div :id=>'doc' do
           self << yield
         end
       }
     }
   end
 
+
   def show
-    _header (@version.version == @page.version ? :backlinks : :show), @page.title
-    _body {
-      _button 'edit', R(Edit, @page.title, @version.version), {:style=>'float: right; margin: 0 0 5px 5px;'} if logged_in? && (@version.version == @page.version && (! @page.readonly || is_admin?))
+    _header (@version.version == @page.version ? :backlinks : :show)
+    _body do
+      _button 'edit', R(Edit, @page.title_url, @version.version), {:style=>'float: right; margin: 0 0 5px 5px;'} if logged_in? && (@version.version == @page.version && (! @page.readonly || is_admin?))
+      h1 @page.title
       _markup @version.body
-      _button 'edit', R(Edit, @page.title, @version.version), {:style=>'float: right; margin: 5px 0 0 5px;'} if logged_in? && (@version.version == @page.version && (! @page.readonly || is_admin?)) && (@version.body && @version.body.size > 200)
+      _button 'edit', R(Edit, @page.title_url, @version.version), {:style=>'float: right; margin: 5px 0 0 5px;'} if logged_in? && (@version.version == @page.version && (! @page.readonly || is_admin?)) && (@version.body && @version.body.size > 200)
       br :clear=>'all'
-    }
+    end
     _footer {
       text "Last edited by <b>#{@version.user.username}</b> on #{@page.updated_at.strftime('%B %d, %Y %I:%M %p')}"
       text " (#{diff_link(@page, @version)}) " if @version.version > 1
@@ -37,31 +38,33 @@ module Junebug::Views
         text "Version #{@version.version} "
         text "(current) " if @version.version == @page.version
         #text 'Other versions: '
-        a '«older', :href => R(Show, @page.title, @version.version-1) unless @version.version == 1
-        a 'newer»', :href => R(Show, @page.title, @version.version+1) unless @version.version == @page.version
-        a 'current', :href => R(Show, @page.title) unless @version.version == @page.version
-        a 'versions', :href => R(Versions, @page.title)
+        a '«older', :href => R(Show, @page.title_url, @version.version-1) unless @version.version == 1
+        a 'newer»', :href => R(Show, @page.title_url, @version.version+1) unless @version.version == @page.version
+        a 'current', :href => R(Show, @page.title_url) unless @version.version == @page.version
+        a 'versions', :href => R(Versions, @page.title_url)
       }
     }
     if is_admin?
       div.admin {
-        _button 'delete', R(Delete, @page.title), {:onclick=>"return confirm('Sure you want to delete?')"} if @version.version == @page.version
-        _button 'revert to', R(Revert, @page.title, @version.version), {:onclick=>"return confirm('Sure you want to revert?')"} if @version.version != @page.version
+        _button 'delete', R(Delete, @page.title_url), {:onclick=>"return confirm('Sure you want to delete?')"} if @version.version == @page.version
+        _button 'revert to', R(Revert, @page.title_url, @version.version), {:onclick=>"return confirm('Sure you want to revert?')"} if @version.version != @page.version
       }
     end
   end
 
+
   def edit
-    _header :show, @page.title
-    _body {
+    _header :show
+    _body do
+      h1 @page_title
       div.formbox {
-        form :method => 'post', :action => R(Edit, @page.title) do
+        form :method => 'post', :action => R(Edit, @page.title_url) do
           p { 
             label 'Page Title'
             br
             input :value => @page.title, :name => 'post_title', :size => 30, 
                   :type => 'text'
-            small " word characters [0-9A-Za-z_] and spaces only"
+            small " word characters [0-9A-Za-z] and spaces only"
           }
           p {
             label 'Page Content'
@@ -85,18 +88,19 @@ module Junebug::Views
         a 'syntax help', :href => 'http://hobix.com/textile/', :target=>'_blank'
         br :clear=>'all'
       }
-    }
+    end
     _footer { '' }
   end
 
+
   def versions
-    _header :show, @page.title
-    _body {
+    _header :show
+    _body do
       h1 @page_title
       ul {
         @versions.each_with_index do |page,i|
           li {
-            a "version #{page.version}", :href => R(Show, @page.title, page.version)
+            a "version #{page.version}", :href => R(Show, @page.title_url, page.version)
             text " (#{diff_link(@page, page)}) " if page.version > 1
             text' - created '
             text last_updated(page)
@@ -106,36 +110,38 @@ module Junebug::Views
           }
         end
       }
-    }
+    end
     _footer { '' }
   end
 
+
   def backlinks
-    _header :show, @page.title
-    _body {
+    _header :show
+    _body do
       h1 "Backlinks to #{@page.title}"
       ul {
         @pages.each { |p| li{ a p.title, :href => R(Show, p.title) } }
       }
-    }
+    end
     _footer { '' }
   end
 
+
   def list
-    _header :static, @page_title
-    _body {
-      h1 "All Wiki Pages"
+    _header :static
+    _body do
+      h1 "All wiki pages"
       ul {
-        @pages.each { |p| li{ a p.title, :href => R(Show, p.title) } }
+        @pages.each { |p| li{ a p.title, :href => R(Show, p.title_url) } }
       }
-    }
+    end
     _footer { '' }
   end
 
 
   def recent
-    _header :static, @page_title
-    _body {
+    _header :static
+    _body do
       h1 "Updates in the last 30 days"
       page = @pages.shift 
       while page
@@ -144,9 +150,9 @@ module Junebug::Views
         ul {
           loop do
             li {
-              a page.title, :href => R(Show, page.title)
+              a page.title, :href => R(Show, page.title_url)
               text ' ('
-              a 'versions', :href => R(Versions, page.title)
+              a 'versions', :href => R(Versions, page.title_url)
               text ",#{diff_link(page)}" if page.version > 1
               text ') '
               span page.updated_at.strftime('%I:%M %p')
@@ -156,25 +162,25 @@ module Junebug::Views
           end
         }
       end
-    }
+    end
     _footer { '' }
   end
   
   def diff
-    _header :show, @page.title
-    _body {
+    _header :show
+    _body do
       text 'Comparing '
       span "version #{@v2.version}", :style=>"background-color: #cfc; padding: 1px 4px;"
       text ' and '
       span "version #{@v1.version}", :style=>"background-color: #ddd; padding: 1px 4px;"
       text ' '
-      a "back", :href => R(Show, @page.title)
+      a "back", :href => R(Show, @page.title_url)
       br
       br
       pre.diff {
-          text @difftext
+        text @difftext
       }
-    }
+    end
     _footer { '' }
   end
   
@@ -209,48 +215,53 @@ module Junebug::Views
     txt.gsub!(Junebug::Models::Page::PAGE_LINK) do
       page = title = $1
       title = $2 unless $2.empty?
-      #page = page.gsub /\W/, '_'
+      page_url = page.gsub(/ /, '_')
       if titles.include?(page)
-        %Q{<a href="#{self/R(Show, page)}">#{title}</a>}
+        %Q{<a href="#{self/R(Show, page_url)}">#{title}</a>}
       else
-        %Q{<span>#{title}<a href="#{self/R(Edit, page, 1)}">?</a></span>}
+        %Q{<span>#{title}<a href="#{self/R(Edit, page_url, 1)}">?</a></span>}
       end
     end
     text RedCloth.new(auto_link_urls(txt), [ ]).to_html
   end
 
-  def _header type, page_title
+  def _header type
     div :id=>'hd' do
-      span :id=>'userlinks', :style=>'float: right;' do
-        logged_in? ? (text "Welcome, #{@state.user.username} - " ; a('sign out', :href=>"#{R(Logout)}?return_to=#{@env['REQUEST_URI']}")) : a('sign in', :href=> "#{R(Login)}?return_to=#{@env['REQUEST_URI']}")
-      end
-      if type == :static
-        h1 page_title
-      elsif type == :backlinks
-        h1 { a page_title, :href => R(Backlinks, page_title) }
-      else
-        h1 { a page_title, :href => R(Show, page_title) }
+      
+      span :id=>'userlinks' do
+        if logged_in?
+          text "Welcome, #{@state.user.username} - "
+          a 'sign out', :href=>"#{R(Logout)}?return_to=#{@env['REQUEST_URI']}"
+        else
+          a 'sign in', :href=> "#{R(Login)}?return_to=#{@env['REQUEST_URI']}"
+        end
       end
-      span {
+    
+      span :id=>'navlinks' do
         a 'Home',  :href => R(Show, Junebug.config['startpage'])
         text ' | '
         a 'RecentChanges', :href => R(Recent)
         text ' | '
         a 'All Pages', :href => R(List)
         text ' | '
-        a 'Help', :href => R(Show, "JunebugHelp") 
-      }
+        a 'Help', :href => R(Show, "Junebug_help") 
+      end
+            
+      # if type == :static
+      #   h1 page_title
+      # elsif type == :backlinks
+      #   h1 { a page_title, :href => R(Backlinks, page_title) }
+      # else
+      #   h1 { a page_title, :href => R(Show, page_title) }
+      # end
+      
     end
   end
 
   def _body
     div :id=>'bd' do
-      div :id=>'yui-main' do
-        div :class=>'yui-b' do
-          div.content do
-            yield
-          end
-        end
+      div.content do
+        yield
       end
     end
   end

data/test/wiki_test.rb

@@ -15,43 +15,43 @@ class JunebugTest < Camping::FunctionalTest
   def test_index
     get
     assert_response :redirect
-    assert_redirected_to '/JunebugWiki'
+    assert_redirected_to '/Welcome_to_Junebug'
   end
 
   def test_start_page
-    get '/JunebugWiki'
+    get '/Welcome_to_Junebug'
     assert_response :success
-    assert_match_body %r!title>JunebugWiki</title!
+    assert_match_body %r!title>Welcome to Junebug</title!
   end
 
   def test_login
     post '/login', :username => 'admin', :password => 'password'
     assert_response :redirect
-    assert_redirected_to '/JunebugWiki'
+    assert_redirected_to '/Welcome_to_Junebug'
     
     get '/logout'
     assert_response :redirect
-    assert_redirected_to '/JunebugWiki'
+    assert_redirected_to '/Welcome_to_Junebug'
   end
 
   def test_required_login
-    get '/JunebugWiki/edit'
+    get '/Welcome_to_Junebug/edit'
     assert_response :redirect
     assert_redirected_to '/login'
     
-    get '/JunebugWiki/1/edit'
+    get '/Welcome_to_Junebug/1/edit'
     assert_response :redirect
     assert_redirected_to '/login'
 
-    post '/JunebugWiki/edit'
+    post '/Welcome_to_Junebug/edit'
     assert_response :redirect
     assert_redirected_to '/login'
 
-    get '/JunebugWiki/delete'
+    get '/Welcome_to_Junebug/delete'
     assert_response :redirect
     assert_redirected_to '/login'
 
-    get '/JunebugWiki/1/revert'
+    get '/Welcome_to_Junebug/1/revert'
     assert_response :redirect
     assert_redirected_to '/login'
   end
@@ -100,9 +100,6 @@ class PageTest < Camping::UnitTest
 
     page = create(:title => 'test page')
     assert page.valid?
-
-    page = create(:title => 'test_page')
-    assert page.valid?
         
     page = create(:title => 'test')
     assert page.valid?
@@ -139,6 +136,10 @@ class PageTest < Camping::UnitTest
     page = create(:title => 'page\'s')
     deny page.valid?
     assert_not_nil page.errors.on(:title)
+
+    page = create(:title => 'test_title')
+    deny page.valid?
+    assert_not_nil page.errors.on(:title)
   end
   
   def test_unique_title
@@ -153,14 +154,6 @@ class PageTest < Camping::UnitTest
     # lowercase
     page2 = create(:title => 'testtitle')
     assert page2.valid?
-
-    # create page with underscores
-    page1 = create(:title => 'test_title')
-    assert page1.valid?
-
-    # different from page with spaces
-    page1 = create(:title => 'test title')
-    assert page1.valid?
   end
 
   def test_spaces

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: junebug-wiki
 version: !ruby/object:Gem::Version 
-  version: 0.0.21
-date: 2006-11-26 00:00:00 -08:00
+  version: 0.0.22
+date: 2006-11-28 00:00:00 -08:00
 summary: Junebug is a minimalist ruby wiki running on Camping.
 require_paths: 
 - lib
@@ -41,7 +41,6 @@ files:
 - deploy/public/images/feed-icon-14x14.png
 - deploy/public/style/base.css
 - deploy/public/style/yui/fonts.css
-- deploy/public/style/yui/grids.css
 - deploy/public/style/yui/reset.css
 - deploy/wiki
 - dump/junebug_pages.yml

data/deploy/public/style/yui/grids.css

@@ -1,88 +0,0 @@
-/*
-Copyright (c) 2006, Yahoo! Inc. All rights reserved.
-Code licensed under the BSD License:
-http://developer.yahoo.net/yui/license.txt
-version: 0.11.3
-*/
-body {
-   text-align:center;
-}
-
-#doc {
-   width:57.69em;
-   *width:56.3em; /* IE */
-   min-width:750px;
-   margin:auto;
-   text-align:left;
-}
-
-#hd,#bd {margin-bottom:1em;text-align:left;}
-#ft {/*font-size:77%;font-family:verdana;*/clear:both;}
-
-/* rules for main templates */
-.yui-t1 #yui-main .yui-b, .yui-t2 #yui-main .yui-b, .yui-t3 #yui-main .yui-b,
-.yui-t4 .yui-b, .yui-t5 .yui-b, .yui-t6 .yui-b {float:right;}
-.yui-t1 .yui-b, .yui-t2 .yui-b, .yui-t3 .yui-b, .yui-t4 #yui-main .yui-b, .yui-
-t5 #yui-main .yui-b, .yui-t6 #yui-main .yui-b {float:left;}
-
-/* t1: L160 */
-.yui-t1 #yui-main .yui-b {width:76%;min-width:570px;}
-.yui-t1 .yui-b {width:21.33%;min-width:160px;}
-
-/* t2 & t4: L180 & R180 */
-.yui-t2 #yui-main .yui-b, .yui-t4 #yui-main .yui-b {width:73.4%;min-
-width:550px;}
-.yui-t2 .yui-b, .yui-t4 .yui-b {width:24%;min-width:180px;}
-
-/* t3 & t6: L300 & R300 */
-.yui-t3 #yui-main .yui-b, .yui-t6 #yui-main .yui-b {width:57.6%;min-
-width:430px;}
-.yui-t3 .yui-b, .yui-t6 .yui-b {width:40%;min-width:300px;}
-
-/* t5: R240 */
-.yui-t5 #yui-main .yui-b {width:65.4%;min-width:490px;}
-.yui-t5 .yui-b {width:32%;min-width:240px;}
-
-/* t7: 750 */
-
-
-
-/*	grid-generic rules for all templates */
-
-/* all modules and grids nested in a grid get floated */
-.yui-g .yui-u, .yui-g .yui-g, .yui-ge .yui-u, .yui-gf .yui-u {
-   float:right;
-   display:inline;   /* IE */
-}
-
-/* float left and kill margin on first for added flex */
-.yui-g .first, .yui-gd .first, .yui-ge .first, .yui-gf .first {float:left; }
-
-/* 2 col */
-.yui-g .yui-u, .yui-g .yui-g {width:49.1%;}
-.yui-g .yui-g .yui-u {width:48.1%;} /* smaller for nested to preserve margins */
-
-/* 3 col */
-.yui-gb .yui-u, .yui-gc .yui-u, .yui-gd .yui-u {
-   float:left; /* need to reverse the order for 3 */
-   margin-left:2%; *margin-left:1.895%;
-   width:32%;
-}
-
-.yui-gb .first, .yui-gc .first, .yui-gd .first {margin-left:0;}
-
-/* colspan 2 */
-.yui-gc .first, .yui-gd .yui-u {width:66%;}
-.yui-gd .first {width:32%;}
-
-/* colspan 3 */
-.yui-ge .yui-u {width:24%;}
-.yui-ge .first, .yui-gf .yui-u {width:74.2%;}
-.yui-gf .first {width:24%;}
-.yui-ge .first {width:74.2%;}
-
-/* self clear floated parent containers */
-#bd:after, .yui-g:after, .yui-gb:after, .yui-gc:after, .yui-gd:after, .yui-
-ge:after, .yui-gf:after
-{content:".";display:block;height:0;clear:both;visibility:hidden;}
-#bd, .yui-g, .yui-gb, .yui-gc, .yui-gd, .yui-ge, .yui-gf {zoom:1;} /* IE */