intentmedia-capybara-webkit 0.7.2.2 → 0.7.2.3

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 (5) hide show
  1. data/Gemfile.lock +4 -4
  2. data/capybara-webkit.gemspec +1 -1
  3. data/lib/capybara/driver/webkit/browser.rb +2 -1
  4. data/src/SetProxy.cpp +12 -6
  5. metadata +232 -206
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- intentmedia-capybara-webkit (0.7.2.2)
4
+ intentmedia-capybara-webkit (0.7.2.3)
5
5
  capybara (>= 1.0.0, < 1.2)
6
6
 
7
7
  GEM
@@ -20,12 +20,12 @@ GEM
20
20
  childprocess (0.2.2)
21
21
  ffi (~> 1.0.6)
22
22
  diff-lcs (1.1.2)
23
- ffi (1.0.10)
23
+ ffi (1.0.9)
24
24
  json_pure (1.6.1)
25
25
  mime-types (1.16)
26
26
  mini_magick (3.2.1)
27
27
  subexec (~> 0.0.4)
28
- nokogiri (1.5.0-java)
28
+ nokogiri (1.5.0)
29
29
  rack (1.3.2)
30
30
  rack-test (0.6.1)
31
31
  rack (>= 1.0)
@@ -39,7 +39,7 @@ GEM
39
39
  diff-lcs (~> 1.1.2)
40
40
  rspec-mocks (2.6.0)
41
41
  rubyzip (0.9.4)
42
- selenium-webdriver (2.8.0)
42
+ selenium-webdriver (2.7.0)
43
43
  childprocess (>= 0.2.1)
44
44
  ffi (>= 1.0.7)
45
45
  json_pure
data/capybara-webkit.gemspec CHANGED
@@ -1,6 +1,6 @@
1
1
  Gem::Specification.new do |s|
2
2
  s.name = "intentmedia-capybara-webkit"
3
- s.version = "0.7.2.2"
3
+ s.version = "0.7.2.3"
4
4
  s.authors = ["thoughtbot", "Joe Ferris", "Jason Morrison", "Tristan Dunn",
5
5
  "Joshua Clayton", "Yuichi Tateno", "Aaron Gibralter",
6
6
  "Vasily Reys", "petrushka", "John Bintz", "Chad Pytel",
data/lib/capybara/driver/webkit/browser.rb CHANGED
@@ -101,7 +101,7 @@ class Capybara::Driver::Webkit
101
101
 
102
102
  def set_proxy(options = {})
103
103
  options = default_proxy_options.merge(options)
104
- command("SetProxy", options[:host], options[:port], options[:user], options[:pass])
104
+ command("SetProxy", options[:type], options[:host], options[:port], options[:user], options[:pass])
105
105
  end
106
106
 
107
107
  def clear_proxy
@@ -206,6 +206,7 @@ class Capybara::Driver::Webkit
206
206
 
207
207
  def default_proxy_options
208
208
  {
209
+ :type => "http",
209
210
  :host => "localhost",
210
211
  :port => "0",
211
212
  :user => "",
data/src/SetProxy.cpp CHANGED
@@ -12,12 +12,18 @@ void SetProxy::start(QStringList &arguments)
12
12
  // default to empty proxy
13
13
  QNetworkProxy proxy;
14
14
 
15
- if (arguments.size() > 0)
16
- proxy = QNetworkProxy(QNetworkProxy::HttpProxy,
17
- arguments[0],
18
- (quint16)(arguments[1].toInt()),
19
- arguments[2],
20
- arguments[3]);
15
+ if (arguments.size() > 0) {
16
+ QNetworkProxy::ProxyType proxyType = QNetworkProxy::HttpProxy;
17
+
18
+ if (arguments[0] == "socks5")
19
+ proxyType = QNetworkProxy::Socks5Proxy;
20
+
21
+ proxy = QNetworkProxy(proxyType,
22
+ arguments[1],
23
+ (quint16)(arguments[2].toInt()),
24
+ arguments[3],
25
+ arguments[4]);
26
+ }
21
27
 
22
28
  page()->networkAccessManager()->setProxy(proxy);
23
29
  emit finished(new Response(true));
metadata CHANGED
@@ -1,207 +1,239 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: intentmedia-capybara-webkit
3
3
  version: !ruby/object:Gem::Version
4
+ hash: 121
4
5
  prerelease:
5
- version: 0.7.2.2
6
+ segments:
7
+ - 0
8
+ - 7
9
+ - 2
10
+ - 3
11
+ version: 0.7.2.3
6
12
  platform: ruby
7
13
  authors:
8
- - thoughtbot
9
- - Joe Ferris
10
- - Jason Morrison
11
- - Tristan Dunn
12
- - Joshua Clayton
13
- - Yuichi Tateno
14
- - Aaron Gibralter
15
- - Vasily Reys
16
- - petrushka
17
- - John Bintz
18
- - Chad Pytel
19
- - Christopher Meiklejohn
20
- - John Barker
21
- - Jeremy Wells
22
- - Chris Griego
23
- - Shigeya Suzuki
14
+ - thoughtbot
15
+ - Joe Ferris
16
+ - Jason Morrison
17
+ - Tristan Dunn
18
+ - Joshua Clayton
19
+ - Yuichi Tateno
20
+ - Aaron Gibralter
21
+ - Vasily Reys
22
+ - petrushka
23
+ - John Bintz
24
+ - Chad Pytel
25
+ - Christopher Meiklejohn
26
+ - John Barker
27
+ - Jeremy Wells
28
+ - Chris Griego
29
+ - Shigeya Suzuki
24
30
  autorequire:
25
31
  bindir: bin
26
32
  cert_chain: []
27
33
 
28
- date: 2011-10-21 00:00:00 -04:00
34
+ date: 2011-12-31 00:00:00 -05:00
29
35
  default_executable:
30
36
  dependencies:
31
- - !ruby/object:Gem::Dependency
32
- name: capybara
33
- version_requirements: &id001 !ruby/object:Gem::Requirement
34
- none: false
35
- requirements:
36
- - - ">="
37
- - !ruby/object:Gem::Version
38
- version: 1.0.0
39
- - - <
40
- - !ruby/object:Gem::Version
41
- version: "1.2"
42
- requirement: *id001
43
- prerelease: false
44
- type: :runtime
45
- - !ruby/object:Gem::Dependency
46
- name: rspec
47
- version_requirements: &id002 !ruby/object:Gem::Requirement
48
- none: false
49
- requirements:
50
- - - ~>
51
- - !ruby/object:Gem::Version
52
- version: 2.6.0
53
- requirement: *id002
54
- prerelease: false
55
- type: :development
56
- - !ruby/object:Gem::Dependency
57
- name: sinatra
58
- version_requirements: &id003 !ruby/object:Gem::Requirement
59
- none: false
60
- requirements:
61
- - - ">="
62
- - !ruby/object:Gem::Version
63
- version: "0"
64
- requirement: *id003
65
- prerelease: false
66
- type: :development
67
- - !ruby/object:Gem::Dependency
68
- name: mini_magick
69
- version_requirements: &id004 !ruby/object:Gem::Requirement
70
- none: false
71
- requirements:
72
- - - ">="
73
- - !ruby/object:Gem::Version
74
- version: "0"
75
- requirement: *id004
76
- prerelease: false
77
- type: :development
78
- - !ruby/object:Gem::Dependency
79
- name: rake
80
- version_requirements: &id005 !ruby/object:Gem::Requirement
81
- none: false
82
- requirements:
83
- - - ">="
84
- - !ruby/object:Gem::Version
85
- version: "0"
86
- requirement: *id005
87
- prerelease: false
88
- type: :development
89
- - !ruby/object:Gem::Dependency
90
- name: appraisal
91
- version_requirements: &id006 !ruby/object:Gem::Requirement
92
- none: false
93
- requirements:
94
- - - ">="
95
- - !ruby/object:Gem::Version
96
- version: "0"
97
- requirement: *id006
98
- prerelease: false
99
- type: :development
37
+ - !ruby/object:Gem::Dependency
38
+ type: :runtime
39
+ requirement: &id001 !ruby/object:Gem::Requirement
40
+ none: false
41
+ requirements:
42
+ - - ">="
43
+ - !ruby/object:Gem::Version
44
+ hash: 23
45
+ segments:
46
+ - 1
47
+ - 0
48
+ - 0
49
+ version: 1.0.0
50
+ - - <
51
+ - !ruby/object:Gem::Version
52
+ hash: 11
53
+ segments:
54
+ - 1
55
+ - 2
56
+ version: "1.2"
57
+ name: capybara
58
+ version_requirements: *id001
59
+ prerelease: false
60
+ - !ruby/object:Gem::Dependency
61
+ type: :development
62
+ requirement: &id002 !ruby/object:Gem::Requirement
63
+ none: false
64
+ requirements:
65
+ - - ~>
66
+ - !ruby/object:Gem::Version
67
+ hash: 23
68
+ segments:
69
+ - 2
70
+ - 6
71
+ - 0
72
+ version: 2.6.0
73
+ name: rspec
74
+ version_requirements: *id002
75
+ prerelease: false
76
+ - !ruby/object:Gem::Dependency
77
+ type: :development
78
+ requirement: &id003 !ruby/object:Gem::Requirement
79
+ none: false
80
+ requirements:
81
+ - - ">="
82
+ - !ruby/object:Gem::Version
83
+ hash: 3
84
+ segments:
85
+ - 0
86
+ version: "0"
87
+ name: sinatra
88
+ version_requirements: *id003
89
+ prerelease: false
90
+ - !ruby/object:Gem::Dependency
91
+ type: :development
92
+ requirement: &id004 !ruby/object:Gem::Requirement
93
+ none: false
94
+ requirements:
95
+ - - ">="
96
+ - !ruby/object:Gem::Version
97
+ hash: 3
98
+ segments:
99
+ - 0
100
+ version: "0"
101
+ name: mini_magick
102
+ version_requirements: *id004
103
+ prerelease: false
104
+ - !ruby/object:Gem::Dependency
105
+ type: :development
106
+ requirement: &id005 !ruby/object:Gem::Requirement
107
+ none: false
108
+ requirements:
109
+ - - ">="
110
+ - !ruby/object:Gem::Version
111
+ hash: 3
112
+ segments:
113
+ - 0
114
+ version: "0"
115
+ name: rake
116
+ version_requirements: *id005
117
+ prerelease: false
118
+ - !ruby/object:Gem::Dependency
119
+ type: :development
120
+ requirement: &id006 !ruby/object:Gem::Requirement
121
+ none: false
122
+ requirements:
123
+ - - ">="
124
+ - !ruby/object:Gem::Version
125
+ hash: 3
126
+ segments:
127
+ - 0
128
+ version: "0"
129
+ name: appraisal
130
+ version_requirements: *id006
131
+ prerelease: false
100
132
  description:
101
133
  email: support@thoughtbot.com
102
134
  executables: []
103
135
 
104
136
  extensions:
105
- - extconf.rb
137
+ - extconf.rb
106
138
  extra_rdoc_files: []
107
139
 
108
140
  files:
109
- - .gitignore
110
- - .rspec
111
- - Appraisals
112
- - CONTRIBUTING.md
113
- - Gemfile
114
- - Gemfile.lock
115
- - LICENSE
116
- - README.md
117
- - Rakefile
118
- - bin/Info.plist
119
- - capybara-webkit.gemspec
120
- - extconf.rb
121
- - gemfiles/1.0.gemfile
122
- - gemfiles/1.0.gemfile.lock
123
- - gemfiles/1.1.gemfile
124
- - gemfiles/1.1.gemfile.lock
125
- - lib/capybara-webkit.rb
126
- - lib/capybara/driver/webkit.rb
127
- - lib/capybara/driver/webkit/browser.rb
128
- - lib/capybara/driver/webkit/node.rb
129
- - lib/capybara/driver/webkit/socket_debugger.rb
130
- - lib/capybara/webkit.rb
131
- - lib/capybara_webkit_builder.rb
132
- - spec/browser_spec.rb
133
- - spec/driver_rendering_spec.rb
134
- - spec/driver_spec.rb
135
- - spec/integration/driver_spec.rb
136
- - spec/integration/session_spec.rb
137
- - spec/self_signed_ssl_cert.rb
138
- - spec/spec_helper.rb
139
- - src/Body.h
140
- - src/ClearCookies.cpp
141
- - src/ClearCookies.h
142
- - src/Command.cpp
143
- - src/Command.h
144
- - src/CommandFactory.cpp
145
- - src/CommandFactory.h
146
- - src/CommandParser.cpp
147
- - src/CommandParser.h
148
- - src/Connection.cpp
149
- - src/Connection.h
150
- - src/Evaluate.cpp
151
- - src/Evaluate.h
152
- - src/Execute.cpp
153
- - src/Execute.h
154
- - src/Find.cpp
155
- - src/Find.h
156
- - src/FrameFocus.cpp
157
- - src/FrameFocus.h
158
- - src/GetCookies.cpp
159
- - src/GetCookies.h
160
- - src/Header.cpp
161
- - src/Header.h
162
- - src/Headers.cpp
163
- - src/Headers.h
164
- - src/JavascriptInvocation.cpp
165
- - src/JavascriptInvocation.h
166
- - src/NetworkAccessManager.cpp
167
- - src/NetworkAccessManager.h
168
- - src/NetworkCookieJar.cpp
169
- - src/NetworkCookieJar.h
170
- - src/Node.cpp
171
- - src/Node.h
172
- - src/Render.cpp
173
- - src/Render.h
174
- - src/Reset.cpp
175
- - src/Reset.h
176
- - src/Response.cpp
177
- - src/Response.h
178
- - src/Server.cpp
179
- - src/Server.h
180
- - src/SetCookie.cpp
181
- - src/SetCookie.h
182
- - src/SetProxy.cpp
183
- - src/SetProxy.h
184
- - src/Source.cpp
185
- - src/Source.h
186
- - src/Status.cpp
187
- - src/Status.h
188
- - src/UnsupportedContentHandler.cpp
189
- - src/UnsupportedContentHandler.h
190
- - src/Url.cpp
191
- - src/Url.h
192
- - src/Visit.cpp
193
- - src/Visit.h
194
- - src/WebPage.cpp
195
- - src/WebPage.h
196
- - src/body.cpp
197
- - src/capybara.js
198
- - src/find_command.h
199
- - src/main.cpp
200
- - src/webkit_server.pro
201
- - src/webkit_server.qrc
202
- - templates/Command.cpp
203
- - templates/Command.h
204
- - webkit_server.pro
141
+ - .gitignore
142
+ - .rspec
143
+ - Appraisals
144
+ - CONTRIBUTING.md
145
+ - Gemfile
146
+ - Gemfile.lock
147
+ - LICENSE
148
+ - README.md
149
+ - Rakefile
150
+ - bin/Info.plist
151
+ - capybara-webkit.gemspec
152
+ - extconf.rb
153
+ - gemfiles/1.0.gemfile
154
+ - gemfiles/1.0.gemfile.lock
155
+ - gemfiles/1.1.gemfile
156
+ - gemfiles/1.1.gemfile.lock
157
+ - lib/capybara-webkit.rb
158
+ - lib/capybara/driver/webkit.rb
159
+ - lib/capybara/driver/webkit/browser.rb
160
+ - lib/capybara/driver/webkit/node.rb
161
+ - lib/capybara/driver/webkit/socket_debugger.rb
162
+ - lib/capybara/webkit.rb
163
+ - lib/capybara_webkit_builder.rb
164
+ - spec/browser_spec.rb
165
+ - spec/driver_rendering_spec.rb
166
+ - spec/driver_spec.rb
167
+ - spec/integration/driver_spec.rb
168
+ - spec/integration/session_spec.rb
169
+ - spec/self_signed_ssl_cert.rb
170
+ - spec/spec_helper.rb
171
+ - src/Body.h
172
+ - src/ClearCookies.cpp
173
+ - src/ClearCookies.h
174
+ - src/Command.cpp
175
+ - src/Command.h
176
+ - src/CommandFactory.cpp
177
+ - src/CommandFactory.h
178
+ - src/CommandParser.cpp
179
+ - src/CommandParser.h
180
+ - src/Connection.cpp
181
+ - src/Connection.h
182
+ - src/Evaluate.cpp
183
+ - src/Evaluate.h
184
+ - src/Execute.cpp
185
+ - src/Execute.h
186
+ - src/Find.cpp
187
+ - src/Find.h
188
+ - src/FrameFocus.cpp
189
+ - src/FrameFocus.h
190
+ - src/GetCookies.cpp
191
+ - src/GetCookies.h
192
+ - src/Header.cpp
193
+ - src/Header.h
194
+ - src/Headers.cpp
195
+ - src/Headers.h
196
+ - src/JavascriptInvocation.cpp
197
+ - src/JavascriptInvocation.h
198
+ - src/NetworkAccessManager.cpp
199
+ - src/NetworkAccessManager.h
200
+ - src/NetworkCookieJar.cpp
201
+ - src/NetworkCookieJar.h
202
+ - src/Node.cpp
203
+ - src/Node.h
204
+ - src/Render.cpp
205
+ - src/Render.h
206
+ - src/Reset.cpp
207
+ - src/Reset.h
208
+ - src/Response.cpp
209
+ - src/Response.h
210
+ - src/Server.cpp
211
+ - src/Server.h
212
+ - src/SetCookie.cpp
213
+ - src/SetCookie.h
214
+ - src/SetProxy.cpp
215
+ - src/SetProxy.h
216
+ - src/Source.cpp
217
+ - src/Source.h
218
+ - src/Status.cpp
219
+ - src/Status.h
220
+ - src/UnsupportedContentHandler.cpp
221
+ - src/UnsupportedContentHandler.h
222
+ - src/Url.cpp
223
+ - src/Url.h
224
+ - src/Visit.cpp
225
+ - src/Visit.h
226
+ - src/WebPage.cpp
227
+ - src/WebPage.h
228
+ - src/body.cpp
229
+ - src/capybara.js
230
+ - src/find_command.h
231
+ - src/main.cpp
232
+ - src/webkit_server.pro
233
+ - src/webkit_server.qrc
234
+ - templates/Command.cpp
235
+ - templates/Command.h
236
+ - webkit_server.pro
205
237
  has_rdoc: true
206
238
  homepage: http://github.com/thoughtbot/capybara-webkit
207
239
  licenses: []
@@ -210,37 +242,31 @@ post_install_message:
210
242
  rdoc_options: []
211
243
 
212
244
  require_paths:
213
- - lib
245
+ - lib
214
246
  required_ruby_version: !ruby/object:Gem::Requirement
215
247
  none: false
216
248
  requirements:
217
- - - ">="
218
- - !ruby/object:Gem::Version
219
- hash: 2
220
- segments:
221
- - 0
222
- version: "0"
249
+ - - ">="
250
+ - !ruby/object:Gem::Version
251
+ hash: 3
252
+ segments:
253
+ - 0
254
+ version: "0"
223
255
  required_rubygems_version: !ruby/object:Gem::Requirement
224
256
  none: false
225
257
  requirements:
226
- - - ">="
227
- - !ruby/object:Gem::Version
228
- hash: 2
229
- segments:
230
- - 0
231
- version: "0"
258
+ - - ">="
259
+ - !ruby/object:Gem::Version
260
+ hash: 3
261
+ segments:
262
+ - 0
263
+ version: "0"
232
264
  requirements: []
233
265
 
234
266
  rubyforge_project:
235
- rubygems_version: 1.5.1
267
+ rubygems_version: 1.6.2
236
268
  signing_key:
237
269
  specification_version: 3
238
270
  summary: Headless Webkit driver for Capybara
239
- test_files:
240
- - spec/browser_spec.rb
241
- - spec/driver_rendering_spec.rb
242
- - spec/driver_spec.rb
243
- - spec/integration/driver_spec.rb
244
- - spec/integration/session_spec.rb
245
- - spec/self_signed_ssl_cert.rb
246
- - spec/spec_helper.rb
271
+ test_files: []
272
+