old_sql 1.25.0 → 1.26.0

data/README.md

@@ -157,7 +157,7 @@ Optionally create a CSV DESIGN file under config/old_sql/report_design:
 	# Tabs or spaces can optionally be used between "cells" for 
 	# ease of reading.
 	#
-	# All uppercase Labels are bolded and converted to capitalized
+	# All uppercase labels are bolded and converted to capitalized
 	# words for the jqgrid, and HTML table report views.
 	
 	id,							name

data/lib/generators/old_sql/templates/user_design_template.csv

@@ -18,9 +18,9 @@
 # Tabs or spaces can optionally be used between "cells" for 
 # ease of reading.
 #
-# All uppercase Labels are bolded and converted to capitalized 
+# All uppercase labels are bolded and converted to capitalized 
 # words for the jqgrid, and HTML table report views.
-
+#
 id,							name
 "EXAMPLE MATH OPERATION",	id + id
 "Totals",					"..."
@@ -28,4 +28,11 @@ id,							name
 "Divide by Zero 1",			0 / 0
 "Divide by Zero 2",			1.0 / 0
 "Divide by Zero 3",			0.0 / 0.0
-"Rounding",					200.0 / 43.0
+"Rounding",					200.0 / 43.0
+
+#Spreadsheet Test Data,,
+#,Total, 200
+#,Foo, 35
+#,,
+#,Foo / Total,
+#,=C28 / C29,

data/lib/old_sql/shell_report_facade.rb

@@ -1,3 +1,5 @@
+require 'cgi'
+
 module OldSql
   class ShellReportFacade
     def self.run_report(report, env, start_date, end_date, clean)
@@ -9,9 +11,8 @@ module OldSql
     set_connection(env)
     
     base_parser = OldSql::ReportProcessor::Base.new
-    data = base_parser.execute_query(report_config['report_sql'],start_date,end_date,nil,
-                                     report_config['report_design'],report_config['report_processor'])
-    
+    data = base_parser.execute_query(report_config,start_date,end_date,nil)
+                                     
     print_header(report, start_date, end_date, clean)
     print_data(data, report_config['fields'], clean)
     print_footer(clean)
@@ -39,7 +40,7 @@ module OldSql
       first = true
       row[:cell].each do |cell|
         line << ", " if !first
-        line << cell.to_s
+        line << OldSql.strip_html(cell.to_s).gsub("\n","")
         first = false
       end
       puts line

metadata

@@ -2,7 +2,7 @@
 name: old_sql
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.25.0
+  version: 1.26.0
 platform: ruby
 authors: 
 - Eddie Gonzales
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-22 00:00:00 Z
+date: 2011-06-24 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: devise
@@ -195,7 +195,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -1326309612636495588
+      hash: 2228815052729082356
       segments: 
       - 0
       version: "0"