wurfl_device 0.1.1 → 0.1.2

data/lib/wurfl_device/constants.rb

@@ -18,6 +18,8 @@ module WurflDevice
     WURFL_USER_AGENTS             = "wurfl:user_agents"
     WURFL_USER_AGENTS_CACHED      = "wurfl:user_agents_cached"
 
+    WORST_MATCH                   = 7
+
     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',
@@ -26,5 +28,6 @@ module WurflDevice
 
     ROBOTS            = [ 'bot', 'crawler', 'spider', 'novarra', 'transcoder', 'yahoo! searchmonkey', 'yahoo! slurp', 'feedfetcher-google', 'toolbar', 'mowser' ]
     DESKTOP_BROWSERS  = [ 'slcc1', '.net clr', 'wow64', 'media center pc', 'funwebproducts', 'macintosh', 'aol 9.', 'america online browser', 'googletoolbar' ]
+
   end
 end

data/lib/wurfl_device/user_agent_matcher.rb

@@ -15,26 +15,25 @@ module WurflDevice
       return self if !@device.nil? && @device.is_valid?
 
       # ris match
-      user_agent = @user_agent.cleaned
       if @device.nil?
-        index_matcher = get_index(user_agent)
+        index_matcher = get_index(@user_agent)
         matcher = "matcher_#{index_matcher.downcase}"
         if self.respond_to?(matcher)
-          self.send(matcher, user_agent) 
+          self.send(matcher, @user_agent) 
         else
-          if user_agent =~ /^Mozilla/i
+          if @user_agent =~ /^Mozilla/i
             tolerance = 5
-            @device = ld_match(user_agent, tolerance)
+            @device = ld_match(@user_agent, tolerance)
           else
-            tolerance = user_agent.first_slash
-            @device = ris_match(user_agent, tolerance)
+            tolerance = @user_agent.first_slash
+            @device = ris_match(@user_agent, tolerance)
           end
         end
       end
 
       # last attempts
       if @device.nil?
-        last_attempts(user_agent)
+        last_attempts(@user_agent)
       end
 
       WurflDevice.save_device_in_ua_cache(@user_agent, @device)
@@ -42,7 +41,8 @@ module WurflDevice
       return self
     end
 
-    def ris_match(user_agent, tolerance)
+    def ris_match(user_agent, tolerance=nil)
+      tolerance = WurflDevice::Constants::WORST_MATCH if tolerance.nil?
       device = nil
       user_agent_list = WurflDevice.get_user_agents_in_index(get_index(user_agent))
       curlen = user_agent.length
@@ -62,7 +62,7 @@ module WurflDevice
     end
 
     def ld_match(user_agent, tolerance=nil)
-      tolerance = 7 if tolerance.nil?
+      tolerance = WurflDevice::Constants::WORST_MATCH if tolerance.nil?
       device = nil
       user_agent_list = WurflDevice.get_user_agents_in_index(get_index(user_agent))
 
@@ -140,7 +140,7 @@ module WurflDevice
       return 'CatchAll'
     end
 
-  private
+  protected
     # user agent matchers
     def last_attempts(user_agent)
       device_id = case
@@ -196,12 +196,13 @@ module WurflDevice
     end
 
     # mobile user agents
-    def match_nokia(user_agent)
+    def matcher_nokia(user_agent)
       tolerance = user_agent.index_of_or_length(['/', ' '], user_agent.index('Nokia'))
       @device = ris_match(user_agent, tolerance)
     end
 
     def matcher_samsung(user_agent)
+      tolerance = 0
       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')
@@ -222,6 +223,7 @@ module WurflDevice
     end
 
     def matcher_blackberry(user_agent)
+      tolerance = 0
       if user_agent.starts_with('BlackBerry')
         tolerance = user_agent.ordinal_index_of(';', 3)
       else
@@ -257,13 +259,13 @@ module WurflDevice
     end
 
     def matcher_sonyericsson(user_agent)
+      tolerance = 0
       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
+      @device = ris_match(user_agent, tolerance)
       if @device.nil?
         tolerance = 14
         @device = ris_match(user_agent, tolerance)
@@ -288,11 +290,12 @@ module WurflDevice
     end
 
     def matcher_apple(user_agent)
+      tolerance = 0
       if user_agent.starts_with('Apple')
-        tolerance = user_agent.ordinal_index_of(' ')
+        tolerance = user_agent.ordinal_index_of(' ', 3)
         tolerance = user_agent.length if tolerance == -1
       else
-        tolerance = user_agent.ordinal_index_of(';')
+        tolerance = user_agent.ordinal_index_of(';', 0)
       end
       @device = ris_match(user_agent, tolerance)
       if @device.nil?
@@ -316,6 +319,7 @@ module WurflDevice
     end
 
     def matcher_docomo(user_agent)
+      tolerance = 0
       if user_agent.num_slashes >= 2
         tolerance = user_agent.second_slash
       else
@@ -349,13 +353,13 @@ module WurflDevice
     end
 
     def matcher_kddi(user_agent)
+      tolerance = 0
       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
+      @device = ris_match(user_agent, tolerance)
       if @device.nil?
         @device = Device.new('opwv_v62_generic')
       end
@@ -412,13 +416,12 @@ module WurflDevice
     end
 
     def matcher_pantech(user_agent)
-      if user_agent.starts_with('Pantech')
-        tolerance = 5
-        @device = ld_match(user_agent, tolerance)
-      else
+      tolerance = 5
+      if !user_agent.starts_with('Pantech')
         tolerance = user_agent.first_slash
         @device = ris_match(user_agent, tolerance)
       end
+      @device = ris_match(user_agent, tolerance)
     end
 
     def matcher_philips(user_agent)
@@ -540,10 +543,11 @@ module WurflDevice
           'msie'
         end
         @device = Device.new(device_id)
+      else
+        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)
       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)

data/lib/wurfl_device/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wurfl_device
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &227601480 !ruby/object:Gem::Requirement
+  requirement: &254521320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *227601480
+  version_requirements: *254521320
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &227600920 !ruby/object:Gem::Requirement
+  requirement: &254520740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *227600920
+  version_requirements: *254520740
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &227600120 !ruby/object:Gem::Requirement
+  requirement: &254519960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *227600120
+  version_requirements: *254519960
 - !ruby/object:Gem::Dependency
   name: text
-  requirement: &227599260 !ruby/object:Gem::Requirement
+  requirement: &254519080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *227599260
+  version_requirements: *254519080
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &227598520 !ruby/object:Gem::Requirement
+  requirement: &254518340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 1.0.10
   type: :development
   prerelease: false
-  version_requirements: *227598520
+  version_requirements: *254518340
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &227598000 !ruby/object:Gem::Requirement
+  requirement: &254517820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *227598000
+  version_requirements: *254517820
 - !ruby/object:Gem::Dependency
   name: rspec-core
-  requirement: &227597340 !ruby/object:Gem::Requirement
+  requirement: &254517120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *227597340
+  version_requirements: *254517120
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
-  requirement: &227596080 !ruby/object:Gem::Requirement
+  requirement: &254516080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *227596080
+  version_requirements: *254516080
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &227595120 !ruby/object:Gem::Requirement
+  requirement: &254515280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *227595120
+  version_requirements: *254515280
 - !ruby/object:Gem::Dependency
   name: faker
-  requirement: &227573320 !ruby/object:Gem::Requirement
+  requirement: &254493140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +120,10 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *227573320
+  version_requirements: *254493140
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &227572860 !ruby/object:Gem::Requirement
+  requirement: &254492660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,7 +131,7 @@ dependencies:
         version: 0.5.3
   type: :development
   prerelease: false
-  version_requirements: *227572860
+  version_requirements: *254492660
 description: Ruby client library for mobile handset detection
 email:
 - ahutalla@gmail.com