wurfl_device 0.2.0 → 0.2.1
Sign up to get free protection for your applications and to get access to all the features.
- data/bin/wurfldevice_rpc_server +1 -1
- data/lib/wurfl_device/cache.rb +2 -2
- data/lib/wurfl_device/user_agent_matcher.rb +14 -14
- data/lib/wurfl_device/version.rb +1 -1
- metadata +30 -30
data/bin/wurfldevice_rpc_server
CHANGED
data/lib/wurfl_device/cache.rb
CHANGED
@@ -136,7 +136,7 @@ module WurflDevice
|
|
136
136
|
UserAgents.clear
|
137
137
|
UserAgentsManufacturers.clear
|
138
138
|
Devices.entries.each do |device_id|
|
139
|
-
device = MessagePack.unpack(Devices.get(device_id))
|
139
|
+
device = MessagePack.unpack(Devices.get(device_id).force_encoding('US-ASCII'))
|
140
140
|
user_agent = UserAgent.new device['user_agent']
|
141
141
|
UserAgents.set user_agent, device_id
|
142
142
|
unless user_agent =~ /^DO_NOT_MATCH/i
|
@@ -165,7 +165,7 @@ module WurflDevice
|
|
165
165
|
def build_capabilities(device_id)
|
166
166
|
capabilities = Capability.new
|
167
167
|
|
168
|
-
actual_capabilities = MessagePack.unpack(Devices.get(device_id)) rescue nil
|
168
|
+
actual_capabilities = MessagePack.unpack(Devices.get(device_id).force_encoding('US-ASCII')) rescue nil
|
169
169
|
|
170
170
|
return capabilities if actual_capabilities.nil?
|
171
171
|
|
@@ -8,42 +8,42 @@ module WurflDevice
|
|
8
8
|
def match(user_agent)
|
9
9
|
user_agent = UserAgent.new(user_agent) unless user_agent.kind_of?(UserAgent)
|
10
10
|
|
11
|
-
@user_agent = user_agent
|
11
|
+
@user_agent = user_agent.dup
|
12
12
|
|
13
13
|
# exact match
|
14
|
-
matched_data = Cache::UserAgentsMatched.get(user_agent)
|
14
|
+
matched_data = Cache::UserAgentsMatched.get(@user_agent)
|
15
15
|
unless matched_data.nil?
|
16
|
-
@capabilities = Capability.new(MessagePack.unpack(matched_data))
|
16
|
+
@capabilities = Capability.new(MessagePack.unpack(matched_data.force_encoding('US-ASCII')))
|
17
17
|
return self
|
18
18
|
end
|
19
19
|
|
20
20
|
matched_ua = nil
|
21
|
-
matcher = "matcher_#{user_agent.manufacturer.downcase}"
|
22
|
-
user_agent = user_agent.cleaned
|
21
|
+
matcher = "matcher_#{@user_agent.manufacturer.downcase}"
|
23
22
|
if self.respond_to?(matcher)
|
24
|
-
matched_ua = self.send(matcher, user_agent)
|
23
|
+
matched_ua = self.send(matcher, @user_agent)
|
25
24
|
else
|
26
|
-
if user_agent =~ /^Mozilla/i
|
25
|
+
if @user_agent =~ /^Mozilla/i
|
27
26
|
tolerance = 5
|
28
|
-
matched_ua = ld_match(user_agent, tolerance)
|
27
|
+
matched_ua = ld_match(@user_agent, tolerance)
|
29
28
|
else
|
30
|
-
tolerance = user_agent.first_slash
|
31
|
-
matched_ua = ris_match(user_agent, tolerance)
|
29
|
+
tolerance = @user_agent.first_slash
|
30
|
+
matched_ua = ris_match(@user_agent, tolerance)
|
32
31
|
end
|
33
32
|
end
|
34
33
|
|
35
34
|
unless matched_ua.nil?
|
36
35
|
device_id = Cache::UserAgents.get(matched_ua)
|
36
|
+
device_id = Settings::GENERIC_XHTML if device_id.nil? || device_id.empty?
|
37
37
|
@capabilities = Cache.build_capabilities(device_id)
|
38
38
|
end
|
39
39
|
|
40
|
-
if @capabilities.
|
41
|
-
|
42
|
-
device_id =
|
40
|
+
if @capabilities.empty?
|
41
|
+
device_id = Cache::UserAgents.get(last_attempts(@user_agent))
|
42
|
+
device_id = Settings::GENERIC_XHTML if device_id.nil? || device_id.empty?
|
43
43
|
@capabilities = Cache.build_capabilities(device_id)
|
44
44
|
end
|
45
45
|
|
46
|
-
Cache::UserAgentsMatched.set @user_agent, MessagePack.pack(@capabilities)
|
46
|
+
Cache::UserAgentsMatched.set @user_agent, MessagePack.pack(@capabilities) unless @capabilities.empty?
|
47
47
|
|
48
48
|
return self
|
49
49
|
end
|
data/lib/wurfl_device/version.rb
CHANGED
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: wurfl_device
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.2.
|
4
|
+
version: 0.2.1
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -9,11 +9,11 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2011-11-
|
12
|
+
date: 2011-11-23 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: msgpack-rpc
|
16
|
-
requirement: &
|
16
|
+
requirement: &141000300 !ruby/object:Gem::Requirement
|
17
17
|
none: false
|
18
18
|
requirements:
|
19
19
|
- - ! '>='
|
@@ -21,10 +21,10 @@ dependencies:
|
|
21
21
|
version: '0'
|
22
22
|
type: :runtime
|
23
23
|
prerelease: false
|
24
|
-
version_requirements: *
|
24
|
+
version_requirements: *141000300
|
25
25
|
- !ruby/object:Gem::Dependency
|
26
26
|
name: daemons
|
27
|
-
requirement: &
|
27
|
+
requirement: &140999080 !ruby/object:Gem::Requirement
|
28
28
|
none: false
|
29
29
|
requirements:
|
30
30
|
- - ! '>='
|
@@ -32,10 +32,10 @@ dependencies:
|
|
32
32
|
version: '0'
|
33
33
|
type: :runtime
|
34
34
|
prerelease: false
|
35
|
-
version_requirements: *
|
35
|
+
version_requirements: *140999080
|
36
36
|
- !ruby/object:Gem::Dependency
|
37
37
|
name: hiredis
|
38
|
-
requirement: &
|
38
|
+
requirement: &140998020 !ruby/object:Gem::Requirement
|
39
39
|
none: false
|
40
40
|
requirements:
|
41
41
|
- - ! '>='
|
@@ -43,10 +43,10 @@ dependencies:
|
|
43
43
|
version: '0'
|
44
44
|
type: :runtime
|
45
45
|
prerelease: false
|
46
|
-
version_requirements: *
|
46
|
+
version_requirements: *140998020
|
47
47
|
- !ruby/object:Gem::Dependency
|
48
48
|
name: redis
|
49
|
-
requirement: &
|
49
|
+
requirement: &140997140 !ruby/object:Gem::Requirement
|
50
50
|
none: false
|
51
51
|
requirements:
|
52
52
|
- - ! '>='
|
@@ -54,10 +54,10 @@ dependencies:
|
|
54
54
|
version: '0'
|
55
55
|
type: :runtime
|
56
56
|
prerelease: false
|
57
|
-
version_requirements: *
|
57
|
+
version_requirements: *140997140
|
58
58
|
- !ruby/object:Gem::Dependency
|
59
59
|
name: thor
|
60
|
-
requirement: &
|
60
|
+
requirement: &140996580 !ruby/object:Gem::Requirement
|
61
61
|
none: false
|
62
62
|
requirements:
|
63
63
|
- - ! '>='
|
@@ -65,10 +65,10 @@ dependencies:
|
|
65
65
|
version: '0'
|
66
66
|
type: :runtime
|
67
67
|
prerelease: false
|
68
|
-
version_requirements: *
|
68
|
+
version_requirements: *140996580
|
69
69
|
- !ruby/object:Gem::Dependency
|
70
70
|
name: ox
|
71
|
-
requirement: &
|
71
|
+
requirement: &140995720 !ruby/object:Gem::Requirement
|
72
72
|
none: false
|
73
73
|
requirements:
|
74
74
|
- - ! '>='
|
@@ -76,10 +76,10 @@ dependencies:
|
|
76
76
|
version: '0'
|
77
77
|
type: :runtime
|
78
78
|
prerelease: false
|
79
|
-
version_requirements: *
|
79
|
+
version_requirements: *140995720
|
80
80
|
- !ruby/object:Gem::Dependency
|
81
81
|
name: text
|
82
|
-
requirement: &
|
82
|
+
requirement: &140994860 !ruby/object:Gem::Requirement
|
83
83
|
none: false
|
84
84
|
requirements:
|
85
85
|
- - ! '>='
|
@@ -87,10 +87,10 @@ dependencies:
|
|
87
87
|
version: '0'
|
88
88
|
type: :runtime
|
89
89
|
prerelease: false
|
90
|
-
version_requirements: *
|
90
|
+
version_requirements: *140994860
|
91
91
|
- !ruby/object:Gem::Dependency
|
92
92
|
name: bundler
|
93
|
-
requirement: &
|
93
|
+
requirement: &140994200 !ruby/object:Gem::Requirement
|
94
94
|
none: false
|
95
95
|
requirements:
|
96
96
|
- - ! '>='
|
@@ -98,10 +98,10 @@ dependencies:
|
|
98
98
|
version: 1.0.10
|
99
99
|
type: :development
|
100
100
|
prerelease: false
|
101
|
-
version_requirements: *
|
101
|
+
version_requirements: *140994200
|
102
102
|
- !ruby/object:Gem::Dependency
|
103
103
|
name: rake
|
104
|
-
requirement: &
|
104
|
+
requirement: &140993400 !ruby/object:Gem::Requirement
|
105
105
|
none: false
|
106
106
|
requirements:
|
107
107
|
- - ! '>='
|
@@ -109,10 +109,10 @@ dependencies:
|
|
109
109
|
version: 0.9.2
|
110
110
|
type: :development
|
111
111
|
prerelease: false
|
112
|
-
version_requirements: *
|
112
|
+
version_requirements: *140993400
|
113
113
|
- !ruby/object:Gem::Dependency
|
114
114
|
name: rspec-core
|
115
|
-
requirement: &
|
115
|
+
requirement: &140992640 !ruby/object:Gem::Requirement
|
116
116
|
none: false
|
117
117
|
requirements:
|
118
118
|
- - ~>
|
@@ -120,10 +120,10 @@ dependencies:
|
|
120
120
|
version: '2.0'
|
121
121
|
type: :development
|
122
122
|
prerelease: false
|
123
|
-
version_requirements: *
|
123
|
+
version_requirements: *140992640
|
124
124
|
- !ruby/object:Gem::Dependency
|
125
125
|
name: rspec-expectations
|
126
|
-
requirement: &
|
126
|
+
requirement: &140991760 !ruby/object:Gem::Requirement
|
127
127
|
none: false
|
128
128
|
requirements:
|
129
129
|
- - ~>
|
@@ -131,10 +131,10 @@ dependencies:
|
|
131
131
|
version: '2.0'
|
132
132
|
type: :development
|
133
133
|
prerelease: false
|
134
|
-
version_requirements: *
|
134
|
+
version_requirements: *140991760
|
135
135
|
- !ruby/object:Gem::Dependency
|
136
136
|
name: rr
|
137
|
-
requirement: &
|
137
|
+
requirement: &140991040 !ruby/object:Gem::Requirement
|
138
138
|
none: false
|
139
139
|
requirements:
|
140
140
|
- - ~>
|
@@ -142,10 +142,10 @@ dependencies:
|
|
142
142
|
version: '1.0'
|
143
143
|
type: :development
|
144
144
|
prerelease: false
|
145
|
-
version_requirements: *
|
145
|
+
version_requirements: *140991040
|
146
146
|
- !ruby/object:Gem::Dependency
|
147
147
|
name: simplecov
|
148
|
-
requirement: &
|
148
|
+
requirement: &140990240 !ruby/object:Gem::Requirement
|
149
149
|
none: false
|
150
150
|
requirements:
|
151
151
|
- - ~>
|
@@ -153,10 +153,10 @@ dependencies:
|
|
153
153
|
version: 0.5.3
|
154
154
|
type: :development
|
155
155
|
prerelease: false
|
156
|
-
version_requirements: *
|
156
|
+
version_requirements: *140990240
|
157
157
|
- !ruby/object:Gem::Dependency
|
158
158
|
name: fakeredis
|
159
|
-
requirement: &
|
159
|
+
requirement: &140989300 !ruby/object:Gem::Requirement
|
160
160
|
none: false
|
161
161
|
requirements:
|
162
162
|
- - ~>
|
@@ -164,7 +164,7 @@ dependencies:
|
|
164
164
|
version: 0.2.2
|
165
165
|
type: :development
|
166
166
|
prerelease: false
|
167
|
-
version_requirements: *
|
167
|
+
version_requirements: *140989300
|
168
168
|
description: Ruby client library for mobile handset detection
|
169
169
|
email:
|
170
170
|
- ahutalla@gmail.com
|