junebug-wiki 0.0.33 → 0.0.34

data/History.txt

@@ -1,3 +1,10 @@
+= 0.0.34 2007-08-26
+
+* Remove spaces from wikilinks
+* Fix preview wikilink formatting bug
+* Testing work
+* Require sqlite3-ruby >= 1.2
+
 = 0.0.33 2007-08-18
 
 * Bugfix release to update manifest

data/Rakefile

@@ -50,7 +50,7 @@ hoe = Hoe.new(GEM_NAME, VERS) do |p|
       ['mongrel',      '>=1.0'],
       ['camping',      '>=1.5'],
       ['daemons',      '>=1.0.4'],
-      ['sqlite3-ruby', '>=1.1.0.1'],
+      ['sqlite3-ruby', '>=1.2'],
       ['activerecord', '>=1.15.1']
     ]
 end

data/lib/junebug/controllers.rb

@@ -17,7 +17,7 @@ module Junebug::Controllers
     def get page_name, version = nil
       @page = Page.find_by_title(page_name.gsub(/_/,' '))
       if @page.nil?
-        logged_in? ? redirect(Edit, page_name, 1) : redirect("/login?return_to=#{CGI::escape(@env['REQUEST_URI'])}")
+        logged_in? ? redirect(Edit, page_name, 1) : redirect("/login?return_to=#{CGI::escape('/'+page_name)}")
       else
         @page_title = @page.title
         @version = (version.nil? or version == @page.version.to_s) ? @page : @page.versions.find_by_version(version)
@@ -29,7 +29,7 @@ module Junebug::Controllers
   class Edit < R slug('/edit'), slug('/(\d+)/edit') 
     
     def get page_name, version = nil
-      redirect("/login?return_to=#{CGI::escape(@env['REQUEST_URI'])}") and return unless logged_in?
+      redirect("/login?return_to=#{CGI::escape('/'+page_name+'/edit')}") and return unless logged_in?
       page_name_spc = page_name.gsub(/_/,' ')
       @page = Page.find_by_title(page_name_spc)
       if @page.nil?
@@ -43,7 +43,7 @@ module Junebug::Controllers
     
     # FIXME: no error checking, also no verify quicksave/readonly rights
     def post page_name
-      redirect("/login?return_to=#{CGI::escape(@env['REQUEST_URI'])}") and return unless logged_in?
+      redirect('/login') and return unless logged_in? # shouldn't be here
       page_name_spc = page_name.gsub(/_/,' ')
       @page = Page.find_by_title(page_name_spc)
       if input.submit == 'cancel'
@@ -82,7 +82,7 @@ module Junebug::Controllers
   
   class Delete < R slug('/delete')
     def get page_name
-      redirect("/login") and return unless logged_in?
+      redirect("/login") and return unless logged_in? # shouldn't be here
       Page.find_by_title(page_name.gsub(/_/,' ')).destroy() if is_admin?
       redirect Junebug.startpage
     end
@@ -91,7 +91,7 @@ module Junebug::Controllers
 
   class Revert < R slug('/(\d)/revert')
     def get page_name, version
-      redirect("/login") and return unless logged_in?
+      redirect("/login") and return unless logged_in? # shouldn't be here
       Page.find_by_title(page_name.gsub(/_/,' ')).revert_to!(version) if is_admin?
       redirect Show, page_name
     end
@@ -224,6 +224,8 @@ module Junebug::Controllers
     def get
       @page_title = "Login/Create Account"
       @return_to = input.return_to
+      puts "\nBB" + @return_to.to_s
+      puts "input: #{input}"
       render :login
     end
 

data/lib/junebug/version.rb

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

data/lib/junebug/views.rb

@@ -297,8 +297,8 @@ module Junebug::Views
   def _markup txt
     return '' if txt.blank?
     titles = Junebug::Models::Page.find(:all, :select => 'title').collect { |p| p.title }
-    txt.gsub!(Junebug::Models::Page::PAGE_LINK) do
-      page = title = $1
+    txt = txt.gsub(Junebug::Models::Page::PAGE_LINK) do
+      page = title = $1.strip
       title = $2 unless $2.empty?
       page_url = page.gsub(/ /, '_')
       if titles.include?(page)

data/test/test_wiki.rb

@@ -55,6 +55,26 @@ class TestJunebug < Camping::FunctionalTest
     assert_response :redirect
     assert_redirected_to '/login'
   end
+  
+  def test_return_to
+    # gets don't seem to pass query params correctly in testing mode, so i've removed them
+    post '/login', :username => 'admin', :password => 'password'
+    assert_response :redirect
+    assert_redirected_to '/Welcome_to_Junebug'
+    
+    # get '/logout'
+    # assert_response :redirect
+    # assert_redirected_to '/Welcome_to_Junebug'
+    
+    post '/login', :username => 'admin', :password => 'password', :return_to => "/TestPage7"
+    assert_response :redirect
+    assert_redirected_to '/TestPage7'
+
+    # get '/logout', :return_to => '/TestPage7'
+    # assert_response :redirect
+    # assert_redirected_to '/TestPage7'
+  end
+
 
   def test_required_login
     # existing pages

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: junebug-wiki
 version: !ruby/object:Gem::Version 
-  version: 0.0.33
-date: 2007-08-18 00:00:00 -07:00
+  version: 0.0.34
+date: 2007-08-26 00:00:00 -07:00
 summary: Junebug is a minimalist ruby wiki running on Camping.
 require_paths: 
 - lib
@@ -121,7 +121,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.1.0.1
+        version: "1.2"
     version: 
 - !ruby/object:Gem::Dependency 
   name: activerecord