Merge pull request heartcombo#31 from kreeger/master

Updating ActiveSupport patching to use #on_load; moved gem dependencies to gemspec.
tfwright · Nov 24, 2012 · 15d0679 · 15d0679
2 parents 23958b4 + b85e5c1
commit 15d0679
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git 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"
diff --git a/has_scope.gemspec b/has_scope.gemspec
@@ -24,4 +24,15 @@ Gem::Specification.new do |s|
   s.extra_rdoc_files = [
     "README.md"
   ]
-end
+
+  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 "rdoc"
+    s.add_development_dependency "ruby-debug"
+  else
+    s.add_development_dependency "test-unit"
+  end
+end
diff --git 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