mobile_detect 0.0.1 → 0.0.2

data/README.md

@@ -33,6 +33,10 @@ you can run that without second argument, but then gem cannot get device from cl
     
 => "iPad"
 
+    detect.os
+
+=> "iOS"
+
 ## Contributing
 
 1. Fork it

data/lib/mobile_detect/mobile_detect.rb

@@ -2,6 +2,33 @@ class MobileDetect
   attr_accessor :user_agent
 
 
+  # os, tablet and phone devices list is from php-mobile-detect
+  OperatingSystems = {
+        'AndroidOS'         => 'Android',
+        'BlackBerryOS'      => 'blackberry|rim tablet os',
+        'PalmOS'            => 'PalmOS|avantgo|blazer|elaine|hiptop|palm|plucker|xiino',
+        'SymbianOS'         => 'Symbian|SymbOS|Series60|Series40|SYB-[0-9]+|\bS60\b',
+        # @reference: http://en.wikipedia.org/wiki/Windows_Mobile
+        'WindowsMobileOS'   => 'Windows CE.*(PPC|Smartphone|Mobile|[0-9]{3}x[0-9]{3})|Window Mobile|Windows Phone [0-9.]+|WCE;',
+        # @reference: http://en.wikipedia.org/wiki/Windows_Phone
+        # http://wifeng.cn/?r=blog&a=view&id=106
+        # http://nicksnettravels.builttoroam.com/post/2011/01/10/Bogus-Windows-Phone-7-User-Agent-String.aspx
+        'WindowsPhoneOS'   => 'Windows Phone OS|XBLWP7|ZuneWP7',
+        'iOS'               => 'iphone|ipod|ipad',
+        #'FlashLiteOS'       => '',
+        # http://en.wikipedia.org/wiki/MeeGo
+        # @todo: research MeeGo in UAs
+        'MeeGoOS'           => 'MeeGo',
+        # http://en.wikipedia.org/wiki/Maemo
+        # @todo: research Maemo in UAs
+        'MaemoOS'           => 'Maemo',
+        'JavaOS'            => 'J2ME/MIDP|Java/',
+        'webOS'             => 'webOS|hpwOS',
+        'badaOS'            => '\bBada\b',
+        'BREWOS'            => 'BREW'
+  }
+
+
   TabletDevices = {
       'BlackBerryTablet'  => 'PlayBook|RIM Tablet',
       'iPad'              => 'iPad|iPad.*Mobile',
@@ -39,6 +66,7 @@ class MobileDetect
     @device = nil
     @is_tablet = nil
     @is_mobile = nil
+    @os = nil
   end
 
   def tablet?
@@ -60,11 +88,19 @@ class MobileDetect
     @device
   end
 
+  def os
+    @os.nil? ? detect_os : @os
+  end
+
   private
   def is_tablet
     @is_tablet = regexp_device(TabletDevices)
   end
 
+  def detect_os
+    @os = regexp_os(OperatingSystems)
+  end
+
 
   def is_mobile
     @is_mobile = (is_mobile_headers || is_mobile_regexp)
@@ -75,7 +111,7 @@ class MobileDetect
   end
 
   def is_mobile_headers
-    return false if @req_headers.blank?
+    return false unless @req_headers
     if @req_headers['HTTP_X_WAP_PROFILE'] ||
         @req_headers['HTTP_WAP_CONNECTION'] ||
         @req_headers['HTTP_X_WAP_CLIENTID'] ||
@@ -94,12 +130,31 @@ class MobileDetect
     end
   end
 
+  def regexp_os(reg_hash)
+    res = regexp(reg_hash)
+    if res
+      @os = res
+      return @os
+    else
+      return false
+    end
+  end
 
   def regexp_device(reg_hash)
+    res = regexp(reg_hash)
+    if res
+      @device = res 
+      return true
+    else
+      return false
+    end
+  end
+
+
+  def regexp(reg_hash)
     reg_hash.each do |key,value|
       if @user_agent =~ /#{value}/i
-        @device = key
-        return true
+        return key
       end
     end
     false

data/lib/mobile_detect/version.rb

@@ -1,3 +1,3 @@
 class MobileDetect
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/mobile_detect_spec.rb

@@ -0,0 +1,33 @@
+require 'mobile_detect'
+
+describe "Test iphone user_agent" do
+  it 'return mobile and device' do
+    md = MobileDetect.new('iphone mobile')
+    md.mobile?.should be true
+    md.tablet?.should be false
+    md.device.should eq 'iPhone'
+  end
+end
+
+
+describe "Test ipad user_agent" do
+  it 'return mobile and device' do
+    md = MobileDetect.new('ipad mobile')
+    md.mobile?.should be false
+    md.tablet?.should be true
+    md.device.should eq 'iPad'
+  end
+end
+
+
+
+describe "Test os detection" do
+  it 'ios test' do
+    md = MobileDetect.new('ipad mobile')
+    md.os.should == 'iOS'
+  end
+  it 'android test' do
+    md = MobileDetect.new('android tablet')
+    md.os.should == 'AndroidOS'
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mobile_detect
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -43,6 +43,7 @@ files:
 - lib/mobile_detect/mobile_detect.rb
 - lib/mobile_detect/version.rb
 - mobile_detect.gemspec
+- spec/mobile_detect_spec.rb
 homepage: ''
 licenses: []
 post_install_message: 
@@ -68,4 +69,5 @@ signing_key:
 specification_version: 3
 summary: Mobile_Detect is a lightweight gem for detecting mobile devices. It uses
   the user-agent string combined with specific HTTP headers to detect the mobile environment.
-test_files: []
+test_files:
+- spec/mobile_detect_spec.rb