rubyfromexcel 0.0.22 → 0.0.23

data/lib/excelfile/worksheet.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module RubyFromExcel
   class Worksheet
   
@@ -86,7 +88,7 @@ module RubyFromExcel
         end
         if workbook.indirects_used
           named_references.each do |name,reference|
-            r.put_simple_method name, reference
+            r.put_simple_method name.downcase.gsub(/[^\p{word}]/,'_'), reference
           end
         end
       end

data/spec/runtime_formula_builder_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require_relative 'spec_helper'
 
 describe RuntimeFormulaBuilder, "For parsing indirect references" do
@@ -49,6 +51,7 @@ describe RuntimeFormulaBuilder, "For parsing indirect references" do
     ruby_for("SUM(OneAnd2)").should == "sum(one_and2)"
     ruby_for("ReferenceOne").should == "reference_one"
     ruby_for("Reference.2").should == "reference_2"
+    ruby_for("阿三").should == "阿三"
     ruby_for("-($AG70+$X70)*EF.NaturalGas.N2O").should == "-(ag70+x70)*ef_natural_gas_n2o"
   end
 

data/spec/worksheet_spec.rb

@@ -2,6 +2,8 @@ require_relative 'spec_helper'
 
 describe Worksheet do  
 
+SheetNames.instance['Outputs'] = 'sheet1'
+
 simple_worksheet_xml =<<END
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <worksheet xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mv="urn:schemas-microsoft-com:mac:vml" mc:Ignorable="mv" mc:PreserveAttributes="mv:*"><dimension ref="A1:A2"/><sheetViews><sheetView view="pageLayout" workbookViewId="0"/></sheetViews><sheetFormatPr baseColWidth="10" defaultRowHeight="13"/><sheetData><row r="1" spans="1:1"><c r="A1" t="str"><f>IF(A2="Hello","hello",Sheet2!B4)</f><v>hello</v></c></row><row r="2" spans="1:1"><c r="A2" t="s"><v>24</v></c></row></sheetData><sheetCalcPr fullCalcOnLoad="1"/><phoneticPr fontId="2" type="noConversion"/><pageMargins left="0.75" right="0.75" top="1" bottom="1" header="0.5" footer="0.5"/><pageSetup paperSize="10" orientation="portrait" horizontalDpi="4294967292" verticalDpi="4294967292"/><extLst><ext xmlns:mx="http://schemas.microsoft.com/office/mac/excel/2008/main" uri="http://schemas.microsoft.com/office/mac/excel/2008/main"><mx:PLV Mode="1" OnePage="0" WScale="0"/></ext></extLst></worksheet>
@@ -58,7 +60,7 @@ it 'should add any named references that apply just to this sheet' do
   SharedStrings.instance[24] = 'A shared string'
   worksheet = Worksheet.new(Nokogiri::XML(simple_worksheet_xml))
   worksheet.workbook = mock(:workbook,:indirects_used => true)  
-  worksheet.named_references['reference_one'] = 'sheet2.a1'
+  worksheet.named_references['reference.one'] = 'sheet2.a1'
   worksheet.name = 'sheet1'
   worksheet.to_ruby.should == named_reference_simple_worksheet_ruby  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubyfromexcel
 version: !ruby/object:Gem::Version
-  version: 0.0.22
+  version: 0.0.23
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-27 00:00:00.000000000 Z
+date: 2012-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70198976262840 !ruby/object:Gem::Requirement
+  requirement: &70140944444740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.4.1
   type: :runtime
   prerelease: false
-  version_requirements: *70198976262840
+  version_requirements: *70140944444740
 - !ruby/object:Gem::Dependency
   name: rubyscriptwriter
-  requirement: &70198976262320 !ruby/object:Gem::Requirement
+  requirement: &70140944444120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *70198976262320
+  version_requirements: *70140944444120
 - !ruby/object:Gem::Dependency
   name: rubypeg
-  requirement: &70198976261740 !ruby/object:Gem::Requirement
+  requirement: &70140944469920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: 0.0.4
   type: :runtime
   prerelease: false
-  version_requirements: *70198976261740
+  version_requirements: *70140944469920
 description: 
 email: ruby-from-excel@greenonblack.com
 executables: