ramaze 0.2.0 → 0.2.1

data/examples/sourceview/public/jquery.treeview.css

@@ -13,12 +13,13 @@
 	float: left;
 	cursor: pointer;
 }
+
 /* fix for IE6 */
 * html div.hitarea {
 	background: #fff;
 	filter: alpha(opacity=0);
 	display: inline;
-	float:none;
+	float: none;
 }
 
 .treeview li { 
@@ -34,14 +35,14 @@
 
 .treeview .hover { color: red; cursor: pointer; }
 
-.treeview li { background: url(/images/tv-item.gif) 0 0 no-repeat; }
-.treeview .collapsable { background-image: url(/images/tv-collapsable.gif); }
-.treeview .expandable { background-image: url(/images/tv-expandable.gif); }
-.treeview .last { background-image: url(/images/tv-item-last.gif); }
-.treeview .lastCollapsable { background-image: url(/images/tv-collapsable-last.gif); }
-.treeview .lastExpandable { background-image: url(/images/tv-expandable-last.gif); }
+.treeview li { background: url(images/tv-item.gif) 0 0 no-repeat; }
+.treeview .collapsable { background-image: url(images/tv-collapsable.gif); }
+.treeview .expandable { background-image: url(images/tv-expandable.gif); }
+.treeview .last { background-image: url(images/tv-item-last.gif); }
+.treeview .lastCollapsable { background-image: url(images/tv-collapsable-last.gif); }
+.treeview .lastExpandable { background-image: url(images/tv-expandable-last.gif); }
 
 .filetree li { padding: 3px 0 1px 16px; }
 .filetree span.folder, .filetree span.file { padding-left: 16px; display: block; height: 15px; }
-.filetree span.folder { background: url(/images/folder.gif) 0 0 no-repeat; }
-.filetree span.file { background: url(/images/file.gif) 0 0 no-repeat; }
+.filetree span.folder { background: url(images/folder.gif) 0 0 no-repeat; }
+.filetree span.file { background: url(images/file.gif) 0 0 no-repeat; }

data/examples/sourceview/public/jquery.treeview.js

@@ -3,13 +3,13 @@
  * 
  * http://bassistance.de/jquery-plugins/jquery-plugin-treeview/
  *
- * Copyright (c) 2006 Jörn Zaefferer, Myles Angell
+ * Copyright (c) 2007 Jörn Zaefferer
  *
  * Dual licensed under the MIT and GPL licenses:
  *   http://www.opensource.org/licenses/mit-license.php
  *   http://www.gnu.org/licenses/gpl.html
  *
- * Revision: $Id: jquery.treeview.js 3522 2007-10-03 08:39:11Z joern.zaefferer $
+ * Revision: $Id: jquery.treeview.js 3752 2007-10-28 02:53:07Z joern.zaefferer $
  *
  */
 
@@ -64,7 +64,7 @@
 		},
 		heightHide: function(animated, callback) {
 			if (animated) {
-				this.animate({ height: "hide" }, animated, callback)
+				this.animate({ height: "hide" }, animated, callback);
 			} else {
 				this.hide();
 				if (callback)
@@ -73,7 +73,7 @@
 		},
 		prepareBranches: function(settings) {
 			// mark last tree items
-			this.filter(":last-child").addClass(CLASSES.last);
+			this.filter(":last-child:not(ul)").addClass(CLASSES.last);
 			// collapse whole tree, or only those marked as closed, anyway except those marked as open
 			this.filter((settings.collapsed ? "" : "." + CLASSES.closed) + ":not(." + CLASSES.open + ")").find(">ul").hide();
 			// return all items with sublists
@@ -98,7 +98,7 @@
 					
             // create hitarea
 			this.prepend("<div class=\"" + CLASSES.hitarea + "\"/>")
-				.find("div." + CLASSES.hitarea).click( toggler )
+				.find("div." + CLASSES.hitarea).click( toggler );
 		},
 		treeview: function(settings) {
 			
@@ -113,7 +113,7 @@
 				var callback = settings.toggle;
 				settings.toggle = function() {
 					return callback.apply($(this).parent()[0], arguments);
-				}
+				};
 			}
 		
 			// factory for treecontroller
@@ -128,7 +128,7 @@
 							return filter ? $(this).parent("." + filter).length : true;
 						}) );
 						return false;
-					}
+					};
 				}
 				// click on first element to collapse tree
 				$(":eq(0)", control).click( handler(CLASSES.collapsable) );

data/examples/sourceview/public/sourceview.js

@@ -1,16 +1,52 @@
-$(document).ready(function(){
+var curfile = null;
+var processing = false;
+
+function setup() {
   $('ul.filetree').treeview({
     persist: 'location',
-		animated: 'fast',
-    unique: true,
-    collapsed: true
+    animated: 'fast',
+    unique: true
   });
 
   $("span.file").click(function(){
-    $('a.selected').removeClass('selected');
-    $('#file_contents').load('/source', { file: $(this).attr('name') });
-    $('a',this).eq(0).addClass('selected');
+    processing = true;
+    file = $('a:eq(0)', this).attr('href').substr(1);
+    if (curfile != file) {
+      curfile = file;
+      $('a.selected').removeClass('selected');
+      $('#file_contents').load('/source'+curfile, {}, function(){ processing = false; });
+      $('a',this).eq(0).addClass('selected');
+    } else {
+      processing = false;
+    }
+
+    if (curfile) {
+      $('#repourl').empty().append(
+        $('<a/>').attr('href', 'http://darcs.ramaze.net/ramaze'+curfile)
+                 .text('download '+curfile.substr(1))
+      );
+      urchinTracker(curfile);
+    }
   });
 
   $('a.selected').parent('span.file').click();
+
+  setInterval(function(){
+    if (processing) return;
+
+    curhash = document.location.hash.substr(1);
+    if(curfile != curhash) {
+      $("a[href='#"+curhash+"']").parents('ul, li').show().end()
+                                 .parent('span.file').click();
+    }
+  }, 100);
+}
+
+$(function(){
+  if (document.location.hash != '') {
+    curfile = document.location.hash.substr(1);
+    $('#file_contents').load('/source'+curfile, {}, setup);
+  } else {
+    setup();
+  }
 });

data/examples/sourceview/sourceview.rb

@@ -4,26 +4,35 @@ require 'coderay'
 require 'ramaze'
 
 # where is the source
-RAMAZE_SRC = File.expand_path(Ramaze::BASEDIR/'..')
+RAMAZE_SRC = File.expand_path(Ramaze::BASEDIR/'..') unless defined? RAMAZE_SRC
+
+# delete cached filetree when source changes
+module Ramaze::SourceReloadHooks
+  module_function
+  def after_safe_load file
+    Ramaze::Cache.actions.delete '/filetree' if file =~ /^#{RAMAZE_SRC}/
+  end
+end
 
 class MainController < Ramaze::Controller
 
   include Remarkably::Common
-  helper :partial, :inform, :cache
-  
-  cache :filetree
+  helper :partial, :inform, :cache, :aspect
   engine :None
-  
-  def source
-    return if request['file'].nil? or request['file'] =~ /\.{2}/
 
-    file = RAMAZE_SRC + request['file']
-    if FileTest.file? file
-      inform :info, "Showing source for #{file}"
-      CodeRay.scan_file(file).html(:line_numbers => :inline)
-    end
+  def index *args
+    redirect "/#/#{args.join('/')}" if args.size > 0
   end
-  
+
+  def source *args
+    file = args.join('/')
+    return if file.empty? or file =~ /\.{2}/
+
+    file[0,0] = RAMAZE_SRC + '/'
+    CodeRay.scan_file(file).html(:line_numbers => :table) if FileTest.file? file
+  end
+  before(:source){ %(<link href='/coderay.css' rel='stylesheet' type='text/css' />) unless request.xhr? }
+
   def filetree
     ul :class => 'filetree treeview' do
       Dir.chdir(RAMAZE_SRC) do
@@ -33,35 +42,29 @@ class MainController < Ramaze::Controller
       end
     end.to_s
   end
-  
-  define_method('coderay.css') do
-    response['Content-Type'] = 'text/css'
-    value_cache[:coderay] ||= CodeRay::Encoders[:html]::CSS.new.stylesheet
-  end
-  
+  cache :filetree
+
   private
 
   def dir_listing dir
     li do
       span dir, :class => 'folder'
       Dir.chdir(dir) do
-        if Dir['*'].any?
-          ul do
-            a '', :href => "##{File.expand_path('.').sub(RAMAZE_SRC,'')}"
-            Dir['*'].each do |d|
-              if FileTest.directory? d
-                dir_listing d
-              else
-                file = File.expand_path(d).sub(RAMAZE_SRC,'')
-                li do
-                  span :class => 'file', :name => file do
-                    a d, :href => "##{file}"
-                  end
+        ul :style => 'display: none;' do
+          a '', :href => "##{File.expand_path('.').sub(RAMAZE_SRC,'')}"
+          Dir['*'].sort.each do |d|
+            if FileTest.directory? d
+              dir_listing d
+            else
+              file = File.expand_path(d).sub(RAMAZE_SRC,'')
+              li do
+                span :class => 'file' do
+                  a d, :href => "##{file}"
                 end
               end
             end
           end
-        end
+        end if Dir['*'].any?
       end
     end
   end
@@ -71,4 +74,4 @@ end
 Ramaze.start :adapter      => :mongrel,
              :load_engines => :Haml,
              :boring       => /(js|gif|css)$/,
-             :port         => 3000
+             :port         => 9950

data/examples/sourceview/template/index.haml

@@ -1,16 +1,22 @@
-!!!
 %html
   %head
     %title Ramaze Source Browser
-    
-    %link{ :rel => 'stylesheet', :type => 'text/css', :href => '/jquery.treeview.css' }/
+
+    %script{ :type => 'text/javascript', :src => '/jquery.js' }=''
+    %script{ :type => 'text/javascript', :src => '/jquery.treeview.js' }=''
+    %script{ :type => 'text/javascript', :src => '/sourceview.js?1.2' }=''
+    %script{ :type => 'text/javascript', :src => 'http://www.google-analytics.com/urchin.js' }=''
+    %script{ :type => 'text/javascript' }
+      _uacct = "UA-1005424-6";
+
     %link{ :rel => 'stylesheet', :type => 'text/css', :href => '/coderay.css' }/
+    %link{ :rel => 'stylesheet', :type => 'text/css', :href => '/jquery.treeview.css' }/
     %style{ :type => 'text/css' }
       :sass
         body
           :font-family sans-serif
           :margin 1.5em
-        
+
         a
           :text-decoration none
           :color #000
@@ -18,26 +24,36 @@
             :color #f00
 
         #dir_listing
-          :float left
-          
+          :position absolute
+          :top 1.5em
+          :width 280px
+
           .filetree
             span.folder, span.file
               :padding-left 19px
               :margin-left 2px
-        
+
         #file_contents
           :margin-left 290px
-          :white-space pre
           :font-size 11pt
-  
+
+          #welcome
+            :text-align center
+            :background-color #f8f8f8
+            :padding 1em
+
+        #repourl
+          :padding-top 4px
+          :text-align right
+          :font-size 10pt
+          a
+            :text-decoration underline
+
   %body
-    #dir_listing
-      = render_partial('/filetree')
-    #file_contents.CodeRay
-      %span{ :style => 'text-align: center' }
+    #file_contents
+      #welcome
         %h1 Welcome to the Ramaze source code browser
         %h3 pick a file on the left to view its contents
-    
-    %script{ :type => 'text/javascript', :src => '/jquery.js' }=""
-    %script{ :type => 'text/javascript', :src => '/jquery.treeview.js' }=""
-    %script{ :type => 'text/javascript', :src => '/sourceview.js' }=""
+    #dir_listing
+      = render_partial('/filetree')
+    #repourl

data/examples/wikore/spec/wikore.rb

@@ -4,6 +4,7 @@ require 'ramaze/spec/helper'
 # if these libraries are missing there is no sense in running the tests,
 # cause they won't work at all. 
 testcase_requires 'hpricot'
+testcase_requires 'sequel'
 
 $:.unshift __DIR__/'../'
 require 'start'

data/examples/wikore/src/controller.rb

@@ -59,7 +59,6 @@ class PageController < Ramaze::Controller
 
   def revert(title)
     page = Page[:title => title]
-    p page
     page.revert
     redirect R(MainController, title)
   end

data/examples/wikore/src/model.rb

@@ -1,24 +1,28 @@
 require 'sequel'
-require 'sequel/sqlite'
 
-case $wikore_db
-when :memory
-  DB = Sequel('sqlite:/')
-else
-  DB = Sequel('sqlite:///wikore.db')
+begin
+  case $wikore_db
+  when :memory
+    DB = Sequel.sqlite
+  else
+    DB = Sequel.sqlite 'wikore.db'
+  end
+rescue NoMethodError
+  raise LoadError, 'Install latest Sequel gem'
 end
 
 module Model
   PAGE_SCHEMA = lambda{
+    primary_key :id
+    boolean :active, :default => true
+    text    :text
+    integer :version
   }
 
   class Page < Sequel::Model(:page)
     set_schema do
-      primary_key :id
-      text    :title, :unique => true, :null => false
-      boolean :active, :default => true
-      text    :text
-      integer :version
+      instance_eval &PAGE_SCHEMA
+      text :title, :unique => true, :null => false
     end
 
     def backup
@@ -37,11 +41,8 @@ module Model
 
   class OldPage < Sequel::Model(:old_page)
     set_schema do
-      primary_key :id
-      text    :title, :unique => false, :null => false
-      boolean :active, :default => true
-      text    :text
-      integer :version
+      instance_eval &PAGE_SCHEMA
+      text :title, :unique => false, :null => false
     end
   end
 

data/lib/proto/src/controller/main.rb

@@ -8,7 +8,7 @@
 #  map '/otherurl'
 # this will force the controller to be mounted on: /otherurl
 
-class MainController < Controller
+class MainController < Ramaze::Controller
 
   # the index action is called automatically when no other action is specified
   def index

data/lib/proto/start.rb

@@ -1,12 +1,11 @@
 #          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
 # All files in this distribution are subject to the terms of the Ruby license.
 
+require 'rubygems'
 require 'ramaze'
 
-include Ramaze
-
 require 'src/controller/main'
 require 'src/element/page'
 require 'src/model'
 
-Ramaze.start
+Ramaze.start :port => 7000

data/lib/ramaze.rb

@@ -34,6 +34,7 @@ require 'ramaze/sourcereload'
 # Complete
 require 'ramaze/dispatcher'
 require 'ramaze/template/ezamar'
+require 'ramaze/contrib'
 
 module Ramaze
 
@@ -59,6 +60,8 @@ module Ramaze
         trait[:essentials].each do |obj|
           obj.startup(options)
         end
+      else
+        Global.startup(options)
       end
     end