mobile-fu 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eec8e6c6d23829759304cd7265e7ec8f15ba159e
-  data.tar.gz: 766d897636d26203c5fa56f16c3ae1aa933bdb37
+  metadata.gz: 2baf64bbd0b25b8b035e267fbf395ab0febf61aa
+  data.tar.gz: 6d69f8abef1d41d6c0137200b44b96908ee55659
 SHA512:
-  metadata.gz: f113d5ca4f26d7e11e79185485202144cf4154edaf220df8b88da24b9e98ea2c4bdc8b6e0ceedf273707b17682fe84f2d4225a91f3f8067298c360d8bf78e25e
-  data.tar.gz: 6a634c597c1b1b3054bff34d1b3a6bbb832e3795044dddf50343c5ee7f08b87c68fb4dec4a0b7b30286461b48dbeb698c0b5175afa262616cb10016f7baa8167
+  metadata.gz: 1f4e53cbf1c3e422d31aa204519156206bae8105cf7e4f5e5ffb9ce4c6912176a99aa3dc00f99c6cc7237ec53b4c019b600edb45d57a393a072ff11e52c75e3f
+  data.tar.gz: 7e8907ac7d37ffbc368bf40b959a2c48e8607c94572059be14bf5a95587e7bcf8a258a85c942d7290fd84b829c0602c65dff5afe66329a7498569c7648a49290

data/lib/mobile-fu.rb

@@ -128,10 +128,10 @@ module ActionController
       # 'Tablet' view.
 
       def set_mobile_format
-        if request.format.html? && !mobile_action? && is_mobile_device? && !request.xhr?
+        if request.format.html? && mobile_action? && is_mobile_device? && !request.xhr?
           request.format = :mobile unless session[:mobile_view] == false
           session[:mobile_view] = true if session[:mobile_view].nil?
-        elsif request.format.html? && !mobile_action? && is_tablet_device? && !request.xhr?
+        elsif request.format.html? && mobile_action? && is_tablet_device? && !request.xhr?
           request.format = :tablet unless session[:tablet_view] == false
           session[:tablet_view] = true if session[:tablet_view].nil?
         end
@@ -179,7 +179,7 @@ module ActionController
       # See #has_mobile_fu_for
       def mobile_action?
         if self.class.instance_variable_get("@mobile_include_actions").nil? #Now we know we dont have any includes, maybe excludes?
-          return mobile_exempt?
+          return !mobile_exempt?
         else
           self.class.instance_variable_get("@mobile_include_actions").try(:include?, params[:action].to_sym)
         end

data/lib/mobile-fu/version.rb

@@ -1,3 +1,3 @@
 module MobileFu
-  VERSION = "1.2.0"
+  VERSION = "1.2.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mobile-fu
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Brendan Lim
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-04 00:00:00.000000000 Z
+date: 2013-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails