schmobile 0.2.0 → 0.3.0

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

data/lib/rack/schmobile/filters.rb

@@ -4,29 +4,28 @@ require 'rack/schmobile/filters/mobile_user_agent'
 
 module Rack
   module Schmobile
-    # Filters are tests that get run against a request to detrmine if it's a mobile request or not.
+    # Filters are tests that get run against a request to determine if it's a mobile request or not.
     # A filter can return true, false or nil. The first non-nil value of the filter chain is the
-    # one that gets used.
+    # one that gets used and this also gets used to mark the session as a "mobile session"
     #
-    # You can modify the chain to add new conditions that check on e.g. request format.
+    # You can manipulate the chain to add new conditions that check on e.g. request format.
     module Filters
       CHAIN = [
+        Rack::Schmobile::Filters::IsMobileParam, # Must come before session check
         Rack::Schmobile::Filters::MobileSession,
-        Rack::Schmobile::Filters::IsMobileParam,
-        Rack::Schmobile::Filters::MobileUserAgent
+        Rack::Schmobile::Filters::MobileUserAgent # Always returns either true or false
       ]
 
       def self.apply(request)
         Rack::Schmobile::Filters::CHAIN.each do |filter|
           result = filter.call(request)
-
           unless result.nil?
             request.session[Rack::Schmobile::IS_MOBILE] = result
-            return result
+            break
           end
         end
 
-        false
+        request.session[Rack::Schmobile::IS_MOBILE] ||= false
       end
     end
   end

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

@@ -4,7 +4,7 @@ module Rack
       module IsMobileParam
         def self.call(request)
           if request.params.key?(Rack::Schmobile::IS_MOBILE)
-             return request.params[Rack::Schmobile::IS_MOBILE] == "true"
+             request.session[Rack::Schmobile::IS_MOBILE] = (request.params[Rack::Schmobile::IS_MOBILE] == "true")
           end
 
           nil

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

@@ -5,7 +5,7 @@ module Rack
     module Filters
       module MobileUserAgent
         def self.call(request)
-          Rack::Schmobile::UserAgents.is_mobile_agent?(request.user_agent)
+          request.session[Rack::Schmobile::IS_MOBILE] = Rack::Schmobile::UserAgents.is_mobile_agent?(request.user_agent)
         end
       end
     end

data/lib/rack/schmobile/request_extension.rb

@@ -9,6 +9,10 @@ module Rack
         @is_mobile
       end
 
+      def toggle_mobile_session!
+        session[Rack::Schmobile::IS_MOBILE] = !is_mobile?
+      end
+
       def is_device?(identifier)
         user_agent =~ /#{identifier}/i
       end

data/schmobile.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{schmobile}
-  s.version = "0.2.0"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Morten Primdahl"]
@@ -35,6 +35,7 @@ Gem::Specification.new do |s|
     "lib/schmobile.rb",
     "schmobile.gemspec",
     "test/helper.rb",
+    "test/test_filters.rb",
     "test/test_middleware.rb",
     "test/test_rack_request.rb",
     "test/test_user_agents.rb"
@@ -46,6 +47,7 @@ Gem::Specification.new do |s|
   s.summary = %q{A Rack middleware for detecting mobile user agents}
   s.test_files = [
     "test/helper.rb",
+    "test/test_filters.rb",
     "test/test_middleware.rb",
     "test/test_rack_request.rb",
     "test/test_user_agents.rb"

data/test/test_filters.rb

@@ -0,0 +1,62 @@
+require 'helper'
+
+class TestFukters < Test::Unit::TestCase
+
+  context "Rack::Schmobile::Filters" do
+    context "#apply" do
+      setup do
+        @request = stub(:user_agent => msie8)
+        @request.stubs(:params).returns({})
+        @session = {}
+        @request.stubs(:session).returns(@session)
+      end
+
+      context "on a pristine request" do
+        should "return true if the session is already mobile" do
+          Rack::Schmobile::UserAgents.expects(:is_mobile_agent?).never
+          @session[Rack::Schmobile::IS_MOBILE] = true
+          assert Rack::Schmobile::Filters.apply(@request)
+        end
+
+        should "return true if there's an is_mobile parameter with value true" do
+          Rack::Schmobile::UserAgents.expects(:is_mobile_agent?).never
+          @request.stubs(:params).returns({ "is_mobile" => "true" })
+          assert Rack::Schmobile::Filters.apply(@request)
+        end
+
+        should "return false if there's an is_mobile parameter with value false" do
+          Rack::Schmobile::UserAgents.expects(:is_mobile_agent?).never
+          @request.stubs(:params).returns({ "is_mobile" => "false" })
+          assert !Rack::Schmobile::Filters.apply(@request)
+        end
+
+        should "defer to user agent check if there's no session or parameter" do
+          Rack::Schmobile::UserAgents.expects(:is_mobile_agent?).once
+          assert !Rack::Schmobile::Filters.apply(@request)
+        end
+      end
+
+      context "on a request with mobile session set to false" do
+        should "allow to change the session value with a parameter" do
+          Rack::Schmobile::UserAgents.expects(:is_mobile_agent?).never
+          @request.session[Rack::Schmobile::IS_MOBILE] = false
+          assert !Rack::Schmobile::Filters.apply(@request)
+          @request.stubs(:params).returns({ "is_mobile" => "true" })
+          assert Rack::Schmobile::Filters.apply(@request)
+          assert @request.session[Rack::Schmobile::IS_MOBILE]
+        end
+      end
+
+      context "on a request with mobile session set to true" do
+        should "allow to change the session value with a parameter" do
+          Rack::Schmobile::UserAgents.expects(:is_mobile_agent?).never
+          @request.session[Rack::Schmobile::IS_MOBILE] = true
+          assert Rack::Schmobile::Filters.apply(@request)
+          @request.stubs(:params).returns({ "is_mobile" => "false" })
+          assert !Rack::Schmobile::Filters.apply(@request)
+          assert !@request.session[Rack::Schmobile::IS_MOBILE]
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: schmobile
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 19
   prerelease: 
   segments: 
   - 0
-  - 2
+  - 3
   - 0
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Morten Primdahl
@@ -124,6 +124,7 @@ files:
 - lib/schmobile.rb
 - schmobile.gemspec
 - test/helper.rb
+- test/test_filters.rb
 - test/test_middleware.rb
 - test/test_rack_request.rb
 - test/test_user_agents.rb
@@ -163,6 +164,7 @@ specification_version: 3
 summary: A Rack middleware for detecting mobile user agents
 test_files: 
 - test/helper.rb
+- test/test_filters.rb
 - test/test_middleware.rb
 - test/test_rack_request.rb
 - test/test_user_agents.rb