junebug-wiki 0.0.30 → 0.0.31

data/History.txt

@@ -1,3 +1,7 @@
+= 0.0.31 2007-04-22
+
+* User list and user history pages
+
 = 0.0.30 2007-04-21
 
 * Small style tweaks, make header smaller

data/lib/junebug/controllers.rb

@@ -133,6 +133,29 @@ module Junebug::Controllers
     end
   end
 
+  class Users < R '/all/users'
+    def get
+      @page_title = "Users"
+      #@users = User.find(:all, :order => 'username')
+      @users = User.find_by_sql("SELECT users.id, username, role, count(*) AS count FROM junebug_users AS users, junebug_page_versions AS versions WHERE users.id=versions.user_id GROUP BY users.id ORDER BY count DESC")
+      render :users
+    end
+  end
+
+  class Userinfo < R '/userinfo/(\w+)'
+    def get username
+      @page_title = "User info"
+      @user = User.find_by_username(username)
+      @versions = Page::Version.find(:all, :conditions => ["user_id = ?", @user.id], :order=>'updated_at desc')
+      @groups = Hash.new {|hash,key| hash[key] = []}
+      @versions.each { |p|
+        @groups[p.updated_at.strftime('%Y-%m-%d')].push(p)
+      }
+      render :userinfo
+    end
+  end
+
+
   class Recent < R '/all/recent'
     def get
       @page_title = "Recent Changes"

data/lib/junebug/models.rb

@@ -13,6 +13,7 @@ module Junebug::Models
     validates_format_of :password, :with => /^([\w]*)$/
     validates_length_of :password, :within=>5..30
     has_many :pages
+    has_many :page_versions, :class_name => 'Junebug::Models::Page::Version'
 
     def username=(text)
       write_attribute(:username, (text ? text.strip.downcase : text) )
@@ -53,6 +54,7 @@ module Junebug::Models
   
   class Page::Version < Base
     belongs_to :user, :class_name=>"Junebug::Models::User", :foreign_key=>'user_id' # Hack to prevent camping error on initial load
+    belongs_to :page, :class_name=>"Junebug::Models::Page", :foreign_key=>'page_id' # Hack to prevent camping error on initial load
   end
 
   class CreateJunebug < V 1.0

data/lib/junebug/version.rb

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

data/lib/junebug/views.rb

@@ -106,7 +106,7 @@ module Junebug::Views
           li {
             a "version #{page.version}", :href => R(Show, @page.title_url, page.version)
             text " (#{diff_link(@page, page)}) " if page.version > 1
-            text' - created '
+            text' - edited '
             text last_updated(page)
             text ' ago by '
             strong page.user.username
@@ -164,7 +164,48 @@ module Junebug::Views
     end
     _footer { '' }
   end
-  
+
+  def users
+    _header :static
+    _body do
+      h1 "Users"
+      ul {
+        @users.each { |u|
+          li {
+            a u.username, :href => R(Userinfo, u.username)
+            text " - #{u.count} edits"
+          }
+        }
+      }
+    end
+    _footer { '' }
+  end
+
+  def userinfo
+    _header :static
+    _body do
+      h1 "Edit history: #{@user.username}"
+      
+      @groups.keys.sort.reverse.each { |key|
+        @versions = @groups[key]
+        h2 key
+        ul {
+          @versions.each { |pv|
+            li{
+              a pv.page.title, :href => R(Show, pv.page.title_url)
+              text ", v#{pv.version}"
+              text " (#{diff_link(pv.page, pv)}) " if pv.version > 1
+              # text' - edited '
+              # text last_updated(pv)
+              # text ' ago'
+            }
+          }
+        }
+      }
+    end
+    _footer { '' }
+  end
+
   def list
     _header :static
     _body do
@@ -292,6 +333,10 @@ module Junebug::Views
         text ' | '
         a 'Pages', :href => R(List)
         text ' | '
+        a 'Users', :href => R(Users)
+        text ' | '
+        a 'Admin', :href => R(Orphans)
+        text ' | '
         a 'Help', :href => R(Show, "Junebug_help") 
       end
       

metadata

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