junebug 0.0.17 → 0.0.18

data/History.txt

@@ -0,0 +1,96 @@
+= 0.0.18 2006-11-21
+
+* Changed diff output to compare unformmatted text
+* Converted to using hoe
+* Quicksave option (doesn't increment version)
+* Signup redirect bugfix
+* External lib dir (ext)
+
+= 0.0.17 2006-11-19
+
+* Quick bugfix for login redirects behind proxy
+
+= 0.0.16 2006-11-19
+
+* Style tweaks
+* Login/logout redirects you back to the page you were on
+
+= 0.0.15 2006-11-17
+
+* Loosen up mongrel requirements for windows users -- thanks deejay
+* Bugfix for static file issue #6536. Thanks zimbatm
+* Added css for wrapping pre text
+* Changed wikiword syntax to [[link]]
+* Unit testing improvements
+* Command line help
+ 
+= 0.0.14 2006-11-14
+
+* Page title cleanup
+* Rake task reorg
+* Dump task
+* Added error checking to generator
+
+= 0.0.13 2006-11-14
+
+* Link style improvement/simplification
+* Autolinking urls
+* use user.role to determine admin rights
+* is_admin?, logged_in?
+
+= 0.0.12 2006-11-13
+
+* content div bugfix
+
+= 0.0.11 2006-11-13
+
+* Added revert
+* Versioning bugfix
+* Changed delete operation
+* Added 'role' user field
+
+= 0.0.10 2006-11-12
+
+* Submit bugfix
+* More unit tests
+ 
+= 0.0.9 2006-11-10
+
+* Mosquito unit tests
+
+= 0.0.8 2006-11-08
+
+* Style work
+* Add rss link to head
+* Stylesheet update rake task
+
+= 0.0.7 2006-11-07
+
+* Redirect bugfix for proxied sites
+ 
+= 0.0.6 2006-11-07
+
+* Delete pages
+* More style work
+
+= 0.0.5 2006-11-06
+
+* Style cleanups
+* Security fix
+* Format test page
+
+= 0.0.4 2006-11-05
+
+* Readonly pages
+* Start page
+* Bugfixes
+
+= 0.0.3 2006-10-30
+
+* User accounts
+* Daemonize
+* Default page fixtures
+
+= 0.0.2 2006-10-22
+
+* Initial release

data/Manifest.txt

@@ -0,0 +1,36 @@
+History.txt
+Manifest.txt
+README.txt
+RELEASE_NOTES.txt
+Rakefile
+bin/junebug
+deploy/Rakefile
+deploy/config.yml
+deploy/console
+deploy/static/images/feed-icon-14x14.png
+deploy/static/style/base.css
+deploy/static/style/yui/fonts.css
+deploy/static/style/yui/grids.css
+deploy/static/style/yui/reset.css
+deploy/wiki
+dump/junebug_pages.yml
+lib/junebug.rb
+lib/junebug/config.rb
+lib/junebug/controllers.rb
+lib/junebug/ext/acts_as_versioned.rb
+lib/junebug/ext/diff.rb
+lib/junebug/ext/mosquito.rb
+lib/junebug/generator.rb
+lib/junebug/helpers.rb
+lib/junebug/models.rb
+lib/junebug/tasks.rb
+lib/junebug/tasks/dump.rake
+lib/junebug/tasks/update.rake
+lib/junebug/version.rb
+lib/junebug/views.rb
+setup.rb
+test/fixtures/junebug_page_versions.yml
+test/fixtures/junebug_pages.yml
+test/fixtures/junebug_users.yml
+test/test_helper.rb
+test/wiki_test.rb

data/README.txt

@@ -0,0 +1,87 @@
+= JUNEBUG WIKI
+
+* http://www.junebugwiki.com
+* http://rubyforge.org/projects/junebug/
+* tim.myrtle@gmail.com
+
+
+== DESCRIPTION:
+
+Junebug is a minimalist wiki, running on Camping.
+
+This is an alpha release.  Use at your own risk.  Please do not use this for anything important.
+
+
+== SYNOPSIS:
+  
+To create your Junebug wiki:
+
+  % junebug testwiki
+
+This creates a directory 'testwiki' with the necessary files.
+
+  % cd testwiki
+  % ruby wiki run
+
+View your new wiki at: http://localhost:3301
+
+If everything is running fine, you can set the wiki to run in the background.  Hit ctrl-C to kill the wiki, and then type
+
+  % ruby wiki start
+
+You can change default configuration (host, port, startpage, etc.. ) by editing the config.yml file.  For the changes to take effect, just restart the wiki:
+
+  % ruby wiki restart
+
+
+== REQUIREMENTS:
+
+* Ruby and rubygems
+* Sqlite3
+
+_why has set up a page describing how to get sqlite3 set up on ruby for various platforms: http://code.whytheluckystiff.net/camping/wiki/BeAlertWhenOnSqlite3
+
+Please follow the instructions _why has provided.  In particular, make sure that you have _why's latest sqlite3-ruby gem installed.
+
+
+== INSTALL:
+
+  % gem install junebug --include-dependencies
+
+
+== NOTES:
+
+Starting and stopping the wiki:
+
+  % ruby wiki [start|stop|restart|run]
+
+
+== CREDITS:
+
+Thans to _why for camping http://code.whytheluckystiff.net/camping/wiki and his tepee wiki example which was the starting point for Junebug, and also to Chris Wanstrath for cheat http://cheat.errtheblog.com/ .
+
+
+== LICENSE:
+
+(The MIT License)
+
+Copyright (c) 2006 Tim Myrtle
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+  
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+   
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER 
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+

data/{RELEASE_NOTES → RELEASE_NOTES.txt}

@@ -1,4 +1,4 @@
-v0.0.15
+= 0.0.15 2006-11-17
 
 The wikiword syntax changed in this release from just straight WikiLink to [[WikiLink]].  Just using camelcase was having trouble coexisting with textile, so I opted instead for the instiki convention which is less problematic.
 

data/Rakefile

@@ -2,70 +2,61 @@ $:.unshift './lib'
 
 require 'rubygems'
 require 'rake'
-
-require 'rake/gempackagetask'
+require 'rake/clean'
 require 'rake/testtask'
+require 'rake/packagetask'
+require 'rake/gempackagetask'
 require 'rake/rdoctask'
-
-require 'junebug'
-
-Gem.manage_gems
-
-gem_spec = Gem::Specification.new do |s|
-  s.name = 'junebug'
-  s.version = Junebug::VERSION
-  s.summary = "Junebug is a minimalist ruby wiki."
-  s.description = "Junebug is a minimalist ruby wiki running on Camping."
-  s.author = "Tim Myrtle"
-  s.email = 'tim.myrtle@gmail.com'
-  s.homepage = 'http://www.junebugwiki.com/'
+require 'rake/contrib/rubyforgepublisher'
+require 'fileutils'
+require 'hoe'
+include FileUtils
+require File.join(File.dirname(__FILE__), 'lib', 'junebug', 'version')
+
+AUTHOR            = "Tim Myrtle"  # can also be an array of Authors
+EMAIL             = "tim.myrtle@gmail.com"
+DESCRIPTION       = "Junebug is a minimalist ruby wiki running on Camping."
+GEM_NAME          = "junebug" # what ppl will type to install your gem
+RUBYFORGE_PROJECT = "junebug" # The unix name for your project
+HOMEPATH          = "http://www.junebugwiki.com"
+RELEASE_TYPES     = %w( gem ) # can use: gem, tar, zip
+
+NAME = "junebug"
+REV  = nil # File.read(".svn/entries")[/committed-rev="(d+)"/, 1] rescue nil
+VERS = ENV['VERSION'] || (Junebug::VERSION::STRING + (REV ? ".#{REV}" : ""))
+CLEAN.include ['**/.*.sw?', '*.gem', '.config', '**/*.db', '**/*.log', 'config.yml', 'deploy/dump/*']
+TEST = ["test/**/*_test.rb"]
+RDOC_OPTS = ['--quiet', '--title', "junebug documentation",
+    "--opname", "index.html", "--line-numbers", "--main", "README", "--inline-source"]
+
+# Generate all the Rake tasks
+# Run 'rake -T' to see list of generated tasks (from gem root directory)
+hoe = Hoe.new(GEM_NAME, VERS) do |p|
+  p.author         = AUTHOR 
+  p.description    = DESCRIPTION
+  p.email          = EMAIL
+  p.summary        = DESCRIPTION
+  p.url            = HOMEPATH
+  p.rubyforge_name = RUBYFORGE_PROJECT
+  p.test_globs     = TEST
+  p.clean_globs    = CLEAN
+  p.need_tar       = false
+  p.changes        = p.paragraphs_of('History.txt', 0..1).join("\n\n")
   
-  s.require_paths = ['lib']
-  s.bindir = 'bin'
-  s.executables = ['junebug']
-  s.files = FileList['README', 'LICENSE', 'CHANGELOG', 'RELEASE_NOTES', 'Rakefile', 'lib/**/*', 'deploy/**/*', 'dump/**/*']
-  s.test_files = FileList['test/**/*']
-
-  s.add_dependency('mongrel', '>=0.3.13.3')
-  s.add_dependency('camping', '>=1.5')
-  s.add_dependency('RedCloth', '>=3.0.4')
-  s.add_dependency('daemons', '>=1.0.3')
-  s.add_dependency('sqlite3-ruby', '>=1.1.0.1')
-  s.add_dependency('activerecord', '>=1.14.4')
+  # == Optional
+  #p.changes        - A description of the release's latest changes.
+  #p.spec_extras    - A hash of extra values to set in the gemspec.
+  p.extra_deps = [
+      ['mongrel',      '>=0.3.13.3'],
+      ['camping',      '>=1.5'],
+      ['RedCloth',     '>=3.0.4'],
+      ['daemons',      '>=1.0.3'],
+      ['sqlite3-ruby', '>=1.1.0.1'],
+      ['activerecord', '>=1.14.4']
+    ]
 end
 
-
-Rake::GemPackageTask.new(gem_spec) do |pkg|
-  pkg.need_zip = false
-  pkg.need_tar = false
-end
-
-
-desc "View tidy html from dev server in editor"
-task :tidy do
-  system("curl http://localhost:3301/#{ENV['PAGE']} | tidy -i -wrap 1000 | #{ENV['VISUAL'] || ENV['EDITOR'] || 'vim' }")
-end
-
-
-desc "Clean up directory"
-task :clean => :clobber_package do
-  rm 'deploy/junebug.db', :force => true
-  rm 'deploy/junebug.log', :force => true
-  Dir['deploy/dump/*'].each { |ext| rm ext }
-  rm 'test/test.log', :force => true
-  rm 'config.yml', :force => true
-end
-
-
-desc 'Test the campground.'
-Rake::TestTask.new(:test) do |t|
-#  t.libs << 'lib'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = true
-end
-
-
-
+#rake test RUBY_FLAGS=''
 
 
 

data/deploy/static/style/base.css

@@ -247,6 +247,7 @@ body {
     background: #f4f4f4;
     border: 1px solid #ddd;
     padding: 8px 20px;
+    margin: 15px 0px;
 }
 
 /* http://longren.org/2006/09/27/wrapping-text-inside-pre-tags */

data/lib/junebug.rb

@@ -6,6 +6,7 @@ require 'camping/session'
 
 Camping.goes :Junebug
 
+require 'junebug/version'
 require 'junebug/helpers'
 require 'junebug/models'
 require 'junebug/views'
@@ -17,8 +18,6 @@ require 'fileutils'
 
 module Junebug
   include Camping::Session
-  
-  VERSION='0.0.17'
 
   def self.create
     Junebug::Models.create_schema :assume => (Junebug::Models::Page.table_exists? ? 1.0 : 0.0)

data/lib/junebug/controllers.rb

@@ -1,4 +1,4 @@
-require 'junebug/diff'
+require 'junebug/ext/diff'
 
 module Junebug::Controllers
   
@@ -29,16 +29,25 @@ module Junebug::Controllers
       render :edit
     end
     
+    # FIXME: no error checking, also no verify quicksave/readonly rights
     def post page_name
       redirect("#{Junebug.config['url']}/login") and return unless logged_in?
       if input.submit == 'save'
-        attrs = { :body => input.post_body, :title => input.post_title, :user_id =>@state.user.id }
-        attrs[:readonly] = input.post_readonly if is_admin?
-        if Page.find_or_create_by_title(page_name).update_attributes( attrs )
-          # redirect Show, input.post_title
-          redirect "#{Junebug.config['url']}/#{input.post_title.gsub(/ /,'+')}"
+        if ! input.quicksave
+          attrs = { :body => input.post_body, :title => input.post_title, :user_id =>@state.user.id }
+          attrs[:readonly] = input.post_readonly if is_admin?
+          Page.find_or_create_by_title(page_name).update_attributes(attrs)
+        else
+          attrs = { :body => input.post_body }
+          attrs[:readonly] = input.post_readonly if is_admin?
+          page = Page.find_by_title(page_name)
+          current_version = page.find_version(page.version)
+          current_version.update_attributes(attrs)
+          page.without_revision { page.update_attributes(attrs) }
         end
-      else
+        # redirect Show, input.post_title
+        redirect "#{Junebug.config['url']}/#{input.post_title.gsub(/ /,'+')}"
+      else # cancel
         redirect "#{Junebug.config['url']}/#{page_name.gsub(/ /,'+')}"
       end
     end
@@ -103,8 +112,10 @@ module Junebug::Controllers
       @v1 = @page.find_version(v1)
       @v2 = @page.find_version(v2)
       
-      @v1_markup = ( @v1.body ? _markup( @v1.body ) : '' )
-      @v2_markup = ( @v2.body ? _markup( @v2.body ) : '' )
+      #@v1_markup = ( @v1.body ? _markup( @v1.body ) : '' )
+      #@v2_markup = ( @v2.body ? _markup( @v2.body ) : '' )
+      @v1_markup = @v1.body || ''
+      @v2_markup = @v2.body || ''
       
       @difftext = diff( @v1_markup , @v2_markup)
       
@@ -157,7 +168,7 @@ module Junebug::Controllers
         @user = User.create :username=>input.username, :password=>input.password
         if @user.errors.empty?
           @state.user = @user
-          redirect(Junebug.startpage)
+          input.return_to.blank? ? redirect(Junebug.startpage) : redirect(Junebug.config['url'] + input.return_to)
           return
         else
           @notice = @user.errors.full_messages[0]

data/lib/junebug/models.rb

@@ -1,5 +1,5 @@
 require 'active_record'
-require 'junebug/acts_as_versioned'
+require 'junebug/ext/acts_as_versioned'
 
 module Junebug::Models