mobylette 2.2.rc1 → 2.2.rc2

data/README.rdoc

@@ -8,7 +8,8 @@ http://tscolari.github.com/mobylette/mobylette_images/mobylette.jpg
   Mobylette 1.6+ only supports Ruby 1.9.2+
   For Ruby 1.8.7 support, please use version < 1.6
 
-= Mobylette http://travis-ci.org/tscolari/mobylette.png
+= Mobylette 
+{<img src="https://secure.travis-ci.org/tscolari/mobylette.png" />}[http://travis-ci.org/tscolari/mobylette]
 
 This gem works by adding the 'mobile' format to your rails application. Whenever a request come from a mobile device, if you have your controller mobile enabled, it shall render the view.mobile.erb instead of the view.html.erb (or haml, or whatever).
 

data/lib/mobylette.rb

@@ -1,8 +1,9 @@
 #
 # Rails automatic mobile request support
 module Mobylette
-  require "mobylette/respond_to_mobile_requests"
+  require 'mobylette/respond_to_mobile_requests'
   require 'mobylette/fallback_resolver'
+  require 'mobylette/mobile_user_agents'
 
   # TestHelpers
   # require "mobylette/helmet"
@@ -12,4 +13,4 @@ end
 
 # Creating the :mobile format alias
 require 'action_controller'
-Mime::Type.register_alias "text/html", :mobile
+Mime::Type.register_alias 'text/html', :mobile

data/lib/mobylette/fallback_resolver.rb

@@ -1,22 +1,42 @@
 module Mobylette
 
-  # Creates a fallback from mobile to another format
+  # 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:
   #
-  #   append_view_path Mobylette::FallbackResolver.new('app/views')
+  #   class SomeController < ApplicationController
+  #     append_view_path Mobylette::FallbackResolver.new
+  #   end
   #
-  # Returns:
   #
-  #   if a .mobile view is not found it will look for a .html view
+  #   ...
+  #     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:
-    #     * :default => Falls back to the original request format
-    #     * :html/:js/:xml => Falls back to the format
+    #     * :html/:js/:xml/... => Falls back to that format
     #
     def use_fallback(fallback)
       @fallback_to = fallback
@@ -26,13 +46,8 @@ module Mobylette
     #         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)
+      details[:formats] = Array.wrap(fallback_list) if details[:formats].first == :mobile
+      super
     end
 
     private

data/lib/mobylette/mobile_user_agents.rb

@@ -0,0 +1,10 @@
+module Mobylette
+  # List of mobile 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'
+end

data/lib/mobylette/respond_to_mobile_requests.rb

@@ -1,8 +1,29 @@
 module Mobylette
-  # Mobylette::Controllers::RespondToMobileRequests includes the respond_to_mobile_requests
-  # to your ActionController::Base.
+  # Defines the behavior for responding to mobile requests with a different view.
+  #
+  # By including this to a controller, it will automaticaly look for a .mobile view
+  # instead of a .html, when the request comes from a mobile device.
+  #
+  # Usage:
+  #
+  #   class AppicationController < ActionController::Base
+  #     include Mobylette::RespondToMobileRequests
+  #   end
+  #
+  #
+  # You can define some options:
+  #
+  #   class...
+  #     include Mobylette::RespondToMobileRequests
+  #     mobylette_config do |config|
+  #       config[:fall_back] = :html
+  #       config[:skip_xhr_requests] = false
+  #     end
+  #     ...
+  #   end
+  #
+  # note: By default it will already fall back to the :html format
   #
-  # The respond_to_mobile_requests method enables the controller mobile handling
   module RespondToMobileRequests
     extend ActiveSupport::Concern
 
@@ -18,20 +39,13 @@ module Mobylette
       @@mobylette_options[:fall_back]         = :html
 
       cattr_accessor :mobylette_fallback_resolver
-      self.mobylette_fallback_resolver = Mobylette::FallbackResolver.new('app/views')
+      self.mobylette_fallback_resolver = Mobylette::FallbackResolver.new
       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)
-      #
-      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'
     end
 
+
+
     module ClassMethods
       # This method enables the controller do handle mobile requests
       #
@@ -74,7 +88,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 =~ /#{MOBILE_USER_AGENTS}/
+      request.user_agent.to_s.downcase =~ /#{Mobylette::MOBILE_USER_AGENTS}/
     end
 
     # :doc:

data/lib/mobylette/version.rb

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

data/spec/lib/fallback_resolver_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 module Mobylette
   describe FallbackResolver do
 
-    subject { FallbackResolver.new('app/views') }
+    subject { FallbackResolver.new }
 
     describe "#fallback_list" do
 
@@ -22,5 +22,32 @@ module Mobylette
       end
     end
 
+    describe "#find_templates" do
+      before(:each) do
+        @formats = []
+        Array.stub(:wrap).and_return(@formats)
+        @details = {:formats => []}
+      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

data/spec/lib/respond_to_mobile_requests_spec.rb

@@ -36,7 +36,7 @@ module Mobylette
         subject.send(:is_mobile_request?).should be_false
       end
 
-      RespondToMobileRequests::MOBILE_USER_AGENTS.split('|').each do |agent|
+      Mobylette::MOBILE_USER_AGENTS.split('|').each do |agent|
         agent.gsub!('\.', '.') # Ugly rack... but otherwise this will fail for up.b
         it "should be true for the agent #{agent}" do
           subject.stub_chain(:request, :user_agent).and_return(agent)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mobylette
 version: !ruby/object:Gem::Version
-  version: 2.2.rc1
+  version: 2.2.rc2
   prerelease: 4
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
-  requirement: &70219511332780 !ruby/object:Gem::Requirement
+  requirement: &70194941379380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70219511332780
+  version_requirements: *70194941379380
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70219511331560 !ruby/object:Gem::Requirement
+  requirement: &70194941378280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70219511331560
+  version_requirements: *70194941378280
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70219511347220 !ruby/object:Gem::Requirement
+  requirement: &70194941377260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70219511347220
+  version_requirements: *70194941377260
 description: Adds the mobile format for rendering views for mobile device.
 email:
 - tscolari@gmail.com
@@ -54,6 +54,7 @@ files:
 - config/initializers/responders.rb
 - lib/mobylette/fallback_resolver.rb
 - lib/mobylette/helmet.rb
+- lib/mobylette/mobile_user_agents.rb
 - lib/mobylette/railtie.rb
 - lib/mobylette/respond_to_mobile_requests.rb
 - lib/mobylette/version.rb
@@ -153,7 +154,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2077747218505376093
+      hash: -1627627498843530674
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: