rack-smartphone_detector 0.0.2 → 0.0.3

data/Changelog.md

@@ -1,8 +1,14 @@
+# 0.0.3
+
+## Features
+
+- Add check methods for each devices
+
 # 0.0.2
 
 ## Features
 
-- Add Android tablet detection
+- Support Android tablet detection
 
 # 0.0.1
 

data/README.md

@@ -1,6 +1,6 @@
 # Rack::SmartphoneDetector [![Build Status](https://secure.travis-ci.org/ihara2525/rack-smartphone_detector.png?branch=master)](http://travis-ci.org/ihara2525/rack-smartphone_detector)
 
-It's a very simple Rack middleware which detect the request comes from smartphones (iPhone/iPad/Android/Windows Phone).  
+It's a very simple Rack middleware which detect the request comes from smartphones (iPhone/iPad/Android/Android Tablet/Windows Phone).  
 
 You can use #from_smartphone? to detect the request.
 
@@ -8,6 +8,16 @@ You can use #from_smartphone? to detect the request.
 request.from_smartphone? # true if it comes from such devices
 ```
 
+or, use methods for each devices.
+
+```ruby
+request.from_iphone?         # true if it comes from iphone
+request.from_ipad?           # true if it comes from ipad
+request.from_android?        # true if it comes from android mobile
+request.from_android_tablet? # true if it comes from android tablet
+request.from_windows_phone?  # true if it comes from windows phone
+```
+
 What this middleware does is just matching HTTP_USER_AGENT with identifier of smartphones.
 
 ## Installation

data/lib/rack/smartphone_detector/checker.rb

@@ -6,6 +6,11 @@ module Rack
         def from_smartphone?
           !env['rack.smartphone_detector.device'].nil?
         end
+
+        SMARTPHONE_IDENTIFIERS.each do |info|
+          name = %Q{from_#{info[:identifier].downcase.gsub(' ', '_')}?}
+          define_method(name) { env['rack.smartphone_detector.device'] == info[:identifier] }
+        end
       end
     end
   end

data/lib/rack/smartphone_detector/version.rb

@@ -1,6 +1,6 @@
 # coding: utf-8
 module Rack
   class SmartphoneDetector
-    VERSION = '0.0.2'
+    VERSION = '0.0.3'
   end
 end

data/lib/rack/smartphone_detector.rb

@@ -6,15 +6,24 @@ require 'rack/smartphone_detector/railtie' if defined?(Rails::Railtie)
 
 module Rack
   class SmartphoneDetector
-    SMARTPHONES_REGEXP = /(iPhone|iPad|Android|Windows Phone)/
+    SMARTPHONE_IDENTIFIERS = [
+      { identifier: 'iPhone',         regexp: /iPhone/ },
+      { identifier: 'iPad',           regexp: /iPad/ },
+      { identifier: 'Android',        regexp: /Android.+Mobile/ },
+      { identifier: 'Android Tablet', regexp: /Android/ },
+      { identifier: 'Windows Phone',  regexp: /Windows Phone/ },
+    ]
 
     def initialize(app, options = {})
       @app = app
     end
 
     def call(env)
-      if env['HTTP_USER_AGENT'] =~ SMARTPHONES_REGEXP
-        env['rack.smartphone_detector.device'] = $1
+      SMARTPHONE_IDENTIFIERS.each do |i|
+        if env['HTTP_USER_AGENT'] =~ i[:regexp]
+          env['rack.smartphone_detector.device'] = i[:identifier]
+          break
+        end
       end
       @app.call(env)
     end

data/spec/rack-smartphone_detector_spec.rb

@@ -7,10 +7,11 @@ describe 'Rack::SmartphoneDetector' do
   include Rack::Test::Methods
 
   SMARTPHONES = [
-    { device: 'iPhone', user_agent: 'Mozilla/5.0 (iPhone; CPU iPhone OS 6_0 like Mac OS X) AppleWebKit/536.26 (KHTML, like Gecko) Version/6.0 Mobile/10A403 Safari/8536.25' },
-    { device: 'iPad', user_agent: 'Mozilla/5.0 (iPad; CPU OS 6_0 like Mac OS X) AppleWebKit/536.26 (KHTML, like Gecko) Version/6.0 Mobile/10A403 Safari/8536.25' },
-    { device: 'Android', user_agent: 'Mozilla/5.0 (Linux; Android 4.1.1; Nexus 7 Build/JRO03S) AppleWebKit/535.19 (KHTML, like Gecko) Chrome/18.0.1025.166 Safari/535.19' },
-    { device: 'Windows Phone', user_agent: 'Mozilla/5.0 (compatible; MSIE 9.0; Windows Phone OS 7.5; Trident/5.0; IEMobile/9.0; FujitsuToshibaMobileCommun; IS12T; KDDI)' }
+    { name: 'iPhone', user_agent: 'Mozilla/5.0 (iPhone; CPU iPhone OS 6_0 like Mac OS X) AppleWebKit/536.26 (KHTML, like Gecko) Version/6.0 Mobile/10A403 Safari/8536.25' },
+    { name: 'iPad', user_agent: 'Mozilla/5.0 (iPad; CPU OS 6_0 like Mac OS X) AppleWebKit/536.26 (KHTML, like Gecko) Version/6.0 Mobile/10A403 Safari/8536.25' },
+    { name: 'Android', user_agent: 'Mozilla/5.0 (Linux; U; Android 4.0.1; ja-jp; Galaxy Nexus Build/ITL41D) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30' },
+    { name: 'Android Tablet', user_agent: 'Mozilla/5.0 (Linux; Android 4.1.1; Nexus 7 Build/JRO03S) AppleWebKit/535.19 (KHTML, like Gecko) Chrome/18.0.1025.166 Safari/535.19' },
+    { name: 'Windows Phone', user_agent: 'Mozilla/5.0 (compatible; MSIE 9.0; Windows Phone OS 7.5; Trident/5.0; IEMobile/9.0; FujitsuToshibaMobileCommun; IS12T; KDDI)' }
   ]
 
   let(:app) do
@@ -19,18 +20,20 @@ describe 'Rack::SmartphoneDetector' do
   end
 
   it 'sets environment variable if the request comes from smartphone' do
-    SMARTPHONES.each do |smartphone|
-      header 'User-Agent', smartphone[:user_agent]
+    SMARTPHONES.each do |info|
+      header 'User-Agent', info[:user_agent]
       get '/'
-      last_request.env['rack.smartphone_detector.device'].must_equal smartphone[:device]
+      last_request.env['rack.smartphone_detector.device'].must_equal info[:name]
     end
   end
 
   describe '#from_smartphone?' do
     it 'returns true if the request comes from smartphone' do
-      header 'User-Agent', SMARTPHONES.first[:device]
-      get '/'
-      last_request.from_smartphone?.must_equal true
+      SMARTPHONES.each do |info|
+        header 'User-Agent', info[:user_agent]
+        get '/'
+        last_request.from_smartphone?.must_equal true
+      end
     end
 
     it 'returns false if the request does not come from smartphone' do
@@ -39,9 +42,53 @@ describe 'Rack::SmartphoneDetector' do
       last_request.from_smartphone?.must_equal false
     end
 
-    it 'returns false if the request comes from unknown device' do
+    it 'returns false if the request comes from device without user-agent' do
       get '/'
       last_request.from_smartphone?.must_equal false
     end
   end
+
+  describe '#from_iphone?' do
+    it 'returns true if the request comes from iphone' do
+      header 'User-Agent', user_agent('iPhone')
+      get '/'
+      last_request.from_iphone?.must_equal true
+    end
+  end
+
+  describe '#from_ipad?' do
+    it 'returns true if the request comes from ipad' do
+      header 'User-Agent', user_agent('iPad')
+      get '/'
+      last_request.from_ipad?.must_equal true
+    end
+  end
+
+  describe '#from_android?' do
+    it 'returns true if the request comes from android mobile' do
+      header 'User-Agent', user_agent('Android')
+      get '/'
+      last_request.from_android?.must_equal true
+    end
+  end
+
+  describe '#from_android_tablet?' do
+    it 'returns true if the request comes from android tablet' do
+      header 'User-Agent', user_agent('Android Tablet')
+      get '/'
+      last_request.from_android_tablet?.must_equal true
+    end
+  end
+
+  describe '#from_windows_phone?' do
+    it 'returns true if the request comes from windows phone' do
+      header 'User-Agent', user_agent('Windows Phone')
+      get '/'
+      last_request.from_windows_phone?.must_equal true
+    end
+  end
+
+  def user_agent(name)
+    SMARTPHONES.find { |info| info[:name] == name }[:user_agent]
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-smartphone_detector
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-14 00:00:00.000000000 Z
+date: 2012-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -110,7 +110,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2045937695078653710
+      hash: 4226079495124680780
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -119,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2045937695078653710
+      hash: 4226079495124680780
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23