wurfl_device 0.2.0 → 0.2.1

data/bin/wurfldevice_rpc_server

@@ -40,8 +40,8 @@ args.parse
 daemon_options = {
   :backtrace => true,
   :log_output => true,
+  :monitor => true,
   :multiple => false,
-  :monitor => false,
 }
 
 class Daemons::Controller

data/lib/wurfl_device/cache.rb

@@ -136,7 +136,7 @@ module WurflDevice
         UserAgents.clear
         UserAgentsManufacturers.clear
         Devices.entries.each do |device_id|
-          device = MessagePack.unpack(Devices.get(device_id))
+          device = MessagePack.unpack(Devices.get(device_id).force_encoding('US-ASCII'))
           user_agent = UserAgent.new device['user_agent']
           UserAgents.set user_agent, device_id
           unless user_agent =~ /^DO_NOT_MATCH/i
@@ -165,7 +165,7 @@ module WurflDevice
       def build_capabilities(device_id)
         capabilities = Capability.new
 
-        actual_capabilities = MessagePack.unpack(Devices.get(device_id)) rescue nil
+        actual_capabilities = MessagePack.unpack(Devices.get(device_id).force_encoding('US-ASCII')) rescue nil
 
         return capabilities if actual_capabilities.nil?
 

data/lib/wurfl_device/user_agent_matcher.rb

@@ -8,42 +8,42 @@ module WurflDevice
     def match(user_agent)
       user_agent = UserAgent.new(user_agent) unless user_agent.kind_of?(UserAgent)
 
-      @user_agent = user_agent
+      @user_agent = user_agent.dup
 
       # exact match
-      matched_data = Cache::UserAgentsMatched.get(user_agent)
+      matched_data = Cache::UserAgentsMatched.get(@user_agent)
       unless matched_data.nil?
-        @capabilities = Capability.new(MessagePack.unpack(matched_data))
+        @capabilities = Capability.new(MessagePack.unpack(matched_data.force_encoding('US-ASCII')))
         return self
       end
 
       matched_ua = nil
-      matcher = "matcher_#{user_agent.manufacturer.downcase}"
-      user_agent = user_agent.cleaned
+      matcher = "matcher_#{@user_agent.manufacturer.downcase}"
       if self.respond_to?(matcher)
-        matched_ua = self.send(matcher, user_agent)
+        matched_ua = self.send(matcher, @user_agent)
       else
-        if user_agent =~ /^Mozilla/i
+        if @user_agent =~ /^Mozilla/i
           tolerance = 5
-          matched_ua = ld_match(user_agent, tolerance)
+          matched_ua = ld_match(@user_agent, tolerance)
         else
-          tolerance = user_agent.first_slash
-          matched_ua = ris_match(user_agent, tolerance)
+          tolerance = @user_agent.first_slash
+          matched_ua = ris_match(@user_agent, tolerance)
         end
       end
 
       unless matched_ua.nil?
         device_id = Cache::UserAgents.get(matched_ua)
+        device_id = Settings::GENERIC_XHTML if device_id.nil? || device_id.empty?
         @capabilities = Cache.build_capabilities(device_id)
       end
 
-      if @capabilities.nil?
-        user_agent = user_agent.cleaned
-        device_id = Cache::UserAgents.get(last_attempts(user_agent))
+      if @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)
+      Cache::UserAgentsMatched.set @user_agent, MessagePack.pack(@capabilities) unless @capabilities.empty?
 
       return self
     end

data/lib/wurfl_device/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wurfl_device
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-21 00:00:00.000000000 Z
+date: 2011-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack-rpc
-  requirement: &227074280 !ruby/object:Gem::Requirement
+  requirement: &141000300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *227074280
+  version_requirements: *141000300
 - !ruby/object:Gem::Dependency
   name: daemons
-  requirement: &227073240 !ruby/object:Gem::Requirement
+  requirement: &140999080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *227073240
+  version_requirements: *140999080
 - !ruby/object:Gem::Dependency
   name: hiredis
-  requirement: &227072160 !ruby/object:Gem::Requirement
+  requirement: &140998020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *227072160
+  version_requirements: *140998020
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &227071320 !ruby/object:Gem::Requirement
+  requirement: &140997140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *227071320
+  version_requirements: *140997140
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &227070660 !ruby/object:Gem::Requirement
+  requirement: &140996580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *227070660
+  version_requirements: *140996580
 - !ruby/object:Gem::Dependency
   name: ox
-  requirement: &227070000 !ruby/object:Gem::Requirement
+  requirement: &140995720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *227070000
+  version_requirements: *140995720
 - !ruby/object:Gem::Dependency
   name: text
-  requirement: &227069080 !ruby/object:Gem::Requirement
+  requirement: &140994860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *227069080
+  version_requirements: *140994860
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &227058420 !ruby/object:Gem::Requirement
+  requirement: &140994200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: 1.0.10
   type: :development
   prerelease: false
-  version_requirements: *227058420
+  version_requirements: *140994200
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &227057900 !ruby/object:Gem::Requirement
+  requirement: &140993400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *227057900
+  version_requirements: *140993400
 - !ruby/object:Gem::Dependency
   name: rspec-core
-  requirement: &227057420 !ruby/object:Gem::Requirement
+  requirement: &140992640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +120,10 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *227057420
+  version_requirements: *140992640
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
-  requirement: &227056840 !ruby/object:Gem::Requirement
+  requirement: &140991760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,10 +131,10 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *227056840
+  version_requirements: *140991760
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &227056380 !ruby/object:Gem::Requirement
+  requirement: &140991040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -142,10 +142,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *227056380
+  version_requirements: *140991040
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &227055880 !ruby/object:Gem::Requirement
+  requirement: &140990240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -153,10 +153,10 @@ dependencies:
         version: 0.5.3
   type: :development
   prerelease: false
-  version_requirements: *227055880
+  version_requirements: *140990240
 - !ruby/object:Gem::Dependency
   name: fakeredis
-  requirement: &227055380 !ruby/object:Gem::Requirement
+  requirement: &140989300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -164,7 +164,7 @@ dependencies:
         version: 0.2.2
   type: :development
   prerelease: false
-  version_requirements: *227055380
+  version_requirements: *140989300
 description: Ruby client library for mobile handset detection
 email:
 - ahutalla@gmail.com