cloudxls-rails 0.4.2 → 0.4.3

data/lib/cloudxls-rails/handlers/csv.rb

@@ -35,7 +35,7 @@ ActionController::Renderers.add :csv do |scope, options|
   filename = options.fetch(:filename, "data-#{DateTime.now.to_s}.csv")
   columns  = options[:columns]
 
-  if options[:stream] == true
+  if options[:stream]
     CloudXLSRails::CSVResponder.stream!(self, scope, options)
   else # no stream:
     data = CloudXLS::CSVWriter.text(scope, {:columns => columns})

data/lib/cloudxls-rails/handlers/xls.rb

@@ -29,10 +29,20 @@ end
 # For respond_to default
 class ActionController::Responder
   def to_xls
-    if options[:stream] == true
+    stream = options.delete(:stream) || false
+    if stream # either string or boolean
       options[:data] ||= {}
-      options[:data][:url] ||= controller.request.url.gsub(/xls\Z/, "csv")
+      options[:data][:url] ||= cloudxls_stream_url(stream, 'xls')
     end
     CloudXLSRails::XLSResponder.redirect!(controller, resources.last, options)
   end
+
+protected
+  def cloudxls_stream_url(stream, extension = 'xls')
+    if stream == true
+      controller.request.url.gsub(/#{extension}\Z/, "csv")
+    else
+      stream.to_s
+    end
+  end
 end

data/lib/cloudxls-rails/handlers/xlsx.rb

@@ -30,9 +30,10 @@ end
 # For respond_to default
 class ActionController::Responder
   def to_xlsx
-    if options[:stream] == true
+    stream = options.delete(:stream) || false
+    if stream # either string or boolean
       options[:data] ||= {}
-      options[:data][:url] ||= controller.request.url.gsub(/xlsx\Z/, "csv")
+      options[:data][:url] ||= cloudxls_stream_url(stream, 'xlsx')
     end
     CloudXLSRails::XLSXResponder.redirect!(controller, resources.last, options)
   end

data/lib/cloudxls-rails/version.rb

@@ -1,3 +1,3 @@
 module CloudXLSRails
-  VERSION = '0.4.2'
+  VERSION = '0.4.3'
 end

data/spec/integration_spec.rb

@@ -58,7 +58,7 @@ describe 'Request', :type => :request do
 
     it "/posts/stream.xls has a working csv export" do
       CloudXLS.should_receive(:xpipe) { |options|
-        !options[:data][:url].end_with?("posts/stream.csv") &&
+        !options[:data][:url].ends_with?("posts/stream.csv") &&
           options.keys.length == 1
       }.and_return(OpenStruct.new(:url => "/successful_redirect"))
 
@@ -66,4 +66,34 @@ describe 'Request', :type => :request do
       page.should have_content("OK")
     end
   end
+
+  describe "/posts/stream_with_custom_url" do
+    it "/posts/stream_with_custom_url.csv should xpipe with csv url" do
+      visit '/posts/stream_with_custom_url.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_with_custom_url.xls will redirect to custom url" do
+      CloudXLS.should_receive(:xpipe) { |options|
+        !options[:data][:url].ends_with?("successful_redirect") &&
+          options.keys.length == 1
+      }.and_return(OpenStruct.new(:url => "/successful_redirect"))
+
+      visit '/posts/stream_with_custom_url.xls'
+      page.should have_content("OK")
+    end
+
+    it "/posts/stream_with_custom_url.xlsx will redirect to custom url" do
+      CloudXLS.should_receive(:xpipe) { |options|
+        !options[:data][:url].ends_with?("successful_redirect") &&
+          options.keys.length == 1
+      }.and_return(OpenStruct.new(:url => "/successful_redirect"))
+
+      visit '/posts/stream_with_custom_url.xlsx'
+      page.should have_content("OK")
+    end
+  end
 end

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

@@ -2,11 +2,20 @@ class PostsController < ApplicationController
   respond_to :csv, :xls, :xlsx, :html
 
   def index
-    respond_with(Post.all, :columns => export_attributes)
+    respond_with(Post.all,
+      :columns => export_attributes)
   end
 
   def stream
-    respond_with(Post.all, :stream => true, :columns => export_attributes)
+    respond_with(Post.all,
+      :stream => true,
+      :columns => export_attributes)
+  end
+
+  def stream_with_custom_url
+    respond_with(Post.all,
+      :stream => "/successful_redirect",
+      :columns => export_attributes)
   end
 
   # Used for stub/mocking a redirect request

data/spec/test_app/config/routes.rb

@@ -2,6 +2,7 @@ TestApp::Application.routes.draw do
   resources :posts do
     collection do
       get "stream"
+      get "stream_with_custom_url"
     end
   end
   get "successful_redirect" => "posts#successful_redirect"

data/spec/test_app/db/schema.rb

@@ -0,0 +1,28 @@
+# encoding: UTF-8
+# This file is auto-generated from the current state of the database. Instead
+# of editing this file, please use the migrations feature of Active Record to
+# incrementally modify your database, and then regenerate this schema definition.
+#
+# Note that this schema.rb definition is the authoritative source for your
+# database schema. If you need to create the application database on another
+# system, you should be using db:schema:load, not running all the migrations
+# from scratch. The latter is a flawed and unsustainable approach (the more migrations
+# you'll amass, the slower it'll run and the greater likelihood for issues).
+#
+# It's strongly recommended that you check this file into your version control system.
+
+ActiveRecord::Schema.define(version: 20120717192452) do
+
+  create_table "posts", force: true do |t|
+    t.string   "title"
+    t.integer  "visits"
+    t.float    "conversion_rate"
+    t.date     "published_on"
+    t.datetime "expired_at"
+    t.boolean  "published"
+    t.datetime "unix_timestamp"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudxls-rails
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-20 00:00:00.000000000 Z
+date: 2013-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cloudxls
@@ -162,6 +162,7 @@ files:
 - spec/test_app/config/locales/en.yml
 - spec/test_app/config/routes.rb
 - spec/test_app/db/migrate/20120717192452_create_posts.rb
+- spec/test_app/db/schema.rb
 - spec/test_app/lib/assets/.gitkeep
 - spec/test_app/log/.gitkeep
 - spec/test_app/public/404.html
@@ -233,6 +234,7 @@ test_files:
 - spec/test_app/config/locales/en.yml
 - spec/test_app/config/routes.rb
 - spec/test_app/db/migrate/20120717192452_create_posts.rb
+- spec/test_app/db/schema.rb
 - spec/test_app/lib/assets/.gitkeep
 - spec/test_app/log/.gitkeep
 - spec/test_app/public/404.html