rspreadsheet 0.2.5 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82068f98220c39b9d05ca4a5cd3bfa2e1eb55eb4
-  data.tar.gz: 95410381c26b1ca2527188b7165ac52ec7277dec
+  metadata.gz: f9603ed2713de6f87efb309a9cd9f36388001731
+  data.tar.gz: baa73509ae8527b93fa5dc19596a244ed21f5171
 SHA512:
-  metadata.gz: 7e2cc1abbb8281f7e8931453f1e404170faea8254f60bb8b2a7ad677c56cb1abcd0a94906bd8eeb226dcd2dfe720de1d24b1c57c97004e77f8af956d01afa498
-  data.tar.gz: 204a41ca91da4f85fd478ce926188ebf41abd82fe890d0b4fc23f57e78a73a28d7695a03b17dceae957b249029b7381a4f8608094eb4ebeaafde63429b3cb736
+  metadata.gz: 691688a99bd3900f791502e2efd9b74b5fb745f1044ef349885fec3323ff6e95fc074fcd65c5c55a2b972f50a49715d58381e5b7b00f65c662dc4f5293378b90
+  data.tar.gz: 1a57249cbdceb90ff94a8544a7f370c89124008d6c33dc9777a2aeae83e3fb6e6f4b67bb7380df27496726170d0a84be36feb51083d9fffda525ba34c9ea10d5

data/.gitignore

@@ -10,6 +10,7 @@
 /test/version_tmp/
 /tmp/
 lib/bundler/man
+.kateproject.d
 
 ## Specific to RubyMotion:
 .dat*

data/DEVEL_BLOG.md

@@ -37,7 +37,7 @@ Guiding ideas
 1. make changes
 2. test if all tests pass (run `bundle exex guard` to test automatically). If not go to 1
 3. build and install locally
-    * ``rake build`` - builds the gem to pkg directory. 
+    * ``rake build`` - builds the gem to pkg directory (if something gets wrong, sometimes comit go git gelps)
     * ``sudo rake install`` - installs gem to local system [^1]
 4. Now can locally and manually use/test the gem. This should not be replacement for automated testing. If you make some changes, go to 1.
 5. When happy, increment the version number and `git add .; git commit -am'commit message'; git push`

data/GUIDE.md

@@ -1,50 +1,8 @@
-## Examples of advanced syntax
+## Examples
 
-Examples of more advanced syntax follows
+  * [basic functionality](https://gist.github.com/gorn/42e33d086d9b4fda10ec) 
+  * [extended examples](https://gist.github.com/gorn/b432e6a69e82628349e6) of lots of alternative syntax
 
-```ruby
-require 'rspreadsheet'
-
-book = Rspreadsheet.new
-sheet = book.create_worksheet 'Top icecreams'
-
-sheet[1,1] = 'My top 5'
-p sheet[1,1].class           # => String
-p sheet[1,1]                 # => "My top 5"
-
-# These are all the same values - alternative syntax
-p sheet.rows(1).cells(0).value   
-p sheet.cells(1,1).value
-p sheet.A1
-p sheet[1,1]
-
-# How to inspect/manipulate the Cell object
-sheet.cells(1,1)                 # => Rspreadsheet::Cell
-sheet.cells(1,1).format
-sheet.cells(1,1).format.size = 15
-sheet.cells(1,1).format.weight = bold
-p sheet.cells(1,1).format.bold?  # => true
-
-# There are the same assigmenents
-sheet.A1 = value
-sheet[1,1]= value
-sheet.cells(1,1).value = value
-
-p sheet.A1.class          # => Rspreadsheet::Cell
-
-# relative cells
-sheet.cells(4,7).relative(-1,0) # => cell 3,7
-
-# build the top five list
-(1..5).each { |i| sheet[i,1] = i }
-sheet.columns(1).format.bold = true
-sheet.cells[2,1..5] = ['Vanilla', 'Pistacia', 'Chocolate', 'Annanas', 'Strawbery']
-
-sheet.columns(1).cells(1).format.color = :red
-
-book.save
-
-```
 ## Conventions
   * **all indexes are 1-based**. This applies to rows, cells cordinates, and all array like structures like list od  worksheets etc. Spreadsheet world is 1-based, ruby is 0-based do I had to make a decision. I intend to make an global option for this, but in early stage I need to keep things simple. 
   * with numeric coordinates row always comes before col as in  (row,col)

data/README.md

@@ -1,7 +1,7 @@
 # rspreadsheet
 
 [![Build Status](https://api.travis-ci.org/gorn/rspreadsheet.svg?branch=master)](https://travis-ci.org/gorn/rspreadsheet) [![Coverage Status](https://coveralls.io/repos/gorn/rspreadsheet/badge.png)](https://coveralls.io/r/gorn/rspreadsheet)
-
+ 
 Manipulating spreadsheets with Ruby. Read, modify, write or create new OpenDocument Spreadsheet files from ruby code.
 
 ## Contibutions, ideas and wishes welcomed
@@ -14,8 +14,8 @@ Alhought this gem is still in alpha stage I use in my project it and it works fi
   
 ```ruby
 require 'rspreadsheet'
-book = Rspreadsheet.open('spreadsheet.ods')
-sheet = book.worksheets[1]
+book = Rspreadsheet.open('./test.ods')
+sheet = book.worksheets(1)
 
 
 # get value of a cell B5 (there are more ways to do this)
@@ -30,28 +30,31 @@ sheet.cells(5,2).value = 1.78
 
 # working with cell format
 sheet.cells(5,2).format.bold = true
-sheet.cells(5,2).format.background = '#FF0000'
+sheet.cells(5,2).format.background_color = '#FF0000'
 
 # calculating sum of cells in row
 sheet.rows(5).cellvalues.sum
-sheet.rows(5).cells.sum{ |cell| cell.value }
+sheet.rows(5).cells.sum{ |cell| cell.value.to_f }
 
 # iterating over list of people and displaying the data
 
 total = 0
 sheet.rows.each do |row|
   puts "Sponsor #{row[1]} with email #{row[2]} has donated #{row[3]} USD."
-  total += row[3]
+  total += row[3].to_f
 end
 puts "Totally fundraised #{total} USD"
 
 # saving file
 book.save
 book.save('different_filename.ods')
-
 ```
 
-This is the basic functionality. However rspreadsheet should allows lots of alternative syntax, like described in [GUIDE.md](GUIDE.md)
+This is also pubished as Gist **where you can leave you comments and suggestions**:
+
+  * [basic functionality](https://gist.github.com/gorn/42e33d086d9b4fda10ec) 
+  * [extended examples](https://gist.github.com/gorn/b432e6a69e82628349e6) of lots of alternative syntax
+  * [GUIDE.md](GUIDE.md) some other notes
 
 ## Installation
 

data/lib/class_extensions.rb

@@ -43,7 +43,7 @@ class Array
     if block_given?
       map(&block).sum(identity)
     else
-      inject { |sum, element| sum + element } || identity
+      inject(0){ |sum, element| sum.to_f + element.to_f } || identity
     end
   end
 end

data/lib/rspreadsheet/cell.rb

@@ -191,6 +191,7 @@ class CellFormat
   
   # text style attribute readers
   def bold;      get_text_style_node_attribute('font-weight') == 'bold' end
+  alias :bold? :bold 
   def italic;    get_text_style_node_attribute('font-style') == 'italic' end
   def color;     get_text_style_node_attribute('color') end
   def font_size; get_text_style_node_attribute('font-size') end
@@ -252,7 +253,7 @@ class CellFormat
     last = cellnode.doc.root.find('./office:automatic-styles/style:style').
       collect {|node| node['name']}.
       collect{ |name| /^ce(\d*)$/.match(name); $1.andand.to_i}.
-      compact.max
+      compact.max || 0
     "ce#{last+1}"
   end
   def automatic_styles_node; cellnode.doc.root.find("./office:automatic-styles").first end

data/lib/rspreadsheet/version.rb

@@ -1,3 +1,3 @@
 module Rspreadsheet
-  VERSION = "0.2.5"
+  VERSION = "0.2.7"
 end

data/lib/rspreadsheet/workbook.rb

@@ -8,7 +8,7 @@ class Workbook
   def initialize(afilename=nil)
     @worksheets=[]
     @filename = afilename
-    @content_xml = Zip::File.open(@filename || './lib/rspreadsheet/empty_file_template.ods') do |zip|
+    @content_xml = Zip::File.open(@filename || File.dirname(__FILE__)+'/empty_file_template.ods') do |zip|
       LibXML::XML::Document.io zip.get_input_stream('content.xml')
     end
     @xmlnode = @content_xml.find_first('//office:spreadsheet')
@@ -20,7 +20,7 @@ class Workbook
     if @filename.nil? and new_filename.nil? then raise 'New file should be named on first save.' end
     # if the filename has changed than first copy the original file to new location (or template if it is a new file)
     if new_filename
-      FileUtils.cp(@filename || './lib/rspreadsheet/empty_file_template.ods', new_filename)
+      FileUtils.cp(@filename || File.dirname(__FILE__)+'/empty_file_template.ods', new_filename)
       @filename = new_filename
     end
     Zip::File.open(@filename) do |zip|

data/spec/cell_spec.rb

@@ -184,8 +184,9 @@ describe Rspreadsheet::Cell do
     # after fresh create
     @cell.xmlnode.attributes['style-name'].should_not be_nil
   end
-  it 'can set formats of the cells' do
-    @cell = @sheet2.cells(1,1)
+  it 'can set formats of the cells in new file' do
+    @cell = @sheet1.cells(1,1)
+    @cell.value = '1'
     # bold
     @cell.format.bold.should be_falsey
     @cell.format.bold = true

data/spec/rspreadsheet_spec.rb

@@ -98,6 +98,51 @@ describe Rspreadsheet do
     end
     total.should eq 55
   end
+  it 'examples from advanced syntax GUIDE are working' do
+    def p(*par); end # supress p in the example
+    expect do 
+      book = Rspreadsheet::Workbook.new
+      sheet = book.create_worksheet 'Top icecreams'
+      
+      sheet[1,1] = 'My top 5'
+      p sheet[1,1].class # => String
+      p sheet[1,1] # => "My top 5"
+      
+      # These are all the same values - alternative syntax
+      p sheet.rows(1).cells(1).value
+      p sheet.cells(1,1).value
+      p sheet.A1
+      p sheet[1,1]
+      p sheet['A1']
+      p sheet.cells('A1').value
+      
+      # How to inspect/manipulate the Cell object
+      sheet.cells(1,1) # => Rspreadsheet::Cell
+      sheet.cells(1,1).format
+      sheet.cells(1,1).format.font_size = '15pt'
+      sheet.cells(1,1).format.bold = true
+      p sheet.cells(1,1).format.bold? # => true
+      
+      # There are the same assigmenents
+      value = 1.234
+      sheet.A1 = value
+      sheet[1,1]= value
+      sheet.cells(1,1).value = value
+      
+      p sheet.A1.class # => Rspreadsheet::Cell
+      
+      # relative cells
+      sheet.cells(4,7).relative(-1,0) # => cell 3,7
+      
+      # build the top five list (these features are not implemented yet)
+#       (1..5).each { |i| sheet[i,1] = i }
+#       sheet.columns(1).format.bold = true
+#       sheet.cells[2,1..5] = ['Vanilla', 'Pistacia', 'Chocolate', 'Annanas', 'Strawbery']
+#       sheet.columns(1).cells(1).format.color = :red
+      
+      book.save('testfile.ods')
+    end.not_to raise_error
+  end
 end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspreadsheet
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.7
 platform: ruby
 authors:
 - Jakub A.Těšínský
@@ -163,7 +163,6 @@ files:
 - ".directory"
 - ".gitignore"
 - ".kateproject"
-- ".kateproject.d/notes.txt"
 - ".travis.yml"
 - ".yardopts"
 - CHANGELOG.md
@@ -180,7 +179,6 @@ files:
 - lib/rspreadsheet.rb
 - lib/rspreadsheet/cell.rb
 - lib/rspreadsheet/empty_file_template.ods
-- lib/rspreadsheet/empty_file_template.old.ods
 - lib/rspreadsheet/row.rb
 - lib/rspreadsheet/tools.rb
 - lib/rspreadsheet/version.rb