query_report 1.0.13 → 1.0.14

data/lib/query_report/column.rb

@@ -86,7 +86,7 @@ module QueryReport
       end
 
       def total
-        @total ||= has_total? ? report.records.inject(0) { |sum, r| sum + r[humanize].to_f } : nil
+        @total ||= has_total? ? report.records.inject(0) { |sum, r| sum + report.content_from_element(r[humanize]).to_f } : nil
       end
     end
   end

data/lib/query_report/record.rb

@@ -65,11 +65,11 @@ module QueryReport
         last_reset_index.each do |col, last_index|
           rowspan_col = rowspan_column_hash[col]
 
-          rowspan_content = get_content_from_element(row[rowspan_col]) #picking the current content of the rowspan column
-          prev_rowspan_content = get_content_from_element(prev_row[rowspan_col]) #picking the last rowspan content stored
+          rowspan_content = content_from_element(row[rowspan_col]) #picking the current content of the rowspan column
+          prev_rowspan_content = content_from_element(prev_row[rowspan_col]) #picking the last rowspan content stored
 
           content = row[col]
-          prev_content = get_content_from_element(prev_row[col])
+          prev_content = content_from_element(prev_row[col])
 
           if index == 0 || rowspan_content != prev_rowspan_content || content != prev_content
             last_reset_index[col] = index
@@ -91,7 +91,7 @@ module QueryReport
       end
     end
 
-    def get_content_from_element(content)
+    def content_from_element(content)
       content.kind_of?(Hash) ? content[:content] : content
     end
   end

data/lib/query_report/version.rb

@@ -1,3 +1,3 @@
 module QueryReport
-  VERSION = "1.0.13"
+  VERSION = "1.0.14"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: query_report
 version: !ruby/object:Gem::Version
-  version: 1.0.13
+  version: 1.0.14
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-30 00:00:00.000000000 Z
+date: 2013-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails