schmobile 0.1.3 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.2.0

data/lib/rack/schmobile/filters.rb

@@ -1,3 +1,4 @@
+require 'rack/schmobile/filters/mobile_session'
 require 'rack/schmobile/filters/is_mobile_param'
 require 'rack/schmobile/filters/mobile_user_agent'
 
@@ -9,7 +10,24 @@ module Rack
     #
     # You can modify the chain to add new conditions that check on e.g. request format.
     module Filters
-      CHAIN = [ Rack::Schmobile::Filters::IsMobileParam, Rack::Schmobile::Filters::MobileUserAgent ]
+      CHAIN = [
+        Rack::Schmobile::Filters::MobileSession,
+        Rack::Schmobile::Filters::IsMobileParam,
+        Rack::Schmobile::Filters::MobileUserAgent
+      ]
+
+      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
+          end
+        end
+
+        false
+      end
     end
   end
 end

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

@@ -4,10 +4,10 @@ module Rack
       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")
+             return request.params[Rack::Schmobile::IS_MOBILE] == "true"
           end
 
-          request.session[Rack::Schmobile::IS_MOBILE]
+          nil
         end
       end
     end

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

@@ -0,0 +1,11 @@
+module Rack
+  module Schmobile
+    module Filters
+      module MobileSession
+        def self.call(request)
+          request.session[Rack::Schmobile::IS_MOBILE]
+        end
+      end
+    end
+  end
+end

data/lib/rack/schmobile/request_extension.rb

@@ -2,12 +2,11 @@ module Rack
   module Schmobile
     module Request
       def is_mobile?
-        Rack::Schmobile::Filters::CHAIN.each do |filter|
-          result = filter.call(self)
-          return result unless result.nil?
+        unless defined?(@is_mobile)
+          @is_mobile = Rack::Schmobile::Filters.apply(self)
         end
 
-        false
+        @is_mobile
       end
 
       def is_device?(identifier)

data/schmobile.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{schmobile}
-  s.version = "0.1.3"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Morten Primdahl"]
-  s.date = %q{2011-05-26}
+  s.date = %q{2011-05-27}
   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 = [
@@ -27,6 +27,7 @@ Gem::Specification.new do |s|
     "lib/rack/schmobile.rb",
     "lib/rack/schmobile/filters.rb",
     "lib/rack/schmobile/filters/is_mobile_param.rb",
+    "lib/rack/schmobile/filters/mobile_session.rb",
     "lib/rack/schmobile/filters/mobile_user_agent.rb",
     "lib/rack/schmobile/middleware.rb",
     "lib/rack/schmobile/request_extension.rb",

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: schmobile
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
-  - 3
-  version: 0.1.3
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Morten Primdahl
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-26 00:00:00 -07:00
+date: 2011-05-27 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -116,6 +116,7 @@ files:
 - lib/rack/schmobile.rb
 - lib/rack/schmobile/filters.rb
 - lib/rack/schmobile/filters/is_mobile_param.rb
+- lib/rack/schmobile/filters/mobile_session.rb
 - lib/rack/schmobile/filters/mobile_user_agent.rb
 - lib/rack/schmobile/middleware.rb
 - lib/rack/schmobile/request_extension.rb