Fixes arity problem introduced by rails 3.2.5. Fixes metaskills#1

* Also master is now 3.2 only.

.travis.yml

@@ -3,6 +3,3 @@ rvm:
   - 1.9.2
   - 1.9.3
   - ree
-gemfile:
-- Gemfile.rails-3.1
-- Gemfile.rails-3.2

CHANGELOG

@@ -1,6 +1,11 @@
 
 = master
 
+= 3.2.0
+
+* ActiveRecord 3.2 only.
+
+
 = 3.1.0
 
 * Works with ActiveRecord 3.1 or 3.2

Gemfile

@@ -1 +1,2 @@
-eval File.read('Gemfile.rails-3.1')
+source :rubygems
+gemspec

README.md

@@ -8,10 +8,10 @@ GroupedScope provides an easy way to group objects and to allow those groups to
 
 ## Installation
 
-Install the gem with bundler. We follow a semantic versioning format that tracks ActiveRecord's minor version. So this means to use the latest 3.1.x version of GroupedScope with any ActiveRecord 3.1 version.
+Install the gem with bundler. We follow a semantic versioning format that tracks ActiveRecord's minor version. So this means to use the latest 3.2.x version of GroupedScope with any ActiveRecord 3.2 version.
 
 ```ruby
-gem 'grouped_scope', '~> 3.1.0'
+gem 'grouped_scope', '~> 3.2.0'
 ```
 
 

grouped_scope.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ['lib']
   s.rdoc_options  = ['--charset=UTF-8']
-  s.add_runtime_dependency 'activerecord', '~> 3.1'
+  s.add_runtime_dependency 'activerecord', '~> 3.2.0'
   s.add_development_dependency 'sqlite3',      '~> 1.3'
   s.add_development_dependency 'rake',         '~> 0.9.2'
   s.add_development_dependency 'minitest',     '~> 2.8.1'

lib/grouped_scope.rb

@@ -1,5 +1,6 @@
 require 'active_record'
 require 'active_record/version'
+require 'active_support/all'
 require 'grouped_scope/errors'
 require 'grouped_scope/self_grouping'
 

lib/grouped_scope/arish/relation/predicate_builer.rb

@@ -9,13 +9,12 @@ module PredicateBuilder
       end
 
       module ClassMethods
-
-        def build_from_hash_with_grouped_scope(engine, attributes, default_table)
+        def build_from_hash_with_grouped_scope(engine, attributes, default_table, check_column = true)
           attributes.select{ |column, value| GroupedScope::SelfGroupping === value }.each do |column_value|
             column, value = column_value
             attributes[column] = value.arel_table[column.to_s].in(value.ids_sql)
           end
-          build_from_hash_without_grouped_scope(engine, attributes, default_table)
+          build_from_hash_without_grouped_scope(engine, attributes, default_table, check_column)
         end
 
       end

lib/grouped_scope/version.rb

@@ -1,3 +1,3 @@
 module GroupedScope
-  VERSION = '3.1.2'
+  VERSION = '3.2.0'
 end

test/helper.rb

@@ -1,7 +1,6 @@
 require 'rubygems'
-require 'bundler'
-require "bundler/setup"
-Bundler.require
+require 'bundler/setup'
+Bundler.require :default, :development
 require 'grouped_scope'
 require 'minitest/autorun'
 require 'factories'