junebug 0.0.12 → 0.0.13

data/CHANGELOG

@@ -1,3 +1,10 @@
+v0.0.13 2006-11-14
+
+ * Link style improvement/simplification
+ * Autolinking urls
+ * use user.role to determine admin rights
+ * is_admin?, logged_in?
+
 v0.0.12 2006-11-13
 
  * content div bugfix

data/Rakefile

@@ -12,7 +12,7 @@ Gem.manage_gems
 
 gem_spec = Gem::Specification.new do |s|
   s.name = 'junebug'
-  s.version = '0.0.12'
+  s.version = '0.0.13'
   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/static/style/base.css

@@ -1,4 +1,13 @@
 
+a:link, a:visited {
+    text-decoration: none;
+    color: #00f;
+}
+a:hover {
+    text-decoration: underline;
+    color: #00f;
+}
+
 
 form { display: inline; }
 
@@ -52,13 +61,6 @@ body {
     color: #ffffff;
 }
 
-#hd a:link, #hd a:visited {
-    text-decoration: none;
-}
-#hd a:hover {
-    text-decoration: underline;
-}
-
 #hd a {
     color: #ffffff;
 }
@@ -77,7 +79,6 @@ body {
     background-color: #ffffff;
 	border:5px solid #929292;
 	border-width:0 5px 5px 0;
-    min-height: 300px;
 }
 
 #yui-main{
@@ -87,11 +88,13 @@ body {
 }
 
 #ft {
-    border: 1px solid #ddd;
-    background-color: #d7dffd;
+    border: 1px solid #eee;
+    background-color: #ddd;
+    color: #333;
     font-size: 100%;
     padding: 8px;
     margin-bottom: 10px;
+    line-height: 150%;
 }
 
 .formbox {
@@ -145,10 +148,7 @@ body {
 .content {
     font-size: 114%;
     padding: 25px;
-}
-
-.content a:link, .content a:visited, .content a:hover {
-    color: #00f;
+    min-height: 300px;
 }
 
 .content h2, .content h3, .content h4 {
@@ -164,14 +164,14 @@ body {
 .content h2 {
     font-size:  129%;
     border-bottom: 2px dotted #bbb;
-    margin-top: 20px;
+    margin-top: 25px;
     margin-bottom: 10px;
 /*    background-color: #d6fbf4;*/
 }
 
 .content h3 {
     font-size:  129%;
-    margin-top: 20px;
+    margin-top: 25px;
     margin-bottom: 10px;
 /*    border-bottom: 1px dotted #bbb;*/
 }
@@ -229,6 +229,7 @@ body {
 /*    font-family:"Bitstream Vera Sans Mono", "Monaco", "Courier", monospace;*/
     display: block;
     background: #eee;
+    border: 1px solid #ddd;
     padding: 8px 20px;
 }
 

data/lib/junebug/controllers.rb

@@ -21,22 +21,19 @@ module Junebug::Controllers
 
   class Edit < R '/(\w+)/edit', '/(\w+)/(\d+)/edit' 
     def get page_name, version = nil
-      redirect("#{Junebug.config['url']}/login") and return if @state.user_id.blank?
+      redirect("#{Junebug.config['url']}/login") and return unless logged_in?
       @page_title = "Edit #{page_name}"
       @page = Page.find(:first, :conditions=>['title = ?', page_name])
-      @page = Page.create(:title => page_name, :user_id=>@state.user_id) unless @page
+      @page = Page.create(:title => page_name, :user_id=>@state.user.id) unless @page
       @page = @page.versions.find_by_version(version) unless version.nil? or version == @page.version.to_s
       render :edit
     end
     
     def post page_name
-      redirect("#{Junebug.config['url']}/login") and return if @state.user_id.blank?
-      if input.submit == 'delete'
-        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, :user_id =>@state.user_id }
-        attrs[:readonly] = input.post_readonly if @state.user_id == 1
+      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}"
@@ -49,8 +46,8 @@ module Junebug::Controllers
   
   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.config['url']}/login") and return unless logged_in?
+      Page.find_by_title(page_name).destroy() if is_admin?
       redirect Junebug.startpage
     end
     
@@ -58,8 +55,8 @@ module Junebug::Controllers
 
   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']}/login") and return unless logged_in?
+      Page.find_by_title(page_name).revert_to!(version) if is_admin?
       redirect "#{Junebug.config['url']}/#{page_name}"
     end
   end
@@ -148,8 +145,7 @@ module Junebug::Controllers
       @user = User.find :first, :conditions => ['username = ? AND password = ?', input.username, input.password]
       if @user
         if @user.password == input.password
-          @state.user_id = @user.id
-          @state.user_username = @user.username
+          @state.user = @user
           redirect(Junebug.startpage); return
         else
           @notice = 'Authentication failed'
@@ -157,8 +153,7 @@ module Junebug::Controllers
       else
           @user = User.create :username=>input.username, :password=>input.password
           if @user.errors.empty?
-            @state.user_id = @user.id
-            @state.user_username = @user.username
+            @state.user = @user
             redirect(Junebug.startpage); return
           else
             @notice = @user.errors.full_messages[0]
@@ -170,9 +165,8 @@ module Junebug::Controllers
    
   class Logout
       def get
-          @state.user_id = nil
-          @state.user_username = nil
-          redirect(Junebug.startpage)
+        @state.user = nil
+        redirect(Junebug.startpage)
       end
   end
 end

data/lib/junebug/helpers.rb

@@ -1,5 +1,14 @@
 
 module Junebug::Helpers
+
+  def logged_in?
+    !@state.user.blank?
+  end
+  
+  def is_admin?
+     @state.user && @state.user.role == Junebug::Models::User::ROLE_ADMIN
+  end
+  
   def last_updated(page)
     from = page.updated_at.to_i
     to = Time.now.to_i
@@ -15,4 +24,19 @@ module Junebug::Helpers
       else             "#{(distance / 1440).round} days"
     end
   end
+
+  def auto_link_urls(text)
+    extra_options = ""
+    text.gsub(/(<\w+.*?>|[^=!:'"\/]|^)((?:http[s]?:\/\/)|(?:www\.))([^\s<]+\/?)([[:punct:]]|\s|<|$)/) do
+      all, a, b, c, d = $&, $1, $2, $3, $4
+      if a =~ /<a\s/i # don't replace URL's that are already linked
+        all
+      else
+        text = b + c
+        text = yield(text) if block_given?
+        %(#{a}<a href="#{b=="www."?"http://www.":b}#{c}"#{extra_options}>#{text}</a>#{d})
+      end
+    end
+  end
+
 end

data/lib/junebug/views.rb

@@ -23,9 +23,10 @@ module Junebug::Views
   def show
     _header (@version.version == @page.version ? :show : :backlinks), @page.title
     _body {
-      _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))
+      _button 'edit', R(Edit, @page.title, @version.version), {:style=>'float: right; margin: 0 0 5px 5px;'} if logged_in? && (@version.version == @page.version && (! @page.readonly || is_admin?))
       _markup @version.body
-      _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)
+      _button 'edit', R(Edit, @page.title, @version.version), {:style=>'float: right; margin: 5px 0 0 5px;'} if logged_in? && (@version.version == @page.version && (! @page.readonly || is_admin?)) && (@version.body && @version.body.size > 100)
+      br :clear=>'all'
     }
     _footer {
       text "Last edited by <b>#{@version.user.username}</b> on #{@page.updated_at.strftime('%B %d, %Y %I:%M %p')}"
@@ -46,7 +47,7 @@ module Junebug::Views
         a 'versions', :href => R(Versions, @page.title)
       }
     }
-    if (@state.user_id == 1)
+    if is_admin?
       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
@@ -71,7 +72,7 @@ module Junebug::Views
             br
             textarea @page.body, :name => 'post_body', :rows => 17, :cols => 80
           }
-          if @state.user_id == 1
+          if is_admin?
             opts = { :type => 'checkbox', :value=>'1', :name => 'post_readonly' }
             opts[:checked] = 1 if @page.readonly
             input opts
@@ -215,13 +216,13 @@ module Junebug::Views
         %Q{<span>#{title}<a href="#{self/R(Edit, page, 1)}">?</a></span>}
       end
     end
-    text RedCloth.new(txt, [ ]).to_html
+    text RedCloth.new(auto_link_urls(txt), [ ]).to_html
   end
 
   def _header type, page_title
     div :id=>'hd' do
       span :id=>'userlinks', :style=>'float: right;' do
-        @state.user_id.blank? ? a('sign in', :href=>R(Login)) : (text "Welcome, #{@state.user_username} - " ; a('sign out', :href=>R(Logout)))
+        logged_in? ? (text "Welcome, #{@state.user.username} - " ; a('sign out', :href=>R(Logout))) : a('sign in', :href=>R(Login))
       end
       if type == :static
         h1 page_title

metadata

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