wurfl_device 0.2.1 → 0.2.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. data/lib/wurfl_device/user_agent_matcher.rb +11 -6
  2. data/lib/wurfl_device/version.rb +1 -1
  3. metadata +30 -30
data/lib/wurfl_device/user_agent_matcher.rb CHANGED
@@ -14,7 +14,9 @@ module WurflDevice
14
14
  matched_data = Cache::UserAgentsMatched.get(@user_agent)
15
15
  unless matched_data.nil?
16
16
  @capabilities = Capability.new(MessagePack.unpack(matched_data.force_encoding('US-ASCII')))
17
- return self
17
+ if !(@capabilities.nil? || @capabilities.empty?)
18
+ return self
19
+ end
18
20
  end
19
21
 
20
22
  matched_ua = nil
@@ -37,13 +39,15 @@ module WurflDevice
37
39
  @capabilities = Cache.build_capabilities(device_id)
38
40
  end
39
41
 
40
- if @capabilities.empty?
42
+ if @capabilities.nil? || @capabilities.empty?
41
43
  device_id = Cache::UserAgents.get(last_attempts(@user_agent))
42
44
  device_id = Settings::GENERIC_XHTML if device_id.nil? || device_id.empty?
43
45
  @capabilities = Cache.build_capabilities(device_id)
44
46
  end
45
47
 
46
- Cache::UserAgentsMatched.set @user_agent, MessagePack.pack(@capabilities) unless @capabilities.empty?
48
+ if !(@capabilities.nil? || @capabilities.empty?)
49
+ Cache::UserAgentsMatched.set @user_agent, MessagePack.pack(@capabilities)
50
+ end
47
51
 
48
52
  return self
49
53
  end
@@ -74,7 +78,7 @@ module WurflDevice
74
78
  current = 0
75
79
  match = nil
76
80
  user_agent_list.each do |ua|
77
- next if !ua.length.between?(length - tolerance, length + tolerance)
81
+ next unless ua.length.between?(length - tolerance, length + tolerance)
78
82
  current = Text::Levenshtein.distance(ua, user_agent)
79
83
  if current <= best
80
84
  best = current
@@ -181,7 +185,8 @@ module WurflDevice
181
185
  matched_ua = ris_match(user_agent, tolerance)
182
186
  if matched_ua.nil?
183
187
  if user_agent =~ /Black[Bb]erry[^\/\s]+\/(\d\.\d)/
184
- versions = {
188
+ vercode = $1
189
+ {
185
190
  '2.' => 'DO_NOT_MATCH_BLACKBERRY_2',
186
191
  '3.2' => 'DO_NOT_MATCH_BLACKBERRY_3_2',
187
192
  '3.3' => 'DO_NOT_MATCH_BLACKBERRY_3_3',
@@ -198,7 +203,7 @@ module WurflDevice
198
203
  '5.' => 'DO_NOT_MATCH_BLACKBERRY_5',
199
204
  '6.' => 'DO_NOT_MATCH_BLACKBERRY_6',
200
205
  }.each_pair do |vercode, device_ua|
201
- if $1.index(vercode)
206
+ if vercode.index(vercode)
202
207
  return device_ua
203
208
  end
204
209
  end
data/lib/wurfl_device/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # -*- encoding: utf-8 -*-
2
2
 
3
3
  module WurflDevice
4
- VERSION = "0.2.1".freeze
4
+ VERSION = "0.2.2".freeze
5
5
  end
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.1
4
+ version: 0.2.2
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-23 00:00:00.000000000 Z
12
+ date: 2011-12-06 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: msgpack-rpc
16
- requirement: &141000300 !ruby/object:Gem::Requirement
16
+ requirement: &93848340 !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: *141000300
24
+ version_requirements: *93848340
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: daemons
27
- requirement: &140999080 !ruby/object:Gem::Requirement
27
+ requirement: &93847120 !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: *140999080
35
+ version_requirements: *93847120
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: hiredis
38
- requirement: &140998020 !ruby/object:Gem::Requirement
38
+ requirement: &93846020 !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: *140998020
46
+ version_requirements: *93846020
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: redis
49
- requirement: &140997140 !ruby/object:Gem::Requirement
49
+ requirement: &93845100 !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: *140997140
57
+ version_requirements: *93845100
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: thor
60
- requirement: &140996580 !ruby/object:Gem::Requirement
60
+ requirement: &93844040 !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: *140996580
68
+ version_requirements: *93844040
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: ox
71
- requirement: &140995720 !ruby/object:Gem::Requirement
71
+ requirement: &93804040 !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: *140995720
79
+ version_requirements: *93804040
80
80
  - !ruby/object:Gem::Dependency
81
81
  name: text
82
- requirement: &140994860 !ruby/object:Gem::Requirement
82
+ requirement: &93803060 !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: *140994860
90
+ version_requirements: *93803060
91
91
  - !ruby/object:Gem::Dependency
92
92
  name: bundler
93
- requirement: &140994200 !ruby/object:Gem::Requirement
93
+ requirement: &93801800 !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: *140994200
101
+ version_requirements: *93801800
102
102
  - !ruby/object:Gem::Dependency
103
103
  name: rake
104
- requirement: &140993400 !ruby/object:Gem::Requirement
104
+ requirement: &93800020 !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: *140993400
112
+ version_requirements: *93800020
113
113
  - !ruby/object:Gem::Dependency
114
114
  name: rspec-core
115
- requirement: &140992640 !ruby/object:Gem::Requirement
115
+ requirement: &93797540 !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: *140992640
123
+ version_requirements: *93797540
124
124
  - !ruby/object:Gem::Dependency
125
125
  name: rspec-expectations
126
- requirement: &140991760 !ruby/object:Gem::Requirement
126
+ requirement: &93796500 !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: *140991760
134
+ version_requirements: *93796500
135
135
  - !ruby/object:Gem::Dependency
136
136
  name: rr
137
- requirement: &140991040 !ruby/object:Gem::Requirement
137
+ requirement: &94189100 !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: *140991040
145
+ version_requirements: *94189100
146
146
  - !ruby/object:Gem::Dependency
147
147
  name: simplecov
148
- requirement: &140990240 !ruby/object:Gem::Requirement
148
+ requirement: &94186000 !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: *140990240
156
+ version_requirements: *94186000
157
157
  - !ruby/object:Gem::Dependency
158
158
  name: fakeredis
159
- requirement: &140989300 !ruby/object:Gem::Requirement
159
+ requirement: &94273340 !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: *140989300
167
+ version_requirements: *94273340
168
168
  description: Ruby client library for mobile handset detection
169
169
  email:
170
170
  - ahutalla@gmail.com