rack-www 1.4.0 → 1.5.0

data/README.rdoc

@@ -36,6 +36,12 @@ If you like it's also possible to show a message while redirecting the user:
 
   config.middleware.use Rack::WWW, :www => false, :message => "You are being redirected..."
 
+You can optionally specify predicate to determine if redirect should take place:
+
+  config.middleware.use Rack::WWW, :predicate => lambda { |env|
+    !Rack::Request.new(env).params.has_key? "noredirect"
+  }
+
 
 === Options
 

data/lib/rack/www.rb

@@ -11,24 +11,48 @@ module Rack
       @redirect = @options[:www] if @options[:www] != nil
       @message = @options[:message]
       @subdomain = @options[:subdomain]
+      @predicate = @options[:predicate]
     end
 
     def call(env)
-      if (already_subdomain?(env) && @redirect) || (!already_subdomain?(env) && !@redirect)
-        @app.call(env)
+      if redirect?(env)
+        redirect(env)
       else
-        url = prepare_url(env)
-        headers = {"Content-Type" => "text/html", "location" => url}
-        if @message.respond_to?(:each)
-          message = @message
-        else
-          message = [@message || '']
-        end
-        [301, headers, message]
+        @app.call(env)
       end
     end
 
     private
+
+    def redirect(env)
+      url = prepare_url(env)
+      headers = {"Content-Type" => "text/html", "location" => url}
+
+      if @message.respond_to?(:each)
+        message = @message
+      else
+        message = [@message || '']
+      end
+      [301, headers, message]
+    end
+
+    def redirect?(env)
+      predicate?(env) && change_subdomain?(env)
+    end
+
+    def predicate?(env)
+      if @predicate
+        @predicate.call env
+      else
+        true
+      end
+    end
+
+    def change_subdomain?(env)
+      @redirect && !already_subdomain?(env) ||
+      !@redirect && already_subdomain?(env)
+    end
+
     def already_subdomain?(env)
       env["HTTP_HOST"].downcase =~ /^(#{@subdomain}.)/
     end

metadata

@@ -1,84 +1,67 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rack-www
-version: !ruby/object:Gem::Version 
-  hash: 7
+version: !ruby/object:Gem::Version
+  version: 1.5.0
   prerelease: 
-  segments: 
-  - 1
-  - 4
-  - 0
-  version: 1.4.0
 platform: ruby
-authors: 
+authors:
 - Jhimy Fernandes Villar
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-26 00:00:00 -03:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-06-25 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rack
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-description: "    Rack middleware to force subdomain redirects, e.g: www.\n"
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: ! '    Rack middleware to force subdomain redirects, e.g: www.
+
+'
 email: stjhimy@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/rack-www.rb
 - lib/rack/www.rb
 - LICENSE
 - CHANGELOG.rdoc
 - README.rdoc
-has_rdoc: true
 homepage: https://github.com/stjhimy/rack-www
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: "Force redirects to a any given subdomain, e.g: www."
+summary: ! 'Force redirects to a any given subdomain, e.g: www.'
 test_files: []
-