Fixes for AA 0.6.1

.gitignore

@@ -7,3 +7,4 @@ doc
 .yardoc
 .rbenv-version
 .ruby-version
+Gemfile.lock

lib/active_admin/axlsx/resource_controller_extension.rb

@@ -20,7 +20,7 @@ def index_with_xlsx(options={}, &block)
       # patching per_page to use the CSV record max for pagination when the format is xlsx
       def per_page_with_xlsx
           if request.format ==  Mime::Type.lookup_by_extension(:xlsx)
-            return max_csv_records
+            return max_per_page
           end
           per_page_without_xlsx
       end

spec/axlsx/unit/resource_controller_spec.rb

@@ -31,8 +31,8 @@
       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)
+    it 'returns max_per_page for per_page' do
+      controller.send(:per_page).should == controller.send(:max_per_page)
     end
 
     it 'kicks back to the default per_page when we are not specifying a xlsx mime type' do

spec/support/rails_template.rb

@@ -12,7 +12,9 @@
 generate :model, "post title:string body:text published_at:datetime author_id:integer category_id:integer"
 inject_into_file 'app/models/post.rb', "  belongs_to :author, :class_name => 'User'\n  belongs_to :category\n  accepts_nested_attributes_for :author\n", :after => "class Post < ActiveRecord::Base\n"
 # Rails 3.2.3 model generator declare attr_accessible
-inject_into_file 'app/models/post.rb', "  attr_accessible :author\n", :before => "end" if Rails::VERSION::STRING >= '3.2.3'
+if Gem::Version.new(::Rails::VERSION::STRING) >= Gem::Version.new('3.2.3')
+  inject_into_file 'app/models/post.rb', "  attr_accessible :author\n", :before => "end"
+end
 generate :model, "user type:string first_name:string last_name:string username:string age:integer"
 inject_into_file 'app/models/user.rb', "  has_many :posts, :foreign_key => 'author_id'\n", :after => "class User < ActiveRecord::Base\n"
 generate :model, "publisher --migration=false --parent=User"
@@ -26,7 +28,7 @@
 id_model_setup = <<-EOF
   self.primary_key = :id
   before_create :set_id
-  
+
   private
   def set_id
     self.id = 8.times.inject("") { |s,e| s << (i = Kernel.rand(62); i += ((i < 10) ? 48 : ((i < 36) ? 55 : 61 ))).chr }