active_device 1.0.1 → 1.1.0

data/README

@@ -63,7 +63,6 @@ Feedback
 
 Send Feedback and questions to: sbertel at mobithought.com
 
-
 More will Coming Soon, Wait for MobiThought
 
 Copyright (c) 2009 Shenouda Bertel, MobiThought, released under the MIT license

data/Rakefile

@@ -28,7 +28,7 @@ PKG_FILES = FileList[ '[a-zA-Z]*', 'generators/**/*', 'lib/**/*', 'rails/**/*',
 
 spec = Gem::Specification.new do |s| 
   s.name = "active_device"
-  s.version = "1.0.1"
+  s.version = "1.1.0"
   s.authors = ["Shenouda Bertel"]
   s.description = "Device UserAgent Detector"
   s.email = "sbertel@mobithought.com"

data/lib/active_device/brand.rb

@@ -22,6 +22,7 @@ class Brand
     when /HTC/i                ; :HTC
     when /iPhone/i             ; :Apple
     when /iTouch/i             ; :Apple
+    when /iPad/i               ; :Apple
     when /iPod/i               ; :Apple
       ## ==================================== ##
     when /Acer/i               ; :Acer
@@ -32,7 +33,6 @@ class Brand
     when /Alphacell/i          ; :Alphacell
     when /Amazon/i             ; :Amazon
     when /Amoi/i               ; :Amoi
-    when /Android/i            ; :Android
     when /AnexTek/i            ; :AnexTek
     when /Arcelik/i            ; :Arcelik
     when /ASMOBILE/i           ; :ASMOBILE
@@ -44,7 +44,7 @@ class Brand
     when /Benefon/i            ; :Benefon
     when /BenQ/i               ; :BenQ
     when /BenQ-Siemens/i       ; :'BenQ-Siemens'
-    #when /Bird/                ; :Bird
+      #when /Bird/                ; :Bird
     when /Bleu/i               ; :Bleu
     when /BlackBerry/i         ; :BlackBerry
     when /Capitel/i            ; :Capitel
@@ -128,7 +128,7 @@ class Brand
     when /LG/i                 ; :LG
     when /Lobster/i            ; :Lobster
     when /Longcos/i            ; :Longcos
-    #when /LT/                  ; :LT
+      #when /LT/                  ; :LT
     when /LXE/i                ; :LXE
     when /Malata/i             ; :Malata
     when /Maxon/i              ; :Maxon
@@ -152,13 +152,15 @@ class Brand
     when /Neonode/i            ; :Neonode
     when /Newgen/i             ; :Newgen
     when /Nexian/i             ; :Nexian
-    #when /Nintendo/i           ; :Nintendo
+      #when /Nintendo/i           ; :Nintendo
     when /Nokia/i              ; :Nokia
     when /NTT DoCoMo/i         ; :'NTT DoCoMo'
     when /O2/                  ; :O2
     when /OKWap/i              ; :OKWap
     when /Onda/i               ; :Onda
-    #when /Opera/i              ; :Opera
+    when /Opera Mini/i         ; :Opera
+    when /Opera Mobi/i         ; :Opera
+      #when /Opera/i              ; :Opera
     when /Optimay/i            ; :Optimay
     when /Orange/i             ; :Orange
     when /PalmOne/i            ; :PalmOne
@@ -225,12 +227,14 @@ class Brand
     when /Vodafone/i           ; :Vodafone
     when /Voxtel/i             ; :Voxtel
     when /W3C/i                ; :W3C
+    when /webOS/i              ; :Palm
     when /WellcoM/i            ; :WellcoM
     when /Wonu/i               ; :Wonu
     when /XDA/i                ; :XDA
     when /YAS/i                ; :YAS
     when /ZT/i                 ; :ZT
     when /ZTE/i                ; :ZTE
+    when /Android/i            ; :Android
     else                       ; :UnknownMobile
     end
   end

data/lib/active_device/browser.rb

@@ -74,6 +74,7 @@ class Browser
     when /IceCat/i               ; :IceCat
     when /Iceweasel/i            ; :Iceweasel
     when /iNet/i                 ; :iNet
+    when /iPad/i                 ; :iPad
     when /iPhone/i               ; :iPhone #Embedded Mobile Based
     when /Iron/i                 ; :Iron
     when /Java/i                 ; :Java # Library
@@ -157,6 +158,7 @@ class Browser
     when /WDG_Validator/i        ; :WDG_Validator # Validator
     when /Web Downloader/i       ; :'Web Downloader' # Offline Browser
     when /WebCopier/i            ; :WebCopier # Offline Browser
+    when /webOS/i                ; :Palm
     when /WebZIP/i               ; :WebZIP # Offline Browser
     when /Wget/i                 ; :Wget # Offline Browser
     when /Winwap/i               ; :Winwap #Embedded Mobile Based

data/lib/active_device/engine.rb

@@ -18,18 +18,19 @@ class Engine
 
   def self.engine user_agent
     case user_agent
-    when /Webkit/i    ; :Webkit
-    when /Khtml/i     ; :khtml
-    when /Konqueror/i ; :Konqueror
-    when /Presto/i    ; :Presto
-    when /Trident/i   ; :Trident
-    when /Gecko/i     ; :Gecko
-    when /MSIE/i      ; :MSIE
-    when /Chrome/i    ; :Chrome
-    when /Darwin/i    ; :Darwin
-    when /NetFront/i  ; :NetFront
-    when /UP.Browser/i; :'UP.Browser'
-    when /Palm/i      ; :Palm
+    when /AppleWebKit/i ; :AppleWebKit
+    when /Webkit/i      ; :Webkit
+    when /Khtml/i       ; :khtml
+    when /Konqueror/i   ; :Konqueror
+    when /Presto/i      ; :Presto
+    when /Trident/i     ; :Trident
+    when /Gecko/i       ; :Gecko
+    when /MSIE/i        ; :MSIE
+    when /Chrome/i      ; :Chrome
+    when /Darwin/i      ; :Darwin
+    when /NetFront/i    ; :NetFront
+    when /UP.Browser/i  ; :'UP.Browser'
+    when /Palm/i        ; :Palm
     else                :Unknown
     end
   end

data/lib/active_device/model.rb

@@ -13,12 +13,19 @@ class Model
 
   def self.brand_model user_agent
     case user_agent
+    when /iPad/i                        ; :iPad
     when /iPhone/i                      ; :iPhone
     when /SAMSUNG[\w\-\.\_\ ]*/i        ; samsung_models user_agent
     when /Nokia[\w\.\_\ ]*/i            ; nokia_models user_agent
     when /HTC[\w\-\.\_\ ]*/i            ; htc_models user_agent
     when /SonyEricsson[\w\-\.\_\ ]*/i   ; sonyericsson_models user_agent
-    when /^Mozilla[0-9\-\.\_\ ]*/i      ; :'Unknown Yet'
+    when /Opera Mini/i                  ; :'Opera Mini'
+    when /Opera Mobi/i                  ; :'Opera Mobile'
+    when /Palm/i                        ; palm_models user_agent
+    when /webOS/i                       ; palm_models user_agent
+    when /T-Mobile G1/i                 ; :'T-Mobile G1'
+    when /Dream/i                       ; :'Dream'
+    when /^Mozilla[0-9\-\.\_\ ]*/i      ; :Unknown
     else                                ; :"#{user_agent[/[\w\-\.\_]*/i]}"
     end
   end
@@ -65,6 +72,25 @@ class Model
     model_clear model
   end
 
+  def self.palm_models user_agent
+    if user_agent =~ /webOS[\w\.\_\-]*/i
+      if user_agent[/Pre[\w\.\_\-]*/i]
+        model = :'Palm Pre'
+      elsif user_agent[/Pixi[\w\.\_\-]*/i]
+        model = :'Palm Pixi'
+      else 
+        model = user_agent[/[\w\.\_\-]*/i]
+      end
+    elsif user_agent =~ /PalmOS[\w\.\_\-]*/i
+      model = user_agent[/Palm[\.\_\-][\w]*/i]
+    elsif user_agent =~ /PalmSource[\w\.\_\-]*/i
+      model = user_agent[/Palm[\.\_\-][\w]*/i]
+    else
+      model = user_agent[/Palm[\w\.\_\-]*/i]
+    end
+    model_clear model
+  end
+
   def self.model_clear model
     model = model.to_s
     if model.include?("Profile")
@@ -79,7 +105,7 @@ class Model
 
   def self.model_reselution user_agent
     case user_agent
-    when /([0-9]+x+[0-9]*)/i                      ; :"#{user_agent[/([0-9]+x+[0-9]*)/i]}"
+    when /([0-9]+x+[0-9]*)/i            ; :"#{user_agent[/([0-9]+x+[0-9]*)/i]}"
     else                                ; :'Not Recognized'
     end
   end

data/lib/active_device/os.rb

@@ -16,6 +16,7 @@ class Os
 
   def self.os user_agent
     case user_agent
+    when /Android/i              ; :Android
     when /windows ce/i           ; :'Windows CE'
     when /windows nt 6\.0/i      ; :'Windows Vista'
     when /windows nt 6\.\d+/i    ; :'Windows 7'
@@ -32,6 +33,8 @@ class Os
     when /SymbianOS/i            ; :SymbianOS
     when /Symbian/i              ; :Symbian
     when /Palm/i                 ; :Palm
+    when /PalmOS/i               ; :PalmOS
+    when /webOS/i                ; :webOS
     when /iPhone/i               ; :iPhone
     else                         ; :Unknown
     end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: active_device
 version: !ruby/object:Gem::Version 
-  version: 1.0.1
+  prerelease: false
+  segments: 
+  - 1
+  - 1
+  - 0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Shenouda Bertel
@@ -9,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-26 00:00:00 +02:00
+date: 2010-05-31 00:00:00 +03:00
 default_executable: 
 dependencies: []
 
@@ -22,26 +27,26 @@ extensions: []
 extra_rdoc_files: 
 - README
 files: 
-- install.rb
-- Rakefile
-- README
 - MIT-LICENSE
+- README
+- install.rb
 - init.rb
+- Rakefile
 - uninstall.rb
-- lib/active_device/model.rb
-- lib/active_device/os.rb
-- lib/active_device/engine.rb
 - lib/active_device/brand.rb
-- lib/active_device/bot.rb
 - lib/active_device/handset.rb
-- lib/active_device/user_agent.rb
+- lib/active_device/model.rb
+- lib/active_device/engine.rb
 - lib/active_device/browser.rb
-- lib/active_device.rb
+- lib/active_device/user_agent.rb
+- lib/active_device/os.rb
+- lib/active_device/bot.rb
 - lib/active_device_helper.rb
+- lib/active_device.rb
 - rails/init.rb
 - tasks/active_device_tasks.rake
-- test/active_device_test.rb
 - test/test_helper.rb
+- test/active_device_test.rb
 has_rdoc: true
 homepage: http://mobithought.com/
 licenses: []
@@ -55,18 +60,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: active_device
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Mobile Device Detector