shuber-proxy 1.3.0 → 1.3.1

data/CHANGELOG

@@ -1,3 +1,9 @@
+2009-06-04 - Sean Huber (shuber@huberry.com)
+  * Update test related rake tasks
+  * Remove huberry namespace
+  * Add support for multiple domains
+  * Update README
+
 2009-05-20 - Sean Huber (shuber@huberry.com)
   * Update date in gemspec so github rebuilds gem
 

data/README.markdown

@@ -1,25 +1,24 @@
-Proxy
-=====
+# Proxy
 
-A gem/plugin that allows rails applications to dynamically respond to proxied requests by detecting forwarded host/uri headers and setting the session domain, default host, and relative url root. The plugin adds this functionality to calls to url\_for, named route helpers, and view url helpers while still allowing you to specifically set the :host and :only\_path options to override this behavior.
+A gem/plugin that allows rails applications to dynamically respond to multiple domains and proxied requests by detecting forwarded host/uri headers and setting the session domain, default host, and relative url root. The plugin adds this functionality to calls to url\_for, named route helpers, and view url helpers while still allowing you to specifically set the :host and :only\_path options to override this behavior.
 
 The original session domain, default host, and relative url root will be restored after each request.
 
 Requires actionpack version >= 2.0.0
 
 
-Installation
-------------
+## Installation
 
 	script/plugin install git://github.com/shuber/proxy.git
 	OR
 	gem install shuber-proxy --source http://gems.github.com
 
 
-Usage
------
+## Usage
 
-Lets say you have a suite of hosted applications all running on the same domain but mounted on different paths. One of them is an order/invoicing application located at:
+### Proxied Requests
+
+Let's say you have a suite of hosted applications all running on the same domain but mounted on different paths. One of them is an order/invoicing application located at:
 
 	http://client.example.com/orders
 
@@ -29,6 +28,9 @@ Imagine you sold an account to a client but the client wants the application to
 
 This plugin will automatically detect this forwarded host and set the session domain and default host (for url generation) accordingly.
 
+
+### Proxied Requests with Custom URIs
+
 Now imagine the client had an existing ordering system already running at /orders, and he wants to slowly migrate his data into your application, so he'll need both applications running for awhile. He wants to keep his original ordering application running at /orders and he wants your application running at:
 
 	http://clientdomain.com/neworders
@@ -42,8 +44,7 @@ Note: this plugin looks for a request header called 'HTTP\_X\_FORWARDED\_URI' to
 You can add that line in environment.rb or an initializer.
 
 
-Relative Url Root Proxy Setup
------------------------------
+#### Relative Url Root Proxy Setup
 
 The client's proxy must forward the request uri header in order for this plugin to automatically set the relative url root correctly. Here is how the client would setup a proxy in apache for the example above:
 
@@ -51,7 +52,42 @@ The client's proxy must forward the request uri header in order for this plugin
 	RequestHeader append X_FORWARDED_URI %{originalUri}e e=originalUri
 
 
-Contact
--------
+### Multiple Domains
+
+Imagine you have a CMS that hosts multiple client sites. You want your users to manage their sites on your root domain `http://yourcmsapp.com` and you display a site's public content when it's accessed by its subdomain (e.g. `http://cool-site.yourcmsapp.com`). You'll probably be using [subdomain-fu](http://github.com/mbleigh/subdomain-fu) so you can route based on subdomains like:
+
+	ActionController::Routing::Routes.draw do |map|
+	  # this routing controller has a before_filter callback that looks up a site by subdomain
+	  map.public_page '*path', :controller => 'routing', :conditions => { :subdomain => /^[^\.]+$/ }
+	
+	  map.with_options :conditions => { :subdomain => nil } do |admin|
+	    admin.resource :account, :controller => 'account'
+	    admin.resources :sites
+	    ...
+	  end
+	end
+
+Now, it gets tricky if you want `http://cool-site.com` to render `cool-site`'s public content because you can't tell if this request has a subdomain or not. In order for your routes to work, you must have all requests coming in from your domain `yourcmsapp.com`. You can accomplish this by calling the `Proxy.replace_host_with(&block)` method like so:
+
+	class ApplicationController < ActionController::Base
+	  
+	  # you can put this in an initializer or something instead if you'd like
+	  Proxy.replace_host_with do |request|
+	    "#{Site.find_by_domain(request.host).try(:subdomain) || '-INVALID-'}.yourcmsapp.com" unless request.host =~ /(.*\.|^)yourcmsapp.com$/i
+	  end
+	  
+	end
+
+Let's examine what this block is doing:
+
+* First, it checks if the current request's host is already on your domain. If it is, we don't need to do anything, otherwise...
+* It checks if a site exists with a domain that matches the current request's host.
+* If a site does exist, a new host is returned using the site's `subdomain` with your app domain and everything renders fine, otherwise...
+* A fake host is returned (-INVALID-.yourcmsapp.com), and the request 404s once it gets to your `routing` controller and a site can't be found with the subdomain `-INVALID-`
+
+If `nil, false, or an empty string` is returned when you call the `Proxy.replace_host_with` method, the current request's host is not modified. Otherwise, the `HTTP_X_FORWARDED_HOST` request header is set to: `"#{the_original_host}, #{the_new_host}"`. This allows your routes to use your domain when evaluating routing conditions and also allows all of the application's url generators to use the original host.
+
+
+## Contact
 
 Problems, comments, and suggestions all welcome: [shuber@huberry.com](mailto:shuber@huberry.com)

data/Rakefile

@@ -3,15 +3,17 @@ require 'rake/testtask'
 require 'rake/rdoctask'
 
 desc 'Default: run the proxy tests'
-task :default => :test_all_versions
+task :default => :test
 
-desc 'Default: run the proxy tests for all versions of actionpack'
-task :test_all_versions do
-  versions = `gem list`.match(/actionpack \((.+)\)/).captures[0].split(/, /).select { |v| v[0,1].to_i > 1 }
-  versions.each do |version|
-    puts "\n\n============================================================="
-    puts "TESTING WITH ACTION PACK VERSION #{version}\n\n"
-    system "rake test ACTION_PACK_VERSION=#{version}"
+namespace :test do
+  desc 'Default: run the proxy tests for all versions of actionpack'
+  task :all do
+    versions = `gem list`.match(/actionpack \((.+)\)/).captures[0].split(/, /).select { |v| v[0,1].to_i > 1 }
+    versions.each do |version|
+      puts "\n\n============================================================="
+      puts "TESTING WITH ACTION PACK VERSION #{version}\n\n"
+      system "rake test ACTION_PACK_VERSION=#{version}"
+    end
   end
 end
 

data/lib/proxy.rb

@@ -1,15 +1,36 @@
-require 'huberry/proxy/action_controller/abstract_request'
-require 'huberry/proxy/action_controller/base'
-require 'huberry/proxy/action_controller/named_route_collection'
-require 'huberry/proxy/action_controller/url_rewriter'
-require 'huberry/proxy/action_view/url_helper'
+require 'proxy/action_controller/abstract_request'
+require 'proxy/action_controller/base'
+require 'proxy/action_controller/named_route_collection'
+require 'proxy/action_controller/url_rewriter'
+require 'proxy/action_view/url_helper'
+
+module Proxy
+  mattr_accessor :replace_host_with_proc
+  self.replace_host_with_proc = proc { |request| }
+  
+  def self.replace_host_with(&block)
+    self.replace_host_with_proc = block
+  end
+  
+  private
+  
+    def self.before_dispatch(dispatcher)
+      request = dispatcher.instance_variable_get('@request')
+      new_host = replace_host_with_proc.call(request)
+      request.env['HTTP_X_FORWARDED_HOST'] = [request.host, new_host].join(', ') unless new_host.blank?
+    end
+end
+
+ActionController::Dispatcher.before_dispatch do |dispatcher|
+  Proxy.send :before_dispatch, dispatcher
+end
 
 ActionController::AbstractRequest = ActionController::Request if defined?(ActionController::Request)
-ActionController::AbstractRequest.send :include, Huberry::Proxy::ActionController::AbstractRequest
-ActionController::Base.send :include, Huberry::Proxy::ActionController::Base
-ActionController::Routing::RouteSet::NamedRouteCollection.send :include, Huberry::Proxy::ActionController::NamedRouteCollection
-ActionController::UrlRewriter.send :include, Huberry::Proxy::ActionController::UrlRewriter
-ActionView::Base.send :include, Huberry::Proxy::ActionView::UrlHelper
+ActionController::AbstractRequest.send :include, Proxy::ActionController::AbstractRequest
+ActionController::Base.send :include, Proxy::ActionController::Base
+ActionController::Routing::RouteSet::NamedRouteCollection.send :include, Proxy::ActionController::NamedRouteCollection
+ActionController::UrlRewriter.send :include, Proxy::ActionController::UrlRewriter
+ActionView::Base.send :include, Proxy::ActionView::UrlHelper
 
 unless ActionController::UrlWriter.respond_to?(:default_url_options)
   ActionController::Base.class_eval do

data/lib/proxy/action_controller/abstract_request.rb

@@ -0,0 +1,41 @@
+module Proxy
+  module ActionController
+    module AbstractRequest
+      def self.included(base)
+        base.class_eval do
+          mattr_accessor :forwarded_uri_header_name
+          self.forwarded_uri_header_name = 'HTTP_X_FORWARDED_URI'
+          memoize :forwarded_hosts, :forwarded_uris if respond_to? :memoize
+        end
+      end
+    
+      # Parses the forwarded host header and returns an array of forwarded hosts
+      #
+      # For example:
+      #
+      #   If the HTTP_X_FORWARDED_HOST header was set to 
+      #     'some-domain.com, some-other-domain.com, and-another-domain.com'
+      #
+      # This method would return ['some-domain.com', 'some-other-domain.com', 'and-another-domain.com']
+      #
+      # Returns an empty array if there aren't any forwarded hosts
+      def forwarded_hosts
+        env['HTTP_X_FORWARDED_HOST'].to_s.split(/,\s*/)
+      end
+    
+      # Parses the forwarded uri header and returns an array of forwarded uris
+      #
+      # For example:
+      #
+      #   If the HTTP_X_FORWARDED_URI header was set to 
+      #     '/some/path, /some/other/path, /and/another/path'
+      #
+      # This method would return ['/some/path, '/some/other/path', '/and/another/path']
+      #
+      # Returns an empty array if there aren't any forwarded uris
+      def forwarded_uris
+        env[self.forwarded_uri_header_name].to_s.split(/,\s*/)
+      end
+    end
+  end
+end

data/lib/proxy/action_controller/base.rb

@@ -0,0 +1,120 @@
+module Proxy
+  module ActionController
+    module Base
+      def self.included(base)
+        base.class_eval do
+          before_filter :set_proxy_relative_url_root
+          around_filter :swap_default_host
+          around_filter :swap_relative_url_root
+          around_filter :swap_session_domain
+          cattr_accessor :original_relative_url_root
+          cattr_accessor :proxy_relative_url_root
+          alias_method_chain :redirect_to, :proxy
+          class << self; delegate :relative_url_root, :relative_url_root=, :to => ::ActionController::AbstractRequest unless ::ActionController::Base.respond_to?(:relative_url_root); end
+        end
+      end
+      
+      protected
+    
+        # Calculates the <tt>relative_url_root</tt> by parsing the request path out of the
+        # first forwarded uri
+        #
+        # For example:
+        #
+        #   http://example.com/manage/videos/new
+        #     gets proxied to
+        #   http://your-domain.com/videos/new
+        #
+        # The first forwarded uri would be: /manage/videos/new
+        # and the request path would be:    /videos/new
+        #
+        # So this method would return: /manage
+        def parse_proxy_relative_url_root
+          request.forwarded_uris.first.gsub(/#{Regexp.escape(request.path)}$/, '')
+        end
+      
+        # Calculates the <tt>session_domain</tt> by parsing the first domain.tld out of the
+        # first forwarded host and prepending a '.'
+        #
+        # For example:
+        #
+        #   http://example.com/manage/videos/new
+        #   http://some.other-domain.com/videos/new
+        #     both get proxied to
+        #   http://your-domain.com/videos/new
+        #
+        # The resulting session domain for the first url would be: '.example.com'
+        # The resulting session domain for the second url would be: '.other-domain.com'
+        def parse_session_domain
+          ".#{$1}" if /([^\.]+\.[^\.]+)$/.match(request.forwarded_hosts.first)
+        end
+      
+        # Forces redirects to use the <tt>default_url_options[:host]</tt> if it exists unless a host
+        # is already set
+        #
+        # For example:
+        #
+        #   http://example.com
+        #     gets proxied to
+        #   http://your-domain.com
+        #
+        # If you have an action that calls <tt>redirect_to new_videos_path</tt>, the example.com domain
+        # would be used instead of your-domain.com
+        def redirect_to_with_proxy(*args)
+          args[0] = request.protocol + ::ActionController::UrlWriter.default_url_options[:host] + args.first if args.first.is_a?(String) && !%r{^\w+://.*}.match(args.first) && !::ActionController::UrlWriter.default_url_options[:host].blank?
+          redirect_to_without_proxy(*args)
+        end
+    
+        # Sets the <tt>proxy_relative_url_root</tt> using the +parse_proxy_relative_url_root+ method
+        # to calculate it
+        #
+        # Sets the <tt>proxy_relative_url_root</tt> to nil if there aren't any forwarded uris
+        def set_proxy_relative_url_root
+          ::ActionController::Base.proxy_relative_url_root = request.forwarded_uris.empty? ? nil : parse_proxy_relative_url_root
+        end
+      
+        # Sets the <tt>default_url_options[:host]</tt> to the first forwarded host if there are any
+        #
+        # The original default host is restored after each request and can be accessed by calling
+        #   <tt>ActionController::UrlWriter.default_url_options[:original_host]</tt>
+        def swap_default_host
+          ::ActionController::UrlWriter.default_url_options[:original_host] = ::ActionController::UrlWriter.default_url_options[:host]
+          ::ActionController::UrlWriter.default_url_options[:host] = request.forwarded_hosts.first unless request.forwarded_hosts.empty?
+          begin
+            yield
+          ensure
+            ::ActionController::UrlWriter.default_url_options[:host] = ::ActionController::UrlWriter.default_url_options[:original_host]
+          end
+        end
+      
+        # Sets the <tt>relative_url_root</tt> to the <tt>proxy_relative_url_root</tt> unless it's nil
+        #
+        # The original relative url root is restored after each request and can be accessed by calling
+        #   <tt>ActionController::Base.original_relative_url_root</tt>
+        def swap_relative_url_root
+          ::ActionController::Base.original_relative_url_root = ::ActionController::Base.relative_url_root
+          ::ActionController::Base.relative_url_root = ::ActionController::Base.proxy_relative_url_root unless ::ActionController::Base.proxy_relative_url_root.nil?
+          begin
+            yield
+          ensure
+            ::ActionController::Base.relative_url_root = ::ActionController::Base.original_relative_url_root
+          end
+        end
+      
+        # Sets the <tt>session_options[:session_domain]</tt> to the result of the +parse_session_domain+ method
+        # unless there aren't any forwarded hosts
+        #
+        # The original session domain is restored after each request and can be accessed by calling
+        #   <tt>ActionController::Base.session_options[:original_session_domain]</tt>
+        def swap_session_domain
+          ::ActionController::Base.session_options[:original_session_domain] = ::ActionController::Base.session_options[:session_domain]
+          ::ActionController::Base.session_options[:session_domain] = parse_session_domain unless request.forwarded_hosts.empty?
+          begin
+            yield
+          ensure
+            ::ActionController::Base.session_options[:session_domain] = ::ActionController::Base.session_options[:original_session_domain]
+          end
+        end
+    end
+  end
+end

data/lib/proxy/action_controller/named_route_collection.rb

@@ -0,0 +1,30 @@
+module Proxy
+  module ActionController
+    module NamedRouteCollection
+      def self.included(base)
+        base.class_eval { alias_method_chain :define_url_helper, :proxy }
+      end
+    
+      # Named route url helpers (not path helpers) don't seem to work correctly 
+      # with forwarded hosts unless we explicitly set the option:
+      #
+      #   :only_path => false
+      #
+      # This method only sets that option if it isn't set already
+      def define_url_helper_with_proxy(route, name, kind, options)
+        define_url_helper_without_proxy(route, name, kind, options)
+        if kind == :url
+          selector = url_helper_name(name, kind)
+          @module.module_eval do
+            define_method "#{selector}_with_proxy" do |*args|
+              args << {} unless args.last.is_a? Hash
+              args.last[:only_path] ||= false
+              send "#{selector}_without_proxy", *args
+            end
+            alias_method_chain selector, :proxy
+          end
+        end
+      end
+    end
+  end
+end

data/lib/proxy/action_controller/url_rewriter.rb

@@ -0,0 +1,21 @@
+module Proxy
+  module ActionController
+    module UrlRewriter
+      def self.included(base)
+        base.class_eval { alias_method_chain :rewrite_url, :proxy }
+      end
+    
+      # Adds the default :host option unless already specified
+      #
+      # It will not set the :host option if <tt>options</tt> is not a hash or
+      # if the <tt>ActionController::UrlWriter.default_url_options[:host]</tt> is blank
+      def rewrite_url_with_proxy(options)
+        if options.is_a?(Hash)
+          options[:host] ||= ::ActionController::UrlWriter.default_url_options[:host] unless ::ActionController::UrlWriter.default_url_options[:host].blank?
+          options.delete(:original_host)
+        end
+        rewrite_url_without_proxy(options)
+      end
+    end
+  end
+end

data/lib/proxy/action_view/url_helper.rb

@@ -0,0 +1,21 @@
+module Proxy
+  module ActionView
+    module UrlHelper
+      def self.included(base)
+        base.class_eval { alias_method_chain :url_for, :proxy }
+      end
+    
+      # Adds the default :host option unless already specified
+      #
+      # It will not set the :host option if <tt>options</tt> is not a hash or
+      # if the <tt>ActionController::UrlWriter.default_url_options[:host]</tt> is blank
+      def url_for_with_proxy(options = {})
+        if options.is_a?(Hash)
+          options[:host] ||= ::ActionController::UrlWriter.default_url_options[:host] unless ::ActionController::UrlWriter.default_url_options[:host].blank?
+          options.delete(:original_host)
+        end
+        url_for_without_proxy(options)
+      end
+    end
+  end
+end

data/test/proxy_test.rb

@@ -0,0 +1,34 @@
+require File.dirname(__FILE__) + '/init'
+
+class ProxyTest < Test::Unit::TestCase
+
+  def setup
+    @controller = TestController.new
+    @request    = ActionController::TestRequest.new
+    def @request.host; env['HTTP_X_FORWARDED_HOST'].blank? ? env['HTTP_HOST'] : env['HTTP_X_FORWARDED_HOST'].split(/,\s/).last; end
+    @response   = ActionController::TestResponse.new
+    @dispatcher = ActionController::Dispatcher.new(StringIO.new)
+    @dispatcher.instance_variable_set('@request', @request)
+    ActionController::UrlWriter.default_url_options[:host] = nil
+    ActionController::Base.relative_url_root = nil
+    
+    Proxy.replace_host_with do |request|
+      'replaced.com' if request.host == 'replace-me.com'
+    end
+  end
+  
+  def test_should_not_replace_host
+    @request.env['HTTP_HOST'] = 'dont-replace-me.com'
+    assert_equal 'dont-replace-me.com', @request.host
+    Proxy.send(:before_dispatch, @dispatcher)
+    assert_equal 'dont-replace-me.com', @request.host
+  end
+  
+  def test_should_replace_host
+    @request.env['HTTP_HOST'] = 'replace-me.com'
+    assert_equal 'replace-me.com', @request.host
+    Proxy.send(:before_dispatch, @dispatcher)
+    assert_equal 'replaced.com', @request.host
+  end
+  
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: shuber-proxy
 version: !ruby/object:Gem::Version 
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors: 
 - Sean Huber
@@ -9,11 +9,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-20 00:00:00 -07:00
+date: 2009-06-04 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
-description: A gem/plugin that allows rails applications to dynamically respond to proxied requests by detecting forwarded host/uri headers and setting the session domain, default host, and relative url root
+description: A gem/plugin that allows rails applications to respond to multiple domains and proxied requests
 email: shuber@huberry.com
 executables: []
 
@@ -24,11 +24,11 @@ extra_rdoc_files: []
 files: 
 - CHANGELOG
 - init.rb
-- lib/huberry/proxy/action_controller/abstract_request.rb
-- lib/huberry/proxy/action_controller/base.rb
-- lib/huberry/proxy/action_controller/named_route_collection.rb
-- lib/huberry/proxy/action_controller/url_rewriter.rb
-- lib/huberry/proxy/action_view/url_helper.rb
+- lib/proxy/action_controller/abstract_request.rb
+- lib/proxy/action_controller/base.rb
+- lib/proxy/action_controller/named_route_collection.rb
+- lib/proxy/action_controller/url_rewriter.rb
+- lib/proxy/action_view/url_helper.rb
 - lib/proxy.rb
 - MIT-LICENSE
 - Rakefile
@@ -61,10 +61,11 @@ rubyforge_project:
 rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
-summary: A gem/plugin that allows rails applications to dynamically respond to proxied requests
+summary: A gem/plugin that allows rails applications to respond to multiple domains and proxied requests
 test_files: 
 - test/abstract_request_test.rb
 - test/base_test.rb
 - test/named_route_collection_test.rb
+- test/proxy_test.rb
 - test/url_helper_test.rb
 - test/url_rewriter_test.rb

data/lib/huberry/proxy/action_controller/abstract_request.rb

@@ -1,43 +0,0 @@
-module Huberry
-  module Proxy
-    module ActionController
-      module AbstractRequest
-        def self.included(base)
-          base.class_eval do
-            mattr_accessor :forwarded_uri_header_name
-            self.forwarded_uri_header_name = 'HTTP_X_FORWARDED_URI'
-            memoize :forwarded_hosts, :forwarded_uris if respond_to? :memoize
-          end
-        end
-      
-        # Parses the forwarded host header and returns an array of forwarded hosts
-        #
-        # For example:
-        #
-        #   If the HTTP_X_FORWARDED_HOST header was set to 
-        #     'some-domain.com, some-other-domain.com, and-another-domain.com'
-        #
-        # This method would return ['some-domain.com', 'some-other-domain.com', 'and-another-domain.com']
-        #
-        # Returns an empty array if there aren't any forwarded hosts
-        def forwarded_hosts
-          env['HTTP_X_FORWARDED_HOST'].to_s.split(/,\s*/)
-        end
-      
-        # Parses the forwarded uri header and returns an array of forwarded uris
-        #
-        # For example:
-        #
-        #   If the HTTP_X_FORWARDED_URI header was set to 
-        #     '/some/path, /some/other/path, /and/another/path'
-        #
-        # This method would return ['/some/path, '/some/other/path', '/and/another/path']
-        #
-        # Returns an empty array if there aren't any forwarded uris
-        def forwarded_uris
-          env[self.forwarded_uri_header_name].to_s.split(/,\s*/)
-        end
-      end
-    end
-  end
-end

data/lib/huberry/proxy/action_controller/base.rb

@@ -1,122 +0,0 @@
-module Huberry
-  module Proxy
-    module ActionController
-      module Base
-        def self.included(base)
-          base.class_eval do
-            before_filter :set_proxy_relative_url_root
-            around_filter :swap_default_host
-            around_filter :swap_relative_url_root
-            around_filter :swap_session_domain
-            cattr_accessor :original_relative_url_root
-            cattr_accessor :proxy_relative_url_root
-            alias_method_chain :redirect_to, :proxy
-            class << self; delegate :relative_url_root, :relative_url_root=, :to => ::ActionController::AbstractRequest unless ::ActionController::Base.respond_to?(:relative_url_root); end
-          end
-        end
-
-        protected
-      
-          # Calculates the <tt>relative_url_root</tt> by parsing the request path out of the
-          # first forwarded uri
-          #
-          # For example:
-          #
-          #   http://example.com/manage/videos/new
-          #     gets proxied to
-          #   http://your-domain.com/videos/new
-          #
-          # The first forwarded uri would be: /manage/videos/new
-          # and the request path would be:    /videos/new
-          #
-          # So this method would return: /manage
-          def parse_proxy_relative_url_root
-            request.forwarded_uris.first.gsub(/#{Regexp.escape(request.path)}$/, '')
-          end
-        
-          # Calculates the <tt>session_domain</tt> by parsing the first domain.tld out of the
-          # first forwarded host and prepending a '.'
-          #
-          # For example:
-          #
-          #   http://example.com/manage/videos/new
-          #   http://some.other-domain.com/videos/new
-          #     both get proxied to
-          #   http://your-domain.com/videos/new
-          #
-          # The resulting session domain for the first url would be: '.example.com'
-          # The resulting session domain for the second url would be: '.other-domain.com'
-          def parse_session_domain
-            ".#{$1}" if /([^\.]+\.[^\.]+)$/.match(request.forwarded_hosts.first)
-          end
-        
-          # Forces redirects to use the <tt>default_url_options[:host]</tt> if it exists unless a host
-          # is already set
-          #
-          # For example:
-          #
-          #   http://example.com
-          #     gets proxied to
-          #   http://your-domain.com
-          #
-          # If you have an action that calls <tt>redirect_to new_videos_path</tt>, the example.com domain
-          # would be used instead of your-domain.com
-          def redirect_to_with_proxy(*args)
-            args[0] = request.protocol + ::ActionController::UrlWriter.default_url_options[:host] + args.first if args.first.is_a?(String) && !%r{^\w+://.*}.match(args.first) && !::ActionController::UrlWriter.default_url_options[:host].blank?
-            redirect_to_without_proxy(*args)
-          end
-      
-          # Sets the <tt>proxy_relative_url_root</tt> using the +parse_proxy_relative_url_root+ method
-          # to calculate it
-          #
-          # Sets the <tt>proxy_relative_url_root</tt> to nil if there aren't any forwarded uris
-          def set_proxy_relative_url_root
-            ::ActionController::Base.proxy_relative_url_root = request.forwarded_uris.empty? ? nil : parse_proxy_relative_url_root
-          end
-        
-          # Sets the <tt>default_url_options[:host]</tt> to the first forwarded host if there are any
-          #
-          # The original default host is restored after each request and can be accessed by calling
-          #   <tt>ActionController::UrlWriter.default_url_options[:original_host]</tt>
-          def swap_default_host
-            ::ActionController::UrlWriter.default_url_options[:original_host] = ::ActionController::UrlWriter.default_url_options[:host]
-            ::ActionController::UrlWriter.default_url_options[:host] = request.forwarded_hosts.first unless request.forwarded_hosts.empty?
-            begin
-              yield
-            ensure
-              ::ActionController::UrlWriter.default_url_options[:host] = ::ActionController::UrlWriter.default_url_options[:original_host]
-            end
-          end
-        
-          # Sets the <tt>relative_url_root</tt> to the <tt>proxy_relative_url_root</tt> unless it's nil
-          #
-          # The original relative url root is restored after each request and can be accessed by calling
-          #   <tt>ActionController::Base.original_relative_url_root</tt>
-          def swap_relative_url_root
-            ::ActionController::Base.original_relative_url_root = ::ActionController::Base.relative_url_root
-            ::ActionController::Base.relative_url_root = ::ActionController::Base.proxy_relative_url_root unless ::ActionController::Base.proxy_relative_url_root.nil?
-            begin
-              yield
-            ensure
-              ::ActionController::Base.relative_url_root = ::ActionController::Base.original_relative_url_root
-            end
-          end
-        
-          # Sets the <tt>session_options[:session_domain]</tt> to the result of the +parse_session_domain+ method
-          # unless there aren't any forwarded hosts
-          #
-          # The original session domain is restored after each request and can be accessed by calling
-          #   <tt>ActionController::Base.session_options[:original_session_domain]</tt>
-          def swap_session_domain
-            ::ActionController::Base.session_options[:original_session_domain] = ::ActionController::Base.session_options[:session_domain]
-            ::ActionController::Base.session_options[:session_domain] = parse_session_domain unless request.forwarded_hosts.empty?
-            begin
-              yield
-            ensure
-              ::ActionController::Base.session_options[:session_domain] = ::ActionController::Base.session_options[:original_session_domain]
-            end
-          end
-      end
-    end
-  end
-end

data/lib/huberry/proxy/action_controller/named_route_collection.rb

@@ -1,32 +0,0 @@
-module Huberry
-  module Proxy
-    module ActionController
-      module NamedRouteCollection
-        def self.included(base)
-          base.class_eval { alias_method_chain :define_url_helper, :proxy }
-        end
-      
-        # Named route url helpers (not path helpers) don't seem to work correctly 
-        # with forwarded hosts unless we explicitly set the option:
-        #
-        #   :only_path => false
-        #
-        # This method only sets that option if it isn't set already
-        def define_url_helper_with_proxy(route, name, kind, options)
-          define_url_helper_without_proxy(route, name, kind, options)
-          if kind == :url
-            selector = url_helper_name(name, kind)
-            @module.module_eval do
-              define_method "#{selector}_with_proxy" do |*args|
-                args << {} unless args.last.is_a? Hash
-                args.last[:only_path] ||= false
-                send "#{selector}_without_proxy", *args
-              end
-              alias_method_chain selector, :proxy
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/lib/huberry/proxy/action_controller/url_rewriter.rb

@@ -1,23 +0,0 @@
-module Huberry
-  module Proxy
-    module ActionController
-      module UrlRewriter
-        def self.included(base)
-          base.class_eval { alias_method_chain :rewrite_url, :proxy }
-        end
-      
-        # Adds the default :host option unless already specified
-        #
-        # It will not set the :host option if <tt>options</tt> is not a hash or
-        # if the <tt>ActionController::UrlWriter.default_url_options[:host]</tt> is blank
-        def rewrite_url_with_proxy(options)
-          if options.is_a?(Hash)
-            options[:host] ||= ::ActionController::UrlWriter.default_url_options[:host] unless ::ActionController::UrlWriter.default_url_options[:host].blank?
-            options.delete(:original_host)
-          end
-          rewrite_url_without_proxy(options)
-        end
-      end
-    end
-  end
-end

data/lib/huberry/proxy/action_view/url_helper.rb

@@ -1,23 +0,0 @@
-module Huberry
-  module Proxy
-    module ActionView
-      module UrlHelper
-        def self.included(base)
-          base.class_eval { alias_method_chain :url_for, :proxy }
-        end
-      
-        # Adds the default :host option unless already specified
-        #
-        # It will not set the :host option if <tt>options</tt> is not a hash or
-        # if the <tt>ActionController::UrlWriter.default_url_options[:host]</tt> is blank
-        def url_for_with_proxy(options = {})
-          if options.is_a?(Hash)
-            options[:host] ||= ::ActionController::UrlWriter.default_url_options[:host] unless ::ActionController::UrlWriter.default_url_options[:host].blank?
-            options.delete(:original_host)
-          end
-          url_for_without_proxy(options)
-        end
-      end
-    end
-  end
-end