Rebase from master

CHANGELOG.md

@@ -1,4 +1,4 @@
-## [Unreleased][unreleased]
+## [2.1.0] - 2015-07-18
 ### Added
 - Added support for Excel 2007 `xlsm` files. [#232](https://github.com/roo-rb/roo/pull/232)
 - Roo::Excelx returns an enumerator when calling each_row_streaming without a block. [#224](https://github.com/roo-rb/roo/pull/224)

README.md

@@ -21,7 +21,7 @@ Install as a gem
 Or add it to your Gemfile
 
 ```ruby
-gem 'roo', '~> 2.0.0'
+gem 'roo', '~> 2.1.0'
 ```
 ## Usage
 
@@ -143,7 +143,7 @@ sheet.to_xml
 sheet.to_yaml
 ```
 
-### Excel (xlsx) Support
+### Excel (xlsx and xlsm) Support
 
 Stream rows from an Excelx spreadsheet.
 

lib/roo.rb

@@ -1,3 +1,4 @@
+require 'roo/constants'
 require 'roo/spreadsheet'
 require 'roo/base'
 
@@ -17,11 +18,11 @@ module Roo
   def self.const_missing(const_name)
     case const_name
     when :Excel
-      raise "Excel support has been extracted to roo-xls due to its dependency on the GPL'd spreadsheet gem. Install roo-xls to use Roo::Excel."
+      raise ROO_EXCEL_NOTICE
     when :Excel2003XML
-      raise "Excel SpreadsheetML support has been extracted to roo-xls. Install roo-xls to use Roo::Excel2003XML."
+      raise ROO_EXCELML_NOTICE
     when :Google
-      raise "Google support has been extracted to roo-google. Install roo-google to use Roo::Google."
+      raise ROO_GOOGLE_NOTICE
     else
       super
     end

lib/roo/constants.rb

@@ -0,0 +1,5 @@
+module Roo
+  ROO_EXCEL_NOTICE   = "Excel support has been extracted to roo-xls due to its dependency on the GPL'd spreadsheet gem. Install roo-xls to use Roo::Excel.".freeze
+  ROO_EXCELML_NOTICE = "Excel SpreadsheetML support has been extracted to roo-xls. Install roo-xls to use Roo::Excel2003XML.".freeze
+  ROO_GOOGLE_NOTICE = "Google support has been extracted to roo-google. Install roo-google to use Roo::Google.".freeze
+end

lib/roo/libre_office.rb

@@ -1,5 +1,4 @@
 require 'roo/open_office'
 
 # LibreOffice is just an alias for Roo::OpenOffice class
-class Roo::LibreOffice < Roo::OpenOffice
-end
+Roo::LibreOffice = Roo::OpenOffice