mobylette 1.6.0 → 2.0

data/lib/mobylette/controllers/helpers.rb

@@ -1,53 +0,0 @@
-module Mobylette
-  module Controllers
-
-    # Mobylette::Controllers::Helpers include few methods to
-    # include different css/js files for the mobile and for
-    # the normal version of your layout
-    #
-    # Personal notes:
-    # * I'm rethinking and I guess that, since you
-    #   may have (and probably will) a different layout file for the
-    #   "normal" and mobile version, you probably wont use this at all.
-    # * Also I'm not sure it's the case of using 'is_mobile_request?'
-    #   or 'is_mobile_view?' check here.'
-    module Helpers
-      extend ActiveSupport::Concern
-
-      # Adds a "_mobile" sulfix to the files you include (when the request is mobile)
-      def mobylette_stylesheet_link_tag(*sources)
-        options = sources.extract_options!
-        if is_mobile_request?
-          stylesheet_link_tag(*sulfix_mobile_assets(sources, :css).insert(-1, options))
-        else
-          stylesheet_link_tag(*sources.insert(-1, options))
-        end
-      end
-
-      # Adds a "_mobile" sulfix to the files you include (when the request is mobile)
-      def mobylette_javascript_include_tag(*sources)
-        options = sources.extract_options!
-        if is_mobile_request?
-          javascript_include_tag(*sulfix_mobile_assets(sources, :js).insert(-1, options))
-        else
-          javascript_include_tag(*sources.insert(-1, options))
-        end
-      end
-
-      private
-
-      # Anex the "_mobile" sulfix to each string in the array,
-      # before the .#{extension}, if it exists
-      def sulfix_mobile_assets(sources, extension)
-        sources.map do |source|
-          if source =~ /.#{extension}/
-            "#{source.split(/.#{extension}$/)[0]}_mobile.#{extension}"
-          else
-            "#{source}_mobile"
-          end
-        end
-      end
-    end
-
-  end
-end

data/lib/mobylette/controllers/respond_to_mobile_requests.rb

@@ -1,125 +0,0 @@
-module Mobylette
-  module Controllers
-
-    # Mobylette::Controllers::RespondToMobileRequests includes the respond_to_mobile_requests
-    # to your ActionController::Base.
-    #
-    # The respond_to_mobile_requests method enables the controller mobile handling
-    module RespondToMobileRequests
-      extend ActiveSupport::Concern
-
-      included do
-        helper_method :is_mobile_request?
-        helper_method :is_mobile_view?
-
-        # 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|iphone|mobileexplorer|mobile'
-      end
-
-      module ClassMethods
-
-        # This method enables the controller do handle mobile requests
-        #
-        # You must add this to every controller you want to respond differently to mobile devices,
-        # or make it application wide calling it from the ApplicationController
-        #
-        # Options:
-        # * 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.
-        #     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
-        #     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
-        def respond_to_mobile_requests(options = {})
-          return if self.included_modules.include?(Mobylette::Controllers::RespondToMobileRequestsMethods)
-
-          options.reverse_merge!({
-            skip_xhr_requests: true
-          })
-
-          cattr_accessor :mobylette_options
-          # works on 1.9, but not on 1.8
-          #valid_options = [:fall_back, :skip_xhr_requests]
-          #self.mobylette_options = options.reject {|option| !valid_options.include?(option)}
-          self.mobylette_options = options
-
-          self.send(:include, Mobylette::Controllers::RespondToMobileRequestsMethods)
-        end
-      end
-
-      private
-
-      # :doc:
-      # This helper returns exclusively if the request's  user_aget is from a mobile
-      # device or not.
-      def is_mobile_request?
-        request.user_agent.to_s.downcase =~ /#{MOBILE_USER_AGENTS}/
-      end
-
-      # :doc:
-      # This helper returns exclusively if the current format is mobile or not
-      def is_mobile_view?
-        true if (request.format.to_s == "mobile") or (params[:format] == "mobile")
-      end
-    end
-
-    # RespondToMobileRequestsMethods is included by respond_to_mobile_requests
-    #
-    # This will check if the request is from a mobile device and change
-    # the request format to :mobile
-    module RespondToMobileRequestsMethods
-      extend ActiveSupport::Concern
-
-      included do
-        before_filter :handle_mobile
-      end
-
-      private
-
-      # Returns true if this request should be treated as a mobile request
-      def respond_as_mobile?
-        processing_xhr_requests? and skip_mobile_param_not_present? and (force_mobile_by_session? or is_mobile_request? or (params[:format] == 'mobile'))
-      end
-
-      # Returns true if the visitor has de force_mobile session
-      def force_mobile_by_session?
-        session[:mobylette_override] == :force_mobile
-      end
-
-      # Returns true when ?skip_mobile=true is not passed to the request
-      def skip_mobile_param_not_present?
-        params[:skip_mobile] != 'true'
-      end
-
-      # Returns true only if treating XHR requests (when skip_xhr_requests are set to false) or
-      # or when this is a non xhr request
-      def processing_xhr_requests?
-        not self.mobylette_options[:skip_xhr_requests] && request.xhr?
-      end
-
-      # :doc:
-      # Changes the request.form to :mobile, when the request is from
-      # a mobile device
-      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
-        end
-      end
-
-    end
-  end
-end

data/lib/mobylette/helmet/faker.rb

@@ -1,19 +0,0 @@
-module Mobylette
-  module Helmet
-
-    # Forces the helper to think that all requests come
-    # from a mobile device
-    module Faker
-      extend ActiveSupport::Concern
-
-      included do
-        cattr_accessor :is_mobile_request
-      end
-
-      def is_mobile_request?
-        is_mobile_request
-      end
-
-    end
-  end
-end

data/lib/mobylette/helmet/helpers.rb

@@ -1,36 +0,0 @@
-module Mobylette
-  module Helmet
-    # This module is only for testing the view's helpers of the module
-    # it simulates the Helmet helpers and the controller methods
-    # that are necessary for the tests
-    module Helpers
-      extend ActiveSupport::Concern
-
-      included do
-        cattr_accessor :user_agent
-      end
-
-      # Force the request to be a mobile request
-      def force_mobile_request_agent
-        insert_faker
-        ActionController::Base.is_mobile_request = true
-      end
-
-      # Reset the request mobile agent of the request
-      def reset_test_request_agent
-        insert_faker
-        ActionController::Base.is_mobile_request = false
-      end
-
-      private
-
-      # includes the faker module for faking mobile requests
-      def insert_faker
-        return if ActionController::Base.included_modules.include?(Mobylette::Helmet::Faker)
-        ActionController::Base.send(:include, Mobylette::Helmet::Faker)
-      end
-
-
-    end
-  end
-end

data/spec/controllers/actioncontroller_base_spec.rb

@@ -1,24 +0,0 @@
-require 'spec_helper'
-
-describe ActionController::Base do
-
-  it "ActionController::Base class should respond to the respond_to_mobile_requests" do
-    ActionController::Base.respond_to?(:respond_to_mobile_requests).should be_true
-  end
-
-  it "should have the :is_mobile_request? method" do
-    # works on ruby 1.9.2, but not on 1.8.7:
-    #@controller.private_methods.include?(:is_mobile_request?).should be_true
-
-    @controller.send(:is_mobile_request?).should be_nil
-  end
-
-  it "should have the :is_mobile_request? method" do
-    # works on ruby 1.9.2, but not on 1.8.7:
-    #@controller.private_methods.include?(:is_mobile_request?).should be_true
-
-    @controller.send(:is_mobile_view?).should be_nil
-  end
-
-
-end

data/spec/controllers/default_fallback_controller_spec.rb

@@ -1,37 +0,0 @@
-require 'spec_helper'
-
-describe DefaultFallbackController do
-  # This controller calls respond_to_mobile_requests with no params
-  # Index action has views for html, js and mobile
-  # Test  action has only html and js
-
-  render_views
-
-  it "should find the correct view when it exists" do
-    force_mobile_request_agent
-    get :index
-    response.should render_template(:index)
-    response.body.should contain("MOBILE VIEW")
-  end
-
-  it "should find the correct view when it exists" do
-    reset_test_request_agent
-    get :index
-    response.should render_template(:index)
-    response.body.should contain("HTML VIEW")
-  end
-
-  it "should fall back to the default request format when it doesnt" do
-    force_mobile_request_agent
-    get :test
-    response.should render_template(:test)
-    response.body.should contain("HTML VIEW")
-  end
-
-  it "should fall back to the default request format when it doesnt (js)" do
-    force_mobile_request_agent
-    get :test, :format => :js
-    response.should render_template(:test)
-    response.body.should contain("JS VIEW")
-  end
-end

data/spec/controllers/desktop_only_controller_spec.rb

@@ -1,18 +0,0 @@
-require 'spec_helper'
-
-describe DesktopOnlyController do
-  # this controller has no actions
-  # and do not call respond_to_mobile_requests
-
-  it "should not have the :handle_mobile method" do
-    @controller.private_methods.include?(:handle_mobile).should_not be_true
-  end
-
-  it "should have the :is_mobile_request? method" do
-    # Works on ruby 1.9.2 but not on 1.8.7:
-    #@controller.private_methods.include?(:is_mobile_request?).should be_true
-
-    @controller.send(:is_mobile_request?).should be_nil
-  end
-
-end

data/spec/controllers/force_fallback_controller_spec.rb

@@ -1,46 +0,0 @@
-require 'spec_helper'
-
-describe ForceFallbackController do
-  # this controller calls respond_to_mobile_requests :fall_back => :js
-  # forcing fallback to be javascript
-  # index action has html, js and mobile views
-  # test  action has html and js only
-
-  render_views
-
-  it "should find the correct view (mobile) when it exists" do
-    force_mobile_request_agent
-    get :index
-    response.should render_template(:index)
-    response.body.should contain("MOBILE VIEW")
-  end
-
-  it "should find the correct view (html) when it exists" do
-    reset_test_request_agent
-    get :index
-    response.should render_template(:index)
-    response.body.should contain("HTML VIEW")
-  end
-
-  it "should fall back to the JS format when it doesnt have mobile" do
-    force_mobile_request_agent
-    get :test
-    response.should render_template(:test)
-    response.body.should contain("JS VIEW")
-  end
-
-  it "should fall back to the JS format when it doesnt have mobile" do
-    force_mobile_request_agent
-    get :test, :format => :html
-    response.should render_template(:test)
-    response.body.should contain("JS VIEW")
-  end
-
-  it "should fall back to the JS format when it doesnt (js)" do
-    force_mobile_request_agent
-    get :test, :format => :js
-    response.should render_template(:test)
-    response.body.should contain("JS VIEW")
-  end
-
-end

data/spec/controllers/home_controller_spec.rb

@@ -1,145 +0,0 @@
-require 'spec_helper'
-
-describe HomeController do
-  # This controller calls respond_to_mobile_requests with no params
-  # no_mobile_view action has only html
-  # mobile action has only mobile
-  # index action has html, js and mobile
-  # desktop action has only html
-  render_views
-
-  it "should have the :handle_mobile method" do
-    # Works on ruby 1.9.2 but not on 1.8.7
-    # @controller.private_methods.include?(:handle_mobile).should be_true
-    # this is a hack, not perfect, but if it didnt have the method it would
-    # throw an error, and the test would fail
-    @controller.send(:handle_mobile).should be_nil
-  end
-
-  it "should render the index view" do
-    get :index
-    response.should render_template(:index)
-    response.body.should contain("this is the html view")
-  end
-
-  describe "is_mobile_request? and force_mobile_request_agent/reset_test_request_agent" do
-    it "should have the Rails Testing request type by default" do
-      get :index
-      request.user_agent.should == "Rails Testing"
-      @controller.send(:is_mobile_request?).should be_false
-    end
-
-    it "should, on a mobile request, have 'is_mobile_request?' == true" do
-      force_mobile_request_agent("Android")
-      get :index
-      request.user_agent.should == "Android"
-      @controller.send(:is_mobile_request?).should be_true
-    end
-
-    it "should, on a mobile request, render the mobile type of view" do
-      force_mobile_request_agent
-      get :index
-      @controller.send(:is_mobile_request?).should be_true
-      response.body.should contain("this is the mobile view")
-    end
-
-    it "should, on reset_test_request_agent call, reset the user_agent to default (Rails Testing)" do
-      force_mobile_request_agent("Iphone")
-      reset_test_request_agent
-      get :index
-      @controller.send(:is_mobile_request?).should be_false
-      request.user_agent.should == "Rails Testing"
-    end
-  end
-
-  describe "Output Rendering" do
-    it "should display THIS A MOBILE DEVICE on index from mobile" do
-      force_mobile_request_agent("Android")
-      get :index
-      response.body.should contain("THIS A MOBILE DEVICE")
-    end
-
-    it "should not display THIS IS NOT A MOBILE DEVICE on index from mobile" do
-      force_mobile_request_agent("Android")
-      get :index
-      response.body.should_not contain("THIS IS NOT A MOBILE DEVICE")
-    end
-
-    it "should not display THIS A MOBILE DEVICE on index from non mobile" do
-      reset_test_request_agent
-      get :index
-      response.body.should_not contain("THIS A MOBILE DEVICE")
-    end
-
-    it "should display THIS IS NOT A MOBILE DEVICE on index from non mobile" do
-      reset_test_request_agent
-      get :index
-      response.body.should contain("THIS IS NOT A MOBILE DEVICE")
-    end
-  end
-
-  describe "respond_to with different views for different request types" do
-    it "should render desktop view on non mobile request" do
-      reset_test_request_agent
-      get :respond_to_test
-      response.should render_template(:desktop)
-    end
-
-    it "should render mobile view on mobile request" do
-      force_mobile_request_agent("Android")
-      get :respond_to_test
-      response.should render_template(:mobile)
-    end
-
-    it "should render mobile view when format => 'mobile' is passed" do
-      get :respond_to_test, :format => "mobile"
-      response.should render_template(:mobile)
-    end
-  end
-
-  #######################################################
-  # Testing XHR requests
-  describe "XHR Requests" do
-    it "should not use mobile format for xhr requests by default" do
-      force_mobile_request_agent("Android")
-      xhr :get, :index
-      response.should render_template(:index)
-      response.body.should contain("AJAX VIEW")
-    end
-  end
-
-  #######################################################
-  # Testing Session Override
-  describe "Session Override" do
-    it "should force mobile view if session says it so" do
-      reset_test_request_agent
-      set_session_override(:force_mobile)
-      get :index
-      response.should render_template(:index)
-      response.should contain("this is the mobile view")
-      response.should contain("THIS IS NOT A MOBILE DEVICE")
-    end
-
-    it "should ignore mobile view processing if session says it so" do
-      force_mobile_request_agent("Android")
-      set_session_override(:ignore_mobile)
-      get :index
-      response.should render_template(:index)
-      response.should contain("this is the html view")
-      response.should contain("THIS A MOBILE DEVICE")
-    end
-  end
-
-  ###################################################
-  # Param forcing
-  describe "Forcing to skip mobile by param" do
-    it "should not render mobile view if skip_mobile param is present and set to true" do
-      force_mobile_request_agent
-      get :index, :skip_mobile => 'true'
-      response.should render_template(:index)
-      response.should contain("this is the html view")
-      response.should contain("THIS A MOBILE DEVICE")
-    end
-  end
-
-end