junebug-wiki 0.0.29 → 0.0.30

data/History.txt

@@ -1,3 +1,11 @@
+= 0.0.30 2007-04-21
+
+* Small style tweaks, make header smaller
+* Changed quicksave checkbox to 'minor update' button
+* Fixed issue with creation of pages when first viewing them, before explicitly saving
+* Orphans page (/all/orphans)
+* Backlink bugfix
+
 = 0.0.29 2007-04-15
 
 * Support Unicode wikiwords. Thanks Julian Tarkhanov

data/deploy/public/style/base.css

@@ -74,11 +74,13 @@ body {
 
 #hd #search {
     float: right;
-    margin-top: 5px;
+/*    margin-top: 5px;*/
+    margin-right: 10px;
 }
 
 #hd #search input {
-    margin-bottom: 0px;
+/*    margin-bottom: 0px;*/
+    margin: 0px;
 }
 
 #hd a {

data/lib/junebug.rb

@@ -1,7 +1,7 @@
 $:.unshift File.dirname(__FILE__) # for running in foreground in dev
 $KCODE = 'u'
 require 'rubygems'
-require_gem 'camping', '>=1.5'
+gem 'camping', '>=1.5'
 require 'camping/session'
 
 Camping.goes :Junebug

data/lib/junebug/controllers.rb

@@ -27,9 +27,14 @@ module Junebug::Controllers
     def get page_name, version = nil
       redirect("/login?return_to=#{CGI::escape(@env['REQUEST_URI'])}") and return unless logged_in?
       page_name_spc = page_name.gsub(/_/,' ')
-      @page = Page.find(:first, :conditions=>['title = ?', page_name_spc])
-      @page = Page.create(:title => page_name_spc, :user_id=>@state.user.id) unless @page
-      @page = @page.versions.find_by_version(version) unless version.nil? or version == @page.version.to_s
+      @page = Page.find_by_title(page_name_spc)
+      if @page.nil?
+        # new page
+        @page = Page.new(:title=>page_name_spc, :body=>'') unless @page
+      else
+        # check for version request
+        @page = @page.versions.find_by_version(version) unless version.nil? or version == @page.version.to_s
+      end
       @page_title = "Editing: #{page_name_spc}"
       render :edit
     end
@@ -39,19 +44,24 @@ module Junebug::Controllers
       redirect("/login?return_to=#{CGI::escape(@env['REQUEST_URI'])}") and return unless logged_in?
       page_name_spc = page_name.gsub(/_/,' ')
       if input.submit == 'save'
-        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_spc).update_attributes(attrs)
+        attrs = { :body => input.post_body, :title => input.post_title, :user_id =>@state.user.id }
+        attrs[:readonly] = input.post_readonly if is_admin?
+        @page = Page.find_by_title(page_name_spc)
+        if @page.nil?
+          # new page
+          @page = Page.create(attrs)
         else
-          attrs = { :body => input.post_body }
-          attrs[:readonly] = input.post_readonly if is_admin?
-          page = Page.find_by_title(page_name_spc)
-          current_version = page.find_version(page.version)
-          current_version.update_attributes(attrs)
-          page.without_revision { page.update_attributes(attrs) }
+          @page.update_attributes(attrs)
         end
         redirect Show, input.post_title.gsub(/ /,'_')
+      elsif input.submit == 'minor edit'
+        attrs = { :body => input.post_body }
+        attrs[:readonly] = input.post_readonly if is_admin?
+        page = Page.find_by_title(page_name_spc)
+        current_version = page.find_version(page.version)
+        current_version.update_attributes(attrs)
+        page.without_revision { page.update_attributes(attrs) }
+        redirect Show, input.post_title.gsub(/ /,'_')
       else # cancel
         redirect Show, page_name
       end
@@ -107,11 +117,22 @@ module Junebug::Controllers
       page_name_spc = page_name.gsub(/_/,' ')
       @page = Page.find_by_title(page_name_spc)
       @page_title = "Backlinks for: #{page_name_spc}"
-      @pages = Page.find(:all, :conditions => ["body LIKE ?", "%#{page_name_spc}%"])
+      @pages = Page.find(:all, :conditions => ["body LIKE ? OR body LIKE ?", "%[[#{page_name_spc}]]%", "%[[#{page_name_spc}|%"])
       render :backlinks
     end
   end
 
+  class Orphans < R '/all/orphans'
+    def get
+      @page_title = "Orphan pages"
+      @pages = Page.find :all, :order => 'title'
+      @pages = @pages.reject do |page|
+        linked_pages = Page.find(:all, :conditions => ["body LIKE ? OR body LIKE ?", "%[[#{page.title}]]%", "%[[#{page.title}|%"]).length > 0
+      end
+      render :orphans
+    end
+  end
+
   class Recent < R '/all/recent'
     def get
       @page_title = "Recent Changes"

data/lib/junebug/version.rb

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

data/lib/junebug/views.rb

@@ -34,7 +34,7 @@ module Junebug::Views
       br :clear=>'all'
     end
     _footer {
-      text "Last edited by <b>#{@version.user.username}</b> on #{@page.updated_at.strftime('%B %d, %Y %I:%M %p')}"
+      text "Page last edited by <b>#{@version.user.username}</b> on #{@page.updated_at.strftime('%B %d, %Y %I:%M %p')}"
       text " (#{diff_link(@page, @version)}) " if @version.version > 1
       br
       text '<b>[readonly]</b> ' if @page.readonly
@@ -77,6 +77,9 @@ module Junebug::Views
             textarea @page.body, :name => 'post_body', :rows => 17, :cols => 80
           }
           input :type => 'submit', :name=>'submit', :value=>'cancel', :class=>'button', :style=>'float: right;'
+          if @page.user_id == @state.user.id
+            input :type => 'submit', :name=>'submit', :value=>'minor edit', :class=>'button', :style=>'float: right;', :accesskey => 'm'
+          end
           input :type => 'submit', :name=>'submit', :value=>'save', :class=>'button', :style=>'float: right;', :accesskey => 's'
           if is_admin?
             opts = { :type => 'checkbox', :value=>'1', :name => 'post_readonly' }
@@ -85,10 +88,6 @@ module Junebug::Views
             text " Readonly "
             br
           end
-          if @page.user_id == @state.user.id
-            input :type=>'checkbox', :value=>'1', :name=>'quicksave'
-            text " Minor edit (don't increment version) "
-          end
 
         end
         br :clear=>'all'
@@ -150,7 +149,22 @@ module Junebug::Views
     _footer { '' }
   end
 
-
+  def orphans
+    _header :show
+    _body do
+      h1 @page_title
+      ul {
+        @pages.each { |p|
+          li{
+            a p.title, :href => R(Show, p.title_url)
+            text ' - empty page' if p.body.nil? or p.body.empty? 
+          }
+        }
+      }
+    end
+    _footer { '' }
+  end
+  
   def list
     _header :static
     _body do
@@ -255,32 +269,32 @@ module Junebug::Views
       
       span :id=>'userlinks' do
         if logged_in?
-          text "Welcome, #{@state.user.username} - "
+          text "Hi, #{@state.user.username} - "
           a 'sign out', :href=>"#{R(Logout)}?return_to=#{@env['REQUEST_URI']}"
         else
           a 'sign in', :href=> "#{R(Login)}?return_to=#{@env['REQUEST_URI']}"
         end
       end
-    
+
+      span :id=>'search' do
+        # text 'Search: '
+        form :action => R(Search), :method => 'post' do
+          input :name => 'q', :type => 'text', :value=>(''), :accesskey => 's' 
+          #input :type => 'submit', :name => 'search', :value => 'Search',
+          #  :style=>'margin: 0 0 5px 5px;'
+        end
+      end
+   
       span :id=>'navlinks' do
         a 'Home',  :href => R(Show, Junebug.config['startpage'])
         text ' | '
-        a 'Recent Changes', :href => R(Recent)
+        a 'Updates', :href => R(Recent)
         text ' | '
-        a 'All Pages', :href => R(List)
+        a 'Pages', :href => R(List)
         text ' | '
         a 'Help', :href => R(Show, "Junebug_help") 
       end
       
-      span :id=>'search' do
-        text 'Search: '
-        form :action => R(Search), :method => 'post' do
-          input :name => 'q', :type => 'text', :value=>(''), :accesskey => 's' 
-          #input :type => 'submit', :name => 'search', :value => 'Search',
-          #  :style=>'margin: 0 0 5px 5px;'
-        end
-      end
-
       br :clear => 'all'
       
       # if type == :static

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: junebug-wiki
 version: !ruby/object:Gem::Version 
-  version: 0.0.29
-date: 2007-04-15 00:00:00 -07:00
+  version: 0.0.30
+date: 2007-04-21 00:00:00 -07:00
 summary: Junebug is a minimalist ruby wiki running on Camping.
 require_paths: 
 - lib