mobylette 3.3 → 3.3.1

data/lib/mobylette/respond_to_mobile_requests.rb

@@ -132,7 +132,7 @@ module Mobylette
     # Private: Tells if the request comes from a mobile user_agent or not
     #
     def is_mobile_request?
-      request.user_agent.to_s.downcase =~ @@mobylette_options[:mobile_user_agents].call
+      (not user_agent_excluded?) && request.user_agent.to_s.downcase =~ @@mobylette_options[:mobile_user_agents].call
     end
 
     # Private: Returns if this request comes from the informed device
@@ -154,15 +154,13 @@ module Mobylette
     #
     def respond_as_mobile?
       impediments = stop_processing_because_xhr? || stop_processing_because_param?
-      (not impediments) && (force_mobile_by_session? || allow_mobile_response? || params[:format] == 'mobile')
+      (not impediments) && (force_mobile_by_session? || is_mobile_request? || 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))
+    # Private: Rertuns true if the current user agent should be skipped by configuration
+    #
+    def user_agent_excluded?
+      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.3"
+  VERSION = "3.3.1"
 end

data/spec/dummy/log/test.log

@@ -30,3 +30,14 @@ 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.
+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.
+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

@@ -189,7 +189,7 @@ module Mobylette
           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(:is_mobile_request?).and_return(true)
           subject.stub(:params).and_return({})
           request = double("request", user_agent: "ipad")
           subject.stub(:request).and_return(request)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mobylette
 version: !ruby/object:Gem::Version
-  version: '3.3'
+  version: 3.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -177,7 +177,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 846771552519936959
+      hash: 2076300502211513819
 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: 846771552519936959
+      hash: 2076300502211513819
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24