agent_orange 0.0.5 → 0.0.6

data/bin/agent_orange_example

@@ -20,10 +20,12 @@ user_agent_strings = [
 def process_user_agent(ua_str)
   puts
   puts '='*120
-  puts "User-Agent:"
+  puts "Original User Agent:"
   puts "  #{ua_str}"
   puts
   ua = AgentOrange::UserAgent.new(:user_agent => ua_str)
+  puts "Parsed Object String:"
+  puts "  #{ua}"
   puts '='*120
 end
 

data/lib/agent_orange/engine.rb

@@ -1,5 +1,6 @@
 require 'agent_orange/browser'
 require 'agent_orange/version'
+require 'pp'
 
 module AgentOrange
   class Engine
@@ -9,7 +10,9 @@ module AgentOrange
     ENGINES = {
       :gecko  => 'Gecko',
       :presto => 'Presto',
-      :webkit => 'AppleWebKit'
+      :trident => 'Trident',
+      :webkit => 'AppleWebKit',
+      :other => 'Other'
     }
     
     def initialize(user_agent)
@@ -18,52 +21,84 @@ module AgentOrange
     
     def parse(user_agent)
       AgentOrange.debug "ENGINE PARSING", 2
-      groups = user_agent.scan(/([^\/[:space:]]*)(\/([^[:space:]]*))?([[:space:]]*\[[a-zA-Z][a-zA-Z]\])?[[:space:]]*(\((([^()]|(\([^()]*\)))*)\))?[[:space:]]*/i)
-      groups.each_with_index do |pieces,i|
-        name = pieces[0]
-        version = pieces[2]
-        comment = pieces[5]
-        
-        if name =~ /(#{ENGINES.collect{|cat,regex| regex}.join(')|(')})/i
-          # Found the engine
-          AgentOrange.debug "  Got an engine in group #{i+1}!", 2
-          AgentOrange.debug "  Raw Name   : #{name}", 2
-          AgentOrange.debug "  Raw Version: #{version}", 2
-          AgentOrange.debug "  Raw Comment: #{comment}", 2
-          AgentOrange.debug "", 2
-                    
-          # Determine engine type
-          if name =~ /(#{ENGINES[:gecko]})/i
-            self.type = "gecko"
+      results = user_agent.scan(/([^\/[:space:]]*)(\/([^[:space:]]*))?([[:space:]]*\[[a-zA-Z][a-zA-Z]\])?[[:space:]]*(\((([^()]|(\([^()]*\)))*)\))?[[:space:]]*/i)
+      groups = scan_results_into_groups(results)
+      groups.each_with_index do |content,i|
+        if content[:name] =~ /(#{ENGINES.collect{|cat,regex| regex}.join(')|(')})/i
+          # Matched group against name
+          self.populate(content)
+        elsif content[:comment] =~ /(#{ENGINES.collect{|cat,regex| regex}.join(')|(')})/i
+          # Matched group against comment
+          chosen_content = { :name => nil, :version => nil }
+          additional_groups = parse_comment(content[:comment])
+          additional_groups.each do |additional_content|
+            if additional_content[:name] =~ /(#{ENGINES.collect{|cat,regex| regex}.join(')|(')})/i
+              chosen_content = additional_content
+            end
           end
-          if name =~ /(#{ENGINES[:presto]})/i
-            self.type = "presto"
-          end
-          if name =~ /(#{ENGINES[:webkit]})/i
-            self.type = "webkit"
-          end
-          
-          # Determine engine name
-          self.name = name
-          
-          # Determine device version
-          self.version = AgentOrange::Version.new(version)
-          
+            
+          self.populate(chosen_content)
         end
-
       end
       
+      self.analysis
+      self.browser = AgentOrange::Browser.new(user_agent)
+    end
+    
+    def scan_results_into_groups(results)
+      groups = []
+      results.each do |result|
+        if result[0] != "" # Add the group of content if name isn't blank
+          groups << { :name => result[0], :version => result[2], :comment => result[5] }
+        end
+      end
+      groups
+    end
+    
+    def parse_comment(comment)
+      groups = []
+      comment.split('; ').each do |piece|
+        content = { :name => nil, :version => nil }
+        if piece =~ /(.+)[ \/]([\w.]+)$/i
+          chopped = piece.scan(/(.+)[ \/]([\w.]+)$/i)[0]
+          groups << { :name => chopped[0], :version => chopped[1] }
+        end
+      end
+      groups
+    end
+    
+    def determine_type(content="")
+      # Determine type
+      type = nil
+      ENGINES.each do |key, value|
+        type = key if content =~ /(#{value})/i
+      end
+      type = "other" if type.nil?
+      type
+    end
+    
+    def populate(content={})
+      AgentOrange.debug "  Raw Name   : #{content[:name]}", 2
+      AgentOrange.debug "  Raw Version: #{content[:version]}", 2
+      AgentOrange.debug "  Raw Comment: #{content[:comment]}", 2
+      AgentOrange.debug "", 2
+                
+      self.type = self.determine_type(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
       AgentOrange.debug "  Type: #{self.type}", 2
       AgentOrange.debug "  Name: #{self.name}", 2
       AgentOrange.debug "  Version: #{self.version}", 2
       AgentOrange.debug "", 2
-      
-      self.browser = AgentOrange::Browser.new(user_agent)
     end
     
     def to_s
-      [self.name, self.version].compact.join(' ')
+      [self.name, self.version].compact.join(' ') || "Unknown"
     end
   end
 end

data/lib/agent_orange/user_agent.rb

@@ -1,8 +1,8 @@
 require 'agent_orange/device'
 
 module AgentOrange
-  DEBUG = true
-  DEBUG_LEVEL = 2
+  DEBUG = false
+  DEBUG_LEVEL = 1
   
   class UserAgent
     attr_accessor :user_agent_string
@@ -26,9 +26,6 @@ module AgentOrange
       AgentOrange.debug "Browser  = #{self.device.engine.browser}"
 
       self.summary
-      
-      AgentOrange.debug "", 2
-      AgentOrange.debug "user_agent.to_s = #{self}", 2
     end
     
     def is_computer?(type=nil)
@@ -44,7 +41,12 @@ module AgentOrange
     end
 
     def to_s
-      [self.device, self.device.platform, self.device.operating_system, self.device.engine, self.device.engine.browser].compact.join(", ")
+      [self.device, 
+        self.device.platform, 
+        self.device.operating_system, 
+        self.device.engine, 
+        self.device.engine.browser
+        ].compact.join(", ")
     end
     
     def to_human_string

data/lib/agent_orange/version.rb

@@ -1,5 +1,5 @@
 module AgentOrange
-  VERSION = "0.0.5" # This is for the gem and does not conflict with the rest of the functionality
+  VERSION = "0.0.6" # 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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: agent_orange
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Kevin Elliott
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-11 00:00:00 Z
+date: 2011-09-12 00:00:00 Z
 dependencies: []
 
 description: Parse and process User Agents like a secret one