junebug 0.0.14 → 0.0.15

data/lib/junebug/views.rb

@@ -65,7 +65,7 @@ module Junebug::Views
             br
             input :value => @page.title, :name => 'post_title', :size => 30, 
                   :type => 'text'
-            small " [ CamelCase only ]"
+            small " word characters [0-9A-Za-z_] and spaces only"
           }
           p {
             label 'Page Content'
@@ -208,8 +208,8 @@ module Junebug::Views
     return '' if txt.blank?
     txt.gsub!(Junebug::Models::Page::PAGE_LINK) do
       page = title = $1
-#      title = $2 unless $2.empty?
-#      page = page.gsub /\W/, '_'
+      title = $2 unless $2.empty?
+      #page = page.gsub /\W/, '_'
       if Junebug::Models::Page.find(:all, :select => 'title').collect { |p| p.title }.include?(page)
         %Q{<a href="#{self/R(Show, page)}">#{title}</a>}
       else

data/test/wiki_test.rb

@@ -4,41 +4,59 @@ require File.dirname(__FILE__) + "/../lib/junebug"
 Junebug.create
 include Junebug::Models
 
-# class JunebugTest < Camping::FunctionalTest
-# 
-#   fixtures :junebug_users
-#   
-#   def setup
-#     super
-#   end
-#   
-#   def test_index
-#     get
-#     assert_response :success
-#     assert_match_body %r!>blog<!
-#   end
-# 
-#   def test_view
-#     get '/view/1'
-#     assert_response :success
-#     assert_match_body %r!The quick fox jumped over the lazy dog!
-#   end
-#       
-#   def test_styles
-#     get 'styles.css'
-#     assert_match_body %r!Utopia!
-#   end
-# 
-#   def test_edit_should_require_login
-#     get '/edit/1'
-#     assert_response :success
-#     assert_match_body 'login'
-#   end
-# 
-#   def test_login
-#     page 'login', :username => 'quentin', :password => 'password'
-#     assert_match_body 'login success'
-#   end
+class JunebugTest < Camping::FunctionalTest
+
+  fixtures :junebug_users
+  
+  def setup
+    super
+  end
+  
+  def test_index
+    get
+    assert_response :redirect
+    assert_redirected_to '/JunebugWiki'
+  end
+
+  def test_start_page
+    get '/JunebugWiki'
+    assert_response :success
+    assert_match_body %r!title>JunebugWiki</title!
+  end
+
+  def test_login
+    post '/login', :username => 'admin', :password => 'password'
+    assert_response :redirect
+    assert_redirected_to '/JunebugWiki'
+    
+    get '/logout'
+    assert_response :redirect
+    assert_redirected_to '/JunebugWiki'
+  end
+
+  def test_required_login
+    get '/JunebugWiki/edit'
+    assert_response :redirect
+    assert_redirected_to '/login'
+    
+    get '/JunebugWiki/1/edit'
+    assert_response :redirect
+    assert_redirected_to '/login'
+
+    post '/JunebugWiki/edit'
+    assert_response :redirect
+    assert_redirected_to '/login'
+
+    get '/JunebugWiki/delete'
+    assert_response :redirect
+    assert_redirected_to '/login'
+
+    get '/JunebugWiki/1/revert'
+    assert_response :redirect
+    assert_redirected_to '/login'
+  end
+
+
 # 
 #   def test_comment
 #     assert_difference(Comment) {
@@ -50,8 +68,8 @@ include Junebug::Models
 #     }
 #   end
 # 
-# end
-# 
+end
+
 class PageTest < Camping::UnitTest
 
   fixtures :junebug_users, :junebug_pages, :junebug_page_versions
@@ -74,6 +92,30 @@ class PageTest < Camping::UnitTest
   end
   
   def test_valid_title
+    page = create(:title => 'TestPage')
+    assert page.valid?
+    
+    page = create(:title => 'Test Page')
+    assert page.valid?
+
+    page = create(:title => 'test page')
+    assert page.valid?
+
+    page = create(:title => 'test_page')
+    assert page.valid?
+        
+    page = create(:title => 'test')
+    assert page.valid?
+    
+    page = create(:title => 't')
+    assert page.valid?
+
+    page = create(:title => '1')
+    assert page.valid?
+
+  end
+  
+  def test_invalid_title
     page = create(:title => nil)
     deny page.valid?
     assert_not_nil page.errors.on(:title)
@@ -82,20 +124,66 @@ class PageTest < Camping::UnitTest
     deny page.valid?
     assert_not_nil page.errors.on(:title)
 
-    page = create(:title => 'Test')
+    page = create(:title => ' ')
+    deny page.valid?
+    assert_not_nil page.errors.on(:title)
+
+    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?
     assert_not_nil page.errors.on(:title)
   end
   
   def test_unique_title
-    page1 = create
+    page1 = create(:title => 'TestTitle')
     assert page1.valid?
-
+    
+    # identical
     page2 = create
     deny page2.valid?
     assert_not_nil page2.errors.on(:title)
+
+    # 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
+    page1 = create(:title => 'TestTitle5')
+    assert page1.valid?
+    assert_equal 'TestTitle5', page1.title
+    
+    # test strip
+    page1 = create(:title => ' TestTitle6 ')
+    assert page1.valid?
+    assert_equal 'TestTitle6', page1.title
+
+    page1 = create(:title => ' Test Title 7 ')
+    assert page1.valid?
+    assert_equal 'Test Title 7', page1.title
+    
+    # test squeeze
+    page1 = create(:title => '  Test  Title  8  ')
+    assert page1.valid?
+    assert_equal 'Test Title 8', page1.title
   end
 
+
 private
 
   def create(options={})

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: junebug
 version: !ruby/object:Gem::Version 
-  version: 0.0.14
-date: 2006-11-14 00:00:00 -08:00
+  version: 0.0.15
+date: 2006-11-17 00:00:00 -08:00
 summary: Junebug is a minimalist ruby wiki.
 require_paths: 
 - lib
@@ -32,6 +32,7 @@ files:
 - README
 - LICENSE
 - CHANGELOG
+- RELEASE_NOTES
 - Rakefile
 - lib/junebug
 - lib/junebug.rb
@@ -43,9 +44,16 @@ files:
 - lib/junebug/helpers.rb
 - lib/junebug/models.rb
 - lib/junebug/mosquito.rb
+- lib/junebug/redcloth
+- lib/junebug/redcloth.rb
 - lib/junebug/tasks
 - lib/junebug/tasks.rb
 - lib/junebug/views.rb
+- lib/junebug/redcloth/all_formats.rb
+- lib/junebug/redcloth/base.rb
+- lib/junebug/redcloth/docbook.rb
+- lib/junebug/redcloth/markdown.rb
+- lib/junebug/redcloth/textile.rb
 - lib/junebug/tasks/dump.rake
 - lib/junebug/tasks/update.rake
 - deploy/config.yml
@@ -87,7 +95,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.3.13.4
+        version: 0.3.13.3
     version: 
 - !ruby/object:Gem::Dependency 
   name: camping