refraction 0.1.3 → 0.1.4

data/README.md

@@ -129,4 +129,5 @@ agent property.
   * Josh Susser (maintainer)
   * Sam Pierson
   * Wai Lun Mang
+  * Brian Morearty
 

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/init.rb

@@ -0,0 +1 @@
+require "refraction"

data/lib/refraction.rb

@@ -2,83 +2,24 @@ require 'rack'
 require 'uri'
 
 class Refraction
-  class RequestContext
-    attr_reader :env
-    attr_reader :status, :message, :action
-
-    def initialize(env)
-      @action = nil
-      @env = env
-
-      hostname = env['SERVER_NAME']   # because the rack mock doesn't set the HTTP_HOST
-      hostname = env['HTTP_HOST'].split(':').first if env['HTTP_HOST']
-      env_path = env['PATH_INFO'] || env['REQUEST_PATH']
-
-      @uri = URI::Generic.build(
-        :scheme => env['rack.url_scheme'],
-        :host   => hostname,
-        :path   => env_path.empty? ? '/' : env_path
-      )
-      unless [URI::HTTP::DEFAULT_PORT, URI::HTTPS::DEFAULT_PORT].include?(env['SERVER_PORT'].to_i)
-        @uri.port = env['SERVER_PORT']
-      end
-      @uri.query = env['QUERY_STRING'] if env['QUERY_STRING'] && !env['QUERY_STRING'].empty?
-    end
-
-    def response
-      headers = @headers || { 'Location' => location, 'Content-Type' => 'text/plain' }
-      headers['Content-Length'] = message.length.to_s
-      [status, headers, [message]]
-    end
-
-    # URI part accessors
-
-    def scheme
-      @uri.scheme
-    end
-
-    def host
-      @uri.host
-    end
-
-    def port
-      @uri.port
-    end
-
-    def path
-      @uri.path
-    end
-
-    def query
-      @uri.query
-    end
 
-    def method
-      @env['REQUEST_METHOD']
-    end
-
-    # borrowed from Rack Request class, i.e. time to refactor
-    def ip
-      if addr = @env['HTTP_X_FORWARDED_FOR']
-        addr.split(',').last.strip
-      else
-        @env['REMOTE_ADDR']
-      end
-    end
+  class Request < Rack::Request
+    attr_reader :action, :status, :message
+    def method; request_method; end
+    def query;  query_string;   end
 
-    # actions
+    ### actions
 
     def set(options)
       if options.is_a?(String)
-        @uri = URI.parse(options)
+        @re_location = options
       else
-        if [:scheme, :protocol, :host, :port].any? {|k| options[k]}
-          @uri.port = nil
-        end
-        options.each do |k,v|
-          k = 'scheme' if k == :protocol
-          @uri.send("#{k}=", v)
-        end
+        @re_scheme = options[:protocol] if options[:protocol] # :protocol is alias for :scheme
+        @re_scheme = options[:scheme]   if options[:scheme]
+        @re_host   = options[:host]     if options[:host]
+        @re_port   = options[:port]     if options[:port]
+        @re_path   = options[:path]     if options[:path]
+        @re_query  = options[:query]    if options[:query]
       end
     end
 
@@ -108,11 +49,39 @@ class Refraction
       @message = content
     end
 
+    ### response
+
+    def response
+      headers = @headers || { 'Location' => location, 'Content-Type' => 'text/plain' }
+      headers['Content-Length'] = message.length.to_s
+      [status, headers, [message]]
+    end
+
     def location
-      @uri.to_s
+      @re_location || url
+    end
+
+    def scheme;       @re_scheme || super; end
+    def host;         @re_host   || super; end
+    def path;         @re_path   || super; end
+    def query_string; @re_query  || super; end
+
+    def port
+      @re_port || ((@re_scheme || @re_host) && default_port) || super
+    end
+
+    def default_port
+      case scheme
+      when "http"  ; 80
+      when "https" ; 443
+      end
+    end
+
+    def http_host
+      self.port ? "#{self.host}:#{self.port}" : self.host
     end
 
-  end   # RequestContext
+  end ### class Request
 
   def self.configure(&block)
     @rules = block
@@ -132,20 +101,21 @@ class Refraction
 
   def call(env)
     if self.rules
-      context = RequestContext.new(env)
+      request = Request.new(env)
 
-      self.rules.call(context)
+      self.rules.call(request)
 
-      case context.action
+      case request.action
       when :permanent, :found, :respond
-        context.response
+        request.response
       when :rewrite
-        env["rack.url_scheme"]                 = context.scheme
-        env["HTTP_HOST"] = env["SERVER_NAME"]  = context.host
-        env["HTTP_PORT"]                       = context.port if context.port
-        env["PATH_INFO"] = env["REQUEST_PATH"] = context.path
-        env["QUERY_STRING"]                    = context.query
-        env["REQUEST_URI"] = context.query ? "#{context.path}?#{context.query}" : context.path
+        env["rack.url_scheme"]  = request.scheme
+        env["HTTP_HOST"]        = request.http_host
+        env["SERVER_NAME"]      = request.host
+        env["HTTP_PORT"]        = request.port if request.port
+        env["PATH_INFO"]        = request.path
+        env["QUERY_STRING"]     = request.query
+        env["REQUEST_URI"]      = request.fullpath
         @app.call(env)
       else
         @app.call(env)
@@ -155,3 +125,13 @@ class Refraction
     end
   end
 end
+
+# Rack version compatibility shim
+
+if Rack.release == "1.0"
+  class Rack::Request
+    def path
+      script_name + path_info
+    end
+  end
+end

data/refraction.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{refraction}
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Pivotal Labs", "Josh Susser", "Sam Pierson", "Wai Lun Mang"]
-  s.date = %q{2009-12-23}
+  s.date = %q{2010-07-01}
   s.description = %q{Reflection is a Rails plugin and standalone Rack middleware library. Give up quirky config syntax and use plain old Ruby for your rewrite and redirection rules.}
   s.email = %q{gems@pivotallabs.com}
   s.extra_rdoc_files = [
@@ -21,6 +21,7 @@ Gem::Specification.new do |s|
      "Rakefile",
      "VERSION",
      "geminstaller.yml",
+     "init.rb",
      "install.rb",
      "lib/refraction.rb",
      "refraction.gemspec",
@@ -30,7 +31,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/pivotal/refraction}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{Rack middleware replacement for mod_rewrite}
   s.test_files = [
     "spec/refraction_spec.rb",

data/spec/refraction_spec.rb

@@ -91,21 +91,81 @@ describe Refraction do
         response[1]['Location'].should == "http://foo.com/bar?baz"
       end
     end
-  end
 
-  describe "using hash arguments but not changing scheme, host, or port" do
-    before do
+    describe "using hash arguments but not changing scheme, host, or port" do
+      before do
+        Refraction.configure do |req|
+          req.permanent! :path => "/bar", :query => "baz"
+        end
+      end
+
+      it "should not clear the port" do
+        env = Rack::MockRequest.env_for('http://bar.com:3000/', :method => 'get')
+        app = mock('app')
+        response = Refraction.new(app).call(env)
+        response[0].should == 301
+        response[1]['Location'].should == "http://bar.com:3000/bar?baz"
+      end
+    end
+
+    describe "with or without port number" do
+    before(:each) do
       Refraction.configure do |req|
-        req.permanent! :path => "/bar", :query => "baz"
+        case req.host 
+        when "asterix.example.com"
+          req.permanent! :path => "/potion#{req.path}"
+        when "obelix.example.com"
+          req.permanent! :host => "menhir.example.com"
+        when "getafix.example.com"
+          req.permanent! :scheme => "https"
+        when "dogmatix.example.com"
+          req.permanent! :port => 3001
+        end
       end
     end
 
-    it "should not clear the port" do
-      env = Rack::MockRequest.env_for('http://bar.com:3000/', :method => 'get')
-      app = mock('app')
-      response = Refraction.new(app).call(env)
-      response[0].should == 301
-      response[1]['Location'].should == "http://bar.com:3000/bar?baz"
+      it "should include port in Location if request had a port and didn't change scheme, host, or port" do
+        env = Rack::MockRequest.env_for('http://asterix.example.com:3000/1', :method => 'get')
+        app = mock('app')
+        response = Refraction.new(app).call(env)
+        response[0].should == 301
+        response[1]['Location'].should include("asterix.example.com:3000")
+      end
+
+      it "should not include port in Location if request didn't specify a port" do
+        env = Rack::MockRequest.env_for('http://asterix.example.com/1', :method => 'get')
+        app = mock('app')
+        response = Refraction.new(app).call(env)
+        response[0].should == 301
+        response[1]['Location'].should include("asterix.example.com")
+        response[1]['Location'].should_not include(":3000")
+      end
+
+      it "should remove port from Location if host was changed" do
+        env = Rack::MockRequest.env_for('http://obelix.example.com:3000/1', :method => 'get')
+        app = mock('app')
+        response = Refraction.new(app).call(env)
+        response[0].should == 301
+        response[1]['Location'].should include("menhir.example.com")
+        response[1]['Location'].should_not include(":3000")
+      end
+
+      it "should remove port from Location if scheme was changed" do
+        env = Rack::MockRequest.env_for('http://getafix.example.com:3000/1', :method => 'get')
+        app = mock('app')
+        response = Refraction.new(app).call(env)
+        response[0].should == 301
+        response[1]['Location'].should include("getafix.example.com")
+        response[1]['Location'].should_not include(":3000")
+      end
+
+      it "should change port in Location if port was changed" do
+        env = Rack::MockRequest.env_for('http://dogmatix.example.com:3000/1', :method => 'get')
+        app = mock('app')
+        response = Refraction.new(app).call(env)
+        response[0].should == 301
+        response[1]['Location'].should include("dogmatix.example.com:3001")
+      end
     end
   end
 

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: refraction
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  prerelease: false
+  segments: 
+  - 0
+  - 1
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Pivotal Labs
@@ -12,19 +17,23 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-23 00:00:00 -08:00
+date: 2010-07-01 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 2
+        - 9
         version: 1.2.9
-    version: 
+  type: :development
+  version_requirements: *id001
 description: Reflection is a Rails plugin and standalone Rack middleware library. Give up quirky config syntax and use plain old Ruby for your rewrite and redirection rules.
 email: gems@pivotallabs.com
 executables: []
@@ -39,6 +48,7 @@ files:
 - Rakefile
 - VERSION
 - geminstaller.yml
+- init.rb
 - install.rb
 - lib/refraction.rb
 - refraction.gemspec
@@ -57,18 +67,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Rack middleware replacement for mod_rewrite