cloudxls-rails 0.3.0 → 0.3.1

data/lib/cloudxls-rails/action_controller.rb

@@ -13,7 +13,7 @@ ActionController::Renderers.add :csv do |scope, options|
   filename = options.fetch(:filename, 'data.csv')
   columns  = options[:columns]
 
-  if options.fetch(:stream, false) == true
+  if options.fetch(:stream, false)
     # streaming response
     headers["Content-Type"] = "text/csv"
     headers["Content-disposition"] = "attachment; filename=\"#{filename}\""
@@ -35,18 +35,39 @@ end
 ActionController::Renderers.add :xls do |scope, options|
   columns  = options.fetch(:columns, nil)
 
-  data     = CloudXLS::CSVWriter.text(scope, {:columns => columns})
-  response = CloudXLS.xpipe(data:  { text: data })
+  xdata = options[:data] || {}
+  unless (xdata.has_key?(:text) ||
+          xdata.has_key?(:url ) ||
+          xdata.has_key?(:file)  )
 
+    xdata[:text] = CloudXLS::CSVWriter.text(scope, {:columns => columns})
+  end
+
+  xopts = {:data => xdata}
+  xopts[:sheet] = options[:sheet] if options[:sheet]
+  xopts[:doc]   = options[:doc]   if options[:doc]
+
+  response = CloudXLS.xpipe(xopts)
   redirect_to response.url
 end
 
 ActionController::Renderers.add :xlsx do |scope, options|
   columns  = options.fetch(:columns, nil)
 
-  data     = CloudXLS::CSVWriter.text(scope, {:columns => columns})
-  response = CloudXLS.xpipe(:data => {:text => data }, doc: {:format => "xlsx"})
+  xdata = options[:data] || {}
+  unless (xdata.has_key?(:text) ||
+          xdata.has_key?(:url ) ||
+          xdata.has_key?(:file)  )
+
+    xdata[:text] = CloudXLS::CSVWriter.text(scope, {:columns => columns})
+  end
+
+  xopts = {:data => xdata}
+  xopts[:sheet] = options[:sheet] if options[:sheet]
+  xopts[:doc]   = options[:doc] || {}
+  xopts[:doc][:format] = 'xlsx'
 
+  response = CloudXLS.xpipe(xopts)
   redirect_to response.url
 end
 
@@ -57,10 +78,18 @@ class ActionController::Responder
   end
 
   def to_xls
-    controller.render({:xls => resources.last, :stream => false }.merge(options))
+    if options[:stream] == true
+      options[:data] ||= {}
+      options[:data][:url] ||= controller.request.url.gsub(/xls\Z/, "csv")
+    end
+    controller.render({:xls => resources.last  }.merge(options))
   end
 
   def to_xlsx
-    controller.render({:xlsx => resources.last, :stream => false}.merge(options))
+    if options[:stream] == true
+      options[:data] ||= {}
+      options[:data][:url] ||= controller.request.url.gsub(/xlsx\Z/, "csv")
+    end
+    controller.render({:xlsx => resources.last }.merge(options))
   end
 end

data/lib/cloudxls-rails/csv_writer.rb

@@ -50,7 +50,12 @@ module CloudXLS
 
       Enumerator.new do |row|
         if options[:skip_headers] != true
-          row << ::CSV.generate_line(csv_titles(columns, :titleize))
+          if scope.respond_to?(:column_names)
+            columns ||= scope.column_names
+          end
+          if columns
+            row << csv_titles(columns, :titleize).to_csv
+          end
         end
 
         enum = scope_enumerator(scope)

data/lib/cloudxls-rails/version.rb

@@ -1,5 +1,5 @@
 module CloudXLS
   module Rails
-    VERSION = '0.3.0'
+    VERSION = '0.3.1'
   end
 end

data/spec/integration_spec.rb

@@ -27,8 +27,43 @@ describe 'Request', :type => :request do
     ].join("\n")
   end
 
-  it "/posts.xls has a working csv export" do
-    CloudXLS.should_receive(:xpipe).and_return(OpenStruct.new(:url => "/successful_redirect"))
-    visit '/posts.xls'
+  it "/posts/stream.csv streams csv" do
+    visit '/posts/stream.csv'
+    page.should have_content [
+      "Title,Visits,Conversion Rate,Published On,Published,Expired At",
+      "hello world,12032,0.24,2013-12-24,false,2013-12-25T12:30:30.000+0000"
+    ].join("\n")
+  end
+
+
+  describe "posts/stream" do
+    it "/posts/stream.csv should xpipe with csv url" do
+      visit '/posts/stream.csv'
+      page.should have_content [
+        "Title,Visits,Conversion Rate,Published On,Published,Expired At",
+        "hello world,12032,0.24,2013-12-24,false,2013-12-25T12:30:30.000+0000"
+      ].join("\n")
+    end
+
+    it "/posts/stream.xlsx has a working csv export" do
+      CloudXLS.should_receive(:xpipe) { |options|
+        !options[:data][:url].ends_with?("posts/stream.csv") &&
+        options[:doc][:format] == "xlsx" &&
+        options.keys.length == 2
+      }.and_return(OpenStruct.new(:url => "/successful_redirect"))
+
+      visit '/posts/stream.xlsx'
+      page.should have_content("OK")
+    end
+
+    it "/posts/stream.xls has a working csv export" do
+      CloudXLS.should_receive(:xpipe) { |options|
+        !options[:data][:url].end_with?("posts/stream.csv") &&
+          options.keys.length == 1
+      }.and_return(OpenStruct.new(:url => "/successful_redirect"))
+
+      visit '/posts/stream.xls'
+      page.should have_content("OK")
+    end
   end
 end

data/spec/test_app/app/controllers/posts_controller.rb

@@ -2,11 +2,23 @@ class PostsController < ApplicationController
   respond_to :csv, :xls, :xlsx, :html
 
   def index
-    respond_with(Post.all, :columns => %w[title visits conversion_rate published_on published expired_at])
+    respond_with(Post.all, :columns => export_attributes)
+  end
+
+  def stream
+    respond_with(Post.all, :stream => true, :columns => export_attributes)
   end
 
   # Used for stub/mocking a redirect request
   def successful_redirect
-    render :text => "xls"
+    # make rails 3.1 happy with a template
+    # /views/posts/successful_redirect.html.erb
+    render :text => "OK"
   end
+
+protected
+  def export_attributes
+    %w[title visits conversion_rate published_on published expired_at]
+  end
+
 end

data/spec/test_app/app/views/posts/successful_redirect.html.erb

@@ -0,0 +1 @@
+OK

data/spec/test_app/config/routes.rb

@@ -1,5 +1,9 @@
 TestApp::Application.routes.draw do
-  resources :posts
+  resources :posts do
+    collection do
+      get "stream"
+    end
+  end
   get "successful_redirect" => "posts#successful_redirect"
   root to: "posts#index"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudxls-rails
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -143,6 +143,7 @@ files:
 - spec/test_app/app/models/post.rb
 - spec/test_app/app/views/layouts/application.html.erb
 - spec/test_app/app/views/posts/index.html.erb
+- spec/test_app/app/views/posts/successful_redirect.html.erb
 - spec/test_app/config.ru
 - spec/test_app/config/application.rb
 - spec/test_app/config/boot.rb
@@ -215,6 +216,7 @@ test_files:
 - spec/test_app/app/models/post.rb
 - spec/test_app/app/views/layouts/application.html.erb
 - spec/test_app/app/views/posts/index.html.erb
+- spec/test_app/app/views/posts/successful_redirect.html.erb
 - spec/test_app/config.ru
 - spec/test_app/config/application.rb
 - spec/test_app/config/boot.rb