writeexcel 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47e11786c44acb989d0bdf6892093094dfdae8b1
-  data.tar.gz: 4f099e9f6626d563f5892ad677ef5051596eddc2
+  metadata.gz: cebe8b5ad6954bc1738d77487b127646a56d64e7
+  data.tar.gz: 2a2f56b156a5509f8a4f2908da8add9882c1f3a6
 SHA512:
-  metadata.gz: bc1795bd107484350cfa48dd1263b61f6280398051f158334992a669e359a98b4987bd7c226453853c7730132a19560fbda70592059d9363d9a8b4e2ce41b478
-  data.tar.gz: 79a2399de75607e4f8f01db705aeee56be70af8088064d6259c217fdb999a6796769fb144443f1290cca8c829decb50e366ed413c775289d8fbaccf48e3d3743
+  metadata.gz: d4605d345ef34c4cd5dc42723e68fc81fd5c83d0abf8ae010b14a543dcb0ab1b43a5ecae351c912a49007766ab49c9feb4fb0fc2ac9fc09cf3c6b13b2ea39151
+  data.tar.gz: e288110b5d45e81b4b38a095d48189b6e87b1384552b9dc9b4d15bede0d72c64adead6ba2f0dab29bffdf9bde6e26bc55e7825769aa9cf05d93bde8f77d188f7

data/README.rdoc

@@ -84,6 +84,9 @@ Example Code:
 * and ......
 
 == Recent Change
+v1.0.4
+* put formula parsers classes in a module to avoid namespace conflicts. (thanks Kevin)
+
 v1.0.3
 * Bug fix issue 29. bug in extern sheet reference.
 

data/html/en/doc_en.html

@@ -269,7 +269,7 @@ a number and a formula to the first worksheet in an Excel workbook called ruby.x
 
     # Write a number and a formula using A1 notation
     worksheet.write('A3', 1.2345)
-    worksheet.write('A4', '=SIN(PI/4)')
+    worksheet.write('A4', '=SIN(PI()/4)')
 
     workbook.close
 </pre>
@@ -885,7 +885,7 @@ name="write"
     worksheet.write(&#39;A10&#39;, &#39;internal:Sheet1!A1&#39;  ) # write_url
     worksheet.write(&#39;A11&#39;, &#39;external:c:\foo.xls&#39; ) # write_url
     worksheet.write(&#39;A12&#39;, &#39;=A3 + 3*A4&#39;          ) # write_formula
-    worksheet.write(&#39;A13&#39;, &#39;=SIN(PI/4)&#39;        ) # write_formula
+    worksheet.write(&#39;A13&#39;, &#39;=SIN(PI()/4)&#39;        ) # write_formula
     worksheet.write(&#39;A14&#39;, array                 ) # write_row
     worksheet.write(&#39;A15&#39;, [array]               ) # write_col
 </pre>
@@ -1279,7 +1279,7 @@ name="write_formula"
 
 <pre>
     worksheet.write_formula(0, 0, &#39;=B3 + B4&#39;  )
-    worksheet.write_formula(1, 0, &#39;=SIN(PI/4)&#39;)
+    worksheet.write_formula(1, 0, &#39;=SIN(PI()/4)&#39;)
     worksheet.write_formula(2, 0, &#39;=SUM(B1:B5)&#39; )
     worksheet.write_formula(&#39;A4&#39;, &#39;=IF(A3&#62;1,&#34;Yes&#34;, &#34;No&#34;)&#39;   )
     worksheet.write_formula(&#39;A5&#39;, &#39;=AVERAGE(1, 2, 3, 4)&#39;    )
@@ -5946,4 +5946,3 @@ name="COPYRIGHT"
 <!-- end doc -->
 
 </body></html>
-

data/lib/writeexcel/excelformula.y

@@ -63,77 +63,80 @@ end
 
 class ExcelFormulaParserError < StandardError; end
 
-class Node
-
-   def exec_list(nodes)
-      v = nil
-      nodes.each { |i| v = i.evaluate }
-      v
-   end
-
-   def excelformulaparser_error(msg)
-      raise ExcelFormulaParserError,
-               "in #{fname}:#{lineno}: #{msg}"
-   end
-
-end
-
-class RootNode < Node
-
-   def initialize(tree)
-      @tree = tree
-   end
-
-   def evaluate
-      exec_list @tree
-   end
-
-end
-
-
-class FuncallNode < Node
-
-   def initialize(func, args)
-      @func = func
-      @args = args
-   end
-
-   def evaluate
-      arg = @args.collect {|i| i.evaluate }
-      out = []
-      arg.each { |i| o.push i }
-      o.push @func
-      p o
+module Writeexcel
+
+   class Node
+   
+      def exec_list(nodes)
+         v = nil
+         nodes.each { |i| v = i.evaluate }
+         v
+      end
+   
+      def excelformulaparser_error(msg)
+         raise ExcelFormulaParserError,
+                  "in #{fname}:#{lineno}: #{msg}"
+      end
+   
    end
-
-end
-
-class NumberNode < Node
-
-   def initialize(val)
-      @val = val
+   
+   class RootNode < Node
+   
+      def initialize(tree)
+         @tree = tree
+      end
+   
+      def evaluate
+         exec_list @tree
+      end
+   
    end
-
-   def evaluate
-      p @val
+   
+   
+   class FuncallNode < Node
+   
+      def initialize(func, args)
+         @func = func
+         @args = args
+      end
+   
+      def evaluate
+         arg = @args.collect {|i| i.evaluate }
+         out = []
+         arg.each { |i| o.push i }
+         o.push @func
+         p o
+      end
+   
    end
-
-end
-
-class OperateNode < Node
-
-   def initialize(op, left, right)
-      @op = op
-      @left = left
-      @right = right
+   
+   class NumberNode < Node
+   
+      def initialize(val)
+         @val = val
+      end
+   
+      def evaluate
+         p @val
+      end
+   
    end
-
-   def evaluate
-      o = []
-      o.push @left
-      o.push @right
-      o.push @op
-      p o
+   
+   class OperateNode < Node
+   
+      def initialize(op, left, right)
+         @op = op
+         @left = left
+         @right = right
+      end
+   
+      def evaluate
+         o = []
+         o.push @left
+         o.push @right
+         o.push @op
+         p o
+      end
    end
 end
 

data/lib/writeexcel/excelformulaparser.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.4.6
+# This file is automatically generated by Racc 1.4.11
 # from Racc grammer file "".
 #
 
@@ -293,14 +293,14 @@ class ExcelFormulaParser < Racc::Parser  # :nodoc:
 
 module_eval(<<'.,.,', 'excelformula.y', 20)
   def _reduce_2(val, _values, result)
-     result = []
+     result = [] 
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'excelformula.y', 21)
   def _reduce_3(val, _values, result)
-     result.push val[1], '_arg', '1'
+     result.push val[1], '_arg', '1' 
     result
   end
 .,.,
@@ -309,84 +309,84 @@ def _reduce_3(val, _values, result)
 
 module_eval(<<'.,.,', 'excelformula.y', 24)
   def _reduce_5(val, _values, result)
-     result = [ val[0], val[2], 'ptgAdd' ]
+     result = [ val[0], val[2], 'ptgAdd' ] 
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'excelformula.y', 25)
   def _reduce_6(val, _values, result)
-     result = [ val[0], val[2], 'ptgSub' ]
+     result = [ val[0], val[2], 'ptgSub' ] 
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'excelformula.y', 26)
   def _reduce_7(val, _values, result)
-     result = [ val[0], val[2], 'ptgMul' ]
+     result = [ val[0], val[2], 'ptgMul' ] 
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'excelformula.y', 27)
   def _reduce_8(val, _values, result)
-     result = [ val[0], val[2], 'ptgDiv' ]
+     result = [ val[0], val[2], 'ptgDiv' ] 
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'excelformula.y', 28)
   def _reduce_9(val, _values, result)
-     result = [ val[0], val[2], 'ptgPower' ]
+     result = [ val[0], val[2], 'ptgPower' ] 
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'excelformula.y', 29)
   def _reduce_10(val, _values, result)
-     result = [ val[0], val[2], 'ptgConcat' ]
+     result = [ val[0], val[2], 'ptgConcat' ] 
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'excelformula.y', 30)
   def _reduce_11(val, _values, result)
-     result = [ val[0], val[2], 'ptgLT' ]
+     result = [ val[0], val[2], 'ptgLT' ] 
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'excelformula.y', 31)
   def _reduce_12(val, _values, result)
-     result = [ val[0], val[2], 'ptgGT' ]
+     result = [ val[0], val[2], 'ptgGT' ] 
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'excelformula.y', 32)
   def _reduce_13(val, _values, result)
-     result = [ val[0], val[2], 'ptgLE' ]
+     result = [ val[0], val[2], 'ptgLE' ] 
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'excelformula.y', 33)
   def _reduce_14(val, _values, result)
-     result = [ val[0], val[2], 'ptgGE' ]
+     result = [ val[0], val[2], 'ptgGE' ] 
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'excelformula.y', 34)
   def _reduce_15(val, _values, result)
-     result = [ val[0], val[2], 'ptgNE' ]
+     result = [ val[0], val[2], 'ptgNE' ] 
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'excelformula.y', 35)
   def _reduce_16(val, _values, result)
-     result = [ val[0], val[2], 'ptgEQ' ]
+     result = [ val[0], val[2], 'ptgEQ' ] 
     result
   end
 .,.,
@@ -395,14 +395,14 @@ def _reduce_16(val, _values, result)
 
 module_eval(<<'.,.,', 'excelformula.y', 38)
   def _reduce_18(val, _values, result)
-     result = [ val[1], '_arg', '1', 'ptgParen']
+     result = [ val[1], '_arg', '1', 'ptgParen'] 
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'excelformula.y', 39)
   def _reduce_19(val, _values, result)
-     result = [ '_num', '-1', val[1], 'ptgMul' ]
+     result = [ '_num', '-1', val[1], 'ptgMul' ] 
     result
   end
 .,.,
@@ -411,63 +411,63 @@ def _reduce_19(val, _values, result)
 
 module_eval(<<'.,.,', 'excelformula.y', 41)
   def _reduce_21(val, _values, result)
-     result = [ '_num',     val[0] ]
+     result = [ '_num',     val[0] ] 
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'excelformula.y', 42)
   def _reduce_22(val, _values, result)
-     result = [ '_str',     val[0] ]
+     result = [ '_str',     val[0] ] 
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'excelformula.y', 43)
   def _reduce_23(val, _values, result)
-     result = [ '_ref2d',   val[0] ]
+     result = [ '_ref2d',   val[0] ] 
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'excelformula.y', 44)
   def _reduce_24(val, _values, result)
-     result = [ '_ref3d',   val[0] ]
+     result = [ '_ref3d',   val[0] ] 
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'excelformula.y', 45)
   def _reduce_25(val, _values, result)
-     result = [ '_range2d', val[0] ]
+     result = [ '_range2d', val[0] ] 
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'excelformula.y', 46)
   def _reduce_26(val, _values, result)
-     result = [ '_range3d', val[0] ]
+     result = [ '_range3d', val[0] ] 
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'excelformula.y', 47)
   def _reduce_27(val, _values, result)
-     result = [ '_name',    val[0] ]
+     result = [ '_name',    val[0] ] 
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'excelformula.y', 48)
   def _reduce_28(val, _values, result)
-     result = [ 'ptgBool',  '1'    ]
+     result = [ 'ptgBool',  '1'    ] 
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'excelformula.y', 49)
   def _reduce_29(val, _values, result)
-     result = [ 'ptgBool',  '0'    ]
+     result = [ 'ptgBool',  '0'    ] 
     result
   end
 .,.,
@@ -476,112 +476,115 @@ def _reduce_29(val, _values, result)
 
 module_eval(<<'.,.,', 'excelformula.y', 52)
   def _reduce_31(val, _values, result)
-     result = [ '_class', val[0], val[2], '_arg', val[2].size.to_s, '_func', val[0] ]
+     result = [ '_class', val[0], val[2], '_arg', val[2].size.to_s, '_func', val[0] ] 
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'excelformula.y', 53)
   def _reduce_32(val, _values, result)
-     result = [ '_func', val[0] ]
+     result = [ '_func', val[0] ] 
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'excelformula.y', 55)
   def _reduce_33(val, _values, result)
-     result = val
+     result = val 
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'excelformula.y', 56)
   def _reduce_34(val, _values, result)
-     result.push val[2]
+     result.push val[2] 
     result
   end
 .,.,
 
-  def _reduce_none(val, _values, result)
-    val[0]
-  end
-
-end   # class ExcelFormulaParser
-
-
-class ExcelFormulaParserError < StandardError #:nodoc:
+def _reduce_none(val, _values, result)
+  val[0]
 end
 
-class Node  # :nodoc:
-
-   def exec_list(nodes)
-      v = nil
-      nodes.each { |i| v = i.evaluate }
-      v
-   end
-
-   def excelformulaparser_error(msg)
-      raise ExcelFormulaParserError,
-               "in #{fname}:#{lineno}: #{msg}"
-   end
-
-end
-
-class RootNode < Node  # :nodoc:
-
-   def initialize(tree)
-      @tree = tree
-   end
+end   # class ExcelFormulaParser
 
-   def evaluate
-      exec_list @tree
-   end
 
+class ExcelFormulaParserError < StandardError  #:nodoc:
 end
 
-
-class FuncallNode < Node  # :nodoc:
-
-   def initialize(func, args)
-      @func = func
-      @args = args
+module Writeexcel
+
+   class Node  # :nodoc:
+   
+      def exec_list(nodes)
+         v = nil
+         nodes.each { |i| v = i.evaluate }
+         v
+      end
+   
+      def excelformulaparser_error(msg)
+         raise ExcelFormulaParserError,
+                  "in #{fname}:#{lineno}: #{msg}"
+      end
+   
    end
-
-   def evaluate
-      arg = @args.collect {|i| i.evaluate }
-      out = []
-      arg.each { |i| o.push i }
-      o.push @func
-      p o
+   
+   class RootNode < Node  # :nodoc:
+   
+      def initialize(tree)
+         @tree = tree
+      end
+   
+      def evaluate
+         exec_list @tree
+      end
+   
    end
-
-end
-
-class NumberNode < Node  # :nodoc:
-
-   def initialize(val)
-      @val = val
+   
+   
+   class FuncallNode < Node  # :nodoc:
+   
+      def initialize(func, args)
+         @func = func
+         @args = args
+      end
+   
+      def evaluate
+         arg = @args.collect {|i| i.evaluate }
+         out = []
+         arg.each { |i| o.push i }
+         o.push @func
+         p o
+      end
+   
    end
-
-   def evaluate
-      p @val
+   
+   class NumberNode < Node  # :nodoc:
+   
+      def initialize(val)
+         @val = val
+      end
+   
+      def evaluate
+         p @val
+      end
+   
    end
-
-end
-
-class OperateNode < Node  # :nodoc:
-
-   def initialize(op, left, right)
-      @op = op
-      @left = left
-      @right = right
-   end
-
-   def evaluate
-      o = []
-      o.push @left
-      o.push @right
-      o.push @op
-      p o
+   
+   class OperateNode < Node  # :nodoc:
+   
+      def initialize(op, left, right)
+         @op = op
+         @left = left
+         @right = right
+      end
+   
+      def evaluate
+         o = []
+         o.push @left
+         o.push @right
+         o.push @op
+         p o
+      end
    end
 end

data/lib/writeexcel/version.rb

@@ -1,5 +1,5 @@
 require 'writeexcel'
 
 class WriteExcel < Workbook
-  VERSION = "1.0.3"
+  VERSION = "1.0.4"
 end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: writeexcel
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Hideo NAKAMURA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-13 00:00:00.000000000 Z
+date: 2014-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Multiple worksheets can be added to a workbook and formatting can be
@@ -35,9 +35,9 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
 files:
-- .document
-- .gitattributes
-- .gitignore
+- ".document"
+- ".gitattributes"
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.rdoc
@@ -304,17 +304,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Write to a cross-platform Excel binary file.