rack-host-redirect 1.1.2 → 1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cdbb38de454a694add16aba10f8c4518abbffd65
-  data.tar.gz: 3ccc2a649f0c8146b9b1eadce5554959f75b3bbc
+  metadata.gz: 5fb6542ad2bd4e616e14c8707e257631d5d8b41d
+  data.tar.gz: 9049c9f3270af53ae3ab186c10dfc22217a5a986
 SHA512:
-  metadata.gz: 20be1733ff93683272a241f6191e95a1025a673daf2a0e9136036e61f7eebb6cb9e3c281c9e277e72a3805eaad4672b76f84f3e2a732bb76575831b2bc89540f
-  data.tar.gz: 55fb6747c589a71c8f2723ac5766c699fb9e05a0421873943c38fe0350ccaf3e27d6f4b1a018c203b81b01258beb952eb32018e2c27432b1684758edc09a9a61
+  metadata.gz: bcdcc7f90caac858ee69004ced4c86834e75872624a5025129c4ad294b6ae1e59a350b38447793261206c8bb530b706574caf1a5f8816d0f277626a884919c28
+  data.tar.gz: e142502f621e2e72b91f5bb20552a2c0d5f691107df77e458d576ce6ffdf2e0fa154cad86a8925758fb66c5c052b42a8cec0168f08fa38caae6da74714d3929d

data/lib/rack/host_redirect.rb

@@ -1,21 +1,19 @@
 require 'rack/request'
+require 'uri'
 
 class Rack::HostRedirect
 
-  def initialize(app, host_mapping = nil, &block)
+  def initialize(app, host_mapping)
     @app = app
-    @host_mapping = downcase_keys(host_mapping) if host_mapping
-    @block = block
+    @host_mapping = preprocess_mapping(host_mapping)
   end
 
   def call(env)
     request = Rack::Request.new(env)
     host = request.host.downcase # downcase for case-insensitive matching
 
-    updated_host = (@host_mapping && @host_mapping[host]) || (@block && @block.call(host, env))
-
-    if updated_host && updated_host.downcase != host
-      location = replace_host(request.url, updated_host)
+    if updated_uri_opts = @host_mapping[host]
+      location = update_url(request.url, updated_uri_opts)
       [301, {'Location' => location}, []]
     else
       @app.call(env)
@@ -24,20 +22,37 @@ class Rack::HostRedirect
 
   private
 
-    def downcase_keys hsh
-      hsh.inject({}) {|out, (k, v)| out[k.downcase] = v; out }
+    def preprocess_mapping hsh
+      hsh.inject({}) do |out, (k, opts)| 
+        opts = {:host => opts} if opts.is_a?(String)
+        
+        if newhost = opts[:host]
+          opts[:host] = newhost.downcase
+        else
+          raise ArgumentError, ":host key must be specified in #{opts.inspect}"
+        end
+
+        [k].flatten.each do |oldhost|
+          oldhost = oldhost.downcase
+
+          if oldhost == opts[:host]
+            raise ArgumentError, "Circular redirect to #{oldhost}"
+          else
+            out[oldhost] = opts
+          end
+        end
+
+        out
+      end
     end
 
-    # Captures everything in url except the host:
-    #
-    #     REPLACE_HOST_REGEX =~ 'https://foo.com/bar?baz=qux'
-    #
-    #     $1 == 'https://'
-    #     $2 == '/bar?baz=qux'
-    REPLACE_HOST_REGEX = /(https?:\/\/)[^\/\?:]+(.*)/
-
-    def replace_host url, host
-      REPLACE_HOST_REGEX =~ url
-      "#{$1}#{host}#{$2}"
+    def update_url url, opts
+      uri = URI(url)
+
+      opts.each do |k, v| 
+        uri.send(:"#{k}=", v)
+      end
+
+      uri.to_s
     end
 end

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: rack-host-redirect
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: '1.2'
 platform: ruby
 authors:
 - Geoff Buesing
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-22 00:00:00.000000000 Z
+date: 2014-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: 
@@ -56,17 +56,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Lean and simple host redirection via Rack middleware