agent_orange 0.0.8 → 0.0.9

data/lib/agent_orange/device.rb

@@ -60,20 +60,20 @@ module AgentOrange
           return self.platform.name.downcase.include?(name.to_s.downcase)
         end
       else
-        (self.type == "computer")
+        (self.type == :computer)
       end
     end
     
     def is_mobile?(name=nil)
-      if name
+      if !name.nil?
         case name
         when String
-          return self.platform.name.downcase.include?(name.downcase)
+          return self.platform.name.downcase.include?(name.downcase) || self.platform.version.downcase.include?(name.downcase)
         when Symbol
-          return self.platform.name.downcase.include?(name.to_s.downcase)
+          return self.platform.name.downcase.include?(name.to_s.downcase) || self.platform.version.to_s.downcase.include?(name.to_s.downcase)
         end
       else
-        self.type == "mobile"
+        (self.type == :mobile)
       end
     end
     
@@ -86,7 +86,7 @@ module AgentOrange
           return self.name.downcase.include?(name.to_s.downcase)
         end
       else
-        self.type == "bot"
+        (self.type == :bot)
       end
     end
     

data/lib/agent_orange/platform.rb

@@ -6,63 +6,22 @@ module AgentOrange
 
     PLATFORMS = {
       :android => 'android',
-      :ios => 'iphone|ipad|ipod',
+      :apple => 'iphone|ipad|ipod',
       :mac => 'macintosh',
       :pc => 'freebsd|linux|netbsd|windows|x11'
     }
     
     PLATFORM_NAMES = {
       :android => 'Android',
-      :ios => 'iOS',
+      :apple => 'Apple',
       :mac => 'Macintosh',
       :pc => 'PC'
     }
-    
-    def old_parse(user_agent)
-      AgentOrange.debug "PLATFORM 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 comment =~ /(#{PLATFORMS.collect{|cat,regex| regex}.join(')|(')})/i
-          # Found the device
-          AgentOrange.debug "  Got a platform 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 platform type
-          if comment =~ /(#{PLATFORMS[:android]})/i
-            self.type = "android"
-          end
-          if comment =~ /(#{PLATFORMS[:ios]})/i
-            self.type = "ios"
-          end
-          if comment =~ /(#{PLATFORMS[:mac]})/i
-            self.type = "mac"
-          end
-          if comment =~ /(#{PLATFORMS[:pc]})/i
-            self.type = "pc"
-          end
-          
-          # Determine platform name
-          self.name = PLATFORM_NAMES[self.type.to_sym]
-          
-          # Determine platform version
-          self.version = nil
-        end
-
-      end
-      
-      AgentOrange.debug "PLATFORM ANALYSIS", 2
-      AgentOrange.debug "  Type: #{self.type}", 2
-      AgentOrange.debug "  Name: #{self.name}", 2
-      AgentOrange.debug "  Version: #{self.version}", 2
-      AgentOrange.debug "", 2
-    end
+    PLATFORM_VERSIONS = {
+      :ipad => 'ipad',
+      :iphone => 'iphone',
+      :ipod => 'ipod'
+    }
     
     def parse(user_agent)
       AgentOrange.debug "PLATFORM PARSING", 2
@@ -84,7 +43,22 @@ module AgentOrange
       
       self.type = self.determine_type(PLATFORMS, content[:comment])
       self.name = PLATFORM_NAMES[self.type.to_sym]
-      self.version = nil
+      
+      if self.type == :apple
+        self.version = case self.determine_type(PLATFORM_VERSIONS, content[:comment])
+        when :ipad
+          AgentOrange::Version.new("iPad")
+        when :iphone
+          AgentOrange::Version.new("iPhone")
+        when :ipod
+          AgentOrange::Version.new("iPod")
+        else
+          AgentOrange::Version.new("Unknown")
+        end
+      else
+        self.version = nil
+      end
+      
       self
     end
     

data/lib/agent_orange/version.rb

@@ -1,5 +1,5 @@
 module AgentOrange
-  VERSION = "0.0.8" # This is for the gem and does not conflict with the rest of the functionality
+  VERSION = "0.0.9" # 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: 15
+  hash: 13
   prerelease: 
   segments: 
   - 0
   - 0
-  - 8
-  version: 0.0.8
+  - 9
+  version: 0.0.9
 platform: ruby
 authors: 
 - Kevin Elliott
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-12 00:00:00 Z
+date: 2011-09-16 00:00:00 Z
 dependencies: []
 
 description: Parse and process User Agents like a secret one