schmobile 0.0.8 → 0.1.0

data/Gemfile

@@ -6,7 +6,7 @@ source "http://rubygems.org"
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "rack", "1.1.0"
+  gem "rack", "~> 1.1.0"
   gem "mocha", "0.9.9"
   gem "shoulda", ">= 0"
   gem "bundler", "~> 1.0.0"

data/Gemfile.lock

@@ -19,5 +19,5 @@ DEPENDENCIES
   bundler (~> 1.0.0)
   jeweler (~> 1.5.2)
   mocha (= 0.9.9)
-  rack (= 1.1.0)
+  rack (~> 1.1.0)
   shoulda

data/README.rdoc

@@ -12,12 +12,15 @@ It supports string interpolation for dynamic destinations:
 
   use Rack::Schmobile, :redirect_to => "/mobile/#!/{{path}}"
 
-== Forcing mobile mode
+Finally the middleware provides a request level method to determine if the client is a mobile device
+
+  Rack::Request#is_mobile?
 
-You can force toggle mobile mode by sending +schmobile_mode=enabled+ and +schmobile_mode=disabled+ - note that these
-require session access.
+== Forcing mobile mode
 
-Finally the middleware provides Rack::Request#is_mobile?
+You can force toggle mobile mode by sending +is_mobile=true+ and +is_mobile=false+ as
+parameters in the request URL - note that these require session access. This entirely
+overrides the user agent detection.
 
 == Rolling out
 
@@ -27,8 +30,8 @@ Finally the middleware provides Rack::Request#is_mobile?
 
 You can add/remove user agents like so:
 
-Rack::Schmobile.add_user_agent_pattern("wibble")
-Rack::Schmobile.remote_user_agent_pattern("ipad")
+  Rack::Schmobile::UserAgents.add_user_agent_pattern("wibble")
+  Rack::Schmobile::UserAgents.remove_user_agent_pattern("ipad")
 
 == Thanks
 

data/VERSION

@@ -1 +1 @@
-0.0.8
+0.1.0

data/lib/rack/schmobile/filters/is_mobile_param.rb

@@ -0,0 +1,15 @@
+module Rack
+  module Schmobile
+    module Filters
+      module IsMobileParam
+        def self.call(request)
+          if request.params.key?(Rack::Schmobile::IS_MOBILE)
+            request.session[Rack::Schmobile::IS_MOBILE] = (request.params[Rack::Schmobile::IS_MOBILE] == "true")
+          end
+
+          request.session[Rack::Schmobile::IS_MOBILE]
+        end
+      end
+    end
+  end
+end

data/lib/rack/schmobile/filters/mobile_user_agent.rb

@@ -0,0 +1,13 @@
+require 'rack/schmobile/user_agents'
+
+module Rack
+  module Schmobile
+    module Filters
+      module MobileUserAgent
+        def self.call(request)
+          Rack::Schmobile::UserAgents.is_mobile_agent?(request.user_agent)
+        end
+      end
+    end
+  end
+end

data/lib/rack/schmobile/filters.rb

@@ -0,0 +1,2 @@
+require 'rack/schmobile/filters/is_mobile_param'
+require 'rack/schmobile/filters/mobile_user_agent'

data/lib/rack/schmobile/middleware.rb

@@ -0,0 +1,61 @@
+module Rack
+  module Schmobile
+    class Middleware
+
+      def initialize(app, options = {})
+        @app     = app
+        @options = options
+      end
+
+      def call(env)
+        request = Rack::Request.new(env)
+
+        if request.is_mobile? && redirect?(request)
+          [ 301, { "Location" => redirect_location(request) }, [] ]
+        else
+          @app.call(env)
+        end
+      end
+
+      # 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?(request)
+        redirecting = true
+
+        if @options.key?(:redirect_if)
+          redirecting = @options[:redirect_if].call(request)
+        end
+
+        if @options.key?(:redirect_to)
+          redirecting &&= request.path !~ /^#{@options[:redirect_to]}/
+        else
+          redirecting = false
+        end
+
+        redirecting ? redirect_location(request) : nil
+      end
+
+      def redirect_location(request)
+        "#{@options[:redirect_to]}#{redirect_with(request)}"
+      end
+
+      def redirect_with(request)
+        build_path(@options[:redirect_with].to_s, request)
+      end
+
+      private
+
+      def build_path(destination, request)
+        final_destination = destination.dup
+        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
+
+    end
+  end
+end

data/lib/rack/schmobile/request_extension.rb

@@ -0,0 +1,10 @@
+Rack::Request.class_eval do
+  def is_mobile?
+    Rack::Schmobile::FILTERS.each do |filter|
+      result = filter.call(self)
+      return result unless result.nil?
+    end
+
+    false
+  end
+end

data/lib/rack/schmobile/user_agents.rb

@@ -0,0 +1,32 @@
+module Rack
+  module Schmobile
+    class UserAgents
+
+      MOBILE_USER_AGENTS = %w(
+        alcatel amoi android astel audiovox blackberry cdm ce chtml danger docomo ericsson htc_touch
+        iphone ipod j2me kddi midp minimo mmp mobi mobile mobileexplorer mot- motorola netfront nokia
+        novarra palm pdxgw phone plucker pocket portable portalmmm sagem samsung sgh sie- softbank
+        sprint symbian telit ucweb up.b upg1 vodafone webos windows x240 x320 xiino
+      )
+
+      def self.remove_user_agent_pattern(pattern)
+        MOBILE_USER_AGENTS.delete(pattern)
+        @mobile_agent_matcher = nil
+      end
+
+      def self.add_user_agent_pattern(pattern)
+        MOBILE_USER_AGENTS.push(*pattern)
+        @mobile_agent_matcher = nil
+      end
+
+      def self.is_mobile_agent?(user_agent)
+        !(user_agent.to_s.downcase =~ mobile_agent_matcher).nil?
+      end
+
+      def self.mobile_agent_matcher
+        @mobile_agent_matcher ||= Regexp.new(MOBILE_USER_AGENTS.uniq.compact.map { |v| Regexp.escape(v) }.join("|"))
+      end
+
+    end
+  end
+end

data/lib/rack/schmobile.rb

@@ -1,110 +1,11 @@
 require 'rack'
+require 'rack/schmobile/middleware'
+require 'rack/schmobile/request_extension'
+require 'rack/schmobile/filters'
 
 module Rack
-
-  # Rack::Schmobile is a minimalist mobile UA detection middleware
-  class Schmobile
-    MOBILE_USER_AGENTS = %w(
-      palm blackberry nokia phone midp mobi symbian chtml ericsson minimo audiovox motorola samsung telit upg1 windows ce
-      ucweb astel plucker x320 x240 j2me sgh portable sprint docomo kddi softbank android mmp pdxgw netfront xiino vodafone
-      portalmmm sagem mot- sie- ipod up.b  webos amoi novarra cdm alcatel pocket ipad iphone mobileexplorer mobile
-    )
-
-    SCHMOBILE_MODE = 'schmobile_mode'
-
-    def self.remove_user_agent_pattern(pattern)
-      MOBILE_USER_AGENTS.delete(pattern)
-      @mobile_agent_matcher = nil
-    end
-
-    def self.add_user_agent_pattern(pattern)
-      MOBILE_USER_AGENTS.push(*pattern)
-      @mobile_agent_matcher = nil
-    end
-
-    def self.is_mobile_request?(request)
-      request.user_agent.to_s.downcase =~ mobile_agent_matcher
-    end
-
-    def self.mobile_agent_matcher
-      @mobile_agent_matcher ||= Regexp.new(MOBILE_USER_AGENTS.uniq.compact.map { |v| Regexp.escape(v) }.join("|"))
-    end
-
-    def initialize(app, options = {})
-      @app     = app
-      @options = options
-    end
-
-    def call(env)
-      request = Rack::Request.new(env)
-
-      if is_mobile_session?(env, request) && redirect?(request)
-        return [ 301, { "Location" => redirect_location(request) }, [] ]
-      end
-
-      @app.call(env)
-    end
-
-    # 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, request)
-      session = env['rack.session'] ||= {}
-
-      if request.params[SCHMOBILE_MODE]
-        session[SCHMOBILE_MODE] = request.params[SCHMOBILE_MODE]
-      end
-
-      unless session[SCHMOBILE_MODE].nil?
-        return session[SCHMOBILE_MODE] == 'enabled'
-      end
-
-      request.is_mobile?
-    end
-
-    # 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?(request)
-      redirecting = true
-
-      if @options.key?(:redirect_if)
-        redirecting = @options[:redirect_if].call(request)
-      end
-
-      if @options.key?(:redirect_to)
-        redirecting &&= request.path !~ /^#{@options[:redirect_to]}/
-      else
-        redirecting = false
-      end
-
-      redirecting
-    end
-
-    def redirect_location(request)
-      "#{@options[:redirect_to]}#{redirect_with(request)}"
-    end
-
-    def redirect_with(request)
-      build_path(@options[:redirect_with].to_s, request)
-    end
-
-    private
-
-    def build_path(destination, request)
-      final_destination = destination.dup
-      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
-
-  end
-end
-
-Rack::Request.class_eval do
-  def is_mobile?
-    Rack::Schmobile.is_mobile_request?(self)
+  module Schmobile
+    FILTERS   = [ Rack::Schmobile::Filters::IsMobileParam, Rack::Schmobile::Filters::MobileUserAgent ]
+    IS_MOBILE = "is_mobile"
   end
 end

data/schmobile.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{schmobile}
-  s.version = "0.0.8"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Morten Primdahl"]
-  s.date = %q{2011-02-17}
+  s.date = %q{2011-05-25}
   s.description = %q{Used to determine if a request is from a mobile client, and possibly redirect it if that's the case}
   s.email = %q{morten@zendesk.com}
   s.extra_rdoc_files = [
@@ -25,40 +25,49 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "lib/rack/schmobile.rb",
+    "lib/rack/schmobile/filters.rb",
+    "lib/rack/schmobile/filters/is_mobile_param.rb",
+    "lib/rack/schmobile/filters/mobile_user_agent.rb",
+    "lib/rack/schmobile/middleware.rb",
+    "lib/rack/schmobile/request_extension.rb",
+    "lib/rack/schmobile/user_agents.rb",
     "lib/schmobile.rb",
     "schmobile.gemspec",
     "test/helper.rb",
-    "test/test_schmobile.rb"
+    "test/test_middleware.rb",
+    "test/test_rack_request.rb",
+    "test/test_user_agents.rb"
   ]
   s.homepage = %q{http://github.com/morten/schmobile}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{A Rack middleware for detecting mobile user agents}
   s.test_files = [
     "test/helper.rb",
-    "test/test_schmobile.rb"
+    "test/test_middleware.rb",
+    "test/test_rack_request.rb",
+    "test/test_user_agents.rb"
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rack>, ["= 1.1.0"])
+      s.add_development_dependency(%q<rack>, ["~> 1.1.0"])
       s.add_development_dependency(%q<mocha>, ["= 0.9.9"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
     else
-      s.add_dependency(%q<rack>, ["= 1.1.0"])
+      s.add_dependency(%q<rack>, ["~> 1.1.0"])
       s.add_dependency(%q<mocha>, ["= 0.9.9"])
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
     end
   else
-    s.add_dependency(%q<rack>, ["= 1.1.0"])
+    s.add_dependency(%q<rack>, ["~> 1.1.0"])
     s.add_dependency(%q<mocha>, ["= 0.9.9"])
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])

data/test/helper.rb

@@ -9,4 +9,63 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'rack/schmobile'
 
 class Test::Unit::TestCase
+  def ipod
+    'Mozilla/5.0 (iPod; U; CPU iPhone OS 2_2 like Mac OS X; en-us) AppleWebKit/525.18.1 (KHTML, like Gecko) Version/3.1.1 Mobile/5G77 Safari/525.20'
+  end
+
+  def iphone
+    'Mozilla/5.0 (iPhone; U; CPU iPhone OS 3_1 like Mac OS X; en-us) AppleWebKit/528.18 (KHTML, like Gecko) Version/4.0 Mobile/7C144 Safari/528.16'
+  end
+
+  def android
+    'Mozilla/5.0 (Linux; U; Android 2.0; ld-us; sdk Build/ECLAIR) AppleWebKit/530.17 (KHTML, like Gecko) Version/4.0 Mobile Safari/530.17'
+  end
+
+  def blackberry
+    'BlackBerry9000/4.6.0.167 Profile/MIDP-2.0 Configuration/CLDC-1.1 VendorID/102'
+  end
+
+  def samsung
+    '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',
+       'HTTP_ACCEPT'=> 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8',
+       'HTTP_ACCEPT_CHARSET'=> 'ISO-8859-1,utf-8;q=0.7,*;q=0.7',
+       'HTTP_ACCEPT_ENCODING'=> 'gzip,deflate',
+       'HTTP_ACCEPT_LANGUAGE'=> 'en-us,en;q=0.5',
+       'HTTP_CONNECTION'=> 'keep-alive',
+       'HTTP_HOST'=> 'localhost:4567',
+       'HTTP_KEEP_ALIVE'=> 300,
+       'HTTP_USER_AGENT'=> 'Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.1.3) Gecko/20090920 Firefox/3.5.3 (Swiftfox)',
+       'HTTP_VERSION'=> 'HTTP/1.1',
+       'PATH_INFO'=> '/',
+       'QUERY_STRING'=> '',
+       'REMOTE_ADDR'=> '127.0.0.1',
+       'REQUEST_METHOD'=> 'GET',
+       'REQUEST_PATH'=> '/',
+       'REQUEST_URI'=> '/',
+       'SCRIPT_NAME'=> '',
+       'SERVER_NAME'=> 'localhost',
+       'SERVER_PORT'=> '4567',
+       'SERVER_PROTOCOL'=> 'HTTP/1.1',
+       'SERVER_SOFTWARE'=> 'Mongrel 1.1.5',
+       'rack.multiprocess'=> false,
+       'rack.multithread'=> true,
+       'rack.request.form_hash'=> '',
+       'rack.request.form_vars'=> '',
+       'rack.request.query_hash'=> '',
+       'rack.request.query_string'=> '',
+       'rack.run_once'=> false,
+       'rack.url_scheme'=> 'http',
+       'rack.version'=> '1: 0'
+     }.merge(overwrite)
+   end
+
 end

data/test/test_middleware.rb

@@ -0,0 +1,69 @@
+require 'helper'
+
+class TestMiddleware < Test::Unit::TestCase
+
+  context "Rack::Schmobile::Middleware" do
+    setup do
+      @app  = Class.new { def call(app); true; end }.new
+      @rack = Rack::Schmobile::Middleware.new(@app)
+    end
+
+    should "return an HTTP permanent redirect when given a redirect path and used by a mobile client" do
+      @rack = Rack::Schmobile::Middleware.new(@app, :redirect_to => "/hello")
+      Rack::Request.any_instance.expects(:is_mobile?).returns(true)
+
+      assert_equal [301, { "Location"=>"/hello" }, []], @rack.call(environment)
+    end
+
+    context "with no redirect_to" do
+      should "not redirect mobile traffic" do
+        Rack::Request.any_instance.expects(:params).returns({})
+        @app.expects(:call)
+        @rack.call(environment("HTTP_USER_AGENT" => iphone))
+      end
+
+      should "query the request object to determine if this is a mobile request" do
+        Rack::Request.any_instance.expects(:is_mobile?).returns(true)
+        @rack.call(environment("HTTP_USER_AGENT" => iphone))
+      end
+    end
+
+    context "with redirect_to" do
+      setup do
+        @rack = Rack::Schmobile::Middleware.new(@app, :redirect_to => "/wonderland")
+      end
+
+      context "#redirect?" do
+        should "return true when not on mobile path" do
+          assert @rack.redirect?(request("PATH_INFO" => "/somewhere"))
+        end
+
+        should "return true on base path" do
+          assert @rack.redirect?(request("PATH_INFO" => "/"))
+        end
+
+        should "return false when already on path" do
+          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::Middleware.new(@app, :redirect_to => "/wonderland", :redirect_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::Middleware.new(@app, :redirect_to => "/wonderland", :redirect_with => "/{{path}}")
+          assert_equal "/wonderland/wiffle", @rack.redirect_location(request("PATH_INFO" => "wiffle"))
+        end
+
+        should "interpolate a multipart argument string" do
+          @rack = Rack::Schmobile::Middleware.new(@app, :redirect_to => "/wonderland/", :redirect_with => "{{path}}/lemurs/{{path}}")
+          assert_equal "/wonderland/wiffle/lemurs/wiffle", @rack.redirect_location(request("PATH_INFO" => "wiffle"))
+        end
+      end
+    end
+  end
+end

data/test/test_rack_request.rb

@@ -0,0 +1,51 @@
+require 'helper'
+
+class TestRackRequest < Test::Unit::TestCase
+
+  context "Rack::Request" do
+    context "#is_mobile?" do
+      context "without params" do
+        setup do
+          Rack::Request.any_instance.stubs(:params).returns({})
+        end
+
+        should "not detect a regular browser as mobile" do
+          assert !request.is_mobile?
+          assert !request("HTTP_USER_AGENT" => nil).is_mobile?
+        end
+
+        should "detect mobile units as mobile" do
+          [ :ipod, :iphone, :android, :blackberry, :samsung ].each do |phone|
+            agent = self.send(phone)
+            assert request("HTTP_USER_AGENT" => agent).is_mobile?
+          end
+        end
+
+        should "return true for a mobile browser" do
+          assert request("HTTP_USER_AGENT" => iphone).is_mobile?
+        end
+
+        should "return false when forced in the session" do
+          Rack::Request.any_instance.stubs(:session).returns({ Rack::Schmobile::IS_MOBILE => false })
+          assert !request("HTTP_USER_AGENT" => iphone).is_mobile?
+        end
+
+        should "return true when forced in the session" do
+          assert request("rack.session" => { Rack::Schmobile::IS_MOBILE => "true" }).is_mobile?
+        end
+      end
+
+      context "with params" do
+        should "return false when forced via a request parameter" do
+          Rack::Request.any_instance.stubs(:params).returns({ Rack::Schmobile::IS_MOBILE => "false" })
+          assert !request("HTTP_USER_AGENT" => iphone).is_mobile?
+        end
+
+        should "return true when forced via a request parameter" do
+          Rack::Request.any_instance.stubs(:params).returns({ Rack::Schmobile::IS_MOBILE => "true" })
+          assert request.is_mobile?
+        end
+      end
+    end
+  end
+end

data/test/test_user_agents.rb

@@ -0,0 +1,23 @@
+require 'helper'
+
+class TestUserAgents < Test::Unit::TestCase
+
+  context "Rack::Schmobile::UserAgents" do
+    context "#remove_user_agent_pattern" do
+      should "allow removal of a user agent" do
+        assert Rack::Schmobile::UserAgents.is_mobile_agent?("novarra")
+        Rack::Schmobile::UserAgents.remove_user_agent_pattern("novarra")
+        assert !Rack::Schmobile::UserAgents.is_mobile_agent?("novarra")
+      end
+    end
+
+    context "#add_user_agent_pattern" do
+      should "allow adding a user agent" do
+        assert !Rack::Schmobile::UserAgents.is_mobile_agent?("wibble")
+        Rack::Schmobile::UserAgents.add_user_agent_pattern("wibble")
+        assert Rack::Schmobile::UserAgents.is_mobile_agent?("wibble")
+      end
+    end
+  end
+
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: schmobile
 version: !ruby/object:Gem::Version 
-  hash: 15
-  prerelease: false
+  hash: 27
+  prerelease: 
   segments: 
   - 0
+  - 1
   - 0
-  - 8
-  version: 0.0.8
+  version: 0.1.0
 platform: ruby
 authors: 
 - Morten Primdahl
@@ -15,17 +15,15 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-17 00:00:00 -08:00
+date: 2011-05-25 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  prerelease: false
   type: :development
-  name: rack
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
         hash: 19
         segments: 
@@ -33,12 +31,12 @@ dependencies:
         - 1
         - 0
         version: 1.1.0
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
+  name: rack
+  version_requirements: *id001
   prerelease: false
+- !ruby/object:Gem::Dependency 
   type: :development
-  name: mocha
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -49,12 +47,12 @@ dependencies:
         - 9
         - 9
         version: 0.9.9
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
+  name: mocha
+  version_requirements: *id002
   prerelease: false
+- !ruby/object:Gem::Dependency 
   type: :development
-  name: shoulda
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -63,12 +61,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
+  name: shoulda
+  version_requirements: *id003
   prerelease: false
+- !ruby/object:Gem::Dependency 
   type: :development
-  name: bundler
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -79,12 +77,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  requirement: *id004
-- !ruby/object:Gem::Dependency 
+  name: bundler
+  version_requirements: *id004
   prerelease: false
+- !ruby/object:Gem::Dependency 
   type: :development
-  name: jeweler
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -95,7 +93,9 @@ dependencies:
         - 5
         - 2
         version: 1.5.2
-  requirement: *id005
+  name: jeweler
+  version_requirements: *id005
+  prerelease: false
 description: Used to determine if a request is from a mobile client, and possibly redirect it if that's the case
 email: morten@zendesk.com
 executables: []
@@ -114,10 +114,18 @@ files:
 - Rakefile
 - VERSION
 - lib/rack/schmobile.rb
+- lib/rack/schmobile/filters.rb
+- lib/rack/schmobile/filters/is_mobile_param.rb
+- lib/rack/schmobile/filters/mobile_user_agent.rb
+- lib/rack/schmobile/middleware.rb
+- lib/rack/schmobile/request_extension.rb
+- lib/rack/schmobile/user_agents.rb
 - lib/schmobile.rb
 - schmobile.gemspec
 - test/helper.rb
-- test/test_schmobile.rb
+- test/test_middleware.rb
+- test/test_rack_request.rb
+- test/test_user_agents.rb
 has_rdoc: true
 homepage: http://github.com/morten/schmobile
 licenses: 
@@ -148,10 +156,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A Rack middleware for detecting mobile user agents
 test_files: 
 - test/helper.rb
-- test/test_schmobile.rb
+- test/test_middleware.rb
+- test/test_rack_request.rb
+- test/test_user_agents.rb

data/test/test_schmobile.rb

@@ -1,208 +0,0 @@
-require 'helper'
-
-class TestSchmobile < Test::Unit::TestCase
-  context "Rack::Request" do
-    context "#is_mobile?" do
-      should "not detect a regular browser as mobile" do
-        assert !Rack::Request.new(environment).is_mobile?
-        assert !Rack::Request.new("HTTP_USER_AGENT" => nil).is_mobile?
-      end
-
-      should "detect mobile units as mobile" do
-        [ :ipod, :iphone, :android, :blackberry, :samsung ].each do |phone|
-          agent = self.send(phone)
-          assert Rack::Request.new(environment("HTTP_USER_AGENT" => agent)).is_mobile?
-        end
-      end
-    end
-  end
-
-  context "Rack::Schmobile class" do
-    context "#remove_user_agent_pattern" do
-      should "allow removal of a user agent" do
-        request = stub(:user_agent => "novarra")
-        assert Rack::Schmobile.is_mobile_request?(request)
-        Rack::Schmobile.remove_user_agent_pattern("novarra")
-        assert !Rack::Schmobile.is_mobile_request?(request)
-      end
-    end
-
-    context "#add_user_agent_pattern" do
-      should "allow adding a user agent" do
-        request = stub(:user_agent => "wibble")
-        assert !Rack::Schmobile.is_mobile_request?(request)
-        Rack::Schmobile.add_user_agent_pattern("wibble")
-        assert Rack::Schmobile.is_mobile_request?(request)
-      end
-    end
-  end
-
-  context "Rack::Schmobile" do
-    setup do
-      @app  = Class.new { def call(app); true; end }.new
-      @rack = Rack::Schmobile.new(@app)
-    end
-
-    should "return an HTTP permanent redirect when given a redirect path and used by a mobile client" do
-      @rack = Rack::Schmobile.new(@app, :redirect_to => "/hello")
-      @rack.expects(:is_mobile_session?).returns(true)
-
-      assert_equal [301, {"Location"=>"/hello"}, []], @rack.call(environment)
-    end
-
-    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, request)
-      end
-
-      should "return true for a mobile browser" do
-        Rack::Request.any_instance.expects(:params).returns({})
-        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.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" }), 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" }), 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, 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, request)
-      end
-    end
-
-    context "with no redirect_to" do
-      should "not redirect mobile traffic" do
-        Rack::Request.any_instance.expects(:params).returns({})
-
-        @app.expects(:call)
-        @rack.call(environment("HTTP_USER_AGENT" => iphone))
-      end
-
-      should "query the request object to determine if this is a mobile request" do
-        Rack::Request.any_instance.expects(:params).returns({})
-        Rack::Request.any_instance.expects(:is_mobile?).returns(true)
-
-        @rack.call(environment("HTTP_USER_AGENT" => iphone))
-      end
-    end
-
-    context "with redirect_to" do
-      setup do
-        @rack = Rack::Schmobile.new(@app, :redirect_to => "/wonderland")
-      end
-
-      context "#redirect?" do
-        should "return true when not on mobile path" do
-          assert @rack.redirect?(request("PATH_INFO" => "/somewhere"))
-        end
-
-        should "return true on base path" do
-          assert @rack.redirect?(request("PATH_INFO" => "/"))
-        end
-
-        should "return false when already on path" do
-          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, :redirect_to => "/wonderland", :redirect_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", :redirect_with => "/{{path}}")
-          assert_equal "/wonderland/wiffle", @rack.redirect_location(request("PATH_INFO" => "wiffle"))
-        end
-
-        should "interpolate a multipart argument string" do
-          @rack = Rack::Schmobile.new(@app, :redirect_to => "/wonderland/", :redirect_with => "{{path}}/lemurs/{{path}}")
-          assert_equal "/wonderland/wiffle/lemurs/wiffle", @rack.redirect_location(request("PATH_INFO" => "wiffle"))
-        end
-      end
-    end
-
-  end
-
-  # User agents for testing
-  def ipod
-    'Mozilla/5.0 (iPod; U; CPU iPhone OS 2_2 like Mac OS X; en-us) AppleWebKit/525.18.1 (KHTML, like Gecko) Version/3.1.1 Mobile/5G77 Safari/525.20'
-  end
-
-  def iphone
-    'Mozilla/5.0 (iPhone; U; CPU iPhone OS 3_1 like Mac OS X; en-us) AppleWebKit/528.18 (KHTML, like Gecko) Version/4.0 Mobile/7C144 Safari/528.16'
-  end
-
-  def android
-    'Mozilla/5.0 (Linux; U; Android 2.0; ld-us; sdk Build/ECLAIR) AppleWebKit/530.17 (KHTML, like Gecko) Version/4.0 Mobile Safari/530.17'
-  end
-
-  def blackberry
-    'BlackBerry9000/4.6.0.167 Profile/MIDP-2.0 Configuration/CLDC-1.1 VendorID/102'
-  end
-
-  def samsung
-    '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',
-       'HTTP_ACCEPT'=> 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8',
-       'HTTP_ACCEPT_CHARSET'=> 'ISO-8859-1,utf-8;q=0.7,*;q=0.7',
-       'HTTP_ACCEPT_ENCODING'=> 'gzip,deflate',
-       'HTTP_ACCEPT_LANGUAGE'=> 'en-us,en;q=0.5',
-       'HTTP_CONNECTION'=> 'keep-alive',
-       'HTTP_HOST'=> 'localhost:4567',
-       'HTTP_KEEP_ALIVE'=> 300,
-       'HTTP_USER_AGENT'=> 'Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.1.3) Gecko/20090920 Firefox/3.5.3 (Swiftfox)',
-       'HTTP_VERSION'=> 'HTTP/1.1',
-       'PATH_INFO'=> '/',
-       'QUERY_STRING'=> '',
-       'REMOTE_ADDR'=> '127.0.0.1',
-       'REQUEST_METHOD'=> 'GET',
-       'REQUEST_PATH'=> '/',
-       'REQUEST_URI'=> '/',
-       'SCRIPT_NAME'=> '',
-       'SERVER_NAME'=> 'localhost',
-       'SERVER_PORT'=> '4567',
-       'SERVER_PROTOCOL'=> 'HTTP/1.1',
-       'SERVER_SOFTWARE'=> 'Mongrel 1.1.5',
-       'rack.multiprocess'=> false,
-       'rack.multithread'=> true,
-       'rack.request.form_hash'=> '',
-       'rack.request.form_vars'=> '',
-       'rack.request.query_hash'=> '',
-       'rack.request.query_string'=> '',
-       'rack.run_once'=> false,
-       'rack.url_scheme'=> 'http',
-       'rack.version'=> '1: 0'
-     }.merge(overwrite)
-   end
-end