wurfl_device 0.2.1 → 0.2.2

data/lib/wurfl_device/user_agent_matcher.rb

@@ -14,7 +14,9 @@ module WurflDevice
       matched_data = Cache::UserAgentsMatched.get(@user_agent)
       unless matched_data.nil?
         @capabilities = Capability.new(MessagePack.unpack(matched_data.force_encoding('US-ASCII')))
-        return self
+        if !(@capabilities.nil? || @capabilities.empty?)
+          return self
+        end
       end
 
       matched_ua = nil
@@ -37,13 +39,15 @@ module WurflDevice
         @capabilities = Cache.build_capabilities(device_id)
       end
 
-      if @capabilities.empty?
+      if @capabilities.nil? || @capabilities.empty?
         device_id = Cache::UserAgents.get(last_attempts(@user_agent))
         device_id = Settings::GENERIC_XHTML if device_id.nil? || device_id.empty?
         @capabilities = Cache.build_capabilities(device_id)
       end
 
-      Cache::UserAgentsMatched.set @user_agent, MessagePack.pack(@capabilities) unless @capabilities.empty?
+      if !(@capabilities.nil? || @capabilities.empty?)
+        Cache::UserAgentsMatched.set @user_agent, MessagePack.pack(@capabilities)
+      end
 
       return self
     end
@@ -74,7 +78,7 @@ module WurflDevice
       current = 0
       match = nil
       user_agent_list.each do |ua|
-        next if !ua.length.between?(length - tolerance, length + tolerance)
+        next unless ua.length.between?(length - tolerance, length + tolerance)
         current = Text::Levenshtein.distance(ua, user_agent)
         if current <= best
           best = current
@@ -181,7 +185,8 @@ module WurflDevice
       matched_ua = ris_match(user_agent, tolerance)
       if matched_ua.nil?
         if user_agent =~ /Black[Bb]erry[^\/\s]+\/(\d\.\d)/
-          versions = {
+          vercode = $1
+          {
             '2.'  => 'DO_NOT_MATCH_BLACKBERRY_2',
             '3.2' => 'DO_NOT_MATCH_BLACKBERRY_3_2',
             '3.3' => 'DO_NOT_MATCH_BLACKBERRY_3_3',
@@ -198,7 +203,7 @@ module WurflDevice
             '5.'  => 'DO_NOT_MATCH_BLACKBERRY_5',
             '6.'  => 'DO_NOT_MATCH_BLACKBERRY_6',
           }.each_pair do |vercode, device_ua|
-            if $1.index(vercode)
+            if vercode.index(vercode)
               return device_ua
             end
           end

data/lib/wurfl_device/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wurfl_device
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-23 00:00:00.000000000 Z
+date: 2011-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack-rpc
-  requirement: &141000300 !ruby/object:Gem::Requirement
+  requirement: &93848340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *141000300
+  version_requirements: *93848340
 - !ruby/object:Gem::Dependency
   name: daemons
-  requirement: &140999080 !ruby/object:Gem::Requirement
+  requirement: &93847120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *140999080
+  version_requirements: *93847120
 - !ruby/object:Gem::Dependency
   name: hiredis
-  requirement: &140998020 !ruby/object:Gem::Requirement
+  requirement: &93846020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *140998020
+  version_requirements: *93846020
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &140997140 !ruby/object:Gem::Requirement
+  requirement: &93845100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *140997140
+  version_requirements: *93845100
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &140996580 !ruby/object:Gem::Requirement
+  requirement: &93844040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *140996580
+  version_requirements: *93844040
 - !ruby/object:Gem::Dependency
   name: ox
-  requirement: &140995720 !ruby/object:Gem::Requirement
+  requirement: &93804040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *140995720
+  version_requirements: *93804040
 - !ruby/object:Gem::Dependency
   name: text
-  requirement: &140994860 !ruby/object:Gem::Requirement
+  requirement: &93803060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *140994860
+  version_requirements: *93803060
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &140994200 !ruby/object:Gem::Requirement
+  requirement: &93801800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: 1.0.10
   type: :development
   prerelease: false
-  version_requirements: *140994200
+  version_requirements: *93801800
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &140993400 !ruby/object:Gem::Requirement
+  requirement: &93800020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *140993400
+  version_requirements: *93800020
 - !ruby/object:Gem::Dependency
   name: rspec-core
-  requirement: &140992640 !ruby/object:Gem::Requirement
+  requirement: &93797540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +120,10 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *140992640
+  version_requirements: *93797540
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
-  requirement: &140991760 !ruby/object:Gem::Requirement
+  requirement: &93796500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,10 +131,10 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *140991760
+  version_requirements: *93796500
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &140991040 !ruby/object:Gem::Requirement
+  requirement: &94189100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -142,10 +142,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *140991040
+  version_requirements: *94189100
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &140990240 !ruby/object:Gem::Requirement
+  requirement: &94186000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -153,10 +153,10 @@ dependencies:
         version: 0.5.3
   type: :development
   prerelease: false
-  version_requirements: *140990240
+  version_requirements: *94186000
 - !ruby/object:Gem::Dependency
   name: fakeredis
-  requirement: &140989300 !ruby/object:Gem::Requirement
+  requirement: &94273340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -164,7 +164,7 @@ dependencies:
         version: 0.2.2
   type: :development
   prerelease: false
-  version_requirements: *140989300
+  version_requirements: *94273340
 description: Ruby client library for mobile handset detection
 email:
 - ahutalla@gmail.com