excel_to_code 0.2.20 → 0.2.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8683fda68a9053d3873f3ae6612dc61af4ad4393
-  data.tar.gz: 5ce67a7a836a8931a2b41f7f790ca07b9c565960
+  metadata.gz: 7dfb614b4506cd5feb1fdf4ed13261b19e33af1c
+  data.tar.gz: 5e06790944edc88f7ccea7959e4a1a1a6119fffb
 SHA512:
-  metadata.gz: abef9a443559d67c2dd453d6c386febc7516c2fa88b13c2a0a8e43e932809d90d51e400e637bf4845d85bd6296136805c42e762b1d7dc563192ba0b32841f93d
-  data.tar.gz: 6d74e0cfe7dcdad64037700c137066f21afddc10f2acafb2df63c8348e26ea0618e1b321697af7b1024853949bbc71ef1bfd87edb0839e7c75e039ae5d7d36d3
+  metadata.gz: 3f5287bc61bfaa773332bfd7361eb062cf3f3246649ce677699374745fdb68cb707899457a003faabd04caa3285483a04a465e8a6864bdcad8a593faa417bf00
+  data.tar.gz: 1dbe79f4c2bf8dcb78db9f033f30ce1dfd0f5e44b3e8004a51b2f42f62507001ae3e3c17e25a19af075af0b67d25598cd214b7b0a39987f994ca7333e6300c2f

data/bin/excel_to_c

@@ -4,7 +4,6 @@ require_relative '../src/excel_to_code'
 
 command = ExcelToC.new
 
-#FIXME: Add a version option
 opts = OptionParser.new do |opts|
   opts.banner = <<-END
 
@@ -20,18 +19,15 @@ END
   opts.separator ""
   opts.separator "Specific options:"
   
-  opts.on('-s','--settable WORKSHEET','Make it possible to set the values of cells in this worksheet at runtime. By default no values are settable.') do |sheet|
-    command.cells_that_can_be_set_at_runtime = { sheet => :all }
+  opts.on('-v','--version', 'Prints the version number of this code') do 
+    puts ExcelToCode.version
+    exit
   end
 
   opts.on('-o','--output-name NAME','Filename to give to c version of code (and associated ruby interface). Defaults to a folder with the same name as the excel file.') do |name|
     command.output_name = name
   end
-  
-  opts.on('-p','--prune-except WORKSHEET',"Remove all cells except those on this worksheet, or that are required to calculate values on that worksheet. By default keeps all cells.") do |sheet|
-    command.cells_to_keep = { sheet => :all }
-  end
-  
+
   opts.on('-c','--compile',"Compile the generated code (where relevant)") do
     command.actually_compile_code = true
   end
@@ -39,15 +35,20 @@ END
   opts.on('-r','--run-tests',"Compile the generated code and then run the tests") do
     command.actually_run_tests = true
   end
-  
-  opts.on('--sloppy-tests',"The generated tests treat blanks and zeros as equivalent and only require numbers to be approximately the same. This is the default.") do
-    command.sloppy_tests = true
+
+  opts.on('-n','--named-references',"Transfer named references from spreadsheet to generated code") do
+    command.named_references_that_can_be_set_at_runtime = :where_possible
+    command.named_references_to_keep = :all
   end
 
-  opts.on('--precise-tests',"The generated tests treat blanks and zeros as different and requires numbers to be exactly the same.") do
-    command.sloppy_tests = false
+  opts.on('-s','--settable WORKSHEET','Make it possible to set the values of cells in this worksheet at runtime. By default no values are settable.') do |sheet|
+    command.cells_that_can_be_set_at_runtime = { sheet => :all }
   end
 
+  opts.on('-p','--prune-except WORKSHEET',"Remove all cells except those on this worksheet, or that are required to calculate values on that worksheet. By default keeps all cells.") do |sheet|
+    command.cells_to_keep = { sheet => :all }
+  end
+  
   opts.on('--isolate WORKSHEET', "Only performs translation and optimiation of that one worksheet. Useful for debugging an incorrect translation of a large worksheet") do |sheet|
     command.isolate = sheet
   end

data/bin/excel_to_ruby

@@ -19,28 +19,38 @@ END
   opts.separator ""
   opts.separator "Specific options:"
   
-  opts.on('-s','--settable WORKSHEET','Make it possible to set the values of cells in this worksheet at runtime. By default no values are settable.') do |sheet|
-    command.cells_that_can_be_set_at_runtime = { sheet => :all }
+  opts.on('-v','--version', 'Prints the version number of this code') do 
+    puts ExcelToCode.version
+    exit
   end
 
-  opts.on('-o','--output-name NAME','Filename to give to ruby version of code. Defaults to a folder with the same name as the excel file.') do |name|
+  opts.on('-o','--output-name NAME','Filename to give to c version of code (and associated ruby interface). Defaults to a folder with the same name as the excel file.') do |name|
     command.output_name = name
   end
-  
-  opts.on('-p','--prune-except WORKSHEET',"Remove all cells except those on this worksheet, or that are required to calculate values on that worksheet. By default keeps all cells.") do |sheet|
-    command.cells_to_keep = { sheet => :all }
+
+  opts.on('-c','--compile',"Compile the generated code (where relevant)") do
+    command.actually_compile_code = true
   end
-    
-  opts.on('-r','--run-tests',"Run the generated tests") do
+  
+  opts.on('-r','--run-tests',"Compile the generated code and then run the tests") do
     command.actually_run_tests = true
   end
-  
-  opts.on('--sloppy-tests',"The generated tests treat blanks and zeros as equivalent and only require numbers to be approximately the same. This is the default.") do
-    command.sloppy_tests = true
+
+  opts.on('-n','--named-references',"Transfer named references from spreadsheet to generated code") do
+    command.named_references_that_can_be_set_at_runtime = :where_possible
+    command.named_references_to_keep = :all
+  end
+
+  opts.on('-s','--settable WORKSHEET','Make it possible to set the values of cells in this worksheet at runtime. By default no values are settable.') do |sheet|
+    command.cells_that_can_be_set_at_runtime = { sheet => :all }
   end
 
-  opts.on('--precise-tests',"The generated tests treat blanks and zeros as different and requires numbers to be exactly the same.") do
-    command.sloppy_tests = false
+  opts.on('-p','--prune-except WORKSHEET',"Remove all cells except those on this worksheet, or that are required to calculate values on that worksheet. By default keeps all cells.") do |sheet|
+    command.cells_to_keep = { sheet => :all }
+  end
+  
+  opts.on('--isolate WORKSHEET', "Only performs translation and optimiation of that one worksheet. Useful for debugging an incorrect translation of a large worksheet") do |sheet|
+    command.isolate = sheet
   end
   
   opts.on("-h", "--help", "Show this message") do

data/src/commands/excel_to_x.rb

@@ -540,7 +540,14 @@ class ExcelToX
   def transfer_named_references_to_keep_into_cells_to_keep
     log.info "Transfering named references to keep into cells to keep"
     return unless @named_references_to_keep
-    @named_references_to_keep = @named_references.keys if @named_references_to_keep == :all
+    if @named_references_to_keep == :all
+      @named_references_to_keep = @named_references.keys 
+      # If the user has specified named_references_to_keep == :all, but there are none, fall back
+      if @named_references_to_keep.empty?
+        log.warn "named_references_to_keep == :all, but no named references found"
+        return
+      end
+    end
     @cells_to_keep ||= {}
     @named_references_to_keep.each do |name|
       ref = @named_references[name]

data/src/compile/c/excel_to_c_runtime_test.c

@@ -482,6 +482,9 @@ int test_functions() {
   ExcelValue sumifs_array_9[] = { new_excel_number(10), new_excel_string("10.0")};
   assert(sumifs(new_excel_number(100),2,sumifs_array_9).number == 100);
 
+  ExcelValue sumifs_array_9b[] = { new_excel_string("10"), new_excel_number(10.0)};
+  assert(sumifs(new_excel_number(100),2,sumifs_array_9b).number == 100);
+
   ExcelValue sumifs_array_10[] = { sumifs_array_4_v, new_excel_string("CO2"), sumifs_array_5_v, new_excel_number(2)};
   assert(sumifs(sumifs_array_3_v,4, sumifs_array_10).number == 0);
 

data/src/excel/excel_functions/sumifs.rb

@@ -37,7 +37,14 @@ module ExcelFunctions
 
         pass = case check_value
         when String
-          check_value.downcase == required_value.to_s.downcase
+          case required_value
+          when String
+            check_value.downcase == required_value.downcase
+          when Numeric
+            check_value.to_f == required_value.to_f
+          else
+            check_value.downcase == required_value.to_s.downcase
+          end
         when true, false
           check_value == required_value
         when nil

data/src/excel_to_code.rb

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

metadata

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