tw 0.3.5 → 0.3.6

Sign up to get free protection for your applications and to get access to all the features.
data/Gemfile CHANGED
@@ -4,7 +4,6 @@ gem 'hoe'
4
4
  gem 'newgem'
5
5
  gem 'oauth'
6
6
  gem 'twitter'
7
- gem 'twitter-text'
8
7
  gem 'userstream'
9
8
  gem 'json'
10
9
  gem 'rainbow'
data/Gemfile.lock CHANGED
@@ -32,8 +32,6 @@ GEM
32
32
  faraday (~> 0.8)
33
33
  multi_json (~> 1.3)
34
34
  simple_oauth (~> 0.1.6)
35
- twitter-text (1.5.0)
36
- activesupport
37
35
  userstream (1.2.2)
38
36
  hashie (~> 1.2.0)
39
37
  oauth (~> 0.4.6)
@@ -51,5 +49,4 @@ DEPENDENCIES
51
49
  parallel
52
50
  rainbow
53
51
  twitter
54
- twitter-text
55
52
  userstream
data/History.txt CHANGED
@@ -1,3 +1,7 @@
1
+ === 0.3.6 2012-10-18
2
+
3
+ * remove twitter-text gem
4
+
1
5
  === 0.3.5 2012-10-18
2
6
 
3
7
  * bugfix
data/Rakefile CHANGED
@@ -16,7 +16,6 @@ $hoe = Hoe.spec 'tw' do
16
16
  self.rubyforge_name = self.name # TODO this is default value
17
17
  self.extra_deps = [['oauth','>= 0.4.7', '< 1.0.0'],
18
18
  ['twitter', '>= 4.0.0', '< 5.0.0'],
19
- ['twitter-text', '>= 1.5.0', '< 2.0.0'],
20
19
  ['userstream', '>= 1.2.0', '< 1.3.0'],
21
20
  ['json', '>= 1.7.5', '< 1.8.0'],
22
21
  ['args_parser', '>= 0.1.2'],
data/lib/tw.rb CHANGED
@@ -1,10 +1,8 @@
1
1
  $:.unshift(File.dirname(__FILE__)) unless
2
2
  $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
3
3
 
4
- $KCODE = 'u' if RUBY_VERSION < '1.9'
5
4
  require 'oauth'
6
5
  require 'twitter'
7
- require 'twitter-text'
8
6
  require 'time'
9
7
  require 'user_stream'
10
8
  require 'yaml'
@@ -23,7 +21,7 @@ require 'tw/client/error'
23
21
  require 'tw/client/helper'
24
22
 
25
23
  module Tw
26
- VERSION = '0.3.5'
24
+ VERSION = '0.3.6'
27
25
  class Conf
28
26
  REQUIRE_VERSION = '0.1.0'
29
27
  end
@@ -1,9 +1,15 @@
1
1
 
2
2
  class String
3
+
4
+ def char_length
5
+ self.split(//u).size
6
+ end
7
+
3
8
  def char_length_with_t_co
4
9
  Tw::Conf.update_twitter_config
5
10
  len = self.char_length
6
- Twitter::Extractor.extract_urls(self).each do |url|
11
+ self.scan(Regexp.new "https?://[^\s]+").each do |url|
12
+ puts url
7
13
  len += (url =~ /^https/ ? Tw::Conf['twitter_config']['short_url_length_https'] : Tw::Conf['twitter_config']['short_url_length']) - url.char_length
8
14
  end
9
15
  len
metadata CHANGED
@@ -1,245 +1,240 @@
1
- --- !ruby/object:Gem::Specification
1
+ --- !ruby/object:Gem::Specification
2
2
  name: tw
3
- version: !ruby/object:Gem::Version
4
- version: 0.3.5
3
+ version: !ruby/object:Gem::Version
4
+ hash: 31
5
5
  prerelease:
6
+ segments:
7
+ - 0
8
+ - 3
9
+ - 6
10
+ version: 0.3.6
6
11
  platform: ruby
7
- authors:
12
+ authors:
8
13
  - Sho Hashimoto
9
14
  autorequire:
10
15
  bindir: bin
11
16
  cert_chain: []
12
- date: 2012-10-18 00:00:00.000000000 Z
13
- dependencies:
14
- - !ruby/object:Gem::Dependency
15
- name: oauth
16
- requirement: !ruby/object:Gem::Requirement
17
+
18
+ date: 2012-10-18 00:00:00 Z
19
+ dependencies:
20
+ - !ruby/object:Gem::Dependency
21
+ requirement: &id001 !ruby/object:Gem::Requirement
17
22
  none: false
18
- requirements:
19
- - - ! '>='
20
- - !ruby/object:Gem::Version
23
+ requirements:
24
+ - - ">="
25
+ - !ruby/object:Gem::Version
26
+ hash: 1
27
+ segments:
28
+ - 0
29
+ - 4
30
+ - 7
21
31
  version: 0.4.7
22
32
  - - <
23
- - !ruby/object:Gem::Version
33
+ - !ruby/object:Gem::Version
34
+ hash: 23
35
+ segments:
36
+ - 1
37
+ - 0
38
+ - 0
24
39
  version: 1.0.0
25
- type: :runtime
40
+ version_requirements: *id001
41
+ name: oauth
26
42
  prerelease: false
27
- version_requirements: !ruby/object:Gem::Requirement
28
- none: false
29
- requirements:
30
- - - ! '>='
31
- - !ruby/object:Gem::Version
32
- version: 0.4.7
33
- - - <
34
- - !ruby/object:Gem::Version
35
- version: 1.0.0
36
- - !ruby/object:Gem::Dependency
37
- name: twitter
38
- requirement: !ruby/object:Gem::Requirement
39
- none: false
40
- requirements:
41
- - - ! '>='
42
- - !ruby/object:Gem::Version
43
- version: 4.0.0
44
- - - <
45
- - !ruby/object:Gem::Version
46
- version: 5.0.0
47
43
  type: :runtime
48
- prerelease: false
49
- version_requirements: !ruby/object:Gem::Requirement
44
+ - !ruby/object:Gem::Dependency
45
+ requirement: &id002 !ruby/object:Gem::Requirement
50
46
  none: false
51
- requirements:
52
- - - ! '>='
53
- - !ruby/object:Gem::Version
47
+ requirements:
48
+ - - ">="
49
+ - !ruby/object:Gem::Version
50
+ hash: 63
51
+ segments:
52
+ - 4
53
+ - 0
54
+ - 0
54
55
  version: 4.0.0
55
56
  - - <
56
- - !ruby/object:Gem::Version
57
+ - !ruby/object:Gem::Version
58
+ hash: 55
59
+ segments:
60
+ - 5
61
+ - 0
62
+ - 0
57
63
  version: 5.0.0
58
- - !ruby/object:Gem::Dependency
59
- name: twitter-text
60
- requirement: !ruby/object:Gem::Requirement
61
- none: false
62
- requirements:
63
- - - ! '>='
64
- - !ruby/object:Gem::Version
65
- version: 1.5.0
66
- - - <
67
- - !ruby/object:Gem::Version
68
- version: 2.0.0
69
- type: :runtime
64
+ version_requirements: *id002
65
+ name: twitter
70
66
  prerelease: false
71
- version_requirements: !ruby/object:Gem::Requirement
72
- none: false
73
- requirements:
74
- - - ! '>='
75
- - !ruby/object:Gem::Version
76
- version: 1.5.0
77
- - - <
78
- - !ruby/object:Gem::Version
79
- version: 2.0.0
80
- - !ruby/object:Gem::Dependency
81
- name: userstream
82
- requirement: !ruby/object:Gem::Requirement
83
- none: false
84
- requirements:
85
- - - ! '>='
86
- - !ruby/object:Gem::Version
87
- version: 1.2.0
88
- - - <
89
- - !ruby/object:Gem::Version
90
- version: 1.3.0
91
67
  type: :runtime
92
- prerelease: false
93
- version_requirements: !ruby/object:Gem::Requirement
68
+ - !ruby/object:Gem::Dependency
69
+ requirement: &id003 !ruby/object:Gem::Requirement
94
70
  none: false
95
- requirements:
96
- - - ! '>='
97
- - !ruby/object:Gem::Version
71
+ requirements:
72
+ - - ">="
73
+ - !ruby/object:Gem::Version
74
+ hash: 31
75
+ segments:
76
+ - 1
77
+ - 2
78
+ - 0
98
79
  version: 1.2.0
99
80
  - - <
100
- - !ruby/object:Gem::Version
81
+ - !ruby/object:Gem::Version
82
+ hash: 27
83
+ segments:
84
+ - 1
85
+ - 3
86
+ - 0
101
87
  version: 1.3.0
102
- - !ruby/object:Gem::Dependency
103
- name: json
104
- requirement: !ruby/object:Gem::Requirement
105
- none: false
106
- requirements:
107
- - - ! '>='
108
- - !ruby/object:Gem::Version
109
- version: 1.7.5
110
- - - <
111
- - !ruby/object:Gem::Version
112
- version: 1.8.0
113
- type: :runtime
88
+ version_requirements: *id003
89
+ name: userstream
114
90
  prerelease: false
115
- version_requirements: !ruby/object:Gem::Requirement
91
+ type: :runtime
92
+ - !ruby/object:Gem::Dependency
93
+ requirement: &id004 !ruby/object:Gem::Requirement
116
94
  none: false
117
- requirements:
118
- - - ! '>='
119
- - !ruby/object:Gem::Version
95
+ requirements:
96
+ - - ">="
97
+ - !ruby/object:Gem::Version
98
+ hash: 1
99
+ segments:
100
+ - 1
101
+ - 7
102
+ - 5
120
103
  version: 1.7.5
121
104
  - - <
122
- - !ruby/object:Gem::Version
105
+ - !ruby/object:Gem::Version
106
+ hash: 55
107
+ segments:
108
+ - 1
109
+ - 8
110
+ - 0
123
111
  version: 1.8.0
124
- - !ruby/object:Gem::Dependency
125
- name: args_parser
126
- requirement: !ruby/object:Gem::Requirement
127
- none: false
128
- requirements:
129
- - - ! '>='
130
- - !ruby/object:Gem::Version
131
- version: 0.1.2
132
- type: :runtime
112
+ version_requirements: *id004
113
+ name: json
133
114
  prerelease: false
134
- version_requirements: !ruby/object:Gem::Requirement
115
+ type: :runtime
116
+ - !ruby/object:Gem::Dependency
117
+ requirement: &id005 !ruby/object:Gem::Requirement
135
118
  none: false
136
- requirements:
137
- - - ! '>='
138
- - !ruby/object:Gem::Version
119
+ requirements:
120
+ - - ">="
121
+ - !ruby/object:Gem::Version
122
+ hash: 31
123
+ segments:
124
+ - 0
125
+ - 1
126
+ - 2
139
127
  version: 0.1.2
140
- - !ruby/object:Gem::Dependency
141
- name: rainbow
142
- requirement: !ruby/object:Gem::Requirement
143
- none: false
144
- requirements:
145
- - - ! '>='
146
- - !ruby/object:Gem::Version
147
- version: 1.1.4
148
- - - <
149
- - !ruby/object:Gem::Version
150
- version: 2.0.0
151
- type: :runtime
128
+ version_requirements: *id005
129
+ name: args_parser
152
130
  prerelease: false
153
- version_requirements: !ruby/object:Gem::Requirement
131
+ type: :runtime
132
+ - !ruby/object:Gem::Dependency
133
+ requirement: &id006 !ruby/object:Gem::Requirement
154
134
  none: false
155
- requirements:
156
- - - ! '>='
157
- - !ruby/object:Gem::Version
135
+ requirements:
136
+ - - ">="
137
+ - !ruby/object:Gem::Version
138
+ hash: 27
139
+ segments:
140
+ - 1
141
+ - 1
142
+ - 4
158
143
  version: 1.1.4
159
144
  - - <
160
- - !ruby/object:Gem::Version
145
+ - !ruby/object:Gem::Version
146
+ hash: 15
147
+ segments:
148
+ - 2
149
+ - 0
150
+ - 0
161
151
  version: 2.0.0
162
- - !ruby/object:Gem::Dependency
163
- name: parallel
164
- requirement: !ruby/object:Gem::Requirement
165
- none: false
166
- requirements:
167
- - - ! '>='
168
- - !ruby/object:Gem::Version
169
- version: 0.5.18
170
- - - <
171
- - !ruby/object:Gem::Version
172
- version: 1.0.0
173
- type: :runtime
152
+ version_requirements: *id006
153
+ name: rainbow
174
154
  prerelease: false
175
- version_requirements: !ruby/object:Gem::Requirement
155
+ type: :runtime
156
+ - !ruby/object:Gem::Dependency
157
+ requirement: &id007 !ruby/object:Gem::Requirement
176
158
  none: false
177
- requirements:
178
- - - ! '>='
179
- - !ruby/object:Gem::Version
159
+ requirements:
160
+ - - ">="
161
+ - !ruby/object:Gem::Version
162
+ hash: 47
163
+ segments:
164
+ - 0
165
+ - 5
166
+ - 18
180
167
  version: 0.5.18
181
168
  - - <
182
- - !ruby/object:Gem::Version
169
+ - !ruby/object:Gem::Version
170
+ hash: 23
171
+ segments:
172
+ - 1
173
+ - 0
174
+ - 0
183
175
  version: 1.0.0
184
- - !ruby/object:Gem::Dependency
185
- name: rdoc
186
- requirement: !ruby/object:Gem::Requirement
187
- none: false
188
- requirements:
189
- - - ~>
190
- - !ruby/object:Gem::Version
191
- version: '3.10'
192
- type: :development
176
+ version_requirements: *id007
177
+ name: parallel
193
178
  prerelease: false
194
- version_requirements: !ruby/object:Gem::Requirement
179
+ type: :runtime
180
+ - !ruby/object:Gem::Dependency
181
+ requirement: &id008 !ruby/object:Gem::Requirement
195
182
  none: false
196
- requirements:
183
+ requirements:
197
184
  - - ~>
198
- - !ruby/object:Gem::Version
199
- version: '3.10'
200
- - !ruby/object:Gem::Dependency
201
- name: newgem
202
- requirement: !ruby/object:Gem::Requirement
203
- none: false
204
- requirements:
205
- - - ! '>='
206
- - !ruby/object:Gem::Version
207
- version: 1.5.3
208
- type: :development
185
+ - !ruby/object:Gem::Version
186
+ hash: 19
187
+ segments:
188
+ - 3
189
+ - 10
190
+ version: "3.10"
191
+ version_requirements: *id008
192
+ name: rdoc
209
193
  prerelease: false
210
- version_requirements: !ruby/object:Gem::Requirement
194
+ type: :development
195
+ - !ruby/object:Gem::Dependency
196
+ requirement: &id009 !ruby/object:Gem::Requirement
211
197
  none: false
212
- requirements:
213
- - - ! '>='
214
- - !ruby/object:Gem::Version
198
+ requirements:
199
+ - - ">="
200
+ - !ruby/object:Gem::Version
201
+ hash: 5
202
+ segments:
203
+ - 1
204
+ - 5
205
+ - 3
215
206
  version: 1.5.3
216
- - !ruby/object:Gem::Dependency
217
- name: hoe
218
- requirement: !ruby/object:Gem::Requirement
219
- none: false
220
- requirements:
221
- - - ~>
222
- - !ruby/object:Gem::Version
223
- version: '3.1'
224
- type: :development
207
+ version_requirements: *id009
208
+ name: newgem
225
209
  prerelease: false
226
- version_requirements: !ruby/object:Gem::Requirement
210
+ type: :development
211
+ - !ruby/object:Gem::Dependency
212
+ requirement: &id010 !ruby/object:Gem::Requirement
227
213
  none: false
228
- requirements:
214
+ requirements:
229
215
  - - ~>
230
- - !ruby/object:Gem::Version
231
- version: '3.1'
232
- description: ! '* twitter client.'
233
- email:
216
+ - !ruby/object:Gem::Version
217
+ hash: 5
218
+ segments:
219
+ - 3
220
+ - 1
221
+ version: "3.1"
222
+ version_requirements: *id010
223
+ name: hoe
224
+ prerelease: false
225
+ type: :development
226
+ description: "* twitter client."
227
+ email:
234
228
  - hashimoto@shokai.org
235
- executables:
229
+ executables:
236
230
  - tw
237
231
  extensions: []
238
- extra_rdoc_files:
232
+
233
+ extra_rdoc_files:
239
234
  - History.txt
240
235
  - Manifest.txt
241
236
  - README.rdoc
242
- files:
237
+ files:
243
238
  - Gemfile
244
239
  - Gemfile.lock
245
240
  - History.txt
@@ -273,34 +268,39 @@ files:
273
268
  - .gemtest
274
269
  homepage: http://shokai.github.com/tw
275
270
  licenses: []
276
- post_install_message: ! '!! Installed "tw" command. => http://shokai.github.com/tw'
277
- rdoc_options:
271
+
272
+ post_install_message: "!! Installed \"tw\" command. => http://shokai.github.com/tw"
273
+ rdoc_options:
278
274
  - --main
279
275
  - README.rdoc
280
- require_paths:
276
+ require_paths:
281
277
  - lib
282
- required_ruby_version: !ruby/object:Gem::Requirement
278
+ required_ruby_version: !ruby/object:Gem::Requirement
283
279
  none: false
284
- requirements:
285
- - - ! '>='
286
- - !ruby/object:Gem::Version
287
- version: '0'
288
- segments:
280
+ requirements:
281
+ - - ">="
282
+ - !ruby/object:Gem::Version
283
+ hash: 3
284
+ segments:
289
285
  - 0
290
- hash: -2105275235005302203
291
- required_rubygems_version: !ruby/object:Gem::Requirement
286
+ version: "0"
287
+ required_rubygems_version: !ruby/object:Gem::Requirement
292
288
  none: false
293
- requirements:
294
- - - ! '>='
295
- - !ruby/object:Gem::Version
296
- version: '0'
289
+ requirements:
290
+ - - ">="
291
+ - !ruby/object:Gem::Version
292
+ hash: 3
293
+ segments:
294
+ - 0
295
+ version: "0"
297
296
  requirements: []
297
+
298
298
  rubyforge_project: tw
299
299
  rubygems_version: 1.8.24
300
300
  signing_key:
301
301
  specification_version: 3
302
- summary: ! '* twitter client.'
303
- test_files:
302
+ summary: "* twitter client."
303
+ test_files:
304
304
  - test/test_helper.rb
305
305
  - test/test_t_co.rb
306
306
  - test/test_tw.rb