activeadmin-axlsx 1.0.0 → 2.0.0

data/.gitignore

@@ -1 +1,4 @@
 spec/rails
+*.gem
+coverage
+*.xlsx

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--format documentation

data/Gemfile

@@ -1,10 +1,9 @@
 source 'https://rubygems.org'
-
+gem 'axlsx'
 gemspec
-gem 'activeadmin'
+
 group :development, :test do
   gem 'sqlite3'
-
   gem 'rake',           '~> 0.9.2.2', :require => false
   gem 'haml',           '~> 3.1.1', :require => false
   gem 'yard'
@@ -12,10 +11,11 @@ group :development, :test do
   gem "sprockets"
   gem 'rails-i18n' # Gives us default i18n for many languages
 end
-
+gem 'simplecov', :require => false, :group => :test
 group :test do
   gem 'inherited_resources'
   gem 'sass-rails'
+  gem 'rspec-mocks'
   gem 'rspec-rails',    '~> 2.9.0'
   gem 'cucumber-rails', '1.2.1', :require => false
   gem 'capybara',       '1.1.2'

data/Gemfile.lock

@@ -1,26 +1,26 @@
 PATH
   remote: .
   specs:
-    activeadmin-axlsx (1.0.0)
+    activeadmin-axlsx (2.0.0)
       activeadmin (>= 0.5.0)
       axlsx
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (3.2.8)
-      actionpack (= 3.2.8)
+    actionmailer (3.2.9)
+      actionpack (= 3.2.9)
       mail (~> 2.4.4)
-    actionpack (3.2.8)
-      activemodel (= 3.2.8)
-      activesupport (= 3.2.8)
+    actionpack (3.2.9)
+      activemodel (= 3.2.9)
+      activesupport (= 3.2.9)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.4)
       rack (~> 1.4.0)
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
-      sprockets (~> 2.1.3)
+      sprockets (~> 2.2.1)
     activeadmin (0.5.0)
       arbre (>= 1.0.1)
       bourbon (>= 1.0.0)
@@ -33,18 +33,18 @@ GEM
       meta_search (>= 0.9.2)
       rails (>= 3.0.0)
       sass (>= 3.1.0)
-    activemodel (3.2.8)
-      activesupport (= 3.2.8)
+    activemodel (3.2.9)
+      activesupport (= 3.2.9)
       builder (~> 3.0.0)
-    activerecord (3.2.8)
-      activemodel (= 3.2.8)
-      activesupport (= 3.2.8)
+    activerecord (3.2.9)
+      activemodel (= 3.2.9)
+      activesupport (= 3.2.9)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.8)
-      activemodel (= 3.2.8)
-      activesupport (= 3.2.8)
-    activesupport (3.2.8)
+    activeresource (3.2.9)
+      activemodel (= 3.2.9)
+      activesupport (= 3.2.9)
+    activesupport (3.2.9)
       i18n (~> 0.6)
       multi_json (~> 1.0)
     addressable (2.3.2)
@@ -56,8 +56,9 @@ GEM
       nokogiri (>= 1.4.1)
       rubyzip (>= 0.9.5)
     bcrypt-ruby (3.0.1)
-    bourbon (2.1.1)
-      sass (>= 3.1)
+    bourbon (2.1.2)
+      sass (>= 3.2)
+      thor
     builder (3.0.4)
     capybara (1.1.2)
       mime-types (>= 1.16)
@@ -84,13 +85,13 @@ GEM
       cucumber (>= 1.1.3)
       nokogiri (>= 1.5.0)
     database_cleaner (0.9.1)
-    debugger (1.2.1)
+    debugger (1.2.2)
       columnize (>= 0.3.1)
       debugger-linecache (~> 1.1.1)
-      debugger-ruby_core_source (~> 1.1.4)
+      debugger-ruby_core_source (~> 1.1.5)
     debugger-linecache (1.1.2)
       debugger-ruby_core_source (>= 1.1.1)
-    debugger-ruby_core_source (1.1.4)
+    debugger-ruby_core_source (1.1.5)
     devise (2.1.2)
       bcrypt-ruby (~> 3.0)
       orm_adapter (~> 0.1)
@@ -101,17 +102,17 @@ GEM
     execjs (1.4.0)
       multi_json (~> 1.0)
     fastercsv (1.5.5)
-    ffi (1.1.5)
+    ffi (1.2.0)
     formtastic (2.2.1)
       actionpack (>= 3.0)
     gherkin (2.11.5)
       json (>= 1.4.6)
-    guard (1.5.1)
+    guard (1.5.4)
       listen (>= 0.4.2)
       lumberjack (>= 1.0.2)
       pry (>= 0.9.10)
       thor (>= 0.14.6)
-    guard-coffeescript (1.2.0)
+    guard-coffeescript (1.2.1)
       coffee-script (>= 2.2.0)
       guard (>= 1.1.0)
     guard-rspec (1.2.1)
@@ -141,8 +142,8 @@ GEM
       activesupport (>= 3.0.0)
     launchy (2.1.2)
       addressable (~> 2.3)
-    libwebsocket (0.1.5)
-      addressable
+    libwebsocket (0.1.6.1)
+      websocket
     listen (0.5.3)
     lumberjack (1.0.2)
     mail (2.4.4)
@@ -156,7 +157,7 @@ GEM
       polyamorous (~> 0.5.0)
     method_source (0.8.1)
     mime-types (1.19)
-    multi_json (1.3.6)
+    multi_json (1.3.7)
     nokogiri (1.5.5)
     orm_adapter (0.4.0)
     polyamorous (0.5.0)
@@ -173,19 +174,19 @@ GEM
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.8)
-      actionmailer (= 3.2.8)
-      actionpack (= 3.2.8)
-      activerecord (= 3.2.8)
-      activeresource (= 3.2.8)
-      activesupport (= 3.2.8)
+    rails (3.2.9)
+      actionmailer (= 3.2.9)
+      actionpack (= 3.2.9)
+      activerecord (= 3.2.9)
+      activeresource (= 3.2.9)
+      activesupport (= 3.2.9)
       bundler (~> 1.0)
-      railties (= 3.2.8)
+      railties (= 3.2.9)
     rails-i18n (0.7.0)
       i18n (~> 0.5)
-    railties (3.2.8)
-      actionpack (= 3.2.8)
-      activesupport (= 3.2.8)
+    railties (3.2.9)
+      actionpack (= 3.2.9)
+      activesupport (= 3.2.9)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
@@ -210,31 +211,37 @@ GEM
       railties (>= 3.0)
       rspec (~> 2.9.0)
     rubyzip (0.9.9)
-    sass (3.2.1)
+    sass (3.2.3)
     sass-rails (3.2.5)
       railties (~> 3.2.0)
       sass (>= 3.1.10)
       tilt (~> 1.3)
-    selenium-webdriver (2.25.0)
+    selenium-webdriver (2.26.0)
       childprocess (>= 0.2.5)
       libwebsocket (~> 0.1.3)
       multi_json (~> 1.0)
       rubyzip
     shoulda-matchers (1.0.0)
+    simplecov (0.7.1)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.7.1)
+    simplecov-html (0.7.1)
     slop (3.3.3)
-    sprockets (2.1.3)
+    sprockets (2.2.1)
       hike (~> 1.2)
+      multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
     sqlite3 (1.3.6)
     thor (0.16.0)
     tilt (1.3.3)
-    treetop (1.4.11)
+    treetop (1.4.12)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.34)
+    tzinfo (0.3.35)
     warden (1.2.1)
       rack (>= 1.0)
+    websocket (1.0.3)
     xpath (0.1.4)
       nokogiri (~> 1.3)
     yard (0.8.3)
@@ -243,8 +250,8 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  activeadmin
   activeadmin-axlsx!
+  axlsx
   capybara (= 1.1.2)
   cucumber-rails (= 1.2.1)
   database_cleaner
@@ -259,9 +266,11 @@ DEPENDENCIES
   rails-i18n
   rake (~> 0.9.2.2)
   rdiscount
+  rspec-mocks
   rspec-rails (~> 2.9.0)
   sass-rails
   shoulda-matchers (= 1.0.0)
+  simplecov
   sprockets
   sqlite3
   yard

data/README.md

@@ -1,7 +1,7 @@
 Active Admin Axlsx: Office Open XML Spreadsheet Export for Active Admin
 ====================================
 
-If you are using this for comercial purposes, or just want to show your
+If you are using this for commercial purposes, or just want to show your
 appreciation for the gem, please don't hesitate to make a donation.
 
 [![Click here to lend your support to: axlsx and make a donation at www.pledgie.com !](http://www.pledgie.com/campaigns/17814.png?skin_name=chrome)](http://www.pledgie.com/campaigns/17814)
@@ -38,12 +38,10 @@ 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 
 the csv download for xlsx (Excel/numbers/Libre Office/Google Docs)
 
-git ls-files -- {test,spec,features}/*
-
 ![Screen 1](https://github.com/randym/activeadmin-axlsx/raw/master/screen_capture.png)
 
 Usage example:
-Simple add the following to your gemfile and you are good to go.
+Simply add the following to your Gemfile and you are good to go.
 All resource index views will now include a link for download directly
 to xlsx.
 
@@ -62,7 +60,7 @@ something adventurous please ping me on irc. (freenode#axlsx)
 
 ```ruby
 #app/admin/posts.rb
-ActiveAdmin.register Posts do
+ActiveAdmin.register Post do
   config.xlsx_builder.i18n_scope [:active_record, :models, :posts]
 end
 ```
@@ -71,7 +69,7 @@ end
 
 ```ruby
 #app/admin/posts.rb
-ActiveAdmin.register Posts do
+ActiveAdmin.register Post do
   config.xlsx_builder.column('author_name') do |resource|
     resource.author.name 
   end
@@ -82,12 +80,68 @@ end
 
 ```ruby
 #app/admin/posts.rb
-ActiveAdmin.register Posts do
+ActiveAdmin.register Post do
   config.xlsx_builder.header_style = { :bg_color => 'FF0000',
                                        :fg_color => 'FF' }
 end
 ```
 
+##Remove columns
+
+```ruby
+#app/admin/posts.rb
+ActiveAdmin.register Post do
+  config.xlsx_builder.delete_columns :id, :created_at, :updated_at
+end
+```
+
+#Using the DSL
+
+Everything that you do with the config'd default builder can be done via
+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], 
+       :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 []
+      sheet.add_row ['Author Name', 'Number of Posts']
+      data = []
+      labels = []
+      User.all.each do |user|
+        data << user.posts.size
+        labels << "#{user.first_name} #{user.last_name}"
+        sheet.add_row [labels.last, data.last]
+      end
+      chart_color =  %w(88F700 279CAC B2A200 FD66A3 F20062 C8BA2B 67E6F8 DFFDB9 FFE800 B6F0F8)
+      sheet.add_chart(::Axlsx::Pie3DChart, :title => "post by author") do |chart|
+        chart.add_series :data => data, :labels => labels, :colors => chart_color
+        chart.start_at 4, 0
+        chart.end_at 7, 20
+      end
+    }
+
+    # iserting data with before_filter
+    before_filter do |sheet|
+      sheet.add_row ['Created', Time.zone.now]
+      sheet.add_row []
+    end
+  end
+end
+```
+
 #Specs
 ------
 Running specs for this gem requires that you construct a rails application.
@@ -101,6 +155,15 @@ bundle exec rake setup
 ```
 bundle exec rake
 ```
+# Changelog
+**2012.11.29** Release 2.0.0
+  - resouce content column are now pre-populated.
+  - added before and after filters
+  - 100% spec coverage
+
+**2012.11.16**
+  - Fixed DSL referencing
+  - Added delete_columns to builder and DSL
 
 #Copyright and License
 ----------

data/Rakefile

@@ -21,4 +21,3 @@ desc "build and release the gem"
 task :release => :build do
   system "gem push activeadmin-axlsx-#{ActiveAdmin::Axlsx::VERSION}.gem"
 end
-  

data/lib/active_admin/axlsx.rb

@@ -1,5 +1,4 @@
 require 'active_admin'
-require 'active_admin/axlsx/autoload_extension'
 require 'active_admin/axlsx/build_download_format_links'
 require 'active_admin/axlsx/version'
 require 'active_admin/axlsx/builder'
@@ -14,9 +13,9 @@ class Railtie < ::Rails::Railtie
         Mime::Type.register "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", :xlsx
       end
     rescue NameError
-      puts "Mime module not defined. Skipping registration of xlsx"
+      # noop
     end
-    ActiveAdmin.send :include, ActiveAdmin::Axlsx::AutoloadExtension
+
     ActiveAdmin::ResourceDSL.send :include, ActiveAdmin::Axlsx::DSL
     ActiveAdmin::Resource.send :include, ActiveAdmin::Axlsx::ResourceExtension
     ActiveAdmin::ResourceController.send :include, ActiveAdmin::Axlsx::ResourceControllerExtension

data/lib/active_admin/axlsx/build_download_format_links.rb

@@ -5,6 +5,8 @@ module ActiveAdmin
         base.send :alias_method_chain, :build_download_format_links, :xlsx
       end
 
+      # We are patching the build_download_format_links to include the :xlsx format
+      # Once ActiveAdmin 0.5.1 or higher has been released this can and should be removed.
       def build_download_format_links_with_xlsx(formats = [:csv, :xml, :json, :xlsx])
         build_download_format_links_without_xlsx(formats)
       end

data/lib/active_admin/axlsx/builder.rb

@@ -2,47 +2,69 @@ require 'axlsx'
 
 module ActiveAdmin
   module Axlsx
-    # XlsxBuilder extends CSVBuilder adding in xlsx specific options
-    #
-    # Usage example
-    #
-    #   xlsx_builder = XlsxBuilder.new
-    #   xlsx_builder.column :id
-    #   xlsx_builder.column('Name') { |resource| resource.full_name }
-    #
-    #   xlsx_builder = XlsxBuilder.new :shared_strings => true
-    #   xlsx_builder.column :id
-    #
-    #   xlsx_builder = XlsxBuiler.new :header_style => { :bg_color => '00', :fg_color => 'FF', :sz => 14, :alignment => { :horizontal => :center } }
-    #   xlsx_buider.i18n_scope [:active_record, :models, :posts]
-    class Builder < ActiveAdmin::CSVBuilder
+    # Builder for xlsx data using the axlsx gem.
+    class Builder
 
       include MethodOrProcHelper
 
-      @@default_header_style =  { :bg_color => '00', :fg_color => 'FF', :sz => 12, :alignment => { :horizontal => :center } }
-
-      # Return a default XlsxBuilder for a resource
-      # The XlsxBuilder columns will be id, follwed by this resource's content columns
-      # The default header_style is applied.
-      def self.default_for_resource(resource)
-        xlsx_builder = super
-        xlsx_builder.header_style = @@default_header_style
-        xlsx_builder
+      # @param resource_class The resource this builder generate column information for.
+      # @param [Hash] options the options for this builder
+      # @option [Hash] :header_style - a hash of style properties to apply
+      #   to the header row. Any properties specified will be merged with the default
+      #   header styles. @see Axlsx::Styles#add_style
+      # @option [Array] :i18n_scope - the I18n scope to use when looking
+      #   up localized column headers.
+      # @param [Block] Any block given will evaluated against this instance of Builder.
+      #   That means you can call any method on the builder from withing that block.
+      # @example
+      #   ActiveAdmin::Axlsx:Builder.new(Post, i18n: [:axlsx]) do
+      #     delete_columns :id, :created_at, :updated_at
+      #     column(:author_name) { |post| post.author.name }
+      #     column(:
+      #     after_filter { |sheet|
+      #       sheet.add_row []
+      #
+      #       sheet.add_row ['Author Name', 'Number of Posts'], :style => self.header_style
+      #       data = labels = []
+      #       User.all.each do |user|
+      #         data << [user.posts.size]
+      #         labels << user.name
+      #         sheet.add_row [labels.last, data.last]
+      #       end
+      #       chart_color =  %w(88F700, 279CAC, B2A200, FD66A3, F20062, C8BA2B, 67E6F8, DFFDB9, FFE800, B6F0F8)
+      #       sheet.add_chart(Axlsx::Pie3DChart, :title => "post by author") do |chart|
+      #         chart.add_series :data => data, :labels => labels, :colors => chart_color
+      #         chart.start_at 2, sheet.rows.size
+      #         chart.end_at 3, sheet.rows.size + 20
+      #       end
+      #     }
+      #   end
+      #   @see ActiveAdmin::Axlsx::DSL
+      def initialize(resource_class, options={}, &block)
+        @columns = resource_columns(resource_class)
+        parse_options options
+        instance_eval &block if block_given?
       end
 
-      attr_reader :columns
-
-      # when this is set to true the xlsx file will be generated with
-      # shared strings and will inter-operate with Numbers for Mac
-      # This is true by default, but you can set it to false to minimize the generation time.
-      attr_accessor :shared_strings
+      # The default header style
+      # @return [Hash]
+      def header_style
+        @header_style ||= { :bg_color => '00', :fg_color => 'FF', :sz => 12, :alignment => { :horizontal => :center } }
+      end
 
       # This has can be used to override the default header style for your
-      # sheet.
+      # sheet. Any values you provide will be merged with the default styles.
+      # Precidence is given to your hash
       # @see https://github.com/randym/axlsx for more details on how to
       # create and apply style.
-      # @return [Hash]
-      attr_accessor :header_style
+      def header_style=(style_hash)
+        @header_style = header_style.merge(style_hash)
+      end
+
+      # The scope to use when looking up column names to generate the report header
+      def i18n_scope
+        @i18n_scope ||= nil
+      end
 
       # This is the I18n scope that will be used when looking up your
       # colum names in the current I18n locale.
@@ -50,65 +72,114 @@ module ActiveAdmin
       # serializer will render the value at active_admin.resources.posts.title in the
       # current translations
       # @note If you do not set this, the column name will be titleized.
-      attr_accessor :i18n_scope
-
-      # @param [Hash] options the options for this builder
-      # @option [Hash] :header_style - a hash of style properties to apply
-      #   to the header row
-      # @option [Array] :i18n_scope - the I18n scope to use when looking
-      #   up localized column headers.
-      # @option [Boolean] :shared_strings - Tells the serializer to use
-      # shared strings or not when parsing out the package. 
-      # @note shared strings are an optional part of the ECMA-376 spec,and
-      # are only required when you need to support Numbers.
-      def initialize(options={}, &block)
-        super
-        @header_style = options.delete(:header_style) || @@default_header_style
-        @i18n_scope = options.delete(:i18n_scope)
-        @shared_strings = options.delete(:shared_strings) || true
-        instance_eval &block if block_given?
+      def i18n_scope=(scope)
+        @i18n_scope = scope
       end
 
-      # the Axlsx::Package
-      def package
-        @package ||= ::Axlsx::Package.new(:use_shared_strings => shared_strings)
+      # The stored block that will be executed after your report is generated.
+      def after_filter(&block)
+        @after_filter = block
       end
 
-      # Serializes the collection provided
-      # @return [Axlsx::Package]
-      def serialize(collection)
-        header_style_id = package.workbook.styles.add_style header_style
-        package.workbook.add_worksheet do |sheet|
-          sheet.add_row header_row, :style => header_style_id
-          collection.each do |resource| 
-            sheet.add_row columns.map { |column| call_method_or_proc_on resource, column.data }
-          end
-        end
-        package
+      # the stored block that will be executed before your report is generated.
+      def before_filter(&block)
+        @before_filter = block
       end
 
-      # tranform column names into array of localized strings
-      # @return [Array]
-      def header_row
-        columns.map { |column| column.localized_name(i18n_scope) }
+      # The columns this builder will be serializing
+      attr_reader :columns
+
+      # 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 = []
       end
 
       # Add a column
+      # @param [Symbol] name The name of the column.
+      # @param [Proc] block A block of code that is executed on the resource
+      #                     when generating row data for this column.
       def column(name, &block)
         @columns << Column.new(name, block)
       end
 
+      # removes columns by name
+      # each column_name should be a symbol
+      def delete_columns(*column_names)
+        @columns.delete_if { |column| column_names.include?(column.name) }
+      end
+
+      # Serializes the collection provided
+      # @return [Axlsx::Package]
+      def serialize(collection)
+        apply_filter @before_filter
+        export_collection(collection)
+        apply_filter @after_filter
+        package
+      end
+
+      protected
+
       class Column
-        attr_reader :name, :data
 
         def initialize(name, block = nil)
           @name = name.to_sym
           @data = block || @name
         end
 
+        attr_reader :name, :data
+
         def localized_name(i18n_scope = nil)
           return name.to_s.titleize unless i18n_scope
-          I18n.t name, i18n_scope
+          I18n.t name, scope: i18n_scope
+        end
+      end
+
+      private
+
+      def export_collection(collection)
+        header_row
+        collection.each do |resource|
+          sheet.add_row resource_data(resource)
+        end
+      end
+
+      def apply_filter(filter)
+        filter.call(sheet) if filter
+      end
+
+      def parse_options(options)
+        options.each do |key, value|
+          self.send("#{key}=", value) if self.respond_to?("#{key}=") && value != nil
+        end
+      end
+
+      def resource_data(resource)
+        columns.map { |column| call_method_or_proc_on resource, column.data }
+      end
+
+      def sheet
+        @sheet ||= package.workbook.add_worksheet
+      end
+
+      # the Axlsx::Package
+      def package
+        @package ||= ::Axlsx::Package.new(:use_shared_strings => true)
+      end
+
+      # tranform column names into array of localized strings
+      # @return [Array]
+      def header_row
+        sheet.add_row columns.map { |column| column.localized_name(i18n_scope) }, :style => header_style_id
+      end
+
+      def header_style_id
+        package.workbook.styles.add_style header_style
+      end
+
+      def resource_columns(resource)
+        [Column.new(:id)] + resource.content_columns.map do |column|
+          Column.new(column.name.to_sym)
         end
       end
     end

data/lib/active_admin/axlsx/dsl.rb

@@ -1,23 +1,11 @@
 module ActiveAdmin
   module Axlsx
     module DSL
-      # Configure the xlsx format
-      #
-      # For example:
-      #
-      #   xlsx do
-      #     i18n_scope = [:active_admin, :resources, :post]
-      #     column :name
-      #     column(:author) { |post| post.author.full_name }
-      #   end
-      #
-      #   xlsx :header_style => { :bg_color => "00", :fg_color => "FF" } do
-      #     column :name
-      #   end
+      delegate :ingnore_columns, :column, :after_filer, :i18n_scope, :header_style, to: :xlsx_builder, prefix: :config
+      # @see ActiveAdmin::Axlsx::Builder
       def xlsx(options={}, &block)
-        config.xlsx_builder = XlsxBuilder.new(options, &block)
+        config.xlsx_builder = ActiveAdmin::Axlsx::Builder.new(config.resource_class, options, &block)
       end
-
     end
   end
 end

data/lib/active_admin/axlsx/resource_controller_extension.rb

@@ -7,17 +7,19 @@ module ActiveAdmin
         base.send :respond_to, :xlsx
       end
 
+      # patching the index method to allow the xlsx format.
       def index_with_xlsx(options={}, &block)
         index_without_xlsx(options) do |format|
            format.xlsx do
             xlsx = active_admin_config.xlsx_builder.serialize(collection)
-            send_data xlsx.to_stream.read, :filename => "#{xlsx_filename}", :type => "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet" 
+            send_data xlsx.to_stream.read, :filename => "#{xlsx_filename}", :type => Mime::Type.lookup_by_extension(:xlsx)
           end
         end
       end
 
+      # patching per_page to use the CSV record max for pagination when the format is xlsx
       def per_page_with_xlsx
-          if request.format == 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
+          if request.format ==  Mime::Type.lookup_by_extension(:xlsx)
             return max_csv_records
           end
           per_page_without_xlsx

data/lib/active_admin/axlsx/resource_extension.rb

@@ -1,20 +1,14 @@
 module ActiveAdmin
   module Axlsx
     module ResourceExtension
-
       def xlsx_builder=(builder)
         @xlsx_builder = builder
       end
 
       def xlsx_builder
-        @xlsx_builder ||= default_xlsx_builder
+        @xlsx_builder ||= ActiveAdmin::Axlsx::Builder.new(resource_class)
       end
 
-      private
-
-      def default_xlsx_builder
-        @default_xlsx_builder ||= Axlsx::Builder.default_for_resource(resource_class)
-      end
     end
   end
 end

data/lib/active_admin/axlsx/version.rb

@@ -1,5 +1,5 @@
 module ActiveAdmin
   module Axlsx
-    VERSION = '1.0.0'
+    VERSION = '2.0.0'
   end
 end

data/spec/axlsx/unit/build_download_format_links_spec.rb

@@ -0,0 +1,48 @@
+require 'spec_helper'
+describe ActiveAdmin::Views::PaginatedCollection do
+  def arbre(assigns = {}, helpers = mock_action_view, &block)
+    Arbre::Context.new(assigns, helpers, &block)
+  end
+
+  def render_arbre_component(assigns = {}, helpers = mock_action_view, &block)
+    arbre(assigns, helpers, &block).children.first
+  end
+
+  # Returns a fake action view instance to use with our renderers
+  def mock_action_view(assigns = {})
+    controller = ActionView::TestCase::TestController.new
+    ActionView::Base.send :include, ActionView::Helpers
+    ActionView::Base.send :include, ActiveAdmin::ViewHelpers
+    ActionView::Base.send :include, Rails.application.routes.url_helpers
+    ActionView::Base.new(ActionController::Base.view_paths, assigns, controller)
+  end
+
+  let(:view) do
+    view = mock_action_view
+    view.request.stub!(:query_parameters).and_return({:controller => 'admin/posts', :action => 'index', :page => '1'})
+    view.controller.params = {:controller => 'admin/posts', :action => 'index'}
+    view
+  end
+
+  # Helper to render paginated collections within an arbre context
+  def paginated_collection(*args)
+    render_arbre_component({:paginated_collection_args => args}, view) do
+      paginated_collection(*paginated_collection_args)
+    end
+  end
+
+  let(:collection) do
+    posts = [Post.new(:title => "First Post")]
+    Kaminari.paginate_array(posts).page(1).per(5)
+  end
+
+  let(:pagination) { paginated_collection(collection) }
+
+  before do
+    collection.stub!(:reorder) { collection }
+  end
+
+  it "renders the xlsx download link" do
+    pagination.children.last.content.should match(/XLSX/)
+  end
+end

data/spec/axlsx/unit/builder_spec.rb

@@ -1,38 +1,117 @@
 require 'spec_helper'
+
 module ActiveAdmin
   module Axlsx
     describe Builder do
-      context "with shared strings" do
-        let(:builder) do
-          Builder.new :shared_strings => true
+
+      let(:builder) { Builder.new(Post) }
+      let(:content_columns) { Post.content_columns }
+
+      context 'the default builder' do
+        subject { builder }
+        its(:header_style) { should == { :bg_color => '00', :fg_color => 'FF', :sz => 12, :alignment => { :horizontal => :center } } }
+        its(:i18n_scope) { should be_nil }
+        its("columns.size") { should == content_columns.size + 1 }
+      end
+
+      context 'customizing a builder' do
+        it 'deletes columns we tell it we dont want' do
+          builder.delete_columns :id, :body
+          builder.columns.size.should == content_columns.size - 1
         end
 
-        it "should be set to use shared strings" do 
-          builder.shared_strings.should be_true
+        it 'lets us add custom columns' do
+          builder.column(:hoge)
+          builder.columns.size.should == content_columns.size + 2
         end
-      end
 
-      context "with i18n_scope" do
-        let(:builder) do
-          Builder.new :i18n_scope => [:active_admin, :resource, :category]
+        it 'lets us clear all columns' do
+          builder.clear_columns
+          builder.columns.size.should == 0
         end
 
-        it "should have the defined i18n_scope set" do
-          builder.i18n_scope.should == [:active_admin, :resource, :category]
+        context 'Using Procs for delayed content generation' do
+
+          let(:post) { Post.new(:title => "Hot Dawg") }
+
+          before do
+            builder.column(:hoge) { |resource| "#{resource.title} - with cheese" }
+          end
+
+          it 'stores the block when defining a column for later execution.' do
+            builder.columns.last.data.should be_a(Proc)
+          end
+
+          it 'evaluates custom column blocks' do
+            builder.columns.last.data.call(post).should == "Hot Dawg - with cheese"
+          end
         end
       end
 
-      context "with a customized header style" do
-        let (:header_style) do
-          { :bg_color => '00', :fg_color => 'FF', :sz => 12, :alignment => { :horizontal=> :center } }
+      context 'Sheet generation with a highly customized configuration.' do
+
+        let!(:users) {  [User.new(first_name: 'bob', last_name: 'nancy')] }
+
+        let!(:posts) {  [Post.new(title: 'bob', body: 'is a swell guy', author: users.first)] }
+
+        let!(:builder) {
+          Builder.new(Post, header_style: { sz: 10, fg_color: "FF0000" }, i18n_scope: [:axlsx, :post]) do
+            delete_columns :id, :created_at, :updated_at
+            column(:author) { |resource| "#{resource.author.first_name} #{resource.author.last_name}" }
+            after_filter { |sheet|
+              sheet.add_row []
+              sheet.add_row ['Author Name', 'Number of Posts']
+              data = []
+              labels = []
+              User.all.each do |user|
+                data << user.posts.size
+                labels << "#{user.first_name} #{user.last_name}"
+                sheet.add_row [labels.last, data.last]
+              end
+              chart_color =  %w(88F700 279CAC B2A200 FD66A3 F20062 C8BA2B 67E6F8 DFFDB9 FFE800 B6F0F8)
+              sheet.add_chart(::Axlsx::Pie3DChart, :title => "post by author") do |chart|
+                chart.add_series :data => data, :labels => labels, :colors => chart_color
+                chart.start_at 4, 0
+                chart.end_at 7, 20
+              end
+            }
+            before_filter do |sheet|
+              sheet.add_row ['Created', Time.zone.now]
+              sheet.add_row []
+            end
+          end
+        }
+
+        before(:all) do
+          User.stub!(:all) { users }
+          Post.stub!(:all) { posts }
+          @package = builder.serialize(Post.all)
+        end
+
+        it 'merges our customizations with the default header style' do
+          builder.header_style[:sz].should be(10)
+          builder.header_style[:fg_color].should == 'FF0000'
+          builder.header_style[:bg_color].should == '00'
         end
 
-        let (:builder) do
-          Builder.new :header_style => header_style
+        it 'uses the specified i18n_scope' do
+          builder.i18n_scope.should == [:axlsx, :post]
+        end
+
+        it 'translates the header row based on our i18n scope' do
+          header_row = @package.workbook.worksheets.first.rows[2]
+          header_row.cells.map(&:value).should == ['Title', 'Content', 'Published On', 'Publisher']
+        end
+
+        it 'processes the before filter' do
+          @package.workbook.worksheets.first["A1"].value.should == 'Created'
+        end
+        it 'processes the after filter' do
+          @package.workbook.charts.size.should == 1
         end
 
-        it "should be set up with a header style" do
-          header_style.each { |key , value| builder.header_style[key].should == value }
+        it 'has no OOXML validation errors' do
+          @package.validate.size.should ==  0
         end
       end
     end

data/spec/axlsx/unit/dsl_spec.rb

@@ -0,0 +1,46 @@
+require 'spec_helper'
+
+module ActiveAdmin
+  module Axlsx
+    describe ::ActiveAdmin::ResourceDSL do
+      context 'in a registraiton block' do
+        let(:builder) {
+          config = ActiveAdmin.register(Post) do
+            xlsx(i18n_scope: [:rspec], header_style: { sz: 20 }) do
+              delete_columns :id, :created_at
+              column(:author) { |post| post.author.first_name }
+              before_filter { |sheet| sheet.add_row ['before_filter'] }
+              after_filter { |sheet| sheet.add_row['after_filter'] }
+            end
+          end
+          config.xlsx_builder
+        }
+
+
+        it "uses our customized i18n scope" do
+          builder.i18n_scope.should == [:rspec]
+        end
+
+        it "removed the columns we told it to ignore" do
+          [:id, :create_at].each do |removed|
+            builder.columns.index{|column| column.name == removed}.should be_nil
+          end
+        end
+
+        it "added the columns we declared" do
+          builder.columns.index{ |column| column.name == :author}.should_not be_nil
+        end
+
+        it "has a before filter set" do
+          builder.instance_values["before_filter"].should be_a(Proc)
+        end
+        it "has an after filter set" do
+          builder.instance_values["after_filter"].should be_a(Proc)
+        end
+        it "updates the header style" do
+          builder.header_style[:sz].should be(20)
+        end
+      end
+    end
+  end
+end

data/spec/axlsx/unit/resource_controller_spec.rb

@@ -0,0 +1,46 @@
+require 'spec_helper'
+describe ActiveAdmin::ResourceController do
+
+
+  let(:mime) { Mime::Type.lookup_by_extension(:xlsx) }
+
+  let(:request) do
+    ActionController::TestRequest.new.tap do |test_request|
+      test_request.accept = mime
+    end
+  end
+
+  let(:response) { ActionController::TestResponse.new }
+
+  let(:controller) do
+    Admin::CategoriesController.new.tap do |controller|
+      controller.request = request
+      controller.response = response
+    end
+  end
+
+  let(:filename) { "#{controller.resource_class.to_s.downcase.pluralize}-#{Time.now.strftime("%Y-%m-%d")}.xlsx" }
+
+  it 'generates an xlsx filename' do
+    controller.xlsx_filename.should == filename
+  end
+
+
+  context 'when making requests with the xlsx mime type' do
+     it 'returns xlsx attachment when requested' do
+      controller.send :index
+      response.headers["Content-Disposition"].should == "attachment; filename=\"#{filename}\""
+      response.headers["Content-Transfer-Encoding"].should == 'binary'
+    end
+
+    it 'returns max_csv_records for per_page' do
+      controller.send(:per_page).should == controller.send(:max_csv_records)
+    end
+
+    it 'kicks back to the default per_page when we are not specifying a xlsx mime type' do
+      controller.request.accept = 'text/html'
+      controller.send(:per_page).should == ActiveAdmin.application.default_per_page
+    end
+  end
+end
+

data/spec/axlsx/unit/resource_spec.rb

@@ -4,31 +4,23 @@ include ActiveAdmin
 module ActiveAdmin
   module Axlsx
     describe Resource do
-      before { load_defaults! }
+      let(:resource) { ActiveAdmin.register(Post) }
 
-      let(:application){ ActiveAdmin::Application.new }
-      let(:namespace){ Namespace.new(application, :admin) }
-
-      def config(options = {})
-        @config ||= Resource.new(namespace, Category, options)
+      let(:custom_builder) do
+        Builder.new(Post) do |builder|
+          column(:fake) { :fake }
+        end
       end
 
-      describe "#xlsx_builder" do
-        context "when no xlsx_builder set" do
-          it "should return a default xlsx_builder with id and content columns" do
-            config.xlsx_builder.columns.size.should == Category.content_columns.size + 1
-          end
+      context 'when registered' do
+        it "each resource has an xlsx_builer" do
+          resource.xlsx_builder.should be_a(Builder)
         end
 
-        context "when xslx_builder set" do
-          it "should return the xlsx_builder we set" do
-            xlsx_builder = Builder.new
-            config.xlsx_builder = xlsx_builder
-            config.xlsx_builder.should == xlsx_builder
-          end
+        it "We can specify our own configured builder" do
+          lambda { resource.xlsx_builder = custom_builder }.should_not raise_error
         end
       end
-
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,22 +1,24 @@
-require 'rails'
-require 'activeadmin'
+require 'simplecov'
+SimpleCov.start do
+  add_filter "/rails/"
+end
 
+# prepare ENV for rails
+require 'rails'
 ENV['RAILS_ROOT'] = File.expand_path("../rails/rails-#{Rails::VERSION::STRING}", __FILE__)
 
+# ensure testing application is in place
 unless File.exists?(ENV['RAILS_ROOT'])
   puts "Please run bundle exec rake setup before running the specs."
   exit
 end
 
-def load_defaults!
-  ActiveAdmin.unload!
-  ActiveAdmin.load!
-  ActiveAdmin.register(Category)
-  ActiveAdmin.register(User)
-  ActiveAdmin.register(Post){ belongs_to :user, :optional => true }
-end
-
-ENV['RAILS_ENV'] = 'test'
+# load up activeadmin and activeadmin-axlsx
+require 'activeadmin-axlsx'
 ActiveAdmin.application.load_paths = [ENV['RAILS_ROOT'] + "/app/admin"]
+
+# start up rails
 require ENV['RAILS_ROOT'] + '/config/environment'
-require 'activeadmin-axlsx'
+
+# and finally,here's rspec
+require 'rspec/rails'

data/spec/support/rails_template.rb

@@ -42,7 +42,7 @@ end
 inject_into_file "config/environments/test.rb", "  config.action_mailer.default_url_options = { :host => 'example.com' }\n", :after => "config.cache_classes = true\n"
 
 # Add our local Active Admin to the load path
-inject_into_file "config/environment.rb", "\n$LOAD_PATH.unshift('#{File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'lib'))}')\nrequire \"active_admin\"\n", :after => "require File.expand_path('../application', __FILE__)"
+inject_into_file "config/environment.rb", "\nrequire \"activeadmin-axlsx\"\n", :after => "require File.expand_path('../application', __FILE__)"
 
 # Add some translations
 append_file "config/locales/en.yml", File.read(File.expand_path('../templates/en.yml', __FILE__))

data/spec/support/rails_template_with_data.rb

@@ -24,6 +24,7 @@ scopes = <<-EOF
   scope :my_posts do |posts|
     posts.where(:author_id => current_admin_user.id)
   end
+
 EOF
 inject_into_file 'app/admin/posts.rb', scopes , :after => "ActiveAdmin.register Post do\n"
 
@@ -49,7 +50,7 @@ append_file "db/seeds.rb", <<-EOF
     published_at = published_at_values[i % published_at_values.size]
     Post.create :title => "Blog Post \#{i}",
                 :body => "Blog post \#{i} is written by \#{user.username} about \#{cat.name}",
-                :category => cat,
+                :category_id => cat.id,
                 :published_at => published_at,
                 :author => user
   end

data/spec/support/templates/en.yml

@@ -1,4 +1,13 @@
 # Sample translations used to test ActiveAdmin's I18n integration.
+  axlsx:
+    post:
+      id: ID
+      title: Title
+      body: Content
+      published_at: Published On
+      author: Publisher
+      created_at: Created
+      updated_at: Updated
   activerecord:
     models:
       store:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin-axlsx
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-03 00:00:00.000000000 Z
+date: 2012-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeadmin
@@ -54,6 +54,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rspec
 - .yardops
 - CHANGELOG.md
 - Gemfile
@@ -63,7 +64,6 @@ files:
 - Rakefile
 - activeadmin-axlsx.gemspec
 - lib/active_admin/axlsx.rb
-- lib/active_admin/axlsx/autoload_extension.rb
 - lib/active_admin/axlsx/build_download_format_links.rb
 - lib/active_admin/axlsx/builder.rb
 - lib/active_admin/axlsx/dsl.rb
@@ -72,7 +72,10 @@ files:
 - lib/active_admin/axlsx/version.rb
 - lib/activeadmin-axlsx.rb
 - screen_capture.png
+- spec/axlsx/unit/build_download_format_links_spec.rb
 - spec/axlsx/unit/builder_spec.rb
+- spec/axlsx/unit/dsl_spec.rb
+- spec/axlsx/unit/resource_controller_spec.rb
 - spec/axlsx/unit/resource_spec.rb
 - spec/spec_helper.rb
 - spec/support/rails_template.rb
@@ -101,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3314868073732542076
+      hash: 646391432693346211
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -110,7 +113,10 @@ specification_version: 3
 summary: Adds excel downloads for resources within the Active Admin framework via
   Axlsx.
 test_files:
+- spec/axlsx/unit/build_download_format_links_spec.rb
 - spec/axlsx/unit/builder_spec.rb
+- spec/axlsx/unit/dsl_spec.rb
+- spec/axlsx/unit/resource_controller_spec.rb
 - spec/axlsx/unit/resource_spec.rb
 - spec/spec_helper.rb
 - spec/support/rails_template.rb

data/lib/active_admin/axlsx/autoload_extension.rb

@@ -1,7 +0,0 @@
-module ActiveAdmin
-  module Axlsx
-    module AutoloadExtension
-      autoload :XlsxBuilder,              'active_admin/xlsx_builder'
-    end
-  end
-end