old_sql 0.46.0 → 0.47.0

data/lib/old_sql/report_design/cell_data.rb

@@ -6,6 +6,7 @@ module OldSql
       COLUMN = 1
       LABEL = 2
       OPERATOR = 3
+      NUMERIC_LITERAL = 4
       
       def initialize(value)
         @data = value
@@ -15,12 +16,13 @@ module OldSql
       private
       
       def set_type
-        first_char = @data[0]
-        @type = case first_char
+        @type = case @data[0]
                 when /['"]/
                   LABEL
-                when /[\/*+]/
+                when /[\/*+-\Q()]/
                   OPERATOR
+                when /[0-9]/
+                  NUMERIC_LITERAL
                 else
                   COLUMN
                 end

data/lib/old_sql/report_processor/base.rb

@@ -59,7 +59,7 @@ module OldSql
           r.each do |key, value|
             cell << value
           end
-          new_row(nil, cell)
+          add_row(nil, cell)
         end
       
         @data
@@ -79,7 +79,8 @@ module OldSql
               if cell.expression?
                 if cd.type == OldSql::ReportDesign::CellData::COLUMN
                   expression << @rec[cd.data].to_s
-                elsif cd.type == OldSql::ReportDesign::CellData::OPERATOR
+                elsif cd.type == OldSql::ReportDesign::CellData::OPERATOR ||
+                      cd.type == OldSql::ReportDesign::CellData::NUMERIC_LITERAL
                   expression << cd.data
                 end
               else
@@ -90,10 +91,23 @@ module OldSql
                 end
               end
             end
-            report_row << eval(expression) unless expression.length==0
+            report_row << eval_expression(expression) unless expression.length==0 
           end
           
-          new_row(nil, report_row)
+          add_row(nil, report_row)
+        end
+      end
+      
+      def eval_expression expression
+        begin
+          result = eval(expression)
+          if result.to_s!="Infinity"
+            return result
+          else
+            return "0"
+          end
+        rescue
+          return "0"
         end
       end
     
@@ -106,7 +120,7 @@ module OldSql
         @data[:rows] = []
       end
   
-      def new_row(title = nil, cell_data = [], id = @id+1)        
+      def add_row(title = nil, cell_data = [], id = @id+1)        
         if !title.nil?
           cell_data.unshift "<b>#{title}</b>"
         end

data/lib/old_sql/report_processor/user_processor.rb.example

@@ -9,8 +9,8 @@ module OldSql
      
         Rails.logger.debug "REC: #{@rec}"
      
-        new_row(nil, [@rec['id'], @rec['name']])
-        new_row('Totals', ['...'])
+        add_row(nil, [@rec['id'], @rec['name']])
+        add_row('Totals', ['...'])
      
         @data
       end

metadata

@@ -2,7 +2,7 @@
 name: old_sql
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.46.0
+  version: 0.47.0
 platform: ruby
 authors: 
 - Eddie Gonzales
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-09 00:00:00 Z
+date: 2011-06-10 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sanitize
@@ -199,7 +199,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -4056453537959555274
+      hash: 4461611604993439562
       segments: 
       - 0
       version: "0"