junebug 0.0.3 → 0.0.4

data/README

@@ -5,7 +5,7 @@ Junebug is a minimalist wiki, running on a minimalist web framework.
 
 == Status
 
-Junebug v0.0.3 release, 2006-10-31
+Junebug v0.0.4 release, 2006-11-05
 
 This is an alpha release.  Use at your own risk.  Please do not use this for anything important.
 
@@ -47,7 +47,8 @@ Starting and stopping the wiki:
 
 > ./wiki start
 > ./wiki stop
-
+> ./wiki restart
+> ./wiki run
 
 == Credits
 

data/deploy/config.yml

@@ -1,11 +1,14 @@
 # this what you want to be the default wiki page
 startpage: JunebugWiki
+
 # server configuration
 host: 0.0.0.0
 port: 3301
-# change this if you want to have the wiki root running on something other than /
+
+# if you want to have the wiki root running on something other than /
 sitepath: /
-# these are for configuring the rss feed
+
+# configuring rss
 url: http://localhost:3301
 feed: http://localhost:3301/all/feed
 

data/deploy/static/base.css

@@ -1,4 +1,5 @@
 
+
 form { display: inline; }
 
 span.actions a {
@@ -7,11 +8,18 @@ span.actions a {
 
 input.button {
     margin-right: 5px;
+    margin-top: 4px;
 }
 
 input, textarea {
     padding: 2px;
     margin-bottom: 5px;
+    font-family:"Bitstream Vera Sans Mono", "Monaco", "Courier", monospace;
+}
+
+textarea {
+    width: 100%;
+    font-size: 92%;
 }
 
 del {
@@ -27,15 +35,18 @@ ins {
 
 	
 /* PAGE STRUCTURE */
+body {
+    background:#d7d7d7;
+}
+
 #doc {
-    font-family: "Lucida Grande", Verdana, sans-serif;
-/*    background-color: #EFE6CE;*/
+    font-family: 'Lucida Grande', 'Trebuchet MS', Arial, Helvetica, sans-serif;
 }
 
 #hd {
-    border-top: 8px solid #4e0dc4;
+    border-top: 6px solid #4e0dc4;
     background-color: #3f276a;
-    padding: 8px;
+    padding: 8px 25px;
 /*    font-size:  100%;*/
     color: #ffffff;
 }
@@ -51,13 +62,22 @@ ins {
     color: #ffffff;
 }
 
+#hd h1 a {
+    color: #ffffff;
+}
+
 #hd h1 {
     font-size: 167%;
-    padding-bottom: 10px;
+    padding-bottom: 5px;
+    font-weight: normal;
 }
 
 #bd {
-    padding: 8px;
+    background-color: #ffffff;
+	border:5px solid #929292;
+	border-width:0 5px 5px 0;
+    padding: 25px;
+    min-height: 300px;
 /*    font-size: 100%;*/
 }
 
@@ -71,7 +91,7 @@ ins {
 
 #ft {
     border: 1px solid #ddd;
-    background-color: #eee;
+    background-color: #d7dffd;
     font-size: 100%;
     padding: 8px;
     margin-bottom: 10px;
@@ -114,28 +134,30 @@ ins {
 }
 
 
-/* CONTENT STYLES */
+/* WIKI CONTENT STYLES */
 .content  {
     font-size: 100%;
 }
 
-.content h1, .content h2, .content h3, .content h4 {
+.content h2, .content h3, .content h4 {
+    margin-top: 20px;
     margin-bottom: 10px;
 }
 
 .content h1 {
+    margin-bottom: 10px;
     font-size:  182%;
 }
 
 .content h2 {
     font-size:  152%;
     border-bottom: 1px dotted #bbb;
-    background-color: #eef;
+/*    background-color: #eef;*/
 }
 
 .content h3 {
     font-size:  129%;
-    border-bottom: 1px dotted #bbb;
+/*    border-bottom: 1px dotted #bbb;*/
 }
 
 .content h4 {
@@ -144,7 +166,11 @@ ins {
 
 .content ul {
     list-style-type: square;
-    margin: 10px 0px 10px 18px;
+    margin: 10px 0px 10px 28px;
+}
+
+.content li {
+    line-height: 150%;
 }
 
 .content ol {
@@ -154,6 +180,7 @@ ins {
 
 .content p {
     margin: 10px 0px;
+    font-size: 114%;
 }
 
 .content strong {
@@ -164,14 +191,17 @@ ins {
     font-weight: bold;
 }
 
-.content pre {
-  color: #00FF00;
-  background: #000;
-  overflow: auto;
-  font-size: 100%;
-  font-family: "courier new", courier, monospace;
-  padding: 10px;
+.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;
+}
 
+asdf {
   /* 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 */

data/fixtures/junebug_pages.yml

@@ -1,23 +1,44 @@
---- 
-- updated_at: 2006-11-01 00:19:02 -08:00
-  title: JunebugWiki
-  readonly: 
-  body: |
-    h1. Welcome to Junebug!
-    
-    This is your default start page.
-    
-    
-
-  id: 1
-  version: 1
-  user_id: 1
-  created_at: 2006-10-29 16:19:34 -08:00
-- updated_at: 2006-11-01 00:10:27 -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-05 20:20:26 -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:
+    
+     ./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-05 19:48:57 -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

data/lib/junebug.rb

@@ -22,24 +22,25 @@ module Junebug
     Junebug::Models.create_schema :assume => (Junebug::Models::Page.table_exists? ? 1.0 : 0.0)
     Camping::Models::Session.create_schema
   end
+  
+  def self.connect
+    Junebug::Models::Base.establish_connection :adapter => 'sqlite3', :database => 'junebug.db'
+    Junebug::Models::Base.logger = Logger.new('junebug.log')
+    Junebug::Models::Base.threaded_connections=false
+  end
 
   def self.config
     @config ||= YAML.load(File.read('config.yml'))
   end
 end
 
-# ENV.each do |key,value|
-#   puts "#{key}: #{value}"
-# end
 
 if __FILE__ == $0 || ENV['DAEMONS_ARGV']
+  puts "In Postamble"
   # When using daemons, the current dir is /
   # So we need to set it to the junebug root
   FileUtils.cd ENV['JUNEBUG_ROOT'] if ENV['JUNEBUG_ROOT']
-
-  Junebug::Models::Base.establish_connection :adapter => 'sqlite3', :database => 'junebug.db'
-  Junebug::Models::Base.logger = Logger.new('junebug.log')
-  Junebug::Models::Base.threaded_connections=false
+  Junebug.connect
   Junebug.create
 
   server = Mongrel::Camping::start( Junebug.config['host'], Junebug.config['port'], Junebug.config['sitepath'], Junebug)

data/lib/junebug/controllers.rb

@@ -28,7 +28,9 @@ module Junebug::Controllers
     
     def post page_name
       redirect(Login) and return if @state.user_id.blank?
-      if Page.find_or_create_by_title(page_name).update_attributes( :body => input.post_body, :title => input.post_title)
+      attrs = { :body => input.post_body, :title => input.post_title }
+      attrs[:readonly] = input.post_readonly if @state.user_id == 1
+      if Page.find_or_create_by_title(page_name).update_attributes( attrs )
         redirect Show, input.post_title
       end
     end

data/lib/junebug/generator.rb

@@ -1,14 +1,45 @@
 require 'fileutils'
 
+require 'junebug'
+require 'junebug/models'
+
 module Junebug
   module Generator
     extend self
   
     def generate(args)
+      puts "In generator"
       src_root = File.dirname(__FILE__) + '/../../deploy'
       app = ARGV.first
       FileUtils.cp_r(src_root, app)
       FileUtils.chmod(0755, app+'/wiki')
+      FileUtils.cd app
+      Junebug.connect
+      Junebug.create
+      
+      user = Junebug::Models::User.find(1)
+      
+      puts <<EOS
+
+***********************************
+
+Welcome to Junebug!
+
+To start your new wiki, do the following:
+
+> cd #{app}
+> ./wiki start
+
+Open your browser to http://#{Junebug.config['host']}:#{Junebug.config['port']}#{Junebug.config['sitepath']}
+
+Your admin account is:
+
+username: #{user.username}
+password: #{user.password}
+
+Submit bug reports to tim.myrtle@gmail.com
+
+EOS
     end
     
   end

data/lib/junebug/models.rb

@@ -44,12 +44,20 @@ module Junebug::Models
       Page.reset_column_information
       
       # Create admin account
-      admin = User.create :username => 'admin', :password => 'password'
+      if ENV['DAEMONS_ARGV']
+        username = 'admin'
+        password = 'password'
+      else
+        print "Create an initial user account\n"
+        print "\nEnter your username (3-30 chars, no spaces or punctuation): "
+        username = STDIN.gets.strip
+        print "\nEnter your password (5-30 chars, no spaces or punctuation): "
+        password = STDIN.gets.strip
+      end
+      admin = User.create :username => username, :password => password
       
       # Install some default pages
       pages_file = File.dirname(__FILE__) + "/../../fixtures/junebug_pages.yml"
-      #puts pages_file
-      #pages_file = '../fixtures/junebug_pages.yml'
       YAML.load_file(pages_file).each {|page_data|Page.create(page_data) } if File.exist?(pages_file)
     end
     def self.down

data/lib/junebug/views.rb

@@ -22,7 +22,7 @@ module Junebug::Views
     _header (@version.version == @page.version ? :show : :backlinks), @page.title
     _body {
       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
+        _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
       }
     }
@@ -34,6 +34,7 @@ module Junebug::Views
         text ")"
       end
       br
+      text '<b>[readonly]</b> ' if @page.readonly
       span.actions {
         text "Version #{@version.version} "
         text "(current) " if @version.version == @page.version
@@ -64,6 +65,13 @@ module Junebug::Views
               br
               textarea @page.body, :name => 'post_body', :rows => 20, :cols => 80
             }
+            if @state.user_id == 1
+              opts = { :type => 'checkbox', :value=>'1', :name => 'post_readonly' }
+              opts[:checked] = 1 if @page.readonly
+              input opts
+              text " Readonly"
+              br
+            end
             input :type => 'submit', :value=>'save'
           end
           _button 'cancel', :href => R(Show, @page.title, @page.version); text '&nbsp;'
@@ -206,7 +214,7 @@ module Junebug::Views
   def _header type, page_title
     div :id=>'hd' do
       span :id=>'userlinks', :style=>'float: right;' do
-        @state.user_id.blank? ? a('login', :href=>R(Login)) : (text "#{@state.user_username} - " ; a('logout', :href=>R(Logout)))
+        @state.user_id.blank? ? a('sign in', :href=>R(Login)) : (text "#{@state.user_username} - " ; a('sign out', :href=>R(Logout)))
       end
       if type == :static
         h1 page_title
@@ -248,13 +256,6 @@ module Junebug::Views
       yield
       br :clear=>'all'
     end
-    text <<END
-<p>
-  <a href="http://validator.w3.org/check?uri=referer"><img
-      src="http://www.w3.org/Icons/valid-xhtml10"
-      alt="Valid XHTML 1.0 Transitional" height="31" width="88" /></a>
-</p>
-END
   end
 
   def self.feed

metadata

@@ -3,15 +3,15 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: junebug
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
-date: 2006-11-01 00:00:00 -08:00
+  version: 0.0.4
+date: 2006-11-05 00:00:00 -08:00
 summary: Junebug is a minimalist ruby wiki.
 require_paths: 
 - lib
 email: tim.myrtle@gmail.com
 homepage: http://www.junebugwiki.com/
 rubyforge_project: 
-description: Junebug is a minimalist ruby wiki.
+description: Junebug is a minimalist ruby wiki running on Camping.
 autorequire: 
 default_executable: 
 bindir: bin