grouped_scope 3.1.2 → 3.2.0

data/.travis.yml

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

data/CHANGELOG

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

data/Gemfile

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

data/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'
 ```
 
 

data/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'
 

data/lib/grouped_scope/arish/relation/predicate_builer.rb

@@ -9,13 +9,12 @@ module GroupedScope
       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

data/lib/grouped_scope/version.rb

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

data/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'

metadata

@@ -1,132 +1,93 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: grouped_scope
-version: !ruby/object:Gem::Version 
-  hash: 7
+version: !ruby/object:Gem::Version
+  version: 3.2.0
   prerelease: 
-  segments: 
-  - 3
-  - 1
-  - 2
-  version: 3.1.2
 platform: ruby
-authors: 
+authors:
 - Ken Collins
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-01-02 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-06-12 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activerecord
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70169324150120 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 3
-        - 1
-        version: "3.1"
+      - !ruby/object:Gem::Version
+        version: 3.2.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: sqlite3
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70169324150120
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: &70169324148520 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 1
-        - 3
-        version: "1.3"
+      - !ruby/object:Gem::Version
+        version: '1.3'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70169324148520
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70169324147520 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 63
-        segments: 
-        - 0
-        - 9
-        - 2
+      - !ruby/object:Gem::Version
         version: 0.9.2
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: minitest
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70169324147520
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: &70169324146780 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 45
-        segments: 
-        - 2
-        - 8
-        - 1
+      - !ruby/object:Gem::Version
         version: 2.8.1
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: factory_girl
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70169324146780
+- !ruby/object:Gem::Dependency
+  name: factory_girl
+  requirement: &70169324146060 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 2
-        - 3
-        - 2
+      - !ruby/object:Gem::Version
         version: 2.3.2
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: mocha
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *70169324146060
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: &70169324145600 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 55
-        segments: 
-        - 0
-        - 10
-        - 0
+      - !ruby/object:Gem::Version
         version: 0.10.0
   type: :development
-  version_requirements: *id006
+  prerelease: false
+  version_requirements: *70169324145600
 description: Extends has_many associations to group scope. For ActiveRecord!
-email: 
+email:
 - ken@metaskills.net
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .travis.yml
 - CHANGELOG
 - Gemfile
-- Gemfile.rails-3.1
-- Gemfile.rails-3.2
 - MIT-LICENSE
 - README.md
 - Rakefile
@@ -149,38 +110,30 @@ files:
 - test/helper.rb
 homepage: http://github.com/metaskills/grouped_scope/
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --charset=UTF-8
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.12
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: Extends has_many associations to group scope.
-test_files: 
+test_files:
 - test/cases/has_many_test.rb
 - test/cases/has_many_through_test.rb
 - test/cases/reflection_test.rb

data/Gemfile.rails-3.1

@@ -1,9 +0,0 @@
-source :rubygems
-
-spec = eval File.read('grouped_scope.gemspec')
-deps = spec.dependencies.map { |dep| {:name => dep.name, :version => dep.requirement.to_s} }
-
-deps.reject! { |dep| dep[:name] =~ /activerecord/ }
-deps.each    { |dep| gem dep[:name], dep[:version] }
-
-gem 'activerecord', '~> 3.1.3'

data/Gemfile.rails-3.2

@@ -1,9 +0,0 @@
-source :rubygems
-
-spec = eval File.read('grouped_scope.gemspec')
-deps = spec.dependencies.map { |dep| {:name => dep.name, :version => dep.requirement.to_s} }
-
-deps.reject! { |dep| dep[:name] =~ /activerecord/ }
-deps.each    { |dep| gem dep[:name], dep[:version] }
-
-gem 'activerecord', '3.2.0.rc1'