excel_to_code 0.2.9 → 0.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7529040ce2d0f45b5a280ac08be87c8ac0df7a73
-  data.tar.gz: dd33604aada1850a86209407453eab32c1562f5a
+  metadata.gz: d131943e44d296b38b2b2f52d4e710fb72b3290c
+  data.tar.gz: 1ced79386e0e176fb515794fb5026a4779d56c2a
 SHA512:
-  metadata.gz: 6adb53e38ffcc2326755175551c358fe223288b2dcd4ac1d23a7c75eca43b785c780836e9dadf39beb15ef5124c896e74af3b69bd510a4dfd9a143153bb13e2a
-  data.tar.gz: 22b7b90bc550f925c704a4087a496ed2e0754a1f93ce0243ddedf5b38367c3b6d21b2e9d268c10d522651aff8e45cd2967606e3e461ff5c8bacb7c03b3af32d0
+  metadata.gz: 90c8c2c66e70b2beb0073a904d02c70444d3881bce4b570fe681a99098597319cee266611282f6789326efaf9a69198c85750633392c5aeae4fed329bfc7c521
+  data.tar.gz: 39325a065501520c32b29be75d0af212c498c8d8d2baf580e1a0e585b2841fa6610679a1298d2dbe86ab5bf6269821612b97ce969b1d178a514ea16ef4831e94

data/src/commands/excel_to_x.rb

@@ -130,6 +130,10 @@ class ExcelToX
     # This gets all the formulae, values and tables out of the worksheets
     extract_data_from_worksheets
 
+    # This is an early check that the functions in the extracted data have 
+    # all got an implementation in, at least, the ruby code
+    check_all_functions_implemented
+
     # This turns named references that are specified as getters and setters
     # into a series of required cell references
     transfer_named_references_to_keep_into_cells_to_keep
@@ -466,6 +470,23 @@ class ExcelToX
       end
     end
   end
+
+  def check_all_functions_implemented
+    functions_that_are_removed_during_compilation = [:INDIRECT, :OFFSET, :ROW, :COLUMN, :TRANSPOSE]
+    functions_used = CachingFormulaParser.instance.functions_used.keys
+    functions_used.delete_if do |f|
+      MapFormulaeToRuby::FUNCTIONS[f]
+    end
+    functions_that_are_removed_during_compilation.each do |f|
+      functions_used.delete(f)
+    end
+    unless functions_used.empty?
+      puts
+      puts "The following functions have not been implemented in excel_to_code. Please see https://github.com/tamc/excel_to_code/blob/master/doc/How_to_add_a_missing_function.md"
+      puts functions_used
+      exit
+    end
+  end
   
   # This makes sure that cells_to_keep includes named_references_to_keep
   def transfer_named_references_to_keep_into_cells_to_keep

data/src/rewrite/caching_formula_parser.rb

@@ -3,6 +3,8 @@ require 'singleton'
 class CachingFormulaParser
   include Singleton
 
+  attr_accessor :functions_used
+
   def self.parse(*args)
     instance.parse(*args)
   end
@@ -19,6 +21,7 @@ class CachingFormulaParser
     @operator_cache = {}
     @comparator_cache = {}
     @sheet_reference_cache = {}
+    @functions_used = {}
   end
 
   def parse(text)
@@ -30,15 +33,24 @@ class CachingFormulaParser
     end
   end
 
+  # FIXME: THe function bit in here isn't DRY or consistent
   def map(ast)
     return ast unless ast.is_a?(Array)
-    ast[1] = ast[1].to_sym if ast[0] == :function
+    if ast[0] == :function
+      ast[1] = ast[1].to_sym 
+      @functions_used[ast[1]] = true
+    end
     if respond_to?(ast[0])
       ast = send(ast[0], ast) 
     else
       ast.each.with_index do |a,i| 
         next unless a.is_a?(Array)
-        a[1] = a[1].to_sym if a[0] == :function
+        
+        if a[0] == :function
+          a[1] = a[1].to_sym 
+          @functions_used[a[1]] = true
+        end
+
         ast[i] = map(a)
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: excel_to_code
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.2.10
 platform: ruby
 authors:
 - Thomas Counsell, Green on Black Ltd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-31 00:00:00.000000000 Z
+date: 2014-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubypeg