From f43a46d92d74b3de374a20268130ac5dc5c76c2d Mon Sep 17 00:00:00 2001
From: Neil Matatall <neilm@twitter.com>
Date: Fri, 25 Jan 2013 00:12:31 -0800
Subject: [PATCH] Instead of requiring dependency, only exe if defined

---
 lib/secure_headers/railtie.rb | 12 ++++++------
 secure-headers.gemspec        |  1 -
 spec/spec_helper.rb           |  1 -
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/lib/secure_headers/railtie.rb b/lib/secure_headers/railtie.rb
index 702c0a1..7e31f57 100644
--- a/lib/secure_headers/railtie.rb
+++ b/lib/secure_headers/railtie.rb
@@ -1,5 +1,3 @@
-require 'active_support/dependencies'
-
 # rails 3.1+
 if defined?(Rails::Railtie)
   module SecureHeaders
@@ -25,10 +23,12 @@ else
     end
   end
 
-  if ActiveSupport::Dependencies.autoload_paths
-    ActiveSupport::Dependencies.autoload_paths << File.expand_path(File.join("..", "..", "..", "app", "controllers"), __FILE__)
-  else
-    ActiveSupport::Dependencies.autoload_paths = [File.expand_path(File.join("..", "..", "..", "app", "controllers"), __FILE__)]
+  if defined?(ActiveSupport::Dependencies)
+    if ActiveSupport::Dependencies.autoload_paths
+      ActiveSupport::Dependencies.autoload_paths << File.expand_path(File.join("..", "..", "..", "app", "controllers"), __FILE__)
+    else
+      ActiveSupport::Dependencies.autoload_paths = [File.expand_path(File.join("..", "..", "..", "app", "controllers"), __FILE__)]
+    end
   end
 
   if defined? ActionController::Routing
diff --git a/secure-headers.gemspec b/secure-headers.gemspec
index db11f10..0628d71 100644
--- a/secure-headers.gemspec
+++ b/secure-headers.gemspec
@@ -19,6 +19,5 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
   gem.add_dependency "brwsr", ">= 1.1.1"
-  gem.add_dependency "activesupport", ">= 2.0"
   gem.add_development_dependency "rake"
 end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index e44ecf5..f8b7d10 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,6 +1,5 @@
 require 'rubygems'
 require 'spork'
-require 'active_support'
 
 unless Spork.using_spork?
   require 'simplecov'