excel_to_code 0.2.26 → 0.2.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c64e8c6e7d12441b0f858d3a98aa97197eac5e52
-  data.tar.gz: 79afc6f86465ca664ce677be464572e87e170589
+  metadata.gz: 86c6743f72819d7a8b5372c8f252c3b109c71921
+  data.tar.gz: 9a5a252b856bf6e58266f32fb742c94ba9511d0c
 SHA512:
-  metadata.gz: 8b512da456ba1a3634d9971ad27537ffe4f7ff4efea6d3b434f548d1412c96552ee147bd7e574d5bb38c38f31757d1fbc8eb080441aad5821a61bf6564159c0e
-  data.tar.gz: 217072420254652330cb7cdca81c9f3c0fdba46ef0dcebf8ba391a443408bc2c2143b6a33415e355a0e48102b867771960d897e2d7f0771477f0c474d1188050
+  metadata.gz: 0c1356a0c2cbdd5bb6214c1465ea8b1f5a9991fd15f08d54f5525fd8596bd5881e00f6337d6e57289b062b42b0256f3c169dd5bcc612bc6f5ee7dc41c2435687
+  data.tar.gz: baaa79346e1fae183328ad246781bfa459c6dac83c06299448445b05421b692ddc3027b84b0897e263ad76f6c4017a35b7adf8aa60ec8c4195c6cf3154ac1504

data/src/commands/excel_to_c.rb

@@ -76,7 +76,7 @@ class ExcelToC < ExcelToX
     named_references_ast = {}
     @named_references_to_keep.each do |ref|
       c_name = ref.is_a?(Array) ? c_name_for(ref) : ["", c_name_for(ref)]
-      named_references_ast[c_name] = @named_references[ref]
+      named_references_ast[c_name] = @named_references[ref] || @table_areas[ref]
     end
 
     c.rewrite(named_references_ast, @worksheet_c_names, o)
@@ -86,7 +86,7 @@ class ExcelToC < ExcelToX
     c.cells_that_can_be_set_at_runtime = cells_that_can_be_set_at_runtime
     named_references_ast = {}
     @named_references_that_can_be_set_at_runtime.each do |ref|
-      named_references_ast[c_name_for(ref)] = @named_references[ref]
+      named_references_ast[c_name_for(ref)] = @named_references[ref] || @table_areas[ref]
     end
     c.rewrite(named_references_ast, @worksheet_c_names, o)
     o.puts "// End of named references"

data/src/commands/excel_to_ruby.rb

@@ -46,7 +46,7 @@ class ExcelToRuby < ExcelToX
     named_references_ast = {}
     @named_references_to_keep.each do |ref|
       c_name = ref.is_a?(Array) ? c_name_for(ref) : ["", c_name_for(ref)]
-      named_references_ast[c_name] = @named_references[ref]
+      named_references_ast[c_name] = @named_references[ref] || @table_areas[ref]
     end
 
     c.rewrite(named_references_ast, @worksheet_c_names, o)
@@ -57,7 +57,7 @@ class ExcelToRuby < ExcelToX
     m.sheet_names = @worksheet_c_names
     @named_references_that_can_be_set_at_runtime.each do |ref|
       c_name = c_name_for(ref)
-      ast = @named_references[ref]
+      ast = @named_references[ref] || @table_areas[ref]
       o.puts "  def #{c_name}=(newValue)"
       o.puts "    @#{c_name} = newValue"
       o.puts m.map(ast)

data/src/commands/excel_to_x.rb

@@ -32,7 +32,9 @@ class ExcelToX
   # should be setable, or an array of cell names on that sheet that should be settable (e.g., A1)
   attr_accessor :cells_that_can_be_set_at_runtime
 
-  # Optional attribute. Specifies which named references to be turned into setters
+  # Optional attribute. Specifies which named references to be turned into setters. 
+  #
+  # NB: Named references are assumed to include table names.
   #
   # Should be an array of strings. Each string is a named reference. Case sensitive.
   # To specify a named reference scoped to a worksheet, use ['worksheet', 'named reference'] instead
@@ -64,6 +66,8 @@ class ExcelToX
  
   # Optional attribute. Specifies which named references should be included in the output
   #
+  # NB: Named references are assumed to include table names.
+  #
   # Should be an array of strings. Each string is a named reference. Case sensitive.
   #
   # To specify a named reference scoped to a worksheet, use ['worksheet', 'named reference'] instead
@@ -140,6 +144,9 @@ class ExcelToX
     # These gets the named references, worksheet names and shared strings out of the excel
     extract_data_from_workbook
     
+    # This gets all the formulae, values and tables out of the worksheets
+    extract_data_from_worksheets
+    
     # This checks that the user inputs of which cells to keep are in the right
     # format and refer to sheets and references that actually exist
     clean_cells_that_can_be_set_at_runtime
@@ -147,9 +154,6 @@ class ExcelToX
     clean_named_references_to_keep
     clean_named_references_that_can_be_set_at_runtime
 
-    # 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
@@ -423,7 +427,11 @@ class ExcelToX
       new_named_references_to_keep = @named_references.keys.select do |named_reference|
         named_references_to_keep.call(named_reference)
       end
-      @named_references_to_keep = new_named_references_to_keep
+      table_references_to_keep = @table_areas.keys.select do |table_name|
+        named_references_to_keep.call(table_name)
+      end
+
+      @named_references_to_keep = new_named_references_to_keep.concat(table_references_to_keep)
     end
 
     return unless named_references_to_keep.is_a?(Array)
@@ -431,8 +439,8 @@ class ExcelToX
 
     # Now we need to check the user specified named references actually exist
     named_references_to_keep.each.with_index do |named_reference, i|
-      next if @named_references.has_key?(named_reference)
-      log.warn "Named reference #{named_reference.inspect} in named_references_to_keep has not been found in the spreadsheet: #{@named_references.keys.inspect}"
+      next if @named_references.has_key?(named_reference) || @table_areas.has_key?(named_reference)
+      $stderr.puts "Named reference #{named_reference.inspect} in named_references_to_keep has not been found in the spreadsheet: #{@named_references.keys.inspect}"
       exit
     end
   end
@@ -446,7 +454,10 @@ class ExcelToX
       new_named_references_that_can_be_set_at_runtime = @named_references.keys.select do |named_reference|
         named_references_that_can_be_set_at_runtime.call(named_reference)
       end
-      @named_references_that_can_be_set_at_runtime = new_named_references_that_can_be_set_at_runtime
+      table_references_that_can_be_set_at_runtime = @table_areas.keys.select do |table_name|
+        named_references_that_can_be_set_at_runtime.call(table_name)
+      end
+      @named_references_that_can_be_set_at_runtime = new_named_references_that_can_be_set_at_runtime.concat(table_references_that_can_be_set_at_runtime)
     end
 
     return unless named_references_that_can_be_set_at_runtime.is_a?(Array)
@@ -454,8 +465,8 @@ class ExcelToX
 
     # Now we need to check the user specified named references actually exist
     named_references_that_can_be_set_at_runtime.each.with_index do |named_reference, i|
-      next if @named_references.has_key?(named_reference)
-      log.error "Named reference #{named_reference.inspect} in named_references_that_can_be_set_at_runtime has not been found in the spreadsheet: #{@named_references.keys.inspect}"
+      next if @named_references.has_key?(named_reference) || @table_areas.has_key?(named_reference)
+      $stderr.puts "Named reference #{named_reference.inspect} in named_references_that_can_be_set_at_runtime has not been found in the spreadsheet: #{@named_references.keys.inspect}"
       exit
     end
   end
@@ -491,6 +502,7 @@ class ExcelToX
     @worksheets_dimensions = extractor.worksheets_dimensions
     @table_rids = extractor.table_rids
     @tables = {}
+    @table_areas = {}
     extract_tables
   end
   
@@ -499,6 +511,7 @@ class ExcelToX
   # reference and contains the table data. Then we consolidate all the data
   # from individual table files into a single table file for the worksheet.
   def extract_tables
+    log.info "Extracting Tables"
     @table_rids.each do |worksheet_name, array_of_table_rids|
       xml_filename = @worksheet_xmls[worksheet_name]
       xml_for_rids = {}
@@ -512,11 +525,22 @@ class ExcelToX
       array_of_table_rids.each do |rid| 
         xml(File.join('worksheets', xml_for_rids[rid])) do |i|
           ExtractTable.extract(worksheet_name, i).each do |table_name, details|
-            @tables[table_name.downcase] = Table.new(table_name, *details)
+            name = table_name.downcase
+            table = Table.new(table_name, *details)
+            @tables[name] = table
+            @table_areas[name.to_sym] = table.all
           end
         end
       end
     end
+
+    # Replace A$1:B2 with [A1, A2, B1, B2]
+    @replace_ranges_with_array_literals_replacer ||= ReplaceRangesWithArrayLiteralsAst.new
+
+    @table_areas.each do |name, reference|
+      @table_areas[name] = @replace_ranges_with_array_literals_replacer.map(reference)
+    end
+    
   end
 
   def check_all_functions_implemented
@@ -548,7 +572,7 @@ class ExcelToX
     log.info "Transfering named references to keep into cells to keep"
     return unless @named_references_to_keep
     if @named_references_to_keep == :all
-      @named_references_to_keep = @named_references.keys 
+      @named_references_to_keep = @named_references.keys + @table_areas.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"
@@ -557,7 +581,7 @@ class ExcelToX
     end
     @cells_to_keep ||= {}
     @named_references_to_keep.each do |name|
-      ref = @named_references[name]
+      ref = @named_references[name] || @table_areas[name]
       if ref
         add_ref_to_hash(ref, @cells_to_keep)
       else
@@ -573,7 +597,7 @@ class ExcelToX
     return if @named_references_that_can_be_set_at_runtime == :where_possible # in this case will be done in #work_out_which_named_references_can_be_set_at_runtime
     @cells_that_can_be_set_at_runtime ||= {}
     @named_references_that_can_be_set_at_runtime.each do |name|
-      ref = @named_references[name]
+      ref = @named_references[name] || @table_areas[name]
       if ref
         add_ref_to_hash(ref, @cells_that_can_be_set_at_runtime)
       else
@@ -761,7 +785,7 @@ class ExcelToX
     # In some situations also need to add the named references 
     if @named_references_to_keep
       @named_references_to_keep.each do |name|
-        ref = @named_references[name]
+        ref = @named_references[name] || @table_areas[name]
         if ref.first == :sheet_reference
           s = ref[1]
           c = Reference.for(ref[2][1]).unfix.to_sym
@@ -853,11 +877,6 @@ class ExcelToX
       end
     end
 
-    @named_references.each do |name, ref|
-      if named_references_that_can_be_set_at_runtime.include?(name)
-        @named_references_that_can_be_set_at_runtime << name
-      end
-    end
   end
     
   def simplify(cells = @formulae)

data/src/excel/table.rb

@@ -106,6 +106,10 @@ class Table
       end
     end
   end
+
+  def all
+    ast_for_area @area.excel_start, @area.excel_finish
+  end
   
   def ast_for_area(start,finish)
     [:sheet_reference,@worksheet,[:area,start.to_sym,finish.to_sym]]

data/src/excel_to_code.rb

@@ -1,5 +1,5 @@
 class ExcelToCode
-  def self.version() "0.2.26" end
+  def self.version() "0.2.27" 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.26
+  version: 0.2.27
 platform: ruby
 authors:
 - Thomas Counsell, Green on Black Ltd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-10 00:00:00.000000000 Z
+date: 2014-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubypeg