wurfl_device 0.0.10 → 0.1

data/lib/wurfl_device/cli.rb

@@ -29,7 +29,7 @@ module WurflDevice
     method_option :yaml, :type => :boolean, :banner => "show the dump in yaml format", :aliases => "-y"
     def dump(device_id)
       device = WurflDevice.get_device_from_id(device_id)
-      device = WurflDevice.get_device_from_ua(device_id, use_cache) if device.nil?
+      device = WurflDevice.get_device_from_ua(device_id) if device.nil?
 
       if options.json?
         WurflDevice.ui.info device.capabilities.to_json
@@ -103,6 +103,17 @@ module WurflDevice
       WurflDevice.ui.info "  " + commify(devices.length) + " device id's"
       WurflDevice.ui.info "  " + commify(user_agents.length) + " exact user agents" + user_agents_message
       WurflDevice.ui.info "  " + commify(WurflDevice.get_user_agents_in_cache.length) + " user agents found in cache"
+      indexes = Array.new
+      WurflDevice.get_indexes.each do |index|
+        index.gsub!(WurflDevice::Constants::WURFL_DEVICES_INDEX, '')
+        indexes << "#{index}(" + commify(WurflDevice.get_user_agents_in_index(index).length) + ")"
+      end
+      indexes.sort!
+      WurflDevice.ui.info "wurfl user agent indexes:"
+      while !indexes.empty?
+        sub = indexes.slice!(0, 7)
+        WurflDevice.ui.info "  " + sub.join(', ')
+      end
       WurflDevice.ui.info ""
     end
     map %w(stats stat info) => :status

data/lib/wurfl_device/constants.rb

@@ -7,6 +7,8 @@ module WurflDevice
 
     DB_INDEX                      = "7".freeze
     GENERIC                       = 'generic'
+    GENERIC_XHTML                 = 'generic_xhtml'
+    GENERIC_WEB_BROWSER           = 'generic_web_browser'
     WURFL                         = "wurfl:"
     WURFL_INFO                    = "wurfl:info"
     WURFL_DEVICES                 = "wurfl:devices:"
@@ -16,14 +18,6 @@ module WurflDevice
     WURFL_USER_AGENTS             = "wurfl:user_agents"
     WURFL_USER_AGENTS_CACHED      = "wurfl:user_agents_cached"
 
-    USER_AGENT_MATCHERS =
-    [
-      "Alcatel", "Android", "AOL", "Apple", "BenQ", "BlackBerry", "Bot", "CatchAll", "Chrome", "DoCoMo",
-      "Firefox", "Grundig", "HTC", "Kddi", "Konqueror", "Kyocera", "LG", "Mitsubishi", "Motorola", "MSIE",
-      "Nec", "Nintendo", "Nokia", "Opera", "OperaMini", "Panasonic", "Pantech", "Philips", "Portalmmm", "Qtek",
-      "Safari", "Sagem", "Samsung", "Sanyo", "Sharp", "Siemens", "SonyEricsson", "SPV", "Toshiba", "Vodafone", "WindowsCE"
-    ]
-
     MOBILE_BROWSERS   =  [
       'cldc', 'symbian', 'midp', 'j2me', 'mobile', 'wireless', 'palm', 'phone', 'pocket pc', 'pocketpc', 'netfront',
       'bolt', 'iris', 'brew', 'openwave', 'windows ce', 'wap2.', 'android', 'opera mini', 'opera mobi', 'maemo', 'fennec',

data/lib/wurfl_device/device.rb

@@ -12,6 +12,7 @@ module WurflDevice
       else
         @capabilities = build_device(device_id)
       end
+      @capabilities['actual_device_root'] ||= ((@capabilities['user_agent'] !~ /^DO_NOT_MATCH/i) ? true : false)
     end
 
     def is_valid?
@@ -32,7 +33,7 @@ module WurflDevice
 
       capabilities['fall_back_tree'] ||= Array.new
 
-      if !device['fall_back'].nil? && !device['fall_back'].empty? && device['id'] != WurflDevice::Constants::GENERIC
+      if !device['fall_back'].nil? && !device['fall_back'].empty? && device['fall_back'] != 'root'
         fall_back = build_device(device['fall_back'])
         unless fall_back.nil?
           capabilities['fall_back_tree'].unshift(fall_back['id'])

data/lib/wurfl_device/user_agent.rb

@@ -0,0 +1,139 @@
+module WurflDevice
+  class UserAgent < String
+    def is_desktop_browser?
+      ua = self.downcase
+      WurflDevice::Constants::DESKTOP_BROWSERS.each do |sig|
+        return true if ua.index(sig)
+      end
+      return false
+    end
+
+    def is_mobile_browser?
+      ua = self.downcase
+      return false if self.is_desktop_browser?
+      return true if ua =~ /[^\d]\d{3}x\d{3}/
+      WurflDevice::Constants::DESKTOP_BROWSERS.each do |sig|
+        return true if ua.index(sig)
+      end
+      return false
+    end
+
+    def is_robot?
+      ua = self.downcase
+      WurflDevice::Constants::ROBOTS.each do |sig|
+        return true if ua.index(sig)
+      end
+      return false
+    end
+
+    def first_slash
+      pos = self.index('/')
+      return self.length if pos.nil?
+      return pos
+    end
+
+    def second_slash
+      first = self.index('/')
+      return self.length if first.nil?
+      second = self.index('/', first + 1)
+      return self.length if second.nil?
+      return second
+    end
+
+    def first_space
+      pos = self.index(' ')
+      return self.length if pos.nil?
+      return pos
+    end
+
+    def first_open_paren
+      pos = self.index('(')
+      return self.length if pos.nil?
+      return pos
+    end
+
+    def contains(find, ignore_case=false)
+      user_agent = self.downcase if ignore_case
+      user_agent = self unless ignore_case
+      if find.kind_of?(Array)
+        find.map do |needle|
+          needle = needle.downcase if ignore_case
+          return true unless user_agent.index(needle).nil?
+        end
+        return false
+      else
+        find = find.downcase if ignore_case
+        return true unless user_agent.index(find).nil?
+        return false
+      end
+    end
+
+    def starts_with(find, ignore_case=false)
+      user_agent = self.downcase if ignore_case
+      user_agent = self unless ignore_case
+      if find.kind_of?(Array)
+        find.map do |needle|
+          needle = needle.downcase if ignore_case
+          return true if user_agent.index(needle) == 0
+        end
+        return false
+      else
+        find = find.downcase if ignore_case
+        return true if user_agent.index(find) == 0
+        return false
+      end
+    end
+
+    def index_of_or_length(target, starting_index=nil)
+      length = self.length
+      return length if starting_index.nil?
+      if target.kind_of?(Array)
+        target.map do |needle|
+          next if needle.nil?
+          pos = self.index(needle, starting_index)
+          return pos unless pos.nil?
+        end
+        return length
+      else
+        pos = self.index(target, starting_index)
+        return length if pos.nil?
+        return pos unless pos.nil?
+      end
+    end
+
+    def ordinal_index_of(needle, ordinal)
+      return -1 if self.nil? || self.empty? || ordinal.is_a?(Integer)
+      found = 0
+      index = -1
+      begin
+        index = self.index(needle, index + 1)
+        index = index.is_a?(Integer) ? index : -1
+        return index if index < 0
+        found = found + 1
+      end while found < ordinal
+      return index
+    end
+
+    def cleaned
+      user_agent = self.dup
+      user_agent.sub!('UP.Link', '')
+      user_agent.replace($1) if user_agent =~ /^(.+)NOKIA-MSISDN\:\ (.+)$/i
+      user_agent.sub!("'M', 'Y' 'P', 'H', 'O', 'N', 'E'", "MyPhone")
+      user_agent.sub!('(null)', '')
+
+      # remove serial numbers
+      user_agent.sub!(/\/SN\d{15}/, '/SNXXXXXXXXXXXXXXX')
+      user_agent.sub!(/\[(ST|TF|NT)\d+\]/, '')
+
+      # remove locale identifiers
+      user_agent.sub!(/([ ;])[a-zA-Z]{2}-[a-zA-Z]{2}([ ;\)])/, '\1xx-xx\2')
+
+      pos = self.index('BlackBerry')
+      user_agent.replace(self.slice(pos, user_agent.length-pos)) unless pos.nil?
+
+      user_agent.sub!(/(Android \d\.\d)([^; \/\)]+)/, '\1')
+      user_agent.strip!
+      user_agent
+    end
+  end
+end

data/lib/wurfl_device/user_agent_matcher.rb

@@ -2,53 +2,39 @@ require 'text'
 
 module WurflDevice
   class UserAgentMatcher
-    attr_accessor :user_agent, :user_agent_cleaned, :device
+    attr_accessor :user_agent, :device
 
     def match(user_agent)
-      @user_agent = user_agent
-      @user_agent_cleaned = UserAgentMatcher.clean_user_agent(user_agent)
-      @device = nil
+      @user_agent = UserAgent.new(user_agent)
 
       # exact match
       @device = WurflDevice.get_device_from_ua_cache(@user_agent)
-      @device = WurflDevice.get_device_from_ua_cache(@user_agent_cleaned) if @device.nil?
+      @device = WurflDevice.get_device_from_ua_cache(@user_agent.cleaned) if @device.nil?
 
       # already in cache so return immediately
       return self if !@device.nil? && @device.is_valid?
 
       # ris match
+      user_agent = @user_agent.cleaned
       if @device.nil?
-        user_agent = @user_agent
-        user_agent_list = WurflDevice.get_user_agents_in_index(UserAgentMatcher.get_index(user_agent)).sort { |a, b| a[0] <=> b[0] }
-        tolerance = UserAgentMatcher.first_slash(user_agent)-1
-        curlen = user_agent.length
-        while curlen >= tolerance
-          user_agent_list.map do |ua, device_id|
-            if ua.index(user_agent) == 0
-              @device = Device.new(device_id)
-              break
-            end
+        index_matcher = get_index(user_agent)
+        matcher = "matcher_#{index_matcher.downcase}"
+        if self.respond_to?(matcher)
+          self.send(matcher, user_agent) 
+        else
+          if user_agent =~ /^Mozilla/i
+            tolerance = 5
+            @device = ld_match(user_agent, tolerance)
+          else
+            tolerance = user_agent.first_slash
+            @device = ris_match(user_agent, tolerance)
           end
-          break unless @device.nil?
-          user_agent = user_agent.slice(0, curlen-1)
-          curlen = user_agent.length
         end
       end
 
       # last attempts
       if @device.nil?
-        user_agent = @user_agent
-        device_id = WurflDevice::Constants::GENERIC
-        device_id = 'opwv_v7_generic' if user_agent.index('UP.Browser/7')
-        device_id = 'opwv_v6_generic' if user_agent.index('UP.Browser/6')
-        device_id = 'upgui_generic' if user_agent.index('UP.Browser/5')
-        device_id = 'uptext_generic' if user_agent.index('UP.Browser/4')
-        device_id = 'uptext_generic' if user_agent.index('UP.Browser/3')
-        device_id = 'nokia_generic_series60' if user_agent.index('Series60')
-        device_id = 'generic_web_browser' if user_agent.index('Mozilla/4.0')
-        device_id = 'generic_web_browser' if user_agent.index('Mozilla/5.0')
-        device_id = 'generic_web_browser' if user_agent.index('Mozilla/6.0')
-        @device = WurflDevice.get_device_from_id(device_id)
+        last_attempts(user_agent)
       end
 
       WurflDevice.save_device_in_ua_cache(@user_agent, @device)
@@ -56,101 +42,589 @@ module WurflDevice
       return self
     end
 
-    class << self
-      def get_index(user_agent)
-        # create device index
-        matcher = 'Generic'
-        WurflDevice::Constants::USER_AGENT_MATCHERS.each do |m|
-          if Regexp.new(m, Regexp::IGNORECASE) =~ user_agent
-            matcher = m
+    def ris_match(user_agent, tolerance)
+      device = nil
+      user_agent_list = WurflDevice.get_user_agents_in_index(get_index(user_agent))
+      curlen = user_agent.length
+      while curlen >= tolerance
+        user_agent_list.each do |ua|
+          next if ua.length < curlen
+          if ua.index(user_agent) == 0
+            device = WurflDevice.get_device_from_ua_cache(ua, true)
             break
           end
         end
-        return matcher
+        break unless device.nil?
+        user_agent = user_agent.slice(0, curlen-1)
+        curlen = user_agent.length
+      end
+      return device
+    end
+
+    def ld_match(user_agent, tolerance=nil)
+      tolerance = 7 if tolerance.nil?
+      device = nil
+      user_agent_list = WurflDevice.get_user_agents_in_index(get_index(user_agent))
+
+      length = user_agent.length
+      best = tolerance
+      current = 0
+      match = nil
+      user_agent_list.select do |ua|
+        next if !ua.length.between?(length - tolerance, length + tolerance)
+        current = Text::Levenshtein.distance(ua, user_agent)
+        if current <= best
+          best = current
+          match = ua
+        end
+        puts "#{current}: #{ua}"
       end
 
-      def clean_user_agent(user_agent)
-        user_agent = remove_up_link_from_ua(user_agent)
+      device = WurflDevice.get_device_from_ua_cache(match, true)
+      return device
+    end
 
-        # remove nokia-msisdn header
-        user_agent = remove_nokia_msisdn(user_agent)
+    def get_index(user_agent)
+      ua = UserAgent.new(user_agent)
+      # Process MOBILE user agents
+      unless ua.is_desktop_browser?
+        return 'Nokia' if ua.contains('Nokia')
+        return 'Samsung' if ua.contains(['Samsung/SGH', 'SAMSUNG-SGH']) || ua.starts_with(['SEC-', 'Samsung', 'SAMSUNG', 'SPH', 'SGH', 'SCH']) || ua.starts_with('samsung', true)
+        return 'BlackBerry' if ua.contains('blackberry', true)
+        return 'SonyEricsson' if ua.contains('Sony')
+        return 'Motorola' if ua.starts_with(['Mot-', 'MOT-', 'MOTO', 'moto']) || ua.contains('Motorola')
 
-        # clean up myphone id's
-        user_agent = user_agent.sub("'M', 'Y' 'P', 'H', 'O', 'N', 'E'", "MyPhone")
-        
-        # remove serial numbers
-        user_agent = user_agent.sub(/\/SN\d{15}/, '/SNXXXXXXXXXXXXXXX')
-        user_agent = user_agent.sub(/\[(ST|TF|NT)\d+\]/, '')
+        return 'Alcatel' if ua.starts_with('alcatel', true)
+        return 'Apple' if ua.contains(['iPhone', 'iPod', 'iPad', '(iphone'])
+        return 'BenQ' if ua.starts_with('benq', true)
+        return 'DoCoMo' if ua.starts_with('DoCoMo')
+        return 'Grundig' if ua.starts_with('grundig', true)
+        return 'HTC' if ua.contains(['HTC', 'XV6875'])
+        return 'Kddi' if ua.contains('KDDI-')
+        return 'Kyocera' if ua.starts_with(['kyocera', 'QC-', 'KWC-'])
+        return 'LG' if ua.starts_with('lg', true)
+        return 'Mitsubishi' if ua.starts_with('Mitsu')
+        return 'Nec' if ua.starts_with(['NEC-', 'KGT'])
+        return 'Nintendo' if ua.contains('Nintendo') || (ua.starts_with('Mozilla/') && ua.starts_with('Nitro') && ua.starts_with('Opera'))
+        return 'Panasonic' if ua.contains('Panasonic')
+        return 'Pantech' if ua.starts_with(['Pantech', 'PT-', 'PANTECH', 'PG-'])
+        return 'Philips' if ua.starts_with('philips', true)
+        return 'Portalmmm' if ua.starts_with('portalmmm')
+        return 'Qtek' if ua.starts_with('Qtek')
+        return 'Sagem' if ua.starts_with('sagem', true)
+        return 'Sharp' if ua.starts_with('sharp', true)
+        return 'Siemens' if ua.starts_with('SIE-')
+        return 'SPV' if ua.starts_with('SPV')
+        return 'Toshiba' if ua.starts_with('Toshiba')
+        return 'Vodafone' if ua.starts_with('Vodafone')
 
-        # remove locale identifiers
-        user_agent = user_agent.sub(/([ ;])[a-zA-Z]{2}-[a-zA-Z]{2}([ ;\)])/, '\1xx-xx\2')
+        # mobile browsers
+        return 'Android' if ua.contains('Android')
+        return 'OperaMini' if ua.contains(['Opera Mini', 'Opera Mobi'])
+        return 'WindowsCE' if ua.contains('Mozilla/') && ua.contains('Windows CE')
+      end
 
-        user_agent = normalize_blackberry(user_agent)
-        user_agent = normalize_android(user_agent)
+      # Process Robots (Web Crawlers and the like)
+      return 'Bot' if ua.is_robot?
 
-        return user_agent.strip
+      # Process NON-MOBILE user agents
+      unless ua.is_mobile_browser?
+        return 'MSIE' if ua.starts_with('Mozilla') && ua.contains('MSIE') && !ua.contains(['Opera', 'armv', 'MOTO', 'BREW'])
+        return 'Firefox' if ua.contains('Firefox') && !ua.contains(['Sony', 'Novarra', 'Opera'])
+        return 'Chrome' if ua.contains('Chrome') 
+        return 'Konqueror' if ua.contains('Konqueror')
+        return 'Opera' if ua.contains('Opera')
+        return 'Safari' if ua.starts_with('Mozilla') && ua.contains('Safari')
+        return 'AOL' if ua.contains(['AOL', 'America Online']) || ua.contains('aol 9', true)
       end
 
-      def first_slash(user_agent)
-        pos = user_agent.index('/')
-        return user_agent.length if pos.nil?
-        return pos
+      return 'CatchAll'
+    end
+
+  private
+    # user agent matchers
+    def last_attempts(user_agent)
+      device_id = case
+      # OpenWave
+      when user_agent.contains('UP.Browser/7.2')
+        'opwv_v72_generic'
+      when user_agent.contains('UP.Browser/7')
+        'opwv_v7_generic'
+      when user_agent.contains('UP.Browser/6.2')
+        'opwv_v62_generic'
+      when user_agent.contains('UP.Browser/6')
+        'opwv_v6_generic'
+      when user_agent.contains('UP.Browser/5')
+        'upgui_generic'
+      when user_agent.contains('UP.Browser/4')
+        'uptext_generic'
+      when user_agent.contains('UP.Browser/3')
+        'uptext_generic'
+      # Series 60
+      when user_agent.contains('Series60')
+        'nokia_generic_series60'
+      when user_agent.contains('Series80')
+        'nokia_generic_series80'
+      # Access/Net Front
+      when user_agent.contains(['NetFront/3.0', 'ACS-NF/3.0'])
+        'generic_netfront_ver3'
+      when user_agent.contains(['NetFront/3.1', 'ACS-NF/3.1'])
+        'generic_netfront_ver3_1'
+      when user_agent.contains(['NetFront/3.2', 'ACS-NF/3.2'])
+        'generic_netfront_ver3_2'
+      when user_agent.contains(['NetFront/3.3', 'ACS-NF/3.3'])
+        'generic_netfront_ver3_3'
+      when user_agent.contains('NetFront/3.4')
+        'generic_netfront_ver3_4'
+      when user_agent.contains('NetFront/3.5')
+        'generic_netfront_ver3_5'
+      # Contains Mozilla/, but not at the beginning of the UA
+      when user_agent.starts_with('Mozilla/') || @user_agent.contains('Mozilla/')
+        WurflDevice::Constants::GENERIC_XHTML
+      # Obigo
+      when user_agent.contains(['ObigoInternetBrowser/Q03C', 'AU-MIC/2', 'AU-MIC-', 'AU-OBIGO', 'Obigo/Q03', 'Obigo/Q04', 'ObigoInternetBrowser/2', 'Teleca Q03B1'])
+        WurflDevice::Constants::GENERIC_XHTML
+      # DoCoMo
+      when user_agent.starts_with('DoCoMo') || @user_agent.starts_with('KDDI')
+        'docomo_generic_jap_ver1'
+      # Generic Mozilla
+      when user_agent.contains(['Mozilla/4.0', 'Mozilla/5.0', 'Mozilla/6.0'])
+        WurflDevice::Constants::GENERIC_WEB_BROWSER
+      else
+        WurflDevice::Constants::GENERIC
       end
+      @device = WurflDevice.get_device_from_id(device_id)
+    end
+
+    # mobile user agents
+    def match_nokia(user_agent)
+      tolerance = user_agent.index_of_or_length(['/', ' '], user_agent.index('Nokia'))
+      @device = ris_match(user_agent, tolerance)
+    end
 
-      def second_slash(user_agent)
-        first = user_agent.index('/')
-        return user_agent.length if first.nil?
-        first = first + 1
-        second = user_agent.index('/', first)
-        return user_agent.length if second.nil?
-        return second
+    def matcher_samsung(user_agent)
+      if user_agent.starts_with('SAMSUNG') || user_agent.starts_with('SEC-') || user_agent.starts_with('SCH-')
+        tolerance = user_agent.first_slash
+      elsif user_agent.starts_with('Samsung') || user_agent.starts_with('SPH') || user_agent.starts_with('SGH')
+        tolerance = user_agent.first_space
+      else
+        tolerance = user_agent.second_slash
+      end
+      @device = ris_match(user_agent, tolerance)
+      if @device.nil?
+        if user_agent.starts_with('SAMSUNG')
+          tolerance = 8
+          @device = ld_match(user_agent, tolerance)
+        else
+          tolerance = user_agent.index_of_or_length('/', user_agent.index('Samsung'))
+          @device = ris_match(user_agent, tolerance)
+        end
+      end
+    end
+
+    def matcher_blackberry(user_agent)
+      if user_agent.starts_with('BlackBerry')
+        tolerance = user_agent.ordinal_index_of(';', 3)
+      else
+        tolerance = user_agent.first_slash
+      end
+      @device = ris_match(user_agent, tolerance)
+      if @device.nil?
+        if user_agent =~ /\#Black[Bb]erry[^\/\s]+\/(\d.\d)\#/
+          versions = {
+            '2.' => 'blackberry_generic_ver2',
+            '3.2' => 'blackberry_generic_ver3_sub2',
+            '3.3' => 'blackberry_generic_ver3_sub30',
+            '3.5' => 'blackberry_generic_ver3_sub50',
+            '3.6' => 'blackberry_generic_ver3_sub60',
+            '3.7' => 'blackberry_generic_ver3_sub70',
+            '4.1' => 'blackberry_generic_ver4_sub10',
+            '4.2' => 'blackberry_generic_ver4_sub20',
+            '4.3' => 'blackberry_generic_ver4_sub30',
+            '4.5' => 'blackberry_generic_ver4_sub50',
+            '4.6' => 'blackberry_generic_ver4_sub60',
+            '4.7' => 'blackberry_generic_ver4_sub70',
+            '4.' => 'blackberry_generic_ver4',
+            '5.' => 'blackberry_generic_ver5',
+            '6.' => 'blackberry_generic_ver6',
+          }.each_pair do |version, device_id|
+            if version.index($1)
+              @device = Device.new(device_id)
+              break
+            end
+          end
+        end
+      end
+    end
+
+    def matcher_sonyericsson(user_agent)
+      if user_agent.starts_with('SonyEricsson')
+        tolerance = user_agent.first_slash - 1
+        @device = ris_match(user_agent, tolerance)
+      else
+        tolerance = user_agent.second_slash
+        @device = ris_match(user_agent, tolerance)
+      end
+      if @device.nil?
+        tolerance = 14
+        @device = ris_match(user_agent, tolerance)
       end
+    end
 
-      def first_space(user_agent)
-        pos = user_agent.index(' ')
-        return user_agent.length if pos.nil?
-        return pos
+    def matcher_motorola(user_agent)
+      tolerance = 5
+      if user_agent.starts_with('Mot-') || user_agent.starts_with('MOT-') || user_agent.starts_with('Motorola')
+        @device = ris_match(user_agent, tolerance)
+      else
+        @device = ld_match(user_agent, tolerance)
+      end
+      if @device.nil?
+        @device = Device.new('mot_mib22_generic') if @user_agent.contains('MIB/2.2') || @user_agent.contains('MIB/BER2.2')
       end
+    end
 
-      def first_open_paren(user_agent)
-        pos = user_agent.index('(')
-        return user_agent.length if pos.nil?
-        return pos
+    def matcher_alcatel(user_agent)
+      tolerance = user_agent.first_slash
+      @device = ris_match(user_agent, tolerance)
+    end
+
+    def matcher_apple(user_agent)
+      if user_agent.starts_with('Apple')
+        tolerance = user_agent.ordinal_index_of(' ')
+        tolerance = user_agent.length if tolerance == -1
+      else
+        tolerance = user_agent.ordinal_index_of(';')
+      end
+      @device = ris_match(user_agent, tolerance)
+      if @device.nil?
+        device_id = case
+        when user_agent.contains('iPod')
+          'apple_ipod_touch_ver1'
+        when user_agent.contains('iPad')
+          'apple_ipad_ver1'
+        when user_agent.contains('iPhone')
+          'apple_iphone_ver1'
+        else
+          WurfDevice::Contants::GENERIC
+        end
+        @device = Device.new(device_id)
       end
+    end
+
+    def matcher_benq(user_agent)
+      tolerance = user_agent.first_slash
+      @device = ris_match(user_agent, tolerance)
+    end
 
-      def remove_nokia_msisdn(user_agent)
-        if user_agent =~ /^(.+)NOKIA-MSISDN\:\ (.+)$/i
-          user_agent = $1
+    def matcher_docomo(user_agent)
+      if user_agent.num_slashes >= 2
+        tolerance = user_agent.second_slash
+      else
+        tolerance = user_agent.first_open_paren
+      end
+      @device = ris_match(user_agent, tolerance)
+      if @device.nil?
+        version_index = 7
+        device_id = case
+        when user_agent[version_index] == '2'
+          'docomo_generic_jap_ver2'
+        else
+          'docomo_generic_jap_ver1'
         end
-        return user_agent
+        @device = Device.new(device_id)
       end
+    end
+
+    def matcher_grundig(user_agent)
+      tolerance = user_agent.first_slash
+      @device = ris_match(user_agent, tolerance)
+    end
 
-      def remove_up_link_from_ua(user_agent)
-        pos = user_agent.index('UP.Link')
-        return user_agent unless pos
-        return user_agent.slice(0..(pos-1))
+    def matcher_htc(user_agent)
+      tolerance = user_agent.first_slash
+      @device = ris_match(user_agent, tolerance)
+      if @device.nil?
+        tolerance = 6
+        @device = ris_match(user_agent, tolerance)
       end
+    end
 
-      def normalize_blackberry(user_agent)
-        pos = user_agent.index('BlackBerry')
-        return user_agent if pos.nil?
-        return user_agent.slice(pos, user_agent.length - pos)
+    def matcher_kddi(user_agent)
+      if user_agent.starts_with('KDDI/')
+        tolerance = user_agent.second_slash
+        @device = ris_match(user_agent, tolerance)
+      else
+        tolerance = user_agent.first_slash
+        @device = ris_match(user_agent, tolerance)
+      end
+      if @device.nil?
+        @device = Device.new('opwv_v62_generic')
       end
+    end
 
-      def normalize_android(user_agent)
-        return user_agent.sub(/(Android \d\.\d)([^; \/\)]+)/, '\1')
+    def matcher_kyocera(user_agent)
+      tolerance = user_agent.first_slash
+      @device = ris_match(user_agent, tolerance)
+    end
+
+    def matcher_lg(user_agent)
+      tolerance = user_agent.index_of_or_length('/', user_agent.index('LG'))
+      @device = ris_match(user_agent, tolerance)
+      if @device.nil?
+        tolerance = 7
+        @device = ris_match(user_agent, tolerance)
       end
+    end
 
-      def parse(user_agent)
-        # grab all Agent/version strings as 'agents'
-        agents = Array.new
-        user_agent.split(/\s+/).each do |string| 
-          if string =~ /\//
-            agents << string
-          end
+    def matcher_mitsubishi(user_agent)
+      tolerance = user_agent.first_slash
+      @device = ris_match(user_agent, tolerance)
+    end
+
+    def matcher_nec(user_agent)
+      tolerance = user_agent.first_slash
+      @device = ris_match(user_agent, tolerance)
+      if @device.nil?
+        tolerance = 2
+        @device = ris_match(user_agent, tolerance)
+      end
+    end
+
+    def matcher_nintendo(user_agent)
+      @device = ld_match(user_agent, tolerance)
+      if @device.nil?
+        device_id = case
+        when user_agent.contains('Nintendo Wii')
+          'nintendo_wii_browser'
+        when user_agent.contains('Nintendo DSi')
+          'nintendo_dsi_ver1'
+        when user_agent.starts_with('Mozilla/') && user_agent.contains('Nitro') && user_agent.contains('Opera')
+          'nintendo_ds_ver1'
+        else
+          'nintendo_wii_browser'
         end
-        return agents
+        @device = Device.new(device_id)
       end
     end
+
+    def matcher_panasonic(user_agent)
+      tolerance = user_agent.first_slash
+      @device = ris_match(user_agent, tolerance)
+    end
+
+    def matcher_pantech(user_agent)
+      if user_agent.starts_with('Pantech')
+        tolerance = 5
+        @device = ld_match(user_agent, tolerance)
+      else
+        tolerance = user_agent.first_slash
+        @device = ris_match(user_agent, tolerance)
+      end
+    end
+
+    def matcher_philips(user_agent)
+      tolerance = user_agent.first_slash
+      @device = ris_match(user_agent, tolerance)
+    end
+
+    def matcher_portalmmm(user_agent)
+      @device = Device.new(WurflDevice::Constants::GENERIC)
+    end
+
+    def matcher_qtek(user_agent)
+      tolerance = user_agent.first_slash
+      @device = ris_match(user_agent, tolerance)
+    end
+
+    def matcher_sagem(user_agent)
+      tolerance = user_agent.first_slash
+      @device = ris_match(user_agent, tolerance)
+    end
+
+    def matcher_sharp(user_agent)
+      tolerance = user_agent.first_slash
+      @device = ris_match(user_agent, tolerance)
+    end
+
+    def matcher_siemens(user_agent)
+      tolerance = user_agent.first_slash
+      @device = ris_match(user_agent, tolerance)
+    end
+
+    def matcher_spv(user_agent)
+      pos = user_agent.index(';')
+      tolerance = pos || user_agent.index('SPV')
+      @device = ris_match(user_agent, tolerance)
+    end
+
+    def matcher_toshiba(user_agent)
+      tolerance = user_agent.first_slash
+      @device = ris_match(user_agent, tolerance)
+    end
+
+    def matcher_vodafone(user_agent)
+      tolerance = user_agent.first_slash
+      @device = ris_match(user_agent, tolerance)
+      if @device.nil?
+        @device = ld_match(user_agent)
+      end
+    end
+
+    # mobile browsers
+    def matcher_android(user_agent)
+      device_id = 'generic_android'
+      if user_agent.contains('Froyo')
+        device_id = Device.new('generic_android_ver2_2')
+      elsif user_agent =~ /#Android[\s\/](\d).(\d)#/
+        version = "generic_android_ver#{$1}_#{$2}"
+        version = 'generic_android_ver2' if version == 'generic_android_ver2_0'
+        device_id = version if [
+          'generic_android',
+          'generic_android_ver1_5',
+          'generic_android_ver1_6',
+          'generic_android_ver2',
+          'generic_android_ver2_1',
+          'generic_android_ver2_2',
+        	].include?(version)
+      end
+      @device = Device.new(device_id)
+    end
+
+    def matcher_operamini(user_agent)
+      tolerance = user_agent.first_slash
+      @device = ris_match(user_agent, tolerance)
+      if @device.nil?
+        device_id = 'browser_opera_mini_release1';
+        if user_agent =~ /#Opera Mini\/([1-5])#/
+          device_id = "browser_opera_mini_release#{$1}"
+        elsif user_agent.contains('Opera Mobi')
+          device_id = 'browser_opera_mini_release4'
+        end
+        @device = Device.new(device_id)
+      end
+    end
+
+    def matcher_windowsce(user_agent)
+      tolerance = 3
+      @device = ld_match(user_agent, tolerance)
+      if @device.nil?
+        @device = Device.new('generic_ms_mobile_browser_ver1')
+      end
+    end
+
+    # robots
+    def matcher_bot(user_agent)
+      tolerance = user_agent.first_slash
+      @device = ris_match(user_agent, tolerance)
+      if @device.nil?
+        @device = Device.new(WurflDevice::Constants::GENERIC_WEB_BROWSER)
+      end
+    end
+
+    # desktop browsers
+    def matcher_msie(user_agent)
+      if user_agent =~ /^Mozilla\/4\.0 \(compatible; MSIE (\d)\.(\d);/
+        version = $1.to_i
+        version_sub = $2.to_i
+        device_id = case
+        when version == 7
+          'msie_7'
+        when version == 8
+          'msie_8'
+        when version == 6
+          'msie_6'
+        when version == 4
+          'msie_4'
+        when version == 5
+          version_sub == 5 ? 'msie_5_5' : 'msie_5'
+        else
+          'msie'
+        end
+        @device = Device.new(device_id)
+      end
+      user_agent.sub!(/( \.NET CLR [\d\.]+;?| Media Center PC [\d\.]+;?| OfficeLive[a-zA-Z0-9\.\d]+;?| InfoPath[\.\d]+;?)/, '')
+      tolerance = user_agent.first_slash
+      @device = ris_match(user_agent, tolerance)
+      if @device.nil?
+        if user_agent.contains(['SLCC1', 'Media Center PC', '.NET CLR', 'OfficeLiveConnector'])
+          @device = Device.new(WurfDevice::Constants::GENERIC_WEB_BROWSER)
+        else
+          @device = Device.new(WurfDevice::Constants::GENERIC)
+        end
+      end
+    end
+
+    def matcher_firefox(user_agent)
+      if user_agent =~ /Firefox\/(\d)\.(\d)/
+        version = $1.to_i
+        version_sub = $2.to_i
+        device_id = case
+        when version == 3
+          version_sub == 5 ? 'firefox_3_5' : 'firefox_3'
+        when version == 2
+          'firefox_2'
+        when version == 1
+          version_sub == 5 ? 'firefox_1_5' : 'firefox_1'
+        else
+          nil
+        end
+        @device = Device.new(device_id) unless device_id.nil?
+      else
+        tolerance = 5
+        @device = ld_match(user_agent, tolerance)
+      end
+    end
+
+    def matcher_chrome(user_agent)
+      tolerance = user_agent.index_of_or_length('/', user_agent.index('Chrome'))
+      @device = ris_match(user_agent, tolerance)
+      if @device.nil?
+        @device = Device.new('google_chrome')
+      end
+    end
+
+    def matcher_konqueror(user_agent)
+      tolerance = user_agent.first_slash
+      @device = ris_match(user_agent, tolerance)
+    end
+
+    def matcher_opera(user_agent)
+      device_id = case
+      when user_agent.contains('Opera/10')
+        'opera_10'
+      when user_agent.contains('Opera/9')
+        'opera_9'
+      when user_agent.contains('Opera/8')
+        'opera_8'
+      when user_agent.contains('Opera/7')
+        'opera_7'
+      else
+        nil
+      end
+      @device = Device.new(device_id) unless device_id.nil?
+      if @device.nil?
+        tolerance = 5
+        @device = ld_match(user_agent, tolerance)
+      end
+      @device = Device.new('opera') if @device.nil?
+    end
+
+    def matcher_safari(user_agent)
+      tolerance = user_agent.first_slash
+      @device = ris_match(user_agent, tolerance)
+      if @device.nil?
+        device_id = case
+        when user_agent.contains('Macintosh') || user_agent.contains('Windows')
+          WurflDevice::Constants::GENERIC_WEB_BROWSER
+        else
+          WurflDevice::Constants::GENERIC
+        end
+        @device = Device.new(device_id)
+      end
+    end
+
+    def matcher_aol(user_agent)
+      @device = Device.new(WurflDevice::Constants::GENERIC_WEB_BROWSER)
+    end
   end
 end

data/lib/wurfl_device/version.rb

@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*-
 
 module WurflDevice
-  VERSION = "0.0.10".freeze
+  VERSION = "0.1".freeze
 end

data/lib/wurfl_device.rb

@@ -10,6 +10,7 @@ module WurflDevice
   autoload :Handset,            'wurfl_device/handset'
   autoload :UI,                 'wurfl_device/ui'
   autoload :CLI,                'wurfl_device/cli'
+  autoload :UserAgent,          'wurfl_device/user_agent'
   autoload :UserAgentMatcher,   'wurfl_device/user_agent_matcher'
   autoload :XmlLoader,          'wurfl_device/xml_loader'
 
@@ -62,9 +63,11 @@ module WurflDevice
       return matcher.device
     end
 
-    def get_device_from_ua_cache(user_agent)
-      cached_device = db.hget(Constants::WURFL_USER_AGENTS_CACHED, user_agent)
-      return Marshal::load(cached_device) unless cached_device.nil?
+    def get_device_from_ua_cache(user_agent, bypass_main_cache=false)
+      unless bypass_main_cache
+        cached_device = db.hget(Constants::WURFL_USER_AGENTS_CACHED, user_agent)
+        return Marshal::load(cached_device) unless cached_device.nil?
+      end
       cached_device = db.hget(Constants::WURFL_USER_AGENTS, user_agent)
       return Marshal::load(cached_device) unless cached_device.nil?
       return nil
@@ -89,8 +92,8 @@ module WurflDevice
 
     def clear_devices
       db.keys("#{Constants::WURFL_DEVICES}*").each { |k| db.del k }
-      db.del(Contants::WURFL_INITIALIZED)
-      db.del(Contants::WURFL_INFO)
+      db.del(Constants::WURFL_INITIALIZED)
+      db.del(Constants::WURFL_INFO)
     end
 
     def get_user_agents
@@ -102,7 +105,7 @@ module WurflDevice
     end
 
     def get_user_agents_in_index(matcher)
-      db.hgetall("#{Constants::WURFL_DEVICES_INDEX}#{matcher}")
+      db.hkeys("#{Constants::WURFL_DEVICES_INDEX}#{matcher}")
     end
 
     def get_actual_device_raw(device_id)
@@ -119,9 +122,8 @@ module WurflDevice
 
     def rebuild_user_agent_cache
       # update the cache's
-      get_indexes.each { |k| db.del k }
       db.del(Constants::WURFL_USER_AGENTS)
-      db.del(Constants::WURFL_DEVICES_INDEX)
+      get_indexes.each { |k| db.del(k) }
 
       get_devices.each do |device_id|
         device_id.gsub!(Constants::WURFL_DEVICES, '')
@@ -131,7 +133,8 @@ module WurflDevice
         next if user_agent.nil? || user_agent.empty?
         db.hset(Constants::WURFL_USER_AGENTS, user_agent, Marshal::dump(Device.new(device_id)))
 
-        matcher = UserAgentMatcher.get_index(user_agent)
+        next if user_agent =~ /^DO_NOT_MATCH/i
+        matcher = UserAgentMatcher.new.get_index(user_agent)
         db.hset("#{Constants::WURFL_DEVICES_INDEX}#{matcher}", user_agent, device_id)
       end
 
@@ -155,35 +158,42 @@ module WurflDevice
         db.set(Constants::WURFL_INITIALIZED, false)
 
         # download & parse the wurfl xml
-        (devices, version, last_updated) = XmlLoader.load_xml_file(download_wurfl_xml_file) do |capabilities|
-          device_id = capabilities.delete('id')
-          next if device_id.nil? || device_id.empty?
-          db.del("#{Constants::WURFL_DEVICES}#{device_id}")
-          user_agent = capabilities.delete('user_agent')
-          fall_back = capabilities.delete('fall_back')
-
-          device_id.strip! unless device_id.nil?
-          user_agent.strip! unless user_agent.nil?
-          fall_back.strip! unless fall_back.nil?
-
-          db.hset("#{Constants::WURFL_DEVICES}#{device_id}", "id", device_id)
-          db.hset("#{Constants::WURFL_DEVICES}#{device_id}", "user_agent", user_agent)
-          db.hset("#{Constants::WURFL_DEVICES}#{device_id}", "fall_back", fall_back)
-
-          capabilities.each_pair do |key, value|
-            if value.is_a?(Hash)
-              value.each_pair do |k, v|
-                db.hset("#{Constants::WURFL_DEVICES}#{device_id}", "#{key.to_s}:#{k.to_s}", v)
+        xml_list = Array.new
+        xml_list << download_wurfl_xml_file
+        xml_list << download_wurfl_web_patch_xml_file
+
+        xml_list.each do |xml_file|
+          (devices, version, last_updated) = XmlLoader.load_xml_file(xml_file) do |capabilities|
+            device_id = capabilities.delete('id')
+            next if device_id.nil? || device_id.empty?
+            db.del("#{Constants::WURFL_DEVICES}#{device_id}")
+            user_agent = capabilities.delete('user_agent')
+            fall_back = capabilities.delete('fall_back')
+
+            device_id.strip! unless device_id.nil?
+            user_agent.strip! unless user_agent.nil?
+            fall_back.strip! unless fall_back.nil?
+
+            db.hset("#{Constants::WURFL_DEVICES}#{device_id}", "id", device_id)
+            db.hset("#{Constants::WURFL_DEVICES}#{device_id}", "user_agent", user_agent)
+            db.hset("#{Constants::WURFL_DEVICES}#{device_id}", "fall_back", fall_back)
+
+            capabilities.each_pair do |key, value|
+              if value.is_a?(Hash)
+                value.each_pair do |k, v|
+                  db.hset("#{Constants::WURFL_DEVICES}#{device_id}", "#{key.to_s}:#{k.to_s}", v)
+                end
+              else
+                db.hset("#{Constants::WURFL_DEVICES}#{device_id}", "#{key.to_s}", value)
               end
-            else
-              db.hset("#{Constants::WURFL_DEVICES}#{device_id}", "#{key.to_s}", value)
             end
           end
-        end
 
-        db.set(Constants::WURFL_INITIALIZED, true)
-        db.hset(Constants::WURFL_INFO, "version", version)
-        db.hset(Constants::WURFL_INFO, "last_updated", Time.now)
+          next if version.nil?
+          db.set(Constants::WURFL_INITIALIZED, true)
+          db.hset(Constants::WURFL_INFO, "version", version)
+          db.hset(Constants::WURFL_INFO, "last_updated", Time.now)
+        end
       end
     end
 
@@ -215,6 +225,17 @@ module WurflDevice
       wurfl_xml_file_extracted
     end
 
+    def download_wurfl_web_patch_xml_file
+      wurfl_web_patch_xml_source = 'http://sourceforge.net/projects/wurfl/files/WURFL/2.2/web_browsers_patch.xml'
+      `wget --timeout=60 -qN -- #{wurfl_web_patch_xml_source} > /dev/null`
+      raise "Failed to download wurfl-latest.xml.gz" unless $? == 0
+
+      wurfl_web_patch_xml = File.join(WurflDevice.tmp_dir, 'web_browsers_patch.xml')
+      raise "web_browsers_patch.xml does not exists!" unless File.exists?(wurfl_web_patch_xml)
+
+      wurfl_web_patch_xml
+    end
+
     def lock_the_cache_for_initializing
       start_at = Time.now
       success = false

data/spec/cache/device_spec.rb

@@ -13,9 +13,25 @@ describe WurflDevice do
     end
 
     it "check for user agent matcher" do
-      user_agent = 'Mozilla/5.0 (SymbianOS/9.2; U; Series60/3.1 Nokia6120c/6.01; Profile/MIDP-2.0 Configuration/CLDC-1.1 ) AppleWebKit/413 (KHTML, like Gecko) Safari/413'
-      device = WurflDevice.get_device_from_ua(user_agent)
-      device.id.should == 'nokia_6120c_ver1_sub601'
+      {
+        'nokia_x3_02_ver1' => 'NokiaX3-02/5.0 (05.60) Profile/MIDP-2.1 Configuration/CLDC-1.1',
+        'nokia_n90_ver1_sub2052414' => 'NokiaN90-1/3.0541.5.2 Series60/2.8 Profile/MIDP-2.0 Configuration/CLDC-1.1',
+
+        #'opwv_v6_generic' => 'SAMSUNG-B5712C/1.0 RTK-E/1.0 DF/1.0 Release/08.17.2007 Browser/Openwave6.2.3.3.c.1.101 Profile/MIDP-2.0 Configuration/CLDC-1.1/*MzU3ODEwMDIwNzc5ODgx UP.Browser/6.',
+        'samsung_a707_ver1_subshpvppr5' => 'SAMSUNG-SGH-A707/1.0 SHP/VPP/R5 NetFront/3.3 SMM-MMS/1.2.0 profile/MIDP-2.0 configuration/CLDC-1.1',
+        'samsung_u700_ver1_subua' => 'SAMSUNG-SGH-U700/1.0 SHP/VPP/R5 NetFront/3.4 SMM-MMS/1.2.0 profile/MIDP-2.0 configuration/CLDC-1.1',
+        #'generic' => 'SAMSUNG-SCH-M710/(null)ID4 (compatible; MSIE 6.0; Windows CE; PPC) Opera 9.5',
+
+        'sonyericsson_k700i_ver1subr2ay' => 'SonyEricssonK700i/R2AC SEMC-Browser/4.0.2 Profile/MIDP-2.0 Configuration/CLDC-1.1',
+        'sonyericsson_k550i_ver1_subr1jd' => 'SonyEricssonK550i/R1JD Browser/NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1',
+
+        'blackberry8520_ver1_subos5' => 'BlackBerry8520/5.0.0.592 Profile/MIDP-2.1 Configuration/CLDC-1.1 VendorID/603',
+
+        'te' => "'M', 'Y' 'P', 'H', 'O', 'N', 'E' Browser/WAP2.0 Profile/MIDP-2.0 Configuration/CLDC-1.1",
+      }.each_pair do |device_id, user_agent|
+        device = WurflDevice.get_device_from_ua(user_agent)
+        device.id.should == device_id
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wurfl_device
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: '0.1'
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-01 00:00:00.000000000 Z
+date: 2011-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &66803460 !ruby/object:Gem::Requirement
+  requirement: &255091900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *66803460
+  version_requirements: *255091900
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &66802960 !ruby/object:Gem::Requirement
+  requirement: &255091200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *66802960
+  version_requirements: *255091200
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &66802500 !ruby/object:Gem::Requirement
+  requirement: &255090680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *66802500
+  version_requirements: *255090680
 - !ruby/object:Gem::Dependency
   name: text
-  requirement: &66802060 !ruby/object:Gem::Requirement
+  requirement: &255090220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *66802060
+  version_requirements: *255090220
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &66801540 !ruby/object:Gem::Requirement
+  requirement: &255089020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 1.0.10
   type: :development
   prerelease: false
-  version_requirements: *66801540
+  version_requirements: *255089020
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &66801020 !ruby/object:Gem::Requirement
+  requirement: &255088420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *66801020
+  version_requirements: *255088420
 - !ruby/object:Gem::Dependency
   name: rspec-core
-  requirement: &66800540 !ruby/object:Gem::Requirement
+  requirement: &255087880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *66800540
+  version_requirements: *255087880
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
-  requirement: &66800060 !ruby/object:Gem::Requirement
+  requirement: &255087420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *66800060
+  version_requirements: *255087420
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &66799560 !ruby/object:Gem::Requirement
+  requirement: &255086940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *66799560
+  version_requirements: *255086940
 - !ruby/object:Gem::Dependency
   name: faker
-  requirement: &66799000 !ruby/object:Gem::Requirement
+  requirement: &255086420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +120,10 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *66799000
+  version_requirements: *255086420
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &66798340 !ruby/object:Gem::Requirement
+  requirement: &255085900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,7 +131,7 @@ dependencies:
         version: 0.5.3
   type: :development
   prerelease: false
-  version_requirements: *66798340
+  version_requirements: *255085900
 description: Ruby client library for mobile handset detection
 email:
 - ahutalla@gmail.com
@@ -154,6 +154,7 @@ files:
 - lib/wurfl_device/constants.rb
 - lib/wurfl_device/device.rb
 - lib/wurfl_device/ui.rb
+- lib/wurfl_device/user_agent.rb
 - lib/wurfl_device/user_agent_matcher.rb
 - lib/wurfl_device/version.rb
 - lib/wurfl_device/xml_loader.rb