Made collection available to before and after filters.

Author: randym

.bundle/config

@@ -1,2 +1 @@
----
-BUNDLE_DISABLE_SHARED_GEMS: '1'
+--- {}

.gitignore

@@ -2,3 +2,7 @@ spec/rails
 *.gem
 coverage
 *.xlsx
+doc
+*.un~
+.yardoc
+.rbenv-version

.yardops

@@ -0,0 +1 @@
+--no-private --protected app/**/*.rb - README.md LEGAL

Gemfile

@@ -4,7 +4,7 @@ gemspec
 
 group :development, :test do
   gem 'sqlite3'
-  gem 'rake',           '~> 0.9.6', :require => false
+  gem 'rake',           '~> 10.0.4', :require => false
   gem 'haml',           '~> 3.1.1', :require => false
   gem 'yard'
   gem 'rdiscount' # For yard

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    activeadmin-axlsx (2.1.1)
+    activeadmin-axlsx (2.1.2)
       activeadmin (~> 0.6.0)
       axlsx
 
@@ -183,7 +183,7 @@ GEM
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
-    rake (0.9.6)
+    rake (10.0.4)
     rdiscount (1.6.8)
     rdoc (3.12)
       json (~> 1.4)
@@ -236,7 +236,7 @@ GEM
     websocket (1.0.3)
     xpath (0.1.4)
       nokogiri (~> 1.3)
-    yard (0.8.3)
+    yard (0.8.6.1)
 
 PLATFORMS
   ruby
@@ -255,7 +255,7 @@ DEPENDENCIES
   jslint_on_rails (~> 1.0.6)
   launchy
   rails-i18n
-  rake (~> 0.9.6)
+  rake (~> 10.0.4)
   rdiscount
   rspec-mocks
   rspec-rails (~> 2.9.0)

README.md

@@ -20,22 +20,22 @@ appreciation for the gem, please don't hesitate to make a donation.
 
 **License**: MIT License
 
-**Latest Version**: 2.0.1
+**Latest Version**: 2.1.2
 
-**Ruby Version**: 1.9.2, 1.9.3
+**Ruby Version**: 1.9.2, 1.9.3, 2.0.0
 
 **JRuby Version**: 1.9 mode
 
 **Rubinius Version**: rubinius 2.0.0dev * lower versions may run, this gem always tests against head.
 
-**Release Date**: TBA
+**Release Date**: 2013.06.02
 
 Synopsis
 --------
 
 This gem provides automatic OOXML (xlsx) downloads for Active Admin
 resources. It lets you harness the full power of Axlsx when you want to
-but for the most part just stays out of your way and adds a link next to 
+but for the most part just stays out of your way and adds a link next to
 the csv download for xlsx (Excel/numbers/Libre Office/Google Docs)
 
 ![Screen 1](https://github.com/randym/activeadmin-axlsx/raw/master/screen_capture.png)
@@ -53,7 +53,7 @@ Cool Toys
 ---------
 
 Here are a few quick examples of things you can easily tweak.
-Axlsx supports A LOT of the specification so if you are looking to do 
+Axlsx supports A LOT of the specification so if you are looking to do
 something adventurous please ping me on irc. (freenode#axlsx)
 
 ##localize column headers
@@ -71,7 +71,7 @@ end
 #app/admin/posts.rb
 ActiveAdmin.register Post do
   config.xlsx_builder.column('author_name') do |resource|
-    resource.author.name 
+    resource.author.name
   end
 end
 ```
@@ -98,22 +98,22 @@ end
 #Using the DSL
 
 Everything that you do with the config'd default builder can be done via
-the resource DSL. 
+the resource DSL.
 
 Below is an example of the DSL
 
 ```ruby
 ActiveAdmin.register Post do
   # i18n_scope and header style are set via options
-  xlsx(:i18n_scope => [:active_admin, :axlsx, :post], 
+  xlsx(:i18n_scope => [:active_admin, :axlsx, :post],
        :header_style => {:bg_color => 'FF0000', :fg_color => 'FF' }) do
 
     # deleting columns from the report
     delete_columns :id, :created_at, :updated_at
 
     # adding a column to the report
     column(:author) { |resource| "#{resource.author.first_name} #{resource.author.last_name}" }
-    
+
     # creating a chart and inserting additional data with after_filter
     after_filter { |sheet|
       sheet.add_row []
@@ -145,7 +145,7 @@ end
 #Specs
 ------
 Running specs for this gem requires that you construct a rails application.
-To execute the specs, navigate to the gem directory, 
+To execute the specs, navigate to the gem directory,
 run bundle install and run these to rake tasks:
 
 ```
@@ -156,8 +156,14 @@ bundle exec rake setup
 bundle exec rake
 ```
 # Changelog
+**2013.06.02** Release 2.1.2
+  - builder#collection is now set on serialize and is available in before and after filters.
+  - Code cleanup
+**2013.04.18** Release 2.1.1
+  - Fixed issue with repeating data in sheets across downloads
+  - Updated to use activeadmin 0.6.0+ which supports plugins.
 **2013.03.21** Release 2.0.1
-  - Fixed an issue with missing objects when using the DSL. 
+  - Fixed an issue with missing objects when using the DSL.
     Huge thanks to [Fivell](https://github.com/Fivell)
 **2012.11.29** Release 2.0.0
   - resouce content column are now pre-populated.

activeadmin-axlsx.gemspec

@@ -8,13 +8,15 @@ Gem::Specification.new do |s|
   s.homepage   	= 'https://github.com/randym/activeadmin-axlsx'
   s.platform    = Gem::Platform::RUBY
   s.date        = Time.now.strftime('%Y-%m-%d')
+  s.license     = 'MIT'
   s.summary     = "Adds excel downloads for resources within the Active Admin framework via Axlsx."
   s.description = <<-eof
   This gem uses axlsx to provide excel/xlsx downloads for resources in Active Admin. Often, users are happier with excel, so why not give it to them instead of CSV?
   eof
   s.files       = `git ls-files`.split("\n").sort 
-  s.test_files    = `git ls-files -- {spec}/*`.split("\n")
+  s.test_files  = `git ls-files -- {spec}/*`.split("\n")
   s.test_files  = Dir.glob("{spec/**/*}")
+
   s.add_runtime_dependency 'activeadmin', "~> 0.6.0"
   s.add_runtime_dependency 'axlsx'
 

lib/active_admin/axlsx.rb

@@ -1,10 +1,10 @@
 require 'active_admin'
-require 'active_admin/axlsx/build_download_format_links'
 require 'active_admin/axlsx/version'
 require 'active_admin/axlsx/builder'
 require 'active_admin/axlsx/dsl'
 require 'active_admin/axlsx/resource_extension'
 require 'active_admin/axlsx/resource_controller_extension'
+
 class Railtie < ::Rails::Railtie
   config.before_initialize do
     begin

lib/active_admin/axlsx/build_download_format_links.rb

@@ -89,7 +89,12 @@ def before_filter(&block)
       # The columns this builder will be serializing
       attr_reader :columns
 
-      # removes all columns from the builder. This is useful when you want to 
+      # The collection we are serializing.
+      # @note This is only available after serialize has been called,
+      # and is reset on each subsequent call.
+      attr_reader :collection
+
+      # removes all columns from the builder. This is useful when you want to
       # only render specific columns. To remove specific columns use ignore_column.
       def clear_columns
         @columns = []
@@ -112,6 +117,7 @@ def delete_columns(*column_names)
       # Serializes the collection provided
       # @return [Axlsx::Package]
       def serialize(collection)
+        @collection = collection
         apply_filter @before_filter
         export_collection(collection)
         apply_filter @after_filter

lib/active_admin/axlsx/builder.rb

@@ -1,5 +1,5 @@
 module ActiveAdmin
   module Axlsx
-    VERSION = '2.1.1'
+    VERSION = '2.1.2'
   end
 end

lib/active_admin/axlsx/version.rb

@@ -76,6 +76,7 @@ module Axlsx
               end
             }
             before_filter do |sheet|
+              collection.first.author.first_name = 'Set In Proc'
               sheet.add_row ['Created', Time.zone.now]
               sheet.add_row []
             end
@@ -89,6 +90,11 @@ module Axlsx
           builder.stub(:clean_up) { false }
           builder.serialize(Post.all)
           @package = builder.send(:package)
+          @collection = builder.collection
+        end
+
+        it 'provides the collection object' do
+          @collection.count.should == Post.all.count
         end
 
         it 'merges our customizations with the default header style' do
@@ -109,6 +115,11 @@ module Axlsx
         it 'processes the before filter' do
           @package.workbook.worksheets.first["A1"].value.should == 'Created'
         end
+
+        it 'lets us work against the collection in the before filter' do
+          @package.workbook.worksheets.first.rows.last.cells.first.value.should == 'Set In Proc nancy'
+        end
+
         it 'processes the after filter' do
           @package.workbook.charts.size.should == 1
         end