From 618fab1263e080ec0716b7f633161f4f62abb124 Mon Sep 17 00:00:00 2001 From: Ben Kreeger Date: Sat, 24 Nov 2012 15:23:39 -0600 Subject: [PATCH 1/5] Updating ActiveSupport patching to use #on_load. --- lib/has_scope.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/has_scope.rb b/lib/has_scope.rb index 167dadc..a0be299 100644 --- a/lib/has_scope.rb +++ b/lib/has_scope.rb @@ -181,7 +181,7 @@ def current_scopes end end -ActionController::Base.instance_eval do +ActiveSupport.on_load :action_controller do include HasScope helper_method :current_scopes end From e542e75f323ae346e93ad44f4a3cd94eb4737672 Mon Sep 17 00:00:00 2001 From: Ben Kreeger Date: Sat, 24 Nov 2012 15:36:09 -0600 Subject: [PATCH 2/5] Moved gem dependencies to gemspec, locked mocha. --- Gemfile | 11 ----------- has_scope.gemspec | 13 ++++++++++++- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Gemfile b/Gemfile index 533c2e6..a1b93f3 100644 --- a/Gemfile +++ b/Gemfile @@ -1,14 +1,3 @@ source :rubygems gemspec - -gem "actionpack", "~> 3.2.0" -gem "activesupport", "~> 3.2.0" - -if RUBY_VERSION < "1.9" - gem "ruby-debug" -else - gem "test-unit" -end - -gem "mocha" \ No newline at end of file diff --git a/has_scope.gemspec b/has_scope.gemspec index 96ac2c1..172cc1c 100644 --- a/has_scope.gemspec +++ b/has_scope.gemspec @@ -24,4 +24,15 @@ Gem::Specification.new do |s| s.extra_rdoc_files = [ "README.md" ] -end \ No newline at end of file + + s.add_runtime_dependency "actionpack", "~> 3.2.0" + s.add_runtime_dependency "activesupport", "~> 3.2.0" + s.add_development_dependency "mocha", "~> 0.12.0" + s.add_development_dependency "rake" + if RUBY_VERSION < "1.9" + s.add_development_dependency "ruby-debug" + else + s.add_development_dependency "test-unit" + s.add_development_dependency "debugger" + end +end From d8b602690408fd99c89b94fa8911c17f474e4185 Mon Sep 17 00:00:00 2001 From: Ben Kreeger Date: Sat, 24 Nov 2012 15:41:37 -0600 Subject: [PATCH 3/5] Adding rdoc as dev dependency on < 1.9. --- has_scope.gemspec | 1 + 1 file changed, 1 insertion(+) diff --git a/has_scope.gemspec b/has_scope.gemspec index 172cc1c..43f7728 100644 --- a/has_scope.gemspec +++ b/has_scope.gemspec @@ -30,6 +30,7 @@ Gem::Specification.new do |s| s.add_development_dependency "mocha", "~> 0.12.0" s.add_development_dependency "rake" if RUBY_VERSION < "1.9" + s.add_development_dependency "rdoc" s.add_development_dependency "ruby-debug" else s.add_development_dependency "test-unit" From 50411d5272787676da3fb2f032678c2c5944dcb6 Mon Sep 17 00:00:00 2001 From: Ben Kreeger Date: Sat, 24 Nov 2012 15:44:36 -0600 Subject: [PATCH 4/5] Ensuring debugger is installed only on ruby < 2.0. --- has_scope.gemspec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/has_scope.gemspec b/has_scope.gemspec index 43f7728..d8163e3 100644 --- a/has_scope.gemspec +++ b/has_scope.gemspec @@ -34,6 +34,8 @@ Gem::Specification.new do |s| s.add_development_dependency "ruby-debug" else s.add_development_dependency "test-unit" - s.add_development_dependency "debugger" + if RUBY_VERSION < "2.0" + s.add_development_dependency "debugger" + end end end From b85e5c1d955ab8f2194d57ecc8fe3dd735351c09 Mon Sep 17 00:00:00 2001 From: Ben Kreeger Date: Sat, 24 Nov 2012 15:46:01 -0600 Subject: [PATCH 5/5] Removing debugger requirement altogether; easier to test Rubies. --- has_scope.gemspec | 3 --- 1 file changed, 3 deletions(-) diff --git a/has_scope.gemspec b/has_scope.gemspec index d8163e3..34241a1 100644 --- a/has_scope.gemspec +++ b/has_scope.gemspec @@ -34,8 +34,5 @@ Gem::Specification.new do |s| s.add_development_dependency "ruby-debug" else s.add_development_dependency "test-unit" - if RUBY_VERSION < "2.0" - s.add_development_dependency "debugger" - end end end