mobylette 3.2 → 3.3

data/README.rdoc

@@ -76,6 +76,14 @@ Mobylette works uppon detecting the user agent of the visitor browser. By defaul
     config[:mobile_user_agents] = proc { %r{iphone|ipad}i }
   end
 
+=== Skipping User Agents
+
+If you need to exclude one or more user agents from the mobile format, lets say ipad for example, you may use the :skip_user_agents option:
+
+  mobylette_config do |config|
+    config[:skip_user_agents] = [:ipad]
+  end
+
 === Fall Backs
 
 Fall backs are handled as a chain of formats. By default the only chain is `:mobile => [:mobile, :html]`.

data/lib/mobylette/respond_to_mobile_requests.rb

@@ -41,6 +41,7 @@ module Mobylette
       @@mobylette_options[:fallback_chains]    = { mobile: [:mobile, :html] }
       @@mobylette_options[:mobile_user_agents] = Mobylette::MobileUserAgents.new
       @@mobylette_options[:devices]            = Hash.new
+      @@mobylette_options[:skip_user_agents]   = []
 
       cattr_accessor :mobylette_resolver
       self.mobylette_resolver = Mobylette::Resolvers::ChainedFallbackResolver.new({}, self.view_paths)
@@ -73,6 +74,8 @@ module Mobylette
       #     Once a device is registered you may call the helper request_device?(device_symb)
       #     to see if the request comes from that device or not.
       #     By default :iphone, :ipad, :ios and :android are already registered.
+      # * skip_user_agents: [:ipad, :android]
+      #     Don't consider these user agents mobile devices.
       #
       # Example Usage:
       #
@@ -151,7 +154,15 @@ module Mobylette
     #
     def respond_as_mobile?
       impediments = stop_processing_because_xhr? || stop_processing_because_param?
-      (not impediments) && (force_mobile_by_session? || is_mobile_request? || params[:format] == 'mobile')
+      (not impediments) && (force_mobile_by_session? || allow_mobile_response? || params[:format] == 'mobile')
+    end
+
+    def allow_mobile_response?
+      user_agent_included? && is_mobile_request?
+    end
+
+    def user_agent_included?
+      request.user_agent.to_s.downcase !~ Regexp.union([self.mobylette_options[:skip_user_agents]].flatten.map(&:to_s))
     end
 
     # Private: Returns true if the visitor has the force_mobile set in it's session

data/lib/mobylette/version.rb

@@ -1,3 +1,3 @@
 module Mobylette
-  VERSION = "3.2"
+  VERSION = "3.3"
 end

data/spec/dummy/log/test.log

@@ -27,3 +27,6 @@ DEPRECATED > Mobylette: Please don't user :fall_back to configure fall backs any
 DEPRECATED > Mobylette: Please don't user :fall_back to configure fall backs any more. See the README for :fallback_chains instead.
 DEPRECATED > Mobylette: Please don't user :fall_back to configure fall backs any more. See the README for :fallback_chains instead.
 DEPRECATED > Mobylette: Please don't user :fall_back to configure fall backs any more. See the README for :fallback_chains instead.
+DEPRECATED > Mobylette: Please don't user :fall_back to configure fall backs any more. See the README for :fallback_chains instead.
+DEPRECATED > Mobylette: Please don't user :fall_back to configure fall backs any more. See the README for :fallback_chains instead.
+DEPRECATED > Mobylette: Please don't user :fall_back to configure fall backs any more. See the README for :fallback_chains instead.

data/spec/lib/respond_to_mobile_requests_spec.rb

@@ -164,6 +164,8 @@ module Mobylette
           subject.stub(:force_mobile_by_session?).and_return(false)
           subject.stub(:is_mobile_request?).and_return(false)
           subject.stub(:params).and_return({})
+          request = double("request", user_agent: "android")
+          subject.stub(:request).and_return(request)
         end
 
         it "should be true if force_mobile_by_session? is true" do
@@ -181,6 +183,34 @@ module Mobylette
           subject.send(:respond_as_mobile?).should be_true
         end
       end
+
+      context "with skip_user_agents config option set" do
+        before(:each) do
+          subject.stub(:stop_processing_because_xhr?).and_return(false)
+          subject.stub(:stop_processing_because_param?).and_return(false)
+          subject.stub(:force_mobile_by_session?).and_return(false)
+          subject.stub(:is_mobile_request?).and_return(true)
+          subject.stub(:params).and_return({})
+          request = double("request", user_agent: "ipad")
+          subject.stub(:request).and_return(request)
+        end
+
+        it "should be false if skip_user_agents contains the current user agent" do
+          subject.mobylette_options[:skip_user_agents] = [:ipad, :android]
+          subject.send(:respond_as_mobile?).should be_false
+        end
+
+        it "should be true if skip_user_agents is not set" do
+          subject.mobylette_options[:skip_user_agents] = []
+          subject.send(:respond_as_mobile?).should be_true
+        end
+
+        it "should be true if skip_user_agents does not contain the current user agent" do
+          subject.mobylette_options[:skip_user_agents] = [:android]
+          subject.send(:respond_as_mobile?).should be_true
+        end
+
+      end
     end
 
     describe "#handle_mobile" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mobylette
 version: !ruby/object:Gem::Version
-  version: '3.2'
+  version: '3.3'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-22 00:00:00.000000000 Z
+date: 2012-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -177,7 +177,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3729222328630037007
+      hash: 846771552519936959
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -186,7 +186,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3729222328630037007
+      hash: 846771552519936959
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24