junebug-wiki 0.0.19 → 0.0.20

data/History.txt

@@ -1,3 +1,9 @@
+= 0.0.20 2006-11-23
+
+* Rake task to update local documentation (rake update:help)
+* Documentation updates
+* Version bugfix. Thanks DJ
+
 = 0.0.19 2006-11-22
 
 * *BE SURE TO READ THE RELEASE NOTES*

data/deploy/public/style/base.css

@@ -237,6 +237,12 @@ body {
     padding: 2px;
 }
 
+.content code.clean {
+/*    font-family:"Bitstream Vera Sans Mono", "Monaco", "Courier", monospace;*/
+    background: #ffffff;
+    padding: 2px;
+}
+
 .content pre code{
     padding: 0px;
 }
@@ -250,6 +256,14 @@ body {
     margin: 15px 0px;
 }
 
+.content pre.clean {
+    display: block;
+    background: #ffffff;
+    border: 0px;
+    padding: 0;
+    margin: 0;
+}
+
 /* http://longren.org/2006/09/27/wrapping-text-inside-pre-tags */
 /* Browser specific (not valid) styles to make preformatted text wrap */
 .content pre { 
@@ -264,8 +278,9 @@ body {
 }
 
 .content th, .content td {
-    padding: 2px 5px;
+    padding: 2px 5px 2px 5px;
     border: solid #eee;
+    vertical-align: top;
 }
 
 .content th {

data/dump/junebug_pages.yml

@@ -1,148 +1,187 @@
---- 
-- updated_at: 2006-11-07 18:24:43 -08:00
-  title: JunebugWiki
-  readonly: true
-  body: |
-    h1. Welcome to Junebug!
-    
-    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
-  created_at: 2006-10-29 16:19:34 -08:00
-- updated_at: 2006-11-07 18:24:43 -08:00
-  title: JunebugHelp
-  readonly: 
-  body: This is a work in progress
-  id: 2
-  version: 1
-  user_id: 1
-  created_at: 2006-11-01 00:10:07 -08:00
-- updated_at: 2006-11-07 18:24:43 -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.
-    
-    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.
-    
-    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.
-    
-    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.
-    
-    h5. Header 5
-    
-    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.
-    
-    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
+--- 
+- updated_at: 2006-11-23 09:39:25 -08:00
+  title: JunebugWiki
+  readonly: true
+  body: |
+    h1. Welcome to Junebug!
+    
+    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
+  created_at: 2006-10-29 16:19:34 -08:00
+- updated_at: 2006-11-23 12:08:56 -08:00
+  title: JunebugHelp
+  readonly: 
+  body: |
+    h1. Junebug Help
+    
+    h2. Wiki Words
+    
+    Junebug will create a wiki link for any text enclosed in double brackets:
+    
+    <span style="background: #f4f4f4; padding: 2px; font-family: monospace;"><span>[[</span>JunebugWiki]]</span> creates a link to [[JunebugWiki]]
+    
+    You can change the text of the link as follows:
+    
+    <span style="background: #f4f4f4; padding: 2px; font-family: monospace;"><span>[[</span>JunebugWiki|Junebug Wiki Home]]</span> creates a link to [[JunebugWiki| Junebug Wiki Home]]
+    
+    h2. Text Formatting (Textile)
+    
+    This is a work in progress...
+    
+    |_.Structural Formatting |_.You Type |_.You Get |
+    | *Paragraphs:*<br>Blank lines create new paragraphs | <pre class="clean">paragraph-1
+    
+    paragraph-2</pre> | paragraph-1<br><br>paragraph-2 |
+    | *Headers:* | <pre class="clean">
+    h1. Header 1
+    h2. Header 2
+    h3. Header 3
+    </pre> | <h1>Header 1</h1><h2>Header 2</h2><h3>Header 3</h3>|
+    |_.Text Formatting |_.You Type |_.You Get |
+    | *Bold Text (strength):*  | <code class="clean">*Bold*</code> | *Bold* |
+    | *Italic Text (emphasis):* | <code class="clean">_Italic_</code> | _Italic_ |
+    | *Fixed Font (code):* | <code class="clean">@Fixed Font@</code> | @Fixed Font@ |
+    | *Code Block (pre/code):*<br>Text indented with a single space | <pre class="clean">_Code Block
+    </pre> | <pre><code>Code Block</code></pre> |
+    | *Preformatted Block:*<br>Text enclosed by &lt;pre&gt; tags | <pre class="clean">
+    <pre>
+    Preformatted Block
+    </pre>
+    </pre> | <pre>Preformatted Block</pre> |
+
+  id: 2
+  version: 1
+  user_id: 1
+  created_at: 2006-11-01 00:10:07 -08:00
+- updated_at: 2006-11-23 09:42:05 -08:00
+  title: TextileTest
+  readonly: 
+  body: |-
+    h1. Textile Syntax Test
+    
+    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.
+    
+    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.
+    
+    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.
+    
+    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.
+    
+    h5. Header 5
+    
+    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.
+    
+    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/generator.rb

@@ -21,7 +21,7 @@ END
       end
       
       if (args[0] == '-v') || (args[0] == '--version')
-        puts "Junebug v#{Junebug::VERSION}"
+        puts "Junebug v#{Junebug::VERSION::STRING}"
         return
       end
       

data/lib/junebug/models.rb

@@ -26,7 +26,8 @@ module Junebug::Models
 
   class Page < Base
     belongs_to :user
-    PAGE_LINK = /\[\[([^\]|]*)[|]?([^\]]*)\]\]/
+    #PAGE_LINK = /\[\[([^\]|]*)[|]?([^\]]*)\]\]/
+    PAGE_LINK = /\[\[([\w ]+)[|]?([^\]]*)\]\]/
     #before_save { |r| r.title = r.title.underscore }
     #PAGE_LINK = /([A-Z][a-z]+[A-Z]\w+)/
     validates_uniqueness_of :title
@@ -85,7 +86,6 @@ module Junebug::Models
       
       # Install some default pages
       pages_file = File.dirname(__FILE__) + "/../../dump/junebug_pages.yml"
-      puts pages_file
       YAML.load_file(pages_file).each {|page_data|Page.create(page_data) } if File.exist?(pages_file)
     end
     def self.down

data/lib/junebug/tasks/update.rake

@@ -1,4 +1,4 @@
-require 'junebug/config'
+require 'junebug'
 
 namespace :update do
 
@@ -19,8 +19,28 @@ namespace :update do
     cp File.join(junebug_root, 'deploy', 'Rakefile'), '.'
   end
 
+  desc "Update help pages"
+  task :help do
+    Junebug.connect
+    pages_file = File.dirname(__FILE__) + "/../../../dump/junebug_pages.yml"
+    YAML.load_file(pages_file).each do |page_data|
+      # For consistency...
+      page_data.delete('id')
+      page_data.delete('version')
+      page_data.delete('updated_at')
+      page_data.delete('created_at')
+      page_data['user_id'] = 1
+      page = Junebug::Models::Page.find_by_title(page_data['title'])
+      if page
+        page.update_attributes(page_data)
+      else
+        Junebug::Models::Page.create(page_data)
+      end
+    end
+  end
+
   desc "Update everything"
-  task :everything => [:deploydir, :stylesheets, :rakefile] do
+  task :everything => [:deploydir, :stylesheets, :rakefile, :help] do
 
   end
 

data/lib/junebug/version.rb

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

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: junebug-wiki
 version: !ruby/object:Gem::Version 
-  version: 0.0.19
-date: 2006-11-22 00:00:00 -08:00
+  version: 0.0.20
+date: 2006-11-23 00:00:00 -08:00
 summary: Junebug is a minimalist ruby wiki running on Camping.
 require_paths: 
 - lib