rspreadsheet 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d3845679733a12aaed33574dc981b22d49d297fe
-  data.tar.gz: c7f151f9ed92317b006eec3e2fc323514b43a5f4
+  metadata.gz: 5e68b11b80d618d17de31bb79ff8723d7367dbbc
+  data.tar.gz: 5cf05fdad441db2cea08b21784ce55cac716b149
 SHA512:
-  metadata.gz: 0307c5a79b0e9aebc2ce1cfc56b6f8445542e4cc8dab661a92398c8c7e4debeaa55ed0f6dce7a7a9a47cbda6d53bdf24cc19f95a441e94b4a3458e4c16d947eb
-  data.tar.gz: 25acbd10e229976cd2b2112dbc35dbf2d4e8610302928df753a7a1110c64f23a0f052362684188fb33dba9341ab402075a0ed5e2b7635e90cc574d46c3b13ba2
+  metadata.gz: 5c438393ef32daba2c6deb4d4d4b251125adc6322ad39297e1f6a4c9d08a7814ff76e5d8f40679e470ffb76fc295048e9da44b590f0561b93dce984617bbf137
+  data.tar.gz: 0a125394984f40ae1aa8fe2db8c142f3a04e921b580714019ee4d29075f549d784c2773cd688b4482600a2eec83ef6ec406b2903d83f83a7c08ec79af470cb8a

data/.gitignore

@@ -26,6 +26,7 @@ build/
 .*kate-swp
 .*kate-swp.bak
 .directory
+.rake-tasks~
 
 ## Environment normalisation:
 /.bundle/

data/lib/rspreadsheet/cell.rb

@@ -122,33 +122,39 @@ class Cell < XMLTiedItem
     detach_if_needed
     if self.mode == :regular
       gt = guess_cell_type(avalue)
+#       raise 'here'+gt.to_s if avalue == 666.66
       case
         when gt == nil then raise 'This value type is not storable to cell'
         when gt == Float then
-          remove_all_value_attributes_and_content(xmlnode)
+          remove_all_value_attributes_and_content
           set_type_attribute('float')
           Tools.set_ns_attribute(xmlnode,'office','value', avalue.to_s) 
           xmlnode << Tools.prepare_ns_node('text','p', avalue.to_f.to_s)
         when gt == String then
-          remove_all_value_attributes_and_content(xmlnode)
+          remove_all_value_attributes_and_content
           set_type_attribute('string')
           xmlnode << Tools.prepare_ns_node('text','p', avalue.to_s)
         when gt == :datetime then 
-          remove_all_value_attributes_and_content(xmlnode)
+          remove_all_value_attributes_and_content
           set_type_attribute('date')
           avalue = avalue.strftime(InternalDateTimeFormat)
           Tools.set_ns_attribute(xmlnode,'office','date-value', avalue)
           xmlnode << Tools.prepare_ns_node('text','p', avalue)
         when gt == :time then
-          remove_all_value_attributes_and_content(xmlnode)
+          remove_all_value_attributes_and_content
           set_type_attribute('time')
           Tools.set_ns_attribute(xmlnode,'office','time-value', avalue.strftime(InternalTimeFormat))
           xmlnode << Tools.prepare_ns_node('text','p', avalue.strftime('%H:%M'))
         when gt == :percentage then
-          remove_all_value_attributes_and_content(xmlnode)
+          remove_all_value_attributes_and_content
           set_type_attribute('percentage')
           Tools.set_ns_attribute(xmlnode,'office','value', '%0.2d%' % avalue.to_f) 
           xmlnode << Tools.prepare_ns_node('text','p', (avalue.to_f*100).round.to_s+'%')
+        when gt == :currency then
+          remove_all_value_attributes_and_content
+          set_type_attribute('currency')
+          Tools.set_ns_attribute(xmlnode,'office','value', '%f' % avalue.to_d)
+          xmlnode << Tools.prepare_ns_node('text','p', avalue.to_d.to_s+' '+self.format.currency)
       end
     else
       raise "Unknown cell mode #{self.mode}"
@@ -158,6 +164,7 @@ class Cell < XMLTiedItem
     Tools.set_ns_attribute(xmlnode,'office','value-type',typestring)
     Tools.set_ns_attribute(xmlnode,'calcext','value-type',typestring)
   end
+  ## TODO: using this is NOT in line with the general intent of forward compatibility
   def remove_all_value_attributes_and_content(node=xmlnode)
     if att = Tools.get_ns_attribute(node, 'office','value') then att.remove! end
     if att = Tools.get_ns_attribute(node, 'office','date-value') then att.remove! end
@@ -197,7 +204,7 @@ class Cell < XMLTiedItem
     end
     result = valueguess
 
-    if valueguess.nil? # valueguess is most important if not succesfull then try guessing by type from node xml
+    if valueguess.nil?  # valueguess is most important if not succesfull then try guessing by type from node xml
       typ = xmlnode.nil? ? 'N/A' : xmlnode.attributes['value-type']
       typeguess = case typ
         when nil then nil
@@ -229,7 +236,7 @@ class Cell < XMLTiedItem
         else             # without value we just beleive typeguess
           typeguess
         end
-      else # it not have a typeguess
+      else  # it not have a typeguess
         if (avalue.nil?) # if nil then nil
           NilClass
         elsif (String(avalue) rescue false) # convertible to String
@@ -238,8 +245,11 @@ class Cell < XMLTiedItem
           nil
         end
       end
-    elsif valueguess == Float and xmlnode.andand.attributes['value-type'] == 'percentage'
-      result = :percentage
+    elsif valueguess == Float 
+      case xmlnode.andand.attributes['value-type'] 
+        when 'percentage' then result = :percentage
+        when 'currency' then result = :currency
+      end
     end
     result
   end

data/lib/rspreadsheet/row.rb

@@ -96,6 +96,13 @@ class Row < XMLTiedItem
     parent.add_row_above(rowi)
   end
   
+  def next_row; relative(+1) end
+  alias :next :next_row
+  
+  def relative(rowi_offset)
+    worksheet.row(self.rowi+rowi_offset)
+  end
+  
  # @!group Private methods, which should not be called directly
   # @private
   # shifts internal represetation of row by diff. This should not be called directly
@@ -114,4 +121,4 @@ class Row < XMLTiedItem
 
 end
 
-end
+end

data/lib/rspreadsheet/version.rb

@@ -1,3 +1,3 @@
 module Rspreadsheet
-  VERSION = "0.4.3"
+  VERSION = "0.4.4"
 end

data/spec/cell_spec.rb

@@ -371,6 +371,20 @@ describe Rspreadsheet::Cell do
     @czkcell = @sheet2.cell('B23')
     @czkcell.value.should == 344.to_d
     @czkcell.format.currency.should == 'CZK'
+    
+    @czkcell.value = 200.to_d
+    @czkcell.value.should == 200.to_d
+    @czkcell.format.currency.should == 'CZK'
+  end
+  it 'preserves currency format when float is assingned to it' do
+    @cell = @sheet2.cell('B23')
+    @cell.type.should eq :currency
+    @cell.format.currency.should == 'CZK'
+    
+    @cell.value = 666.66.to_d
+    @cell.value.should == 666.66.to_d
+    @cell.type.should eq :currency
+    @cell.format.currency.should == 'CZK'
   end
   it 'is possible to manipulate borders of cells' do
     @cell = @sheet1.cell(1,1)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspreadsheet
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Jakub A.Těšínský
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-30 00:00:00.000000000 Z
+date: 2017-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: libxml-ruby