webroar 0.6.1 → 0.7.0

data/src/admin_panel/app/models/resource_usage.rb

@@ -28,7 +28,11 @@ class ResourceUsage < ActiveRecord::Base
       t1 = Time.now
       interval = 60 # in seconds
       t2 = t1 - interval
-      result = find(:first, :select => "sum(cpu_usage) as tot_cpu, sum(memory_usage) as tot_memory", :conditions => ["wall_time <= ? and wall_time >= ?",t1,t2])
+      result = select('sum(cpu_usage) as tot_cpu,
+                       sum(memory_usage) as tot_memory'
+                       ).where('wall_time <= ? and
+                       wall_time >= ?',
+                       t1.strftime("%Y-%m-%d %H:%M:%S"),t2.strftime("%Y-%m-%d %H:%M:%S")).first
       if !result
         res = [0.0, 0.0]
       else
@@ -36,12 +40,12 @@ class ResourceUsage < ActiveRecord::Base
       end
       res
     end
-    
+
     #This method is used to get the latest state of the application i.e. its cpu usage and physical memory usage.
     # Returns hash with application name as key and 2 element array as value. In 2 element, first element is cpu usage, 2nd is memory usage in kb
     def get_latest_for_apps
 
-      apps = App.find(:all, :select => "id, name")
+      apps = App.select('id, name')
 
       app_hash = Hash.new
       result_hash = Hash.new
@@ -54,8 +58,12 @@ class ResourceUsage < ActiveRecord::Base
       t1 = Time.now
       interval = 60 # in seconds
       t2 = t1 - interval
-
-      result_set = find(:all, :select => "app_id, sum(cpu_usage) as tot_cpu, sum(memory_usage) as tot_memory", :conditions => ["wall_time <= ? and wall_time >= ?",t1,t2], :group => 'app_id')
+      result_set = select('app_id,
+                           sum(cpu_usage) as tot_cpu,
+                           sum(memory_usage) as tot_memory'
+                           ).where('wall_time <= ? and wall_time >= ?',
+                            t1.strftime("%Y-%m-%d %H:%M:%S"),t2.strftime("%Y-%m-%d %H:%M:%S")
+                            ).group(:app_id)
 
       if result_set.length != 0
         result_set.each do |result|
@@ -77,7 +85,7 @@ class ResourceUsage < ActiveRecord::Base
       end
       latest_apps
     end
-    
+
     #This method Returns the Resource Usage data for the server. This data is used to plot the graph for cpu usage and memory usage of the server.
     #CPU usage is in percentage and the physical memory usage is MBs.
     def get_server_resource_usage(start_time, end_time, type)
@@ -86,25 +94,31 @@ class ResourceUsage < ActiveRecord::Base
       interval = ((end_time - start_time) / 60).to_i
       final_data = Array.new(interval)
       wall_time = Array.new(interval)
-      resource_usages = find(:all, :select=>'wall_time, sum(cpu_usage) as cpu_usage, sum(memory_usage) as memory_usage', :conditions => ["wall_time >= ? and wall_time < ?", start_time, end_time], :group => 'wall_time')
-     resource_usages.each do |resource_usage| 
-          current_time = Time.local(resource_usage.wall_time.year,  resource_usage.wall_time.month, resource_usage.wall_time.day, resource_usage.wall_time.hour, resource_usage.wall_time.min, '0')
-          index = (current_time - start_time) / 60
-          if type == "CPU"
-            total_data = resource_usage.cpu_usage
-          elsif type == "Memory"
-            total_data = resource_usage.memory_usage.to_f / 1024
-          end
-          if max < total_data
-            max = total_data.to_i
-          end
-          final_data[index] = total_data
-          wall_time[index] = current_time.strftime("%H:%M")
-      end  
+      resource_usages = select('wall_time,
+                                sum(cpu_usage) as cpu_usage,
+                                sum(memory_usage) as memory_usage'
+                                ).where('wall_time >= ? and wall_time < ?',
+                                start_time.strftime("%Y-%m-%d %H:%M:%S"), end_time.strftime("%Y-%m-%d %H:%M:%S")
+                                ).group(:wall_time)
+
+      resource_usages.each do |resource_usage|
+        current_time = Time.local(resource_usage.wall_time.year,  resource_usage.wall_time.month, resource_usage.wall_time.day, resource_usage.wall_time.hour, resource_usage.wall_time.min, '0')
+        index = (current_time - start_time) / 60
+        if type == "CPU"
+          total_data = resource_usage.cpu_usage
+        elsif type == "Memory"
+          total_data = resource_usage.memory_usage.to_f / 1024
+        end
+        if max < total_data
+          max = total_data.to_i
+        end
+        final_data[index] = total_data
+        wall_time[index] = current_time.strftime("%H:%M")
+      end
       for i in 0..interval
-          if final_data[i].nil?
-              wall_time[i] = (start_time+i*60).strftime("%H:%M")
-          end
+        if final_data[i].nil?
+          wall_time[i] = (start_time+i*60).strftime("%H:%M")
+        end
       end
       max, slab = get_max_and_slab(max)
       fill_gaps!(final_data)
@@ -112,7 +126,6 @@ class ResourceUsage < ActiveRecord::Base
       return wall_time, final_data, max, slab, step
     end
 
- 
     #This method Returns the Resource Usage data for a particular application. This data is used to plot the graph for cpu usage and memory usage for that application.
     #CPU usage is in percentage and the physical memory usage is MBs.
 
@@ -122,27 +135,35 @@ class ResourceUsage < ActiveRecord::Base
       interval = ((end_time - start_time) / 60).to_i
       final_data = Array.new(interval)
       wall_time = Array.new(interval)
-      resource_usages = find(:all, :select => 'sum(cpu_usage) as cpu_usage, sum(memory_usage) as memory_usage, count(*) as count, wall_time', :conditions => ['app_id = ? and wall_time >= ? and wall_time < ?', app_id, start_time, end_time], :group => 'wall_time')
-        resource_usages.each do |resource_usage|
-            current_time = Time.local(resource_usage.wall_time.year, resource_usage.wall_time.month, resource_usage.wall_time.day, resource_usage.wall_time.hour, resource_usage.wall_time.min, '0')
-            index = (current_time - start_time) / 60
-            count = resource_usage.count
-            if type == "cpu"
-              total_data = resource_usage.cpu_usage
-            elsif type == "memory"
-              total_data = resource_usage.memory_usage.to_f / 1024
-            end
-          if max < total_data
-            max = total_data.to_i
-          end
-          final_data[index] = total_data
-          wall_time[index] = current_time.strftime("%H:%M")
+      resource_usages = select('sum(cpu_usage) as cpu_usage,
+                                sum(memory_usage) as memory_usage,
+                                count(*) as count,
+                                wall_time'
+                                ).where('app_id = ? and
+                                wall_time >= ? and wall_time < ?',
+                                app_id,
+                                start_time.strftime("%Y-%m-%d %H:%M:%S"), end_time.strftime("%Y-%m-%d %H:%M:%S")
+                                ).group(:wall_time)
+      resource_usages.each do |resource_usage|
+        current_time = Time.local(resource_usage.wall_time.year, resource_usage.wall_time.month, resource_usage.wall_time.day, resource_usage.wall_time.hour, resource_usage.wall_time.min, '0')
+        index = (current_time - start_time) / 60
+        count = resource_usage.count
+        if type == "cpu"
+          total_data = resource_usage.cpu_usage
+        elsif type == "memory"
+          total_data = resource_usage.memory_usage.to_f / 1024
+        end
+        if max < total_data
+          max = total_data.to_i
         end
+        final_data[index] = total_data
+        wall_time[index] = current_time.strftime("%H:%M")
+      end
 
-       for i in 0..interval
-          if final_data[i].nil?
-              wall_time[i] = (start_time+i*60).strftime("%H:%M")
-          end
+      for i in 0..interval
+        if final_data[i].nil?
+          wall_time[i] = (start_time+i*60).strftime("%H:%M")
+        end
       end
 
       max,slab = get_max_and_slab(max)
@@ -154,19 +175,19 @@ class ResourceUsage < ActiveRecord::Base
     #This method gives the maximum value for y axis and the value by which the y axis is to be partitioned.
     def get_max_and_slab(max)
       if max == 0
-        max = 1
-        slab = 1
+      max = 1
+      slab = 1
       else
         if max > 8
-          slab = max/8.to_i
+        slab = max/8.to_i
         else
-          slab = 1
+        slab = 1
         end
       end
       max = max.to_i + slab
       return max, slab
     end
-    
+
     # Due to technical reasons, e.g. sleep(60) , thread can remain in sleep state for more than 60 seconds, in this case it may not get sample for that minute.
     # With this method filling any such gaps(consecutive one gap at max) by predicting usage from around values.
     # Parameters : array(Array) of integer or float
@@ -175,23 +196,23 @@ class ResourceUsage < ActiveRecord::Base
       if array.length > 0  # proceed only if array is not empty
         if array[0] == 0 # if first element is zero, predict value from next two values.
           if array.length > 2 and array[1] != 0 and array[2] != 0 and !array[1].nil? and !array[2].nil?
-            array[0] = (array[1] + array[2]) / 2
+          array[0] = (array[1] + array[2]) / 2
           end # if array.length > 2
         end # if array[0].to_i == 0
-        
+
         if array[-1] == 0 #if last element is zero, predict value from previous two values.
           if array.length > 2 and array[-2] != 0 and array[-3] != 0 and !array[-2].nil? and !array[-3].nil?
-            array[-1] = (array[-2] + array[-3]) / 2
+          array[-1] = (array[-2] + array[-3]) / 2
           end # if array.length > 2
         end # if array[-1].to_i == 0
-        
+
         for i in 1..array.length-1 # checking for interminant values
           if array[i] == 0 and array[i-1] != 0 and array[i+1] != 0 and !array[i-1].nil? and !array[i+1].nil?
-            array[i] = (array[i-1] + array[i+1]) / 2
+          array[i] = (array[i-1] + array[i+1]) / 2
           end # if
         end # for
       end # if array.length > 0
     end # fill_gaps
-    
+
   end # self
 end

data/src/admin_panel/app/models/url_breakup_time_sample.rb

@@ -25,17 +25,12 @@ class UrlBreakupTimeSample < ActiveRecord::Base
     #This method gives the data details for the url in the table. The url data is retrived with the help of url ids.
     #The array of url id is supplied as input to this method.
     def get_url_breakup_sample_data(url_id)
-#      url_id_array_size = url_id.size
-      criteria = "url_sample_id in (" + (url_id.join(", ") || '') + ')'      
-#      for i in 0..url_id_array_size-1
-#        str1 =	str1 + "url_sample_id ="+url_id[i].to_s
-#        if i != url_id_array_size-1
-#          str1 = str1 + " or "
-#        end
-#      end
-      query_str = "select method_name, sum(spent_time) as time_spent from url_breakup_time_samples where " + criteria + " group by method_name order by time_spent desc"
-      url_breakup_sample = find_by_sql(query_str)
-      return url_breakup_sample
+      criteria = "url_sample_id in (" + (url_id.join(", ") || '') + ')'
+      return select('method_name,
+                    sum(spent_time) as time_spent'
+                    ).where(criteria
+                    ).group(:method_name
+                    ).order('time_spent desc')
     end
   end
 end

data/src/admin_panel/app/models/url_time_sample.rb

@@ -40,6 +40,7 @@ class UrlTimeSample < ActiveRecord::Base
       else
         url_samples = get_top_db_consuming_url_data(app_id, start_time, end_time)
       end
+      url_samples = url_samples.to_a
       if url_samples.size > 0
         url_samples.each do |url_sample|
           urls << url_sample.url
@@ -73,26 +74,50 @@ class UrlTimeSample < ActiveRecord::Base
     
     #This method is get data of the url hits for an application. This method is called by the get_url_calls_data method.
     def get_url_hits_data(app_id, start_time, end_time)
-      url_samples = find(:all, :select => 'url, sum(number_of_requests) as requests', :conditions => ['app_id = ? and wall_time >= ? and wall_time < ?', app_id, start_time, end_time], :group => 'url', :order => 'requests desc')
-      return	url_samples
+      return select('url, 
+                    sum(number_of_requests) as requests'
+                    ).where('app_id = ? and 
+                    wall_time >= ? and wall_time < ?',
+                    app_id, 
+                    start_time, end_time
+                    ).group(:url
+                    ).order('requests desc')
     end
     
     #This method is get data of the slowest urls of an application. This method is called by the get_url_calls_data method.
     def get_slowest_url_data(app_id, start_time, end_time)
-      url_samples = find(:all, :select=>'url, (sum(total_time) / sum(number_of_requests)) as result', :conditions => ['app_id = ? and wall_time >= ? and wall_time < ?', app_id, start_time, end_time], :group => 'url', :order => 'result desc')
-      return	url_samples
+      return select('url, 
+                    sum(total_time) / sum(number_of_requests) as result'
+                    ).where('app_id = ? and 
+                    wall_time >= ? and wall_time < ?',
+                    app_id, 
+                    start_time, end_time
+                    ).group(:url
+                    ).order('result desc')
     end
     
     #This method is get data of the time consuming urls of an application. This method is called by the get_url_calls_data method.
     def get_time_consuming_url_data(app_id, start_time, end_time)
-      url_samples = find(:all, :select => 'url, sum(total_time) as time', :conditions=>['app_id = ? and wall_time >= ? and wall_time < ?', app_id, start_time, end_time], :group => 'url', :order => 'time desc')
-      return	url_samples
+      return select('url, 
+                    sum(total_time) as time'
+                    ).where('app_id = ? and 
+                    wall_time >= ? and wall_time < ?',
+                    app_id, 
+                    start_time, end_time
+                    ).group(:url
+                    ).order('time desc')
     end
     
     #This method is get data of the top database consuming urls of an application. This method is called by the get_url_calls_data method.
     def get_top_db_consuming_url_data(app_id, start_time, end_time)
-      url_samples = find(:all, :select => 'url, sum(db_time) as time', :conditions=>['app_id = ? and wall_time >= ? and wall_time < ?', app_id, start_time, end_time], :group => 'url', :order => 'time desc')
-      return url_samples
+      return select('url, 
+                    sum(db_time) as time'
+                    ).where('app_id = ? and 
+                    wall_time >= ? and wall_time < ?',
+                    app_id, 
+                    start_time, end_time
+                    ).group(:url
+                    ).order('time desc')
     end
     
     #This method gives the maximum value for y axis and the value by which the y axis is to be partitioned.
@@ -114,7 +139,14 @@ class UrlTimeSample < ActiveRecord::Base
     #This method returns the array of the url for an application that were hit between start_time and end_time
     def get_urls(start_time, end_time, app_id)      
       urls = Array.new
-      url_samples = UrlTimeSample.find:all, :select=>'id, url, sum(total_time) as time', :conditions => ['app_id = ? and wall_time >= ? and wall_time < ?', app_id,  start_time, end_time], :group => 'url', :order => 'time desc'
+      url_samples = select('url, 
+                           sum(total_time) as time'
+                           ).where('app_id = ? and 
+                           wall_time >= ? and wall_time < ?', 
+                           app_id,  
+                           start_time, end_time
+                           ).group(:url
+                           ).order('time desc')
       url_samples.each do |url_sample|
         urls << url_sample.url
       end
@@ -124,15 +156,27 @@ class UrlTimeSample < ActiveRecord::Base
     # This method returns the total_time, db_time and rendering time for an url of an application 
     # for the given period between start_time and end_time
     def get_url_data(start_time, end_time, app_id, url_name)
-      url_samples=UrlTimeSample.find:all, :select=>'sum(total_time) as total_time, sum(db_time) as db_time, sum(rendering_time) as rendering_time, sum(number_of_requests) as requests', :conditions => ['app_id = ? and url = ? and wall_time >= ? and wall_time < ?', app_id, url_name, start_time, end_time]
-      return url_samples
+      return select('sum(total_time) as total_time, 
+                    sum(db_time) as db_time, 
+                    sum(rendering_time) as rendering_time, 
+                    sum(number_of_requests) as requests'
+                    ).where('app_id = ? and 
+                    url = ? and 
+                    wall_time >= ? and wall_time < ?', 
+                    app_id, 
+                    url_name, 
+                    start_time, end_time)
     end
     
     # This method returns the array of the url ids for a particular url of an application 
     # that was hit in a period between start_time and end_time
     def get_url_id(start_time, end_time, url_name,app_id)
-      url_samples = UrlTimeSample.find:all, :select => 'id, url', :conditions => ['url = ? and app_id = ? and wall_time >= ? and wall_time < ?', url_name, app_id, start_time, end_time]
-      return url_samples
+      return select('id, url'
+                    ).where('url = ? and 
+                    app_id = ? and 
+                    wall_time >= ? and wall_time < ?', 
+                    url_name, 
+                    app_id, start_time, end_time)
     end
     
     

data/src/admin_panel/app/views/admin/_application_table.html.erb

@@ -40,7 +40,7 @@ along with WebROaR.  If not, see <http://www.gnu.org/licenses/>.
 =end
 %>
 
-<table width = 95%>
+<table width = 95%  align='center'>
   <%if @info and @info['Application Specification']%>
     <tr>
       <th colspan = 11>Application Specifications</th>
@@ -74,7 +74,7 @@ along with WebROaR.  If not, see <http://www.gnu.org/licenses/>.
     </tr>
     <% end %>
     <tr>
-      <td colspan = 11 align='center'>
+      <td colspan = 11 style="text-align:center;">
         ( <%= @applications.offset + 1 %> to <%= @applications.size + @applications.offset %> of <%= @applications.total_entries %> )
       </td>
     </tr>
@@ -86,17 +86,17 @@ along with WebROaR.  If not, see <http://www.gnu.org/licenses/>.
       </tr>
     <% end %>
     <tr>
-      <td colspan = 11 align = right><%=link_to 'Add Application', :controller => 'application_specification', :action => 'add_application_form'%></td>
+      <td colspan = 11 style="text-align:right;"><%=link_to 'Add Application', :controller => 'application_specification', :action => 'add_application_form'%></td>
     </tr>
   <%else%>
     <tr>
       <th colspan = 9>&nbsp;</th>
     </tr>
     <tr>
-      <td colspan = 9 align = center><%=NO_DEPLOYED_APPLICATION_MESSAGE%></td>
+      <td colspan = 9 style="text-align:center;"><%=NO_DEPLOYED_APPLICATION_MESSAGE%></td>
     </tr>
     <tr>
-      <td colspan = 9 align = right><%=link_to 'Add Application', :controller => 'application_specification', :action => 'add_application_form'%></td>
+      <td colspan = 9 style="text-align:right;"><%=link_to 'Add Application', :controller => 'application_specification', :action => 'add_application_form'%></td>
     </tr>
   <%end%>
 </table>	

data/src/admin_panel/app/views/admin/_feedback_partial.html.erb

@@ -21,15 +21,15 @@
 <%if(flash[:notice].class == Array )%>
   <%= flash[:notice][0] %> Please use <%= link_to 'Configuration',configuration_path %> tab to configure mail settings.
 <% else %>
-  <%form_remote_for :feedback,:update =>"contact_us",:before => 'show_busy_div()',:complete => "hide_busy_div()",:url => {:action => 'send_feedback' },:html => { :onsubmit => 'if(!validate_feedback(this)){return false;}'} do%>
-    <table width='75%'>
+  <%= form_remote_for :feedback,:update =>"contact_us",:before => 'show_busy_div()',:complete => "hide_busy_div()",:url => {:action => 'send_feedback' },:html => { :onsubmit => 'if(!validate_feedback(this)){return false;}'} do%>
+    <table width='75%' align='center'>
       <tr>
         <th colspan='2'>Feedback</th>
       </tr>
       <tr>
         <td colspan = 2>
           <div id = 'error_div' style="padding:0px;">
-            <%= flash[:notice] if flash[:notice] %>
+            <%= raw(flash[:notice]) if flash[:notice] %>
           </div>
           Name<span id = 'needed'>*</span><br>
           <%= text_field :feedback, :name, :value => @fb[:name],:class =>'input_text'%><br><br>
@@ -40,7 +40,7 @@
           Message<span id = 'needed'>*</span><br>
           <%= text_area :feedback, :message, :value => @fb[:message],:class =>'input_text',:rows => 15%><br><br>
 
-          <%= text_captcha_tag %>
+          <%= raw(text_captcha_tag) %>
           <p align="center"><%= submit_tag 'Submit'%></p>
         </td>
       </tr>

data/src/admin_panel/app/views/admin/_report_bug_partial.html.erb

@@ -22,8 +22,8 @@
 <%if(flash[:notice].class == Array )%>
   <%= flash[:notice][0] %> Please use <%= link_to 'Configuration',configuration_path %> tab to configure mail settings.
 <% else %>
-  <%form_remote_for :report_bug,:update =>"contact_us",:before => 'show_busy_div()',:complete => "hide_busy_div()", :url => {:action => 'send_report_bug' },:html => { :onsubmit => 'if(!validate_report_bug(this)){return false;}'} do%>  
-    <table width='75%'>
+  <%= form_remote_for :report_bug,:update =>"contact_us",:before => 'show_busy_div()',:complete => "hide_busy_div()", :url => {:action => 'send_report_bug' },:html => { :onsubmit => 'if(!validate_report_bug(this)){return false;}'} do%>  
+    <table width='75%' align='center'>
       <tr>
         <th colspan='2' >Report Bug / Raise Issue </th>
       </tr>
@@ -31,9 +31,9 @@
         <td colspan = 2 >
           <div id = 'error_div' style="padding:0px;">
             <%if(flash[:notice].class == Array )%>
-                <%= flash[:notice][0] %> Please use <%= link_to 'Configuration',configuration_path %> tab to configure mail settings.
+                <%= raw(flash[:notice][0]) %> Please use <%= link_to 'Configuration',configuration_path %> tab to configure mail settings.
             <% else %>
-              <%= flash[:notice] %>
+              <%= raw(flash[:notice]) %>
             <% end %>
           </div>
           Name<span id = 'needed'>*</span><br>
@@ -48,7 +48,7 @@
           Describe the problem<span id = 'needed'>*</span><br>
           <%= text_area :report_bug, :description, :value => @rb[:description],:class =>'input_text',:rows => 15%><br><br>
 
-          <%= text_captcha_tag %>
+          <%= raw(text_captcha_tag) %>
           <p align='center'><%= submit_tag 'Submit'%></p>
         </td>
       </tr>