mobile_path 0.1.0 → 0.2.0

data/README.md

@@ -30,6 +30,17 @@ You can override some of the defaults in your config/initializers/ folder like s
       config.mobile_device_regex = /(iPhone|Android)/
     end
 
+Configure your environment for appropriate top level domain length such as the following examples
+
+    development.rb
+    #   lvh.me = this is an alias for localhost
+    config.action_dispatch.tld_length=1
+
+    others
+
+    #   staging.mysite.com
+    #   config.action_dispatch.tld_length=2
+
 Usage
 -----
 

data/lib/mobile_path/configuration.rb

@@ -25,7 +25,12 @@ module MobilePath
     @@defaults = {
       :subdomain => 'm',
       :mobile_view_path => "mobile_views",
-      :mobile_device_regex => /(iPhone|iPod|iPad|Android)/
+      :mobile_device_regex => /('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')/i
     }
     
     def self.defaults

data/lib/mobile_path/version.rb

@@ -0,0 +1,3 @@
+module MobilePath
+  VERSION = "0.2.0"
+end

data/lib/mobile_path.rb

@@ -20,10 +20,10 @@ require 'active_support/concern'
 require 'mobile_path/configuration'
 
 module MobilePath
-    
+
   extend ActiveSupport::Concern
 
-  included do 
+  included do
     before_filter :toggle_mobile_preference_cookie
     before_filter :redirect_to_mobile_if_applicable
     before_filter :prepend_view_path_if_mobile
@@ -31,35 +31,35 @@ module MobilePath
 
 
   module InstanceMethods
-    
+
     private
-    
+
     #
     # checks if the requesting user agent is a mobile browser. The devices
     # that return true can be configured with the mobile_device_regex.
     def mobile_browser?
-       user_agent && user_agent[MobilePath.config.mobile_device_regex]
+      user_agent && user_agent[MobilePath.config.mobile_device_regex].present?
     end
-  
+
     #
     # Checks if the incoming request is using the mobile subdomain.
     def mobile_request?
-      request.subdomains.first == mobile_subdomain
+      (mobile_subdomain.present? && request.subdomains.first == mobile_subdomain) || mobile_browser?
     end
-    
+
     #
     # The subdomain for the application can be configured.  This method
     # just caches the subdomain in case it is used more than once per request.
     def mobile_subdomain
       @mobile_subdomain ||= MobilePath.config.subdomain
-    end  
-  
-  
+    end
+
+
     #
     # The view path that is prepended can be configured with mobile_view_path.
-    def mobile_view_path 
+    def mobile_view_path
       @mobile_view_path ||= MobilePath.config.mobile_view_path
-    end  
+    end
 
     #
     # If the request is for a mobile device, prepend the configured mobile view
@@ -72,21 +72,29 @@ module MobilePath
 
     #
     # Remove the mobile sudomain from the request path and redirect.
+    # Make sure to set the correct told lenght in environment configuration
+    #   lvh.me
+    #   config.action_dispatch.tld_length=1
+    #   staging.mysite.com
+    #   config.action_dispatch.tld_length=2
     def redirect_to_full_site
-      redirect_to request.protocol + request.host_with_port.gsub(mobile_subdomain, '') +
-                  request.fullpath and return
+      redirect_to [request.protocol, request.domain, request.port_string, request.fullpath].join and return
     end
 
     #
     # Remove www. and add the mobile submomain to the request and redirect
     def redirect_to_mobile
-      redirect_to request.protocol + mobile_subdomain + "." + request.host_with_port.gsub(/^www\./, '') + request.fullpath
+      redirect_to [request.protocol,
+                   mobile_subdomain, "." ,
+                   request.domain,
+                   request.port_string,
+                   request.fullpath].join and return if mobile_subdomain.present?
     end
 
     #
     # If a request is mobile and the user doesn't prefer the full-site, redirect to the mobile site.
     def redirect_to_mobile_if_applicable
-      unless mobile_request? || cookies[:prefer_full_site] || !mobile_browser?
+      unless !mobile_request? || cookies[:prefer_full_site].present?
         redirect_to_mobile and return
       end
     end
@@ -98,15 +106,14 @@ module MobilePath
         cookies.delete(:prefer_full_site)
       elsif params[:full_site]
         cookies.permanent[:prefer_full_site] = 1
-        redirect_to_full_site if mobile_request?
       end
     end
-  
+
     #
     # wrapper for the request HTTP user agent.
     def user_agent
       @user_agent ||= request.env["HTTP_USER_AGENT"]
     end
   end
-  
-end
+
+end

metadata

@@ -1,217 +1,156 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: mobile_path
-version: !ruby/object:Gem::Version 
-  hash: 27
+version: !ruby/object:Gem::Version
+  version: 0.2.0
   prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 0
-  version: 0.1.0
 platform: ruby
-authors: 
+authors:
 - patricksrobertson
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-05-23 00:00:00 -04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-09-04 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rails
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70112691525380 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70112691525380
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70112691524900 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 2
-        - 6
-        - 0
+      - !ruby/object:Gem::Version
         version: 2.6.0
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rspec-rails
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70112691524900
+- !ruby/object:Gem::Dependency
+  name: rspec-rails
+  requirement: &70112691524420 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 2
-        - 6
-        - 0
+      - !ruby/object:Gem::Version
         version: 2.6.0
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: yard
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70112691524420
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: &70112691523940 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 0
-        - 6
-        - 0
+      - !ruby/object:Gem::Version
         version: 0.6.0
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: bundler
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70112691523940
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: &70112691523460 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: jeweler
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *70112691523460
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: &70112691522980 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 6
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.6.0
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: rcov
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *70112691522980
+- !ruby/object:Gem::Dependency
+  name: rcov
+  requirement: &70112691522500 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: diesel
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: *70112691522500
+- !ruby/object:Gem::Dependency
+  name: diesel
+  requirement: &70112691522020 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 0
-        - 1
-        version: "0.1"
+      - !ruby/object:Gem::Version
+        version: '0.1'
   type: :development
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: sqlite3
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: *70112691522020
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: &70112691521540 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id009
-description: Mobile Path provides you with a mobile sub-domain and a new view path for mobile content.
+  prerelease: false
+  version_requirements: *70112691521540
+description: Mobile Path provides you with a mobile sub-domain and a new view path
+  for mobile content.
 email: patrick.robertson@velir.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
 - README.md
-files: 
-- .document
-- .rspec
+files:
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
-- README.md
 - Rakefile
+- README.md
 - VERSION
-- lib/mobile_path.rb
 - lib/mobile_path/configuration.rb
-- mobile_path.gemspec
-- spec/controllers/application_controller_spec.rb
-- spec/spec_helper.rb
-has_rdoc: true
+- lib/mobile_path/version.rb
+- lib/mobile_path.rb
 homepage: http://github.com/Velir/mobile_path
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Simple way to give your Rails app mobile views.
 test_files: []
-

data/.document

@@ -1,5 +0,0 @@
-lib/**/*.rb
-bin/*
-- 
-features/**/*.feature
-LICENSE.txt

data/.rspec

@@ -1 +0,0 @@
---color

data/mobile_path.gemspec

@@ -1,76 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{mobile_path}
-  s.version = "0.1.0"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["patricksrobertson"]
-  s.date = %q{2011-05-23}
-  s.description = %q{Mobile Path provides you with a mobile sub-domain and a new view path for mobile content.}
-  s.email = %q{patrick.robertson@velir.com}
-  s.extra_rdoc_files = [
-    "LICENSE.txt",
-    "README.md"
-  ]
-  s.files = [
-    ".document",
-    ".rspec",
-    "Gemfile",
-    "Gemfile.lock",
-    "LICENSE.txt",
-    "README.md",
-    "Rakefile",
-    "VERSION",
-    "lib/mobile_path.rb",
-    "lib/mobile_path/configuration.rb",
-    "mobile_path.gemspec",
-    "spec/controllers/application_controller_spec.rb",
-    "spec/spec_helper.rb"
-  ]
-  s.homepage = %q{http://github.com/Velir/mobile_path}
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
-  s.summary = %q{Simple way to give your Rails app mobile views.}
-
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rails>, ["~> 3.0"])
-      s.add_development_dependency(%q<rspec>, ["~> 2.6.0"])
-      s.add_development_dependency(%q<rspec-rails>, ["~> 2.6.0"])
-      s.add_development_dependency(%q<yard>, ["~> 0.6.0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.6.0"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
-      s.add_development_dependency(%q<diesel>, ["~> 0.1"])
-      s.add_development_dependency(%q<sqlite3>, [">= 0"])
-    else
-      s.add_dependency(%q<rails>, ["~> 3.0"])
-      s.add_dependency(%q<rspec>, ["~> 2.6.0"])
-      s.add_dependency(%q<rspec-rails>, ["~> 2.6.0"])
-      s.add_dependency(%q<yard>, ["~> 0.6.0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.6.0"])
-      s.add_dependency(%q<rcov>, [">= 0"])
-      s.add_dependency(%q<diesel>, ["~> 0.1"])
-      s.add_dependency(%q<sqlite3>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<rails>, ["~> 3.0"])
-    s.add_dependency(%q<rspec>, ["~> 2.6.0"])
-    s.add_dependency(%q<rspec-rails>, ["~> 2.6.0"])
-    s.add_dependency(%q<yard>, ["~> 0.6.0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.6.0"])
-    s.add_dependency(%q<rcov>, [">= 0"])
-    s.add_dependency(%q<diesel>, ["~> 0.1"])
-    s.add_dependency(%q<sqlite3>, [">= 0"])
-  end
-end
-

data/spec/controllers/application_controller_spec.rb

@@ -1,43 +0,0 @@
-require 'spec_helper'
-
-describe ApplicationController do
-  controller do
-    def index
-      render :nothing => true
-    end
-  end
-  
-  describe "GET 'index'" do
-    it "should redirect to a mobile domain when given an appropriate user agent" do    
-      request.env["HTTP_USER_AGENT"] = "Mozilla/5.0 (iPhone; U; XXXXX like Mac OS X; en) AppleWebKit/420+ (KHTML, like Gecko) Version/3.0 Mobile/241 Safari/419.3 |"
-      get :index
-      response.location.split("http://")[1].split(".")[0].should eq(MobilePath.config.subdomain)
-    end
-    
-    it "should redirect to a configured domain as well." do    
-      request.env["HTTP_USER_AGENT"] = "Mozilla/5.0 (iPhone; U; XXXXX like Mac OS X; en) AppleWebKit/420+ (KHTML, like Gecko) Version/3.0 Mobile/241 Safari/419.3 |"
-      MobilePath.configure do |config|
-        config.subdomain = "mobizzle"
-      end
-      get :index
-      response.location.split("http://")[1].split(".")[0].should eq("mobizzle")
-    end
-    
-    it "shouldn't redirect on a normal user agent" do
-      request.env["HTTP_USER_AGENT"] = "Test"      
-      get :index
-      response.location.should be_false
-    end
-    
-    it "shouldn't redirect on a mobile user agent with a full_site param" do
-      request.env["HTTP_USER_AGENT"] = "Mozilla/5.0 (iPhone; U; XXXXX like Mac OS X; en) AppleWebKit/420+ (KHTML, like Gecko) Version/3.0 Mobile/241 Safari/419.3 |"      
-      get :index, {:full_site => true}
-      response.location.should be_false
-      
-      get :index, {:mobile_site => true}
-      response.location.split("http://")[1].split(".")[0].should eq(MobilePath.config.subdomain)
-    end
-    
-  end
-
-end

data/spec/spec_helper.rb

@@ -1,19 +0,0 @@
-ENV["RAILS_ENV"] ||= 'test'
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'rspec'
-require 'mobile_path'
-require 'rails/all'
-require 'rspec/rails'
-require 'diesel/testing'
-
-# Requires supporting files with custom matchers and macros, etc,
-# in ./support/ and its subdirectories.
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
-
-class ApplicationController < ActionController::Base
-  include MobilePath
-end
-
-RSpec.configure do |config|
-end