excel_to_code 0.0.7 → 0.0.8

data/src/rewrite/rewrite_merge_formulae_and_values.rb

@@ -11,7 +11,7 @@ class RewriteMergeFormulaeAndValues
     shared_formulae = Hash[shared_formulae.readlines.map { |line| [line[/(.*?)\t/,1],line]}]
     array_formula = Hash[array_formula.readlines.map { |line| [line[/(.*?)\t/,1],line]}]
     simple_formulae = Hash[simple_formulae.readlines.map { |line| [line[/(.*?)\t/,1],line]}]
-
+        
     values.lines do |line|
       ref = line[/(.*?)\t/,1]
       @references_to_add_if_they_are_not_already_present.delete(ref)

data/src/rewrite/rewrite_relationship_id_to_filename.rb

@@ -4,18 +4,18 @@ class RewriteRelationshipIdToFilename
     self.new.rewrite(*args)
   end
   
-  def rewrite(input,relationships_file,output)
-    relationships_file.rewind
+  def rewrite(input, relationships_file, output)
     relationships_file.rewind
     relationships = Hash[relationships_file.readlines.map { |line| line.split("\t")}]
     input.lines do |line|
       parts = line.split("\t")
       rid = parts.pop.strip
       if relationships.has_key?(rid)
-        output.puts "#{parts.join("\t")}#{parts.size > 0 ? "\t" : ""}#{relationships[rid].strip}"
+        parts.push relationships[rid].strip
+        output.puts parts.join("\t")
       else
         $stderr.puts "Warning, #{rid.inspect} not found in relationships file #{relationships.inspect}"
-        outputs.puts "Warning, #{rid.inspect} not found in relationships file #{relationships.inspect}"
+        output.puts "Warning, #{rid.inspect} not found in relationships file #{relationships.inspect}"
       end
     end
   end

data/src/rewrite/rewrite_whole_row_column_references_to_areas.rb

@@ -66,16 +66,14 @@ end
 
 class RewriteWholeRowColumnReferencesToAreas
   
-  def self.rewrite(input,default_worksheet_name,worksheet_dimensions,output)
-    new.rewrite(input,default_worksheet_name,worksheet_dimensions,output)
+  attr_accessor :sheet_name
+  attr_accessor :dimensions
+  
+  def self.rewrite(input,output)
+    new.rewrite(input,output)
   end
   
-  def rewrite(input,default_worksheet_name,worksheet_dimensions,output)
-    dimensions =  Hash[worksheet_dimensions.readlines.map do |line| 
-      worksheet_name, area = line.split("\t")
-      [worksheet_name,WorksheetDimension.new(area)]
-    end]
-    mapper = MapColumnAndRowRangeAst.new(default_worksheet_name,dimensions)
+  def rewrite(input,output)
     input.lines do |line|
       if line =~ /(:column_range|:row_range)/
         content = line.split("\t")
@@ -87,4 +85,16 @@ class RewriteWholeRowColumnReferencesToAreas
     end
   end
   
+  def worksheet_dimensions=(worksheet_dimensions)
+    @dimensions =  Hash[worksheet_dimensions.readlines.map do |line| 
+      worksheet_name, area = line.split("\t")
+      [worksheet_name,WorksheetDimension.new(area)]
+    end]
+    @mapper = nil
+  end
+  
+  def mapper
+    @mapper ||= MapColumnAndRowRangeAst.new(sheet_name,dimensions)
+  end
+  
 end

data/src/simplify/count_formula_references.rb

@@ -26,6 +26,7 @@ class CountFormulaReferences
   end
     
   def count_dependencies_for(sheet,ref,ast)
+    @dependencies[sheet][ref] ||= 0
     current_sheet.push(sheet)
     map(ast)
     current_sheet.pop

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: excel_to_code
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-31 00:00:00.000000000 Z
+date: 2012-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubypeg
-  requirement: &70200308259560 !ruby/object:Gem::Requirement
+  requirement: &70200979061400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70200308259560
+  version_requirements: *70200979061400
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70200305826260 !ruby/object:Gem::Requirement
+  requirement: &70200979060900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70200305826260
+  version_requirements: *70200979060900
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70200305824320 !ruby/object:Gem::Requirement
+  requirement: &70200979060400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 2.7.0
   type: :runtime
   prerelease: false
-  version_requirements: *70200305824320
+  version_requirements: *70200979060400
 - !ruby/object:Gem::Dependency
   name: ffi
-  requirement: &70200305818740 !ruby/object:Gem::Requirement
+  requirement: &70200979050020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: 1.0.11
   type: :runtime
   prerelease: false
-  version_requirements: *70200305818740
+  version_requirements: *70200979050020
 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