excel_to_code 0.2.1 → 0.2.3

data/src/compile/ruby/map_formulae_to_ruby.rb

@@ -6,6 +6,7 @@ class MapFormulaeToRuby < MapValuesToRuby
   attr_accessor :worksheet
   
   FUNCTIONS = {
+    'LOWER' => 'lower',
     :'*' => 'multiply',
     :'+' => 'add',
     :'-' => 'subtract',

data/src/excel/excel_functions.rb

@@ -94,3 +94,5 @@ require_relative 'excel_functions/isnumber'
 require_relative 'excel_functions/len'
 
 require_relative 'excel_functions/substitute'
+
+require_relative 'excel_functions/lower'

data/src/excel/excel_functions/lower.rb

@@ -0,0 +1,21 @@
+module ExcelFunctions
+  
+  def lower(string)
+    return string if string.is_a?(Symbol)
+    case  string
+    when nil; ""
+    when String; string.downcase
+    when Numeric
+      if string.round == string
+        string.to_i.to_s
+      else
+        string.to_s
+      end
+    when true; "true"
+    when false; "false"
+    else
+      string.to_s
+    end
+  end
+  
+end

data/src/extract.rb

@@ -1,15 +1,6 @@
-require_relative 'extract/check_for_unknown_functions'
-require_relative "extract/extract_array_formulae"
-require_relative "extract/extract_formulae"
 require_relative "extract/extract_relationships"
-require_relative "extract/extract_shared_formulae"
-require_relative "extract/extract_shared_formulae_targets"
 require_relative "extract/extract_shared_strings"
-require_relative "extract/extract_simple_formulae"
-require_relative "extract/extract_values"
-require_relative "extract/extract_worksheet_dimensions"
 require_relative "extract/extract_worksheet_names"
 require_relative "extract/extract_named_references"
-require_relative "extract/extract_worksheet_table_relationships"
 require_relative "extract/extract_table"
-require_relative "extract/extract_everything"
+require_relative "extract/extract_data_from_worksheet"

data/src/extract/{extract_everything.rb → extract_data_from_worksheet.rb}

@@ -1,6 +1,6 @@
 require 'ox'
 
-class ExtractEverythingFromWorkbook < ::Ox::Sax
+class ExtractDataFromWorksheet < ::Ox::Sax
 
   attr_accessor :table_rids
   attr_accessor :worksheets_dimensions

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: excel_to_code
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.3
 platform: ruby
 authors:
 - Thomas Counsell, Green on Black Ltd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-22 00:00:00.000000000 Z
+date: 2014-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubypeg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.7.0
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.11
 - !ruby/object:Gem::Dependency
   name: ox
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.12
 description: "# excel_to_code\n\nConverts some excel spreadsheets (.xlsx, not .xls)
@@ -108,30 +108,35 @@ extra_rdoc_files: []
 files:
 - README.md
 - TODO
+- bin/excel_to_c
+- bin/excel_to_ruby
+- src/commands.rb
 - src/commands/excel_to_c.rb
 - src/commands/excel_to_ruby.rb
 - src/commands/excel_to_x.rb
-- src/commands.rb
+- src/compile.rb
+- src/compile/c.rb
 - src/compile/c/a.out
 - src/compile/c/compile_named_reference_setters.rb
 - src/compile/c/compile_to_c.rb
 - src/compile/c/compile_to_c_header.rb
 - src/compile/c/compile_to_c_unit_test.rb
 - src/compile/c/excel_to_c_runtime.c
+- src/compile/c/excel_to_c_runtime_test.c
 - src/compile/c/map_formulae_to_c.rb
 - src/compile/c/map_sheet_names_to_c_names.rb
 - src/compile/c/map_values_to_c.rb
 - src/compile/c/map_values_to_c_structs.rb
-- src/compile/c.rb
+- src/compile/ruby.rb
 - src/compile/ruby/compile_to_ruby.rb
 - src/compile/ruby/compile_to_ruby_unit_test.rb
 - src/compile/ruby/excel_to_ruby_runtime.rb
 - src/compile/ruby/map_formulae_to_ruby.rb
 - src/compile/ruby/map_sheet_names_to_ruby_names.rb
 - src/compile/ruby/map_values_to_ruby.rb
-- src/compile/ruby.rb
-- src/compile.rb
+- src/excel.rb
 - src/excel/area.rb
+- src/excel/excel_functions.rb
 - src/excel/excel_functions/abs.rb
 - src/excel/excel_functions/add.rb
 - src/excel/excel_functions/and.rb
@@ -158,6 +163,7 @@ files:
 - src/excel/excel_functions/less_than.rb
 - src/excel/excel_functions/less_than_or_equal.rb
 - src/excel/excel_functions/log.rb
+- src/excel/excel_functions/lower.rb
 - src/excel/excel_functions/max.rb
 - src/excel/excel_functions/mid.rb
 - src/excel/excel_functions/min.rb
@@ -189,30 +195,19 @@ files:
 - src/excel/excel_functions/text.rb
 - src/excel/excel_functions/trim.rb
 - src/excel/excel_functions/vlookup.rb
-- src/excel/excel_functions.rb
 - src/excel/formula_peg.rb
 - src/excel/formula_peg.txt
 - src/excel/reference.rb
 - src/excel/table.rb
-- src/excel.rb
 - src/excel_to_code.rb
-- src/extract/check_for_unknown_functions.rb
-- src/extract/extract_array_formulae.rb
-- src/extract/extract_everything.rb
-- src/extract/extract_formulae.rb
+- src/extract.rb
+- src/extract/extract_data_from_worksheet.rb
 - src/extract/extract_named_references.rb
 - src/extract/extract_relationships.rb
-- src/extract/extract_shared_formulae.rb
-- src/extract/extract_shared_formulae_targets.rb
 - src/extract/extract_shared_strings.rb
-- src/extract/extract_simple_formulae.rb
 - src/extract/extract_table.rb
-- src/extract/extract_values.rb
-- src/extract/extract_worksheet_dimensions.rb
 - src/extract/extract_worksheet_names.rb
-- src/extract/extract_worksheet_table_relationships.rb
-- src/extract/simple_extract_from_xml.rb
-- src/extract.rb
+- src/rewrite.rb
 - src/rewrite/ast_copy_formula.rb
 - src/rewrite/ast_expand_array_formulae.rb
 - src/rewrite/caching_formula_parser.rb
@@ -227,7 +222,7 @@ files:
 - src/rewrite/rewrite_values_to_ast.rb
 - src/rewrite/rewrite_whole_row_column_references_to_areas.rb
 - src/rewrite/rewrite_worksheet_names.rb
-- src/rewrite.rb
+- src/simplify.rb
 - src/simplify/count_formula_references.rb
 - src/simplify/emergency_array_formula_replace_indirect_bodge.rb
 - src/simplify/identify_dependencies.rb
@@ -251,12 +246,9 @@ files:
 - src/simplify/simplify_arithmetic.rb
 - src/simplify/sort_into_calculation_order.rb
 - src/simplify/wrap_formulae_that_return_arrays_and_are_not_in_arrays.rb
-- src/simplify.rb
+- src/util.rb
 - src/util/not_supported_exception.rb
 - src/util/try.rb
-- src/util.rb
-- bin/excel_to_c
-- bin/excel_to_ruby
 homepage: http://github.com/tamc/excel_to_code
 licenses:
 - MIT
@@ -267,20 +259,19 @@ require_paths:
 - src
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.1
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Converts .xlxs files into pure ruby 1.9 code or pure C code so that they
   can be executed without excel
 test_files: []
-has_rdoc: false

data/src/extract/check_for_unknown_functions.rb

@@ -1,20 +0,0 @@
-require_relative '../compile/ruby/map_formulae_to_ruby'
-
-class CheckForUnknownFunctions
-  
-  attr_accessor :settable
-  
-  def self.rewrite(*args)
-    self.new.rewrite(*args)
-  end
-  
-  def check(input,output)
-    self.settable ||= lambda { |ref| false }
-    input.each_line do |line|
-      line.scan(/\[:function, :["']?([A-Z ]+)['"]?/).each do |match|
-        output.puts $1 unless MapFormulaeToRuby::FUNCTIONS.has_key?($1.to_sym)
-      end
-    end
-  end
-  
-end

data/src/extract/extract_array_formulae.rb

@@ -1,23 +0,0 @@
-require_relative 'extract_formulae'
-
-class ExtractArrayFormulae < ExtractFormulae
-  
-  def start_formula(type,attributes)
-    return unless type == 'array' && attributes.assoc('ref')
-    @array_range = attributes.assoc('ref').last
-    @parsing = true
-  end
-  
-  def write_formula
-    return if @formula.empty?
-    formula_text = @formula.join.gsub(/[\r\n]+/,'')
-    ast = CachingFormulaParser.parse(formula_text)
-    unless ast
-      $stderr.puts "Could not parse #{@sheet_name} #{@ref} #{formula_text}"
-      exit
-    end
-    # FIXME: Should leave in original form rather than converting to ast?
-    @output[[@sheet_name, @ref]] = [@array_range, ast]
-  end
-
-end

data/src/extract/extract_formulae.rb

@@ -1,46 +0,0 @@
-require 'nokogiri'
-
-class ExtractFormulae < Nokogiri::XML::SAX::Document 
-
-  def self.extract(*args)
-    self.new.extract(*args)
-  end
-
-  def extract(sheet_name, input)
-    @sheet_name = sheet_name.to_sym
-    @output = {}
-    @parsing = false
-    Nokogiri::XML::SAX::Parser.new(self).parse(input)
-    @output
-  end
-
-  def start_element(name,attributes)
-    if name == 'c'
-      @ref = attributes.assoc('r').last.to_sym
-    elsif name == "f"
-      type = attributes.assoc('t')
-      @formula = []
-      start_formula( type && type.last, attributes)
-    end
-  end
-
-  def end_element(name)
-    return unless @parsing && name == "f"
-    @parsing = false
-    write_formula
-  end
-
-  def characters(string)
-    return unless @parsing
-    @formula.push(string)
-  end
-
-  def start_formula(type,attributes)
-    # Override
-  end
-
-  def write_formula   
-    # Override
-  end
-
-end

data/src/extract/extract_shared_formulae.rb

@@ -1,24 +0,0 @@
-require_relative 'extract_formulae'
-
-class ExtractSharedFormulae < ExtractFormulae
-  
-  def start_formula(type,attributes)
-    return unless type == 'shared' && attributes.assoc('ref')
-    @shared_range = attributes.assoc('ref').last
-    @shared_formula_identifier = attributes.assoc('si').last
-    @parsing = true
-  end
-  
-  def write_formula
-    return if @formula.empty?
-    formula_text = @formula.join.gsub(/[\r\n]+/,'')
-    ast = CachingFormulaParser.parse(formula_text)
-    unless ast
-      $stderr.puts "Could not parse #{@sheet_name} #{@ref} #{formula_text}"
-      exit
-    end
-    # FIXME: Should leave in original form rather than converting to ast?
-    @output[[@sheet_name, @ref]] = [@shared_range, @shared_formula_identifier, ast]
-  end
-  
-end

data/src/extract/extract_shared_formulae_targets.rb

@@ -1,15 +0,0 @@
-require_relative 'extract_formulae'
-
-class ExtractSharedFormulaeTargets < ExtractFormulae
-  
-  def start_formula(type,attributes)
-    return unless type == 'shared'
-    @shared_formula_identifier = attributes.assoc('si').last
-    @parsing = true
-  end
-  
-  def write_formula
-    @output[[@sheet_name, @ref]] = @shared_formula_identifier
-  end
-  
-end

data/src/extract/extract_simple_formulae.rb

@@ -1,23 +0,0 @@
-require_relative 'extract_formulae'
-
-class ExtractSimpleFormulae < ExtractFormulae
-
-  def start_formula(type,attributes)
-    # Simple formulas don't have a type
-    return if type
-    @parsing = true
-  end
-
-  def write_formula   
-    return if @formula.empty?
-    formula_text = @formula.join.gsub(/[\r\n]+/,'')
-    ast = CachingFormulaParser.parse(formula_text)
-    unless ast
-      $stderr.puts "Could not parse #{@sheet_name} #{@ref} #{formula_text}"
-      exit
-    end
-    # FIXME: Should leave in original form rather than converting to ast?
-    @output[[@sheet_name, @ref]] = ast
-  end
-
-end