old_sql 0.6.0 → 0.7.0

data/Gemfile

@@ -3,6 +3,8 @@ source "http://rubygems.org"
 # Example:
 #   gem "activesupport", ">= 2.3.5"
 
+gem "sanitize"
+
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
@@ -11,3 +13,9 @@ group :development do
   gem "jeweler"
   #gem "rcov", ">= 0"
 end
+
+group :test do
+  gem "rails", "3.0.6"
+  gem "capybara", ">= 0.4.0"
+  gem "sqlite3"
+end

data/Gemfile.lock

@@ -1,15 +1,107 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    abstract (1.0.0)
+    actionmailer (3.0.6)
+      actionpack (= 3.0.6)
+      mail (~> 2.2.15)
+    actionpack (3.0.6)
+      activemodel (= 3.0.6)
+      activesupport (= 3.0.6)
+      builder (~> 2.1.2)
+      erubis (~> 2.6.6)
+      i18n (~> 0.5.0)
+      rack (~> 1.2.1)
+      rack-mount (~> 0.6.14)
+      rack-test (~> 0.5.7)
+      tzinfo (~> 0.3.23)
+    activemodel (3.0.6)
+      activesupport (= 3.0.6)
+      builder (~> 2.1.2)
+      i18n (~> 0.5.0)
+    activerecord (3.0.6)
+      activemodel (= 3.0.6)
+      activesupport (= 3.0.6)
+      arel (~> 2.0.2)
+      tzinfo (~> 0.3.23)
+    activeresource (3.0.6)
+      activemodel (= 3.0.6)
+      activesupport (= 3.0.6)
+    activesupport (3.0.6)
+    arel (2.0.10)
+    builder (2.1.2)
+    capybara (0.4.1.2)
+      celerity (>= 0.7.9)
+      culerity (>= 0.2.4)
+      mime-types (>= 1.16)
+      nokogiri (>= 1.3.3)
+      rack (>= 1.0.0)
+      rack-test (>= 0.5.4)
+      selenium-webdriver (>= 0.0.27)
+      xpath (~> 0.1.3)
+    celerity (0.8.9)
+    childprocess (0.1.9)
+      ffi (~> 1.0.6)
+    culerity (0.2.15)
+    erubis (2.6.6)
+      abstract (>= 1.0.0)
+    ffi (1.0.9)
     git (1.2.5)
+    i18n (0.5.0)
     jeweler (1.6.2)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
+    json_pure (1.5.1)
+    mail (2.2.19)
+      activesupport (>= 2.3.6)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.16)
+    nokogiri (1.4.4)
+    polyglot (0.3.1)
+    rack (1.2.3)
+    rack-mount (0.6.14)
+      rack (>= 1.0.0)
+    rack-test (0.5.7)
+      rack (>= 1.0)
+    rails (3.0.6)
+      actionmailer (= 3.0.6)
+      actionpack (= 3.0.6)
+      activerecord (= 3.0.6)
+      activeresource (= 3.0.6)
+      activesupport (= 3.0.6)
+      bundler (~> 1.0)
+      railties (= 3.0.6)
+    railties (3.0.6)
+      actionpack (= 3.0.6)
+      activesupport (= 3.0.6)
+      rake (>= 0.8.7)
+      thor (~> 0.14.4)
     rake (0.9.1)
+    rubyzip (0.9.4)
+    sanitize (2.0.2)
+      nokogiri (~> 1.4.4)
+    selenium-webdriver (0.2.1)
+      childprocess (>= 0.1.7)
+      ffi (>= 1.0.7)
+      json_pure
+      rubyzip
+    sqlite3 (1.3.3)
+    thor (0.14.6)
+    treetop (1.4.9)
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.27)
+    xpath (0.1.4)
+      nokogiri (~> 1.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  capybara (>= 0.4.0)
   jeweler
+  rails (= 3.0.6)
+  sanitize
+  sqlite3

data/Rakefile

@@ -25,12 +25,14 @@ Jeweler::Tasks.new do |gem|
 end
 Jeweler::RubygemsDotOrgTasks.new
 
-#require 'rake/testtask'
-#Rake::TestTask.new(:test) do |test|
-#  test.libs << 'lib' << 'test'
-#  test.pattern = 'test/**/test_*.rb'
-#  test.verbose = true
-#end
+require 'rake/testtask'
+
+Rake::TestTask.new(:test) do |t|
+  t.libs << 'lib'
+  t.libs << 'test'
+  t.pattern = 'test/**/*_test.rb'
+  t.verbose = false
+end
 
 #require 'rcov/rcovtask'
 #Rcov::RcovTask.new do |test|

data/TODO.mkd

@@ -1,5 +1,10 @@
 # TODO
 
-* Implement Rails Engine
-* Allow users to pass in their own variables to the sql file (complete)
-* Allow multiple sql files
+* Allow multiple sql files
+* Move javascript in index.html.erb into a separate javascript file.
+* As an alternative to report_processors allow for a csv file that defines the format of the report.
+  Use symbols in the cells for the columns. Math operators could be used for performing calculations.
+  If this works we could write a complex report with zero ruby/rails code, html, or javascript.   
+* Try and implement jqgrid sort and search methods.
+  This should be done in the sql files by passing the params from jqgrid into them.
+* Add Devise support

data/VERSION

@@ -1 +1 @@
-0.6.0
+0.7.0

data/app/controllers/old_sql/report_controller.rb

@@ -1,39 +1,18 @@
 require 'csv'
 
-#
-# TODO:
-# 1. Reduce the datagrid and print views to a single view.
-#    The colnames can be defined in the reports.yml config file.
-#    (Completed on 5-24-2011)
-# 2. Create a generic SQL parse method.
-#    (Completed on 5-24-2011)
-# 3. Convert to a gem. This class will be overridden to implement
-#    parse methods.
-# 4. Add export to CSV
-#    (Completed on 5-24-2011)
-# 5. I think we should move the parse methods to a lib class.
-#    The parse class name could be defined in the reports.yml file.
-#    (Completed on 5-24-2011)
-# 6. Try and implement jqgrid sort and search methods.
-#    This should be done in the sql files by passing the params
-#    from jqgrid into them.
-# 7. Remove rails_admin dependencies
-# 8. Add Devise support
-# 9. Rewrite jqgrid using JQuery 
-#
-
 module OldSql
   class ReportController < ApplicationController
     before_filter :_init
     before_filter :_reports
 
-    helper_method :jqgrid_field_list
+    helper_method :jqgrid_col_model
+    helper_method :jqgrid_col_names
 
-    ROUND_PRECISION = 2
+    layout "old_sql/report.html.erb"
+    
     BASE_PROCESSOR = "base"
 
     def index
-      #render :layout => 'rails_admin/dashboard'
     end
     
     def datagrid
@@ -43,7 +22,7 @@ module OldSql
       @report_name = params[:report]
       @report_sql = params[:report_sql]
       
-      render :template => "rails_admin/db_report/datagrid.html.erb"
+      render :template => "old_sql/report/datagrid.html.erb"
     end
     
     def query
@@ -115,16 +94,15 @@ module OldSql
       processor = load_processor(@report_name)
       @report = processor.execute_query(@report_sql,@start_date,@end_date,query_vars(@report_name))
       
-      render :layout => 'rails_admin/db_report_print', :template => "rails_admin/db_report/print.html.erb"
+      render :template => "old_sql/report/print.html.erb"
     end
     
 
     private
       def _init
-		#todo add Devise support
+		    #todo add Devise support
         #@authorization_adapter.authorize(:index) if @authorization_adapter
-        @page_name = t("admin.report.pagename")
-        @page_type = "report"
+        @page_name = t("old_sql.report.pagename")
         @host = self.request.host
         @port = self.request.port
       end
@@ -140,38 +118,53 @@ module OldSql
           #todo get processor name from @reports
           
           if !@reports[report]['processor'].nil?
-            logger.info "Loading Processor report_processor/#{@reports[report]['processor'].downcase}"
-            require "report_processor/#{@reports[report]['processor'].downcase}"
-            processor=eval("ReportProcessor::#{@reports[report]['processor'].gsub("_","")}").new
+            logger.info "Loading Processor old_sql/report_processor/#{@reports[report]['processor'].downcase}"
+            require "old_sql/report_processor/#{@reports[report]['processor'].downcase}"
+            processor=eval("OldSql::ReportProcessor::#{@reports[report]['processor'].gsub("_","")}").new
           
           else
-            logger.info "Loading Processor report_processor/#{BASE_PROCESSOR}"
-            require "report_processor/#{BASE_PROCESSOR}"
-            processor=eval("ReportProcessor::#{BASE_PROCESSOR}.capitalize").new
+            logger.info "Loading Processor old_sql/report_processor/#{BASE_PROCESSOR}"
+            require "old_sql/report_processor/#{BASE_PROCESSOR}"
+            processor=eval("OldSql::ReportProcessor::#{BASE_PROCESSOR.capitalize}").new
           end 
-        rescue
-          logger.info "Loading Processor report_processor/#{BASE_PROCESSOR}"
-          require "report_processor/#{BASE_PROCESSOR}"
-          processor=eval("ReportProcessor::#{BASE_PROCESSOR}.capitalize").new
+        rescue Exception=>e
+          logger.error e.message
+          logger.info "Loading Processor old_sql/report_processor/#{BASE_PROCESSOR}"
+          require "old_sql/report_processor/#{BASE_PROCESSOR}"
+          processor=eval("OldSql::ReportProcessor::#{BASE_PROCESSOR.capitalize}").new
         end
         
         processor
       end
       
-      def jqgrid_field_list
+      def jqgrid_col_model
         @fields = []
         field_num = 1
+        
+        # [
+        #   {name:'id',index:'id', width:55},
+        #   {name:'invdate',index:'invdate', width:90, editable:true},
+        #   {name:'name',index:'name', width:100,editable:true},
+        #   {name:'amount',index:'amount', width:80, align:"right",editable:true},
+        #   {name:'tax',index:'tax', width:80, align:"right",editable:true},    
+        #   {name:'total',index:'total', width:80,align:"right",editable:true},   
+        #   {name:'note',index:'note', width:150, sortable:false,editable:true}   
+        # ]
 
         @reports[@report_name]['fields'].each do |field|
           if field_num == 1
-            @fields << { :field => "cell_#{field_num}", :label => field }
+            @fields << { :name=>field }
           else
-            @fields << { :field => "cell_#{field_num}", :label => field, :align => "center" }
+            @fields << { :name=>field, :align=>"center" }
           end
           field_num+=1
         end
         
-        @fields
+        @fields.to_json
+      end
+      
+      def jqgrid_col_names
+        @reports[@report_name]['fields'].to_json
       end
       
       def query_vars report

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

@@ -0,0 +1,14 @@
+<html>
+<head>
+<%= stylesheet_link_tag "old_sql/old_sql.css" %>
+<%= stylesheet_link_tag "old_sql/ui-lightness/jquery-ui-1.8.13.custom.css" %>
+
+<%= javascript_include_tag "old_sql/jquery-1.5.1.min.js" %>
+<%= javascript_include_tag "old_sql/jquery-ui-1.8.13.custom.min.js" %>
+<%= javascript_include_tag "old_sql/jquery-ui-timepicker-addon.js" %>
+<%= javascript_include_tag "old_sql/date_format.js" %>
+</head>
+<body>
+<%= yield %>
+</body>
+</html>

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

@@ -1,16 +1,25 @@
-<%=jqgrid_javascripts%>
-<%=jqgrid_stylesheets%>
+<!-- TODO move these to the head -->
+<%= stylesheet_link_tag "old_sql/jqgrid/ui.jqgrid.css" %>
+<%= javascript_include_tag "old_sql/jqgrid/jquery.jqGrid.min.js" %>
+<%= javascript_include_tag "old_sql/jqgrid/ui.multiselect.js" %>
 
-<%=raw jqgrid(
-	"#{@reports[@report_name]['value']} Report", 
-	"#{@report_name}", 		
-	"/admin/db/report/query.json/",
-	jqgrid_field_list(), 
-	{
-		:autowidth=>true, 
-		:height=>430, 
-		:rows_per_page=>25,
-		:mtype=>'GET',
-		:post_data=>"{'report':'#{@report_name}','report_sql':'#{@report_sql}','generation':'#{@generation}','start_date':'#{@start_date}','end_date':'#{@end_date}'}"
-	}
- ) %>
+<script>
+jQuery(document).ready(function(){
+  jQuery("#rowed1").jqGrid({
+    url:"http://<%=@host%>:<%=@port%>/sql/reports/query.json/?report=<%=@report_name%>&report_sql=<%=@report_sql%>&generation=<%=@generation%>&start_date=<%=@start_date%>&end_date=<%=@end_date%>",
+  	datatype: "json",
+  	pager: false,
+    colNames:['id','name'],
+    colModel:[
+      {name:'id',index:'id', width:55},
+      {name:'name',index:'name', width:100}
+    ],
+    rowNum:25,
+    rowList:[10,20,30],
+    width: 777,
+    caption: "<%=@reports[@report_name]['value']%> Report"
+  });
+});
+</script>
+
+<table id="rowed1"></table>

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

@@ -1,9 +1,3 @@
-<%= stylesheet_link_tag "old_sql/db_report" %>
-<%= stylesheet_link_tag "old_sql/ui-lightness/jquery-ui-1.8.13.custom.css" %>
-
-<%= javascript_link_tag "old_sql/jquery-1.5.1.min.js" %>
-<%= javascript_link_tag "old_sql/jquery-ui-1.8.13.custom.min.js" %>
-
 <script>
 var host = "<%=@host%>";
 var port = "<%=@port%>";
@@ -12,24 +6,25 @@ var _report_loaded = false;
 
 function report_selected()
 {
-	var virality = $j("#report option:selected").attr('virality');
-	_report_sql = $j("#report option:selected").attr('report_sql');
+	var virality = jQuery("#report option:selected").attr('virality');
+	_report_sql = jQuery("#report option:selected").attr('report_sql');
 	
   	if (virality == 'true')
 	{
-		$j("#select-generation").removeAttr('disabled');
+		jQuery("#select-generation").removeAttr('disabled');
 	}
 	else
 	{
-		$j("#select-generation").attr('disabled', 'disabled');
-		$j("#select-generation option:first").attr('selected','selected');
+		jQuery("#select-generation").attr('disabled', 'disabled');
+		jQuery("#select-generation option:first").attr('selected','selected');
 	}
 }
 
 function load_report()
 {	
-	var src = "http://" + host+":"+port+"/admin/db/report/datagrid/?report="+$j("#report").val()+
-	"&start_date="+$j("#datepicker-start").val()+"&end_date="+$j("#datepicker-end").val()+"&generation="+$j("#select-generation").val()+"&report_sql="+
+	var src = "http://"+host+":"+port+"/sql/reports/datagrid/?report="+jQuery("#report").val()+
+	"&start_date="+jQuery("#datepicker-start").val()+"&end_date="+jQuery("#datepicker-end").val()+"&generation="+
+	jQuery("#select-generation").val()+"&report_sql="+
 	_report_sql;
 	
 	jQuery('iframe').attr('src', src);
@@ -45,10 +40,10 @@ function print_report()
 		return;
 	}
 	
-	var src = "http://" + host+":"+port+"/admin/db/report/print/?report="+$j("#report").val()+
-		"&start_date="+$j("#datepicker-start").val()+"&end_date="+$j("#datepicker-end").val()+"&generation="+$j("#select-generation").val()+"&report_sql="+
-		_report_sql+"&desc="+$j("#report option:selected").attr('desc');
-	window.open(src,'DB Report')
+	var src = "http://"+host+":"+port+"/sql/reports/print/?report="+jQuery("#report").val()+
+		"&start_date="+jQuery("#datepicker-start").val()+"&end_date="+jQuery("#datepicker-end").val()+"&generation="+
+		jQuery("#select-generation").val()+"&report_sql="+_report_sql+"&desc="+jQuery("#report option:selected").attr('desc');
+	window.open(src,'Old SQL Report')
 }
 
 function export_report_to_excel()
@@ -59,36 +54,37 @@ function export_report_to_excel()
 		return;
 	}
 	
-	var src = "http://" + host+":"+port+"/admin/db/report/query.csv/?report="+$j("#report").val()+
-		"&start_date="+$j("#datepicker-start").val()+"&end_date="+$j("#datepicker-end").val()+"&generation="+$j("#select-generation").val()+"&report_sql="+
-		_report_sql+"&desc="+$j("#report option:selected").attr('desc');
+	var src = "http://"+host+":"+port+"/sql/reports/query.csv/?report="+jQuery("#report").val()+
+		"&start_date="+jQuery("#datepicker-start").val()+"&end_date="+jQuery("#datepicker-end").val()+
+		"&generation="+jQuery("#select-generation").val()+"&report_sql="+
+		_report_sql+"&desc="+jQuery("#report option:selected").attr('desc');
 	window.open(src,'DB Report')
 }
 
-$j(document).ready(function($){
-	$("#datepicker-start").datetimepicker();
-	$("#datepicker-start").datetimepicker( "option", "dateFormat", "yy/mm/dd" );
-	$("#datepicker-end").datetimepicker();
-	$("#datepicker-end").datetimepicker( "option", "dateFormat", "yy/mm/dd" );
+jQuery(document).ready(function($){
+	jQuery("#datepicker-start").datetimepicker();
+	jQuery("#datepicker-start").datetimepicker( "option", "dateFormat", "yy/mm/dd" );
+	jQuery("#datepicker-end").datetimepicker();
+	jQuery("#datepicker-end").datetimepicker( "option", "dateFormat", "yy/mm/dd" );
 
-	$j("#select-generation").attr('disabled', 'disabled');
+	jQuery("#select-generation").attr('disabled', 'disabled');
 	
 	var now = new Date();
 	var tomorrow = new Date();
 	var two_weeks_ago = new Date();
 	two_weeks_ago.setDate(now.getDate() - 14);
 	tomorrow.setDate(now.getDate() + 1);
-	$j("#datepicker-start").attr('value', two_weeks_ago.format("yyyy/mm/dd HH:MM:ss"));
-	$j("#datepicker-end").attr('value', tomorrow.format("yyyy/mm/dd HH:MM:ss"));
+	jQuery("#datepicker-start").attr('value', two_weeks_ago.format("yyyy/mm/dd HH:MM:ss"));
+	jQuery("#datepicker-end").attr('value', tomorrow.format("yyyy/mm/dd HH:MM:ss"));
 });
 </script>
 
-<div class="ra-block">
+<div class="os-block">
 	<div class="ui-widget-header clearfix">
     	<%= @page_name %>
   	</div>
 
-	<form id="report-form" name="report-form" action="/admin/db/report/query" method="POST">
+	<form id="report-form" name="report-form" action="/oldsql/reports/query" method="POST">
 		<div class="report-form-row">
 			<div class="report-form-label">SELECT A REPORT:</div>
 			<div class="report-form-input">

data/config/locales/old_sql.en.yml

@@ -0,0 +1,5 @@
+en:
+  old_sql:
+    report:
+      pagename: Old SQL Reports
+      name: Old SQL Reports

data/config/routes.rb

@@ -1,10 +1,12 @@
 Rails.application.routes.draw do
-  scope "report", :module => :old_sql, :as => "old_sql" do
-    controller "report" do
-      match "/", :to => :index, :as => "report_list"
-      match "/query", :to => :query, :as => "query"
-      match "/datagrid", :to => :datagrid, :as => "datagrid"
-      match "/print", :to => :print, :as => "print"
+  scope "sql", :module => :old_sql, :as => "old_sql" do
+    scope "reports", :as => "reports" do
+      controller "report" do
+        match "/", :to => :index, :as => "report_list"
+        match "/query", :to => :query, :as => "query"
+        match "/datagrid", :to => :datagrid, :as => "datagrid"
+        match "/print", :to => :print, :as => "print"
+      end
     end
   end
 end

data/lib/old_sql/engine.rb

@@ -5,5 +5,9 @@ require "action_controller"
 module OldSql
   class Engine < Rails::Engine
     engine_name :old_sql
+    
+    initializer "static assets" do |app|
+      app.middleware.use ::ActionDispatch::Static, "#{root}/public"
+    end
   end
 end

data/lib/old_sql/report_processor/base.rb

@@ -0,0 +1,92 @@
+module OldSql
+  module ReportProcessor
+    class Base
+    
+      ROUND_PRECISION = 2
+      
+      def hello_world
+        puts "Hello World"
+      end
+    
+      def execute_query(report_sql,start_date,end_date,query_vars)
+        vars = {:start_date => start_date, :end_date => end_date}
+      
+        if !query_vars.nil?
+          vars = vars.merge query_vars
+        end
+      
+        template = File.read("#{Rails.root}/config/report_sql/#{report_sql}.erb")
+        sql = Erubis::Eruby.new(template).result(vars)
+      
+        Rails.logger.debug sql
+      
+        db = nil
+      
+        begin
+          #todo change to a reporting db
+          db = ActiveRecord::Base.connection();
+        
+          @resultset = []
+          rec = db.select_all(sql)
+          rec.each do |row|
+            @resultset << row
+          end
+        rescue
+          #todo log error
+        end
+      
+        parse(@resultset)
+      
+        @data
+      end
+    
+      def init(resultset)
+        @rec = resultset[0]
+        self.new_data
+      end
+    
+      def parse(resultset)
+        init(resultset)
+      
+        resultset.each do |r|
+          cell = [] 
+          r.each do |key, value|
+            cell << value
+          end
+          new_row(nil, cell)
+        end
+      
+        @data
+      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 new_row(title = nil, cell_data = [], id = @id+1)        
+        if !title.nil?
+          cell_data.unshift "<b>#{title}</b>"
+        end
+    
+        @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
+    end
+  end
+end