excel_to_code 0.3.8 → 0.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b31b150912c743cfb3ca5fa00d9045eb7e127f1
-  data.tar.gz: 70c47e8edebfa98d247707dc341325aab44d8e11
+  metadata.gz: 8f304a10a7977c70c147712719e56badfba0a619
+  data.tar.gz: 182ecde186d561e58a3cf15c8b8765fca8f996c0
 SHA512:
-  metadata.gz: fe48eabe07ddfd1961d6baeafa0944a6f2dbf8ec2c42cc6a78374d3786d9fbd7240b2b7f21149a3fe870db8707cf1969dbeb32cde1252a8cdced7455536e20e0
-  data.tar.gz: 926221e23b72ed369390ea72d7c257a7fb02c643555c9f78560c6166fcccccb74b9d5c7c024e6aeebcd5bc8fb299991f23d97cb763e81253021e999b0f503950
+  metadata.gz: 7c36dcaca5afc7cb6210fc906f33a8e5fe42dcacaa7dbe45275bca689ea67aa5d060b5a1e457a463689573736cccc4507addac4edb78db4288e10dfdd9aebd27
+  data.tar.gz: ff50f71cfd95e7023862ed9b5a2344273c44273103e54eaba17b0c80cce798147a0e1be0eb7546f92c614355dffedcf25ecce537c485c1ea93f90f66fc561bdc

data/src/commands/excel_to_x.rb

@@ -228,7 +228,12 @@ class ExcelToX
     self.output_directory = File.expand_path(output_directory)
     
     # Set up our log file
-    self.log ||= Logger.new(STDOUT)
+    unless self.log
+      self.log = Logger.new(STDOUT)
+      log.formatter = proc do |severity, datetime, progname, msg|
+        "#{datetime.strftime("%H:%M")}\t#{msg}\n"
+      end
+    end
 
     # By default, tests allow empty cells and zeros to be treated as equivalent, and numbers only have to match to a 0.001 epsilon (if expected>1) or 0.001 delta (if expected<1)
     self.sloppy_tests ||= true
@@ -257,8 +262,8 @@ class ExcelToX
   
   # FIXME: Replace these with pure ruby versions?
   def unzip_excel
-    log.info `rm -fr '#{xml_directory}'` # Force delete
-    log.info `unzip '#{excel_file}' -d '#{xml_directory}'` # If don't force delete, make sure that force the zip to overwrite old files 
+    log.info "Removing any old xml #{`rm -fr '#{xml_directory}'`}" # Force delete
+    log.info "Unziping excel into xml #{`unzip -q '#{excel_file}' -d '#{xml_directory}'`}" # If don't force delete, make sure that force the zip to overwrite old files 
   end
   
   # The excel workbook.xml and allied relationship files knows about
@@ -905,6 +910,7 @@ class ExcelToX
     @replace_string_joins_on_ranges_replacer ||= ReplaceStringJoinOnRangesAST.new
     @sheetless_cell_reference_replacer ||= RewriteCellReferencesToIncludeSheetAst.new
     @replace_references_to_blanks_with_zeros ||= ReplaceReferencesToBlanksWithZeros.new(@formulae, nil, inline_ast_decision)
+    @fix_subtotal_of_subtotals ||= FixSubtotalOfSubtotals.new(@formulae)
 
     #require 'pry'; binding.pry
 
@@ -929,6 +935,7 @@ class ExcelToX
         @wrap_formulae_that_return_arrays_replacer.map(ast)
         @replace_references_to_blanks_with_zeros.current_sheet_name = ref.first
         @replace_references_to_blanks_with_zeros.map(ast)
+        @fix_subtotal_of_subtotals.map(ast)
       rescue  Exception => e
         log.fatal "Exception when simplifying #{ref}: #{ast}"
         raise

data/src/excel_to_code.rb

@@ -1,5 +1,5 @@
 class ExcelToCode
-  def self.version() "0.3.8" end
+  def self.version() "0.3.9" end
 end
 
 require_relative 'commands'

data/src/simplify.rb

@@ -22,3 +22,4 @@ require_relative "simplify/replace_string_join_on_ranges"
 require_relative "simplify/emergency_array_formula_replace_indirect_bodge.rb"
 require_relative "simplify/replace_transpose_function"
 require_relative "simplify/replace_references_to_blanks_with_zeros"
+require_relative "simplify/fix_subtotal_of_subtotals"

data/src/simplify/fix_subtotal_of_subtotals.rb

@@ -0,0 +1,76 @@
+class FixSubtotalOfSubtotals
+
+  attr_accessor :references
+  attr_accessor :count_replaced
+  
+  def initialize(references = nil)
+    @references = references
+    @count_replaced = 0
+  end
+
+  def map(ast)
+    return ast unless ast.is_a?(Array)
+    if ast[0] == :function && ast[1] == :SUBTOTAL
+      count_before = @count_replaced
+      new_arguments = ast[2..-1].map do |a| 
+        remove_subtotals_from(a)
+      end
+      new_arguments.compact!
+      if @count_replaced > count_before
+        ast.replace([:function, :SUBTOTAL].concat(new_arguments))
+      end
+    end
+    ast.each do |a|
+      map(a) if a.is_a?(Array)
+    end
+  end
+
+  def is_subtotal?(ast)
+    return false unless ast.is_a?(Array)
+    return true if ast[0] == :function && ast[1] == :SUBTOTAL
+    ast.each do |e|
+      r = is_subtotal?(e) if e.is_a?(Array) # To limit the stack depth
+      return true if r
+    end
+    return false
+  end
+
+  def is_or_refers_to_subtotal?(ast)
+    return false unless ast.is_a?(Array)
+    return is_subtotal?(ast) unless ast[0] == :sheet_reference
+
+    raise ExcelToCodeException.new("Expecting cell") unless ast[2][0] == :cell
+    reference_ast = references[[ast[1], ast[2][1]]]
+    return false unless reference_ast
+    
+    is_subtotal?(reference_ast)
+  end
+
+  def remove_subtotals_from(ast)
+    return ast unless ast.is_a?(Array)
+    if ast.first == :array
+      new_ast = ast.dup
+      new_ast.delete_if do |element|
+        if element == :array
+          false
+        else
+          raise ExcelToCodeException("Expecting row") unless element.is_a?(Array) && element[0] == :row
+          element[1..-1].any? { |cell| is_or_refers_to_subtotal?(cell) }
+        end
+      end
+      return ast if new_ast.length == ast.length
+      @count_replaced += 1
+      return new_ast
+    else
+      if is_or_refers_to_subtotal?(ast)
+        @count_replaced += 1
+        return nil 
+      end
+    end
+    ast
+  end
+  
+
+
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: excel_to_code
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.3.9
 platform: ruby
 authors:
 - Thomas Counsell, Green on Black Ltd
@@ -247,6 +247,7 @@ files:
 - src/simplify.rb
 - src/simplify/count_formula_references.rb
 - src/simplify/emergency_array_formula_replace_indirect_bodge.rb
+- src/simplify/fix_subtotal_of_subtotals.rb
 - src/simplify/identify_dependencies.rb
 - src/simplify/identify_repeated_formula_elements.rb
 - src/simplify/inline_formulae.rb