rack-mobile-detect 0.3.0 → 0.4.0

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+### 0.4.0: Jun 7, 2012 ###
+* Added iPad as a targeted device, thank you sansari (https://github.com/sansari)
+
 ### 0.3.0: Mar 12, 2011 ###
 * Modified catch-all based: https://github.com/brendanlim/mobile-fu
 

data/README.md

@@ -23,10 +23,10 @@ advanced capabilities - for example and iPhone or Android phone.
 Targeted mobile devices are detected via a `Regexp` applied against
 the HTTP User-Agent header.
 
-By default, the targeted devices are iPhone, Android and iPod. If a
-targeted device is detected, the token match from the regular
-expression will be the value passed in the `X_MOBILE_DEVICE` header,
-i.e.: `X_MOBILE_DEVICE: iPhone`
+By default, the targeted devices are iPhone, iPad, Android and
+iPod. If a targeted device is detected, the token match from the
+regular expression will be the value passed in the `X_MOBILE_DEVICE`
+header, i.e.: `X_MOBILE_DEVICE: iPhone`
 
 
 ### UAProf Detection ###
@@ -84,27 +84,29 @@ list you choose.
 Redirects
 =========
 
-    use Rack::MobileDetect, :redirect_to => '/mobile'
+    use Rack::MobileDetect, :redirect_to => 'http://m.example.com/'
 
 This allows you to choose a custom redirect path any time a mobile
 device is detected.
 
     use Rack::MobileDetect, :targeted => /BlackBerry|iPhone/,
-                            :redirect_map => { 'BlackBerry' => '/m/blackberry', 'iPhone' => '/m/iphone' }
+                            :redirect_map => { 'BlackBerry' => 'http://m.example.com/blackberry',
+                                               'iPhone' => 'http://m.example.com/iphone' }
 
 This allows you to map specific redirect URLs to targeted devices. The
 key in the redirect_map should be the value of the matched pattern.
 
     use Rack::MobileDetect, :targeted => /BlackBerry|iPhone/,
-                            :redirect_map => { 'BlackBerry' => '/m/blackberry', 'iPhone' => '/m/iphone' },
-                            :redirect_to => '/mobile'
+                            :redirect_map => { 'BlackBerry' => 'http://m.example.com/blackberry',
+                                               'iPhone' => 'http://m.example.com/iphone' },
+                            :redirect_to => 'http://m.example.com/'
 
 This allows you to map targeted devices to specific URLs. Non-targeted
 mobile devices will redirect to the url specified by redirect_to.
 
 In the example above, BlackBerrys and iPhones get redirected to
 device-specific URLs. All other mobile devices get redirected to
-'/mobile'.
+'http://m.example.com'.
 
 
 Utils

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
+:patch: 0
 :major: 0
 :build: 
-:minor: 3
-:patch: 0
+:minor: 4

data/lib/rack/mobile-detect.rb

@@ -33,11 +33,11 @@ module Rack
   #
   # 1. Search for a 'targeted' mobile device. A targeted mobile device
   # is a mobile device you may want to provide special content to
-  # because it has advanced capabilities - for example and iPhone or
+  # because it has advanced capabilities - for example an iPad, iPhone or
   # Android device. Targeted mobile devices are detected via a Regexp
   # applied against the HTTP User-Agent header.
   #
-  # By default, the targeted devices are iPhone, Android and iPod. If
+  # By default, the targeted devices are iPhone, Android, iPad and iPod. If
   # a targeted device is detected, the token match from the regular
   # expression will be the value passed in the X_MOBILE_DEVICE header,
   # i.e.: X_MOBILE_DEVICE: iPhone
@@ -109,7 +109,7 @@ module Rack
       # captured. Captured tokens are passed through in the
       # environment variable. These are special mobile devices that
       # may have special rendering capabilities for you to target.
-      @regex_ua_targeted = options[:targeted] || /iphone|android|ipod/i
+      @regex_ua_targeted = options[:targeted] || /iphone|android|ipod|ipad/i
 
       # Match mobile content in Accept header:
       # http://www.developershome.com/wap/detection/detection.asp?page=httpHeaders

data/rack-mobile-detect.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rack-mobile-detect}
-  s.version = "0.3.0"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tom Alison"]
-  s.date = %q{2011-03-12}
+  s.date = %q{2012-06-07}
   s.description = %q{Rack::MobileDetect detects mobile devices and adds an
     X_MOBILE_DEVICE header to the request if a mobile device is detected. Specific
     devices can be targeted with custom Regexps and redirect support is available.}
@@ -35,7 +35,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = %q{http://github.com/talison/rack-mobile-detect}
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{Rack middleware for ruby webapps to detect mobile devices.}
   s.test_files = [
     "test/helper.rb",
@@ -43,9 +43,10 @@ Gem::Specification.new do |s|
   ]
 
   if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_runtime_dependency(%q<rack>, [">= 0"])
     else

data/test/test_rack-mobile-detect.rb

@@ -26,6 +26,10 @@ class TestRackMobileDetect < Test::Unit::TestCase
       env = test_env({ 'HTTP_USER_AGENT' => android })
       @rack.call(env)
       assert_equal 'Android', env[x_mobile]
+
+      env = test_env({ 'HTTP_USER_AGENT' => ipad })
+      @rack.call(env)
+      assert_equal 'iPad', env[x_mobile]
     end
 
     should "detect UAProf device" do
@@ -130,7 +134,8 @@ class TestRackMobileDetect < Test::Unit::TestCase
     setup do
       @app = test_app
       # Custom redirect
-      @rack = Rack::MobileDetect.new(@app, :redirect_to => '/mobile')
+      @rack = Rack::MobileDetect.new(@app,
+                                     :redirect_to => 'http://m.example.com/')
     end
 
     should "redirect to mobile website" do
@@ -139,14 +144,17 @@ class TestRackMobileDetect < Test::Unit::TestCase
       assert_equal 'iPhone', env[x_mobile]
 
       assert_equal(301, status)
-      assert_equal({'Location' => "/mobile"}, headers)
+      assert_equal({'Location' => "http://m.example.com/"}, headers)
     end
   end
 
   context "An app with a custom redirect map" do
     setup do
       @app = test_app
-      redirects = { "myphone" => "/m/myphone", "yourphone" => "/m/yourphone" }
+      redirects = {
+        "myphone" => "http://m.example.com/myphone",
+        "yourphone" => "http://m.example.com/yourphone"
+      }
       # Target fake devices
       @rack = Rack::MobileDetect.new(@app,
                                      :targeted => /myphone|yourphone/,
@@ -159,7 +167,7 @@ class TestRackMobileDetect < Test::Unit::TestCase
       assert_equal 'myphone', env[x_mobile]
 
       assert_equal(301, status)
-      assert_equal({'Location' => "/m/myphone"}, headers)
+      assert_equal({'Location' => "http://m.example.com/myphone"}, headers)
 
 
       env = test_env({ 'HTTP_USER_AGENT' => 'yourphone sucks' })
@@ -167,7 +175,7 @@ class TestRackMobileDetect < Test::Unit::TestCase
       assert_equal 'yourphone', env[x_mobile]
 
       assert_equal(301, status)
-      assert_equal({'Location' => "/m/yourphone"}, headers)
+      assert_equal({'Location' => "http://m.example.com/yourphone"}, headers)
 
     end
 
@@ -183,12 +191,15 @@ class TestRackMobileDetect < Test::Unit::TestCase
   context "An app with a custom redirect map and redirect_to option" do
     setup do
       @app = test_app
-      redirects = { "myphone" => "/m/myphone", "yourphone" => "/m/yourphone" }
+      redirects = {
+        "myphone" => "http://m.example.com/myphone",
+        "yourphone" => "http://m.example.com/yourphone"
+      }
       # Target fake devices
       @rack = Rack::MobileDetect.new(@app,
                                      :targeted => /myphone|yourphone/,
                                      :redirect_map => redirects,
-                                     :redirect_to => '/m/genericdevice')
+                                     :redirect_to => 'http://m.example.com/genericdevice')
     end
 
     should "use the redirect value in the redirect map when targeted" do
@@ -197,7 +208,7 @@ class TestRackMobileDetect < Test::Unit::TestCase
       assert_equal 'myphone', env[x_mobile]
 
       assert_equal(301, status)
-      assert_equal({'Location' => "/m/myphone"}, headers)
+      assert_equal({'Location' => "http://m.example.com/myphone"}, headers)
 
     end
 
@@ -207,8 +218,9 @@ class TestRackMobileDetect < Test::Unit::TestCase
       assert_equal 'true', env[x_mobile]
 
       assert_equal(301, status)
-      assert_equal({'Location' => "/m/genericdevice"}, headers)
+      assert_equal({'Location' => "http://m.example.com/genericdevice"}, headers)
     end
+
   end
 
 
@@ -218,6 +230,9 @@ class TestRackMobileDetect < Test::Unit::TestCase
   end
 
   # User agents for testing
+  def ipad
+    'Mozilla/5.0 (iPad; U; CPU OS 3_2 like Mac OS X; en-us) AppleWebKit/531.21.10 (KHTML, like Gecko) Version/4.0.4 Mobile/7B334b Safari/531.21.10'
+  end
   def ipod
     'Mozilla/5.0 (iPod; U; CPU iPhone OS 2_2 like Mac OS X; en-us) AppleWebKit/525.18.1 (KHTML, like Gecko) Version/3.1.1 Mobile/5G77 Safari/525.20'
   end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: rack-mobile-detect
 version: !ruby/object:Gem::Version 
-  hash: 19
-  prerelease: 
+  prerelease: false
   segments: 
   - 0
-  - 3
+  - 4
   - 0
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Tom Alison
@@ -15,18 +14,16 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-12 00:00:00 -08:00
+date: 2012-06-07 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: shoulda
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -36,11 +33,9 @@ dependencies:
   name: rack
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -82,27 +77,23 @@ rdoc_options: []
 require_paths: 
 - lib
 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 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Rack middleware for ruby webapps to detect mobile devices.