junebug 0.0.10 → 0.0.11

data/CHANGELOG

@@ -1,3 +1,10 @@
+v0.0.11 2006-11-13
+
+ * Added revert
+ * Versioning bugfix
+ * Changed delete operation
+ * Added 'role' user field
+
 v0.0.10 2006-11-12
 
  * Submit bugfix

data/Rakefile

@@ -12,7 +12,7 @@ Gem.manage_gems
 
 gem_spec = Gem::Specification.new do |s|
   s.name = 'junebug'
-  s.version = '0.0.10'
+  s.version = '0.0.11'
   s.summary = "Junebug is a minimalist ruby wiki."
   s.description = "Junebug is a minimalist ruby wiki running on Camping."
   s.author = "Tim Myrtle"

data/deploy/Rakefile

@@ -5,15 +5,26 @@ require 'rake'
 
 require 'junebug/config'
 
-desc "Update stylesheets"
-task :update_stylesheets do
-  junebug_root = Junebug::Config.rootdir
-  puts junebug_root
-  cp File.join(junebug_root, 'deploy', 'static', 'style', 'base.css'), File.join('static', 'style')
-end
+namespace :update do
+  
+  desc "Update stylesheets"
+  task :stylesheets do
+    junebug_root = Junebug::Config.rootdir
+    cp_r File.join(junebug_root, 'deploy', 'static'), '.'
+  end
+
+  desc "Update rakefile"
+  task :rakefile do
+    junebug_root = Junebug::Config.rootdir
+    cp File.join(junebug_root, 'deploy', 'Rakefile'), '.'
+  end
 
+  desc "Update everything"
+  task :everything => [:stylesheets, :rakefile] do
 
+  end
 
+end
 
 
 

data/deploy/static/style/base.css

@@ -131,6 +131,16 @@ body {
     color: #822;
 }
 
+.admin {
+    float: left;
+/*    background-color: #ffa;*/
+}
+
+.admin input.button {
+    background-color: #ffa;
+    font-size: 85%;
+    margin: 0;
+}
 
 /* WIKI CONTENT STYLES */
 .content {

data/lib/junebug/controllers.rb

@@ -35,7 +35,7 @@ module Junebug::Controllers
         Page.find_by_title(page_name).destroy() if @state.user_id == 1
         redirect Junebug.startpage
       elsif input.submit == 'save'
-        attrs = { :body => input.post_body, :title => input.post_title }
+        attrs = { :body => input.post_body, :title => input.post_title, :user_id =>@state.user_id }
         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
@@ -46,6 +46,23 @@ module Junebug::Controllers
       end
     end
   end
+  
+  class Delete < R '/(\w+)/delete'
+    def get page_name
+      redirect("#{Junebug.config['url']}/login") and return if @state.user_id.blank?
+      Page.find_by_title(page_name).destroy() if @state.user_id == 1
+      redirect Junebug.startpage
+    end
+    
+  end
+
+  class Revert < R '/(\w+)/(\d+)/revert'
+    def get page_name, version
+      redirect("#{Junebug.config['url']}/login") and return if @state.user_id.blank?
+      Page.find_by_title(page_name).revert_to!(version) if @state.user_id == 1
+      redirect "#{Junebug.config['url']}/#{page_name}"
+    end
+  end
 
   class Versions < R '/(\w+)/versions'
     def get page_name

data/lib/junebug/models.rb

@@ -4,6 +4,9 @@ require 'acts_as_versioned'
 module Junebug::Models
 
   class User < Base
+    
+    ROLE_USER = 0
+    ROLE_ADMIN = 10
     validates_uniqueness_of :username
     validates_format_of :username, :with => /^([\w]*)$/
     validates_length_of :username, :within=>3..30
@@ -41,8 +44,9 @@ module Junebug::Models
     def self.up
       create_table :junebug_users do |t|
         t.column :id,       :integer, :null => false
-        t.column :username, :string
-        t.column :password, :string
+        t.column :username, :string, :null => false
+        t.column :password, :string, :null => false
+        t.column :role,     :integer, :default => 0
       end
       create_table :junebug_pages do |t|
         t.column :title, :string, :limit => 255
@@ -66,7 +70,7 @@ module Junebug::Models
         username = 'admin'
         password = 'password'
       end
-      admin = User.create :username => username, :password => password
+      admin = User.create :username => username, :password => password, :role => User::ROLE_ADMIN
       
       # Install some default pages
       pages_file = File.dirname(__FILE__) + "/../../fixtures/junebug_pages.yml"

data/lib/junebug/views.rb

@@ -24,9 +24,9 @@ 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 && (! @page.readonly || @state.user_id == 1))
+        _button 'edit', 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
+        _button 'edit', 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 && @version.body.size > 100)
       }
     }
     _footer {
@@ -45,9 +45,15 @@ module Junebug::Views
         a '«older', :href => R(Show, @page.title, @version.version-1) unless @version.version == 1
         a 'newer»', :href => R(Show, @page.title, @version.version+1) unless @version.version == @page.version
         a 'current', :href => R(Show, @page.title) unless @version.version == @page.version
-        a 'show all', :href => R(Versions, @page.title)
+        a 'versions', :href => R(Versions, @page.title)
       }
     }
+    if (@state.user_id == 1)
+      div.admin {
+        _button 'delete', R(Delete, @page.title), {:onclick=>'return confirm("Sure you want to delete?")'} if @version.version == @page.version
+        _button 'revert to', R(Revert, @page.title, @version.version), {:onclick=>'return confirm("Sure you want to revert?")'} if @version.version != @page.version
+      }
+    end
   end
 
   def edit
@@ -66,7 +72,7 @@ module Junebug::Views
             p {
               label 'Page Content'
               br
-              textarea @page.body, :name => 'post_body', :rows => 20, :cols => 80
+              textarea @page.body, :name => 'post_body', :rows => 17, :cols => 80
             }
             if @state.user_id == 1
               opts = { :type => 'checkbox', :value=>'1', :name => 'post_readonly' }
@@ -77,7 +83,6 @@ module Junebug::Views
             end
             input :type => 'submit', :name=>'submit', :value=>'cancel', :class=>'button', :style=>'float: right;'
             input :type => 'submit', :name=>'submit', :value=>'save', :class=>'button', :style=>'float: right;'
-            input :type => 'submit', :name=>'submit', :value=>'delete', :class=>'button', :onclick=>'return confirm("You sure?")'
           end
           a 'syntax help', :href => 'http://hobix.com/textile/', :target=>'_blank'
           br :clear=>'all'
@@ -104,7 +109,7 @@ module Junebug::Views
             text last_updated(page)
             text ' ago by '
             strong page.user.username
-            text ' (current)' if i == 0
+            text ' (current)' if @page.version == page.version
           }
         end
       }
@@ -195,9 +200,10 @@ module Junebug::Views
     }
   end
 
-  def _button(text, options={})
-    form :method=>:get, :action=>options[:href] do
-      input.button :type=>'submit', :name=>'submit', :value=>text, :style=>options[:style]
+  def _button(text, href, options={})
+    form :method=>:get, :action=>href do
+      opts = {:type=>'submit', :name=>'submit', :value=>text}.merge(options)
+      input.button opts
     end
   end
 

data/test/fixtures/junebug_users.yml

@@ -2,3 +2,4 @@ id_1:
   id: 1
   username: admin
   password: password
+  role: 10

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: junebug
 version: !ruby/object:Gem::Version 
-  version: 0.0.10
-date: 2006-11-12 00:00:00 -08:00
+  version: 0.0.11
+date: 2006-11-13 00:00:00 -08:00
 summary: Junebug is a minimalist ruby wiki.
 require_paths: 
 - lib