old_sql 1.17.0 → 1.18.0

data/README.md

@@ -13,15 +13,17 @@ Some features of Old SQL are:
     and describe the layout of the report in an intuitive way.
   - If you want more fine grained control, a custom report processor can parse the SQL.
   - Simple to convert legacy reports into Old SQL reports.  
-* 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).
+* Multiple report views (jqGrid, HTML table, and chart).
+* Bar and Pie charts using Google Charts.
 * 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.
 * Old SQL has rake tasks for running the reports and outputting the result as CSV. This can simplify testing. 
   It also allows reports to be run as a cron task.
 * The look of Old SQL can be customized.
 * Support for printing and exporting to CSV.
+* 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).
+* Support for multiple database connections.
 
 Quick Setup and Demo
 --------------------
@@ -40,9 +42,16 @@ Quick Setup and Demo
 
 Screenshots
 -----------
+#### jqGrid
 
 ![jqGrid view](https://github.com/egonz/old_sql/raw/master/screenshots/jqgrid.png "jqGrid view")
+
+#### HTML Table
+
 ![table view](https://github.com/egonz/old_sql/raw/master/screenshots/table.png "Table view")
+
+#### Google Charts
+
 ![table view](https://github.com/egonz/old_sql/raw/master/screenshots/chart.png "Chart view")
 
 Installation
@@ -86,6 +95,9 @@ Configure your reports config/old_sql/report.yml. An example configuration is cr
 	# 'report_view' is optional. It overrides the default_report_view defined in the initializer. It
 	# can be set to jqgrid, table, or chart.
 	#
+	# Optionally use 'report_db' to specify a class that extends ActiveRecord::Base. Use the require
+	# path for your class. E.g. foo/my_alternative_db.
+	#
 	# The 'fields' are the headers for the report.
 
 	user_jqgrid:

data/app/controllers/old_sql/report_controller.rb

@@ -46,8 +46,7 @@ module OldSql
       @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'])
+      @report = processor.execute_query(@reports[@report_name],@start_date,@end_date,query_vars(@report_name))
       
       render :template => "old_sql/report/table.html.erb"
     end
@@ -63,8 +62,7 @@ module OldSql
       @height = 500
       
       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'])
+      @report = processor.execute_query(@reports[@report_name],@start_date,@end_date,query_vars(@report_name))
       
       render :layout => 'old_sql/chart.html.erb', :template => "old_sql/report/chart.html.erb"
     end
@@ -77,8 +75,7 @@ module OldSql
       @report_sql_orig = params[:report_sql].downcase
       
       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'])
+      @report = processor.execute_query(@reports[@report_name],@start_date,@end_date,query_vars(@report_name))
       
       respond_to do |format|
         format.json { render :json => @report.to_json}
@@ -115,8 +112,7 @@ module OldSql
       @report_sql_orig = params[:report_sql].downcase
       
       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'])
+      @report = processor.execute_query(@reports[@report_name],@start_date,@end_date,query_vars(@report_name))
       
       render :template => "old_sql/report/print.html.erb"
     end
@@ -194,11 +190,13 @@ module OldSql
       end
       
       def chart_data
+        return nil if @report.nil?
         json = @report.values.first.to_json
         json.html_safe
       end
       
       def chart_type
+        return nil if @report.nil?
         @report.keys.first
       end
   end

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

@@ -1,6 +1,7 @@
 <html>
 <head>
 <title><%=OldSql.report_select_page_title%></title>
+<%= stylesheet_link_tag "old_sql/old_sql.css" %>
 <!--Load the AJAX API-->
 <script type="text/javascript" src="https://www.google.com/jsapi"></script>
 <%= javascript_include_tag "old_sql/chart.js" %>

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

@@ -1,3 +1,6 @@
+<% if @report.nil? %>
+	The report has no data for this date range.
+<% else %>
 <script type="text/javascript">
 	var chart_title = "<%=@reports[@report_name]['description']%> Report";
 	var chart_type = "<%=chart_type%>";
@@ -7,4 +10,5 @@
 	var height = <%=@height%>;
 </script>
 
-<div id="chart_div"></div>
+<div id="chart_div"></div>
+<% end %>

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

@@ -1,3 +1,6 @@
+<% if @report.nil? %>
+	The report has no data for this date range.
+<% else %>
 <script>
 	print();
 </script>
@@ -63,4 +66,5 @@ th {
 			</tr>
 		<% end %>
 	</table>
-</div>
+</div>
+<% end %>

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

@@ -1,3 +1,6 @@
+<% if @report.nil? %>
+	The report has no data for this date range.
+<% else %>
 <%= stylesheet_link_tag "old_sql/table.css" %>
 <%= javascript_include_tag "old_sql/table.js" %>
 
@@ -17,4 +20,5 @@
 	<% end %>
 	</tr>
 <% end %>	
-</table>
+</table>
+<% end %>

data/lib/generators/old_sql/copy_assets_generator.rb

@@ -17,6 +17,7 @@ module OldSql
       copy_file "#{gem_path}/public/stylesheets/old_sql/old_sql.css", "#{app_path}/public/stylesheets/old_sql/old_sql.css"
       copy_file "#{gem_path}/public/stylesheets/old_sql/old_sql.css", "#{app_path}/public/stylesheets/old_sql/table.css"
       copy_file "#{gem_path}/app/views/layouts/old_sql/report.html.erb", "#{app_path}/app/views/layouts/old_sql/report.html.erb"
+      copy_file "#{gem_path}/app/views/layouts/old_sql/report.html.erb", "#{app_path}/app/views/layouts/old_sql/chart.html.erb"
     end
     
     private

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

@@ -18,6 +18,9 @@
 # 'report_view' is optional. It overrides the default_report_view defined in the initializer. It
 # can be set to jqgrid, table, or chart.
 #
+# Optionally use 'report_db' to specify a class that extends ActiveRecord::Base. Use the require
+# path for your class. E.g. foo/my_alternative_db. 
+#
 # The 'fields' are the headers for the report.
 
 user_jqgrid:

data/lib/generators/old_sql/templates/user_processor.rb.example

@@ -5,8 +5,6 @@ module OldSql
     class UserOldSqlDemoProcessor < OldSql::ReportProcessor::Base
    
       def parse(resultset)
-        init(resultset)
-     
         Rails.logger.debug "REC: #{@rec}"
      
         add_row([@rec['id'], @rec['name']])

data/lib/old_sql/report_processor/base.rb

@@ -3,7 +3,6 @@ require 'old_sql/report_design/model'
 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'
@@ -15,7 +14,50 @@ module OldSql
     
       ROUND_PRECISION = OldSql.rounding_precision
     
-      def execute_query(report_sql,start_date,end_date,query_vars,design=nil,sub_processor=nil)
+      def execute_query(report_config, start_date, end_date, query_vars = nil)
+        sql = load_sql(report_config['report_sql'], start_date, end_date, query_vars)
+        query(sql, report_config)
+        
+        return nil if @resultset.nil?
+        
+        init
+        
+        report_design = report_config['report_design']
+        
+        if report_design
+          parse_design(report_design, @resultset) if report_design =~ /csv/
+          parse_chart_design(report_design, @resultset) if report_design =~ /yml/
+        else
+          loaded_sub_processor = load_sub_processor(report_config['report_processor'])
+          
+          if loaded_sub_processor.nil?
+            parse(@resultset)
+          else
+            @data = loaded_sub_processor.parse(@resultset)
+          end
+        end
+        
+        @data
+      end
+      
+      protected
+      
+      def add_row(cell_data = [], id = @id+1)        
+        @data[:rows] << {id: id, cell: cell_data}
+      end
+      
+      def round(value, precision = ROUND_PRECISION)
+        factor = 10.0**precision
+        (value*factor).round / factor
+      end
+  
+      def isNumeric(s)
+        Float(s) != nil rescue false
+      end
+      
+      private
+      
+      def load_sql(report_sql, start_date, end_date, query_vars)
         vars = {:start_date => start_date, :end_date => end_date}
       
         if !query_vars.nil?
@@ -24,10 +66,14 @@ module OldSql
       
         template = File.read("#{Rails.root}/config/old_sql/report_sql/#{report_sql}.erb")
         sql = Erubis::Eruby.new(template).result(vars)
+      end
       
+      def query sql, report_config
         begin
           #todo change to a reporting db
-          db = ActiveRecord::Base.connection();
+          db = db_connection(report_config['report_db'])
+        
+          raise Exception("Unable to Establish a Database Connection") unless db.active?
         
           @resultset = []
           rec = db.select_all(sql)
@@ -35,34 +81,67 @@ module OldSql
             @resultset << row
           end
         rescue Exception=>e
-          #todo log error
           Rails.logger.error e
         end
         
-        if design
-          parse_design(design, @resultset) if design =~ /csv/
-          parse_chart_design(design, @resultset) if design =~ /yml/
+        @resultset
+      end
+      
+      def db_connection report_db
+        db = nil
+        if report_db.nil?
+          db = ActiveRecord::Base.connection();
         else
-          loaded_sub_processor = load_sub_processor(sub_processor)
-          
-          if loaded_sub_processor.nil?
-            parse(@resultset)
-          else
-            @data = loaded_sub_processor.parse(@resultset)
+          require report_db
+    
+          db_class_name = ""
+          first = true
+    
+          report_db.split("/").each do |path|
+            db_class_name << "::" unless first
+            path.split("_").each {|c| db_class_name << c.capitalize }
+            first = false
           end
+    
+          db=eval(db_class_name).connection
         end
         
-        @data
+        db
       end
-    
-      def init(resultset)
-        @rec = resultset[0]
-        self.new_data
+      
+      def load_sub_processor sub_processor
+        return if sub_processor.nil?
+        
+        loaded_sub_processor = nil
+        begin
+          require "old_sql/report_processor/#{sub_processor.downcase}"
+          loaded_sub_processor=eval("OldSql::ReportProcessor::#{sub_processor.gsub("_","")}").new 
+        rescue Exception=>e
+          Rails.logger.error e.message
+        end
+        
+        loaded_sub_processor
+      end
+      
+      def init
+        @rec = @resultset[0]
+        @id = 0
+        @data = {}
+        @data[:rows] = []
+        
+        init_jqgrid_data
       end
+      
+      def init_jqgrid_data(page=1, total=1, records=1)
+        @data[:page]=page
+        @data[:total]=total
+        @data[:records]=records
+      end
+      
     
       def parse(resultset)
-        init(resultset)
-      
+        init_jqgrid_data
+        
         resultset.each do |r|
           cell = [] 
           r.each do |key, value|
@@ -75,14 +154,8 @@ module OldSql
       end
       
       def parse_design(design, resultset)
-        init(resultset)
-        
-        return nil if @rec.nil?
-        
         model = OldSql::ReportDesign::Parser.read_file("#{design}")
         
-        init(resultset)
-        
         model.rows.each do |row|
           report_row = []
           row.cells.each do |cell|
@@ -116,13 +189,13 @@ module OldSql
       
       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
@@ -167,51 +240,6 @@ module OldSql
         
         result
       end
-      
-      def round(value, precision = ROUND_PRECISION)
-        factor = 10.0**precision
-        (value*factor).round / factor
-      end
-    
-      def new_data(page=1, total=1, records=1)
-        @id = 0
-        @data = {}
-        @data[:page]=page
-        @data[:total]=total
-        @data[:records]=records
-        @data[:rows] = []
-      end
-  
-      def add_row(cell_data = [], id = @id+1)        
-        @data[:rows] << {id: id, cell: cell_data}
-      end
-  
-      def ifnull(o)
-        if !o.nil? && o != 0
-          return o
-        else
-          return 1
-        end
-      end
-  
-      def isNumeric(s)
-        Float(s) != nil rescue false
-      end
-      
-      def load_sub_processor sub_processor
-        return if sub_processor.nil?
-        
-        loaded_sub_processor = nil
-        begin
-          Rails.logger.info "Loading Processor old_sql/report_processor/#{sub_processor.downcase}"
-          require "old_sql/report_processor/#{sub_processor.downcase}"
-          loaded_sub_processor=eval("OldSql::ReportProcessor::#{sub_processor.gsub("_","")}").new 
-        rescue Exception=>e
-          Rails.logger.error e.message
-        end
-        
-        loaded_sub_processor
-      end
     end
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: old_sql
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.17.0
+  version: 1.18.0
 platform: ruby
 authors: 
 - Eddie Gonzales
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-15 00:00:00 Z
+date: 2011-06-16 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: devise
@@ -193,7 +193,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1474127642564641117
+      hash: 1596520403789192732
       segments: 
       - 0
       version: "0"