Merge pull request activeadmin#3760 from rdlugosz/fix_ruby2_2_compatibility

timoschilling · timoschilling · commit 37b56f4150ae · 2015-01-28T00:54:24.000+01:00
Add parens to method calls used as arg defaults for Ruby 2.2, fix activeadmin#3733
diff --git a/.travis.yml b/.travis.yml
@@ -2,6 +2,7 @@ script: bundle exec rake test
 rvm:
   - 1.9.3
   - 2.0.0
+  - 2.2.0
 before_install:
   - gem update --system
   - gem --version
@@ -11,5 +12,8 @@ env:
   - RAILS=3.1.12
   - RAILS=3.2.14
 matrix:
-  allow_failures:
+  exclude:
     - rvm: 2.0.0
+      env: RAILS=3.0.20
+    - rvm: 2.2.0
+      env: RAILS=3.0.20
diff --git a/Gemfile b/Gemfile
@@ -17,6 +17,7 @@ when /^3\.(1|2)/
   # These are the gems you have to have for Rails 3.1 to be happy
   gem 'sass-rails'
   gem 'uglifier'
+  gem "test-unit", "~>3.0" # a rails 3.2 on ruby 2.2 requirement
 else
   raise "Rails #{rails_version} is not supported yet"
 end
diff --git a/lib/active_admin/helpers/collection.rb b/lib/active_admin/helpers/collection.rb
@@ -7,15 +7,15 @@ module Collection
       # the ORDER statement mentions a column defined in the SELECT statement.
       #
       # We remove the ORDER statement to work around this issue.
-      def collection_size(collection=collection)
+      def collection_size(collection=collection())
         size = collection.reorder("").count
         # when GROUP BY is used, AR returns Hash instead of Fixnum for .size
         size = size.size if size.kind_of?(Hash)
 
         size
       end
 
-      def collection_is_empty?(collection=collection)
+      def collection_is_empty?(collection=collection())
         collection_size(collection) == 0
       end
     end
