agent_orange 0.0.9 → 0.1.0

data/Rakefile

@@ -1 +1,3 @@
 require 'bundler/gem_tasks'
+Dir.glob('./lib/tasks/*.rake').each { |r| import r }
+

data/bin/agent_orange_example

@@ -14,7 +14,9 @@ user_agent_strings = [
   "Mozilla/5.0 (Windows NT 6.1; rv:6.0) Gecko/20110814 Firefox/6.0",
   "Mozilla/5.0 (X11; U; Linux i586; de; rv:5.0) Gecko/20100101 Firefox/5.0",
   "Opera/9.80 (Windows NT 6.1; U; es-ES) Presto/2.9.181 Version/12.00",
-  "Opera/9.80 (X11; Linux i686; U; ru) Presto/2.8.131 Version/11.11"
+  "Opera/9.80 (X11; Linux i686; U; ru) Presto/2.8.131 Version/11.11",
+  "ia_archiver (+http://www.alexa.com/site/help/webmasters; crawler@alexa.com)",
+  "Mozilla/5.0 (compatible; Googlebot/2.1; +http://www.google.com/bot.html)"
   ]
 
 def process_user_agent(ua_str)

data/lib/agent_orange/browser.rb

@@ -5,17 +5,17 @@ module AgentOrange
   class Browser < Base
     attr_accessor :type, :name, :version
     attr_accessor :security
-    
+
     BROWSERS = {
       :ie       => 'MSIE|Internet Explorer|IE',
       :firefox  => 'Firefox',
       :opera    => 'Opera',
       :safari   => 'Safari'
     }
-    
+
     def parse(user_agent)
       AgentOrange.debug "BROWSER PARSING", 2
-      
+
       groups = parse_user_agent_string_into_groups(user_agent)
       groups.each_with_index do |content,i|
         if content[:name] =~ /(#{BROWSERS.collect{|cat,regex| regex}.join(')|(')})/i
@@ -30,32 +30,32 @@ module AgentOrange
               chosen_content = additional_content
             end
           end
-            
+
           self.populate(chosen_content)
         end
       end
-      
+
       self.analysis
     end
-    
+
     def populate(content={})
       self.debug_raw_content(content)
       AgentOrange.debug "", 2
-      
+
       self.type = self.determine_type(BROWSERS, content[:name])
       self.name = content[:name]
       self.version = AgentOrange::Version.new(content[:version])
       self
     end
-    
+
     def analysis
       AgentOrange.debug "BROWSER ANALYSIS", 2
       self.debug_content(:type => self.type, :name => self.name, :version => self.version)
       AgentOrange.debug "", 2
     end
-    
+
     def to_s
       [self.name, self.version].compact.join(' ')
     end
   end
-end
+end

data/lib/agent_orange/device.rb

@@ -10,16 +10,16 @@ module AgentOrange
     attr_accessor :platform
     attr_accessor :operating_system
     attr_accessor :engine
-    
+
     DEVICES = {
       :computer => 'windows|macintosh|x11|linux',
       :mobile => 'ipod|ipad|iphone|palm|android|opera mini|hiptop|windows ce|smartphone|mobile|treo|psp',
-      :bot => 'bot'
+      :bot => 'bot|googlebot|crawler|spider|robot|crawling'
     }
-    
+
     def parse(user_agent)
       AgentOrange.debug "DEVICE PARSING", 2
-      
+
       groups = parse_user_agent_string_into_groups(user_agent)
       groups.each_with_index do |content,i|
         if content[:comment] =~ /(#{DEVICES.collect{|cat,regex| regex}.join(')|(')})/i
@@ -27,30 +27,30 @@ module AgentOrange
           self.populate(content)
         end
       end
-      
+
       self.analysis
-      
+
       self.platform = AgentOrange::Platform.new(user_agent)
       self.operating_system = AgentOrange::OperatingSystem.new(user_agent)
       self.engine = AgentOrange::Engine.new(user_agent)
     end
-    
+
     def populate(content={})
       self.debug_raw_content(content)
       AgentOrange.debug "", 2
-      
+
       self.type = self.determine_type(DEVICES, content[:comment])
       self.name = self.type.to_s.capitalize
       self.version = nil
       self
     end
-    
+
     def analysis
       AgentOrange.debug "DEVICE ANALYSIS", 2
       self.debug_content(:type => self.type, :name => self.name, :version => self.version)
       AgentOrange.debug "", 2
     end
-    
+
     def is_computer?(name=nil)
       if name
         case name
@@ -63,9 +63,9 @@ module AgentOrange
         (self.type == :computer)
       end
     end
-    
+
     def is_mobile?(name=nil)
-      if !name.nil?
+      if !name.nil? && !self.platform.name.nil?
         case name
         when String
           return self.platform.name.downcase.include?(name.downcase) || self.platform.version.downcase.include?(name.downcase)
@@ -76,7 +76,7 @@ module AgentOrange
         (self.type == :mobile)
       end
     end
-    
+
     def is_bot?(name=nil)
       if name
         case name
@@ -89,9 +89,9 @@ module AgentOrange
         (self.type == :bot)
       end
     end
-    
+
     def to_s
       [self.name, self.version].compact.join(' ')
     end
   end
-end
+end

data/lib/agent_orange/engine.rb

@@ -7,7 +7,7 @@ module AgentOrange
   class Engine < Base
     attr_accessor :type, :name, :version
     attr_accessor :browser
-    
+
     ENGINES = {
       :gecko  => 'Gecko',
       :presto => 'Presto',
@@ -15,10 +15,10 @@ module AgentOrange
       :webkit => 'AppleWebKit',
       :other => 'Other'
     }
-    
+
     def parse(user_agent)
       AgentOrange.debug "ENGINE PARSING", 2
-      
+
       groups = parse_user_agent_string_into_groups(user_agent)
       groups.each_with_index do |content,i|
         if content[:name] =~ /(#{ENGINES.collect{|cat,regex| regex}.join(')|(')})/i
@@ -33,33 +33,33 @@ module AgentOrange
               chosen_content = additional_content
             end
           end
-            
+
           self.populate(chosen_content)
         end
       end
-      
+
       self.analysis
       self.browser = AgentOrange::Browser.new(user_agent)
     end
-    
+
     def populate(content={})
       self.debug_raw_content(content)
       AgentOrange.debug "", 2
-      
+
       self.type = self.determine_type(ENGINES, content[:name])
       self.name = ENGINES[self.type.to_sym]
       self.version = AgentOrange::Version.new(content[:version])
       self
     end
-    
+
     def analysis
       AgentOrange.debug "ENGINE ANALYSIS", 2
       self.debug_content(:type => self.type, :name => self.name, :version => self.version)
       AgentOrange.debug "", 2
     end
-    
+
     def to_s
       [self.name, self.version].compact.join(' ') || "Unknown"
     end
   end
-end
+end

data/lib/agent_orange/operating_system.rb

@@ -3,7 +3,7 @@ require 'agent_orange/base'
 module AgentOrange
   class OperatingSystem < Base
     attr_accessor :type, :name, :version
-    
+
     OPERATING_SYSTEMS = {
       :android => 'android',
       :freebsd => 'freebsd',
@@ -26,7 +26,7 @@ module AgentOrange
 
     def parse(user_agent)
       AgentOrange.debug "OPERATING SYSTEM PARSING", 2
-      
+
       groups = parse_user_agent_string_into_groups(user_agent)
       groups.each_with_index do |content,i|
         if content[:comment] =~ /(#{OPERATING_SYSTEMS.collect{|cat,regex| regex}.join(')|(')})/i
@@ -38,32 +38,32 @@ module AgentOrange
               chosen_content = additional_content
             end
           end
-            
+
           self.populate(chosen_content)
         end
       end
-      
+
       self.analysis
     end
-    
+
     def populate(content={})
       self.debug_raw_content(content)
       AgentOrange.debug "", 2
-      
+
       self.type = self.determine_type(OPERATING_SYSTEMS, content[:name])
       self.name = OPERATING_SYSTEM_NAMES[self.type.to_sym]
       self.version = AgentOrange::Version.new(content[:version])
       self
     end
-    
+
     def analysis
       AgentOrange.debug "OPERATING SYSTEM ANALYSIS", 2
       self.debug_content(:type => self.type, :name => self.name, :version => self.version)
       AgentOrange.debug "", 2
     end
-    
+
     def to_s
       [self.name, self.version].compact.join(' ')
     end
   end
-end
+end

data/lib/agent_orange/platform.rb

@@ -10,7 +10,7 @@ module AgentOrange
       :mac => 'macintosh',
       :pc => 'freebsd|linux|netbsd|windows|x11'
     }
-    
+
     PLATFORM_NAMES = {
       :android => 'Android',
       :apple => 'Apple',
@@ -22,10 +22,10 @@ module AgentOrange
       :iphone => 'iphone',
       :ipod => 'ipod'
     }
-    
+
     def parse(user_agent)
       AgentOrange.debug "PLATFORM PARSING", 2
-      
+
       groups = parse_user_agent_string_into_groups(user_agent)
       groups.each_with_index do |content,i|
         if content[:comment] =~ /(#{PLATFORMS.collect{|cat,regex| regex}.join(')|(')})/i
@@ -33,17 +33,17 @@ module AgentOrange
           self.populate(content)
         end
       end
-      
+
       self.analysis
     end
-    
+
     def populate(content={})
       self.debug_raw_content(content)
       AgentOrange.debug "", 2
-      
+
       self.type = self.determine_type(PLATFORMS, content[:comment])
       self.name = PLATFORM_NAMES[self.type.to_sym]
-      
+
       if self.type == :apple
         self.version = case self.determine_type(PLATFORM_VERSIONS, content[:comment])
         when :ipad
@@ -58,18 +58,18 @@ module AgentOrange
       else
         self.version = nil
       end
-      
+
       self
     end
-    
+
     def analysis
       AgentOrange.debug "PLATFORM ANALYSIS", 2
       self.debug_content(:type => self.type, :name => self.name, :version => self.version)
       AgentOrange.debug "", 2
     end
-    
+
     def to_s
       [self.name, self.version].compact.join(' ')
     end
   end
-end
+end

data/lib/agent_orange/user_agent.rb

@@ -3,17 +3,17 @@ require 'agent_orange/device'
 module AgentOrange
   DEBUG = false
   DEBUG_LEVEL = 1
-  
+
   class UserAgent
     attr_accessor :user_agent_string
     attr_accessor :user_language
     attr_accessor :device
-    
+
     def initialize(user_agent_string)
       self.parse(user_agent_string)
     end
 
-    def parse(user_agent)      
+    def parse(user_agent)
       self.user_agent_string = user_agent
       self.device = AgentOrange::Device.new(self.user_agent_string)
 
@@ -25,7 +25,7 @@ module AgentOrange
 
       self.summary
     end
-    
+
     def is_computer?(type=nil)
       self.device.is_computer?(type)
     end
@@ -39,14 +39,14 @@ module AgentOrange
     end
 
     def to_s
-      [self.device, 
-        self.device.platform, 
-        self.device.operating_system, 
-        self.device.engine, 
+      [self.device,
+        self.device.platform,
+        self.device.operating_system,
+        self.device.engine,
         self.device.engine.browser
         ].compact.join(", ")
     end
-    
+
     def to_human_string
       if self.device && self.device.engine && self.device.engine.browser
         "User has a #{self.device} running #{self.device.engine.browser} (which is based on #{self.device.engine})."
@@ -74,9 +74,9 @@ module AgentOrange
       AgentOrange.debug
     end
   end
-  
+
   def self.debug(str="", level=1)
     puts str if DEBUG && (DEBUG_LEVEL >= level)
   end
-  
-end
+
+end

data/lib/agent_orange/version.rb

@@ -1,6 +1,6 @@
 module AgentOrange
-  VERSION = "0.0.9" # This is for the gem and does not conflict with the rest of the functionality
-  
+  VERSION = "0.1.0" # This is for the gem and does not conflict with the rest of the functionality
+
   class Version
     attr_accessor :major, :minor, :patch_level, :build_number
 
@@ -13,21 +13,25 @@ module AgentOrange
 
       pieces = version_string.split('.')
       pieces_count = pieces.count
-      
+
       self.major = pieces[0] if pieces_count >= 1
       self.minor = pieces[1] if pieces_count >= 2
       self.patch_level = pieces[2] if pieces_count >= 3
       self.build_number = pieces[3] if pieces_count >= 4
     end
-    
+
     def to_s
       [self.major, self.minor, self.patch_level, self.build_number].compact.join('.')
     end
-    
+
     private
-    
+
     def sanitize_version_string(version_string)
-      version_string.gsub('_','.')
+      unless version_string.nil?
+        version_string.gsub('_','.')
+      else
+        ""
+      end
     end
   end
-end
+end

data/lib/agent_orange.rb

@@ -5,4 +5,4 @@ require 'agent_orange/engine'
 require 'agent_orange/browser'
 
 module AgentOrange
-end
+end

metadata

@@ -1,40 +1,24 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: agent_orange
-version: !ruby/object:Gem::Version 
-  hash: 13
+version: !ruby/object:Gem::Version
+  version: 0.1.0
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 9
-  version: 0.0.9
 platform: ruby
-authors: 
+authors:
 - Kevin Elliott
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-09-16 00:00:00 Z
+date: 2011-10-21 00:00:00.000000000Z
 dependencies: []
-
 description: Parse and process User Agents like a secret one
-email: 
+email:
 - kevin@welikeinc.com
-executables: 
+executables:
 - agent_orange_example
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- .gitignore
-- Gemfile
-- README.rdoc
-- Rakefile
-- agent_orange.gemspec
-- bin/agent_orange_example
-- lib/agent_orange.rb
+files:
 - lib/agent_orange/base.rb
 - lib/agent_orange/browser.rb
 - lib/agent_orange/device.rb
@@ -43,38 +27,33 @@ files:
 - lib/agent_orange/platform.rb
 - lib/agent_orange/user_agent.rb
 - lib/agent_orange/version.rb
+- lib/agent_orange.rb
+- bin/agent_orange_example
+- Gemfile
+- Rakefile
+- README.rdoc
 homepage: http://github.com/kevinelliott/agent_orange
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: agent_orange
-rubygems_version: 1.8.5
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Parse and process User Agents like a secret one
 test_files: []
-

data/.gitignore

@@ -1,4 +0,0 @@
-*.gem
-.bundle
-Gemfile.lock
-pkg/*

data/agent_orange.gemspec

@@ -1,20 +0,0 @@
-# -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "agent_orange/version"
-
-Gem::Specification.new do |s|
-  s.name        = "agent_orange"
-  s.version     = AgentOrange::VERSION
-  s.authors     = ["Kevin Elliott"]
-  s.email       = ["kevin@welikeinc.com"]
-  s.homepage    = "http://github.com/kevinelliott/agent_orange"
-  s.summary     = %q{Parse and process User Agents like a secret one}
-  s.description = %q{Parse and process User Agents like a secret one}
-
-  s.rubyforge_project = "agent_orange"
-
-  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