workbook 0.8.1 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87ff9d1b27ed349f1b788ec37cf0ca3e743353abf6281badaebd2a9a5efa4355
-  data.tar.gz: 52f399ec0e3ea2acead3f918cf9b43b942dc158ee321e19239eff71563f4f6ba
+  metadata.gz: 898a4a79301299545d91cfdd5b5f1f261f4cde32337d4713256f21d894cc49f0
+  data.tar.gz: ee61cd9e3e3687092b5c8ca82e8aa10bf8f846553a3602ce3c46103b43ee4e9b
 SHA512:
-  metadata.gz: 151d666f60f1edcb99ba8dfaa35d4cb8e6bebe33bcb3e15543f80f22b62593fa02dd8a45e74fd680260296f2a398008a07fc227dddaafa21958eb0a0a65f8cfb
-  data.tar.gz: eb0fcf133fe88aed80b42c91e9c3cec2f94820c7fb33eda606b0f5c97f1d7cf1368f6de52508655790af0ebd03a5952e6099d8293b1a3329ffd13d156c20fb76
+  metadata.gz: 27b2ab505f2ff035a12e839db5148337c504d81bb2c2517b2eb1ac4749df5e47f31fd281386c4c4d4880c2e24c75a3630d02c7a7bb13e5f62789543bf991f7f9
+  data.tar.gz: 465f709b61f96afe734739b214d1b56daa06e837ea8cd85f98c9343f9c1f7d3337409616bdc5617fa456de3718427d0d89ae89c1fa40a13efe4afbe8841ac175

data/.codeclimate.yml

@@ -0,0 +1,21 @@
+version: "2"
+plugins:
+  rubocop:
+    enabled: true
+    channel: rubocop-1-23-0
+  brakeman:
+    enabled: false
+exclude_patterns:
+  - "config/"
+  - "db/"
+  - "dist/"
+  - "features/"
+  - "**/node_modules/"
+  - "script/"
+  - "**/spec/"
+  - "**/test/"
+  - "**/tests/"
+  - "Tests/"
+  - "**/vendor/"
+  - "**/*_test.go"
+  - "**/*.d.ts"

data/.gitignore

@@ -1,4 +1,5 @@
 untitled document.xls
+untitled document.csv
 test.xls
 compare*.xls
 sharepoint_download_excel.*
@@ -14,4 +15,6 @@ untitled document.xlsx*
 .DS_Store
 doc
 private_*
-test_private_*
+test_private_*
+coverage
+.byebug_history

data/.ruby-version

@@ -1 +1 @@
-2.6.2
+3.2.1

data/.travis.yml

@@ -4,10 +4,10 @@ env:
 sudo: false
 language: ruby
 rvm:
-  - 2.3.0
-  - 2.4.0
-  - 2.5.0
-  - 2.6.0
+  - 2.5.3
+  - 2.6.3
+  - 2.7.1
+  - 3.0.2
 before_install:
   - gem install bundler
 before_script:

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+### 0.9.0
+
+* Dropped inheritance from Array and borrowed from the Enumerable module instead (this might break some existing implementations; please create pull request if you miss Array like functionality)
+* Fix: ODS: Currency formatted cell now no longer returns String
+
+### 0.8.1
+
+* Adopted [Standard](https://github.com/testdouble/standard) for code formatting
 
 ### 0.8.0
 

data/Gemfile

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-source "http://rubygems.org"
+source "https://rubygems.org"
 
 # Specify your gem's dependencies in workbook.gemspec
 
 gemspec
-gem 'rubyzip', :require => 'zip/zip'
+gem "rubyzip", require: "zip/zip"

data/README.md

@@ -1,7 +1,10 @@
 # Workbook
-[![Code Climate](https://codeclimate.com/github/murb/workbook.png)](https://codeclimate.com/github/murb/workbook) [![Build Status](https://travis-ci.org/murb/workbook.svg?branch=master)](https://travis-ci.org/murb/workbook) [![Gem Version](https://badge.fury.io/rb/workbook.svg)](http://badge.fury.io/rb/workbook)
+[![Code Climate](https://codeclimate.com/github/murb/workbook.svg)](https://codeclimate.com/github/murb/workbook)
+[![Test Coverage](https://api.codeclimate.com/v1/badges/058655e705a3f36896e0/test_coverage)](https://codeclimate.com/github/murb/workbook/test_coverage)
+[![Build Status](https://travis-ci.org/murb/workbook.svg?branch=master)](https://travis-ci.org/murb/workbook)
+[![Gem Version](https://badge.fury.io/rb/workbook.svg)](http://badge.fury.io/rb/workbook)
 
-Goal of this gem is to make working with workbooks (spreadsheets) as programmer friendly as possible. Not reinventing a totally new DSL or all kinds of new methodnames, but just borrowing from known concepts such as hashes and arrays (much like (Faster)CSV does)). Workbook is a gem that mimicks a typical spreadsheet, a bundle of sheets, bundled in a *workbook*. A sheet may contain one or more tables (which might the multi table sheets of Apple Numbers or Excel ranges). Basically:
+Goal of this gem is to make working with workbooks (spreadsheets) as programmer friendly as possible. Not reinventing a totally new DSL or all kinds of new methodnames, but just borrowing from known concepts such as hashes and arrays (much like (Faster)CSV does)). Workbook is a gem that mimicks a typical spreadsheet, a bundle of sheets, bundled in a *workbook*. A sheet may contain one or more tables (which might be the multi table sheets of Apple Numbers or Excel ranges). Basically:
 
 * Book
    * Sheet (one or more)
@@ -13,7 +16,7 @@ Subsequently a table consists of:
    * Row (one or more)
       * Cell ( wich has may have a (shared) Format )
 
-Book, Sheet, Table and Row inherit from the base Array class, and hence walks and quacks as such. The row is extended with hashlike lookups (`row[:id]`) and writers (`row[:id]=`). Values are converted to ruby native types, and optional parsers can be added to improve recognition.
+Book, Sheet, Table and Row inherit much of the behaviours from the Array and Hash classes, it tries to walk and quack as such. The row is extended with hashlike lookups (`row[:id]`) and writers (`row[:id]=`). Values are converted to ruby native types, and optional parsers can be added to improve recognition.
 
 In addition to offering you this plain structure it allows for importing .xls, .csv, .xlsx, .txt files (more to come), writing .xls, and .csv  (more to come) and includes several utilities to easily create an overview of the differences between two tables and output basic cell-styling properties as css.
 
@@ -32,7 +35,7 @@ Calling
     s = b.sheet
     t = s.table
 
-will give you an the first Sheet and Table (if one doesn't exist it is created on the fly).
+will give you the first Sheet and Table (if one doesn't exist it is created on the fly).
 
 You can initialize with simple 2-d array like this:
 
@@ -129,8 +132,7 @@ In case you want to display a formatted table in HTML, some conversion is offere
 
 ## Compatibility
 
-Workbook is automatically tested for ruby 1.9, 2.0 and 2.1. Most of it works with 1.8.7 and jruby but not all tests give equal results.
-Check [Travis for Workbook's current build status](https://travis-ci.org/murb/workbook) [![Build Status](https://travis-ci.org/murb/workbook.svg?branch=master)](https://travis-ci.org/murb/workbook).
+Workbook is automatically tested. Check [Travis for Workbook's current build status of the supported ruby versions](https://travis-ci.org/murb/workbook) [![Build Status](https://travis-ci.org/murb/workbook.svg?branch=master)](https://travis-ci.org/murb/workbook).
 
 ## Future
 
@@ -153,4 +155,4 @@ Workbook uses the following gems:
 * [FasterCSV](http://fastercsv.rubyforge.org/) Used for reading CSV (comma separated text) and TXT (tab separated text) files (Copyright © James Edward Gray II; GPL2 & Ruby License)
 * [rchardet](http://rubyforge.org/projects/rchardet) Used for detecting encoding in CSV and TXT importers (Copyright © JMHodges; LGPL)
 * [axslx](https://github.com/randym/axlsx) Used for writing the newer .xlsx files (with formatting) (Copyright © 2011, 2012 Randy Morgan, MIT License)
-* [Nokogiri](http://nokogiri.org/) Used for reading ODS documents (Copyright © 2008 - 2012 Aaron Patterson, Mike Dalessio, Charles Nutter, Sergio Arbeo, Patrick Mahoney, Yoko Harada; MIT Licensed)
+* [Nokogiri](http://nokogiri.org/) Used for reading ODS documents (Copyright © 2008 - 2012 Aaron Patterson, Mike Dalessio, Charles Nutter, Sergio Arbeo, Patrick Mahoney, Yoko Harada; MIT Licensed)

data/Rakefile

@@ -1,16 +1,16 @@
 # frozen_string_literal: true
 
-require 'rake'
-require 'rake/testtask'
-require 'bundler'
+require "rake"
+require "rake/testtask"
+require "bundler"
 require "bundler/gem_tasks"
 
-#Bundler::GemHelper.install_tasks
+# Bundler::GemHelper.install_tasks
 
-task :default => [:test]
+task default: [:test]
 
 Rake::TestTask.new do |t|
   t.libs << "test"
-  t.test_files = FileList['test/test*.rb','test/writers/test*.rb']
+  t.test_files = FileList["test/test*.rb", "test/writers/test*.rb"]
   t.verbose = false
 end

data/json_test.json

@@ -0,0 +1 @@
+[{"a":1,"b":2},{"a":"2012-01-01","b":null}]

data/lib/workbook/book.rb

@@ -1,19 +1,18 @@
 # frozen_string_literal: true
-
-# -*- encoding : utf-8 -*-
 # frozen_string_literal: true
-require 'open-uri'
-require 'workbook/writers/xls_writer'
-require 'workbook/writers/xlsx_writer'
-require 'workbook/writers/html_writer'
-require 'workbook/readers/xls_reader'
-require 'workbook/readers/xls_shared'
-require 'workbook/readers/xlsx_reader'
-require 'workbook/readers/ods_reader'
-require 'workbook/readers/csv_reader'
-require 'workbook/readers/txt_reader'
-require 'workbook/readers/txt_reader'
-require 'workbook/modules/diff_sort'
+
+require "forwardable"
+require "open-uri"
+require "workbook/writers/xls_writer"
+require "workbook/writers/xlsx_writer"
+require "workbook/writers/html_writer"
+require "workbook/readers/xls_reader"
+require "workbook/readers/xls_shared"
+require "workbook/readers/xlsx_reader"
+require "workbook/readers/ods_reader"
+require "workbook/readers/csv_reader"
+require "workbook/readers/txt_reader"
+require "workbook/modules/diff_sort"
 
 module Workbook
   # The Book class is the container of sheets. It can be inialized by either the standard initalizer or the open method. The
@@ -35,8 +34,9 @@ module Workbook
     "CDF V2 Document, No summary info"
   ]
 
-  class Book < Array
-
+  class Book
+    include Enumerable
+    extend Forwardable
 
     include Workbook::Readers::XlsShared
     include Workbook::Writers::XlsWriter
@@ -49,14 +49,13 @@ module Workbook
     include Workbook::Readers::TxtReader
     include Workbook::Modules::BookDiffSort
 
+    delegate [:last, :pop, :delete_at, :each, :[]] => :@sheets
+
     # @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=nil
-      if sheet.is_a? Workbook::Sheet
-        self.push sheet
-      elsif sheet
-        self.push Workbook::Sheet.new(sheet, self, {})
-      end
+    def initialize sheet = nil
+      @sheets = []
+      push sheet if sheet
     end
 
     # @return [Workbook::Template] returns the template describing how the document should be/is formatted
@@ -74,37 +73,51 @@ module Workbook
     #
     # @return [String] the title of the workbook
     def title
-      (defined?(@title) and !@title.nil?) ? @title : "untitled document"
+      defined?(@title) && !@title.nil? ? @title : "untitled document"
     end
 
-    def title= t
-      @title = t
-    end
+    attr_writer :title
 
     # Push (like in array) a sheet to the workbook (parameter is optional, default is a new sheet)
     #
-    # @param [Workbook::Sheet] sheet
-    def push sheet=Workbook::Sheet.new
-      super(sheet)
-      sheet.book=(self)
+    # @param [Workbook::Sheet, Array[Array]] sheet
+    def push sheet = Workbook::Sheet.new
+      sheet = Workbook::Sheet.new(sheet) unless sheet.is_a? Workbook::Sheet
+      sheet.book = self
+
+      @sheets.push(sheet)
+      sheet
     end
 
-    # << (like in array) a sheet to the workbook (parameter is optional, default is a new sheet)
+    # Inserts a new Table at the specified index
     #
-    # @param [Workbook::Sheet] sheet
-    def << sheet=Workbook::Sheet.new
-      sheet = Workbook::Sheet.new(sheet) unless sheet.is_a? Workbook::Sheet
-      super(sheet)
-      sheet.book=(self)
+    # @param [Integer] index of the table
+    # @param [Workbook::Table, Array<Array>] table   The new first table of this sheet
+    #
+    # @return [Workbook::Table]
+    def []= index, value
+      table_to_insert = value.is_a?(Workbook::Sheet) ? value : Workbook::Sheet.new
+      table_to_insert.book = self
+      @sheets[index] = table_to_insert
     end
 
+    # returns the index of an item
+    def index item
+      @sheets.index item
+    end
+
+    # << (like in array) a sheet to the workbook (parameter is optional, default is a new sheet)
+    #
+    # @param [Workbook::Sheet, Array[Array]] sheet
+    def << sheet = Workbook::Sheet.new
+      push sheet
+    end
 
     # Sheet returns the first sheet of a workbook, or an empty one.
     #
     # @return [Workbook::Sheet] The first sheet, and creates an empty one if one doesn't exists
     def sheet
-      push Workbook::Sheet.new unless first
-      first
+      first || push
     end
 
     # If the first sheet has any contents
@@ -119,9 +132,9 @@ module Workbook
     # @param [String] filename   a string with a reference to the file to be opened
     # @param [String] extension  an optional string enforcing a certain parser (based on the file extension, e.g. 'txt', 'csv' or 'xls')
     # @return [Workbook::Book] A new instance, based on the filename
-    def import filename, extension=nil, options={}
-      extension = file_extension(filename) unless extension
-      if ['txt','csv','xml'].include?(extension)
+    def import filename, extension = nil, options = {}
+      extension ||= file_extension(filename)
+      if ["txt", "csv", "xml"].include?(extension)
         open_text filename, extension, options
       else
         open_binary filename, extension, options
@@ -133,9 +146,9 @@ module Workbook
     # @param [String] filename a string with a reference to the file to be opened
     # @param [String] extension an optional string enforcing a certain parser (based on the file extension, e.g. 'txt', 'csv' or 'xls')
     # @return [Workbook::Book] A new instance, based on the filename
-    def open_binary filename, extension=nil, options={}
-      extension = file_extension(filename) unless extension
-      f = open(filename)
+    def open_binary filename, extension = nil, options = {}
+      extension ||= file_extension(filename)
+      f = File.open(filename)
       send("load_#{extension}".to_sym, f, options)
     end
 
@@ -143,9 +156,9 @@ module Workbook
     #
     # @param [String] filename   a string with a reference to the file to be opened
     # @param [String] extension  an optional string enforcing a certain parser (based on the file extension, e.g. 'txt', 'csv' or 'xls')
-    def open_text filename, extension=nil, options={}
-      extension = file_extension(filename) unless extension
-      t = text_to_utf8(open(filename).read)
+    def open_text filename, extension = nil, options = {}
+      extension ||= file_extension(filename)
+      t = text_to_utf8(File.open(filename).read)
       send("load_#{extension}".to_sym, t, options)
     end
 
@@ -153,21 +166,20 @@ module Workbook
     #
     # @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={}
+    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
     #
     # @param [String] text a string to convert
     def text_to_utf8 text
-      unless text.valid_encoding? and text.encoding == "UTF-8"
+      unless text.valid_encoding? && (text.encoding == "UTF-8")
         # TODO: had some ruby 1.9 problems with rchardet ... but ideally it or a similar functionality will be reintroduced
         source_encoding = text.valid_encoding? ? text.encoding : "US-ASCII"
-        text = text.encode('UTF-8', source_encoding, {:invalid=>:replace, :undef=>:replace, :replace=>""})
-        text = text.gsub("\u0000","") # TODO: this cleanup of nil values isn't supposed to be needed...
+        text = text.encode("UTF-8", source_encoding, invalid: :replace, undef: :replace, replace: "")
+        text = text.delete("\u0000") # TODO: this cleanup of nil values isn't supposed to be needed...
       end
       text
     end
@@ -176,16 +188,16 @@ module Workbook
     #
     # @return [String] The file extension
     def file_extension(filename)
-      ext = File.extname(filename).gsub('.','').downcase if filename
+      ext = File.extname(filename).delete(".").downcase if filename
       # for remote files which has asset id after extension
-      ext.split('?')[0]
+      ext.split("?")[0]
     end
 
     # Load the CSV data contained in the given StringIO or String object
     #
     # @param [StringIO] stringio_or_string StringIO stream or String object, with data in CSV format
     # @param [Symbol] filetype (currently only :csv or :txt), indicating the format of the first parameter
-    def read(stringio_or_string, filetype, options={})
+    def read(stringio_or_string, filetype, options = {})
       raise ArgumentError.new("The filetype parameter should be either :csv or :txt") unless [:csv, :txt].include?(filetype)
       t = stringio_or_string.respond_to?(:read) ? stringio_or_string.read : stringio_or_string.to_s
       t = text_to_utf8(t)
@@ -197,7 +209,7 @@ module Workbook
     # @param [Integer] index    the index of the sheet
     def create_or_open_sheet_at index
       s = self[index]
-      s = self[index] = Workbook::Sheet.new if s == nil
+      s = self[index] = Workbook::Sheet.new if s.nil?
       s.book = self
       s
     end
@@ -208,10 +220,10 @@ module Workbook
       # @param [String] filename of the document
       # @param [String] extension of the document (not required). The parser used is based on the extension of the file, this option allows you to override the default.
       # @return [Workbook::Book] A new instance, based on the filename
-      def open filename, extension=nil
-        wb = self.new
+      def open filename, extension = nil
+        wb = new
         wb.import filename, extension
-        return wb
+        wb
       end
 
       # Create an instance from the given stream or string, which should be in CSV or TXT format
@@ -219,12 +231,11 @@ module Workbook
       # @param [StringIO] stringio_or_string StringIO stream or String object, with data in CSV or TXT format
       # @param [Symbol] filetype (currently only :csv or :txt), indicating the format of the first parameter
       # @return [Workbook::Book] A new instance
-      def read stringio_or_string, filetype, options={}
-        wb = self.new
+      def read stringio_or_string, filetype, options = {}
+        wb = new
         wb.read(stringio_or_string, filetype, options)
         wb
       end
-
     end
   end
 end

data/lib/workbook/cell.rb

@@ -1,20 +1,65 @@
 # frozen_string_literal: true
-
-# -*- encoding : utf-8 -*-
 # frozen_string_literal: true
-require 'workbook/modules/cell'
+
+require "workbook/modules/cell"
 
 module Workbook
   class Cell
-     include Workbook::Modules::Cell
-
-     # @param [Numeric,String,Time,Date,TrueClass,FalseClass,NilClass] value a valid value
-     # @param [Hash] options a reference to :format (Workbook::Format) can be specified
-     def initialize value=nil, options={}
-       self.format = options[:format] if options[:format]
-       self.row = options[:row]
-       self.value = value
-       @to_sym = nil
-     end
+    include Workbook::Modules::Cell
+
+    class << self
+
+      # returns a symbol representation of a string.
+      # @param [String] value to convert
+      # @example
+      #
+      #     <Workbook::Cell value="yet another value">.to_sym # returns :yet_another_value
+      def value_to_sym value
+        v = nil
+        cell_type ||= ::Workbook::Modules::Cell::CLASS_CELLTYPE_MAPPING[value.class.to_s]
+        value_to_s = value.to_s.strip.downcase
+        unless value.nil? || value_to_s == ""
+          if cell_type == :integer
+            v = "num#{value}".to_sym
+          elsif cell_type == :float
+            v = "num#{value}".sub(".", "_").to_sym
+          else
+            v = value_to_s.strip
+            ends_with_exclamationmark = (v[-1] == "!")
+            ends_with_questionmark = (v[-1] == "?")
+
+            v = _replace_possibly_problematic_characters_from_string(v)
+
+            v = v.encode(Encoding.find("ASCII"), invalid: :replace, undef: :replace, replace: "")
+
+            v = "#{v}!" if ends_with_exclamationmark
+            v = "#{v}?" if ends_with_questionmark
+            v = v.downcase.to_sym
+          end
+        end
+        v
+      end
+
+      private
+
+      def _replace_possibly_problematic_characters_from_string(string)
+        Workbook::Modules::Cell::CHARACTER_REPACEMENTS.each do |ac, rep|
+          ac.each do |s|
+            string = string.gsub(s, rep)
+          end
+        end
+        string
+      end
+
+    end
+
+    # @param [Numeric,String,Time,Date,TrueClass,FalseClass,NilClass] value a valid value
+    # @param [Hash] options a reference to :format (Workbook::Format) can be specified
+    def initialize value = nil, options = {}
+      self.format = options[:format] if options[:format]
+      self.row = options[:row]
+      self.value = value
+      @to_sym = nil
+    end
   end
 end

data/lib/workbook/column.rb

@@ -1,35 +1,39 @@
 # frozen_string_literal: true
-
-# -*- encoding : utf-8 -*-
 # frozen_string_literal: true
+
 module Workbook
+  # Column helps us to store general properties of a column, and lets us easily perform operations on values within a column, it also exposes a read only Enumerable API to access the cells in the column.
 
-  # 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 :limit, :width #character limit
+    include Enumerable
+    extend Forwardable
+
+    delegate [:first, :last, :each, :count, :include?, :index, :to_csv, :length, :empty?] => :cells
 
-    def initialize(table=nil, options={})
+    attr_accessor :limit, :width # character limit
+
+    def initialize(table = nil, options = {})
       self.table = table
-      options.each{ |k,v| self.public_send("#{k}=",v) }
+      options.each { |k, v| public_send("#{k}=", v) }
     end
 
     # Returns column type, either :primary_key, :string, :text, :integer, :float, :decimal, :datetime, :date, :binary, :boolean
     def column_type
       return @column_type if defined?(@column_type)
-      ind = self.index
+      ind = index
       table[1..500].each do |row|
-        if row[ind] and row[ind].cell_type
+        if row[ind]&.cell_type
           cel_column_type = row[ind].cell_type
-          if !defined?(@column_type) or @column_type.nil?
+          if !defined?(@column_type) || @column_type.nil?
             @column_type = cel_column_type
-          elsif cel_column_type == @column_type or cel_column_type == :nil
+          elsif (cel_column_type == @column_type) || (cel_column_type == :nil)
           else
             @column_type = :string
             break
           end
         end
       end
-      return @column_type
+      @column_type
     end
 
     # Returns index of the column within the table's columns-set
@@ -41,14 +45,12 @@ module Workbook
     # Set the table this column belongs to
     # @param [Workbook::Table] table this column belongs to
     def table= table
-      raise(ArgumentError, "value should be nil or Workbook::Table") unless [NilClass,Workbook::Table].include? table.class
+      raise(ArgumentError, "value should be nil or Workbook::Table") unless [NilClass, Workbook::Table].include? table.class
       @table = table
     end
 
     # @return [Workbook::Table]
-    def table
-      @table
-    end
+    attr_reader :table
 
     def column_type= column_type
       if [:primary_key, :string, :text, :integer, :float, :decimal, :datetime, :date, :binary, :boolean].include? column_type
@@ -59,25 +61,26 @@ module Workbook
       end
     end
 
+    def cells
+      table_header_object_id = table.header.object_id
+      table.map{|r| r[index] unless r.object_id == table_header_object_id }.compact
+    end
+
     def head_value
-      begin
-        table.header[index].value
-      rescue
-        return "!noheader!"
-      end
+      table.header[index].value
+    rescue
+      "!noheader!"
     end
 
     def inspect
       "<Workbook::Column index=#{index}, header=#{head_value}>"
     end
 
-    #default cell
-    def default
-      return @default
-    end
+    # default cell
+    attr_reader :default
 
     def default= value
-      @default = value if value.class == Cell
+      @default = value if value.instance_of?(Cell)
       @default = Cell.new(value)
     end
 
@@ -87,10 +90,10 @@ module Workbook
       # @return [Integer]
       def alpha_index_to_number_index string
         sum = 0
-        string.upcase.chars.each_with_index do | char, char_index|
-          sum = sum * 26 + char.unpack('U')[0]-64
+        string.upcase.chars.each_with_index do |char, char_index|
+          sum = sum * 26 + char.unpack1("U") - 64
         end
-        return sum-1
+        sum - 1
       end
     end
   end