calco 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4dff627df1a1920dd84f04840b38bd72f6ad821d
-  data.tar.gz: 53b3752b2a38c3549832f653572ccc093bb72916
+  metadata.gz: a5707d4a21a4635524c7c6f979f289244416e63d
+  data.tar.gz: 08b02c592036444641c85f22c323b18eccb4bfcb
 SHA512:
-  metadata.gz: 53853ba1e0e3cbf02b859e99189cbc14c8f9dc0d5fdeed55336140630b538390d0d0c01b96d765eabdd6fb01adc1421c044a65ad67d288090219d52de526d670
-  data.tar.gz: 549d49ceb97b325170072cb6250984f01c80564cf7f675b3bd9de5feacd6a216c68a33adc1e8c5a9245eb8ae71cf46bf8d51b0d4e703607c273f9de33948e209
+  metadata.gz: 8aaab8c7481340e72160a003b50c9c5e784f88835b8fb9d46ee7edec95ae187f2eea0f076297e907411cb1d6890b8bdcac0f078dce1982b8e2e37c0cbf5238f1
+  data.tar.gz: 16ee8d319c4931296165f878c623b988c41179f67a34a906322d85dab425fab8e4605de3ec2cdd2db32b0b725164e41067b83d54580065c3128d7578fc54e068

data/README.md

@@ -288,6 +288,7 @@ The time values are real time values, not strings. The formulas are computed.
 
 ## Todo
 
+0. Mutliple sheets and cross-sheet references
 0. office engine
    * problems with UTF-8
 0. change styles when generating...

data/lib/calco/elements/builtin_function.rb

@@ -11,10 +11,10 @@ module Calco
     # of class objects
     def self.declare name, arity, type = :any
 
-      unless arity == :n or arity.is_a?(Integer)
+      unless arity == :n || arity.is_a?(Integer)
         raise ArgumentError, "Artity must be an integer or :n but was a #{arity.class}"
       end
-      unless type.is_a?(Class) or (type.respond_to?(:all?) and type.all?{|t| t.is_a?(Class)})
+      unless type.is_a?(Class) || (type.respond_to?(:all?) && type.all?{|t| t.is_a?(Class)})
         raise ArgumentError, "Type should be a Class or an array of Class objects" 
       end
       

data/lib/calco/elements/formula.rb

@@ -25,7 +25,7 @@ module Calco
 
     def generate row
 
-      if self.reference_type == :absolute and self.absolute_row != row
+      if self.reference_type == :absolute && self.absolute_row != row
         nil
       else
         @statement.generate(row)

data/lib/calco/elements/value_extractor.rb

@@ -31,7 +31,7 @@ module Calco
 
     def generate row
       
-      return nil if @variable.absolute_row and @variable.absolute_row != row
+      return nil if @variable.absolute_row && @variable.absolute_row != row
 
       @engine.value(self)
       

data/lib/calco/engines/csv_engine.rb

@@ -15,7 +15,7 @@ module Calco
 
     def write_row sheet, row_id
 
-      row_id += 1 if row_id > 0 and sheet.has_titles?
+      row_id += 1 if row_id > 0 && sheet.has_titles?
 
       cells = sheet.row(row_id)
 

data/lib/calco/engines/default_engine.rb

@@ -105,9 +105,9 @@ module Calco
       if ! element.respond_to?(:value)
         element.inspect
       elsif element.value.is_a?(Time)
-        res = element.value.strftime("%H:%M:%S")
+        element.value.strftime("%H:%M:%S")
       elsif element.value.is_a?(Date)
-        res = element.value.strftime("%Y-%m-%d")
+        element.value.strftime("%Y-%m-%d")
       else
         element.value.inspect
       end

data/lib/calco/engines/office_engine.rb

@@ -52,7 +52,7 @@ module Calco
     
     def write_row sheet, row_id
 
-      return if row_id == 0 and sheet.has_titles?
+      return if row_id == 0 && sheet.has_titles?
       
       row_id += 1 # office sheet indexes start at 1
       
@@ -75,7 +75,7 @@ module Calco
     def generate_cell row_number, column, cell_style, column_style, column_type
 
       return '<table:table-cell/>' unless column
-      return '<table:table-cell/>' if column.absolute_row and column.absolute_row != row_number
+      return '<table:table-cell/>' if column.absolute_row && column.absolute_row != row_number
 
       cell = column.generate(row_number)
 

data/lib/calco/engines/simple_calculator_engine.rb

@@ -30,7 +30,7 @@ module Calco
     
     def write_row sheet, row_id
     
-      return if sheet.has_titles? and row_id == 0
+      return if sheet.has_titles? && row_id == 0
       
       names = column_names(sheet)
       
@@ -42,7 +42,7 @@ module Calco
       
         next unless value
         
-        value = value.to_s if value.is_a?(Date) or value.is_a?(Time)
+        value = value.to_s if value.is_a?(Date) || value.is_a?(Time)
         
         @out_stream.write "%#{longest_name}s = #{value.inspect}\n" % names[i]
         

data/lib/calco/sheet.rb

@@ -64,7 +64,7 @@ module Calco
     #    id           => id associated to the column
     def column name, options = {}
 
-      if name.is_a?(Numeric) or name.is_a?(String)
+      if name.is_a?(Numeric) || name.is_a?(String)
         @columns << Constant.wrap(name)
       elsif name.is_a?(ValueExtractor)
         @columns << name
@@ -150,7 +150,7 @@ module Calco
         return
       end
       
-      if new_content.is_a?(Numeric) or new_content.is_a?(String)
+      if new_content.is_a?(Numeric) || new_content.is_a?(String)
         new_content = Constant.new(new_content)
         assign_engine new_content, @engine
       elsif @definitions.variable?(new_content)
@@ -328,7 +328,7 @@ module Calco
     
     def assign_engine el, engine
 
-      return unless el.is_a?(Calco::Element) or el.is_a?(Calco::Style)
+      return unless el.is_a?(Calco::Element) || el.is_a?(Calco::Style)
 
       current_engine = el.instance_variable_get(:@engine)
       

data/lib/calco/version.rb

@@ -1,3 +1,3 @@
 module Calco
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: calco
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Jean Lazarou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-07 00:00:00.000000000 Z
+date: 2014-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec