rack-smartphone_detector 0.0.4 → 0.0.5

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: c3d807710a9fe9027964d1393d939d4feecfe8a0
+  data.tar.gz: dab547033f2b45e5e20995938950f946215c70cd
+SHA512:
+  metadata.gz: 18ada9aeaf2b27a8d1bc38153cd0680349baa175a9a883b5588f9b5f30d59bec15cc51cee55fde3190fdb53e5f3bdb5e7974112603d83c99d598cad408935e38
+  data.tar.gz: 17cefa2d21551bcd271135d91b9e13267d37cb122c504ec066035ad8fb716a038eee802c032a58ec82fa6f6b21ba0506f2b2eeb718d902760066fd2b721db321

data/lib/rack/smartphone_detector/checker.rb

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

data/lib/rack/smartphone_detector/version.rb

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

data/lib/rack/smartphone_detector.rb

@@ -6,12 +6,18 @@ require 'rack/smartphone_detector/railtie' if defined?(Rails::Railtie)
 
 module Rack
   class SmartphoneDetector
+    VERSION_PATTERNS = {
+      ios:           /OS\s+([\d_]+)\s+like Mac OS X/,
+      android:       /Android\s+([\d\.]+);/,
+      windows_phone: /Windows Phone OS\s+([\d\.]+);/,
+    }
+
     SMARTPHONE_IDENTIFIERS = [
-      { identifier: 'iPhone',         regexp: /iPhone/ },
-      { identifier: 'iPad',           regexp: /iPad/ },
-      { identifier: 'Android',        regexp: /Android.+Mobi(le)?/ },
-      { identifier: 'Android Tablet', regexp: /Android/ },
-      { identifier: 'Windows Phone',  regexp: /Windows Phone/ },
+      { identifier: 'iPhone',         regexp: /iPhone/,             version_type: :ios },
+      { identifier: 'iPad',           regexp: /iPad/,               version_type: :ios },
+      { identifier: 'Android',        regexp: /Android.+Mobi(le)?/, version_type: :android },
+      { identifier: 'Android Tablet', regexp: /Android/,            version_type: :android },
+      { identifier: 'Windows Phone',  regexp: /Windows Phone/,      version_type: :windows_phone },
     ]
 
     def initialize(app, options = {})
@@ -22,11 +28,20 @@ module Rack
       SMARTPHONE_IDENTIFIERS.each do |i|
         if env['HTTP_USER_AGENT'] =~ i[:regexp]
           env['rack.smartphone_detector.device'] = i[:identifier]
+          detect_version(env, i[:version_type])
           break
         end
       end
       @app.call(env)
     end
+
+    private
+
+    def detect_version(env, version_type)
+      if env['HTTP_USER_AGENT'] =~ VERSION_PATTERNS[version_type]
+        env['rack.smartphone_detector.device_version'] = Regexp.last_match[1]
+      end
+    end
   end
 
   class Request

data/spec/rack-smartphone_detector_spec.rb

@@ -9,32 +9,56 @@ describe 'Rack::SmartphoneDetector' do
   SMARTPHONES = [
     {
       name: 'iPhone',
+      version: '5_1_1',
+      user_agents: [
+        'Mozilla/5.0 (iPhone; CPU iPhone OS 5_1_1 like Mac OS X) AppleWebKit/534.46 (KHTML, like Gecko) Version/5.1 Mobile/9B206 Safari/7534.48.3',
+      ]
+    },
+    {
+      name: 'iPhone',
+      version: '6_0',
       user_agents: [
         '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',
+      version: '6_0',
       user_agents: [
         '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',
+      version: '4.0.1',
       user_agents: [
         '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',
-        'Mozilla/5.0 (Android; Mobile; rv:18.0) Gecko/18.0 Firefox/18.0',
+      ]
+    },
+    {
+      name: 'Android',
+      version: '4.2.1',
+      user_agents: [
         'Opera/9.80 (Android 4.2.1; Linux; Opera Mobi/ADR-1301080958) Presto/2.11.355 Version/12.10'
       ]
     },
+    {
+      name: 'Android',
+      version: nil,
+      user_agents: [
+        'Mozilla/5.0 (Android; Mobile; rv:18.0) Gecko/18.0 Firefox/18.0',
+      ]
+    },
     {
       name: 'Android Tablet',
+      version: '4.1.1',
       user_agents: [
         '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',
+      version: '7.5',
       user_agents: [
         'Mozilla/5.0 (compatible; MSIE 9.0; Windows Phone OS 7.5; Trident/5.0; IEMobile/9.0; FujitsuToshibaMobileCommun; IS12T; KDDI)'
       ]
@@ -84,6 +108,18 @@ describe 'Rack::SmartphoneDetector' do
     end
   end
 
+  describe '#smartphone_version' do
+    it 'returns version number string if it could be detected' do
+      SMARTPHONES.each do |info|
+        info[:user_agents].each do |ua|
+          header 'User-Agent', ua
+          get '/'
+          last_request.smartphone_version.must_equal info[:version]
+        end
+      end
+    end
+  end
+
   describe '#from_iphone?' do
     it 'returns true if the request comes from iphone' do
       user_agents('iPhone').each do |ua|

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: rack-smartphone_detector
 version: !ruby/object:Gem::Version
-  version: 0.0.4
-  prerelease: 
+  version: 0.0.5
 platform: ruby
 authors:
 - Masahiro Ihara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-09 00:00:00.000000000 Z
+date: 2013-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,49 +27,43 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Simple Rack middleware which detect the request comes from smartphone
@@ -98,27 +89,26 @@ files:
 - spec/rack-smartphone_detector_spec.rb
 homepage: https://github.com/ihara2525/rack-smartphone_detector
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.1.10
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Simple Rack middleware which detect the request comes from smartphone
 test_files:
 - spec/rack-smartphone_detector_spec.rb