grouped_scope 3.1.1 → 3.1.2

data/.travis.yml

@@ -2,4 +2,7 @@ rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
-  - ree
+  - ree
+gemfile:
+- Gemfile.rails-3.1
+- Gemfile.rails-3.2

data/CHANGELOG

@@ -1,9 +1,9 @@
 
 = master
 
-= 3.1.0 (unreleased)
+= 3.1.0
 
-* Works with ActiveRecord 3.1
+* Works with ActiveRecord 3.1 or 3.2
 
 * The group object is now an ActiveRecord::Relation so you can further scope it.
 

data/Gemfile

@@ -1,21 +1 @@
-
-source :rubygems
-source 'http://gems.github.com/'
-
-spec = eval(File.read('grouped_scope.gemspec'))
-ar_version = spec.dependencies.detect{ |d|d.name == 'activerecord' }.requirement.to_s
-ar_version = ENV['RAILS_VERSION'] || ar_version
-
-gem 'sqlite3', '1.3.4'
-gem 'activerecord', ar_version, :require => 'active_record'
-
-group :development do
-  gem 'rake', '~> 0.9.2'
-end
-
-group :test do
-  gem 'minitest',     '~> 2.8.1'
-  gem 'factory_girl', '~> 2.3.2'
-  gem 'mocha',        '~> 0.10.0'
-end
-
+eval File.read('Gemfile.rails-3.1')

data/Gemfile.rails-3.1

@@ -0,0 +1,9 @@
+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

@@ -0,0 +1,9 @@
+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'

data/Rakefile

@@ -1,14 +1,13 @@
-require 'rake'
+require 'bundler'
 require 'rake/testtask'
 
-desc 'Default: run unit tests.'
-task :default => :test
+Bundler::GemHelper.install_tasks
 
 desc 'Test the GroupedScope plugin.'
 Rake::TestTask.new do |t|
-  t.libs << 'lib'
-  t.libs << 'test'
-  t.pattern = 'test/**/*_test.rb'
+  t.libs = ['lib','test']
+  t.test_files = Dir.glob("test/**/*_test.rb").sort
   t.verbose = true
 end
 
+task :default => [:test]

data/lib/grouped_scope.rb

@@ -1,3 +1,4 @@
+require 'active_record'
 require 'active_record/version'
 require 'grouped_scope/errors'
 require 'grouped_scope/self_grouping'

data/lib/grouped_scope/arish/associations/builder/grouped_association.rb

@@ -22,14 +22,14 @@ module GroupedScope
             model.send(ungrouped_reflection.macro, grouped_name, grouped_options).tap do |grouped_reflection|
               grouped_reflection.grouped_scope = true
               model.grouped_reflections = model.grouped_reflections.merge(ungrouped_name => grouped_reflection)
-              define_grouped_scope_reader(model)
+              define_grouped_scope_reader
             end
           end
           
           
           private
           
-          def define_grouped_scope_reader(model)
+          def define_grouped_scope_reader
             model.send(:define_method, :group) do
               @group ||= GroupedScope::SelfGroupping.new(self)
             end

data/lib/grouped_scope/arish/associations/collection_association.rb

@@ -5,16 +5,12 @@ module GroupedScope
 
         extend ActiveSupport::Concern
 
-        module InstanceMethods
-          
-          def association_scope
-            if reflection.grouped_scope?
-              @association_scope ||= Associations::AssociationScope.new(self).scope if klass
-            else
-              super
-            end
+        def association_scope
+          if reflection.grouped_scope?
+            @association_scope ||= Associations::AssociationScope.new(self).scope if klass
+          else
+            super
           end
-
         end
 
       end

data/lib/grouped_scope/version.rb

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

data/test/helper.rb

@@ -1,7 +1,7 @@
 require 'rubygems'
 require 'bundler'
 require "bundler/setup"
-Bundler.require(:default, :development, :test)
+Bundler.require
 require 'grouped_scope'
 require 'minitest/autorun'
 require 'factories'
@@ -156,7 +156,7 @@ class Employee < ActiveRecord::Base
 end
 
 class LegacyEmployee < ActiveRecord::Base
-  set_primary_key :email
+  self.primary_key = 'email'
   has_many :reports, :class_name => 'LegacyReport', :foreign_key => 'email'
   grouped_scope :reports
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: grouped_scope
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 7
   prerelease: 
   segments: 
   - 3
   - 1
-  - 1
-  version: 3.1.1
+  - 2
+  version: 3.1.2
 platform: ruby
 authors: 
 - Ken Collins
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-07 00:00:00 Z
+date: 2012-01-02 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
@@ -25,15 +25,93 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 5
         segments: 
         - 3
         - 1
-        - 0
-        version: 3.1.0
+        version: "3.1"
   type: :runtime
   version_requirements: *id001
-description: Extends has_many associations to group scope. For ActiveRecord 3.1!
+- !ruby/object:Gem::Dependency 
+  name: sqlite3
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 1
+        - 3
+        version: "1.3"
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 63
+        segments: 
+        - 0
+        - 9
+        - 2
+        version: 0.9.2
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: minitest
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 45
+        segments: 
+        - 2
+        - 8
+        - 1
+        version: 2.8.1
+  type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: factory_girl
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 2
+        - 3
+        - 2
+        version: 2.3.2
+  type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: mocha
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 55
+        segments: 
+        - 0
+        - 10
+        - 0
+        version: 0.10.0
+  type: :development
+  version_requirements: *id006
+description: Extends has_many associations to group scope. For ActiveRecord!
 email: 
 - ken@metaskills.net
 executables: []
@@ -47,6 +125,8 @@ files:
 - .travis.yml
 - CHANGELOG
 - Gemfile
+- Gemfile.rails-3.1
+- Gemfile.rails-3.2
 - MIT-LICENSE
 - README.md
 - Rakefile
@@ -96,7 +176,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.12
 signing_key: 
 specification_version: 3
 summary: Extends has_many associations to group scope.