excelinator 1.0.0 → 1.1.0

data/README.md

@@ -112,8 +112,10 @@ I did, and I apologize. Lemme know when your pull request is ready.
 
 ###Are there any options to re-use CSV/HTML views with No additional controller/view code?
 
-I've tinkered with it, but it requires a bit of duck punching of the Rails
-rendering code.
+I've tinkered with it, but it requires a bit of duck punching of the
+Rails rendering code. Checkout
+[exceliderp](https://github.com/chrismo/exceliderp) and see if I've
+pushed it up there yet.
 
 ###What if I want to generate a real Excel spreadsheet from scratch with all sorts of awesome in it?
 
@@ -144,3 +146,9 @@ XMLDoc.
 
 They're not all supposed to work. Think of it more as a workshop for example
 code.
+
+CHANGELOG
+---------
+####1.1.0
+
+Added Ruby 1.9 support.

data/lib/excelinator.rb

@@ -2,7 +2,16 @@ require 'excelinator/xls'
 require 'excelinator/rails'
 require 'excelinator/version'
 require 'spreadsheet'
-require 'fastercsv'
+
+def ruby19?
+  RUBY_VERSION =~ /1.9/
+end
+
+if ruby19?
+  require 'csv'
+else
+  require 'fastercsv'
+end
 
 if defined?(Rails)
   Excelinator::Rails.setup

data/lib/excelinator/version.rb

@@ -1,3 +1,3 @@
 module Excelinator
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 end

data/lib/excelinator/xls.rb

@@ -7,8 +7,9 @@ module Excelinator
     content =~ /<table/ ? Excelinator.html_as_xls(content) : Excelinator.csv_to_xls(content)
   end
 
-  def self.csv_to_xls(csv_content)
-    ary = FasterCSV.parse(csv_content)
+def self.csv_to_xls(csv_content)
+    ary = (ruby19? ? CSV : FasterCSV).parse(csv_content)
+
     book = Spreadsheet::Workbook.new
     sheet = book.create_worksheet
     ary.each_with_index do |row_ary, index|
@@ -32,7 +33,7 @@ module Excelinator
   # If you don't have need of utf-8 encoding, or want to prepend that yourself, there's no need to use this method.
   def self.html_as_xls(html_content, options={})
     encoding_meta_tag = '<meta http-equiv="Content-Type" content="text/html; charset=utf-8">'
-    encoding_meta_tag + (options.delete(:do_not_strip) ? html_content : html_content.scan(/<table.*\/table>/mi).to_s)
+    encoding_meta_tag + (options.delete(:do_not_strip) ? html_content : html_content.scan(/<table.*\/table>/mi).join)
   end
 
   # def self.html_to_xls might be nice to do - convert html table to _real_ xls file

metadata

@@ -1,26 +1,25 @@
 --- !ruby/object:Gem::Specification 
 name: excelinator
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 19
   prerelease: 
   segments: 
   - 1
+  - 1
   - 0
-  - 0
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors: 
 - chrismo
+- jwhitmire
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2012-08-03 00:00:00 -05:00
-default_executable: 
+date: 2012-12-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: spreadsheet
-  prerelease: false
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -34,9 +33,9 @@ dependencies:
         version: 0.6.8
   type: :runtime
   requirement: *id001
+  prerelease: false
 - !ruby/object:Gem::Dependency 
   name: fastercsv
-  prerelease: false
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -48,9 +47,9 @@ dependencies:
         version: "0"
   type: :runtime
   requirement: *id002
+  prerelease: false
 - !ruby/object:Gem::Dependency 
   name: rake
-  prerelease: false
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -62,9 +61,9 @@ dependencies:
         version: "0"
   type: :development
   requirement: *id003
+  prerelease: false
 - !ruby/object:Gem::Dependency 
   name: rspec
-  prerelease: false
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -76,9 +75,11 @@ dependencies:
         version: "0"
   type: :development
   requirement: *id004
+  prerelease: false
 description: convert your csv data and html tables to excel data
 email: 
 - chrismo@clabs.org
+- jeff@jwhitmire.com
 executables: []
 
 extensions: []
@@ -91,7 +92,6 @@ files:
 - lib/excelinator/rails.rb
 - lib/excelinator/version.rb
 - lib/excelinator/xls.rb
-has_rdoc: true
 homepage: https://github.com/livingsocial/excelinator
 licenses: []
 
@@ -121,7 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Excel Converter