rutemaweb 0.8.0 → 0.9.0

data/History.txt

@@ -1,3 +1,11 @@
+=== 0.9.0 / 2008-10-06
+* Updated design (actually designed something that is half-way usable)
+* Left panel lists latest runs with status
+* Scenario list now shows title and description
+* Lists are now paginated
+* requires rutema 1.0.0
+* Moved up to ActiveRecord 2.1.1 and Ramaze 2008.06
+
 === 0.8.0 / 2008-07-03
 * rutemaweb gets it's own gem!
 * Test case presentation now vertical with new ruport formatter.

data/Manifest.txt

@@ -6,7 +6,7 @@ Rakefile
 bin/rutemaweb
 lib/rutemaweb/gems.rb
 lib/rutemaweb/main.rb
-lib/rutemaweb/public/.DS_Store
+lib/rutemaweb/model.rb
 lib/rutemaweb/public/css/style.css
 lib/rutemaweb/public/images/bg_menu.gif
 lib/rutemaweb/public/images/bg_submenu.gif
@@ -17,8 +17,10 @@ lib/rutemaweb/public/images/step_error.png
 lib/rutemaweb/public/images/step_ok.png
 lib/rutemaweb/public/images/step_warn.png
 lib/rutemaweb/public/images/tie_logo.gif
+lib/rutemaweb/public/images/left.png
+lib/rutemaweb/public/images/right.png
 lib/rutemaweb/public/js/folding.js
 lib/rutemaweb/ramaze_controller.rb
 lib/rutemaweb/ruport_formatter.rb
 lib/rutemaweb/view/layout.rhtml
-
+test/test_rutemaweb.rb

data/README.txt

@@ -7,12 +7,10 @@ It can be used as a viewer for database files created with the ActiveRecord repo
 
 == FEATURES/PROBLEMS:
 
-
 == SYNOPSIS:
 rutemaweb [results.db] and browse to http://localhost:7000 for the glorious view
 
 == REQUIREMENTS:
-
 * patir (http://patir.rubyforge.org)
 * activerecord (http://ar.rubyonrails.com/)
 * sqlite3 (http://rubyforge.org/projects/sqlite-ruby/)
@@ -22,11 +20,9 @@ rutemaweb [results.db] and browse to http://localhost:7000 for the glorious view
 * erubis
 
 == INSTALL:
-
 * sudo gem install rutemaweb
 
 == LICENSE:
-
 (The Ruby License)
 
 rutema is copyright (c) 2007 Vassilis Rizopoulos

data/Rakefile

@@ -1,10 +1,9 @@
 #  Copyright (c) 2008 Vassilis Rizopoulos. All rights reserved.
 # -*- ruby -*-
 $:.unshift File.join(File.dirname(__FILE__),"lib")
-$:.unshift File.join(File.dirname(__FILE__),"ext")
+require 'rutemaweb/main'
 require 'rubygems'
 require 'hoe'
-require 'rutemaweb/main'
 
 Hoe.new('rutemaweb', "#{RutemaWeb::Version::STRING}") do |p|
   p.rubyforge_name = 'patir'
@@ -14,15 +13,13 @@ Hoe.new('rutemaweb', "#{RutemaWeb::Version::STRING}") do |p|
   p.description = p.paragraphs_of('README.txt', 1..5).join("\n\n")
   p.url = p.paragraphs_of('README.txt', 0).first.split(/\n/)[1..-1]
   p.changes = p.paragraphs_of('History.txt', 0..1).join("\n\n")
-  p.extra_deps<<['patir',">=0.5.3"]
-  p.extra_deps<<['rutema',">=0.8.0"]
-  p.extra_deps<<['activerecord','=2.0.2']
+  p.extra_deps<<['patir',">=0.6.0"]
+  p.extra_deps<<['rutema',">=1.0.0"]
+  p.extra_deps<<['activerecord','=2.1.1']
   p.extra_deps<<['ruport']
-  p.extra_deps<<['acts_as_reportable']
-  p.extra_deps<<['ramaze','=0.3.9.1']
+  p.extra_deps<<['ramaze','=2008.06']
   p.extra_deps<<['erubis']
-  p.extra_deps<<['highline']
-  p.extra_deps<<['mailfactory']
+  p.extra_deps<<['acts_as_reportable']
   p.spec_extras={:executables=>["rutemaweb"],
     :default_executable=>"rutemaweb"}
 end

data/lib/rutemaweb/gems.rb

@@ -1,9 +1,12 @@
 require 'rubygems'
-gem 'ramaze','=0.3.9.1'
+gem 'ramaze','=2008.06'
 require 'ramaze'
-#class String; undef_method :start_with? end
-gem 'activerecord','=2.0.2'
+#this fixes a clash with activesupport 2.1.1 (because it checks start_with? but not end_with?)
+#end Ramaze on 1.8.6 only creates a start_with? method
+class String; undef_method :start_with? end
+gem 'activerecord','=2.1.1'
 require 'active_record'
+gem 'rutema',"=1.0.0"
 require 'patir/configuration'
 require 'patir/command'
 require 'patir/base'

data/lib/rutemaweb/main.rb

@@ -1,4 +1,5 @@
 $:.unshift File.join(File.dirname(__FILE__),"..")
+require 'rutemaweb/gems'
 require 'rutemaweb/ramaze_controller'
 
 #This is the web frontend for Rutema databases.
@@ -7,7 +8,7 @@ module RutemaWeb
   #This module defines the version numbers for the library
   module Version
     MAJOR=0
-    MINOR=8
+    MINOR=9
     TINY=0
     STRING=[ MAJOR, MINOR, TINY ].join( "." )
   end
@@ -17,6 +18,7 @@ module RutemaWeb
     db_file=parse_command_line(ARGV)
     db_file=File.expand_path(db_file)
     Rutema.connect_to_ar(db_file,logger)  
+    Rutema::UI.ramaze_settings
     Ramaze.start :force=>true
   end
   #Parses the command line arguments

data/lib/rutemaweb/model.rb

@@ -0,0 +1,60 @@
+#  Copyright (c) 2008 Vassilis Rizopoulos. All rights reserved.
+$:.unshift File.join(File.dirname(__FILE__),"..")
+require 'rutemaweb/gems'
+
+
+module Rutema
+
+  module Model
+    #Extensions of Run to accomodate specific view requirements for rutemaweb
+    class Run <ActiveRecord::Base
+      # The view wants to display runs grouped into pages, 
+      # where each page shows page_size runs at a time. 
+      # This method returns the runs on page page_num (starting 
+      # at zero). 
+      def self.find_on_page(page_num, page_size,conditions=nil) 
+        find(:all, 
+        :order => "id DESC", 
+        :limit => page_size, 
+        :conditions=>conditions,
+        :offset => page_num*page_size) 
+      end
+      
+      def status
+        st=:success
+        st=:warning if scenarios.empty?
+        self.scenarios.each do |sc|
+          case sc.status
+          when "warning" || "not_executed"
+            st=:warning unless st==:error
+            break
+          when "error"
+            st=:error
+            break
+          end
+        end
+        return st
+      end
+    end
+    
+    class Scenario <ActiveRecord::Base
+      # The view wants to display scenarios grouped into pages, 
+      # where each page shows page_size scenarios at a time. 
+      # This method returns the scenarios grouped by name on page page_num (starting 
+      # at zero). 
+      def self.find_on_page(page_num, page_size,conditions=nil) 
+        find(:all, 
+        :order => "name ASC",
+        :group=>"name", 
+        :limit => page_size, 
+        :conditions=>conditions,
+        :offset => page_num*page_size) 
+      end
+      
+    end
+  end
+end
+
+
+
+

data/lib/rutemaweb/public/css/style.css

@@ -10,7 +10,7 @@ body {
 table {
 	font: 0.9em Tahoma, sans-serif;
 	color: #666666;
-	text-align: center;
+	text-align: left;
 	
 }
 #logo{float:left; background-image:url(/images/tie_logo.gif); width:234px; height:213px;}

data/lib/rutemaweb/ramaze_controller.rb

@@ -1,18 +1,14 @@
 #  Copyright (c) 2008 Vassilis Rizopoulos. All rights reserved.
 $:.unshift File.join(File.dirname(__FILE__),"..")
-require 'rutema/system'
-require 'rutemaweb/ruport_formatter.rb'
 require 'rutemaweb/gems'
-
+require 'rutemaweb/ruport_formatter.rb'
+require 'rutemaweb/model'
+require 'rutema/system'
 
 module Rutema
   module UI
-    class MainController < Ramaze::Controller
-      map '/'
-      engine :Erubis
-      layout :layout
-      #Time format to use for the start and stop times
-      TIME_FORMAT="%y%m%d - %H:%M:%S"
+    #Helper methods that create HTML snippets
+    module ViewUtilities
       #image filename to use for succesfull scenarios
       IMG_SCE_OK="/images/run_ok.png"
       #image filename to use for failed scenarios
@@ -25,75 +21,261 @@ module Rutema
       IMG_STEP_ERROR="/images/step_error.png"
       #image filename to use for unexecuted steps
       IMG_STEP_WARN="/images/step_warn.png"
+      #Time format to use for the start and stop times
+      TIME_FORMAT="%d/%m/%Y, %H:%M:%S"
+      #The left arrow
+      IMG_LEFT="/images/left.png"
+      #The right arrow
+      IMG_RIGHT="images/right.png"
+      # returns the image tag appropriate for the given status
+      def status_icon status
+        return case status
+        when :warning ,"not_executed" 
+          "<img src=\"#{IMG_STEP_WARN}\" align=\"center\"/>"
+        when :success, "success"
+           "<img src=\"#{IMG_STEP_OK}\" align=\"center\"/>"
+        when :error, "error"
+           "<img src=\"#{IMG_STEP_ERROR}\" align=\"center\"/>"
+        else
+           "<img src=\"#{IMG_STEP_WARN}\" align=\"center\"/>"
+        end
+      end
+      # Returns a string with the correct time format for display
+      def time_formatted time
+        time.strftime(TIME_FORMAT)
+      end
+      #Returns the URL of details page for a run
+      def run_url run
+        "/run/#{run.id}"
+      end
+      
+      def run_summary r
+        Ramaze::Log.debug("Summary snippet for #{r}") if @logger
+        "#{run_link(r)} started at #{time_formatted(r.context.start_time)}"
+      end
+      
+      def run_link r
+        "<a class=\"smallgreytext\" href=\"#{run_url(r)}\">Run #{r.id}</a>"
+      end
+      #will render a hash in a table of key||value rows 
+      def context_table context
+        ret="<table><tr>"
+        context.each do |k,v|
+          ret<<"<td>#{k.to_s}</td><td>#{v.to_s}</td>"
+        end
+        ret<<"</tr></table>"
+      end
+      
+      #returns the pagination HTML for runs
+      def run_page_link page_number,page_total
+        ret=""
+        unless page_total==1
+          ret<<"<a href=\"/runs/#{page_number-1}\">Previous</a>" unless page_number==0
+          ret<<" | Page #{page_number+1}"
+          ret<<" | <a href=\"/runs/#{page_number+1}\">Next</a>" unless page_number==page_total-1
+        end
+        return ret
+      end
+      #returns the pagination HTML for scenarios
+      def scenario_page_link page_number,page_total
+        ret=""
+        unless page_total==1
+          ret<<"<a href=\"/scenarios/#{page_number-1}\">Previous</a>" unless page_number==0
+          ret<<" | Page #{page_number+1}"
+          ret<<" | <a href=\"/scenarios/#{page_number+1}\">Next</a>" unless page_number==page_total-1
+        end
+        return ret
+      end
+      
+      #Gives the HTML to use for the status column of a scenario list
+      def scenario_status r
+          img_src=IMG_SCE_WARN
+          img_src=IMG_SCE_OK if "success"==r.status
+          img_src=IMG_SCE_ERROR if "error"==r.status
+          "<img src=\"#{img_src}\" align=\"center\"/>"
+      end
+    
+    end
+    
+    #Sets the values we need for public and view directories
+    def self.ramaze_settings
+       Ramaze::Global.public_root = File.expand_path(File.join(File.dirname(__FILE__),"public"))
+       Ramaze::Global.view_root = File.expand_path(File.join(File.dirname(__FILE__),"view"))
+    end
+    
+    class MainController < Ramaze::Controller
+      include ViewUtilities
+      map '/'
+      engine :Erubis
+      layout :layout
+      #The number of items to show in lists
+      PAGE_SIZE=10
+      
       def index
-        @panel_content=panel_content(:runs)
-        @content="<p>This is the rutema web interface.<br/>It allows you to browse the contents of the test results database.</p><p>Currently you can view the results for each separate run, the results for a specific scenario (a complete list of all steps executed in the scenario with standard and error output logs) or the complete execution history of a scenario.</p>"
+        @title="Rutema"
+        @panel_content=panel_runs
+        @content_title="Welcome to Rutema"
+        @content="<p>This is the rutema web interface.<br/>It allows you to browse the contents of the test results database.</p><p>Currently you can view the results for each separate run, the results for a specific scenario (a complete list of all steps executed in the scenario with standard and error output logs) or the complete execution history of a scenario.</p><p>The panel on the left shows a list of the ten most recent runs.</p>"
+      end
+      #Displays a paginated list of all runs
+      def runs page=0
+        @title="All runs"
+        @content_title="Runs"
+        @content=""
+        dt=[]
+        total_pages=(Rutema::Model::Run.count/PAGE_SIZE)+1
+        page_number=validated_page_number(page,total_pages)
+        
+        runs=Rutema::Model::Run.find_on_page(page_number,PAGE_SIZE)
+        runs.each do |r| 
+          dt<<[status_icon(r.status),run_summary(r)]
+        end
+        @content<< Ruport::Data::Table.new(:data=>dt,:column_names=>["status","description"]).to_html
+        @content<<"<br/>"
+        @content<<run_page_link(page_number,total_pages)
+        return @content
       end
+      #Displays the details of a run
+      #
+      #Routes to /runs if no id is provided
       def run run_id=""
-        @panel_content=panel_content(:runs)
+        @panel_content=nil
         if !run_id.empty?
+          @panel_content=panel_runs
+          @title="Run #{run_id}"
+          @content_title="Summary of run #{run_id}"
           @content=single_run(run_id)
+        else
+          runs
+        end
+      end
+      
+      #Displays a paginated list of scenarios
+      def scenarios page=0
+        @title="All scenarios"
+        @content_title="Scenarios"
+        @content=""
+        @panel_content=panel_runs
+        runs=Hash.new
+        #find which runs contain each scenario with the same name
+        Ramaze::Log.debug("Getting the runs for each scenario")
+        conditions="name NOT LIKE '%_teardown' AND name NOT LIKE '%_setup'"
+        Rutema::Model::Scenario.find(:all, :conditions=>conditions).each do |sc|
+          nm=sc.name
+          runs[nm]||=[]
+          runs[nm]<<sc.run.id
+        end
+        #the size of the hash is also the number of unique scenario names
+        total_pages=(runs.size / PAGE_SIZE)+1
+        page_number=validated_page_number(page,total_pages)
+        Ramaze::Log.debug("Getting scenarios for page #{page_number}")
+        scens=Rutema::Model::Scenario.find_on_page(page_number,PAGE_SIZE,conditions)
+        #and now build the table data
+        dt=Array.new
+        scens.each do |sc|
+          nm=sc.name
+          #sort the run ids
+          runs[nm]=runs[nm].sort.reverse[0..4]
+          dt<<["<a href=\"/scenario/#{nm}\">#{nm}</a> : ",sc.title,runs[nm].map{|r| " <a href=\"/run/#{r}\">#{r}</a>"}.join(" ")]
         end
+        @content<<Ruport::Data::Table.new(:data=>dt,:column_names=>["name","title","last 5 runs"]).to_html
+        @content<<"<br/>"
+        @content<<scenario_page_link(page_number,total_pages)
       end
+      #Displays the details of a scenario
       def scenario scenario_id=""
-        @panel_content=panel_content(:scenarios)
+        @panel_content=""
         if !scenario_id.empty?
           if scenario_id.to_i==0
             @content=scenario_by_name(scenario_id)
           else
-            @content=scenario_in_a_run(scenario_id)
+            @content=scenario_in_a_run(scenario_id.to_i)
           end
+        else
+          return scenarios
         end
       end
+      
+      def error
+      end
+      
+      def settings
+        if request.post?
+        end
+        @panel_content=panel_runs()
+        @title="Settings"
+        @content_title="Settings"
+        @content=""
+      end
       private 
+      #Returns a valid page number no matter what __page__ is.
+      def validated_page_number page,total_pages
+        page_number=page.to_i if page
+        page_number||=0
+        Ramaze::Log.debug("Total number of run pages is #{total_pages}")
+        if page_number<0 || page_number>total_pages-1
+          Ramaze::Log.warn("Page number out of bounds: #{page_number}. Reseting")
+          page_number=0
+        end
+        return page_number
+      end
+      
       #Renders the summary of all runs for a single scenario
       def scenario_by_name scenario_id
         ret=""
+        @title="Runs for #{scenario_id}"
+        @content_title="Scenario #{scenario_id} runs"
         begin
-          table=Rutema::Model::Scenario.report_table(:all,:conditions=>["name = :spec_name",{:spec_name=>scenario_id}])
+          table=Rutema::Model::Scenario.report_table(:all,:conditions=>["name = :spec_name",{:spec_name=>scenario_id}],
+                                                      :order=>"run_id DESC")
           if table.empty?
-            ret="<p>no results for #{scenario_id}</p>"
+            ret="<p>no results for the given name</p>"
           else
-            table.replace_column("status") do |r| 
-              scenario_status_snippet(r)
-            end
-            table.replace_column("version") {|r| r.version ? r.version : "N/A"}
+            table.replace_column("status"){|r| scenario_status(r)}
+            table.replace_column("name") { |r| "<a href=\"/scenario/#{r}\">#{r}</a>"}
             table.replace_column("start_time"){|r| r.stop_time ? r.start_time.strftime(TIME_FORMAT) : nil}
-            table.replace_column("stop_time"){|r| r.stop_time.strftime(TIME_FORMAT)}
-            table.reorder("status","run_id","version","start_time","stop_time")
+            table.replace_column("stop_time"){|r| r.stop_time ? r.stop_time.strftime(TIME_FORMAT) : nil}
+            table.replace_column("run_id"){|r| "<a class=\"smallgreytext\" href=\"/run/#{r.run_id}\">Run #{r.run_id}</a>"}
+            table.reorder("status","run_id","title","start_time","stop_time")
+            table.column_names=["status","run","title","started at","ended at"]
             ret<<table.to_html
           end
         rescue
-          puts $!
-          "<p>could not retrieve data for #{scenario_id}</p>"
+          @content_title="Error"
+          @title=@content_title
+          Ramaze::Log.error("Could not retrieve data for the scenario name '#{scenario_id}'")
+          Ramaze::Log.debug("#{$!.message}:\n#{$!.backtrace}")
+          ret="<p>could not retrieve data for the given scenario name</p>"
         end
         return ret
       end
       #Renders the information for a specific executed scenario
       #giving a detailed list of the steps, with status and output
       def scenario_in_a_run scenario_id
-        table=Rutema::Model::Step.report_table(:all,:conditions=>["scenario_id = :scenario_id",{:scenario_id=>scenario_id}])
-        if table.empty?
-          ret="<p>no results for #{scenario_id}</p>"
-        else
-          table.replace_column("status") do |r| 
-            img_src=IMG_STEP_WARN if "not_executed"==r.status
-            img_src=IMG_STEP_OK if "success"==r.status
-            img_src=IMG_STEP_ERROR if "error"==r.status
-            "<img src=\"#{img_src}\" align=\"center\"/>"
+        @panel_content=panel_runs
+        begin
+          scenario=Rutema::Model::Scenario.find(scenario_id)
+          @content_title="Summary for #{scenario.name} in run #{scenario.run_id}"
+          @title=@content_title
+          table=Rutema::Model::Step.report_table(:all,
+          :conditions=>["scenario_id = :scenario_id",{:scenario_id=>scenario_id}],
+          :order=>"number ASC")
+          if table.empty?
+            ret="<p>no results for the given id</p>"
+          else
+            table.replace_column("status"){|r| status_icon(r.status)}
+            ret=table.to_vhtml
           end
-          ret=table.to_vhtml
+        rescue
+          @content_title="Error"
+          @title=@content_title
+          Ramaze::Log.error("Could not find scenario with the id '#{scenario_id}'")
+          #Ramaze::Log.debug("#{$!.message}:\n#{$!.backtrace}")
+          ret="<p>Could not find scenario with the given id.</p>"
         end
         return ret
       end
-      #will render a hash in a table of key||value rows 
-      def context_table context
-        ret="<table><tr>"
-        context.each do |k,v|
-          ret<<"<td>#{k.to_s}</td><td>#{v.to_s}</td>"
-        end
-        ret<<"</tr></table>"
-      end
+      
       #Renders the information for a single run providing the context and a list of the scenarios
       def single_run run_id
         ret=""
@@ -105,46 +287,32 @@ module Rutema
         if run.context
           ret<<context_table(run.context)
         end
-        table=Rutema::Model::Scenario.report_table(:all,:conditions=>["run_id = :run_id",{:run_id=>run_id}],:except=>["run_id"])
+        conditions="run_id = :run_id AND name NOT LIKE '%_teardown' AND name NOT LIKE '%_setup'"
+        table=Rutema::Model::Scenario.report_table(:all,
+        :conditions=>[conditions,{:run_id=>run_id}],:except=>["run_id"],
+        :order=>"name ASC")
         if table.empty?
-          return "No scenarios for run #{run_id}"
+          ret<<"No scenarios for run #{run_id}"
         else
-          table.replace_column("status") do |r| 
-            scenario_status_snippet(r)
-          end
-          table.replace_column("version") {|r| r.version ? r.version : "N/A"}
-          table.replace_column("start_time"){|r| r.stop_time ? r.start_time.strftime(TIME_FORMAT) : nil}
-          table.replace_column("stop_time"){|r| r.stop_time.strftime(TIME_FORMAT)}
-          table.reorder("status","name","version","start_time","stop_time")
+          table.replace_column("status") {|r| scenario_status(r) }
+          table.replace_column("name"){ |r| "<a href=\"/scenario/#{r.id}\">#{r.name}</a>" }
+          table.replace_column("start_time"){|r| r.start_time ? r.start_time.strftime(TIME_FORMAT) : nil}
+          table.replace_column("stop_time"){|r| r.stop_time ? r.stop_time.strftime(TIME_FORMAT) : nil}
+          table.reorder("status","name","title","start_time","stop_time")
+          table.column_names=["status","name","title","started at","ended at"]
           ret<<table.to_html
         end
         return ret
       end
-      #Gives the HTML to use for the status column of a scenario list
-      def scenario_status_snippet r
-        if "not_executed"==r.status
-          "<img src=\"#{IMG_SCE_WARN}\"  align=\"center\"/>"
-        else
-          img_src=IMG_SCE_OK if "success"==r.status
-          img_src=IMG_SCE_ERROR if "error"==r.status
-          "<a href=\"/scenario/#{r.data["id"]}\"><img src=\"#{img_src}\" align=\"center\"/></a>"
-        end
-      end
-      def panel_content context
+      
+      def panel_runs
         ret=""
-        if context==:runs
-          #<img src="run_error.png" align="center"/><a href="index.html" class="smallgraytext">1 - 28.06.2007</a>
-          Rutema::Model::Run.find(:all,:select=>"id").reverse.each do |r|
-            ret<<"<a class=\"smallgreytext\" href=\"/run/#{r.id}\">Run #{r.id}</a><br/>"
-          end
-        elsif context==:scenarios
-          result=Rutema::Model::Scenario.find(:all).collect{|r| r.name}
-          result.uniq.sort.each do |r|
-            ret<<"<a class=\"smallgreytext\" href=\"/scenario/#{r}\">#{r}</a><br/>"
-          end
+        Rutema::Model::Run.find(:all,:limit=>10,:order=>"id DESC").each do |r|
+          ret<<"#{status_icon(r.status)} #{run_link(r)}<br/>"
         end
         return ret
       end
+      
     end
   end
 end

data/lib/rutemaweb/ruport_formatter.rb

@@ -1,5 +1,5 @@
 $:.unshift File.join(File.dirname(__FILE__),"..")
-require 'rutema/gems'
+require 'rutemaweb/gems'
 
 module Rutema
   module UI

data/lib/rutemaweb/view/layout.rhtml

@@ -5,7 +5,7 @@
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
 	<link rel="stylesheet" href="/css/style.css" type="text/css" />
 	<script src="/js/folding.js" type="text/javascript"></script>
-	<title>Rutema Historian</title>
+	<title><%=@title%></title>
 </head>
 <body>
 	<div id="page" align="center">
@@ -29,14 +29,16 @@
 			</div>
 			<div id="contenttext">
 				<div style="padding:10px">
-					<span class="titletext">Summary</span>
+					<span class="titletext"><%=@content_title%></span>
 				</div>
 				<div class="bodytext" style="padding:12px;" align="justify"><%=@content%></div>
 			</div>
 			<div id="leftpanel">
+				<% if @panel_content && !@panel_content.empty? %>
 				<div align="justify" class="graypanel">
 					<%=@panel_content%>
 				</div>
+				<% end %>
 			</div>
 			<div id="footer" class="smallgraytext">
 				<a href="/">Home</a> | <a href="http://patir.rubyforge.org/rutema">about rutema</a> | 

data/test/test_rutemaweb.rb

@@ -0,0 +1,107 @@
+$:.unshift File.join(File.dirname(__FILE__),"..","lib")
+require 'test/unit'
+require 'ostruct'
+require 'rutemaweb/ramaze_controller'
+require 'rubygems'
+require 'mocha'
+
+class TestRutemaWeb <Test::Unit::TestCase
+  ActiveRecord::Base.establish_connection(:adapter  => "sqlite3",:database =>":memory:")
+  def setup
+
+  end
+  def test_loading
+    controller=nil
+    assert_nothing_raised() { controller = Rutema::UI::MainController.new }
+    return controller
+  end
+  def test_run
+    cntlr=test_loading
+    r=mock()
+    r.expects(:id).returns(5).times(2)
+    r.expects(:context).returns(OpenStruct.new({:start_time=>Time.now}))
+    r.expects(:status).returns(:success)
+    t=mock()
+    t.expects(:to_html).returns("mocked")
+    Rutema::Model::Run.expects(:find).returns([r])
+    Rutema::Model::Run.expects(:count).returns(1)
+    Ruport::Data::Table.expects(:new).returns(t)
+    #Check nothing is raised when calling run (with everything mocked)
+    assert_nothing_raised(){ cntlr.run}
+  end
+  
+  def test_runs
+    cntlr=test_loading
+    mock_12_runs
+    #Check nothing is raised when calling run (with everything mocked)
+    assert_nothing_raised(){ cntlr.runs}
+    return cntlr
+  end
+  #unit tests for the pagination code of runs
+  def test_pagination
+    cntlr=test_loading
+    mock_12_runs
+    #Check nothing is raised when calling run (with everything mocked)
+    assert_nothing_raised(){ cntlr.runs(1)}
+    return cntlr
+  end
+  def test_page_number_to_large
+    cntlr=test_loading
+    mock_12_runs
+    #Check nothing is raised when calling run with a page number greater than the available
+    assert_nothing_raised(){ cntlr.runs(50)}
+  end
+  def test_page_number_negative
+    cntlr=test_loading
+    mock_12_runs
+    #Check nothing is raised when calling run with a negative page number greater than the available
+    assert_nothing_raised(){ cntlr.runs(-1)}
+  end
+  def test_page_number_bogus
+    cntlr=test_loading
+    mock_12_runs
+    #Check nothing is raised when calling run with a page number that is not a number
+    assert_nothing_raised(){ cntlr.runs("atttaaaaack!!")}
+  end
+  
+  #unit tests for scenarios
+  def test_scenarios
+    ctlr=test_loading
+    mock_12_scenarios
+    Rutema::Model::Run.expects(:find).returns("")
+    assert_nothing_raised() { ctlr.scenarios }
+  end
+  
+  def test_scenario_wrong_arguments
+    ctlr=test_loading
+    ctlr.expects(:error).returns("super")
+    assert_raise(ArgumentError) { ctlr.scenario("bla","blu")  }
+  end
+  private 
+  def mock_12_runs
+    t=mock()
+    t.expects(:to_html).returns("mocked")
+    Ruport::Data::Table.expects(:new).returns(t)
+    runs=[mock(),mock(),mock(),mock(),mock(),mock(),mock(),mock(),mock(),mock(),mock(),mock()]
+    runs.each do |r|
+      r.expects(:id).returns(5).times(2)
+      r.expects(:context).returns(OpenStruct.new({:start_time=>Time.now}))
+      r.expects(:status).returns(:success)
+    end
+    Rutema::Model::Run.expects(:find).returns(runs)
+    Rutema::Model::Run.expects(:count).returns(12)
+  end
+
+  def mock_12_scenarios
+    t=mock()
+    t.expects(:to_html).returns("mocked")
+    Ruport::Data::Table.expects(:new).returns(t)
+    scenarios=[mock(),mock(),mock(),mock(),mock(),mock(),mock(),mock(),mock(),mock(),mock(),mock()]
+    scenarios.each do |sc|
+      sc.expects(:name).returns(scenarios.index(sc).to_s).times(2)
+      sc.expects(:title).returns(scenarios.index(sc).to_s)
+      sc.expects(:run).returns(scenarios.index(sc))
+    end
+    Rutema::Model::Scenario.expects(:find).returns(scenarios).times(2)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rutemaweb
 version: !ruby/object:Gem::Version 
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors: 
 - Vassilis Rizopoulos
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-07-03 00:00:00 +02:00
+date: 2008-10-06 00:00:00 +02:00
 default_executable: rutemaweb
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.5.3
+        version: 0.6.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: rutema
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.8.0
+        version: 1.0.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
@@ -40,7 +40,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 2.0.2
+        version: 2.1.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: ruport
@@ -52,16 +52,6 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
-- !ruby/object:Gem::Dependency 
-  name: acts_as_reportable
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
 - !ruby/object:Gem::Dependency 
   name: ramaze
   type: :runtime
@@ -70,7 +60,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.3.9.1
+        version: "2008.06"
     version: 
 - !ruby/object:Gem::Dependency 
   name: erubis
@@ -83,17 +73,7 @@ dependencies:
         version: "0"
     version: 
 - !ruby/object:Gem::Dependency 
-  name: highline
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: mailfactory
+  name: acts_as_reportable
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
@@ -112,7 +92,7 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.7.0
     version: 
-description: "== DESCRIPTION: rutemaweb is the web frontend for rutema.   It can be used as a viewer for database files created with the ActiveRecord reporter.  == FEATURES/PROBLEMS:  == SYNOPSIS: rutemaweb [results.db] and browse to http://localhost:7000 for the glorious view  == REQUIREMENTS:"
+description: "== DESCRIPTION: rutemaweb is the web frontend for rutema.   It can be used as a viewer for database files created with the ActiveRecord reporter.  == FEATURES/PROBLEMS:  == SYNOPSIS: rutemaweb [results.db] and browse to http://localhost:7000 for the glorious view  == REQUIREMENTS: * patir (http://patir.rubyforge.org) * activerecord (http://ar.rubyonrails.com/) * sqlite3 (http://rubyforge.org/projects/sqlite-ruby/) * ramaze (http://www.ramaze.net/) * ruport (http://rubyreports.org/) * acts_as_reportable * erubis"
 email: riva@braveworld.net
 executables: 
 - rutemaweb
@@ -132,7 +112,7 @@ files:
 - bin/rutemaweb
 - lib/rutemaweb/gems.rb
 - lib/rutemaweb/main.rb
-- lib/rutemaweb/public/.DS_Store
+- lib/rutemaweb/model.rb
 - lib/rutemaweb/public/css/style.css
 - lib/rutemaweb/public/images/bg_menu.gif
 - lib/rutemaweb/public/images/bg_submenu.gif
@@ -143,10 +123,13 @@ files:
 - lib/rutemaweb/public/images/step_ok.png
 - lib/rutemaweb/public/images/step_warn.png
 - lib/rutemaweb/public/images/tie_logo.gif
+- lib/rutemaweb/public/images/left.png
+- lib/rutemaweb/public/images/right.png
 - lib/rutemaweb/public/js/folding.js
 - lib/rutemaweb/ramaze_controller.rb
 - lib/rutemaweb/ruport_formatter.rb
 - lib/rutemaweb/view/layout.rhtml
+- test/test_rutemaweb.rb
 has_rdoc: true
 homepage: 
 post_install_message: 
@@ -170,9 +153,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: patir
-rubygems_version: 1.2.0
+rubygems_version: 1.3.0
 signing_key: 
 specification_version: 2
 summary: rutemaweb is the web frontend for rutema
-test_files: []
-
+test_files: 
+- test/test_rutemaweb.rb