old_sql 1.1.0 → 1.2.0

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

@@ -4,6 +4,12 @@ OldSql.setup do |config|
   # The title of the Report Selection View.
   config.report_select_page_title = 'Old SQL Reports'
   
+  # Determines whether the values for the report will be rounded.
+  config.round_report_values = true
+  
+  # The precision to round all values to if rounding is enabled.
+  config.rounding_precision = 2
+  
   # Configure the default report view. This setting will be used unless overridden 
   # in config/old_sql/reports.yml.
   config.default_report_view = "jqgrid"

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

@@ -1,6 +1,26 @@
 # Old SQL:
-# Example Report Design document.
+# Example Report Design Document
+#
+# Text not in quotes are column names from the SQL query
+# Quoted text are labels that will appear in the report.
+# Expressions like ( id + id ) * 10 below must be single 
+# space delimited. So (id+id) will not parse correctly.
+#
+# NaN and Infinity are returned as zero. 
+#
+# Comments are lines beginning with a hash #. They are 
+# stripped when this document is parsed.
+#
+# Values (either columns or expressions) are rounded by default. 
+# To disable this set round_report_values to false in
+# config/initializers/old_sql.rb. You can also change the
+# precision, which is 2 by default.
 #
 id,name
 "Example Math Operation",id + id
-"Totals","..."
+"Totals","..."
+"Expression",( id + id ) * 10
+"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

data/lib/old_sql/report_processor/base.rb

@@ -8,7 +8,7 @@ module OldSql
   module ReportProcessor
     class Base
     
-      ROUND_PRECISION = 2
+      ROUND_PRECISION = OldSql.rounding_precision
     
       def execute_query(report_sql,start_date,end_date,query_vars,design=nil,sub_processor=nil)
         vars = {:start_date => start_date, :end_date => end_date}
@@ -94,7 +94,11 @@ module OldSql
                 end
               else
                 if cd.type == OldSql::ReportDesign::CellData::COLUMN
-                  report_row << @rec[cd.data]
+                  result = @rec[cd.data]
+                  if OldSql.round_report_values
+                    result = round(result.to_f, OldSql.rounding_precision)
+                  end
+                  report_row << result
                 elsif  cd.type == OldSql::ReportDesign::CellData::LABEL
                   report_row << cd.data.gsub(/"/,"")
                 end
@@ -108,11 +112,10 @@ module OldSql
       end
       
       def eval_expression expression
-        result = "0.0"
+        result = 0.0
         begin
           Rails.logger.debug "Evalutating Expression: #{expression}"
           result = eval(expression)
-          Rails.logger.debug "EXPR RESULT #{result.to_s}"
         rescue ZeroDivisionError => e
           Rails.logger.error e
         rescue Exception => e
@@ -124,14 +127,20 @@ module OldSql
         end
         
         if result == "Infinity" || result == "NaN"
-          result = "0.0"
+          result = 0.0
+        elsif OldSql.round_report_values
+          result = round(result.to_f, OldSql.rounding_precision)
         end
         
-        puts "Result of the expression: #{result}"
-        Rails.logger.debug "Result of the expression: #{result}"
+        Rails.logger.debug "Expression result: #{result}"
         
         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/lib/old_sql.rb

@@ -10,10 +10,13 @@ module OldSql
   mattr_accessor :default_report_view
   @@default_report_view = 'jqgrid'
   
-  # The default report view. This setting will be used unless overridden in 
-  # config/old_sql/reports.yml.
-  mattr_accessor :default_report_view
-  @@default_report_view = 'jqgrid'
+  # Determines whether the values for the report will be rounded.
+  mattr_accessor :round_report_values
+  @@round_report_values = true
+  
+  # The precision to round all values to if rounding is enabled.
+  mattr_accessor :rounding_precision
+  @@rounding_precision = 2
   
   # Width of the jqGrid component in the jqGrid report view.
   mattr_accessor :jqgrid_width

metadata

@@ -2,7 +2,7 @@
 name: old_sql
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Eddie Gonzales
@@ -200,7 +200,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -2514440904525593455
+      hash: 1929929110961270162
       segments: 
       - 0
       version: "0"