cloudxls-rails 0.4.1 → 0.4.2

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

@@ -1,6 +1,6 @@
-# CloudXLSRails::CSVStream
+# CloudXLSRails::CSVResponder
 module CloudXLSRails
-  class CSVStream
+  class CSVResponder
     def initialize(controller, stream)
       @controller = controller
       @stream = stream
@@ -36,7 +36,7 @@ ActionController::Renderers.add :csv do |scope, options|
   columns  = options[:columns]
 
   if options[:stream] == true
-    CloudXLSRails::CSVStream.stream!(self, scope, options)
+    CloudXLSRails::CSVResponder.stream!(self, scope, options)
   else # no stream:
     data = CloudXLS::CSVWriter.text(scope, {:columns => columns})
 
@@ -49,7 +49,7 @@ end
 class ActionController::Responder
   def to_csv
     if options[:stream] == true
-      CloudXLSRails::CSVStream.stream!(controller, resources.last, options)
+      CloudXLSRails::CSVResponder.stream!(controller, resources.last, options)
     else
       controller.render({:csv => resources.last, :stream => false }.merge(options))
     end

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

@@ -2,24 +2,27 @@ unless defined? Mime::XLS
   Mime::Type.register "application/vnd.ms-excel", :xls
 end
 
-
-ActionController::Renderers.add :xls do |scope, options|
-  columns  = options.fetch(:columns, nil)
-
-  xdata = options[:data] || {}
-  unless (xdata.has_key?(:text) ||
-          xdata.has_key?(:url ) ||
-          xdata.has_key?(:file)  )
-
-    xdata[:text] = CloudXLS::CSVWriter.text(scope, {:columns => columns})
+# CloudXLSRails::XLSResponder
+module CloudXLSRails
+  class XLSResponder
+    def self.redirect!(controller, scope, options)
+      columns  = options.fetch(:columns, nil)
+      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)
+      controller.redirect_to response.url
+    end
   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
 
 
@@ -30,6 +33,6 @@ class ActionController::Responder
       options[:data] ||= {}
       options[:data][:url] ||= controller.request.url.gsub(/xls\Z/, "csv")
     end
-    controller.render({:xls => resources.last  }.merge(options))
+    CloudXLSRails::XLSResponder.redirect!(controller, resources.last, options)
   end
 end

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

@@ -2,26 +2,31 @@ unless defined? Mime::XLSX
   Mime::Type.register "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", :xlsx
 end
 
-ActionController::Renderers.add :xlsx do |scope, options|
-  columns  = options.fetch(:columns, nil)
+# CloudXLSRails::XLSResponder
+module CloudXLSRails
+  class XLSXResponder
+    def self.redirect!(controller, scope, options)
+      columns  = options.fetch(:columns, nil)
+      xdata = options[:data] || {}
+      unless (xdata.has_key?(:text) ||
+              xdata.has_key?(:url ) ||
+              xdata.has_key?(:file)  )
 
-  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
 
-    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'
+      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
+      response = CloudXLS.xpipe(xopts)
+      controller.redirect_to response.url
+    end
+  end
 end
 
+
 # For respond_to default
 class ActionController::Responder
   def to_xlsx
@@ -29,6 +34,6 @@ class ActionController::Responder
       options[:data] ||= {}
       options[:data][:url] ||= controller.request.url.gsub(/xlsx\Z/, "csv")
     end
-    controller.render({:xlsx => resources.last }.merge(options))
+    CloudXLSRails::XLSXResponder.redirect!(controller, resources.last, options)
   end
 end

data/lib/cloudxls-rails/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudxls-rails
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
   prerelease: 
 platform: ruby
 authors: