From 88cd1c7f1fec1ed57c27f92be859c26adef26070 Mon Sep 17 00:00:00 2001 From: Ken Collins Date: Tue, 6 Dec 2011 17:47:30 -0500 Subject: [PATCH 1/3] Rename test cases directory. --- test/{grouped_scope => cases}/has_many_test.rb | 0 test/{grouped_scope => cases}/has_many_through_test.rb | 0 test/{grouped_scope => cases}/reflection_test.rb | 0 test/{grouped_scope => cases}/self_grouping_test.rb | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename test/{grouped_scope => cases}/has_many_test.rb (100%) rename test/{grouped_scope => cases}/has_many_through_test.rb (100%) rename test/{grouped_scope => cases}/reflection_test.rb (100%) rename test/{grouped_scope => cases}/self_grouping_test.rb (100%) diff --git a/test/grouped_scope/has_many_test.rb b/test/cases/has_many_test.rb similarity index 100% rename from test/grouped_scope/has_many_test.rb rename to test/cases/has_many_test.rb diff --git a/test/grouped_scope/has_many_through_test.rb b/test/cases/has_many_through_test.rb similarity index 100% rename from test/grouped_scope/has_many_through_test.rb rename to test/cases/has_many_through_test.rb diff --git a/test/grouped_scope/reflection_test.rb b/test/cases/reflection_test.rb similarity index 100% rename from test/grouped_scope/reflection_test.rb rename to test/cases/reflection_test.rb diff --git a/test/grouped_scope/self_grouping_test.rb b/test/cases/self_grouping_test.rb similarity index 100% rename from test/grouped_scope/self_grouping_test.rb rename to test/cases/self_grouping_test.rb From ac4090bf269e0717870b73f26d99602a7813cedc Mon Sep 17 00:00:00 2001 From: Ken Collins Date: Tue, 6 Dec 2011 19:42:21 -0500 Subject: [PATCH 2/3] New version for leaner AR version --- Gemfile | 1 + grouped_scope.gemspec | 4 ++-- lib/grouped_scope/version.rb | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index a961ac4..0cd8376 100644 --- a/Gemfile +++ b/Gemfile @@ -4,6 +4,7 @@ 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' diff --git a/grouped_scope.gemspec b/grouped_scope.gemspec index f127b14..faf4d7d 100644 --- a/grouped_scope.gemspec +++ b/grouped_scope.gemspec @@ -9,12 +9,12 @@ Gem::Specification.new do |s| s.email = ['ken@metaskills.net'] s.homepage = 'http://github.com/metaskills/grouped_scope/' s.summary = 'Extends has_many associations to group scope.' - s.description = 'Extends has_many associations to group scope. For ActiveRecord 2.3.x!' + s.description = 'Extends has_many associations to group scope. For ActiveRecord 3.1!' s.files = `git ls-files`.split("\n") - ["grouped_scope.gemspec"] s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n") 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_dependency 'activerecord', '~> 3.1.3' + s.add_dependency 'activerecord', '~> 3.1.0' end diff --git a/lib/grouped_scope/version.rb b/lib/grouped_scope/version.rb index ce4226a..12ab0f9 100644 --- a/lib/grouped_scope/version.rb +++ b/lib/grouped_scope/version.rb @@ -1,3 +1,3 @@ module GroupedScope - VERSION = '3.1.0' + VERSION = '3.1.1' end From acb736d848cee3ab3404af462b5c2f6a9d9cb173 Mon Sep 17 00:00:00 2001 From: Ken Collins Date: Tue, 6 Dec 2011 19:43:03 -0500 Subject: [PATCH 3/3] Ignore built gem files. --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 2ef238e..24e357b 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,5 @@ debug.log autotest .rbenv-version Gemfile.lock -debug.log \ No newline at end of file +debug.log +*.gem \ No newline at end of file