Cleanup

bin/agent_orange_example

@@ -2,12 +2,24 @@
 
 require "agent_orange/user_agent"
 
+puts
+puts '='*80
+puts
+
 ua_str = "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_5_5; sv-se) AppleWebKit/525.26.2 (KHTML, like Gecko) Version/3.2 Safari/525.26.12"
+puts "User-Agent:"
+puts
+puts "#{ua_str}"
+puts
 ua = AgentOrange::UserAgent.new(:user_agent => ua_str)
 
 puts
 puts '='*80
 puts
 
 ua_str = "Mozilla/5.0 (iPhone; U; Linux i686; pt-br) AppleWebKit/532+ (KHTML, like Gecko) Version/3.0 Mobile/1A538b Safari/419.3 Midori/0.2.0"
+puts "User-Agent:"
+puts
+puts "#{ua_str}"
+puts
 ua = AgentOrange::UserAgent.new(:user_agent => ua_str)

lib/agent_orange/browser.rb

@@ -58,7 +58,7 @@ def parse(user_agent)
     end
 
     def to_s
-      [self.name, self.version].join(' ')
+      [self.name, self.version].compact.join(' ')
     end
   end
 end

lib/agent_orange/device.rb

@@ -63,20 +63,20 @@ def parse(user_agent)
       self.engine = AgentOrange::Engine.new(user_agent)
     end
 
-    def is_computer?(type=nil)
-      self.type == "computer"
+    def is_computer?(name=nil)
+      (self.type == "computer")
     end
 
-    def is_mobile?(type=nil)
+    def is_mobile?(name=nil)
       self.type == "mobile"
     end
 
-    def is_bot?(type=nil)
+    def is_bot?(name=nil)
       self.type == "bot"
     end
 
     def to_s
-      [self.name, self.version].join(' ')
+      [self.name, self.version].compact.join(' ')
     end
   end
 end

lib/agent_orange/engine.rb

@@ -62,7 +62,7 @@ def parse(user_agent)
     end
 
     def to_s
-      [self.name, self.version].join(' ')
+      [self.name, self.version].compact.join(' ')
     end
   end
 end

lib/agent_orange/user_agent.rb

@@ -19,8 +19,7 @@ def initialize(options = {}, &block)
       yield self if block_given?
     end
 
-    def parse(user_agent)
-      puts "User-Agent: #{user_agent}"
+    def parse(user_agent)      
       self.device = AgentOrange::Device.new(user_agent)
 
       puts
@@ -29,24 +28,38 @@ def parse(user_agent)
       puts "Is mobile? #{self.is_mobile?}"
       puts "Is bot? #{self.is_bot?}"
       puts
+
       puts "Engine = #{self.device.engine}"
+      puts
+
+      puts "Browser = #{self.device.engine.browser}"
+      puts
 
+      puts "user_agent.to_s = #{self}"
     end
 
     def is_computer?(type=nil)
-      self.device.is_computer?
+      self.device.is_computer?(type)
     end
 
     def is_mobile?(type=nil)
-      self.device.is_mobile?
+      self.device.is_mobile?(type)
     end
 
     def is_bot?(type=nil)
-      self.device.is_bot?
+      self.device.is_bot?(type)
     end
 
     def to_s
-      "#{device.to_s}"
+      [self.device, 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})."
+      else
+        "User has some kind of device that I've never seen."
+      end
     end
 
   end