excel_to_code 0.2.22 → 0.2.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ccdb199882da15b8172e1714f446a6bf0327d9e
-  data.tar.gz: 1a6a3be2a554c829a9654a0d567f385f8f8fca92
+  metadata.gz: 98a30a4502c1cb0068615b80e1b05cd68f4e1dee
+  data.tar.gz: 27283677b8603cbcbb40f7995a71de4713ae17dd
 SHA512:
-  metadata.gz: e2653de86cca389d7865e7fe853fa1253255b3399953764c3746ed968432ab0c6f6a3fc4cb10bd10de4b7beeefa06d563f85463b697e385b783f19c07b5cc7a3
-  data.tar.gz: 7040c57720a1bfb389106405ac2c6d17e8f2f0602d944456b8cffd3b5ad2033f5104850af57cb2d7a022e06697af9fe1a03689f53fc8c05d25390612c89e7259
+  metadata.gz: 2e8e0cb3094aea477cb3e8af859a6005b9a44ae693d3869ef35a2ac4a2065c58c7f143d3700cb119dccef87bf940f40ac7fde0c5351bf31203b39c44079361d3
+  data.tar.gz: 063a30d831f861cb7f7faa403c4a49b4da2248b32e6c3aa3c74661d58c3020f1864fc85b15915711446c48336d4072f2683346406f5dfcd7e05ac0fbd43f65c9

data/src/excel/excel_functions/sumifs.rb

@@ -41,7 +41,11 @@ module ExcelFunctions
           when String
             check_value.downcase == required_value.downcase
           when Numeric
-            check_value.to_f == required_value.to_f
+            begin
+              Float(check_value) == required_value.to_f
+            rescue ArgumentError
+              false
+            end
           else
             check_value.downcase == required_value.to_s.downcase
           end

data/src/excel_to_code.rb

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

data/src/rewrite/ast_expand_array_formulae.rb

@@ -176,10 +176,20 @@ class AstExpandArrayFormulae
   end
   
   def array?(*args)
-    args.any? { |a| a.first == :array }
+    args.any? { |a| a.first == :array || function_that_returns_an_array?(a) }
+  end
+
+  def function_that_returns_an_array?(ast)
+    return false unless ast[0] == :function
+    return false unless ast[1] == :INDEX
+    return false if ast.length < 4
+    return false if (ast[3][0] == :number && ast[3][1].to_f != 0.0) && (ast[4][0] == :number && ast[4][1].to_f != 0.0)
+    # Might contain a zero or null for the row or column number
+    true
   end
   
   def array_ast_to_ruby_array(array_ast)
+    return function_to_ruby_array(array_ast) if function_that_returns_an_array?(array_ast)
     return [[array_ast]] unless array_ast.first == :array
     array_ast[1..-1].map do |row_ast|
       row_ast[1..-1].map do |cell|
@@ -187,5 +197,20 @@ class AstExpandArrayFormulae
       end
     end
   end
+
+  # This handles the special case of INDEX which might return an array
+  def function_to_ruby_array(ast)
+    return [[ast]] unless ast[0] == :function && ast[1] == :INDEX
+    return [[ast]] unless ast[2][0] == :array
+    rows = ast[2].length - 1
+    columns = ast[2][1].length - 1
+    array = Array.new(rows) { Array.new(columns) }
+    1.upto(rows).each do |row|
+      1.upto(columns).each do |column|
+        array[row-1][column-1] = [:function, :INDEX, ast, [:number, row], [:number, column]]
+      end
+    end
+    array
+  end
   
 end

data/src/simplify/map_formulae_to_values.rb

@@ -202,6 +202,8 @@ class MapFormulaeToValues
     indexes = @calculator._filtered_range_indexes(sum_range, *values)
     if indexes.is_a?(Symbol)
       new_ast = value(filtered_range)
+    elsif indexes.empty?
+      new_ast = [:number, 0]
     else
       new_ast = [:function, :SUM, *sum_range.values_at(*indexes)]
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: excel_to_code
 version: !ruby/object:Gem::Version
-  version: 0.2.22
+  version: 0.2.23
 platform: ruby
 authors:
 - Thomas Counsell, Green on Black Ltd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-27 00:00:00.000000000 Z
+date: 2014-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubypeg