agent_helpers 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 62dd40d9ba486c340fc2dbfc15c70bfae2860af5
-  data.tar.gz: 24e7182726b1c65f79ebd79503ce915de2c5f330
+  metadata.gz: 3554deaaaf3356dfb3929d7c7776930b0346304f
+  data.tar.gz: e2552702bc1a372a0f845d72653c5411375c737b
 SHA512:
-  metadata.gz: d570d834d0b53c0e51e18789ff18d39246f0e65d2c3f5274476bde5d69337004437d1845bd5336f272c451b80c7a112cd20d170b50f755fc44f31461cc68c288
-  data.tar.gz: 442e83190874bbfc5ff157d7c212464e9ad364eee22b9378407d04b4597f2ab80e1051a8588868a32b2e969ffd25f013f5e7022df9b775c6e046cdb2c32ed442
+  metadata.gz: 7fb3a8bfae9a91a989d783e1de0ec07e9b96ada9bca8487e96c95d266e782439a4e223f620604b0d60113b0a67e49cc4f84749c64d2352e1f196ce96f156b3fa
+  data.tar.gz: 055f12bfd5dcb8031f35fc40493ffccdb6242fca6f424867ff8042428dbd86d04b80c99697939a6ed1148936e3e0f492e55c5f3a749f4bc57b4e01fbc11132f0

data/app/helpers/agent_helpers/detector_helper.rb

@@ -3,55 +3,83 @@ module AgentHelpers::DetectorHelper
     if !controller.instance_variable_get(:@agent_helpers_detector)
       controller.instance_variable_set(:@agent_helpers_detector, ::AgentHelpers::Detector.new(:request => request))
     end
-    
+
     return controller.instance_variable_get(:@agent_helpers_detector)
   end
-  
+
   def agent_robot?
     agent_detector.browser == :bot
   end
-  
+
   def agent_human?
     agent_detector.browser != :bot && agent_detector.browser != :unknown
   end
-  
+
   def agent_browser
     agent_detector.browser
   end
-  
+
   def agent_title
     agent_detector.title
   end
-  
+
   def agent_version
     agent_detector.version
   end
-  
+
+  def agent_version_major
+    agent_detector.version_major
+  end
+
   def agent_device
     agent_detector.device
   end
-  
+
+  def agent_os
+    agent_detector.os
+  end
+
   def agent_chrome?
     agent_detector.browser == :chrome
   end
-  
+
   def agent_firefox?
     agent_detector.browser == :firefox
   end
-  
+
   def agent_ie?
     agent_detector.browser == :ie
   end
-  
+
   def agent_safari?
     agent_detector.browser == :safari
   end
-  
+
   def agent_opera?
     agent_detector.browser == :opera
   end
-  
+
   def agent_mobile?
-    agent_detector.device == :android || agent_detector.device == :ipad || agent_detector.device == :iphone
+    agent_detector.os == :android || agent_detector.os == :ios
+  end
+
+  def agent_windows?
+    agent_detector.os == :windows
+  end
+
+  def agent_linux?
+    agent_detector.os == :linux
+  end
+
+  def agent_osx?
+    agent_detector.os == :osx
+  end
+
+  def agent_os_version
+    agent_detector.os_version
+  end
+
+  def agent_os_title
+    agent_detector.os_title
   end
 end

data/lib/agent_helpers/detector.rb

@@ -1,130 +1,168 @@
 class AgentHelpers::Detector
-  attr_reader :browser, :title, :version, :device
-  
+  attr_reader :browser, :title, :version, :device, :os, :os_title, :os_version
+
+  WINDOWS_VERSIONS = {
+    "NT 5.0" => "Windows 2000",
+    "NT 5.01" => "Windows 2000 SP1",
+    "NT 5.1" => "Windows XP",
+    "NT 5.2" => "Windows XP 64bit",
+    "NT 6.0" => "Windows Vista",
+    "NT 6.1" => "Windows 7",
+    "NT 6.2" => "Windows 8",
+    "NT 6.3" => "Windows 8.1"
+  }
+
+  MAC_OSX_VERSIONS = {
+    "10.0" => "Cheetah",
+    "10.1" => "Puma",
+    "10.2" => "Juguar",
+    "10.3" => "Panther",
+    "10.4" => "Tiger",
+    "10.5" => "Leopard",
+    "10.6" => "Snow Leopard",
+    "10.7" => "Lion",
+    "10.8" => "Mountain Lion",
+    "10.9" => "Mavericks",
+    "10.10" => "Yosemite"
+  }
+
   def initialize(args)
     @request = args[:request]
     raise "No request was given." unless @request
     @env = @request.env
     @user_agent = @request.user_agent.to_s.downcase.strip
     raise "No user agent was given." if @user_agent.empty?
-    parse
+
+    browsers = [:chrome, :ie, :firefox, :opera, :safari]
+    browsers.each do |browser|
+      __send__("parse_#{browser}") unless @browser
+    end
+
+    parse_bots unless @browser
+    parse_device
+  end
+
+  def version_major
+    if match = version.to_s.match(/^(\d+)/)
+      return match[1].to_i
+    else
+      return nil
+    end
   end
-  
+
 private
-  
-  def parse
-    if match = @user_agent.match(/chrome\/(\d+\.\d+)/)
+
+  def parse_chrome
+    if match = @user_agent.match(/chrome\/([\d+\.]+)/)
       @browser = :chrome
       @title = "Google Chrome"
       @version = match[1]
-    elsif match = @user_agent.match(/firefox\/(\d+\.\d+)/)
-      @browser = :firefox
-      @title = "Mozilla Firefox"
-      @version = match[1]
-    elsif @env["HTTP_ACCEPT"] == "*/*" && @env["HTTP_ACCEPT_LANGUAGE"] == "zh-cn,zh-hk,zh-tw,en-us" && @env["HTTP_USER_AGENT"] == "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1)" && (@env["REMOTE_ADDR"][0,10] == "114.80.93." || @env["HTTP_X_FORWARDED_FOR"][0, 10] == "114.80.93.")
-      @browser = :bot
-      @title = "bot"
-      @version = "(unknown annoying bot from China)"
-    elsif match = @user_agent.match(/msie\s*(\d+\.\d+)/)
+    end
+  end
+
+  def parse_ie
+    if match = @user_agent.match(/msie\s*([\d+\.]+)/)
       @browser = :ie
       @title = "Microsoft Internet Explorer"
       @version = match[1]
-    elsif match = @user_agent.match(/opera\/([\d+\.]+)/)
+    end
+  end
+
+  def parse_firefox
+    if match = @user_agent.match(/firefox\/([\d+\.]+)/)
+      @browser = :firefox
+      @title = "Mozilla Firefox"
+      @version = match[1]
+    end
+  end
+
+  def parse_opera
+    if match = @user_agent.match(/opera\/([\d+\.]+)/)
       @browser = :opera
       @title = "Opera"
       @version = match[1]
-    elsif match = @user_agent.match(/wget\/([\d+\.]+)/)
-      @browser = :bot
-      @title = "Bot"
-      @version = "Wget #{match[1]}"
-    elsif @user_agent.include?("baiduspider")
-      @browser = :bot
-      @title = "Bot"
-      @version = "Baiduspider"
-    elsif match = @user_agent.match(/googlebot\/([\d\.]+)/)
-      @browser = :bot
-      @title = "Googlebot"
-      @version = match[1]
-    elsif @user_agent.include?("gidbot")
-      @browser = :bot
-      @title = "Bot"
-      @version = "GIDBot"
-    elsif match = @user_agent.match(/android\s+([\d\.]+)/)
-      @browser = :android
-      @title = "Android"
-      @version = match[1]
-    elsif match = @user_agent.match(/safari\/(\d+)/)
+    end
+  end
+
+  def parse_safari
+    if match = @user_agent.match(/safari\/([\d+\.]+)/)
       @browser = :safari
       @title = "Safari"
       @version = match[1]
-    elsif @user_agent.include?("bingbot")
-      @browser = :bot
-      @title = "Bot"
-      @version = "Bingbot"
-    elsif @user_agent.include?("yahoo! slurp")
-      @browser = :bot
-      @title = "Bot"
-      @version = "Yahoo! Slurp"
-    elsif @user_agent.include?("hostharvest")
-      @browser = :bot
-      @title = "Bot"
-      @version = "HostHarvest"
-    elsif @user_agent.include?("exabot")
-      @browser = :bot
-      @title = "Bot"
-      @version = "Exabot"
-    elsif @user_agent.include?("dotbot")
-      @browser = :bot
-      @title = "Bot"
-      @version = "DotBot"
-    elsif @user_agent.include?("msnbot")
-      @browser = :bot
-      @title = "Bot"
-      @version = "MSN bot"
-    elsif @user_agent.include?("yandexbot")
-      @browser = :bot
-      @title = "Bot"
-      @version = "Yandex Bot"
-    elsif @user_agent.include?("mj12bot")
-      @browser = :bot
-      @title = "Bot"
-      @version = "Majestic12 Bot"
-    elsif @user_agent.include?("facebookexternalhit")
-      @browser = :bot
-      @title = "Bot"
-      @version = "Facebook Externalhit"
-    elsif @user_agent.include?("sitebot")
-      @browser = :bot
-      @title = "Bot"
-      @version = "SiteBot"
+    end
+  end
+
+  def parse_apps
+    if match = @user_agent.match(/wget\/([\d+\.]+)/)
+      @browser = :app
+      @title = "Wget"
+      @version = match[1]
     elsif match = @user_agent.match(/java\/([\d\.]+)/)
-      @browser = :bot
+      @browser = :app
       @title = "Java"
       @version = match[1]
-    elsif match = @user_agent.match(/ezooms\/([\d\.]+)/)
-      @browser = :bot
-      @title = "Ezooms"
-      @version = match[1]
-    elsif match = @user_agent.match(/ahrefsbot\/([\d\.]+)/)
+    end
+  end
+
+  def parse_bots
+    regex_list = [/(googlebot)\/([\d\.]+)/, /(ezooms)\/([\d\.]+)/, /(ahrefsbot)\/([\d\.]+)/, /(baiduspider)/, /(gidbot)/, /(yahoo! slurp)/,
+      /(hostharvest)/, /(exabot)/, /(dotbot)/, /(msnbot)/, /(yandexbot)/, /(sitebot)/, /(sosospider)/, /(bingbot)/]
+    parse_regex_list(regex_list, :bot)
+    return if @browser
+
+    if @env["HTTP_ACCEPT"] == "*/*" && @env["HTTP_ACCEPT_LANGUAGE"] == "zh-cn,zh-hk,zh-tw,en-us" && @env["HTTP_USER_AGENT"] == "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1)" && (@env["REMOTE_ADDR"][0,10] == "114.80.93." || @env["HTTP_X_FORWARDED_FOR"][0, 10] == "114.80.93.")
+      @browser = :bot
+      @title = "(unknown annoying bot from China)"
+    elsif @user_agent.include?("mj12bot")
       @browser = :bot
-      @title = "AhrefsBot"
-      @version = match[1]
-    elsif @user_agent.include?("sosospider")
+      @title = "Majestic12 Bot"
+    elsif @user_agent.include?("facebookexternalhit")
       @browser = :bot
-      @title = "Bot"
-      @version = "Sosospider"
-    else
-      @browser = :unknown
-      @title = "(unknown browser)"
-      @version = "(unknown version)"
+      @title = "Facebook Externalhit"
     end
-    
+  end
+
+  def parse_device
     if @user_agent.include?("ipad")
       @device = :ipad
+      @os = :ios
     elsif @user_agent.include?("iphone")
       @device = :iphone
+      @os = :ios
     elsif @user_agent.include?("android")
-      @device = :android
+      @os = :android
+    elsif match = @user_agent.match(/windows (nt |)([\d\.]+)/)
+      @os = :windows
+      @os_version = match[2]
+      @os_version = "NT #{@os_version}" if match[1] == "nt "
+      @os_title = WINDOWS_VERSIONS[@os_version]
+    elsif @user_agent.include?("linux")
+      @os = :linux
+      @os_title = "Linux"
+    elsif match = @user_agent.match(/mac os x ([\d_]+)/)
+      @os = :osx
+      @os_version = match[1].gsub("_", ".")
+      detect_osx_title
+    end
+  end
+
+  def detect_osx_title
+    major_version = @os_version.match(/^\d+\.\d+/)[0]
+    @os_title = "Mac OSX"
+
+    if title = MAC_OSX_VERSIONS[major_version]
+      @os_title << " #{title}"
+    end
+  end
+
+  def parse_regex_list(list, browser)
+    list.each do |regex|
+      if match = @user_agent.match(regex)
+        @browser = browser
+        @title = match[1].to_s.capitalize
+        @version = match[2] if match[2]
+        break
+      end
     end
   end
 end

data/lib/agent_helpers/version.rb

@@ -1,3 +1,3 @@
 module AgentHelpers
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,97 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: agent_helpers
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Kasper Johansen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-23 00:00:00.000000000 Z
+date: 2014-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: string-cases
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: forgery
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: codeclimate-test-reporter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Inspects the user agent for you and allows you to take action based on
@@ -102,21 +116,20 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- app/helpers/agent_helpers/application_helper.rb
-- app/helpers/agent_helpers/detector_helper.rb
+- MIT-LICENSE
+- Rakefile
 - app/assets/javascripts/agent_helpers/application.js
 - app/assets/stylesheets/agent_helpers/application.css
 - app/controllers/agent_helpers/application_controller.rb
+- app/helpers/agent_helpers/application_helper.rb
+- app/helpers/agent_helpers/detector_helper.rb
 - app/views/layouts/agent_helpers/application.html.erb
 - config/routes.rb
 - lib/agent_helpers.rb
+- lib/agent_helpers/detector.rb
 - lib/agent_helpers/engine.rb
 - lib/agent_helpers/version.rb
-- lib/agent_helpers/detector.rb
 - lib/tasks/agent_helpers_tasks.rake
-- MIT-LICENSE
-- Rakefile
-- README.rdoc
 homepage: https://www.github.com/kaspernj/agent_helpers
 licenses: []
 metadata: {}
@@ -126,17 +139,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.7
+rubygems_version: 2.4.0
 signing_key: 
 specification_version: 4
 summary: Easily detect robots, browser, versions and more with convenient helpers.

data/README.rdoc

@@ -1,3 +0,0 @@
-= AgentHelpers
-
-This project rocks and uses MIT-LICENSE.