schmobile 0.0.4 → 0.0.5

data/README.rdoc

@@ -19,6 +19,10 @@ require session access.
 
 Finally the middleware provides Rack::Request#is_mobile?
 
+== Rolling out
+
+  use Rack::Schmobile, :redirect_to => "/mobile", :if => Proc.new { |request| request.host =~ /staging/ }
+
 == User agent detection
 
 You can add/remove user agents like so:

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/lib/rack/schmobile.rb

@@ -36,8 +36,10 @@ module Rack
     end
 
     def call(env)
-      if is_mobile_session?(env) && redirect?(env)
-        return [ 301, { "Location" => redirect(env) }, [] ]
+      request = Rack::Request.new(env)
+
+      if is_mobile_session?(env, request) && redirect?(request)
+        return [ 301, { "Location" => redirect(request) }, [] ]
       end
 
       @app.call(env)
@@ -45,10 +47,9 @@ module Rack
 
     # Checks if this session has been forced into mobile mode and returns that if that is the case. Otherwise
     # checks the user agent via request.is_mobile?
-    def is_mobile_session?(env)
+    def is_mobile_session?(env, request)
       session = env['rack.session'] ||= {}
 
-      request = Rack::Request.new(env)
       if request.params[SCHMOBILE_MODE]
         session[SCHMOBILE_MODE] = request.params[SCHMOBILE_MODE]
       end
@@ -62,13 +63,16 @@ module Rack
 
     # Returns true if this middleware has been configured with a redirect_to and the requested path is not already
     # below the configured redirect_to
-    def redirect?(env)
-      !redirect(env).empty? && Rack::Utils.unescape(env["PATH_INFO"]) !~ /^#{redirect(env)}/
+    def redirect?(request)
+      if @options[:if].is_a?(Proc)
+        return false unless @options[:if].call(request)
+      end
+
+      !redirect(request).empty? && request.path !~ /^#{redirect(request)}/
     end
 
-    def redirect(env)
+    def redirect(request)
       destination = @options[:redirect_to].to_s
-      request     = Rack::Request.new(env)
       build_path(destination, request)
     end
 
@@ -76,12 +80,12 @@ module Rack
 
     def build_path(destination, request)
       final_destination = destination.dup
-      destination.scan(/\{\{\w+\}\}/) { |call|
+      destination.scan(/\{\{\w+\}\}/) do |call|
         func = call.scan(/\w+/).to_s
         if request.respond_to?(func)
           final_destination.sub!(/\{\{#{func}\}\}/, request.send(func))
         end
-      }
+      end
       final_destination
     end
 

data/schmobile.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{schmobile}
-  s.version = "0.0.4"
+  s.version = "0.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Morten Primdahl"]

data/test/test_schmobile.rb

@@ -53,40 +53,40 @@ class TestSchmobile < Test::Unit::TestCase
     context "#is_mobile_session?" do
       should "return false for regular browsers" do
         Rack::Request.any_instance.expects(:params).returns({})
-        assert !@rack.is_mobile_session?(environment)
+        assert !@rack.is_mobile_session?(environment, request)
       end
 
       should "return true for a mobile browser" do
         Rack::Request.any_instance.expects(:params).returns({})
-        assert @rack.is_mobile_session?(environment("HTTP_USER_AGENT" => iphone))
+        assert @rack.is_mobile_session?(environment, request("HTTP_USER_AGENT" => iphone))
       end
 
       should "return false when forced in the session" do
-        Rack::Request.any_instance.expects(:params).returns({})
+        Rack::Request.any_instance.stubs(:params).returns({})
         Rack::Request.any_instance.expects(:is_mobile?).never
 
-        assert !@rack.is_mobile_session?(environment("HTTP_USER_AGENT" => iphone, "rack.session" => { Rack::Schmobile::SCHMOBILE_MODE => "disabled" }))
+        assert !@rack.is_mobile_session?(environment("HTTP_USER_AGENT" => iphone, "rack.session" => { Rack::Schmobile::SCHMOBILE_MODE => "disabled" }), request)
       end
 
       should "return true when forced in the session" do
         Rack::Request.any_instance.expects(:params).returns({})
         Rack::Request.any_instance.expects(:is_mobile?).never
 
-        assert @rack.is_mobile_session?(environment("rack.session" => { Rack::Schmobile::SCHMOBILE_MODE => "enabled" }))
+        assert @rack.is_mobile_session?(environment("rack.session" => { Rack::Schmobile::SCHMOBILE_MODE => "enabled" }), request)
       end
 
       should "return false when forced via a request parameter" do
         Rack::Request.any_instance.stubs(:params).returns({ Rack::Schmobile::SCHMOBILE_MODE => "disabled" })
         Rack::Request.any_instance.expects(:is_mobile?).never
 
-        assert !@rack.is_mobile_session?(environment("HTTP_USER_AGENT" => iphone))
+        assert !@rack.is_mobile_session?(environment, request("HTTP_USER_AGENT" => iphone))
       end
 
       should "return true when forced via a request parameter" do
         Rack::Request.any_instance.stubs(:params).returns({ Rack::Schmobile::SCHMOBILE_MODE => "enabled" })
         Rack::Request.any_instance.expects(:is_mobile?).never
 
-        assert @rack.is_mobile_session?(environment)
+        assert @rack.is_mobile_session?(environment, request)
       end
     end
 
@@ -113,26 +113,33 @@ class TestSchmobile < Test::Unit::TestCase
 
       context "#redirect?" do
         should "return true when not on mobile path" do
-          assert @rack.redirect?(environment("PATH_INFO" => "/somewhere"))
+          assert @rack.redirect?(request("PATH_INFO" => "/somewhere"))
         end
 
         should "return true on base path" do
-          assert @rack.redirect?(environment("PATH_INFO" => "/"))
+          assert @rack.redirect?(request("PATH_INFO" => "/"))
         end
 
         should "return false when already on path" do
-          assert !@rack.redirect?(environment("PATH_INFO" => "/wonderland"))
+          assert !@rack.redirect?(request("PATH_INFO" => "/wonderland"))
+          assert !@rack.redirect?(request("PATH_INFO" => "/wonderland/more/stuff"))
+        end
+
+        should "return false when :if resolves to false" do
+          @rack = Rack::Schmobile.new(@app, :if => Proc.new { |request| false })
+          assert !@rack.redirect?(request("PATH_INFO" => "/somewhere"))
         end
       end
 
       context "#redirect" do
         should "interpolate the argument string" do
           @rack = Rack::Schmobile.new(@app, :redirect_to => "/wonderland/{{path}}")
-          assert_equal "/wonderland/wiffle", @rack.redirect(environment("PATH_INFO" => "wiffle"))
+          assert_equal "/wonderland/wiffle", @rack.redirect(request("PATH_INFO" => "wiffle"))
         end
+
         should "interpolate a multipart argument string" do
           @rack = Rack::Schmobile.new(@app, :redirect_to => "/wonderland/{{path}}/lemurs/{{path}}")
-          assert_equal "/wonderland/wiffle/lemurs/wiffle", @rack.redirect(environment("PATH_INFO" => "wiffle"))
+          assert_equal "/wonderland/wiffle/lemurs/wiffle", @rack.redirect(request("PATH_INFO" => "wiffle"))
         end
       end
     end
@@ -160,6 +167,10 @@ class TestSchmobile < Test::Unit::TestCase
     'Mozilla/4.0 (compatible; MSIE 6.0; BREW 3.1.5; en )/800x480 Samsung SCH-U960'
   end
 
+  def request(overwrite = {})
+    Rack::Request.new(environment(overwrite))
+  end
+
   def environment(overwrite = {})
      {
        'GATEWAY_INTERFACE'=> 'CGI/1.2',

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: schmobile
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Morten Primdahl