schmobile 0.3.2 → 0.4.0

data/VERSION

@@ -1 +1 @@
-0.3.2
+0.4.0

data/lib/rack/schmobile/user_agents.rb

@@ -9,6 +9,10 @@ module Rack
         sprint symbian telit ucweb up.b upg1 vodafone webos windows\ ce x240 x320 xiino
       )
 
+      NON_MOBILE_USER_AGENTS = %w(
+        ipad
+      )
+
       def self.remove_user_agent_pattern(pattern)
         MOBILE_USER_AGENTS.delete(pattern)
         @mobile_agent_matcher = nil
@@ -20,13 +24,25 @@ module Rack
       end
 
       def self.is_mobile_agent?(user_agent)
-        !(user_agent.to_s.downcase =~ mobile_agent_matcher).nil?
+        agent = user_agent.to_s.downcase
+        agent !~ non_mobile_agent_matcher && !(agent =~ 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
 
+      def self.non_mobile_agent_matcher
+        @non_mobile_agent_matcher ||= Regexp.new(NON_MOBILE_USER_AGENTS.uniq.compact.map { |v| Regexp.escape(v) }.join("|"))
+      end
+
+      def self.matched_by?(user_agent)
+        MOBILE_USER_AGENTS.each do |agent|
+          return agent if user_agent =~ /#{agent}/
+        end
+        nil
+      end
+
     end
   end
 end

data/schmobile.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{schmobile}
-  s.version = "0.3.2"
+  s.version = "0.4.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-31}
+  s.date = %q{2011-06-30}
   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 = [

data/test/test_rack_request.rb

@@ -51,6 +51,10 @@ class TestRackRequest < Test::Unit::TestCase
           end
         end
 
+        should "not detect an ipad as a mobile browser" do
+          assert !request("HTTP_USER_AGENT" => ipad).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?

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: schmobile
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 15
   prerelease: 
   segments: 
   - 0
-  - 3
-  - 2
-  version: 0.3.2
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Morten Primdahl
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-31 00:00:00 -07:00
+date: 2011-06-30 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency