junebug 0.0.4 → 0.0.5

data/README

@@ -1,6 +1,6 @@
 = Junebug: Minimalist Ruby Wiki
 
-Junebug is a minimalist wiki, running on a minimalist web framework.
+Junebug is a minimalist wiki, running on Camping.
 
 
 == Status

data/deploy/static/{base.css → style/base.css}

@@ -14,12 +14,15 @@ input.button {
 input, textarea {
     padding: 2px;
     margin-bottom: 5px;
-    font-family:"Bitstream Vera Sans Mono", "Monaco", "Courier", monospace;
+/*    font-family:"Bitstream Vera Sans Mono", "Monaco", "Courier", monospace;*/
+}
+
+input, textarea, pre, code {
+    font-family: monospace;
 }
 
 textarea {
     width: 100%;
-    font-size: 92%;
 }
 
 del {
@@ -47,7 +50,6 @@ body {
     border-top: 6px solid #4e0dc4;
     background-color: #3f276a;
     padding: 8px 25px;
-/*    font-size:  100%;*/
     color: #ffffff;
 }
 
@@ -78,15 +80,12 @@ body {
 	border-width:0 5px 5px 0;
     padding: 25px;
     min-height: 300px;
-/*    font-size: 100%;*/
 }
 
 #yui-main{
-/*    font-size: 100%;*/
 }
 
 .yui-b{
-/*    font-size: 100%;*/
 }
 
 #ft {
@@ -135,12 +134,12 @@ body {
 
 
 /* WIKI CONTENT STYLES */
-.content  {
+.content {
     font-size: 100%;
 }
 
 .content h2, .content h3, .content h4 {
-    margin-top: 20px;
+    margin-top: 25px;
     margin-bottom: 10px;
 }
 
@@ -179,8 +178,12 @@ body {
 }
 
 .content p {
+    line-height: 140%;
     margin: 10px 0px;
-    font-size: 114%;
+}
+
+.content em {
+    font-style: italic;
 }
 
 .content strong {
@@ -191,21 +194,28 @@ body {
     font-weight: bold;
 }
 
+.content code {
+/*    font-family:"Bitstream Vera Sans Mono", "Monaco", "Courier", monospace;*/
+    background: #eee;
+    padding: 2px;
+}
+
 .content pre code{
-  display: block;
-  color: #000000;
-  background: #eee;
-/*  overflow: auto;*/
-  font-size: 92%;
-  font-family:"Bitstream Vera Sans Mono", "Monaco", "Courier", monospace;
-  padding: 8px 20px;
+    padding: 0px;
 }
 
-asdf {
+.content pre {
+/*    font-family:"Bitstream Vera Sans Mono", "Monaco", "Courier", monospace;*/
+    display: block;
+    background: #eee;
+    padding: 8px 20px;
+}
+
+.content th, .content td {
+    padding: 2px 5px;
+}
+
+.content th {
+    font-weight: bold;
+}
   /* http://longren.org/2006/09/27/wrapping-text-inside-pre-tags */
-   white-space: pre-wrap;       /* css-3 */
-   white-space: -moz-pre-wrap !important;  /* Mozilla, since 1999 */
-   white-space: -pre-wrap;      /* Opera 4-6 */
-   white-space: -o-pre-wrap;    /* Opera 7 */
-   word-wrap: break-word;       /* Internet Explorer 5.5+ */
-}

data/deploy/static/{yui → style/yui}/fonts.css

@@ -24,7 +24,7 @@ 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%;}
+/*pre, code {font:115% monospace;*font-size:100%;}*/
 
 /**
  * Default line-height based on font-size rather than "computed-value"

data/fixtures/junebug_pages.yml

@@ -1,5 +1,5 @@
 --- 
-- updated_at: 2006-11-05 20:20:26 -08:00
+- updated_at: 2006-11-06 09:15:45 -08:00
   title: JunebugWiki
   readonly: true
   body: |
@@ -34,7 +34,7 @@
   version: 1
   user_id: 1
   created_at: 2006-10-29 16:19:34 -08:00
-- updated_at: 2006-11-05 19:48:57 -08:00
+- updated_at: 2006-11-06 09:15:45 -08:00
   title: JunebugHelp
   readonly: 
   body: This is a work in progress
@@ -42,3 +42,103 @@
   version: 1
   user_id: 1
   created_at: 2006-11-01 00:10:07 -08:00
+- updated_at: 2006-11-06 21:49:04 -08:00
+  title: FormatTest
+  readonly: 
+  body: |-
+    See "this page":http://hobix.com/textile/ for the full range of formatting options
+    
+    h2. Headers
+    
+    h1. Header 1
+    
+    Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+    
+    h2. Header 2
+    
+    Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+    
+    h3. Header 3
+    
+    Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+    
+    h4. Header 4
+    
+    Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+    
+    h2. Structural emphasis
+    
+    This is _emphasis_ (italic)
+    
+    This is *strong* (bold)
+    
+    This is @code@
+    
+     more code
+     @difftext = diff( @v1_markup , @v2_markup)
+    
+    This is -deleted- text
+    
+    This is +inserted+ text
+    
+    Arbitrary style: I'm %{color:red}unaware% of most soft drinks.
+    
+    
+    h2. Arbitrary html, pre, and code
+    
+    Inserting arbitrary html (pre/code)
+    
+    <pre><code>a.gsub!( /</, '' )</code></pre>
+    
+    Inserting arbitrary html (pre/code)
+    
+    <pre>
+    <code>a.gsub!( /</, '' )</code>
+    </pre>
+    
+    Arbitrary html (pre)
+    
+    <pre>
+    a.gsub!( /</, '' )
+    </pre>
+    
+    Code by indenting
+    
+     more code
+     @difftext = diff( @v1_markup , @v2_markup)
+    
+    h2. Lists
+    
+    # A first item
+    # A second item
+    # A third
+    
+    # Fuel could be:
+    ## Coal
+    ## Gasoline
+    ## Electricity
+    # Humans need only:
+    ## Water
+    ## Protein
+    
+    * A first item
+    * A second item
+    * A third
+    
+    h2. External references
+    
+    This is a link: "Google":http://google.com
+    
+    Images: !/static/images/feed-icon-14x14.png! 
+    
+    
+    h2. Tables
+    
+    |_. name |_. age |_. sex |
+    | joan | 24 | f |
+    | archie | 29 | m |
+    | bella | 45 | f |
+  id: 3
+  version: 1
+  user_id: 1
+  created_at: 2006-11-06 09:40:53 -08:00

data/lib/junebug/controllers.rb

@@ -96,13 +96,16 @@ module Junebug::Controllers
 
   class Static < R '/static/(.+)'         
     MIME_TYPES = {'.css' => 'text/css', '.js' => 'text/javascript', '.jpg' => 'image/jpeg'}
-#    PATH = __FILE__[/(.*)\//, 1]
+    #PATH = __FILE__[/(.*)\//, 1]
     PATH = '.'
-    #puts `pwd`
     
     def get(path)
       @headers['Content-Type'] = MIME_TYPES[path[/\.\w+$/, 0]] || "text/plain"
-      @headers['X-Sendfile'] = "#{PATH}/static/#{path}"
+      unless path =~ /\.\./ # sample test to prevent directory traversal attacks
+        @headers['X-Sendfile'] = "#{PATH}/static/#{path}"
+      else
+        "404 - Invalid path"
+      end
     end
   end
 

data/lib/junebug/views.rb

@@ -5,10 +5,10 @@ module Junebug::Views
     html {
       head {
         title @page_title ? @page_title : @page.title
-        link :href=>'/static/yui/reset.css', :type=>'text/css', :rel=>'stylesheet'
-        link :href=>'/static/yui/fonts.css', :type=>'text/css', :rel=>'stylesheet'
-        link :href=>'/static/yui/grids.css', :type=>'text/css', :rel=>'stylesheet'
-        link :href=>'/static/base.css',      :type=>'text/css', :rel=>'stylesheet'
+        link :href=>'/static/style/yui/reset.css', :type=>'text/css', :rel=>'stylesheet'
+        link :href=>'/static/style/yui/fonts.css', :type=>'text/css', :rel=>'stylesheet'
+        link :href=>'/static/style/yui/grids.css', :type=>'text/css', :rel=>'stylesheet'
+        link :href=>'/static/style/base.css',      :type=>'text/css', :rel=>'stylesheet'
       }
       body {
         div :id=>'doc', :class=>'yui-t7' do
@@ -24,6 +24,7 @@ module Junebug::Views
       div.content {
         _button 'Edit page', {:href => R(Edit, @page.title, @version.version), :style=>'float: right; margin: 0 0 5px 5px;'} if (@version.version == @page.version && (! @page.readonly || @state.user_id == 1))
         _markup @version.body
+        _button 'Edit page', {:href => R(Edit, @page.title, @version.version), :style=>'float: right; margin: 0 0 5px 5px;'} if (@version.version == @page.version && (! @page.readonly || @state.user_id == 1)) && @version.body.size > 100
       }
     }
     _footer {
@@ -50,7 +51,7 @@ module Junebug::Views
   def edit
     _header :backlinks, @page.title
     _body {
-        h1 @page_title
+      div.content {
         div.formbox {
           form :method => 'post', :action => R(Edit, @page.title) do
             p { 
@@ -78,6 +79,7 @@ module Junebug::Views
           a 'syntax help', :href => 'http://hobix.com/textile/', :target=>'_blank'
           br :clear=>'all'
         }
+      }
     }
     _footer { '' }
   end
@@ -252,6 +254,10 @@ module Junebug::Views
       span :style=>'float: right;' do
         text 'Powered by '
         a 'JunebugWiki', :href => 'http://www.junebugwiki.com/'
+        text ' '
+        a :href => Junebug.config['feed'] do
+          img :src => '/static/images/feed-icon-14x14.png'
+        end
       end
       yield
       br :clear=>'all'
@@ -273,11 +279,11 @@ module Junebug::Views
 
       pages.each do |page|
         xml.entry do
-          xml.id Junebug.config['url'] + '/s/' + page.title
+          xml.id Junebug.config['url'] + '/' + page.title
           xml.title page.title
-          xml.author { xml.name "Anonymous" }
+          xml.author { xml.name page.user.username }
           xml.updated page.updated_at.xmlschema
-          xml.link "rel" => "alternate", "href" => Junebug.config['url'] + '/s/' + page.title
+          xml.link "rel" => "alternate", "href" => Junebug.config['url'] + '/' + page.title
           xml.summary "#{page.title}"
           xml.content 'type' => 'html' do 
             xml.text! page.body.gsub("\n", '<br/>').gsub("\r", '') 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: junebug
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
-date: 2006-11-05 00:00:00 -08:00
+  version: 0.0.5
+date: 2006-11-06 00:00:00 -08:00
 summary: Junebug is a minimalist ruby wiki.
 require_paths: 
 - lib
@@ -45,11 +45,14 @@ files:
 - deploy/console
 - deploy/static
 - deploy/wiki
-- deploy/static/base.css
-- deploy/static/yui
-- deploy/static/yui/fonts.css
-- deploy/static/yui/grids.css
-- deploy/static/yui/reset.css
+- deploy/static/images
+- deploy/static/style
+- deploy/static/images/feed-icon-14x14.png
+- deploy/static/style/base.css
+- deploy/static/style/yui
+- deploy/static/style/yui/fonts.css
+- deploy/static/style/yui/grids.css
+- deploy/static/style/yui/reset.css
 - fixtures/junebug_pages.yml
 test_files: []