workbook 0.4.4 → 0.4.5

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: c0a6519a54a39e28ff553a4c91ed323bc1ea26cb
+  data.tar.gz: 2fc5bc899ed4347d5010b98224f9eb28d6895df8
+SHA512:
+  metadata.gz: c62b71197742c0b0e4d99890e7e695daaa4b22b3a91dc575c085fe4ab4309d731d3e03539e0995bc15201ebf90c75c925a3cd84f60cb0ff8e48fc67bb6c4d88a
+  data.tar.gz: 11b95b6db274135ea696380bca9d0b35e939cca6182fcf368b1b10b56d91886d5fc30a3b5ab06c03c60676fff348d9a66b2fe3a04cde0603ad6a22a661b2965b

data/lib/workbook/book.rb

@@ -22,9 +22,6 @@ module Workbook
     include Workbook::Readers::CsvReader
     include Workbook::Readers::TxtReader
 
-    attr_accessor :title
-    attr_accessor :template
-
     # @param [Workbook::Sheet, Array] sheet    create a new workbook based on an existing sheet, or initialize a sheet based on the array
     # @return [Workbook::Book]
     def initialize sheet=Workbook::Sheet.new([], self, options={})
@@ -53,6 +50,10 @@ module Workbook
       @title ? @title : "untitled document"
     end
 
+    def title= t
+      @title = t
+    end
+
     # Push (like in array) a sheet to the workbook (parameter is optional, default is a new sheet)
     #
     # @param [Workbook::Sheet] sheet
@@ -112,6 +113,15 @@ module Workbook
       send("load_#{extension}".to_sym,t)
     end
 
+    # Writes the book to a file. Filetype is based on the extension, but can be overridden
+    #
+    # @param [String] filename   a string with a reference to the file to be written to
+    # @param [Hash] options  depends on the writer chosen by the file's filetype
+    def write filename, options
+      extension = file_extension(filename)
+      send("write_to_#{extension}".to_sym, filename, options)
+    end
+
 
     # Helper method to convert text in a file to UTF-8
     #

data/lib/workbook/cell.rb

@@ -6,11 +6,7 @@ module Workbook
   class Cell
     include Workbook::Modules::TypeParser
 
-    attr_accessor :value
-    attr_accessor :format
     attr_accessor :formula
-    attr_accessor :colspan
-    attr_accessor :rowspan
 
     # Note that these types are sorted by 'importance'
     VALID_TYPES = [Numeric,String,Time,Date,TrueClass,FalseClass,NilClass,Workbook::NilValue]
@@ -29,7 +25,7 @@ module Workbook
     # @param [Hash] options a reference to :format (Workbook::Format) can be specified
     def initialize value=nil, options={}
       if valid_value? value
-        format = options[:format]
+        self.format = options[:format]
         @value = value
       else
         raise ArgumentError, "value should be of a primitive type, e.g. a string, or an integer, not a #{value.class} (is_a? [TrueClass,FalseClass,Date,Time,Numeric,String, NilClass])"
@@ -47,6 +43,13 @@ module Workbook
       end
     end
 
+    # Returns the current value
+    #
+    # @return [Numeric,String,Time,Date,TrueClass,FalseClass,NilClass] a valid value
+    def value
+      @value
+    end
+
     # Change the current format
     #
     # @param [Workbook::Format, Hash] f set the formatting properties of this Cell
@@ -95,7 +98,7 @@ module Workbook
       v = nil
       if value
         v = value.to_s.downcase
-        v = v.gsub(' (j/?/leeg)','').gsub(/dd-mm-(.*)/,'').gsub(/\ja\/nee/,'').gsub(/\(\)/,'').gsub(/[\(\)]+/, '')
+        v = v.gsub(' (j/?/leeg)','').gsub(/dd-mm-(.*)/,'').gsub(/ja\/nee/,'').gsub(/\(\)/,'').gsub(/[\(\)]+/, '')
         v = v.strip.gsub(/(\.|\?|,|\=)/,'').
         gsub('$','').
         gsub(/\&/,'en').
@@ -147,7 +150,7 @@ module Workbook
       rv = nil
       begin
         rv = self.value <=> other.value
-      rescue NoMethodError => e
+      rescue NoMethodError
         rv = compare_on_class other
       end
       if rv == nil
@@ -192,11 +195,18 @@ module Workbook
       end
     end
 
+    def colspan= c
+      @colspan = c
+    end
+    def rowspan= r
+      @rowspan = r
+    end
+
     def colspan
-      @colspan.to_i if @colspan.to_i > 1
+      @colspan.to_i if defined?(@colspan) and @colspan.to_i > 1
     end
     def rowspan
-      @rowspan.to_i if @rowspan.to_i > 1
+      @rowspan.to_i if defined?(@rowspan) and @rowspan.to_i > 1
     end
   end
 end

data/lib/workbook/column.rb

@@ -3,14 +3,17 @@ module Workbook
 
   # Column helps us to store general properties of a column, and lets us easily perform operations on values within a column
   class Column
-    attr_accessor :column_type # :primary_key, :string, :text, :integer, :float, :decimal, :datetime, :date, :binary, :boolean.
     attr_accessor :limit #character limit
-    attr_accessor :default #default cell
 
     def initialize(options={})
       options.each{ |k,v| self.public_send("#{k}=",v) }
     end
 
+    # Returns column type, either :primary_key, :string, :text, :integer, :float, :decimal, :datetime, :date, :binary, :boolean
+    def column_type
+      @column_type
+    end
+
     def column_type= column_type
       if [:primary_key, :string, :text, :integer, :float, :decimal, :datetime, :date, :binary, :boolean].include? column_type
         @column_type = column_type
@@ -20,6 +23,11 @@ module Workbook
       end
     end
 
+    #default cell
+    def default
+      return @default
+    end
+
     def default= value
       @default = value if value.class == Cell
       @default = Cell.new(value)

data/lib/workbook/modules/table_diff_sort.rb

@@ -80,7 +80,6 @@ module Workbook
 
         options = {:sort=>true,:ignore_headers=>false}.merge(options)
 
-        iteration_cols = nil
         sother = other.clone.remove_empty_lines!
         sself = self.clone.remove_empty_lines!
 
@@ -92,8 +91,6 @@ module Workbook
         sother = options[:sort] ? Workbook::Table.new(sother.sort) : sother
         sself = options[:sort] ? Workbook::Table.new(sself.sort) : sself
 
-        iteration_rows =  [sother.count,sself.count].max.times.collect
-
         row_index = 0
         while row_index < [sother.count,sself.count].max and row_index < other.count+self.count do
           row_index = align_row(sself, sother, row_index)

data/lib/workbook/nil_value.rb

@@ -2,7 +2,6 @@ module Workbook
 
   # Used in cases col or rowspans are used
   class NilValue
-    attr_accessor :reason #:covered
 
     # initialize this special nilvalue with a reason
     # @params [String] reason (currently only :covered, in case this cell is coverd because an adjecant cell spans over it)
@@ -20,6 +19,10 @@ module Workbook
       value <=> v
     end
 
+    def reason
+      @reason
+    end
+
     # set the reason why this value is nil
     def reason= reason
       if reason == :covered

data/lib/workbook/readers/ods_reader.rb

@@ -81,7 +81,6 @@ module Workbook
 
       #set column count
       def get_column_count(table)
-        init_column_count = table.xpath("table:table-column").count
         first_row = table.xpath("table:table-row").first
         cells = first_row.xpath("table:table-cell|table:covered-table-cell")
         column_count = 0

data/lib/workbook/readers/xls_reader.rb

@@ -7,7 +7,7 @@ module Workbook
 
       def load_xls file_obj
         begin
-          sp = Spreadsheet.open(file_obj, mode='rb')
+          sp = Spreadsheet.open(file_obj, 'rb')
           template.add_raw sp
           parse_xls sp
         rescue Ole::Storage::FormatError => e

data/lib/workbook/sheet.rb

@@ -2,7 +2,6 @@
 module Workbook
   class Sheet < Array
     # A Sheet is a container of tables
-    attr_accessor :book
     attr_accessor :name
 
     # Initialize a new sheet
@@ -61,6 +60,10 @@ module Workbook
       end
     end
 
+    def book= b
+      @book = b
+    end
+
     # Removes all lines from this table
     #
     # @return [Workbook::Table] (self)

data/lib/workbook/table.rb

@@ -12,7 +12,6 @@ module Workbook
     include Workbook::Writers::JsonTableWriter
     attr_accessor :sheet
     attr_accessor :name
-    attr_accessor :header
 
     def initialize row_cel_values=[], sheet=nil, options={}
       row_cel_values = [] if row_cel_values == nil
@@ -32,15 +31,19 @@ module Workbook
     #
     # @return [Workbook::Row] The header
     def header
-      if @header == false
+      if defined?(@header) and @header == false
         false
-      elsif @header
+      elsif defined?(@header) and @header
         @header
       else
         first
       end
     end
 
+    def header= h
+      @header = h
+    end
+
     # Generates a new row, with optionally predefined cell-values, that is already connected to this table.
     def new_row cell_values=[]
       r = Workbook::Row.new(cell_values,self)

data/lib/workbook/version.rb

@@ -1,4 +1,4 @@
 # -*- encoding : utf-8 -*-
 module Workbook
-  VERSION = '0.4.4'
+  VERSION = '0.4.5'
 end

data/test/test_column.rb

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 require File.join(File.dirname(__FILE__), 'helper')
 
-class TestRow < Test::Unit::TestCase
+class TestColumn < Test::Unit::TestCase
 
   def test_init
     c = Workbook::Column.new

data/test/test_readers_ods_reader.rb

@@ -1,8 +1,8 @@
 # -*- encoding : utf-8 -*-
 require File.join(File.dirname(__FILE__), 'helper')
 module Readers
-  class TestXlsWriter < Test::Unit::TestCase
-    def test_open
+  class TestOdsWriter < Test::Unit::TestCase
+    def test_ods_open
 
       w = Workbook::Book.new
       w.open File.join(File.dirname(__FILE__), 'artifacts/book_with_tabs_and_colours.ods')

data/test/test_readers_xls_reader.rb

@@ -2,7 +2,7 @@
 require File.join(File.dirname(__FILE__), 'helper')
 module Readers
   class TestXlsWriter < Test::Unit::TestCase
-    def test_open
+    def test_xls_open
       w = Workbook::Book.new
       w.open File.join(File.dirname(__FILE__), 'artifacts/book_with_tabs_and_colours.xls')
       assert_equal([:a, :b, :c, :d, :e],w.sheet.table.header.to_symbols)
@@ -15,7 +15,7 @@ module Readers
 
     end
 
-    def test_complex_types
+    def test_xls_complex_types
       w = Workbook::Book.new
       w.open File.join(File.dirname(__FILE__), 'artifacts/complex_types.xls')
       assert_equal(Date.new(2011,11,15), w.sheet.table[2][3].value)
@@ -24,7 +24,7 @@ module Readers
       assert_equal(1.2, w.sheet.table[3][1].value)
     end
 
-    def test_excel_standardized_open
+    def test_xls_excel_standardized_open
       w = Workbook::Book.new
       w.open(File.join(File.dirname(__FILE__), "artifacts/excel_different_types.xls"))
       # reads

data/test/test_readers_xlsx_reader.rb

@@ -2,7 +2,7 @@
 require File.join(File.dirname(__FILE__), 'helper')
 module Readers
   class TestXlsxWriter < Test::Unit::TestCase
-    def test_open
+    def test_xlsx_open
       w = Workbook::Book.new
       w.open File.join(File.dirname(__FILE__), 'artifacts/book_with_tabs_and_colours.xlsx')
       assert_equal([:a, :b, :c, :d, :e],w.sheet.table.header.to_symbols)

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: workbook
 version: !ruby/object:Gem::Version
-  version: 0.4.4
-  prerelease: 
+  version: 0.4.5
 platform: ruby
 authors:
 - Maarten Brouwers
@@ -14,7 +13,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -30,97 +27,85 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: spreadsheet
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.7.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.7.5
 - !ruby/object:Gem::Dependency
   name: rchardet
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rubyXL
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Workbook contains workbooks, as in a table, contains rows, contains cells,
@@ -128,20 +113,22 @@ description: Workbook contains workbooks, as in a table, contains rows, contains
   and sorting capabilities.
 email:
 - gem@murb.nl
-executables: []
+executables:
+- axldiff
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
-- .yardoc/checksums
-- .yardoc/object_types
-- .yardoc/objects/root.dat
-- .yardoc/proxy_types
+- ".gitignore"
+- ".travis.yml"
+- ".yardoc/checksums"
+- ".yardoc/object_types"
+- ".yardoc/objects/root.dat"
+- ".yardoc/proxy_types"
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/axldiff
 - doc/RubyXL.html
 - doc/RubyXL/Cell.html
 - doc/RubyXL/Workbook.html
@@ -253,27 +240,26 @@ files:
 - workbook.gemspec
 homepage: http://murb.nl/blog?tags=workbook
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: workbook
-rubygems_version: 1.8.23
+rubygems_version: 2.2.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Workbook is a datastructure to contain books of tables (an anlogy used in
   e.g. Excel)
 test_files: