junebug-wiki 0.0.34 → 0.0.35

data/deploy/public/style/base.css

@@ -46,6 +46,9 @@ ins {
 
 	
 /* PAGE STRUCTURE */
+html {
+    background:#d7d7d7;  
+}
 body {
     background:#d7d7d7;
     text-align: center;
@@ -185,6 +188,7 @@ body {
 
 .content h1 {
     font-size:  182%;
+    margin-top: 0;
     margin-bottom: 10px;
     border-bottom: 2px dotted #bbb;
 }
@@ -255,6 +259,16 @@ body {
     padding: 2px;
 }
 
+.content code.eqn {
+    display: block;
+    text-align: center;
+    background: #f4f4f4;
+    border: 1px solid #ddd;
+    padding: 8px 20px;
+    margin: 15px 0px;
+    overflow: auto;
+}
+
 .content code.clean {
 /*    font-family:"Bitstream Vera Sans Mono", "Monaco", "Courier", monospace;*/
     background: #ffffff;

data/lib/junebug/controllers.rb

@@ -205,7 +205,7 @@ module Junebug::Controllers
     end
   end
 
-  class Static < R '(/images/.+)', '(/style/.+)'         
+  class Static < R '(/images/.+)', '(/style/.+)', '(/javascripts/.+)'
     MIME_TYPES = {'.css' => 'text/css', '.js' => 'text/javascript', '.jpg' => 'image/jpeg'}
     #PATH = __FILE__[/(.*)\//, 1]
     PATH = ENV['JUNEBUG_ROOT'] || File.expand_path('.')

data/lib/junebug/ext/redcloth/textile.rb

@@ -395,6 +395,13 @@ class RedCloth < String
         text.gsub!( /^ *(\\?)==([^=]+.*?)\1==/m ) do |m|
           $1.empty? ? "<notextile>#{$2}</notextile>" : "==#{$2}=="
         end
+        text.gsub!( /^ +(`[^`]+`)/ ) do |m|
+          "<code class=\"eqn\">#{$1}</code>"
+        end
+        text.gsub!( /(`[^`]+`)/ ) do |m|
+          "<notextile>#{$1}</notextile>"
+        end
+          
     end
 
     def glyphs_textile( text, level = 0 )

data/lib/junebug/generator.rb

@@ -1,5 +1,3 @@
-require 'fileutils'
-
 require 'junebug'
 require 'junebug/models'
 

data/lib/junebug/version.rb

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

data/lib/junebug/views.rb

@@ -9,9 +9,10 @@ module Junebug::Views
       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/base.css',      :type=>'text/css', :rel=>'stylesheet'
+          link :href=>'http://yui.yahooapis.com/2.4.0/build/reset-fonts-grids/reset-fonts-grids.css', :type=>'text/css', :rel=>'stylesheet'
+          link :href=>'http://yui.yahooapis.com/2.4.0/build/base/base-min.css', :type=>'text/css', :rel=>'stylesheet'
+          link :href=>'/style/base.css', :type=>'text/css', :rel=>'stylesheet'
+          script :type=>'text/javascript', :src=>'/javascripts/ASCIIMathML.js'          
           link :href=>Junebug.config['feedurl'], :rel => "alternate", :title => "Recently Updated Pages", :type => "application/atom+xml"
         }
         body {

data/test/fixtures/junebug_page_versions.yml

@@ -0,0 +1,34 @@
+page_1:
+  updated_at: 2006-11-23 09:39:25 -08:00
+  readonly: true
+  body: |
+    To complete setup of you new wiki, here are a few things you should do:
+    
+    
+    h3. 1. Login to your account
+    
+    When you created this wiki, the username and password you submitted were used to set up an account for you.  Now click the 'sign in' link at the upper right and sign in.
+    
+    Once you sign in you will see your username in the upper right corner.
+    
+    
+    h3. 2. Set the start page
+    
+    This page will always be the default start page for a new wiki.  Probably not what you want, right?  Fortunately, it is easy to change.  Open the config.yml file (in your wiki directory) with any texteditor, and change the startpage field to the page you want.
+    
+    Next, in your wiki directory, run the command:
+    
+     ruby wiki restart
+    
+    The next time you click on the 'Home' link in the nav bar, you will be taken to your new start page.  If the page doesn't already exist, you will first be asked to login, and then you will be presented with an edit form to create the page.
+    
+    
+    h3. 3. Create some pages!
+    
+    If you have any trouble, or need some help getting started, click on the 'Help' link in the nav bar.  The documentation is pretty sparse right now, but I'm working on it!
+
+  id: 1
+  page_id: 1
+  version: 1
+  user_id: 1
+  created_at: 2006-10-29 16:19:34 -08:00

data/test/fixtures/junebug_pages.yml

@@ -1,5 +1,34 @@
 page_1:
+  updated_at: 2006-11-23 09:39:25 -08:00
+  title: Welcome to Junebug
+  readonly: true
+  body: |
+    To complete setup of you new wiki, here are a few things you should do:
+    
+    
+    h3. 1. Login to your account
+    
+    When you created this wiki, the username and password you submitted were used to set up an account for you.  Now click the 'sign in' link at the upper right and sign in.
+    
+    Once you sign in you will see your username in the upper right corner.
+    
+    
+    h3. 2. Set the start page
+    
+    This page will always be the default start page for a new wiki.  Probably not what you want, right?  Fortunately, it is easy to change.  Open the config.yml file (in your wiki directory) with any texteditor, and change the startpage field to the page you want.
+    
+    Next, in your wiki directory, run the command:
+    
+     ruby wiki restart
+    
+    The next time you click on the 'Home' link in the nav bar, you will be taken to your new start page.  If the page doesn't already exist, you will first be asked to login, and then you will be presented with an edit form to create the page.
+    
+    
+    h3. 3. Create some pages!
+    
+    If you have any trouble, or need some help getting started, click on the 'Help' link in the nav bar.  The documentation is pretty sparse right now, but I'm working on it!
+
   id: 1
+  version: 1
   user_id: 1
-  title: TestTitle1
-  body: The quick fox jumped over the lazy dog.
+  created_at: 2006-10-29 16:19:34 -08:00

data/test/test_wiki.rb

@@ -7,7 +7,8 @@ include Junebug::Models
 
 class TestJunebug < Camping::FunctionalTest
 
-  #fixtures :junebug_users
+  fixtures :junebug_users, :junebug_pages, :junebug_page_versions
+  
   def setup
     super
   end
@@ -38,7 +39,7 @@ class TestJunebug < Camping::FunctionalTest
   def test_login_basic
     get '/Welcome_to_Junebug/edit'
     assert_response :redirect
-    assert_redirected_to '/login'
+    assert_redirected_to '/login?return_to=%2FWelcome_to_Junebug%2Fedit'
 
     post '/login', :username => 'admin', :password => 'password'
     assert_response :redirect
@@ -53,26 +54,25 @@ class TestJunebug < Camping::FunctionalTest
 
     get '/Welcome_to_Junebug/edit'
     assert_response :redirect
-    assert_redirected_to '/login'
+    assert_redirected_to '/login?return_to=%2FWelcome_to_Junebug%2Fedit'
   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'
+    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'
+    get '/logout', :return_to => '/TestPage7'
+    assert_response :redirect
+    assert_redirected_to '/TestPage7'
   end
 
 
@@ -80,11 +80,11 @@ class TestJunebug < Camping::FunctionalTest
     # existing pages
     get '/Welcome_to_Junebug/edit'
     assert_response :redirect
-    assert_redirected_to '/login'
+    assert_redirected_to '/login?return_to=%2FWelcome_to_Junebug%2Fedit'
     
     get '/Welcome_to_Junebug/1/edit'
     assert_response :redirect
-    assert_redirected_to '/login'
+    assert_redirected_to '/login?return_to=%2FWelcome_to_Junebug%2Fedit'
 
     get '/Welcome_to_Junebug/delete'
     assert_response :redirect
@@ -97,11 +97,11 @@ class TestJunebug < Camping::FunctionalTest
     # page creation
     get '/NonexistentPage/edit'
     assert_response :redirect
-    assert_redirected_to '/login'
+    assert_redirected_to '/login?return_to=%2FNonexistentPage%2Fedit'
     
     get '/NonexistentPage/1/edit'
     assert_response :redirect
-    assert_redirected_to '/login'
+    assert_redirected_to '/login?return_to=%2FNonexistentPage%2Fedit'
 
     get '/NonexistentPage/delete'
     assert_response :redirect
@@ -115,7 +115,7 @@ class TestJunebug < Camping::FunctionalTest
   def test_page_editing
     get '/TestPage1'
     assert_response :redirect
-    assert_redirected_to '/login'
+    assert_redirected_to '/login?return_to=%2FTestPage1'
     
     post '/login', :username => 'admin', :password => 'password'
     assert_response :redirect

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: junebug-wiki
 version: !ruby/object:Gem::Version 
-  version: 0.0.34
-date: 2007-08-26 00:00:00 -07:00
+  version: 0.0.35
+date: 2007-12-08 00:00:00 -08:00
 summary: Junebug is a minimalist ruby wiki running on Camping.
 require_paths: 
 - lib
@@ -40,9 +40,8 @@ files:
 - deploy/console
 - deploy/public/images/feed-icon-14x14.png
 - deploy/public/images/draft.png
+- deploy/public/javascripts/ASCIIMathML.js
 - deploy/public/style/base.css
-- deploy/public/style/yui/fonts.css
-- deploy/public/style/yui/reset.css
 - deploy/wiki
 - dump/junebug_pages.yml
 - lib/junebug.rb

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

@@ -1,34 +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
-*/
-
-/**
- * 84.5% for !IE, keywords for IE
- * Percents could work for IE, but for backCompat purposes, we are using
- keywords.
- * x-small is for IE < 6 and IE6 quirks mode.
- *
- */
-body {font:13px arial,helvetica,clean,sans-serif;*font-size:small;*font:x-
-small;}
-table {font-size:inherit;font:100%;}
-
-/**
- * 99% for safari; 100% is too large
- */
-select, input, textarea {font:99% arial,helvetica,clean,sans-serif;}
-
-/**
- * Bump up !IE to get to 13px equivalent
- */
-/*pre, code {font:115% monospace;*font-size:100%;}*/
-
-/**
- * Default line-height based on font-size rather than "computed-value"
- * see: http://www.w3.org/TR/CSS21/visudet.html#line-height
- */
-body * {line-height:1.22em;}
-

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

@@ -1,14 +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,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,form,fieldset,input,p,blockquote,th,td{margin:0;padding:0;}
-table{border-collapse:collapse;border-spacing:0;}
-fieldset,img{border:0;}
-address,caption,cite,code,dfn,em,strong,th,var{font-style:normal;font-weight:normal;}
-ol,ul {list-style:none;}
-caption,th {text-align:left;}
-h1,h2,h3,h4,h5,h6{font-size:100%;}
-q:before,q:after{content:'';}