junebug-wiki 0.0.31 → 0.0.32

data/History.txt

@@ -1,3 +1,8 @@
+= 0.0.32 2007-08-18
+
+* Added preview function.  Thanks Bob Showalter
+* Added more tests
+
 = 0.0.31 2007-04-22
 
 * User list and user history pages

data/RELEASE_NOTES.txt

@@ -1,3 +1,10 @@
+= 0.0.32 2007-08-18
+
+This release includes some css changes, so don't forget to rake update:everything
+
+Read the updating page at http://www.junebugwiki.com/JunebugUpdating
+
+
 = 0.0.28 2007-01-20
 
 Existing users be sure to read the updating page at http://www.junebugwiki.com/JunebugUpdating

data/deploy/public/style/base.css

@@ -306,3 +306,10 @@ body {
     font-weight: bold;
     background-color: #d7e0ff;
 }
+
+div.preview {
+  border: 2px solid #bbf;
+  padding: 10px;
+  margin-bottom: 10px;
+  background: transparent url(/images/draft.png) repeat scroll 0%;
+}

data/lib/junebug/controllers.rb

@@ -15,10 +15,14 @@ module Junebug::Controllers
 
   class Show < R slug, slug('/(\d+)')
     def get page_name, version = nil
-      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
+      @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'])}")
+      else
+        @page_title = @page.title
+        @version = (version.nil? or version == @page.version.to_s) ? @page : @page.versions.find_by_version(version)
+        render :show
+      end
     end
   end
 
@@ -29,13 +33,11 @@ module Junebug::Controllers
       page_name_spc = page_name.gsub(/_/,' ')
       @page = Page.find_by_title(page_name_spc)
       if @page.nil?
-        # new page
-        @page = Page.new(:title=>page_name_spc, :body=>'') unless @page
+        @page = Page.new(:title=>page_name_spc, :body=>'')
       else
         # check for version request
         @page = @page.versions.find_by_version(version) unless version.nil? or version == @page.version.to_s
       end
-      @page_title = "Editing: #{page_name_spc}"
       render :edit
     end
     
@@ -43,27 +45,37 @@ module Junebug::Controllers
     def post page_name
       redirect("/login?return_to=#{CGI::escape(@env['REQUEST_URI'])}") and return unless logged_in?
       page_name_spc = page_name.gsub(/_/,' ')
-      if input.submit == 'save'
-        attrs = { :body => input.post_body, :title => input.post_title, :user_id =>@state.user.id }
+      @page = Page.find_by_title(page_name_spc)
+      if input.submit == 'cancel'
+        @page ? redirect(Show, page_name) : redirect(Junebug.startpage)
+      else
+        attrs = { :body => input.post_body }
         attrs[:readonly] = input.post_readonly if is_admin?
-        @page = Page.find_by_title(page_name_spc)
-        if @page.nil?
-          # new page
-          @page = Page.create(attrs)
+        if input.submit == 'minor edit'
+          current_version = @page.find_version(@page.version)
+          current_version.update_attributes(attrs)
+          @page.without_revision { @page.update_attributes(attrs) }
+          redirect Show, page_name_spc.gsub(/ /,'_') # don't allow pagename changes as minor edits
         else
-          @page.update_attributes(attrs)
+          attrs[:title] = input.post_title
+          if input.submit == 'preview'
+            @show_preview = true
+            if @page
+              @page.attributes = attrs
+            else
+              @page = Page.new(attrs)
+            end
+            render :edit
+          elsif input.submit == 'save'
+            attrs[:user_id] = @state.user.id # don't set this until save
+            if @page
+              @page.update_attributes(attrs)
+            else
+              @page = Page.create(attrs)
+            end
+            redirect Show, input.post_title.gsub(/ /,'_')
+          end
         end
-        redirect Show, input.post_title.gsub(/ /,'_')
-      elsif input.submit == 'minor edit'
-        attrs = { :body => input.post_body }
-        attrs[:readonly] = input.post_readonly if is_admin?
-        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) }
-        redirect Show, input.post_title.gsub(/ /,'_')
-      else # cancel
-        redirect Show, page_name
       end
     end
   end

data/lib/junebug/version.rb

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

data/lib/junebug/views.rb

@@ -60,7 +60,12 @@ module Junebug::Views
   def edit
     _header :show
     _body do
-      h1 @page_title
+      if @show_preview
+        div.preview {
+          h1 "#{@page.title}"
+          _markup @page.body
+        }
+      end
       div.formbox {
         form :method => 'post', :action => R(Edit, @page.title_url) do
           p { 
@@ -81,6 +86,7 @@ module Junebug::Views
             input :type => 'submit', :name=>'submit', :value=>'minor edit', :class=>'button', :style=>'float: right;', :accesskey => 'm'
           end
           input :type => 'submit', :name=>'submit', :value=>'save', :class=>'button', :style=>'float: right;', :accesskey => 's'
+          input :type => 'submit', :name=>'submit', :value=>'preview', :class=>'button', :style=>'float: right;', :accesskey => 'p'
           if is_admin?
             opts = { :type => 'checkbox', :value=>'1', :name => 'post_readonly' }
             opts[:checked] = 1 if @page.readonly

data/test/test_wiki.rb

@@ -35,17 +35,29 @@ class TestJunebug < Camping::FunctionalTest
     assert_match_body /Слово сказано/
   end
   
-  def test_login
+  def test_login_basic
+    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
     
     get '/logout'
     assert_response :redirect
     assert_redirected_to '/Welcome_to_Junebug'
+
+    get '/Welcome_to_Junebug/edit'
+    assert_response :redirect
+    assert_redirected_to '/login'
   end
 
   def test_required_login
+    # existing pages
     get '/Welcome_to_Junebug/edit'
     assert_response :redirect
     assert_redirected_to '/login'
@@ -61,10 +73,27 @@ class TestJunebug < Camping::FunctionalTest
     get '/Welcome_to_Junebug/1/revert'
     assert_response :redirect
     assert_redirected_to '/login'
+
+    # page creation
+    get '/NonexistentPage/edit'
+    assert_response :redirect
+    assert_redirected_to '/login'
+    
+    get '/NonexistentPage/1/edit'
+    assert_response :redirect
+    assert_redirected_to '/login'
+
+    get '/NonexistentPage/delete'
+    assert_response :redirect
+    assert_redirected_to '/login'
+
+    get '/NonexistentPage/1/revert'
+    assert_response :redirect
+    assert_redirected_to '/login'
   end
   
-  def test_edit_cycle
-    get '/Welcome_to_Junebug/edit'
+  def test_page_editing
+    get '/TestPage1'
     assert_response :redirect
     assert_redirected_to '/login'
     
@@ -72,40 +101,60 @@ class TestJunebug < Camping::FunctionalTest
     assert_response :redirect
     assert_redirected_to '/Welcome_to_Junebug'
     
-    get '/Welcome_to_Junebug/edit'
+    get '/TestPage1/edit'
     assert_response :success
 
-    pagename = "Welcome to Junebug"
-    page = Junebug::Models::Page.find_by_title(pagename)
+    # create page
+    post "/TestPage1/edit", :post_title=>"TestPage1", :post_body=>"test body", :post_readonly=>"0", :submit=>'save'    
+    assert_response :redirect
+    assert_redirected_to "/TestPage1"
     
-    # submit nochange
-    post "/#{page.title_url}/edit", :post_title=>page.title, :post_body=>page.body, :post_readonly=>page.readonly, :submit=>'save'
+    page = Junebug::Models::Page.find_by_title("TestPage1")
+    
+    assert_equal "TestPage1", page.title
+    assert_equal "test body", page.body
+    assert_equal 1,           page.user_id
+    assert_equal false,       page.readonly
+    assert_equal 1,           page.version
+
+    # edit, nochange
+    post "/TestPage1/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)
+    assert_redirected_to "/TestPage1"
+    
+    page2 = Junebug::Models::Page.find_by_title("TestPage1")
+    
+    assert_equal "TestPage1", page2.title
+    assert_equal "test body", page2.body
+    assert_equal 1,           page2.user_id
+    assert_equal false,       page2.readonly
+    assert_equal 2,           page2.version
     
     # 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'
+    post "/TestPage1/edit", :post_title=>'TestPage1xx', :post_body=>'test body xx', :post_readonly=>"0", :submit=>'save'
+    assert_response :redirect
+    assert_redirected_to "/TestPage1xx"
+    
+    page3 = Junebug::Models::Page.find_by_title('TestPage1xx')
+
+    assert_equal "TestPage1xx",  page3.title
+    assert_equal "test body xx", page3.body
+    assert_equal 1,              page3.user_id
+    assert_equal false,          page3.readonly
+    assert_equal 3,              page3.version   
+    
+    # submit minor edit
+    post "/TestPage1xx/edit", :post_title=>"TestPage1yy", :post_body=>'test body yy', :post_readonly=>"0", :submit=>'minor edit'
     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
+    assert_redirected_to "/TestPage1xx" # not allowed to change the title in minor edit 
     
-    # set it back
-    post "/#{page2.title_url}/edit", :post_title=>page.title, :post_body=>page.body, :post_readonly=>page.readonly, :submit=>'save'
+    page4 = Junebug::Models::Page.find_by_title('TestPage1xx')
 
+    assert_equal "TestPage1xx",  page4.title
+    assert_equal "test body yy", page4.body
+    assert_equal 1,              page4.user_id
+    assert_equal false,          page4.readonly
+    assert_equal 3,              page4.version # version doesn't change
   end
 
 
@@ -148,19 +197,19 @@ class TestPage < Camping::UnitTest
   end
   
   def test_valid_title
-    page = create(:title => 'TestPage')
+    page = create(:title => 'TestPage3')
     assert page.valid?
     
-    page = create(:title => 'Test Page')
+    page = create(:title => 'Test Page3')
     assert page.valid?
 
-    page = create(:title => 'Test-Page')
+    page = create(:title => 'Test-Page3')
     assert page.valid?
     
-    page = create(:title => 'test page')
+    page = create(:title => 'test page3')
     assert page.valid?
         
-    page = create(:title => 'test')
+    page = create(:title => 'test3')
     assert page.valid?
     
     page = create(:title => 't')
@@ -215,25 +264,39 @@ class TestPage < Camping::UnitTest
   end
 
   def test_spaces
-    page1 = create(:title => 'TestTitle5')
+    page1 = create(:title => 'TestTitle51')
     assert page1.valid?
-    assert_equal 'TestTitle5', page1.title
+    assert_equal 'TestTitle51', page1.title
     
     # test strip
-    page1 = create(:title => ' TestTitle6 ')
+    page1 = create(:title => ' TestTitle52 ')
     assert page1.valid?
-    assert_equal 'TestTitle6', page1.title
+    assert_equal 'TestTitle52', page1.title
 
-    page1 = create(:title => ' Test Title 7 ')
+    page1 = create(:title => ' Test Title 53 ')
     assert page1.valid?
-    assert_equal 'Test Title 7', page1.title
+    assert_equal 'Test Title 53', page1.title
     
     # test squeeze
-    page1 = create(:title => '  Test  Title  8  ')
+    page1 = create(:title => '  Test  Title  54  ')
     assert page1.valid?
-    assert_equal 'Test Title 8', page1.title
+    assert_equal 'Test Title 54', page1.title
   end
 
+  def test_basic_update
+    # create test page
+    page = create(:title => "TestUpdate")
+    assert page.valid?
+    assert_equal 1, page.version
+    
+    # update body
+    page.body = "New body"
+    page.save
+    assert page.valid?
+    assert_equal "TestUpdate", page.title
+    assert_equal "New body", page.body
+    assert_equal 2, page.version
+  end
 
 private
 

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.2
+rubygems_version: 0.9.4
 specification_version: 1
 name: junebug-wiki
 version: !ruby/object:Gem::Version 
-  version: 0.0.31
-date: 2007-04-22 00:00:00 -07:00
+  version: 0.0.32
+date: 2007-08-18 00:00:00 -07:00
 summary: Junebug is a minimalist ruby wiki running on Camping.
 require_paths: 
 - lib
@@ -71,10 +71,14 @@ files:
 - test/test_wiki.rb
 test_files: []
 
-rdoc_options: []
-
-extra_rdoc_files: []
-
+rdoc_options: 
+- --main
+- README.txt
+extra_rdoc_files: 
+- History.txt
+- Manifest.txt
+- README.txt
+- RELEASE_NOTES.txt
 executables: 
 - junebug
 extensions: []
@@ -134,5 +138,5 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.2.0
+        version: 1.3.0
     version: