activeadmin-xls 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0061e54090d183ee6259739d20d7db62eb890790
-  data.tar.gz: 7691fe01a10bcdd3aac3239f690ae98f95258460
+  metadata.gz: d5dcd598421b522ad83b3ddd1a1a038b3d173f3e
+  data.tar.gz: c882e40a69baa02ef345c31001f77b5f2b291652
 SHA512:
-  metadata.gz: 522ac0e6309ad124d216acdd64228efec606836dd75369f90b9f8e2e806e017c658190a841c56bf54b3e77fe72bd3b5cac00be571db3602745a22f432855f33d
-  data.tar.gz: ffab449bd41cfb19b97d5b879d656f531a2cde929e98a5188b90765a5bce506200fd328f3f49a1ce4819d8837c8d5e994839abf4a36bd3c8e2dc1cbff97d1990
+  metadata.gz: 5909fa865c0f9664b61d7771215faaf2695e2b6fe72c8de21b61d5286ba1c7213496d1271057ab9df6579f265e3203f0e40ccb9b7ca5ca227e0493709801e53c
+  data.tar.gz: 10ea87bd2f9c629b4c4f5acf58f37dcb89f2c8f263e58ba6b12c840d70b80922e00bc65af457495d08bfef5deff3d2b3278e442eb6ce443166b8b531e378f991

data/CHANGELOG.md

@@ -2,6 +2,19 @@
 
 ## [Unreleased]
 
+## 2.0.1
+
+### Fixed
+
+* fix issue with xls_builder retaining data between requests when there is an exception on a computed field [#13][]
+
+## 2.0.0
+
+### Changed
+
+* Drop support for ruby 1.9, rails 3.2, and ActiveAdmin 0.6.6.
+* Add support for rails 5.1 [#8][]
+
 ## 1.1.0
 
 ### Added
@@ -45,7 +58,9 @@
 [#3]: https://github.com/thambley/activeadmin-xls/issues/3
 [#4]: https://github.com/thambley/activeadmin-xls/pull/4
 [#7]: https://github.com/thambley/activeadmin-xls/issues/7
+[#8]: https://github.com/thambley/activeadmin-xls/issues/8
 [#11]: https://github.com/thambley/activeadmin-xls/pull/11
+[#13]: https://github.com/thambley/activeadmin-xls/issues/13
 
 [@rewritten]: https://github.com/rewritten
 [@ejaypcanaria]: https://github.com/ejaypcanaria

data/Gemfile

@@ -4,7 +4,7 @@ gem 'spreadsheet', '~> 1.1', '>= 1.1.4'
 
 group :development, :test do
   gem 'rails-i18n' # Gives us default i18n for many languages
-  gem 'sqlite3'
+  gem 'sqlite3', '~> 1.3.0'
   gem 'yard'
 end
 

data/lib/active_admin/xls/builder.rb

@@ -10,7 +10,7 @@ module ActiveAdmin
       # @param [Class] resource_class The resource this builder generate column
       #   information for.
       # @param [Hash] options the options for the builder
-      # @option options [Hash] :header_format a hash of format properties to
+      # @option options [Hash] :header_format A hash of format properties to
       #   apply to the header row. Any properties specified will be merged with
       #   the default header styles.
       # @option options [Array] :i18n_scope the I18n scope to use when looking
@@ -264,11 +264,13 @@ module ActiveAdmin
       def serialize(collection, view_context = nil)
         @collection = collection
         @view_context = view_context
+        book = Spreadsheet::Workbook.new
+        sheet = book.create_worksheet
         load_columns unless @columns_loaded
-        apply_filter @before_filter
-        export_collection(collection)
-        apply_filter @after_filter
-        to_stream
+        apply_filter @before_filter, sheet
+        export_collection collection, sheet
+        apply_filter @after_filter, sheet
+        to_stream book
       end
 
       # Xls column information
@@ -314,18 +316,13 @@ module ActiveAdmin
         columns
       end
 
-      def to_stream
+      def to_stream(book)
         stream = StringIO.new('')
         book.write stream
-        clean_up
         stream.string
       end
 
-      def clean_up
-        @book = @sheet = nil
-      end
-
-      def export_collection(collection)
+      def export_collection(collection, sheet)
         return if columns.none?
         row_index = sheet.dimensions[1]
 
@@ -354,7 +351,7 @@ module ActiveAdmin
         end.compact
       end
 
-      def apply_filter(filter)
+      def apply_filter(filter, sheet)
         filter.call(sheet) if filter
       end
 
@@ -376,14 +373,6 @@ module ActiveAdmin
         resource.respond_to?(column.name)
       end
 
-      def sheet
-        @sheet ||= book.create_worksheet
-      end
-
-      def book
-        @book ||= ::Spreadsheet::Workbook.new
-      end
-
       def resource_columns(resource)
         [Column.new(:id)] + resource.content_columns.map do |column|
           Column.new(column.name.to_sym)

data/lib/active_admin/xls/resource_controller_extension.rb

@@ -51,8 +51,6 @@ module ActiveAdmin
       end
 
       # Returns the collection to use when generating an xls file.
-      # It uses the find_collection function if it is available, and uses
-      # collection if find_collection isn't available.
       def xls_collection
         find_collection except: :pagination
       end

data/lib/active_admin/xls/version.rb

@@ -1,6 +1,6 @@
 module ActiveAdmin
   module Xls
     # ActiveAdmin XLS gem version
-    VERSION = '2.0.0'.freeze
+    VERSION = '2.0.1'.freeze
   end
 end

data/spec/support/rails_template.rb

@@ -93,8 +93,8 @@ inject_into_file(
   after: "config.cache_classes = true\n"
 )
 
-lib_path = File.expand_path('../../../lib/activeadmin-xls', __FILE__)
 # Add our local Active Admin to the load path
+lib_path = File.expand_path('../../../lib/activeadmin-xls', __FILE__)
 inject_into_file 'config/environment.rb',
                  "\nrequire '#{lib_path}'\n",
                  after: "require File.expand_path('../application', __FILE__)"

data/spec/xls/unit/builder_spec.rb

@@ -84,12 +84,7 @@ module ActiveAdmin
         end
 
         before do
-          # disable clean up so we can get the book.
-          allow(builder).to receive(:clean_up) { false }
-          # @book = Spreadsheet.open(builder.serialize(posts))
-          builder.serialize(posts)
-          @book = builder.send(:book)
-          @collection = builder.collection
+          @book = Spreadsheet.open(StringIO.new(builder.serialize(posts)))
         end
 
         it 'does not serialize the header' do
@@ -113,12 +108,7 @@ module ActiveAdmin
         end
 
         before do
-          allow(User).to receive(:all) { users }
-          allow(Post).to receive(:all) { posts }
-          # disable clean up so we can get the book.
-          allow(builder).to receive(:clean_up) { false }
-          builder.serialize(Post.all)
-          @book = builder.send(:book)
+          @book = Spreadsheet.open(StringIO.new(builder.serialize(posts)))
           @collection = builder.collection
         end
 
@@ -173,10 +163,7 @@ module ActiveAdmin
           @post = Post.create!(title: 'bob',
                                body: 'is a swell guy',
                                author: @user)
-          # disable clean up so we can get the book.
-          allow(builder).to receive(:clean_up) { false }
-          builder.serialize(Post.all)
-          @book = builder.send(:book)
+          @book = Spreadsheet.open(StringIO.new(builder.serialize(Post.all)))
           @collection = builder.collection
         end
 
@@ -209,6 +196,48 @@ module ActiveAdmin
           expect(@book.worksheets.first.last_row[0]).to eq('Set In Proc nancy')
         end
       end
+
+      ################################
+      context 'Sheet generation with a exceptions.' do
+        let!(:users) { [User.new(first_name: 'bob', last_name: 'nancy')] }
+
+        let!(:posts) do
+          [Post.new(title: 'bob', body: 'is a swell guy', author: users.first)]
+        end
+
+        let!(:exposts) do
+          [Post.new(title: 'sal', body: 'is a swell guy', author: users.first),
+           Post.new(title: 'err', body: 'is a swell guy', author: users.first)]
+        end
+
+        let!(:builder) do
+          Builder.new(Post, header_style: {}, i18n_scope: %i[xls post]) do
+            delete_columns :id, :created_at, :updated_at
+            column(:author) do |resource|
+              raise 'err' if resource.title == 'err'
+              "#{resource.author.first_name} #{resource.author.last_name}"
+            end
+          end
+        end
+
+        before do
+          begin
+            @book1 = Spreadsheet.open(StringIO.new(builder.serialize(exposts)))
+          rescue StandardError => err
+            raise unless err.message == 'err'
+          end
+          @book2 = Spreadsheet.open(StringIO.new(builder.serialize(posts)))
+          @collection = builder.collection
+        end
+
+        it 'does not contain data from other collections with errors' do
+          sheet = @book2.worksheets.first
+          expect(sheet.dimensions[1]).to eq(2)
+          expect(sheet[0, 0]).to eq('Title')
+          expect(sheet[1, 0]).to eq(@collection.first.title)
+        end
+      end
+      ################################
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin-xls
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Todd Hambley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-07 00:00:00.000000000 Z
+date: 2019-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeadmin
@@ -44,8 +44,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-description: |2
-    This gem provides excel/xls downloads for resources in Active Admin.
+description: "  This gem provides excel/xls downloads for resources in Active Admin.\n"
 email: thambley@travelleaders.com
 executables: []
 extensions: []
@@ -105,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.2
+rubygems_version: 2.6.14.1
 signing_key: 
 specification_version: 4
 summary: Adds excel (xls) downloads for resources within the Active Admin framework.