contacts_cn_19 1.1.0 → 1.1.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (2) hide show
  1. data/lib/contacts/hotmail.rb +8 -3
  2. metadata +12 -13
@@ -61,11 +61,16 @@ class Contacts
61
61
  if @contacts.nil? && connected?
62
62
  url = URI.parse(contact_list_url)
63
63
  data, resp, cookies, forward = get(get_contact_list_url, @cookies )
64
- data = Iconv.conv('UTF-8//IGNORE','UTF-8',data)
64
+ data.force_encoding('gbk')
65
+ data = data.encode('UTF-8')
65
66
  data.gsub!(";",",")
66
67
  data.gsub!("'","")
67
- # data = data.gsub(/[\x80-\xff]/n,"")
68
-
68
+ if data =~ /^<html><head><title>Object\s+moved<\/title><\/head>/
69
+ url = data.scan(/<a\s+href=[\"\'](.*)[\'\"]/).flatten.first
70
+ data, resp, cookies, forward = get(url, @cookies )
71
+ data.force_encoding('gbk')
72
+ data = data.encode('UTF-8')
73
+ end
69
74
  @contacts = CSV.parse(data, {:headers => true, :col_sep => ','}).map do |row|
70
75
  name = ""
71
76
  name = row["First Name"] if !row["First Name"].nil?
metadata CHANGED
@@ -1,23 +1,22 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: contacts_cn_19
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.1.0
4
+ version: 1.1.1
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
8
- - Marcus
9
- - Joey
8
+ - ''
10
9
  autorequire:
11
10
  bindir: bin
12
11
  cert_chain: []
13
- date: 2012-09-24 00:00:00.000000000 Z
12
+ date: 2013-03-05 00:00:00.000000000 Z
14
13
  dependencies:
15
14
  - !ruby/object:Gem::Dependency
16
15
  name: gdata_19
17
16
  requirement: !ruby/object:Gem::Requirement
18
17
  none: false
19
18
  requirements:
20
- - - ! '>='
19
+ - - '>='
21
20
  - !ruby/object:Gem::Version
22
21
  version: '0'
23
22
  type: :runtime
@@ -25,7 +24,7 @@ dependencies:
25
24
  version_requirements: !ruby/object:Gem::Requirement
26
25
  none: false
27
26
  requirements:
28
- - - ! '>='
27
+ - - '>='
29
28
  - !ruby/object:Gem::Version
30
29
  version: '0'
31
30
  - !ruby/object:Gem::Dependency
@@ -33,7 +32,7 @@ dependencies:
33
32
  requirement: !ruby/object:Gem::Requirement
34
33
  none: false
35
34
  requirements:
36
- - - ! '>='
35
+ - - '>='
37
36
  - !ruby/object:Gem::Version
38
37
  version: '0'
39
38
  type: :runtime
@@ -41,7 +40,7 @@ dependencies:
41
40
  version_requirements: !ruby/object:Gem::Requirement
42
41
  none: false
43
42
  requirements:
44
- - - ! '>='
43
+ - - '>='
45
44
  - !ruby/object:Gem::Version
46
45
  version: '0'
47
46
  - !ruby/object:Gem::Dependency
@@ -49,7 +48,7 @@ dependencies:
49
48
  requirement: !ruby/object:Gem::Requirement
50
49
  none: false
51
50
  requirements:
52
- - - ! '>='
51
+ - - '>='
53
52
  - !ruby/object:Gem::Version
54
53
  version: '0'
55
54
  type: :runtime
@@ -57,7 +56,7 @@ dependencies:
57
56
  version_requirements: !ruby/object:Gem::Requirement
58
57
  none: false
59
58
  requirements:
60
- - - ! '>='
59
+ - - '>='
61
60
  - !ruby/object:Gem::Version
62
61
  version: '0'
63
62
  description: adjust some code ,make 'contacts_cn' fit ruby 1.9
@@ -87,18 +86,18 @@ require_paths:
87
86
  required_ruby_version: !ruby/object:Gem::Requirement
88
87
  none: false
89
88
  requirements:
90
- - - ! '>='
89
+ - - '>='
91
90
  - !ruby/object:Gem::Version
92
91
  version: '0'
93
92
  required_rubygems_version: !ruby/object:Gem::Requirement
94
93
  none: false
95
94
  requirements:
96
- - - ! '>='
95
+ - - '>='
97
96
  - !ruby/object:Gem::Version
98
97
  version: '0'
99
98
  requirements: []
100
99
  rubyforge_project:
101
- rubygems_version: 1.8.24
100
+ rubygems_version: 1.8.25
102
101
  signing_key:
103
102
  specification_version: 3
104
103
  summary: contacts_cn_19