listings 0.1.14 → 0.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4591a7706b0590ae7a1958eb970989b111ddd602
-  data.tar.gz: 9d77ce4ae69577c507ebce9ad93eaf1383dbb794
+  metadata.gz: 22306e285b8f18877c6d47cc742bfa3cb284c4ac
+  data.tar.gz: f402374e22a72800dfef55e6a8d65fabc2c17a69
 SHA512:
-  metadata.gz: d0da43eddc770ae15ad49502830922bc4f5592be2135fe888c4a24549ca66a592deef3c8982bfb1ff0db6c7f4bbec4d9c601d70d3218e610717e3806f6bfb812
-  data.tar.gz: a2f408023fbe5f2a6fca0615ebeeeedd75be2e129c40bb2ecaa02318af7465a50c025bfc09f2c6d3caf6afcf6e6d532401197f8603bf2073babd59d8fecb186c
+  metadata.gz: e0dac07fedd6ef74330151646a991720ded9b0ff2cdb8f7059cfcf0d0d3e62a8a44176a95a9abee7a37e2665662a071670aedf1e7358066fdcdc90858d9248a6
+  data.tar.gz: bf3482c5505d5bce1c903e65cb29dace7917f8fbf60f4629ded558e24cab4d2a2b14a352b8d29f9d9f2d624324254e9be50caf8c34424acf03f3107bdf2fbc80

data/app/controllers/listings/listings_controller.rb

@@ -21,10 +21,7 @@ module Listings
 
       respond_to do |format|
         format.csv { @listing.send_csv(self) }
-        format.xls do
-          headers["Content-Disposition"] = "attachment; filename=\"#{@listing.export_filename(:xls)}\""
-          render 'listings/export'
-        end
+        format.xls { @listing.send_xls(self) }
       end
     ensure
       Kaminari::Helpers::Tag.paginate_with_listings(nil)

data/app/views/listings/export.xls.erb

@@ -11,7 +11,7 @@
           <Cell><Data ss:Type="String"><%= col.human_name %></Data></Cell>
         <% end %>
       </Row>
-    <% @listing.items.each do |item| %>
+    <% @listing.export_each do |item| %>
       <Row>
         <% @listing.columns.each do |col| %>
           <% col.value_for(item).tap do |value| %>

data/lib/listings/base.rb

@@ -177,6 +177,12 @@ module Listings
       (params[:format] || :html).to_sym
     end
 
+    def export_each
+      self.items.each do |item|
+        yield item
+      end
+    end
+
     def send_csv(controller)
       csv_filename = self.export_filename(:csv)
 
@@ -190,7 +196,7 @@ module Listings
       controller.response_body = Enumerator.new do |lines|
         lines << self.columns.map { |c| c.human_name }.to_csv
 
-        self.items.find_each do |item|
+        self.export_each do |item|
           row = []
           self.columns.each do |col|
             row << col.value_for(item)
@@ -200,6 +206,11 @@ module Listings
       end
     end
 
+    def send_xls(controller)
+      controller.headers["Content-Disposition"] = %(attachment; filename="#{self.export_filename(:xls)}")
+      controller.render 'listings/export'
+    end
+
     def method_missing(m, *args, &block)
       view_context.send(m, *args, &block)
     end

data/lib/listings/version.rb

@@ -1,3 +1,3 @@
 module Listings
-  VERSION = "0.1.14"
+  VERSION = "0.1.15"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: listings
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.15
 platform: ruby
 authors:
 - Brian J. Cardiff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-25 00:00:00.000000000 Z
+date: 2021-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails