mobylette 2.1 → 2.2.rc1

data/README.rdoc

@@ -29,7 +29,7 @@ Add the gem to your gemfile:
 
 And add to your ApplicationController.rb (for enabling it to all your controllers) or to the controllers you want this functionality on:
 
-    include Mobyllete::RespondToMobileRequests
+    include Mobylette::RespondToMobileRequests
 
 After that, you may start adding your .mobile. views.
 
@@ -49,22 +49,22 @@ There is a difference between is_mobile_view? and is_mobile_request?. You may ha
 
 == Configuration
 
-You can set the configuration with the mobyllete_config method:
+You can set the configuration with the mobylette_config method:
 
     mobylette_config do |config|
-      config[:fall_back] = nil
+      config[:fall_back] = false
       config[:skip_xhr_requests] = false
     end
 
 == Fall Backs
 
-By default, when the mobile format is not found, mobylette will fall back to the request original format. For example, if a mobile device makes a request by html, and there is no mobile view, it will render the html. You may force it always to fall back to a especific format, by setting the :fall_back option on your controller:
+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_config do |config|
       config[:fall_back] = :html
     end
 
-This would force all views (mobile) to fall back to the html views. You may also disable this behavior, and no fall back will ever occur:
+This would force all views (mobile) to fall back to the html views. You may also disable fall backs:
 
     mobylette_config do |config|
       config[:fall_back] = false

data/lib/mobylette.rb

@@ -2,6 +2,7 @@
 # Rails automatic mobile request support
 module Mobylette
   require "mobylette/respond_to_mobile_requests"
+  require 'mobylette/fallback_resolver'
 
   # TestHelpers
   # require "mobylette/helmet"

data/lib/mobylette/fallback_resolver.rb

@@ -0,0 +1,50 @@
+module Mobylette
+
+  # Creates a fallback from mobile to another format
+  #
+  # Examples:
+  #
+  #   append_view_path Mobylette::FallbackResolver.new('app/views')
+  #
+  # Returns:
+  #
+  #   if a .mobile view is not found it will look for a .html view
+  #
+  class FallbackResolver < ::ActionView::FileSystemResolver
+
+    # Public: Configures what fallback the resolver should use
+    #
+    # - fallback:
+    #     * :default => Falls back to the original request format
+    #     * :html/:js/:xml => Falls back to the 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)
+      return super unless details[:formats].first == :mobile
+
+      formats = Array.wrap(fallback_list)
+      details_copy = details.dup
+      details_copy[:formats] = formats
+      path = Path.build(name, prefix, partial)
+      query(path, details_copy, formats)
+    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/lib/mobylette/respond_to_mobile_requests.rb

@@ -15,7 +15,12 @@ module Mobylette
       cattr_accessor :mobylette_options
       @@mobylette_options = Hash.new
       @@mobylette_options[:skip_xhr_requests] = true
-      @@mobylette_options[:fall_back]         = nil
+      @@mobylette_options[:fall_back]         = :html
+
+      cattr_accessor :mobylette_fallback_resolver
+      self.mobylette_fallback_resolver = Mobylette::FallbackResolver.new('app/views')
+      self.mobylette_fallback_resolver.use_fallback(@@mobylette_options[:fall_back])
+      append_view_path self.mobylette_fallback_resolver
 
       # List of mobile agents, from mobile_fu (https://github.com/brendanlim/mobile-fu)
       #
@@ -37,7 +42,7 @@ module Mobylette
       # * fall_back: :html
       #     You may pass a fall_back option to the method, it will force the render
       #     to look for that other format, in case there is not a .mobile file for the view.
-      #     By default, it will fall back to the format of the original request.
+      #     By default, it will fall back to the html format.
       #     If you don't want fall back at all, pass fall_back: false
       # * skip_xhr_requests: true/false
       #     By default this is set to true. When a xhr request enters in, it will skip the
@@ -59,6 +64,7 @@ module Mobylette
       #
       def mobylette_config
         yield(self.mobylette_options)
+        self.mobylette_fallback_resolver.use_fallback(self.mobylette_options[:fall_back])
       end
     end
 
@@ -122,13 +128,9 @@ module Mobylette
     #
     def handle_mobile
       return if session[:mobylette_override] == :ignore_mobile
-      if respond_as_mobile?
 
-        original_format   = request.format.to_sym
-        request.format    = :mobile
-        if self.mobylette_options[:fall_back] != false
-          request.formats << Mime::Type.new(self.mobylette_options[:fall_back] || original_format)
-        end
+      if respond_as_mobile?
+        request.format = :mobile
       end
     end
 

data/lib/mobylette/version.rb

@@ -1,3 +1,3 @@
 module Mobylette
-  VERSION = "2.1"
+  VERSION = "2.2.rc1"
 end

data/spec/lib/fallback_resolver_spec.rb

@@ -0,0 +1,26 @@
+require 'spec_helper'
+
+module Mobylette
+  describe FallbackResolver do
+
+    subject { FallbackResolver.new('app/views') }
+
+    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
+
+  end
+end

data/spec/lib/respond_to_mobile_requests_spec.rb

@@ -236,17 +236,6 @@ module Mobylette
           @format.should == :mobile
         end
 
-        it "should have a fall back to the original format when fall_back is nil" do
-          subject.mobylette_options[:fall_back] = nil
-          subject.send(:handle_mobile)
-          @formats.include?(Mime::Type.new :old_format).should be_true
-        end
-
-        it "should have a fall back to :html when fall_back is :html" do
-          subject.mobylette_options[:fall_back] = :html
-          subject.send(:handle_mobile)
-          @formats.include?(Mime::Type.new :html).should be_true
-        end
       end
     end
   end

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: mobylette
 version: !ruby/object:Gem::Version
-  version: '2.1'
-  prerelease: 
+  version: 2.2.rc1
+  prerelease: 4
 platform: ruby
 authors:
 - Tiago Scolari
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-15 00:00:00.000000000 Z
+date: 2012-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
-  requirement: &70140935962560 !ruby/object:Gem::Requirement
+  requirement: &70219511332780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70140935962560
+  version_requirements: *70219511332780
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70140935961540 !ruby/object:Gem::Requirement
+  requirement: &70219511331560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70140935961540
+  version_requirements: *70219511331560
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70140935959780 !ruby/object:Gem::Requirement
+  requirement: &70219511347220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70140935959780
+  version_requirements: *70219511347220
 description: Adds the mobile format for rendering views for mobile device.
 email:
 - tscolari@gmail.com
@@ -52,6 +52,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - config/initializers/responders.rb
+- lib/mobylette/fallback_resolver.rb
 - lib/mobylette/helmet.rb
 - lib/mobylette/railtie.rb
 - lib/mobylette/respond_to_mobile_requests.rb
@@ -132,6 +133,7 @@ files:
 - 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/respond_to_mobile_requests_spec.rb
 - spec/mobylette_spec.rb
 - spec/spec_helper.rb
@@ -151,16 +153,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3922416622570358250
+      hash: 2077747218505376093
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: -3922416622570358250
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10
@@ -239,6 +238,7 @@ test_files:
 - 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/respond_to_mobile_requests_spec.rb
 - spec/mobylette_spec.rb
 - spec/spec_helper.rb