old_sql 1.13.0 → 1.14.0

data/README.rdoc

@@ -10,7 +10,7 @@ Some features of Old SQL are:
   - The design documents, which are nothing more than csv files, can also serve as documentation, and describe the layout of the report in an intuitive way.
   - If you want more fine grained control and report processor can parse the SQL.
   - This also makes it simple to convert legacy reports into Old SQL reports.  
-* Multiple report views (jqGrid, HTML table) that can be configured using the old_sql initializer.
+* Multiple report views (jqGrid, HTML table, and chart) that can be configured using the old_sql initializer.
 * Old SQL uses Devise for authentication, and will install it for you. It can
   even add Devise support to an existing model (by default users).
 * In the report design all data is rounded to a precision that can be set in the old_sql initializer. This feature can also be disabled in the initializer.
@@ -67,14 +67,35 @@ Configure your reports config/old_sql/report.yml. An example configuration is cr
 	# 'report_design' is also optional, and should point to a file in config/old_sql/report_design.
 	# See config/old_sql/report_design/user_old_sql_demo.csv for an example.
 	#
+	# 'report_view' is optional. It overrides the default_report_view defined in the initializer. It
+	# can be set to jqgrid, table, or chart.
+	#
 	# The 'fields' are the headers for the report.
 
-	user:
-  	  description: User
-  	  report_sql: user_old_sql_demo
-  	  report_design: user_old_sql_demo
-  	  #report_processor: User_Old_Sql_Demo_Processor
-  	  fields: 
+	user_jqgrid:
+	description: User jqGrid
+	report_sql: user_old_sql_demo
+	report_design: user_old_sql_demo.csv
+	report_view: jqgrid
+	fields: 
+    	- 'id'
+    	- 'name'
+    
+	user_table:
+	description: User HTML Table
+	report_sql: user_old_sql_demo
+	report_processor: User_Old_Sql_Demo_Processor
+	report_view: table
+	fields: 
+		- 'id'
+		- 'name'
+    
+	user_chart:
+	description: User Chart
+	report_sql: user_old_sql_demo
+	report_design: user_old_sql_demo.yml
+	report_view: chart
+	fields: 
 		- 'id'
 		- 'name'
 
@@ -144,6 +165,14 @@ All css and html template files can be copied to your installation by executing:
 	
 Settings for Old SQL can be configured in config/initializers/old_sql.rb.
 
+== Rake Examples
+
+	rake old_sql:print:range[user_table,'development','2011-03-01','2011-09-01']
+
+	rake old_sql:print:today[user_table,'development']
+
+	rake old_sql:print:week[user_table,'development']
+
 == Contributing to old_sql
  
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet

data/app/controllers/old_sql/report_controller.rb

@@ -10,6 +10,9 @@ module OldSql
     helper_method :jqgrid_col_model
     helper_method :jqgrid_col_names
     helper_method :strip_html
+    helper_method :chart_type
+    helper_method :chart_fields
+    helper_method :chart_data
 
     layout "old_sql/report.html.erb"
     
@@ -50,6 +53,23 @@ module OldSql
       render :template => "old_sql/report/table.html.erb"
     end
     
+    def chart
+      @start_date = params[:start_date]
+      @end_date = params[:end_date]
+      @report_name = params[:report]
+      @report_sql = params[:report_sql].downcase
+      @report_sql_orig = params[:report_sql].downcase
+      
+      @width = OldSql.report_width
+      @height = OldSql.report_height
+      
+      processor = load_base_processor
+      @report = processor.execute_query(@report_sql,@start_date,@end_date,query_vars(@report_name),@reports[@report_name]['report_design'],
+                                        @reports[@report_name]['report_processor'])
+      
+      render :template => "old_sql/report/chart.html.erb"
+    end
+    
     def query
       @start_date = params[:start_date]
       @end_date = params[:end_date]
@@ -173,6 +193,28 @@ module OldSql
       def strip_html html
         OldSql.strip_html html
       end
+      
+      def chart_fields
+        fields =[]
+        
+        i=0
+        @reports[@report_name]['fields'].each do |field|
+          fields << {v:i, label:field}
+          i+=1
+        end
+        
+        json = fields.to_json 
+        json.html_safe
+      end
+      
+      def chart_data
+        json = @report.values.first.to_json
+        json.html_safe
+      end
+      
+      def chart_type
+        @report.keys.first
+      end
   end
 end
 

data/app/views/old_sql/report/chart.html.erb

@@ -0,0 +1,26 @@
+<%= javascript_include_tag "old_sql/MochiKit-1.4.2/lib/MochiKit/MochiKit.js" %>
+<%= javascript_include_tag "old_sql/plotkit-0.9.1/PlotKit/Base.js" %>
+<%= javascript_include_tag "old_sql/plotkit-0.9.1/PlotKit/Layout.js" %>
+<%= javascript_include_tag "old_sql/plotkit-0.9.1/PlotKit/Canvas.js" %>
+<%= javascript_include_tag "old_sql/plotkit-0.9.1/PlotKit/SweetCanvas.js" %>
+
+<script>
+var options = {
+   "IECanvasHTC": "/plotkit/iecanvas.htc",
+   "colorScheme": PlotKit.Base.palette(PlotKit.Base.baseColors()[0]),
+   "xTicks": <%=chart_fields%>,
+   "drawYAxis": true
+};
+
+function drawGraph() {
+    var layout = new PlotKit.Layout("<%=chart_type%>", options);
+    layout.addDataset("sqrt", <%=chart_data%>);
+    layout.evaluate();
+    var canvas = MochiKit.DOM.getElement("graph");
+    var plotter = new PlotKit.SweetCanvasRenderer(canvas, layout, options);
+    plotter.render();
+}
+MochiKit.DOM.addLoadEvent(drawGraph);
+</script>
+
+<div><canvas id="graph" height="555" width="555"></canvas></div>

data/app/views/old_sql/report/index.html.erb

@@ -1,7 +1,7 @@
 <script>
 var host = "<%=@host%>";
 var port = "<%=@port%>";
-var report_view = "<%=@report_view%>";
+var default_report_view = "<%=@report_view%>";
 </script>
 
 <div class="os-block">
@@ -17,7 +17,9 @@ var report_view = "<%=@report_view%>";
 					onchange="report_selected()">
 					<option></option>		
 					<% @reports.each do |report, data| %>
-					<option value="<%= data['name'] %>" report_sql="<%= data['report_sql'] %>" desc="<%= data['description'] %>" name="<%=report%>"><%= data['description'] %></option>
+					<option value="<%= data['name'] %>" report_sql="<%= data['report_sql'] %>" 
+					 desc="<%= data['description'] %>" name="<%=report%>" 
+					 report_view="<%=data['report_view']%>"><%= data['description'] %></option>
 					<% end %>
 				</select>
 			</div>

data/config/routes.rb

@@ -6,6 +6,7 @@ Rails.application.routes.draw do
         match "/query", :to => :query, :as => "query"
         match "/jqgrid", :to => :jqgrid, :as => "jqgrid"
         match "/table", :to => :table, :as => "table"
+        match "/chart", :to => :chart, :as => "chart"
         match "/print", :to => :print, :as => "print"
       end
     end

data/lib/generators/old_sql/install_generator.rb

@@ -59,6 +59,7 @@ module OldSql
       copy_file "user.erb.example", "#{app_path}/config/old_sql/report_sql/user_old_sql_demo.erb"
       copy_file "user_processor.rb.example", "#{app_path}/lib/old_sql/report_processor/user_old_sql_demo_processor.rb"
       copy_file "user_design_template.csv", "#{app_path}/config/old_sql/report_design/user_old_sql_demo.csv"
+      copy_file "user_old_sql_demo_chart_design.yml", "#{app_path}/config/old_sql/report_design/user_old_sql_demo.yml"
     end
     
     def configure_initializer

data/lib/generators/old_sql/templates/reports.yml.example

@@ -15,13 +15,37 @@
 # 'report_design' is also optional, and should point to a file in config/old_sql/report_design.
 # See config/old_sql/report_design/user_old_sql_demo.csv for an example.
 #
+# 'report_view' is optional. It overrides the default_report_view defined in the initializer. It
+# can be set to jqgrid, table, or chart.
+#
 # The 'fields' are the headers for the report.
 
-user:
-  description: User
+user_jqgrid:
+  description: User jqGrid
+  report_sql: user_old_sql_demo
+  report_design: user_old_sql_demo.csv
+  report_view: jqgrid
+  fields: 
+    - 'id'
+    - 'name'
+    
+user_table:
+  description: User HTML Table
   report_sql: user_old_sql_demo
-  report_design: user_old_sql_demo
-  #report_processor: User_Old_Sql_Demo_Processor
+  report_processor: User_Old_Sql_Demo_Processor
+  report_view: table
   fields: 
     - 'id'
-    - 'name'
+    - 'name'
+    
+user_chart:
+  description: User Chart
+  report_sql: user_old_sql_demo
+  report_design: user_old_sql_demo.yml
+  report_view: chart
+  fields: 
+    - 'zero'
+    - 'one'
+    - 'two'
+    - 'three'
+    - 'four'

data/lib/generators/old_sql/templates/user_old_sql_demo_chart_design.yml

@@ -0,0 +1,8 @@
+# Old SQL Chart Design Example
+
+pie:
+  0: id + 10
+  1: id + 20
+  2: id + 50
+  3: id + 70
+  4: id + 100

data/lib/old_sql/report_design/chart.rb

@@ -0,0 +1,24 @@
+module OldSql
+  module ReportDesign
+    class Chart
+      attr_accessor :type, :items
+      
+      def initialize(value = [])
+        @items = value
+      end
+      
+      def type new_type = nil
+        @type = new_type unless new_type.nil?
+        @type
+      end
+      
+      def add(key, value)
+        @items << ChartItem.new(key, value)
+      end
+      
+      def item(index)
+        @items[index]
+      end
+    end
+  end
+end

data/lib/old_sql/report_design/chart_data.rb

@@ -0,0 +1,29 @@
+module OldSql
+  module ReportDesign
+    class ChartData
+      attr_accessor :value, :type
+      
+      COLUMN = 1
+      OPERATOR = 3
+      NUMERIC_LITERAL = 4
+      
+      def initialize(value)
+        @value = value
+        set_type
+      end
+      
+      private
+      
+      def set_type
+        @type = case @value[0]
+                when /[\/*+-\Q()]/
+                  OPERATOR
+                when /[0-9]/
+                  NUMERIC_LITERAL
+                else
+                  COLUMN
+                end
+      end
+    end
+  end
+end

data/lib/old_sql/report_design/chart_item.rb

@@ -0,0 +1,23 @@
+module OldSql
+  module ReportDesign
+    class ChartItem
+      attr_accessor :chart_data, :key
+      
+      def initialize(key, value)
+        @key = key
+        @value = value
+        @chart_data = []
+        
+        @value.split(" ").each {|chart_data| @chart_data << ChartData.new(chart_data)}
+      end
+      
+      def expression?
+        if @chart_data.count>1
+          return true
+        else
+          return false
+        end
+      end
+    end
+  end
+end

data/lib/old_sql/report_design/chart_parser.rb

@@ -0,0 +1,32 @@
+module OldSql
+  module ReportDesign
+    class ChartParser
+      def self.read_file file_to_read
+        raise ArgumentError, 'Argument file is null.' unless !file_to_read.nil?
+        full_path = "#{report_design_path}/#{file_to_read}"
+        raise ArgumentError, "File #{full_path} not found." unless File.exists?(full_path)
+        
+        @chart = Chart.new
+        
+        template = File.read("#{report_design_path}/#{file_to_read}")
+        design_template = YAML.load(Erubis::Eruby.new(template).result)
+        
+        design_template.each do |type, i|
+          @chart.type = type
+          i.each do |key, value|
+            @chart.add(key, value)
+          end
+        end
+      
+        @chart
+      end
+      
+      def self.report_design_path
+        app_path = Rails.public_path.split("/")
+        app_path.delete_at(-1)
+        app_path = app_path.join("/")
+        app_path << "/config/old_sql/report_design"
+      end
+    end
+  end
+end

data/lib/old_sql/report_processor/base.rb

@@ -4,6 +4,11 @@ require 'old_sql/report_design/row'
 require 'old_sql/report_design/cell'
 require 'old_sql/report_design/cell_data'
 
+require 'old_sql/report_design/chart_parser'
+require 'old_sql/report_design/chart'
+require 'old_sql/report_design/chart_item'
+require 'old_sql/report_design/chart_data'
+
 module OldSql
   module ReportProcessor
     class Base
@@ -35,7 +40,8 @@ module OldSql
         end
         
         if design
-          parse_design(design, @resultset)
+          parse_design(design, @resultset) if design =~ /csv/
+          parse_chart_design(design, @resultset) if design =~ /yml/
         else
           loaded_sub_processor = load_sub_processor(sub_processor)
           
@@ -73,7 +79,7 @@ module OldSql
         
         return nil if @rec.nil?
         
-        model = OldSql::ReportDesign::Parser.read_file("#{design}.csv")
+        model = OldSql::ReportDesign::Parser.read_file("#{design}")
         
         init(resultset)
         
@@ -108,6 +114,39 @@ module OldSql
         end
       end
       
+      def parse_chart_design(design, resultset)
+        report_row = []
+        @rec = resultset[0]
+            
+        chart = OldSql::ReportDesign::ChartParser.read_file("#{design}")
+        
+        chart.items.each do |item|
+          key = item.key
+          expression = ""
+          item.chart_data.each do |data|
+            if item.expression?
+              if data.type == OldSql::ReportDesign::ChartData::COLUMN
+                expression << @rec[data.value].to_s
+              elsif data.type == OldSql::ReportDesign::ChartData::OPERATOR ||
+                    data.type == OldSql::ReportDesign::ChartData::NUMERIC_LITERAL
+                expression << data.value
+              end
+            else
+              if data.type == OldSql::ReportDesign::ChartData::COLUMN
+                result = @rec[data.value]
+                if OldSql.round_report_values
+                  result = round(result.to_f, OldSql.rounding_precision)
+                end
+                report_row << [key,result]
+              end
+            end
+          end
+          report_row << [key,eval_expression(expression)] unless expression.length==0
+        end
+        
+        @data = {chart.type=>report_row}
+      end
+      
       def eval_expression expression
         result = 0.0
         begin

data/public/javascripts/old_sql/old_sql.js

@@ -2,6 +2,7 @@ function load_report()
 {	
   report_name = jQuery("#report option:selected").attr('name');
   report_sql = jQuery("#report option:selected").attr('report_sql');
+  report_view = get_report_view();
 
   if (!reported_selected(report_name)) return;
   
@@ -18,6 +19,7 @@ function print_report()
 {
 	report_name = jQuery("#report option:selected").attr('name');
   report_sql = jQuery("#report option:selected").attr('report_sql');
+	report_view = get_report_view();
 	
 	if (!reported_selected(report_name)) return;
 	
@@ -31,6 +33,7 @@ function export_report_to_excel()
 {
 	report_name = jQuery("#report option:selected").attr('name');
   report_sql = jQuery("#report option:selected").attr('report_sql');
+  report_view = get_report_view();
 	
 	if (!reported_selected(report_name)) return;
 	
@@ -50,6 +53,17 @@ function reported_selected(report_name)
   }
 }
 
+function get_report_view()
+{
+  report_view = jQuery("#report option:selected").attr('report_view');
+  
+  if (report_view) {
+    return report_view;
+  } else {
+    return default_report_view;
+  }
+}
+
 jQuery(document).ready(function($){
 	jQuery("#datepicker-start").datetimepicker();
 	jQuery("#datepicker-start").datetimepicker( "option", "dateFormat", "yy/mm/dd" );

metadata

@@ -2,7 +2,7 @@
 name: old_sql
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.13.0
+  version: 1.14.0
 platform: ruby
 authors: 
 - Eddie Gonzales
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-13 00:00:00 Z
+date: 2011-06-14 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: devise
@@ -51,6 +51,7 @@ files:
 - app/controllers/old_sql/report_controller.rb
 - app/views/layouts/old_sql/report.html.erb
 - app/views/old_sql/errors/401.html.erb
+- app/views/old_sql/report/chart.html.erb
 - app/views/old_sql/report/datagrid.html.erb
 - app/views/old_sql/report/index.html.erb
 - app/views/old_sql/report/print.html.erb
@@ -71,11 +72,16 @@ files:
 - lib/generators/old_sql/templates/reports.yml.example
 - lib/generators/old_sql/templates/user.erb.example
 - lib/generators/old_sql/templates/user_design_template.csv
+- lib/generators/old_sql/templates/user_old_sql_demo_chart_design.yml
 - lib/generators/old_sql/templates/user_processor.rb.example
 - lib/old_sql.rb
 - lib/old_sql/engine.rb
 - lib/old_sql/report_design/cell.rb
 - lib/old_sql/report_design/cell_data.rb
+- lib/old_sql/report_design/chart.rb
+- lib/old_sql/report_design/chart_data.rb
+- lib/old_sql/report_design/chart_item.rb
+- lib/old_sql/report_design/chart_parser.rb
 - lib/old_sql/report_design/model.rb
 - lib/old_sql/report_design/parser.rb
 - lib/old_sql/report_design/row.rb
@@ -447,7 +453,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -2765212415048541641
+      hash: 1769007801397558054
       segments: 
       - 0
       version: "0"