mobylette 2.3 → 3.0

data/README.rdoc

@@ -44,34 +44,63 @@ After that, you may start adding your .mobile. views.
 
   Returns if the current format is :mobile or not.
 
-There is a difference between is_mobile_view? and is_mobile_request?. You may have a user requesting from a mobile device (is_mobile_request? == true) and at the same time, you may use the sesssion override to render de default format aways (is_mobile_view? == false). There are a lot of other combinations where these 2 functions will return different results.
-  * is_mobile_request?  -> Exclusively checks for the device from where the request were made
-  * is_mobile_view?     -> Exclusively checks for the view format been rendered
+* ==== request_device?
+
+  Returns true/false if the current request comes from the device passed as parameter.
+
+  Examples:
+    request_device?(:iphone)
+
+    request_device?(:android)
+
+  Only :iphone, :ipad, :ios and :android are recognized by default. But you can add other devices, check configuration.
 
 == Configuration
 
 You can set the configuration with the mobylette_config method:
 
     mobylette_config do |config|
-      config[:fall_back] = false
+    config[:fallback_chains] = { mobile: [:mobile, :html] }
       config[:skip_xhr_requests] = false
+      config[:mobile_user_agents] = proc { %r{iphone}i }
     end
 
-== Fall Backs
+=== Custom User Agents
 
-By default, when the mobile format is not found, mobylette will fall back to the html format. You may force it to fall back to another format, by setting the :fall_back option on your controller:
+Mobylette works uppon detecting the user agent of the visitor browser. By default it will detect any mobile user agent. But you can customize this by passing a proc with a regex of any matching user agent you may wish.
 
-    mobylette_config do |config|
-      config[:fall_back] = :html
-    end
+  mobylette_config do |config|
+    config[:mobile_user_agents] = proc { %r{iphone|ipad}i }
+  end
 
-This would force all views (mobile) to fall back to the html views. You may also disable fall backs:
+=== Fall Backs
 
-    mobylette_config do |config|
-      config[:fall_back] = false
-    end
+Fall backs are handled as a chain of formats. By default the only chain is `:mobile => [:mobile, :html]`.
+You can override this and add your own fall back chains using the `mobylette_config`.
+
+  mobylette_config do |config|
+    config[:fallback_chains] = {
+      mobile: [:mobile, :html],
+      iphone: [:iphone, :mobile, :html],
+      ...
+    }
+  end
 
-== XHR Requests
+When you create a custom format with fall back chains, `:iphone` for example, you must register it as a Mime::Type:
+  
+  # config/initializers/mime_types.rb
+  Mime::Type.register_alias 'text/html', :iphone
+  # this is very important, don't forget!
+  # :mobile is already registered!
+
+If you don't want any fall backs, just set it to:
+
+  mobylette_config do |config|
+    config[:fallback_chains] = { mobile: [:mobile] }
+  end
+
+
+=== XHR Requests
 
 By default the mobile device verification will skip XHR requests, and these will be served as if mobylette wasn't there. You can override this behavior by setting the :skip_xhr_requests option to false on your controller:
 
@@ -81,6 +110,17 @@ By default the mobile device verification will skip XHR requests, and these will
 
 You may need to use this if you are using JQuery mobile or something similar in your application.
 
+=== Registering Mobile Devices
+
+Mobylette 3.0+ has a `request_device?` helper. By default only :iphone, :ipad, :ios and :android devices come registered.
+But you can register any device using the `mobylette_config` method:
+
+  mobylette_config do |config|
+    config[:devices] = { my_unique_phone: %r{UniquePhone 1.2.3}, ... }
+  end
+
+Note: This will not add the device to the mobile user_agent detection. For that read #Custom User Agents.
+
 == Skiping mobile filter
 
 In the case you need to skip a mobile_request for been treated as mobile, you can pass the `skip_mobile=true` param to the url/request.
@@ -138,6 +178,6 @@ This will force the session_override value in the users session. Values possible
 Friendly note: on your tests, call these functions BEFORE you make the request, otherwise they are useless =p
 
 
-= LICENSE
+= License
 
 MIT License. Copyright 2012 Tiago Scolari.

data/lib/mobylette.rb

@@ -2,8 +2,9 @@
 # Rails automatic mobile request support
 module Mobylette
   require 'mobylette/respond_to_mobile_requests'
-  require 'mobylette/fallback_resolver'
+  require 'mobylette/resolvers/chained_fallback_resolver'
   require 'mobylette/mobile_user_agents'
+  require 'mobylette/devices'
 
   # TestHelpers
   # require "mobylette/helmet"

data/lib/mobylette/devices.rb

@@ -0,0 +1,47 @@
+require 'singleton'
+module Mobylette
+  class Devices
+    include Singleton
+
+    def initialize
+      @devices = {
+        android:  %r{android}i,
+        android2: %r{android\s+2\.}i,
+        android3: %r{android\s+3\.}i,
+        android4: %r{android\s+4\.}i,
+        iphone:   %r{iphone}i,
+        ipad:     %r{ipad}i,
+        ios:      %r{iphone|ipad}i,
+        ios3:     %r{(iphone|ipad)\s+os\s+3_},
+        ios4:     %r{(iphone|ipad)\s+os\s+4_},
+        ios5:     %r{(iphone|ipad)\s+os\s+5_},
+        ios6:     %r{(iphone|ipad)\s+os\s+6_}
+      }
+    end
+
+    # Register a new device to the
+    # devices list
+    #
+    # devices - hash defining a new device and it's regex.
+    #           you may assign multiple devices here.
+    #
+    # Examples:
+    #
+    #   register(iphone: /iphone/i)
+    #   register(iphone: /iphone/i, ipad: /ipad/i)
+    #
+    def register(devices)
+      @devices.merge! devices
+    end
+
+    # Returns the regex for the device
+    #
+    def device(device)
+      @devices[device] 
+    end
+  end
+
+  def self.devices
+    Devices.instance
+  end
+end

data/lib/mobylette/mobile_user_agents.rb

@@ -1,10 +1,78 @@
 module Mobylette
-  # List of mobile agents
+
+  # This is a mobile_user_agents object, you may pass your own implementation of this
+  # to the mobylette_config, it must return respond to call, returning a regexp
+  # for matching mobile user agents.
   #
-  MOBILE_USER_AGENTS =  'palm|blackberry|nokia|phone|midp|mobi|symbian|chtml|ericsson|minimo|' +
-    'audiovox|motorola|samsung|telit|upg1|windows ce|ucweb|astel|plucker|' +
-    'x320|x240|j2me|sgh|portable|sprint|docomo|kddi|softbank|android|mmp|' +
-    'pdxgw|netfront|xiino|vodafone|portalmmm|sagem|mot-|sie-|ipod|up\\.b|' +
-    'webos|amoi|novarra|cdm|alcatel|pocket|ipad|iphone|mobileexplorer|' +
-    'mobile|maemo|fennec|silk'
+  #   mobylette_config do |config|
+  #     config[:mobile_user_agents] = proc { /iphone|android/ }
+  #   end
+  #
+  class MobileUserAgents
+    
+    # Returns a list of mobile user agents
+    #
+    def call()
+      Regexp.union(DEFAULT_USER_AGENTS)
+    end
+
+    # List of all mobile user agents
+    #
+    DEFAULT_USER_AGENTS = %w(
+      palm
+      blackberry
+      nokia
+      phone
+      midp
+      mobi
+      symbian
+      chtml
+      ericsson
+      minimo
+      audiovox
+      motorola
+      samsung
+      telit
+      upg1
+      windows
+      ce
+      ucweb
+      astel
+      plucker
+      x320
+      x240
+      j2me
+      sgh
+      portable
+      sprint
+      docomo
+      kddi
+      softbank
+      android
+      mmp
+      pdxgw
+      netfront
+      xiino
+      vodafone
+      portalmmm
+      sagem
+      mot-
+      sie-
+      ipod
+      up.b
+      webos
+      amoi
+      novarra
+      cdm
+      alcatel
+      pocket
+      ipad
+      iphone
+      mobileexplorer
+      mobile
+      maemo
+      fennec
+      silk
+    )
+  end
 end

data/lib/mobylette/resolvers/chained_fallback_resolver.rb

@@ -0,0 +1,48 @@
+module Mobylette
+  module Resolvers
+    class ChainedFallbackResolver < ::ActionView::FileSystemResolver
+
+      # Initializes the fallback resolver with a default
+      # mobile format.
+      #
+      def initialize(formats = {})
+        @fallback_formats = formats.reverse_merge!({ mobile: [:mobile] })
+        super('app/views')
+      end
+
+      # Updates the fallback resolver replacing the
+      # fallback format hash.
+      #
+      # formats - hash of fallbacks, example:
+      #
+      #   formats = {
+      #     mobile: [:mobile, :html],
+      #     iphone: [:iphone, :ios, :mobile, :html],
+      #     android: [:android, :mobile],
+      #     ...
+      #   }
+      #
+      # It will add the fallback chain array of the 
+      # request.format to the resolver.
+      # 
+      # If the format.request is not defined in formats,
+      # it will behave as a normal FileSystemResovler.
+      #
+      def replace_fallback_formats_chain(formats)
+        @fallback_formats = formats.reverse_merge!({ mobile: [:mobile] })
+      end
+
+      # Public: finds the right template on the filesystem,
+      #         using fallback if needed
+      #
+      def find_templates(name, prefix, partial, details)
+        # checks if the format has a fallback chain
+        if @fallback_formats.has_key?(details[:formats].first)
+          details = details.dup
+          details[:formats] = Array.wrap(@fallback_formats[details[:formats].first]) 
+        end
+        super(name, prefix, partial, details)
+      end
+    end
+  end
+end

data/lib/mobylette/respond_to_mobile_requests.rb

@@ -18,6 +18,7 @@ module Mobylette
   #     mobylette_config do |config|
   #       config[:fall_back] = :html
   #       config[:skip_xhr_requests] = false
+  #       config[:mobile_user_agents] = proc { /iphone/i }
   #     end
   #     ...
   #   end
@@ -30,18 +31,21 @@ module Mobylette
     included do
       helper_method :is_mobile_request?
       helper_method :is_mobile_view?
+      helper_method :request_device?
 
       before_filter :handle_mobile
 
       cattr_accessor :mobylette_options
       @@mobylette_options = Hash.new
-      @@mobylette_options[:skip_xhr_requests] = true
-      @@mobylette_options[:fall_back]         = :html
-
-      cattr_accessor :mobylette_fallback_resolver
-      self.mobylette_fallback_resolver = Mobylette::FallbackResolver.new
-      self.mobylette_fallback_resolver.use_fallback(@@mobylette_options[:fall_back])
-      append_view_path self.mobylette_fallback_resolver
+      @@mobylette_options[:skip_xhr_requests]  = true
+      @@mobylette_options[:fallback_chains]    = { mobile: [:mobile, :html] }
+      @@mobylette_options[:mobile_user_agents] = Mobylette::MobileUserAgents.new
+      @@mobylette_options[:devices]            = Hash.new
+
+      cattr_accessor :mobylette_resolver
+      self.mobylette_resolver = Mobylette::Resolvers::ChainedFallbackResolver.new()
+      self.mobylette_resolver.replace_fallback_formats_chain(@@mobylette_options[:fallback_chains])
+      append_view_path self.mobylette_resolver
     end
 
 
@@ -63,6 +67,14 @@ module Mobylette
       #     mobile verification. This will let your ajax calls to work as intended.
       #     You may disable this (actually you will have to) if you are using JQuery Mobile, or
       #     other js framework that uses ajax. To disable, set skip_xhr_requests: false
+      # * mobile_user_agents: proc { /user_agents_match/ }
+      #     If you want to restrict the user agents that will be considered mobile devices,
+      #     you can send a custom proc/object that returns the matching regex you wish.
+      # * devices: {device_name: /device_reg/, device2_name: /device2_reg/, ...}
+      #     You may register devices for custom behavior by device.
+      #     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.
       #
       # Example Usage:
       #
@@ -72,26 +84,64 @@ module Mobylette
       #     mobylette_config do |config|
       #       config[:fall_back] = :html
       #       config[:skip_xhr_requests] = false
+      #       config[:mobile_user_agents] = proc { %r{iphone|android}i }
+      #       config[:devices] = {cool_phone: %r{cool\s+phone} }
       #     end
       #     ...
       #   end
       #
       def mobylette_config
         yield(self.mobylette_options)
-        self.mobylette_fallback_resolver.use_fallback(self.mobylette_options[:fall_back])
+        configure_fallback_resolver(self.mobylette_options)
+        Mobylette.devices.register(self.mobylette_options[:devices]) if self.mobylette_options[:devices]
+      end
+
+      private
+
+      # Private: Configures how the resolver shall handle fallbacks.
+      #
+      # if options has a :fallback_chains key, it will use it 
+      # as the fallback rules for the resolver, the format should
+      # be a hash, where each key defines a array of formats.
+      # Example:
+      #   options[:fallback_chains]
+      #   #=> { iphone: [:iphone, :mobile, :html], mobile: [:mobile, :html] }
+      #
+      # if there is no :fallback_chains, then it will look for a :fall_back
+      # key, that shall define only 1 fallback format to the mobile format.
+      # This keep compatibility with older versions.
+      # Example:
+      #   options[:fall_back]
+      #   #=> :html
+      #
+      def configure_fallback_resolver(options)
+        if options[:fall_back]
+          logger.warn "DEPRECATED > Mobylette: Please don't user :fall_back to configure fall backs any more. See the README for :fallback_chains instead."
+          self.mobylette_resolver.replace_fallback_formats_chain({ mobile: [:mobile, options[:fall_back]] })
+        else
+          if options[:fallback_chains]
+            self.mobylette_resolver.replace_fallback_formats_chain(options[:fallback_chains])
+          end
+        end
       end
     end
 
     private
 
-    # :doc:
     # Private: Tells if the request comes from a mobile user_agent or not
     #
     def is_mobile_request?
-      request.user_agent.to_s.downcase =~ /#{Mobylette::MOBILE_USER_AGENTS}/
+      request.user_agent.to_s.downcase =~ @@mobylette_options[:mobile_user_agents].call
+    end
+
+    # Private: Returns if this request comes from the informed device
+    #
+    # devive - device symbol. It must be previously registered as a device.
+    #
+    def request_device?(device)
+      (request.user_agent.to_s.downcase =~ (Mobylette.devices.device(device) || %r{not_to_be_matched_please}) ? true : false)
     end
 
-    # :doc:
     # Private: Helper method that tells if the currently view is mobile or not
     #
     def is_mobile_view?
@@ -137,15 +187,26 @@ module Mobylette
       end
     end
 
-    # :doc:
     # Private: Process the request as mobile
     #
     def handle_mobile
       return if session[:mobylette_override] == :ignore_mobile
-
       if respond_as_mobile?
-        request.format = :mobile
+        request.format = set_mobile_format
+      end
+    end
+
+    # Private: Checks if there are fallback_chains defined.
+    # if there is, it will try to match the request browser
+    # agains a fallback_chain key.
+    #
+    def set_mobile_format
+      if self.mobylette_options[:fallback_chains]
+        self.mobylette_options[:fallback_chains].keys.each do |device|
+          return device if request_device?(device)
+        end
       end
+      :mobile 
     end
 
   end

data/lib/mobylette/version.rb

@@ -1,3 +1,3 @@
 module Mobylette
-  VERSION = "2.3"
+  VERSION = "3.0"
 end

data/spec/dummy/log/development.log

@@ -0,0 +1,116 @@
+
+
+Started GET "/" for 127.0.0.1 at 2012-03-25 16:04:55 -0300
+  Processing by HomeController#index as HTML
+Rendered home/index.html.erb within layouts/application (2.2ms)
+Compiled application.css  (0ms)  (pid 45506)
+Compiled application.js  (0ms)  (pid 45506)
+Completed 200 OK in 25ms (Views: 24.5ms)
+
+
+Started GET "/assets/application.css?body=1" for 127.0.0.1 at 2012-03-25 16:04:55 -0300
+Served asset /application.css - 200 OK (5ms)
+
+
+Started GET "/assets/application.js?body=1" for 127.0.0.1 at 2012-03-25 16:04:55 -0300
+Served asset /application.js - 200 OK (3ms)
+
+
+Started GET "/" for 192.168.0.5 at 2012-03-25 16:05:53 -0300
+  Processing by HomeController#index as HTML
+Rendered home/index.mobile.erb within layouts/application (0.6ms)
+Compiled application_mobile.css  (0ms)  (pid 45506)
+Compiled application_mobile.js  (0ms)  (pid 45506)
+Completed 200 OK in 30ms (Views: 29.3ms)
+
+
+Started GET "/assets/application_mobile.css?body=1" for 192.168.0.5 at 2012-03-25 16:05:53 -0300
+Served asset /application_mobile.css - 200 OK (5ms)
+
+
+Started GET "/assets/application_mobile.js?body=1" for 192.168.0.5 at 2012-03-25 16:05:53 -0300
+Served asset /application_mobile.js - 200 OK (2ms)
+
+
+Started GET "/" for 127.0.0.1 at 2012-03-25 16:11:35 -0300
+  Processing by HomeController#index as HTML
+Rendered home/index.html.erb within layouts/application (2.5ms)
+Completed 200 OK in 34ms (Views: 33.9ms)
+
+
+Started GET "/assets/application.css?body=1" for 127.0.0.1 at 2012-03-25 16:11:35 -0300
+Served asset /application.css - 304 Not Modified (0ms)
+
+
+Started GET "/assets/application.js?body=1" for 127.0.0.1 at 2012-03-25 16:11:35 -0300
+Served asset /application.js - 304 Not Modified (0ms)
+
+
+Started GET "/" for 192.168.0.5 at 2012-03-25 16:11:43 -0300
+  Processing by HomeController#index as HTML
+Rendered home/index.mobile.erb within layouts/application (0.8ms)
+Completed 200 OK in 8ms (Views: 8.1ms)
+
+
+Started GET "/assets/application_mobile.css?body=1" for 192.168.0.5 at 2012-03-25 16:11:43 -0300
+Served asset /application_mobile.css - 304 Not Modified (0ms)
+
+
+Started GET "/assets/application_mobile.js?body=1" for 192.168.0.5 at 2012-03-25 16:11:43 -0300
+Served asset /application_mobile.js - 304 Not Modified (0ms)
+
+
+Started GET "/" for 127.0.0.1 at 2012-03-25 16:12:03 -0300
+  Processing by HomeController#index as HTML
+Rendered home/index.html.erb within layouts/application (0.3ms)
+Completed 200 OK in 26ms (Views: 25.6ms)
+
+
+Started GET "/assets/application.css?body=1" for 127.0.0.1 at 2012-03-25 16:12:03 -0300
+Served asset /application.css - 304 Not Modified (0ms)
+
+
+Started GET "/assets/application.js?body=1" for 127.0.0.1 at 2012-03-25 16:12:03 -0300
+Served asset /application.js - 304 Not Modified (0ms)
+
+
+Started GET "/" for 127.0.0.1 at 2012-03-25 16:12:05 -0300
+  Processing by HomeController#index as HTML
+Rendered home/index.html.erb within layouts/application (0.2ms)
+Completed 200 OK in 4ms (Views: 3.7ms)
+
+
+Started GET "/assets/application.css?body=1" for 127.0.0.1 at 2012-03-25 16:12:05 -0300
+Served asset /application.css - 304 Not Modified (0ms)
+
+
+Started GET "/assets/application.js?body=1" for 127.0.0.1 at 2012-03-25 16:12:05 -0300
+Served asset /application.js - 304 Not Modified (0ms)
+
+
+Started GET "/" for 127.0.0.1 at 2012-03-25 16:12:12 -0300
+  Processing by HomeController#index as HTML
+Rendered home/index.html.erb within layouts/application (0.2ms)
+Completed 200 OK in 4ms (Views: 3.6ms)
+
+
+Started GET "/assets/application.css?body=1" for 127.0.0.1 at 2012-03-25 16:12:12 -0300
+Served asset /application.css - 304 Not Modified (0ms)
+
+
+Started GET "/assets/application.js?body=1" for 127.0.0.1 at 2012-03-25 16:12:12 -0300
+Served asset /application.js - 304 Not Modified (0ms)
+
+
+Started GET "/" for 192.168.0.5 at 2012-03-25 16:12:15 -0300
+  Processing by HomeController#index as HTML
+Rendered home/index.mobile.erb within layouts/application (0.5ms)
+Completed 200 OK in 4ms (Views: 3.7ms)
+
+
+Started GET "/assets/application_mobile.css?body=1" for 192.168.0.5 at 2012-03-25 16:12:15 -0300
+Served asset /application_mobile.css - 200 OK (1ms)
+
+
+Started GET "/assets/application_mobile.js?body=1" for 192.168.0.5 at 2012-03-25 16:12:15 -0300
+Served asset /application_mobile.js - 200 OK (0ms)

data/spec/dummy/log/test.log

@@ -0,0 +1,97 @@
+  Processing by DefaultFallbackController#index as HTML
+Completed 200 OK in 19ms (Views: 17.9ms)
+  Processing by DefaultFallbackController#index as HTML
+Completed 200 OK in 2ms (Views: 2.2ms)
+  Processing by DefaultFallbackController#test as HTML
+Completed 200 OK in 2ms (Views: 2.0ms)
+  Processing by DefaultFallbackController#test as JS
+Completed 200 OK in 8ms (Views: 7.4ms)
+  Processing by ForceFallbackController#index as HTML
+Completed 200 OK in 4ms (Views: 3.4ms)
+  Processing by ForceFallbackController#index as HTML
+Completed 200 OK in 2ms (Views: 1.8ms)
+  Processing by ForceFallbackController#test as HTML
+Completed 200 OK in 2ms (Views: 1.8ms)
+  Processing by ForceFallbackController#test as HTML
+Completed 200 OK in 1ms (Views: 0.9ms)
+  Processing by ForceFallbackController#test as JS
+Completed 200 OK in 1ms (Views: 0.7ms)
+  Processing by HomeController#index as HTML
+Completed 200 OK in 4ms (Views: 3.4ms)
+  Processing by HomeController#index as HTML
+Completed 200 OK in 1ms (Views: 1.2ms)
+  Processing by HomeController#index as HTML
+Completed 200 OK in 2ms (Views: 2.2ms)
+  Processing by HomeController#index as HTML
+Completed 200 OK in 2ms (Views: 1.5ms)
+  Processing by HomeController#index as HTML
+Completed 200 OK in 1ms (Views: 1.1ms)
+  Processing by HomeController#index as HTML
+Completed 200 OK in 1ms (Views: 1.0ms)
+  Processing by HomeController#index as HTML
+Completed 200 OK in 2ms (Views: 1.8ms)
+  Processing by HomeController#index as HTML
+Completed 200 OK in 2ms (Views: 1.3ms)
+  Processing by HomeController#index as HTML
+Completed 200 OK in 1ms (Views: 1.0ms)
+  Processing by HomeController#respond_to_test as HTML
+Completed 200 OK in 2ms (Views: 1.7ms)
+  Processing by HomeController#respond_to_test as HTML
+Completed 200 OK in 2ms (Views: 1.7ms)
+  Processing by HomeController#respond_to_test as MOBILE
+Completed 200 OK in 1ms (Views: 0.9ms)
+  Processing by HomeController#index as JS
+Completed 200 OK in 5ms (Views: 5.2ms)
+  Processing by HomeController#index as HTML
+Completed 200 OK in 1ms (Views: 1.1ms)
+  Processing by HomeController#index as HTML
+Completed 200 OK in 1ms (Views: 1.1ms)
+  Processing by HomeController#index as HTML
+  Parameters: {"skip_mobile"=>"true"}
+Completed 200 OK in 1ms (Views: 1.1ms)
+  Processing by NoFallbackController#index as HTML
+Completed 200 OK in 4ms (Views: 3.7ms)
+  Processing by NoFallbackController#index as HTML
+Completed 200 OK in 3ms (Views: 2.5ms)
+  Processing by NoFallbackController#test as HTML
+Completed 500 Internal Server Error in 1ms
+  Processing by NoFallbackController#test as HTML
+Completed 500 Internal Server Error in 1ms
+  Processing by NoFallbackController#test as HTML
+Completed 500 Internal Server Error in 1ms
+  Processing by SkipXhrRequestController#index as JS
+Completed 200 OK in 6ms (Views: 5.3ms)
+DEPRECATED > Mobylette: Please don't user :fall_back to configure fall backs any more. Read the README for :fallback_chains instead.
+DEPRECATED > Mobylette: Please don't user :fall_back to configure fall backs any more. Read the README for :fallback_chains instead.
+DEPRECATED > Mobylette: Please don't user :fall_back to configure fall backs any more. Read the README for :fallback_chains instead.
+DEPRECATED > Mobylette: Please don't user :fall_back to configure fall backs any more. Read the README for :fallback_chains instead.
+DEPRECATED > Mobylette: Please don't user :fall_back to configure fall backs any more. Read the README for :fallback_chains instead.
+DEPRECATED > Mobylette: Please don't user :fall_back to configure fall backs any more. Read the README for :fallback_chains instead.
+DEPRECATED > Mobylette: Please don't user :fall_back to configure fall backs any more. Read the README for :fallback_chains instead.
+DEPRECATED > Mobylette: Please don't user :fall_back to configure fall backs any more. Read the README for :fallback_chains instead.
+DEPRECATED > Mobylette: Please don't user :fall_back to configure fall backs any more. Read the README for :fallback_chains instead.
+DEPRECATED > Mobylette: Please don't user :fall_back to configure fall backs any more. Read the README for :fallback_chains instead.
+DEPRECATED > Mobylette: Please don't user :fall_back to configure fall backs any more. Read the README for :fallback_chains instead.
+DEPRECATED > Mobylette: Please don't user :fall_back to configure fall backs any more. Read the README for :fallback_chains instead.
+DEPRECATED > Mobylette: Please don't user :fall_back to configure fall backs any more. Read the README for :fallback_chains instead.
+DEPRECATED > Mobylette: Please don't user :fall_back to configure fall backs any more. Read the README for :fallback_chains instead.
+DEPRECATED > Mobylette: Please don't user :fall_back to configure fall backs any more. Read the README for :fallback_chains instead.
+DEPRECATED > Mobylette: Please don't user :fall_back to configure fall backs any more. Read the README for :fallback_chains instead.
+DEPRECATED > Mobylette: Please don't user :fall_back to configure fall backs any more. Read the README for :fallback_chains instead.
+DEPRECATED > Mobylette: Please don't user :fall_back to configure fall backs any more. Read the README for :fallback_chains instead.
+DEPRECATED > Mobylette: Please don't user :fall_back to configure fall backs any more. Read the README for :fallback_chains instead.
+DEPRECATED > Mobylette: Please don't user :fall_back to configure fall backs any more. Read the README for :fallback_chains instead.
+DEPRECATED > Mobylette: Please don't user :fall_back to configure fall backs any more. Read the README for :fallback_chains instead.
+DEPRECATED > Mobylette: Please don't user :fall_back to configure fall backs any more. Read the README for :fallback_chains instead.
+DEPRECATED > Mobylette: Please don't user :fall_back to configure fall backs any more. Read the README for :fallback_chains instead.
+DEPRECATED > Mobylette: Please don't user :fall_back to configure fall backs any more. Read the README for :fallback_chains instead.
+DEPRECATED > Mobylette: Please don't user :fall_back to configure fall backs any more. Read the README for :fallback_chains instead.
+DEPRECATED > Mobylette: Please don't user :fall_back to configure fall backs any more. Read the README for :fallback_chains instead.
+DEPRECATED > Mobylette: Please don't user :fall_back to configure fall backs any more. Read the README for :fallback_chains instead.
+DEPRECATED > Mobylette: Please don't user :fall_back to configure fall backs any more. Read the README for :fallback_chains instead.
+DEPRECATED > Mobylette: Please don't user :fall_back to configure fall backs any more. Read the README for :fallback_chains instead.
+DEPRECATED > Mobylette: Please don't user :fall_back to configure fall backs any more. Read the README for :fallback_chains instead.
+DEPRECATED > Mobylette: Please don't user :fall_back to configure fall backs any more. Read the README for :fallback_chains instead.
+DEPRECATED > Mobylette: Please don't user :fall_back to configure fall backs any more. Read the README for :fallback_chains instead.
+DEPRECATED > Mobylette: Please don't user :fall_back to configure fall backs any more. Read the README for :fallback_chains instead.
+DEPRECATED > Mobylette: Please don't user :fall_back to configure fall backs any more. Read the README for :fallback_chains instead.

data/spec/dummy/tmp/cache/assets/C82/3E0/sprockets%2F48eb4ac616538f8f36870451073315da

@@ -0,0 +1,14 @@
+o: ActiveSupport::Cache::Entry	:@compressedF:@expires_in0:@created_atf1332702353.878731:@value{	I"length:EFi�
I"digest;
+F"%769c3433f6bf172ce80327c044c94eb8I"source;
+FI"�
// This is a manifest file that'll be compiled into including all the files listed below.
+// Add new JavaScript/Coffee code in separate files in this directory and they'll automatically
+// be included in the compiled file accessible from http://example.com/assets/application.js
+// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
+// the compiled file.
+//
+//
+
+alert("MOBILE JS");
+;
+FI"
+F"%34fa2587d444e6aea52cea430c668ccd

data/spec/dummy/tmp/cache/assets/CFC/200/sprockets%2F716f89d85d4855706b8a9abec1969c62

@@ -0,0 +1,16 @@
+o: ActiveSupport::Cache::Entry	:@compressedF:@expires_in0:@created_atf1332702353.869955:@value{	I"length:EFiaI"digest;
+F"%7b5b4d1463c8ab2cd40517c7d780541aI"source;
+FI"a/*
+ * This is the application mobile CSS
+ *
+ *
+ *
+ */
+
+
+body {
+  background-color: green;
+}
+;
+FI"
+F"%dcc110379513c5a0ef6f15e1c0fd77c0

data/spec/dummy/tmp/cache/assets/D54/ED0/sprockets%2F71c9fa01091d432b131da3bb73faf3d4

@@ -0,0 +1,16 @@
+o: ActiveSupport::Cache::Entry	:@compressedF:@expires_in0:@created_atf1332702295.254518:@value{	I"length:EFi`
I"digest;
+F"%da492739dcaff65c608e68791e24b0b5I"source;
+FI"`
/*
+ * This is a manifest file that'll automatically include all the stylesheets available in this directory
+ * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
+ * the top of the compiled file, but it's generally better to create a new file per style scope.
+*/
+
+
+
+body {
+  background-color: blue;
+}
+;
+FI"
+F"%4445ed39e85707f3677849c0aa9f18ed

data/spec/dummy/tmp/cache/assets/D84/210/sprockets%2Fabd0103ccec2b428ac62c94e4c40b384

@@ -0,0 +1,14 @@
+o: ActiveSupport::Cache::Entry	:@compressedF:@expires_in0:@created_atf1332702295.262975:@value{	I"length:EFi�
I"digest;
+F"%e9b5a652b2cb6afb7f4abf460034a746I"source;
+FI"�
// This is a manifest file that'll be compiled into including all the files listed below.
+// Add new JavaScript/Coffee code in separate files in this directory and they'll automatically
+// be included in the compiled file accessible from http://example.com/assets/application.js
+// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
+// the compiled file.
+//
+//
+
+alert("HTML JS");
+;
+FI"
+F"%22b0e19566c0b533398b54fe8fbd3f62

data/spec/lib/devices_spec.rb

@@ -0,0 +1,31 @@
+require 'spec_helper'
+
+module Mobylette
+  describe Devices do
+    
+    describe "#register" do
+      it "should accept a {key:value} and insert it into the devices list" do
+        Devices.instance.register(crazy_phone: /woot/)
+        Devices.instance.instance_variable_get("@devices")[:crazy_phone].should == /woot/
+      end
+
+      it "should accept more than one key:value" do
+        Devices.instance.register(awesomephone: /waat/, notthatcool: /sad/)
+        Devices.instance.instance_variable_get("@devices")[:awesomephone].should == /waat/
+        Devices.instance.instance_variable_get("@devices")[:notthatcool].should == /sad/
+      end
+    end
+
+    describe "#device" do
+      it "should return the regex for the informed device" do
+        Devices.instance.device(:iphone).should == /iphone/i
+      end
+    end
+  end
+
+  describe "#devices" do
+    it "should be an alias to Mobylette::Devices.instance" do
+      Mobylette.devices.should == Mobylette::Devices.instance
+    end
+  end
+end

data/spec/lib/resolvers/chained_fallback_resolver_spec.rb

@@ -0,0 +1,47 @@
+require 'spec_helper'
+
+module Mobylette
+  module Resolvers
+    describe ChainedFallbackResolver do
+
+      describe "#find_templates" do
+
+        context "single fallback chain" do
+          [
+            { mobile: [:mobile, :html]},
+            { iphone: [:iphone, :mobile, :html]}
+          ].each do |fallback_chain|
+            context "fallback chain = #{fallback_chain.to_s}" do
+              subject { Mobylette::Resolvers::ChainedFallbackResolver.new(fallback_chain) }
+
+              it "should change details[:formats] to the fallback array" do
+                details = { formats: [fallback_chain.keys.first] }
+                details.stub(:dup).and_return(details)
+                subject.find_templates("", "", "", details)
+                details[:formats].should == fallback_chain.values.first
+              end
+
+            end
+          end
+        end
+
+        context "multiple fallback chains" do
+          fallback_chains = {iphone: [:iphone, :mobile, :html], android: [:android, :html], mobile: [:mobile, :html]}
+          subject { Mobylette::Resolvers::ChainedFallbackResolver.new(fallback_chains) }
+
+          fallback_chains.each_pair do |format, fallback_array|
+            context "#{format} format" do
+              it "should change details[:formats] to the fallback array" do
+                details = { formats: [format] } 
+                details.stub(:dup).and_return(details)
+                subject.find_templates("", "", "", details)
+                details[:formats].should == fallback_array
+              end
+            end
+          end
+        end
+
+      end
+    end
+  end
+end

data/spec/lib/respond_to_mobile_requests/configuration_spec.rb

@@ -0,0 +1,65 @@
+require 'spec_helper'
+
+module Mobylette
+  describe RespondToMobileRequests do
+    describe 'Configuration' do
+
+      class MockConfigurationController < ActionController::Base
+        include Mobylette::RespondToMobileRequests
+      end
+
+      subject { MockConfigurationController.new }
+
+      describe "basic configuration delegation" do
+
+        describe "#mobilette_config" do
+          it "should set mobylette_options" do
+            subject.class.mobylette_config do |config|
+              config[:fallback_chains]   = { mobile: [:mobile, :html, :js] }
+              config[:skip_xhr_requests] = false
+            end
+            subject.mobylette_options[:fallback_chains].should == { mobile: [:mobile, :html, :js] }
+            subject.mobylette_options[:skip_xhr_requests].should be_false
+          end
+        end
+
+        describe "devices" do
+          it "should register devices to Mobylette::Devices" do
+            subject.class.mobylette_config do |config|
+              config[:devices] = {phone1: %r{phone_1}, phone2: %r{phone_2}}
+            end
+            Mobylette::Devices.instance.device(:phone1).should == /phone_1/
+            Mobylette::Devices.instance.device(:phone2).should == /phone_2/
+          end
+        end
+
+        describe "fallbacks" do
+          context "compatibility with deprecated fall back" do
+            it "should configure the fallback device with only one fallback" do
+              mobylette_resolver = double("resolver", replace_fallback_formats_chain: "")
+              mobylette_resolver.should_receive(:replace_fallback_formats_chain).with({ mobile: [:mobile, :spec] })
+              subject.class.stub(:mobylette_resolver).and_return(mobylette_resolver)
+              subject.class.mobylette_config do |config|
+                config[:fall_back] = :spec
+                config[:fallback_chains] = { mobile: [:mobile, :mp3] }
+              end
+            end
+          end
+
+          context "chained fallback" do
+            it "should use the fallback chain" do
+              mobylette_resolver = double("resolver", replace_fallback_formats_chain: "")
+              mobylette_resolver.should_receive(:replace_fallback_formats_chain).with({ iphone: [:iphone, :mobile], mobile: [:mobile, :html] })
+              subject.class.stub(:mobylette_resolver).and_return(mobylette_resolver)
+              subject.class.mobylette_config do |config|
+                config[:fall_back] = nil # reset to the default state
+                config[:fallback_chains] = { iphone: [:iphone, :mobile], mobile: [:mobile, :html] }
+              end
+            end
+          end
+
+        end
+      end
+    end
+  end
+end

data/spec/lib/respond_to_mobile_requests_spec.rb

@@ -5,39 +5,18 @@ module Mobylette
 
     class MockController < ActionController::Base
       include Mobylette::RespondToMobileRequests
-
-      mobylette_config do |config|
-        config[:fall_back] = :something
-        config[:skip_xhr_requests] = :something
-      end
     end
 
     subject { MockController.new }
 
-    describe "#mobilette_config" do
-      it "should have options configured" do
-        subject.mobylette_options[:fall_back].should == :something
-        subject.mobylette_options[:skip_xhr_requests].should == :something
-      end
-
-      it "should set mobylette_options" do
-        subject.class.mobylette_config do |config|
-          config[:fall_back] = :js
-          config[:skip_xhr_requests] = false
-        end
-        subject.mobylette_options[:fall_back].should == :js
-        subject.mobylette_options[:skip_xhr_requests].should be_false
-      end
-    end
-
     describe "#is_mobile_request?" do
       it "should be false for a normal request" do
         subject.stub_chain(:request, :user_agent).and_return('some mozilla')
         subject.send(:is_mobile_request?).should be_false
       end
 
-      Mobylette::MOBILE_USER_AGENTS.split('|').each do |agent|
-        agent.gsub!('\.', '.') # Ugly rack... but otherwise this will fail for up.b
+      Mobylette::MobileUserAgents.new.call.to_s.split('|').each do |agent|
+        agent.gsub!('\\', '')
         it "should be true for the agent #{agent}" do
           subject.stub_chain(:request, :user_agent).and_return(agent)
           subject.send(:is_mobile_request?).should be_true
@@ -220,13 +199,10 @@ module Mobylette
         before(:each) do
           subject.stub(:session).and_return({})
           subject.stub(:respond_as_mobile?).and_return(true)
-          @request = mock("request")
-          @format  = mock("old_format")
-          @format.stub(:to_sym).and_return(:old_format)
-          @request.stub(:format).and_return(@format)
-          @request.stub(:format=).and_return { |new_value| @format = new_value }
+          @format  = double("old_format", to_sym: :old_format)
           @formats = []
-          @request.stub(:formats).and_return(@formats)
+          @request = double("request", user_agent: "android", format: @format, formats: @formats)
+          @request.stub(:format=).and_return { |new_value| @format = new_value }
           subject.stub(:request).and_return(@request)
           subject.mobylette_options[:fall_back] = false
         end
@@ -238,5 +214,34 @@ module Mobylette
 
       end
     end
+
+    describe "#request_device?" do
+      it "should match a device" do
+        subject.stub_chain(:request, :user_agent).and_return('very custom browser WebKit')
+        Mobylette.devices.register(custom_phone: %r{custom\s+browser})
+        subject.send(:request_device?, :iphone).should be_false
+        subject.send(:request_device?, :custom_phone).should be_true
+      end
+    end
+
+    describe "#set_mobile_format" do
+      context "matching format in fallback chain" do
+        it "should return the request device format when it is in a chain" do
+          subject.mobylette_options[:fallback_chains] = { html: [:html, :htm], mp3: [:mp3, :wav, :mid] }
+          subject.stub(:request_device?).with(:mp3).and_return(true)
+          subject.stub(:request_device?).with(:html).and_return(false)
+          subject.send(:set_mobile_format).should == :mp3
+        end
+      end
+
+      context "not matching format in fallback chain" do
+        it "should return :mobile" do
+          subject.mobylette_options[:fallback_chains] = { html: [:html, :htm], mp3: [:mp3, :wav, :mid] }
+          subject.stub_chain(:request, :user_agent).and_return("android")
+          subject.send(:set_mobile_format).should == :mobile
+        end
+      end
+    end
+
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mobylette
 version: !ruby/object:Gem::Version
-  version: '2.3'
+  version: '3.0'
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-24 00:00:00.000000000 Z
+date: 2012-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
-  requirement: &70147243123000 !ruby/object:Gem::Requirement
+  requirement: &70192278087920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70147243123000
+  version_requirements: *70192278087920
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70147243121340 !ruby/object:Gem::Requirement
+  requirement: &70192278087140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70147243121340
+  version_requirements: *70192278087140
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70147243119240 !ruby/object:Gem::Requirement
+  requirement: &70192278085780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,18 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70147243119240
+  version_requirements: *70192278085780
+- !ruby/object:Gem::Dependency
+  name: debugger
+  requirement: &70192278084660 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70192278084660
 description: Adds the mobile format for rendering views for mobile device.
 email:
 - tscolari@gmail.com
@@ -52,10 +63,11 @@ extensions: []
 extra_rdoc_files: []
 files:
 - config/initializers/responders.rb
-- lib/mobylette/fallback_resolver.rb
+- lib/mobylette/devices.rb
 - lib/mobylette/helmet.rb
 - lib/mobylette/mobile_user_agents.rb
 - lib/mobylette/railtie.rb
+- lib/mobylette/resolvers/chained_fallback_resolver.rb
 - lib/mobylette/respond_to_mobile_requests.rb
 - lib/mobylette/version.rb
 - lib/mobylette.rb
@@ -117,6 +129,7 @@ files:
 - spec/dummy/config/routes.rb
 - spec/dummy/config.ru
 - spec/dummy/db/schema.rb
+- spec/dummy/log/development.log
 - spec/dummy/log/test.log
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
@@ -124,16 +137,24 @@ files:
 - spec/dummy/public/favicon.ico
 - spec/dummy/Rakefile
 - spec/dummy/script/rails
+- spec/dummy/tmp/cache/assets/C82/3E0/sprockets%2F48eb4ac616538f8f36870451073315da
+- spec/dummy/tmp/cache/assets/CE4/1C0/sprockets%2F18d93e1533d585b2f64ec90b33176ac9
+- spec/dummy/tmp/cache/assets/CED/A70/sprockets%2F621683d8791730a9cc7ce45e17a7e46d
+- spec/dummy/tmp/cache/assets/CFC/200/sprockets%2F716f89d85d4855706b8a9abec1969c62
+- spec/dummy/tmp/cache/assets/D32/A10/sprockets%2F13fe41fee1fe35b49d145bcc06610705
+- spec/dummy/tmp/cache/assets/D54/ED0/sprockets%2F71c9fa01091d432b131da3bb73faf3d4
+- spec/dummy/tmp/cache/assets/D84/210/sprockets%2Fabd0103ccec2b428ac62c94e4c40b384
+- spec/dummy/tmp/cache/assets/E04/890/sprockets%2F2f5173deea6c795b8fdde723bb4b63af
 - spec/integration/navigation_spec.rb
-- spec/lib/fallback_resolver_spec.rb
+- spec/lib/devices_spec.rb
+- spec/lib/resolvers/chained_fallback_resolver_spec.rb
+- spec/lib/respond_to_mobile_requests/configuration_spec.rb
 - spec/lib/respond_to_mobile_requests_spec.rb
 - spec/mobylette_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/tscolari/mobylette
 licenses: []
-post_install_message: ! "  **************************\n  Mobylette gem configuration
-  changed.\n  Use include Mobylette::RespondToMobileRequests instead of respond_to_mobile_requests
-  now.\n  Please refer to the readme for more information.\n  **************************\n"
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -145,7 +166,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1262445420216473146
+      hash: -96816333988164215
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -154,7 +175,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1262445420216473146
+      hash: -96816333988164215
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10
@@ -216,6 +237,7 @@ test_files:
 - spec/dummy/config/routes.rb
 - spec/dummy/config.ru
 - spec/dummy/db/schema.rb
+- spec/dummy/log/development.log
 - spec/dummy/log/test.log
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
@@ -223,8 +245,18 @@ test_files:
 - spec/dummy/public/favicon.ico
 - spec/dummy/Rakefile
 - spec/dummy/script/rails
+- spec/dummy/tmp/cache/assets/C82/3E0/sprockets%2F48eb4ac616538f8f36870451073315da
+- spec/dummy/tmp/cache/assets/CE4/1C0/sprockets%2F18d93e1533d585b2f64ec90b33176ac9
+- spec/dummy/tmp/cache/assets/CED/A70/sprockets%2F621683d8791730a9cc7ce45e17a7e46d
+- spec/dummy/tmp/cache/assets/CFC/200/sprockets%2F716f89d85d4855706b8a9abec1969c62
+- spec/dummy/tmp/cache/assets/D32/A10/sprockets%2F13fe41fee1fe35b49d145bcc06610705
+- spec/dummy/tmp/cache/assets/D54/ED0/sprockets%2F71c9fa01091d432b131da3bb73faf3d4
+- spec/dummy/tmp/cache/assets/D84/210/sprockets%2Fabd0103ccec2b428ac62c94e4c40b384
+- spec/dummy/tmp/cache/assets/E04/890/sprockets%2F2f5173deea6c795b8fdde723bb4b63af
 - spec/integration/navigation_spec.rb
-- spec/lib/fallback_resolver_spec.rb
+- spec/lib/devices_spec.rb
+- spec/lib/resolvers/chained_fallback_resolver_spec.rb
+- spec/lib/respond_to_mobile_requests/configuration_spec.rb
 - spec/lib/respond_to_mobile_requests_spec.rb
 - spec/mobylette_spec.rb
 - spec/spec_helper.rb

data/lib/mobylette/fallback_resolver.rb

@@ -1,69 +0,0 @@
-module Mobylette
-
-  # This manages the fall back from mobile views
-  # It only interfers on requests where the format is :mobile,
-  # and in case there is no view for the mobile format, it
-  # will fall back to the any other format that is configurated.
-  #
-  # When you insert Mobylette::RespondToMobileRequests to a
-  # controller, this class will be the new resolver for that
-  # controller.
-  #
-  # By default this resolver will not fallback to any format.
-  # Only is @fallback_to is configurated (by use_fallback)
-  #
-  # You should not use this by yourself unless you know what
-  # you are doing.
-  #
-  # Examples:
-  #
-  #   class SomeController < ApplicationController
-  #     append_view_path Mobylette::FallbackResolver.new
-  #   end
-  #
-  #
-  #   ...
-  #     my_controller_resolver = Mobylette::FallbackResolver.new
-  #     my_controller_resolver.use_fallback(:html)
-  #   ...
-  #
-  class FallbackResolver < ::ActionView::FileSystemResolver
-
-    def initialize
-      super('app/views')
-    end
-
-    # Public: Configures what fallback the resolver should use
-    #
-    # - fallback:
-    #     * :html/:js/:xml/... => Falls back to that format
-    #
-    def use_fallback(fallback)
-      @fallback_to = fallback
-    end
-
-    # Public: finds the right template on the filesystem,
-    #         using fallback if needed
-    #
-    def find_templates(name, prefix, partial, details)
-      if details[:formats].first == :mobile
-        details = details.dup
-        details[:formats] = Array.wrap(fallback_list) 
-      end
-
-      super(name, prefix, partial, details)
-    end
-
-    private
-
-    # Private: formats array, in fall back order
-    #
-    def fallback_list
-      if @fallback_to
-        [:mobile, @fallback_to.to_sym]
-      else
-        [:mobile]
-      end
-    end
-  end
-end

data/spec/lib/fallback_resolver_spec.rb

@@ -1,54 +0,0 @@
-require 'spec_helper'
-
-module Mobylette
-  describe FallbackResolver do
-
-    subject { FallbackResolver.new }
-
-    describe "#fallback_list" do
-
-      context "when use_fallback is set to false" do
-        it "should return only :mobile" do
-          subject.use_fallback(false)
-          subject.send(:fallback_list).should == [:mobile]
-        end
-      end
-
-      context "when use_fallback is set to any value" do
-        it "should return :mobile and the use_fallback value" do
-          subject.use_fallback(:somestuff)
-          subject.send(:fallback_list).should == [:mobile, :somestuff]
-        end
-      end
-    end
-
-    describe "#find_templates" do
-      before(:each) do
-        @formats = []
-        Array.stub(:wrap).and_return(@formats)
-        @details = {:formats => []}
-        @details.stub(:dup).and_return(@details)
-      end
-
-      context "mobile request" do
-        before(:each) { @details[:formats] = [:mobile] }
-
-        it "should set the details[:formats]" do
-          Array.should_receive(:wrap)
-          subject.find_templates('', '', '', @details)
-          @details[:formats].should == @formats
-        end
-      end
-
-      context "normal request" do
-        before(:each) { @details[:formats] = [:html] }
-
-        it "should not set the details[:formats]" do
-          subject.find_templates('', '', '', @details)
-          @details[:formats].should == [:html]
-        end
-      end
-    end
-
-  end
-end