active_device 1.1.0 → 1.2.0

data/.gitignore

@@ -0,0 +1 @@
+pkg/*

data/Gemfile

@@ -0,0 +1,4 @@
+source "http://rubygems.org"
+
+# Specify your gem's dependencies in active_device.gemspec
+gemspec

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009 [name of plugin creator]
+Copyright (c) 2010 Shenouda Bertel, Mobithought
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README

@@ -65,4 +65,4 @@ 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
+Copyright (c) 2009 Shenouda Bertel, MobiThought, released under the MIT license

data/Rakefile

@@ -1,49 +1,2 @@
-require 'rubygems'
-require 'rake'
-require 'rake/testtask'
-require 'rake/rdoctask'
-require 'rake/gempackagetask'
-
-desc 'Default: run unit tests.'
-task :default => :test
-
-desc 'Test the active_device plugin.'
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.libs << 'test'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = true
-end
-
-desc 'Generate documentation for the active_device plugin.'
-Rake::RDocTask.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'ActiveDevice'
-  rdoc.options << '--line-numbers' << '--inline-source'
-  rdoc.rdoc_files.include('README')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
-
-PKG_FILES = FileList[ '[a-zA-Z]*', 'generators/**/*', 'lib/**/*', 'rails/**/*', 'tasks/**/*', 'test/**/*' ]
-
-spec = Gem::Specification.new do |s| 
-  s.name = "active_device"
-  s.version = "1.1.0"
-  s.authors = ["Shenouda Bertel"]
-  s.description = "Device UserAgent Detector"
-  s.email = "sbertel@mobithought.com"
-  s.homepage = "http://mobithought.com/"
-  s.files = PKG_FILES.to_a
-  s.require_paths = ["lib"]
-  s.rubyforge_project = "active_device"
-  s.rubygems_version = "1.3.5"
-  s.summary = "Mobile Device Detector"
-  s.platform = Gem::Platform::RUBY 
-  s.has_rdoc = false
-  s.extra_rdoc_files = ["README"]
-end
-
-desc 'Turn this plugin into a gem.'
-Rake::GemPackageTask.new(spec) do |pkg|
-  pkg.gem_spec = spec
-end
+require 'bundler'
+Bundler::GemHelper.install_tasks

data/active_device.gemspec

@@ -0,0 +1,21 @@
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "active_device/version"
+
+Gem::Specification.new do |s|
+  s.name        = "active_device"
+  s.version     = ActiveDevice::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["Shenouda Bertel"]
+  s.email       = ["sbertel@mobithought.com"]
+  s.homepage    = "http://mobithought.com"
+  s.summary     = %q{Mobile Device Detector"}
+  s.description = %q{Device UserAgent Detector}
+
+  s.rubyforge_project = "active_device"
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+end

data/init.rb

@@ -1 +1,2 @@
-require File.dirname(__FILE__) + "/rails/init.rb"
+require 'active_device'
+require 'active_device_helper'

data/lib/active_device.rb

@@ -29,8 +29,11 @@ require 'active_device/bot'
 require 'active_device/engine'
 require 'active_device/browser'
 require 'active_device/os'
+require 'active_device/helper'
 
 module ActiveDevice
+
+  include ActiveDevice::Helper
   
   def self.included(base)
     base.before_filter :set_mobile_format
@@ -135,4 +138,5 @@ module ActiveDevice
 
 end
 
-ActionController::Base.send(:include, ActiveDevice)
+ActionController::Base.send :include, ActiveDevice
+ActionView::Base.send :include, ActiveDevice::Helper

data/lib/active_device/brand.rb

@@ -24,7 +24,7 @@ class Brand
     when /iTouch/i             ; :Apple
     when /iPad/i               ; :Apple
     when /iPod/i               ; :Apple
-      ## ==================================== ##
+    ## ==================================== ##
     when /Acer/i               ; :Acer
     when /Ahong/i              ; :Ahong
     when /Aiko/i               ; :Aiko
@@ -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,7 +152,7 @@ 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
@@ -160,7 +160,7 @@ class Brand
     when /Onda/i               ; :Onda
     when /Opera Mini/i         ; :Opera
     when /Opera Mobi/i         ; :Opera
-      #when /Opera/i              ; :Opera
+    #when /Opera/i              ; :Opera
     when /Optimay/i            ; :Optimay
     when /Orange/i             ; :Orange
     when /PalmOne/i            ; :PalmOne
@@ -226,7 +226,7 @@ class Brand
     when /VK/i                 ; :VK
     when /Vodafone/i           ; :Vodafone
     when /Voxtel/i             ; :Voxtel
-    when /W3C/i                ; :W3C
+    #when /W3C/i                ; :W3C
     when /webOS/i              ; :Palm
     when /WellcoM/i            ; :WellcoM
     when /Wonu/i               ; :Wonu

data/lib/active_device/browser.rb

@@ -30,6 +30,7 @@ class Browser
     when /Arora/i                ; :Arora
     when /Avant/i                ; :Avant
     when /Beonex/i               ; :Beonex
+    when /BlackBerry/i           ; :BlackBerry
     when /Bloglines/i            ; :Bloglines # Feed Reader
     when /BonEcho/i              ; :BonEcho
     when /Camino/i               ; :Camino
@@ -140,6 +141,7 @@ class Browser
     when /Shiira/i               ; :Shiira
     when /Shiretoko/i            ; :Shiretoko
     when /SiteBar/i              ; :SiteBar #Link Checker
+    when /Skyfire/i              ; :Skyfire
     when /Sleipnir/i             ; :Sleipnir
     when /Stainless/i            ; :Stainless
     when /Sunrise/i              ; :Sunrise
@@ -148,12 +150,13 @@ class Browser
     when /Symbian/i              ; :Symbian #Embedded Mobile Based
     when /TeaShark/i             ; :TeaShark
     when /Thunderbird/i          ; :Thunderbird # E-Mail Client
+    when /UCWEB/i                ; :UCWEB
     when /uzbl/i                 ; :Uzbl
     when /Vivante Link Checker/i ; :'Vivante Link Checker' # Link Checker
     when /w3m/i                  ; :w3m
-    when /W3C-checklink/i        ; :'W3C-checklink' # Link Checker
-    when /W3C_CSS_Validator_JFouffa/i ; :W3C_CSS_Validator_JFouffa # Validator
-    when /W3C_Validator/i        ; :W3C_Validator # Validator
+    #when /W3C-checklink/i        ; :'W3C-checklink' # Link Checker
+    #when /W3C_CSS_Validator_JFouffa/i ; :W3C_CSS_Validator_JFouffa # Validator
+    #when /W3C_Validator/i        ; :W3C_Validator # Validator
     when /WapTiger/i             ; :WapTiger #Embedded Mobile Based
     when /WDG_Validator/i        ; :WDG_Validator # Validator
     when /Web Downloader/i       ; :'Web Downloader' # Offline Browser
@@ -191,6 +194,7 @@ class Browser
       #    when :SymbianOS  ; $1 if user_agent =~ /\/([\d\w\.\-]+)/i #\)?\s*$
       #    when :Symbian    ; $1 if user_agent =~ /\ ([0-9\d\w\.\-]+)\)?\s*$/i
       #    when :iPhone     ; $1 if user_agent =~ /([\d\w\.\-]+)\)?\s*$/i
+    when :iPhone     ; $1 if user_agent =~ /#{name.to_s} OS ([0-9\-\.\_]+)/i
       #when name[/safari([0-9\-\.\_]+)/i] ; $1 if name =~ /([0-9\-\.\_]+)/i
     else           $1 if user_agent =~ /#{name.to_s}[\/ ]([\d\w\.\-]+)/i
     end

data/lib/{active_device_helper.rb → active_device/helper.rb}

@@ -21,15 +21,6 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
 
-require 'active_device/user_agent'
-require 'active_device/brand'
-require 'active_device/model'
-require 'active_device/handset'
-require 'active_device/bot'
-require 'active_device/engine'
-require 'active_device/browser'
-require 'active_device/os'
-
 module ActiveDevice
 
   module Helper
@@ -105,4 +96,4 @@ module ActiveDevice
     end
     
   end
-end
+end

data/lib/active_device/version.rb

@@ -0,0 +1,3 @@
+module ActiveDevice
+  VERSION = "1.2.0"
+end

data/rails/init.rb

@@ -1,4 +1,2 @@
-require 'active_device'
-require 'active_device_helper'
-
-ActionView::Base.send :include, ActiveDevice::Helper
+# encoding: utf-8
+require File.expand_path(File.join(File.dirname(__FILE__), "..", "init"))

data/rails/init.rb~

@@ -0,0 +1 @@
+require 'active_device'

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
-  - 1
+  - 2
   - 0
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Shenouda Bertel
@@ -14,41 +14,44 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-31 00:00:00 +03:00
+date: 2010-12-21 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
 description: Device UserAgent Detector
-email: sbertel@mobithought.com
+email: 
+- sbertel@mobithought.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- README
+extra_rdoc_files: []
+
 files: 
+- .gitignore
+- Gemfile
 - MIT-LICENSE
 - README
-- install.rb
-- init.rb
 - Rakefile
-- uninstall.rb
+- active_device.gemspec
+- init.rb
+- lib/active_device.rb
+- lib/active_device/bot.rb
 - lib/active_device/brand.rb
+- lib/active_device/browser.rb
+- lib/active_device/engine.rb
 - lib/active_device/handset.rb
+- lib/active_device/helper.rb
 - lib/active_device/model.rb
-- lib/active_device/engine.rb
-- lib/active_device/browser.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
+- lib/active_device/user_agent.rb
+- lib/active_device/version.rb
 - rails/init.rb
-- tasks/active_device_tasks.rake
-- test/test_helper.rb
+- rails/init.rb~
 - test/active_device_test.rb
+- test/test_helper.rb
 has_rdoc: true
-homepage: http://mobithought.com/
+homepage: http://mobithought.com
 licenses: []
 
 post_install_message: 
@@ -57,6 +60,7 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -64,6 +68,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -73,9 +78,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: active_device
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: Mobile Device Detector
+summary: Mobile Device Detector"
 test_files: []
 

data/install.rb

@@ -1 +0,0 @@
-# Install hook code here

data/tasks/active_device_tasks.rake

@@ -1,4 +0,0 @@
-# desc "Explaining what the task does"
-# task :active_device do
-#   # Task goes here
-# end

data/uninstall.rb

@@ -1 +0,0 @@
-# Uninstall hook code here