mobile-fu 1.1.1 → 1.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: eec8e6c6d23829759304cd7265e7ec8f15ba159e
+  data.tar.gz: 766d897636d26203c5fa56f16c3ae1aa933bdb37
+SHA512:
+  metadata.gz: f113d5ca4f26d7e11e79185485202144cf4154edaf220df8b88da24b9e98ea2c4bdc8b6e0ceedf273707b17682fe84f2d4225a91f3f8067298c360d8bf78e25e
+  data.tar.gz: 6a634c597c1b1b3054bff34d1b3a6bbb832e3795044dddf50343c5ee7f08b87c68fb4dec4a0b7b30286461b48dbeb698c0b5175afa262616cb10016f7baa8167

data/README.md

@@ -36,6 +36,24 @@ class ApplicationController < ActionController::Base
 end
 ```
 
+If you dont want to have all the methods respond to :mobile and :tablet, you can opt-in this actions
+using the following class method: `has_mobile_fu_for :action`
+Example:
+
+```ruby
+class YourAwesomeClass < ActionController::Base
+  has_mobile_fu
+  has_mobile_fu_for :index
+
+  def index
+    # Mobile format will be set as normal here if user is on a mobile device
+  end
+
+  def another_method
+    # Mobile format will not be set, even if user is on a mobile device
+  end
+```
+
 Mobile Fu automatically adds a new `:mobile` and `:tablet` to `text/html` mime type
 alias for Rails apps. If you already have a custom `:mobile` alias registered in
 `config/initializers/mime_types.rb`, you can remove that.
@@ -69,6 +87,21 @@ session[:tablet_view] # => Set to true if request format is :tablet and false
                            if set to :html
 ```
 
+If you want to use the default response templates, like index.html.erb, instead of the index.tablet.erb you can
+exclude the tablet rendering from beeing used:
+you can create a `before_filter` and put it before the has_mobile_fu call
+
+```ruby
+before_filter :force_tablet_html
+has_mobile_fu
+
+def force_tablet_html
+	session[:tablet_view] = false
+end
+```
+
+Same will work for mobile, just change the `tablet` values to `mobile`
+
 So, different devices need different styling.  Don't worry, we've got this
 baked in to Mobile Fu.
 

data/lib/mobile-fu.rb

@@ -33,7 +33,7 @@ module ActionController
   module MobileFu
     # These are various strings that can be found in tablet devices.  Please feel free
     # to add on to this list.
-    TABLET_USER_AGENTS =  'ipad|android 3.0|xoom|sch-i800|playbook|tablet|kindle|honeycomb'
+    TABLET_USER_AGENTS =  /ipad|android 3.0|xoom|sch-i800|gt-p1000|playbook|tablet|kindle|honeycomb|nexus 7/.freeze
 
     def self.included(base)
       base.extend ClassMethods
@@ -82,6 +82,23 @@ module ActionController
       def has_no_mobile_fu_for(*actions)
         @mobile_exempt_actions = actions
       end
+      
+      # Add this to your controllers to only let those actions use the mobile format
+      # this method has priority over the #has_no_mobile_fu_for
+      #   class AwesomeController < ApplicationController
+      #     has_mobile_fu_for :index
+      #
+      #     def index
+      #       # Mobile format will be set as normal here if user is on a mobile device
+      #     end
+      #
+      #     def show
+      #       # Mobile format will not be set, even if user is on a mobile device
+      #     end
+      #   end
+      def has_mobile_fu_for(*actions)
+        @mobile_include_actions = actions
+      end
     end
 
     module InstanceMethods
@@ -111,10 +128,10 @@ module ActionController
       # 'Tablet' view.
 
       def set_mobile_format
-        if !mobile_exempt? && 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 !mobile_exempt? && 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
@@ -140,7 +157,7 @@ module ActionController
       # the device making the request is matched to a device in our regex.
 
       def is_tablet_device?
-        !!(request.user_agent.to_s.downcase =~ Regexp.new(ActionController::MobileFu::TABLET_USER_AGENTS))
+        !!(request.user_agent.to_s.downcase =~ ActionController::MobileFu::TABLET_USER_AGENTS)
       end
 
       def is_mobile_device?
@@ -158,6 +175,16 @@ module ActionController
         request.user_agent.to_s.downcase.include? type.to_s.downcase
       end
 
+      # Returns true if current action is supposed to use mobile format
+      # 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?
+        else
+          self.class.instance_variable_get("@mobile_include_actions").try(:include?, params[:action].to_sym)
+        end
+      end
+
       # Returns true if current action isn't supposed to use mobile format
       # See #has_no_mobile_fu_for
 

data/lib/mobile-fu/helper.rb

@@ -1,7 +1,9 @@
 module MobileFu
   module Helper
+    JS_ENABLED_DEVICES = %w{iphone ipod ipad mobileexplorer android zune}
+
     def js_enabled_mobile_device?
-      is_device?('iphone') || is_device?('ipod') || is_device?('ipad') || is_device?('mobileexplorer') || is_device?('android')
+      JS_ENABLED_DEVICES.find { |device| is_device? device }
     end
 
     def stylesheet_link_tag_with_mobilization(*sources)

data/lib/mobile-fu/version.rb

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

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mobile-fu
 version: !ruby/object:Gem::Version
-  version: 1.1.1
-  prerelease: 
+  version: 1.2.0
 platform: ruby
 authors:
 - Brendan Lim
@@ -10,70 +9,62 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-15 00:00:00.000000000 Z
+date: 2013-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rack-mobile-detect
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Want to automatically detect mobile devices that access your Rails application?
@@ -96,33 +87,26 @@ files:
 - spec/spec_helper.rb
 homepage: https://github.com/benlangfeld/mobile-fu
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -851634981796251436
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -851634981796251436
 requirements: []
 rubyforge_project: mobile-fu
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Automatically detect mobile requests from mobile devices in your Rails application.
 test_files:
 - spec/mobilized_styles_spec.rb