junebug-wiki 0.0.22 → 0.0.23

data/History.txt

@@ -1,3 +1,13 @@
+= 0.0.23 2006-11-28
+
+* *EXISTING USERS PLEASE READ THE RELEASE NOTES*
+* Cleaned up redirect handling
+* Renamed 'url' config parameter to 'feedurl'
+* Make edit button always visible
+* Fix for camping error on initial load
+* Allow dashes in wikiwords
+* More tests
+
 = 0.0.22 2006-11-28
 
 * *EXISTING USERS PLEASE READ THE RELEASE NOTES*

data/RELEASE_NOTES.txt

@@ -1,3 +1,10 @@
+= 0.0.23 2006-11-28
+
+Robert Gogolok rightly pointed out that the 'url' parameter in config.yml was confusing, so I renamed it 'feedurl'.  You will need to make this change to any existing junebug wikis.
+
+Also, as part of this change, I cleaned up the redirect handling code.  This might affect users operating a proxied Junebug wiki.  I will add some notes to http://www.junebugwiki.com for setting up an apache proxy for Junebug.
+
+
 = 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:

data/deploy/config.yml

@@ -30,7 +30,8 @@ dbconnection:
 #  host: localhost
 
 # configuring rss
-feedtitle: 'Wiki Updates'
-url: http://localhost:3301
+# you should only need to change this is you have an external feed manager like feedburner
+feedtitle: Wiki Updates
+feedurl: http://localhost:3301
 feed: http://localhost:3301/all/feed
 

data/deploy/public/style/base.css

@@ -102,6 +102,7 @@ body {
     color: #333;
     font-size: 100%;
     padding: 8px;
+    margin-top: 10px;
     margin-bottom: 10px;
     line-height: 150%;
 }

data/lib/junebug.rb

@@ -35,7 +35,7 @@ module Junebug
   end
   
   def self.startpage
-    "#{Junebug.config['url']}/#{Junebug.config['startpage']}"
+    "/#{Junebug.config['startpage']}"
   end
 end
 

data/lib/junebug/controllers.rb

@@ -2,26 +2,24 @@ require 'junebug/ext/diff'
 
 module Junebug::Controllers
   
-
   class Index < R '/'
     def get
       redirect Junebug.startpage
     end
   end
 
-  class Show < R '/([0-9A-Za-z_]+)', '/([0-9A-Za-z_]+)/(\d+)'
+  class Show < R '/([0-9A-Za-z_-]+)', '/([0-9A-Za-z_-]+)/(\d+)'
     def get page_name, version = nil
-      #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.gsub(/_/,' '))
+      redirect(Edit, page_name, 1) 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 '/([0-9A-Za-z_]+)/edit', '/([0-9A-Za-z_]+)/(\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?
+      redirect("/login?return_to=#{CGI::escape(@env['REQUEST_URI'])}") and return unless logged_in?
       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
@@ -32,7 +30,7 @@ module Junebug::Controllers
     
     # FIXME: no error checking, also no verify quicksave/readonly rights
     def post page_name
-      redirect("#{Junebug.config['url']}/login") and return unless logged_in?
+      redirect("/login?return_to=#{CGI::escape(@env['REQUEST_URI'])}") and return unless logged_in?
       page_name_spc = page_name.gsub(/_/,' ')
       if input.submit == 'save'
         if ! input.quicksave
@@ -47,32 +45,31 @@ module Junebug::Controllers
           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 Show, input.post_title.gsub(/ /,'_')
       else # cancel
-        redirect "#{Junebug.config['url']}/#{page_name}"
+        redirect Show, page_name
       end
     end
   end
   
-  class Delete < R '/([0-9A-Za-z_]+)/delete'
+  class Delete < R '/([0-9A-Za-z_-]+)/delete'
     def get page_name
-      redirect("#{Junebug.config['url']}/login") and return unless logged_in?
+      redirect("/login") and return unless logged_in?
       Page.find_by_title(page_name.gsub(/_/,' ')).destroy() if is_admin?
       redirect Junebug.startpage
     end
     
   end
 
-  class Revert < R '/([0-9A-Za-z_]+)/(\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?
+      redirect("/login") and return unless logged_in?
       Page.find_by_title(page_name.gsub(/_/,' ')).revert_to!(version) if is_admin?
-      redirect "#{Junebug.config['url']}/#{page_name}"
+      redirect Show, page_name
     end
   end
 
-  class Versions < R '/([0-9A-Za-z_]+)/versions'
+  class Versions < R '/([0-9A-Za-z_-]+)/versions'
     def get page_name
       page_name_spc = page_name.gsub(/_/,' ')
       @page = Page.find_by_title(page_name_spc)
@@ -90,7 +87,7 @@ module Junebug::Controllers
     end
   end
 
-  class Backlinks < R '/([0-9A-Za-z_]+)/backlinks'
+  class Backlinks < R '/([0-9A-Za-z_-]+)/backlinks'
     def get page_name
       page_name_spc = page_name.gsub(/_/,' ')
       @page = Page.find_by_title(page_name_spc)
@@ -108,7 +105,7 @@ module Junebug::Controllers
     end
   end
   
-  class Diff < R '/([0-9A-Za-z_]+)/(\d+)/(\d+)/diff'
+  class Diff < R '/([0-9A-Za-z_-]+)/(\d+)/(\d+)/diff'
     include HTMLDiff
     def get page_name, v1, v2
       page_name_spc = page_name.gsub(/_/,' ')
@@ -164,7 +161,7 @@ module Junebug::Controllers
       if @user
         if @user.password == input.password
           @state.user = @user
-          input.return_to.blank? ? redirect(Junebug.startpage) : redirect(Junebug.config['url'] + input.return_to)
+          input.return_to.blank? ? redirect(Junebug.startpage) : redirect(input.return_to)
           return
         else
           @notice = 'Authentication failed'
@@ -173,7 +170,7 @@ module Junebug::Controllers
         @user = User.create :username=>input.username, :password=>input.password
         if @user.errors.empty?
           @state.user = @user
-          input.return_to.blank? ? redirect(Junebug.startpage) : redirect(Junebug.config['url'] + input.return_to)
+          input.return_to.blank? ? redirect(Junebug.startpage) : redirect(input.return_to)
           return
         else
           @notice = @user.errors.full_messages[0]
@@ -186,7 +183,7 @@ module Junebug::Controllers
   class Logout
       def get
         @state.user = nil
-        input.return_to.blank? ? redirect(Junebug.startpage) : redirect(Junebug.config['url'] + input.return_to)
+        input.return_to.blank? ? redirect(Junebug.startpage) : redirect(input.return_to)
       end
   end
 end

data/lib/junebug/models.rb

@@ -25,13 +25,13 @@ module Junebug::Models
   end
 
   class Page < Base
-    belongs_to :user
+    belongs_to :user, :class_name=>"Junebug::Models::User" # Hack to prevent camping error on initial load
     #PAGE_LINK = /\[\[([^\]|]*)[|]?([^\]]*)\]\]/
-    PAGE_LINK = /\[\[([0-9A-Za-z ]+)[|]?([^\]]*)\]\]/
+    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 => /^[0-9A-Za-z ]+$/
+    validates_format_of :title, :with => /^[0-9A-Za-z -]+$/
     validates_presence_of :title
     acts_as_versioned
     non_versioned_fields.push 'title'
@@ -46,7 +46,7 @@ module Junebug::Models
   end
   
   class Page::Version < Base
-    belongs_to :user
+    belongs_to :user, :class_name=>"Junebug::Models::User" # Hack to prevent camping error on initial load
   end
 
   class CreateJunebug < V 1.0

data/lib/junebug/version.rb

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

data/lib/junebug/views.rb

@@ -23,10 +23,10 @@ module Junebug::Views
   def show
     _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?))
+      _button 'edit', R(Edit, @page.title_url, @version.version), {:style=>'float: right; margin: 0 0 5px 5px;'} if (@version.version == @page.version && (! @page.readonly || is_admin?))
       h1 @page.title
       _markup @version.body
-      _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)
+      _button 'edit', R(Edit, @page.title_url, @version.version), {:style=>'float: right; margin: 5px 0 0 5px;'} if (@version.version == @page.version && (! @page.readonly || is_admin?)) && (@version.body && @version.body.size > 200)
       br :clear=>'all'
     end
     _footer {
@@ -64,7 +64,7 @@ module Junebug::Views
             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), dashes, and spaces only"
           }
           p {
             label 'Page Content'
@@ -288,14 +288,14 @@ module Junebug::Views
     xml.feed "xmlns"=>"http://www.w3.org/2005/Atom" do
 
       xml.title Junebug.config['feedtitle'] || "Wiki Updates"
-      xml.id Junebug.config['url'] + '/'
+      xml.id Junebug.config['feedurl'] + '/'
       xml.link "rel" => "self", "href" => Junebug.config['feed']
 
       pages = Junebug::Models::Page.find(:all, :order => 'updated_at DESC', :limit => 20)
       xml.updated pages.first.updated_at.xmlschema
 
       pages.each do |page|
-        url = Junebug.config['url'] + '/' + page.title
+        url = Junebug.config['feedurl'] + '/' + page.title
         xml.entry do
           xml.id url
           xml.title page.title

data/test/wiki_test.rb

@@ -6,7 +6,7 @@ include Junebug::Models
 
 class JunebugTest < Camping::FunctionalTest
 
-  fixtures :junebug_users
+  #fixtures :junebug_users
   
   def setup
     super
@@ -43,10 +43,6 @@ class JunebugTest < Camping::FunctionalTest
     assert_response :redirect
     assert_redirected_to '/login'
 
-    post '/Welcome_to_Junebug/edit'
-    assert_response :redirect
-    assert_redirected_to '/login'
-
     get '/Welcome_to_Junebug/delete'
     assert_response :redirect
     assert_redirected_to '/login'
@@ -55,6 +51,47 @@ class JunebugTest < Camping::FunctionalTest
     assert_response :redirect
     assert_redirected_to '/login'
   end
+  
+  def test_edit_cycle
+    get '/Welcome_to_Junebug/edit'
+    assert_response :redirect
+    assert_redirected_to '/login'
+    
+    post '/login', :username => 'admin', :password => 'password'
+    assert_response :redirect
+    assert_redirected_to '/Welcome_to_Junebug'
+    
+    get '/Welcome_to_Junebug/edit'
+    assert_response :success
+
+    pagename = "Welcome to Junebug"
+    page = Junebug::Models::Page.find_by_title(pagename)
+    
+    # submit nochange
+    post "/#{page.title_url}/edit", :post_title=>page.title, :post_body=>page.body, :post_readonly=>page.readonly, :submit=>'save'
+    assert_response :redirect
+    assert_redirected_to "/#{page.title_url}"
+    page2 = Junebug::Models::Page.find_by_title(page.title)
+    assert_equal page.title, page2.title
+    assert_equal page.body, page2.body
+    assert_equal page.user_id, page2.user_id
+    assert_equal page.readonly, page2.readonly
+    assert_equal page.version+1, page2.version
+
+    pagename = "Welcome to Junebug"
+    page = Junebug::Models::Page.find_by_title(pagename)
+    
+    # submit edited title and body
+    post "/#{page.title_url}/edit", :post_title=>page.title+'2', :post_body=>page.body+'2', :post_readonly=>page.readonly, :submit=>'save'
+    assert_response :redirect
+    assert_redirected_to "/#{page.title_url+'2'}"
+    page2 = Junebug::Models::Page.find_by_title(page.title+'2')
+    assert_equal page.title+'2', page2.title
+    assert_equal page.body+'2', page2.body
+    assert_equal page.user_id, page2.user_id
+    assert_equal page.readonly, page2.readonly
+    assert_equal page.version+1, page2.version
+  end
 
 
 # 
@@ -98,6 +135,9 @@ class PageTest < Camping::UnitTest
     page = create(:title => 'Test Page')
     assert page.valid?
 
+    page = create(:title => 'Test-Page')
+    assert page.valid?
+    
     page = create(:title => 'test page')
     assert page.valid?
         
@@ -128,10 +168,6 @@ class PageTest < Camping::UnitTest
     page = create(:title => '*')
     deny page.valid?
     assert_not_nil page.errors.on(:title)
-    
-    page = create(:title => 'page-1')
-    deny page.valid?
-    assert_not_nil page.errors.on(:title)
 
     page = create(:title => 'page\'s')
     deny page.valid?

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: junebug-wiki
 version: !ruby/object:Gem::Version 
-  version: 0.0.22
+  version: 0.0.23
 date: 2006-11-28 00:00:00 -08:00
 summary: Junebug is a minimalist ruby wiki running on Camping.
 require_paths: