excel_to_code 0.0.11 → 0.0.13

data/bin/excel_to_c

@@ -42,6 +42,14 @@ END
   opts.on('-m','--run-in-memory',"Instead of writing intermediate files to disk, uses memory. Requires a lot of memory") do
     command.run_in_memory = 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
+  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
+  end
   
   opts.on("-h", "--help", "Show this message") do
     puts opts
@@ -64,4 +72,4 @@ end
 command.excel_file = ARGV[0]
 command.output_directory = ARGV[1] if ARGV[1]
 
-command.go!
+command.go!

data/bin/excel_to_ruby

@@ -35,9 +35,17 @@ END
     command.actually_run_tests = true
   end
   
-  opts.on('-m','--run-in-memory',"Instead of writing intermediate files to disk, uses memory. Requires a lot of memory") do
+  opts.on('-m','--run-in-memory',"Instead of writing intermediate files to disk, uses memory. Requires a lot of memory.") do
     command.run_in_memory = 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
+  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
+  end
   
   opts.on("-h", "--help", "Show this message") do
     puts opts

data/src/commands/excel_to_c.rb

@@ -242,7 +242,7 @@ END
       end
       if refs_to_test && !refs_to_test.empty?
         refs_to_test = refs_to_test.map(&:upcase)
-        CompileToCUnitTest.rewrite(i, c_name, refs_to_test, o)
+        CompileToCUnitTest.rewrite(i, sloppy_tests, c_name, refs_to_test, o)
       end
       close(i)
     end

data/src/commands/excel_to_ruby.rb

@@ -104,7 +104,7 @@ class ExcelToRuby < ExcelToX
       end
       if refs_to_test && !refs_to_test.empty?
         refs_to_test = refs_to_test.map(&:upcase)
-        c.rewrite(i, c_name, refs_to_test, o)
+        c.rewrite(i, sloppy_tests, c_name, refs_to_test, o)
       end
       o.puts "  # End of #{name}"
       o.puts ""
@@ -124,4 +124,4 @@ class ExcelToRuby < ExcelToX
     puts `cd #{File.join(output_directory)}; ruby "test_#{output_name.downcase}.rb"`
   end
   
-end
+end

data/src/commands/excel_to_x.rb

@@ -63,6 +63,11 @@ class ExcelToX
   
   # This is the log file, if set it needs to respond to the same methods as the standard logger library
   attr_accessor :log
+
+  # Optional attribute. Boolean. Default true.
+  #   * true - empty cells and zeros are treated as being equivalent in tests. Numbers greater then 1 are only expected to match with assert_in_epsilon, numbers less than 1 are only expected to match with assert_in_delta
+  #   * false - empty cells and zeros are treated as being different in tests. Numbers must match to full accuracy.
+  attr_accessor :sloppy_tests
   
   def set_defaults
     raise ExcelToCodeException.new("No excel file has been specified") unless excel_file
@@ -95,6 +100,9 @@ class ExcelToX
     
     # Set up our log file
     self.log ||= Logger.new(STDOUT)
+
+    # 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
   end
   
   def go!

data/src/compile/c/compile_to_c_unit_test.rb

@@ -1,10 +1,18 @@
 class CompileToCUnitTest
+
+  attr_accessor :epsilon
+  attr_accessor :delta
+
+  def initialize
+    @epsilon = 0.001
+    @delta = 0.001
+  end
   
   def self.rewrite(*args)
     self.new.rewrite(*args)
   end
   
-  def rewrite(input,c_name, refs_to_test, output)
+  def rewrite(input, sloppy, c_name, refs_to_test, output)
     input.lines do |line|
       begin
         ref, formula = line.split("\t")
@@ -14,8 +22,22 @@ class CompileToCUnitTest
         ast = eval(formula)
         case ast.first
         when :number, :percentage
-          output.puts "  assert_equal(:ExcelNumber,r[:type])"
-          output.puts "  assert_in_epsilon(#{ast.last.to_f.to_s},r[:number])"
+          unless sloppy
+            output.puts "  assert_equal(:ExcelNumber,r[:type])"
+            output.puts "  assert_equal(#{ast.last.to_f.to_s},r[:number])"
+          else
+            if ast.last.to_f == 0
+              output.puts "  pass if r[:type] == :ExcelEmpty"
+            end
+            
+            output.puts "  assert_equal(:ExcelNumber,r[:type])"
+
+            if ast.last.to_f <= 1
+              output.puts "  assert_in_delta(#{ast.last.to_f.to_s},r[:number],#{@delta})"
+            else
+              output.puts "  assert_in_epsilon(#{ast.last.to_f.to_s},r[:number],#{@epsilon})"
+            end
+          end
         when :error
           output.puts "  assert_equal(:ExcelError,r[:type])"
         when :string
@@ -27,8 +49,16 @@ class CompileToCUnitTest
         when :boolean_false
           output.puts "  assert_equal(:ExcelBoolean,r[:type])"
           output.puts "  assert_equal(0,r[:number])"           
+        when :blank
+          unless sloppy
+            output.puts "  assert_equal(:ExcelEmpty,r[:type])"
+          else
+            output.puts "  pass if r[:type] == :ExcelEmpty"
+            output.puts "  assert_equal(:ExcelNumber,r[:type])"
+            output.puts "  assert_in_delta(0.0,r[:number],#{@delta})"
+          end
         else
-          raise NotSupportedException.new("#{ast} type can't be settable")
+          raise NotSupportedException.new("#{ast} type can't be tested")
         end
         output.puts "end"
         output.puts

data/src/compile/ruby/compile_to_ruby_unit_test.rb

@@ -2,11 +2,20 @@ require_relative "map_values_to_ruby"
 
 class CompileToRubyUnitTest
   
+
+  attr_accessor :epsilon
+  attr_accessor :delta
+
+  def initialize
+    @epsilon = 0.001
+    @delta = 0.001
+  end
+
   def self.rewrite(*args)
     self.new.rewrite(*args)
   end
   
-  def rewrite(input, c_name, refs_to_test, output)
+  def rewrite(input, sloppy, c_name, refs_to_test, o)
     mapper = MapValuesToRuby.new
     input.lines do |line|
       ref, formula = line.split("\t")
@@ -14,16 +23,32 @@ class CompileToRubyUnitTest
       ast = eval(formula)
       value = mapper.map(ast)
       full_reference = "worksheet.#{c_name}_#{ref.downcase}"
-      if ast.first == :number
-        if value == "0" # Need to do a slightly different test, because needs to pass if nil returned, as well as zero
-          output.puts "  def test_#{c_name}_#{ref.downcase}; assert_in_epsilon(#{value},#{full_reference} || 0); end"      
+      test_name = "test_#{c_name}_#{ref.downcase}"
+      case ast.first
+      when :blank
+        if sloppy
+          o.puts "  def #{test_name}; assert_includes([nil, 0], #{full_reference}); end"
+        else
+          o.puts "  def #{test_name}; assert_equal(#{value}, #{full_reference}); end"
+        end
+      when :number
+        if sloppy
+          if value.to_f.abs <= 1
+            if value == "0" 
+              o.puts "  def #{test_name}; assert_in_delta(#{value}, (#{full_reference}||0), #{delta}); end"
+            else
+              o.puts "  def #{test_name}; assert_in_delta(#{value}, #{full_reference}, #{delta}); end"
+            end
+          else
+            o.puts "  def #{test_name}; assert_in_epsilon(#{value}, #{full_reference}, #{epsilon}); end"
+          end
         else
-          output.puts "  def test_#{c_name}_#{ref.downcase}; assert_in_epsilon(#{value},#{full_reference}); end"      
+          o.puts "  def #{test_name}; assert_equal(#{value}, #{full_reference}); end"
         end
       else
-        output.puts "  def test_#{c_name}_#{ref.downcase}; assert_equal(#{value},#{full_reference}); end"
+        o.puts "  def #{test_name}; assert_equal(#{value}, #{full_reference}); end"
       end
     end
   end
   
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: excel_to_code
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.13
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-17 00:00:00.000000000 Z
+date: 2012-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubypeg
-  requirement: &70307966168940 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70307966168940
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70307966167440 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70307966167440
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70307966165300 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: 2.7.0
   type: :runtime
   prerelease: false
-  version_requirements: *70307966165300
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.7.0
 - !ruby/object:Gem::Dependency
   name: ffi
-  requirement: &70307966164020 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +69,12 @@ dependencies:
         version: 1.0.11
   type: :runtime
   prerelease: false
-  version_requirements: *70307966164020
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.11
 description: ! "# excel_to_code\n\nConverts some excel spreadsheets (.xlsx, not .xls)
   into some other programming languages (currently ruby or c).\nThis allows the excel
   spreadsheets to be run programatically, without excel.\n\nIts cannonical source
@@ -202,7 +222,7 @@ files:
 - src/util.rb
 - bin/excel_to_c
 - bin/excel_to_ruby
-homepage: http://github.com/tamc/excel2code
+homepage: http://github.com/tamc/excel_to_code
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -222,7 +242,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Converts .xlxs files into pure ruby 1.9 code or pure C code so that they