leifcr-rack-livereload 0.3.16 → 0.3.17

Sign up to get free protection for your applications and to get access to all the features.
Files changed (19) hide show
  1. checksums.yaml +4 -4
  2. data/.travis.yml +4 -7
  3. data/README.md +1 -24
  4. data/Rakefile +0 -12
  5. data/features/step_definitions/then/i_should_not_have_livereload_code.rb +1 -2
  6. data/gemfiles/{rails32.gemfile → rails42.gemfile} +2 -2
  7. data/gemfiles/{rails40.gemfile → rails50.gemfile} +2 -2
  8. data/js/livereload.js +752 -624
  9. data/lib/rack-livereload.rb +1 -1
  10. data/lib/rack/livereload.rb +1 -9
  11. data/lib/rack/livereload/body_processor.rb +0 -9
  12. data/skel/livereload.html.erb +6 -11
  13. data/spec/rack/livereload/body_processor_spec.rb +28 -51
  14. data/spec/rack/livereload/processing_skip_analyzer_spec.rb +18 -18
  15. data/spec/rack/livereload_spec.rb +2 -2
  16. metadata +3 -6
  17. data/js/WebSocketMain.swf +0 -0
  18. data/js/swfobject.js +0 -4
  19. data/js/web_socket.js +0 -379
data/lib/rack-livereload.rb CHANGED
@@ -1,6 +1,6 @@
1
1
  require "rack/livereload"
2
2
 
3
3
  class Rack::LiveReload
4
- VERSION = '0.3.16'
4
+ VERSION = '0.3.17'
5
5
  end
6
6
 
data/lib/rack/livereload.rb CHANGED
@@ -39,15 +39,7 @@ module Rack
39
39
 
40
40
  private
41
41
  def deliver_file(file)
42
- type = case ::File.extname(file)
43
- when '.js'
44
- 'text/javascript'
45
- when '.swf'
46
- 'application/swf'
47
- end
48
-
49
- [ 200, { 'Content-Type' => type, 'Content-Length' => ::File.size(file).to_s }, [ ::File.read(file) ] ]
42
+ [ 200, { 'Content-Type' => 'text/javascript', 'Content-Length' => ::File.size(file).to_s }, [ ::File.read(file) ] ]
50
43
  end
51
44
  end
52
45
  end
53
-
data/lib/rack/livereload/body_processor.rb CHANGED
@@ -24,14 +24,6 @@ module Rack
24
24
  @processed = false
25
25
  end
26
26
 
27
- def force_swf?
28
- @options[:force_swf]
29
- end
30
-
31
- def with_swf?
32
- !@options[:no_swf]
33
- end
34
-
35
27
  def use_vendored?
36
28
  return @use_vendored if @use_vendored
37
29
 
@@ -113,4 +105,3 @@ module Rack
113
105
  end
114
106
  end
115
107
  end
116
-
data/skel/livereload.html.erb CHANGED
@@ -1,15 +1,10 @@
1
- <% if with_swf? %>
2
- <script type="text/javascript">
3
- WEB_SOCKET_SWF_LOCATION = "/__rack/WebSocketMain.swf";
4
- <% if force_swf? %>
5
- WEB_SOCKET_FORCE_FLASH = true;
6
- <% end %>
7
- </script>
8
- <script type="text/javascript" src="<%= app_root %>/__rack/swfobject.js"></script>
9
- <script type="text/javascript" src="<%= app_root %>/__rack/web_socket.js"></script>
10
- <% end %>
1
+ <% if defined?(SecureHeaders) %>
2
+ <script type="text/javascript" nonce="<%= content_security_policy_script_nonce %>">
3
+ RACK_LIVERELOAD_PORT = <%= @options[:live_reload_port] %>;
4
+ </script>
5
+ <% else %>
11
6
  <script type="text/javascript">
12
7
  RACK_LIVERELOAD_PORT = <%= @options[:live_reload_port] %>;
13
8
  </script>
9
+ <% end %>
14
10
  <script type="text/javascript" src="<%= livereload_source %>"></script>
15
-
data/spec/rack/livereload/body_processor_spec.rb CHANGED
@@ -6,16 +6,16 @@ describe Rack::LiveReload::BodyProcessor do
6
6
  let(:regex) { described_class::HEAD_TAG_REGEX }
7
7
  subject { regex }
8
8
 
9
- it { should be_kind_of(Regexp) }
9
+ it { is_expected.to be_kind_of(Regexp) }
10
10
 
11
11
  it 'only picks a valid <head> tag' do
12
- regex.match("<head></head>").to_s.should eq('<head>')
13
- regex.match("<head><title></title></head>").to_s.should eq('<head>')
14
- regex.match("<head attribute='something'><title></title></head>").to_s.should eq("<head attribute='something'>")
12
+ expect(regex.match("<head></head>").to_s).to eq('<head>')
13
+ expect(regex.match("<head><title></title></head>").to_s).to eq('<head>')
14
+ expect(regex.match("<head attribute='something'><title></title></head>").to_s).to eq("<head attribute='something'>")
15
15
  end
16
16
 
17
17
  it 'responds false when no head tag' do
18
- regex.match("<header></header>").should be_falsey
18
+ expect(regex.match("<header></header>")).to be_falsey
19
19
  end
20
20
  end
21
21
 
@@ -40,7 +40,7 @@ describe Rack::LiveReload::BodyProcessor do
40
40
  stub_request(:any, 'localhost:35729/livereload.js').to_timeout
41
41
  end
42
42
 
43
- it { should use_vendored }
43
+ it { is_expected.to use_vendored }
44
44
  end
45
45
 
46
46
  context 'exists' do
@@ -48,7 +48,7 @@ describe Rack::LiveReload::BodyProcessor do
48
48
  stub_request(:any, 'localhost:35729/livereload.js')
49
49
  end
50
50
 
51
- it { should_not use_vendored }
51
+ it { is_expected.not_to use_vendored }
52
52
  end
53
53
 
54
54
  context 'with custom port' do
@@ -58,20 +58,20 @@ describe Rack::LiveReload::BodyProcessor do
58
58
  before do
59
59
  stub_request(:any, 'localhost:12348/livereload.js')
60
60
  end
61
- it { should_not use_vendored }
61
+ it { is_expected.not_to use_vendored }
62
62
  end
63
63
  end
64
64
 
65
65
  context 'specify vendored' do
66
66
  let(:options) { { :source => :vendored } }
67
67
 
68
- it { should use_vendored }
68
+ it { is_expected.to use_vendored }
69
69
  end
70
70
 
71
71
  context 'specify LR' do
72
72
  let(:options) { { :source => :livereload } }
73
73
 
74
- it { should_not use_vendored }
74
+ it { is_expected.not_to use_vendored }
75
75
  end
76
76
  end
77
77
 
@@ -90,15 +90,12 @@ describe Rack::LiveReload::BodyProcessor do
90
90
 
91
91
  context 'vendored' do
92
92
  it 'should add the vendored livereload js script tag' do
93
- processed_body.should include("script")
94
- processed_body.should include(described_class::LIVERELOAD_JS_PATH)
93
+ expect(processed_body).to include("script")
94
+ expect(processed_body).to include(described_class::LIVERELOAD_JS_PATH)
95
95
 
96
- length.to_s.should == processed_body.length.to_s
96
+ expect(length.to_s).to eq(processed_body.length.to_s)
97
97
 
98
- described_class::LIVERELOAD_JS_PATH.should_not include(host)
99
-
100
- processed_body.should include('swfobject')
101
- processed_body.should include('web_socket')
98
+ expect(described_class::LIVERELOAD_JS_PATH).not_to include(host)
102
99
  end
103
100
  end
104
101
 
@@ -108,9 +105,9 @@ describe Rack::LiveReload::BodyProcessor do
108
105
  let(:body_dom) { Nokogiri::XML(processed_body) }
109
106
 
110
107
  it 'should add the livereload js script tag before all other script tags' do
111
- body_dom.at_css("head")[:attribute].should == 'attribute'
112
- body_dom.at_css("script:eq(5)")[:src].should include(described_class::LIVERELOAD_JS_PATH)
113
- body_dom.at_css("script:last-child")[:insert].should == "before"
108
+ expect(body_dom.at_css("head")[:attribute]).to eq('attribute')
109
+ expect(body_dom.at_css("script:eq(2)")[:src]).to include(described_class::LIVERELOAD_JS_PATH)
110
+ expect(body_dom.at_css("script:last-child")[:insert]).to eq("before")
114
111
  end
115
112
 
116
113
  context 'when a relative URL root is specified' do
@@ -119,7 +116,7 @@ describe Rack::LiveReload::BodyProcessor do
119
116
  end
120
117
 
121
118
  it 'should prepend the relative path to the script src' do
122
- body_dom.at_css("script:eq(5)")[:src].should match(%r{^/a_relative_path/})
119
+ expect(body_dom.at_css("script:eq(2)")[:src]).to match(%r{^/a_relative_path/})
123
120
  end
124
121
  end
125
122
  end
@@ -128,7 +125,7 @@ describe Rack::LiveReload::BodyProcessor do
128
125
  let(:options) { { :live_reload_port => 12345 }}
129
126
 
130
127
  it "sets the variable at the top of the file" do
131
- processed_body.should include 'RACK_LIVERELOAD_PORT = 12345'
128
+ expect(processed_body).to include 'RACK_LIVERELOAD_PORT = 12345'
132
129
  end
133
130
  end
134
131
 
@@ -138,8 +135,8 @@ describe Rack::LiveReload::BodyProcessor do
138
135
  let(:body_dom) { Nokogiri::XML(processed_body) }
139
136
 
140
137
  it 'should not add the livereload js' do
141
- body_dom.at_css("header")[:class].should == 'hero'
142
- body_dom.css('script').should be_empty
138
+ expect(body_dom.at_css("header")[:class]).to eq('hero')
139
+ expect(body_dom.css('script')).to be_empty
143
140
  end
144
141
  end
145
142
 
@@ -149,8 +146,8 @@ describe Rack::LiveReload::BodyProcessor do
149
146
  end
150
147
 
151
148
  it 'should add the LR livereload js script tag' do
152
- processed_body.should include("script")
153
- processed_body.should include(processor.livereload_local_uri.gsub('localhost', 'host'))
149
+ expect(processed_body).to include("script")
150
+ expect(processed_body).to include(processor.livereload_local_uri.gsub('localhost', 'host'))
154
151
  end
155
152
  end
156
153
 
@@ -162,29 +159,10 @@ describe Rack::LiveReload::BodyProcessor do
162
159
  let(:new_host) { 'myhost' }
163
160
 
164
161
  it 'should add the livereload.js script tag' do
165
- processed_body.should include("mindelay=#{min_delay}")
166
- processed_body.should include("maxdelay=#{max_delay}")
167
- processed_body.should include("port=#{port}")
168
- processed_body.should include("host=#{new_host}")
169
- end
170
- end
171
-
172
- context 'force flash' do
173
- let(:options) { { :force_swf => true } }
174
-
175
- it 'should not add the flash shim' do
176
- processed_body.should include('WEB_SOCKET_FORCE_FLASH')
177
- processed_body.should include('swfobject')
178
- processed_body.should include('web_socket')
179
- end
180
- end
181
-
182
- context 'no flash' do
183
- let(:options) { { :no_swf => true } }
184
-
185
- it 'should not add the flash shim' do
186
- processed_body.should_not include('swfobject')
187
- processed_body.should_not include('web_socket')
162
+ expect(processed_body).to include("mindelay=#{min_delay}")
163
+ expect(processed_body).to include("maxdelay=#{max_delay}")
164
+ expect(processed_body).to include("port=#{port}")
165
+ expect(processed_body).to include("host=#{new_host}")
188
166
  end
189
167
  end
190
168
 
@@ -192,9 +170,8 @@ describe Rack::LiveReload::BodyProcessor do
192
170
  let(:env) { {} }
193
171
 
194
172
  it 'should use localhost' do
195
- processed_body.should include('localhost')
173
+ expect(processed_body).to include('localhost')
196
174
  end
197
175
  end
198
176
  end
199
177
  end
200
-
data/spec/rack/livereload/processing_skip_analyzer_spec.rb CHANGED
@@ -14,7 +14,7 @@ describe Rack::LiveReload::ProcessingSkipAnalyzer do
14
14
 
15
15
  describe '#skip_processing?' do
16
16
  it "should skip processing" do
17
- subject.skip_processing?.should be_truthy
17
+ expect(subject.skip_processing?).to be_truthy
18
18
  end
19
19
  end
20
20
 
@@ -24,25 +24,25 @@ describe Rack::LiveReload::ProcessingSkipAnalyzer do
24
24
  context 'path contains ignore pattern' do
25
25
  let(:env) { { 'PATH_INFO' => '/this/file', 'QUERY_STRING' => '' } }
26
26
 
27
- it { should be_ignored }
27
+ it { is_expected.to be_ignored }
28
28
  end
29
29
 
30
30
  context 'root path' do
31
31
  let(:env) { { 'PATH_INFO' => '/', 'QUERY_STRING' => '' } }
32
32
 
33
- it { should_not be_ignored }
33
+ it { is_expected.not_to be_ignored }
34
34
  end
35
35
  end
36
36
 
37
37
  describe '#chunked?' do
38
38
  context 'regular response' do
39
- it { should_not be_chunked }
39
+ it { is_expected.not_to be_chunked }
40
40
  end
41
41
 
42
42
  context 'chunked response' do
43
43
  let(:headers) { { 'Transfer-Encoding' => 'chunked' } }
44
44
 
45
- it { should be_chunked }
45
+ it { is_expected.to be_chunked }
46
46
  end
47
47
  end
48
48
 
@@ -50,7 +50,7 @@ describe Rack::LiveReload::ProcessingSkipAnalyzer do
50
50
  context 'inline disposition' do
51
51
  let(:headers) { { 'Content-Disposition' => 'inline; filename=my_inlined_file' } }
52
52
 
53
- it { should be_inline }
53
+ it { is_expected.to be_inline }
54
54
  end
55
55
  end
56
56
 
@@ -60,31 +60,31 @@ describe Rack::LiveReload::ProcessingSkipAnalyzer do
60
60
  let(:env) { { 'PATH_INFO' => path_info, 'QUERY_STRING' => query_string } }
61
61
 
62
62
  context 'no ignore set' do
63
- it { should_not be_ignored }
63
+ it { is_expected.not_to be_ignored }
64
64
  end
65
65
 
66
66
  context 'ignore set' do
67
67
  let(:options) { { :ignore => [ %r{#{path_info}} ] } }
68
68
 
69
- it { should be_ignored }
69
+ it { is_expected.to be_ignored }
70
70
  end
71
71
 
72
72
  context 'ignore set including query_string' do
73
73
  let(:options) { { :ignore => [ %r{#{path_info}\?#{query_string}} ] } }
74
74
 
75
- it { should be_ignored }
75
+ it { is_expected.to be_ignored }
76
76
  end
77
77
  end
78
78
 
79
79
  describe '#bad_browser?' do
80
80
  context 'Firefox' do
81
- it { should_not be_bad_browser }
81
+ it { is_expected.not_to be_bad_browser }
82
82
  end
83
83
 
84
84
  context 'BAD browser' do
85
85
  let(:user_agent) { described_class::BAD_USER_AGENTS.first.source }
86
86
 
87
- it { should be_bad_browser }
87
+ it { is_expected.to be_bad_browser }
88
88
  end
89
89
  end
90
90
 
@@ -92,13 +92,13 @@ describe Rack::LiveReload::ProcessingSkipAnalyzer do
92
92
  context 'HTML content' do
93
93
  let(:headers) { { 'Content-Type' => 'text/html' } }
94
94
 
95
- it { should be_html }
95
+ it { is_expected.to be_html }
96
96
  end
97
97
 
98
98
  context 'PDF content' do
99
99
  let(:headers) { { 'Content-Type' => 'application/pdf' } }
100
100
 
101
- it { should_not be_html }
101
+ it { is_expected.not_to be_html }
102
102
  end
103
103
  end
104
104
 
@@ -106,31 +106,31 @@ describe Rack::LiveReload::ProcessingSkipAnalyzer do
106
106
  context 'GET request' do
107
107
  let(:env) { { 'REQUEST_METHOD' => 'GET' } }
108
108
 
109
- it { should be_get }
109
+ it { is_expected.to be_get }
110
110
  end
111
111
 
112
112
  context 'PUT request' do
113
113
  let(:env) { { 'REQUEST_METHOD' => 'PUT' } }
114
114
 
115
- it { should_not be_get }
115
+ it { is_expected.not_to be_get }
116
116
  end
117
117
 
118
118
  context 'POST request' do
119
119
  let(:env) { { 'REQUEST_METHOD' => 'POST' } }
120
120
 
121
- it { should_not be_get }
121
+ it { is_expected.not_to be_get }
122
122
  end
123
123
 
124
124
  context 'DELETE request' do
125
125
  let(:env) { { 'REQUEST_METHOD' => 'DELETE' } }
126
126
 
127
- it { should_not be_get }
127
+ it { is_expected.not_to be_get }
128
128
  end
129
129
 
130
130
  context 'PATCH request' do
131
131
  let(:env) { { 'REQUEST_METHOD' => 'PATCH' } }
132
132
 
133
- it { should_not be_get }
133
+ it { is_expected.not_to be_get }
134
134
  end
135
135
  end
136
136
  end
data/spec/rack/livereload_spec.rb CHANGED
@@ -8,7 +8,7 @@ describe Rack::LiveReload do
8
8
  subject { middleware }
9
9
 
10
10
  it 'should be an app' do
11
- middleware.app.should be == app
11
+ expect(middleware.app).to eq(app)
12
12
  end
13
13
 
14
14
  let(:env) { {} }
@@ -22,7 +22,7 @@ describe Rack::LiveReload do
22
22
  end
23
23
 
24
24
  it 'should return the js file' do
25
- middleware._call(env).should be_truthy
25
+ expect(middleware._call(env)).to be_truthy
26
26
  end
27
27
  end
28
28
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: leifcr-rack-livereload
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.3.16
4
+ version: 0.3.17
5
5
  platform: ruby
6
6
  authors:
7
7
  - John Bintz
@@ -255,13 +255,10 @@ files:
255
255
  - features/step_definitions/then/i_should_not_have_livereload_code.rb
256
256
  - features/step_definitions/when/i_make_a_request_with_headers.rb
257
257
  - features/support/env.rb
258
- - gemfiles/rails32.gemfile
259
- - gemfiles/rails40.gemfile
258
+ - gemfiles/rails42.gemfile
259
+ - gemfiles/rails50.gemfile
260
260
  - index.html
261
- - js/WebSocketMain.swf
262
261
  - js/livereload.js
263
- - js/swfobject.js
264
- - js/web_socket.js
265
262
  - lib/rack-livereload.rb
266
263
  - lib/rack/livereload.rb
267
264
  - lib/rack/livereload/body_processor.rb
data/js/WebSocketMain.swf DELETED
Binary file
data/js/swfobject.js DELETED
@@ -1,4 +0,0 @@
1
- /* SWFObject v2.2 <http://code.google.com/p/swfobject/>
2
- is released under the MIT License <http://www.opensource.org/licenses/mit-license.php>
3
- */
4
- var swfobject=function(){var D="undefined",r="object",S="Shockwave Flash",W="ShockwaveFlash.ShockwaveFlash",q="application/x-shockwave-flash",R="SWFObjectExprInst",x="onreadystatechange",O=window,j=document,t=navigator,T=false,U=[h],o=[],N=[],I=[],l,Q,E,B,J=false,a=false,n,G,m=true,M=function(){var aa=typeof j.getElementById!=D&&typeof j.getElementsByTagName!=D&&typeof j.createElement!=D,ah=t.userAgent.toLowerCase(),Y=t.platform.toLowerCase(),ae=Y?/win/.test(Y):/win/.test(ah),ac=Y?/mac/.test(Y):/mac/.test(ah),af=/webkit/.test(ah)?parseFloat(ah.replace(/^.*webkit\/(\d+(\.\d+)?).*$/,"$1")):false,X=!+"\v1",ag=[0,0,0],ab=null;if(typeof t.plugins!=D&&typeof t.plugins[S]==r){ab=t.plugins[S].description;if(ab&&!(typeof t.mimeTypes!=D&&t.mimeTypes[q]&&!t.mimeTypes[q].enabledPlugin)){T=true;X=false;ab=ab.replace(/^.*\s+(\S+\s+\S+$)/,"$1");ag[0]=parseInt(ab.replace(/^(.*)\..*$/,"$1"),10);ag[1]=parseInt(ab.replace(/^.*\.(.*)\s.*$/,"$1"),10);ag[2]=/[a-zA-Z]/.test(ab)?parseInt(ab.replace(/^.*[a-zA-Z]+(.*)$/,"$1"),10):0}}else{if(typeof O.ActiveXObject!=D){try{var ad=new ActiveXObject(W);if(ad){ab=ad.GetVariable("$version");if(ab){X=true;ab=ab.split(" ")[1].split(",");ag=[parseInt(ab[0],10),parseInt(ab[1],10),parseInt(ab[2],10)]}}}catch(Z){}}}return{w3:aa,pv:ag,wk:af,ie:X,win:ae,mac:ac}}(),k=function(){if(!M.w3){return}if((typeof j.readyState!=D&&j.readyState=="complete")||(typeof j.readyState==D&&(j.getElementsByTagName("body")[0]||j.body))){f()}if(!J){if(typeof j.addEventListener!=D){j.addEventListener("DOMContentLoaded",f,false)}if(M.ie&&M.win){j.attachEvent(x,function(){if(j.readyState=="complete"){j.detachEvent(x,arguments.callee);f()}});if(O==top){(function(){if(J){return}try{j.documentElement.doScroll("left")}catch(X){setTimeout(arguments.callee,0);return}f()})()}}if(M.wk){(function(){if(J){return}if(!/loaded|complete/.test(j.readyState)){setTimeout(arguments.callee,0);return}f()})()}s(f)}}();function f(){if(J){return}try{var Z=j.getElementsByTagName("body")[0].appendChild(C("span"));Z.parentNode.removeChild(Z)}catch(aa){return}J=true;var X=U.length;for(var Y=0;Y<X;Y++){U[Y]()}}function K(X){if(J){X()}else{U[U.length]=X}}function s(Y){if(typeof O.addEventListener!=D){O.addEventListener("load",Y,false)}else{if(typeof j.addEventListener!=D){j.addEventListener("load",Y,false)}else{if(typeof O.attachEvent!=D){i(O,"onload",Y)}else{if(typeof O.onload=="function"){var X=O.onload;O.onload=function(){X();Y()}}else{O.onload=Y}}}}}function h(){if(T){V()}else{H()}}function V(){var X=j.getElementsByTagName("body")[0];var aa=C(r);aa.setAttribute("type",q);var Z=X.appendChild(aa);if(Z){var Y=0;(function(){if(typeof Z.GetVariable!=D){var ab=Z.GetVariable("$version");if(ab){ab=ab.split(" ")[1].split(",");M.pv=[parseInt(ab[0],10),parseInt(ab[1],10),parseInt(ab[2],10)]}}else{if(Y<10){Y++;setTimeout(arguments.callee,10);return}}X.removeChild(aa);Z=null;H()})()}else{H()}}function H(){var ag=o.length;if(ag>0){for(var af=0;af<ag;af++){var Y=o[af].id;var ab=o[af].callbackFn;var aa={success:false,id:Y};if(M.pv[0]>0){var ae=c(Y);if(ae){if(F(o[af].swfVersion)&&!(M.wk&&M.wk<312)){w(Y,true);if(ab){aa.success=true;aa.ref=z(Y);ab(aa)}}else{if(o[af].expressInstall&&A()){var ai={};ai.data=o[af].expressInstall;ai.width=ae.getAttribute("width")||"0";ai.height=ae.getAttribute("height")||"0";if(ae.getAttribute("class")){ai.styleclass=ae.getAttribute("class")}if(ae.getAttribute("align")){ai.align=ae.getAttribute("align")}var ah={};var X=ae.getElementsByTagName("param");var ac=X.length;for(var ad=0;ad<ac;ad++){if(X[ad].getAttribute("name").toLowerCase()!="movie"){ah[X[ad].getAttribute("name")]=X[ad].getAttribute("value")}}P(ai,ah,Y,ab)}else{p(ae);if(ab){ab(aa)}}}}}else{w(Y,true);if(ab){var Z=z(Y);if(Z&&typeof Z.SetVariable!=D){aa.success=true;aa.ref=Z}ab(aa)}}}}}function z(aa){var X=null;var Y=c(aa);if(Y&&Y.nodeName=="OBJECT"){if(typeof Y.SetVariable!=D){X=Y}else{var Z=Y.getElementsByTagName(r)[0];if(Z){X=Z}}}return X}function A(){return !a&&F("6.0.65")&&(M.win||M.mac)&&!(M.wk&&M.wk<312)}function P(aa,ab,X,Z){a=true;E=Z||null;B={success:false,id:X};var ae=c(X);if(ae){if(ae.nodeName=="OBJECT"){l=g(ae);Q=null}else{l=ae;Q=X}aa.id=R;if(typeof aa.width==D||(!/%$/.test(aa.width)&&parseInt(aa.width,10)<310)){aa.width="310"}if(typeof aa.height==D||(!/%$/.test(aa.height)&&parseInt(aa.height,10)<137)){aa.height="137"}j.title=j.title.slice(0,47)+" - Flash Player Installation";var ad=M.ie&&M.win?"ActiveX":"PlugIn",ac="MMredirectURL="+O.location.toString().replace(/&/g,"%26")+"&MMplayerType="+ad+"&MMdoctitle="+j.title;if(typeof ab.flashvars!=D){ab.flashvars+="&"+ac}else{ab.flashvars=ac}if(M.ie&&M.win&&ae.readyState!=4){var Y=C("div");X+="SWFObjectNew";Y.setAttribute("id",X);ae.parentNode.insertBefore(Y,ae);ae.style.display="none";(function(){if(ae.readyState==4){ae.parentNode.removeChild(ae)}else{setTimeout(arguments.callee,10)}})()}u(aa,ab,X)}}function p(Y){if(M.ie&&M.win&&Y.readyState!=4){var X=C("div");Y.parentNode.insertBefore(X,Y);X.parentNode.replaceChild(g(Y),X);Y.style.display="none";(function(){if(Y.readyState==4){Y.parentNode.removeChild(Y)}else{setTimeout(arguments.callee,10)}})()}else{Y.parentNode.replaceChild(g(Y),Y)}}function g(ab){var aa=C("div");if(M.win&&M.ie){aa.innerHTML=ab.innerHTML}else{var Y=ab.getElementsByTagName(r)[0];if(Y){var ad=Y.childNodes;if(ad){var X=ad.length;for(var Z=0;Z<X;Z++){if(!(ad[Z].nodeType==1&&ad[Z].nodeName=="PARAM")&&!(ad[Z].nodeType==8)){aa.appendChild(ad[Z].cloneNode(true))}}}}}return aa}function u(ai,ag,Y){var X,aa=c(Y);if(M.wk&&M.wk<312){return X}if(aa){if(typeof ai.id==D){ai.id=Y}if(M.ie&&M.win){var ah="";for(var ae in ai){if(ai[ae]!=Object.prototype[ae]){if(ae.toLowerCase()=="data"){ag.movie=ai[ae]}else{if(ae.toLowerCase()=="styleclass"){ah+=' class="'+ai[ae]+'"'}else{if(ae.toLowerCase()!="classid"){ah+=" "+ae+'="'+ai[ae]+'"'}}}}}var af="";for(var ad in ag){if(ag[ad]!=Object.prototype[ad]){af+='<param name="'+ad+'" value="'+ag[ad]+'" />'}}aa.outerHTML='<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"'+ah+">"+af+"</object>";N[N.length]=ai.id;X=c(ai.id)}else{var Z=C(r);Z.setAttribute("type",q);for(var ac in ai){if(ai[ac]!=Object.prototype[ac]){if(ac.toLowerCase()=="styleclass"){Z.setAttribute("class",ai[ac])}else{if(ac.toLowerCase()!="classid"){Z.setAttribute(ac,ai[ac])}}}}for(var ab in ag){if(ag[ab]!=Object.prototype[ab]&&ab.toLowerCase()!="movie"){e(Z,ab,ag[ab])}}aa.parentNode.replaceChild(Z,aa);X=Z}}return X}function e(Z,X,Y){var aa=C("param");aa.setAttribute("name",X);aa.setAttribute("value",Y);Z.appendChild(aa)}function y(Y){var X=c(Y);if(X&&X.nodeName=="OBJECT"){if(M.ie&&M.win){X.style.display="none";(function(){if(X.readyState==4){b(Y)}else{setTimeout(arguments.callee,10)}})()}else{X.parentNode.removeChild(X)}}}function b(Z){var Y=c(Z);if(Y){for(var X in Y){if(typeof Y[X]=="function"){Y[X]=null}}Y.parentNode.removeChild(Y)}}function c(Z){var X=null;try{X=j.getElementById(Z)}catch(Y){}return X}function C(X){return j.createElement(X)}function i(Z,X,Y){Z.attachEvent(X,Y);I[I.length]=[Z,X,Y]}function F(Z){var Y=M.pv,X=Z.split(".");X[0]=parseInt(X[0],10);X[1]=parseInt(X[1],10)||0;X[2]=parseInt(X[2],10)||0;return(Y[0]>X[0]||(Y[0]==X[0]&&Y[1]>X[1])||(Y[0]==X[0]&&Y[1]==X[1]&&Y[2]>=X[2]))?true:false}function v(ac,Y,ad,ab){if(M.ie&&M.mac){return}var aa=j.getElementsByTagName("head")[0];if(!aa){return}var X=(ad&&typeof ad=="string")?ad:"screen";if(ab){n=null;G=null}if(!n||G!=X){var Z=C("style");Z.setAttribute("type","text/css");Z.setAttribute("media",X);n=aa.appendChild(Z);if(M.ie&&M.win&&typeof j.styleSheets!=D&&j.styleSheets.length>0){n=j.styleSheets[j.styleSheets.length-1]}G=X}if(M.ie&&M.win){if(n&&typeof n.addRule==r){n.addRule(ac,Y)}}else{if(n&&typeof j.createTextNode!=D){n.appendChild(j.createTextNode(ac+" {"+Y+"}"))}}}function w(Z,X){if(!m){return}var Y=X?"visible":"hidden";if(J&&c(Z)){c(Z).style.visibility=Y}else{v("#"+Z,"visibility:"+Y)}}function L(Y){var Z=/[\\\"<>\.;]/;var X=Z.exec(Y)!=null;return X&&typeof encodeURIComponent!=D?encodeURIComponent(Y):Y}var d=function(){if(M.ie&&M.win){window.attachEvent("onunload",function(){var ac=I.length;for(var ab=0;ab<ac;ab++){I[ab][0].detachEvent(I[ab][1],I[ab][2])}var Z=N.length;for(var aa=0;aa<Z;aa++){y(N[aa])}for(var Y in M){M[Y]=null}M=null;for(var X in swfobject){swfobject[X]=null}swfobject=null})}}();return{registerObject:function(ab,X,aa,Z){if(M.w3&&ab&&X){var Y={};Y.id=ab;Y.swfVersion=X;Y.expressInstall=aa;Y.callbackFn=Z;o[o.length]=Y;w(ab,false)}else{if(Z){Z({success:false,id:ab})}}},getObjectById:function(X){if(M.w3){return z(X)}},embedSWF:function(ab,ah,ae,ag,Y,aa,Z,ad,af,ac){var X={success:false,id:ah};if(M.w3&&!(M.wk&&M.wk<312)&&ab&&ah&&ae&&ag&&Y){w(ah,false);K(function(){ae+="";ag+="";var aj={};if(af&&typeof af===r){for(var al in af){aj[al]=af[al]}}aj.data=ab;aj.width=ae;aj.height=ag;var am={};if(ad&&typeof ad===r){for(var ak in ad){am[ak]=ad[ak]}}if(Z&&typeof Z===r){for(var ai in Z){if(typeof am.flashvars!=D){am.flashvars+="&"+ai+"="+Z[ai]}else{am.flashvars=ai+"="+Z[ai]}}}if(F(Y)){var an=u(aj,am,ah);if(aj.id==ah){w(ah,true)}X.success=true;X.ref=an}else{if(aa&&A()){aj.data=aa;P(aj,am,ah,ac);return}else{w(ah,true)}}if(ac){ac(X)}})}else{if(ac){ac(X)}}},switchOffAutoHideShow:function(){m=false},ua:M,getFlashPlayerVersion:function(){return{major:M.pv[0],minor:M.pv[1],release:M.pv[2]}},hasFlashPlayerVersion:F,createSWF:function(Z,Y,X){if(M.w3){return u(Z,Y,X)}else{return undefined}},showExpressInstall:function(Z,aa,X,Y){if(M.w3&&A()){P(Z,aa,X,Y)}},removeSWF:function(X){if(M.w3){y(X)}},createCSS:function(aa,Z,Y,X){if(M.w3){v(aa,Z,Y,X)}},addDomLoadEvent:K,addLoadEvent:s,getQueryParamValue:function(aa){var Z=j.location.search||j.location.hash;if(Z){if(/\?/.test(Z)){Z=Z.split("?")[1]}if(aa==null){return L(Z)}var Y=Z.split("&");for(var X=0;X<Y.length;X++){if(Y[X].substring(0,Y[X].indexOf("="))==aa){return L(Y[X].substring((Y[X].indexOf("=")+1)))}}}return""},expressInstallCallback:function(){if(a){var X=c(R);if(X&&l){X.parentNode.replaceChild(l,X);if(Q){w(Q,true);if(M.ie&&M.win){l.style.display="block"}}if(E){E(B)}}a=false}}}}();
data/js/web_socket.js DELETED
@@ -1,379 +0,0 @@
1
- // Copyright: Hiroshi Ichikawa <http://gimite.net/en/>
2
- // License: New BSD License
3
- // Reference: http://dev.w3.org/html5/websockets/
4
- // Reference: http://tools.ietf.org/html/draft-ietf-hybi-thewebsocketprotocol-10
5
-
6
- (function() {
7
-
8
- if (window.WebSocket && !window.WEB_SOCKET_FORCE_FLASH) return;
9
-
10
- var logger;
11
- if (window.WEB_SOCKET_LOGGER) {
12
- logger = WEB_SOCKET_LOGGER;
13
- } else if (window.console && window.console.log && window.console.error) {
14
- // In some environment, console is defined but console.log or console.error is missing.
15
- logger = window.console;
16
- } else {
17
- logger = {log: function(){ }, error: function(){ }};
18
- }
19
-
20
- // swfobject.hasFlashPlayerVersion("10.0.0") doesn't work with Gnash.
21
- if (swfobject.getFlashPlayerVersion().major < 10) {
22
- logger.error("Flash Player >= 10.0.0 is required.");
23
- return;
24
- }
25
- if (location.protocol == "file:") {
26
- logger.error(
27
- "WARNING: web-socket-js doesn't work in file:///... URL " +
28
- "unless you set Flash Security Settings properly. " +
29
- "Open the page via Web server i.e. http://...");
30
- }
31
-
32
- /**
33
- * This class represents a faux web socket.
34
- * @param {string} url
35
- * @param {array or string} protocols
36
- * @param {string} proxyHost
37
- * @param {int} proxyPort
38
- * @param {string} headers
39
- */
40
- WebSocket = function(url, protocols, proxyHost, proxyPort, headers) {
41
- var self = this;
42
- self.__id = WebSocket.__nextId++;
43
- WebSocket.__instances[self.__id] = self;
44
- self.readyState = WebSocket.CONNECTING;
45
- self.bufferedAmount = 0;
46
- self.__events = {};
47
- if (!protocols) {
48
- protocols = [];
49
- } else if (typeof protocols == "string") {
50
- protocols = [protocols];
51
- }
52
- // Uses setTimeout() to make sure __createFlash() runs after the caller sets ws.onopen etc.
53
- // Otherwise, when onopen fires immediately, onopen is called before it is set.
54
- self.__createTask = setTimeout(function() {
55
- WebSocket.__addTask(function() {
56
- self.__createTask = null;
57
- WebSocket.__flash.create(
58
- self.__id, url, protocols, proxyHost || null, proxyPort || 0, headers || null);
59
- });
60
- }, 0);
61
- };
62
-
63
- /**
64
- * Send data to the web socket.
65
- * @param {string} data The data to send to the socket.
66
- * @return {boolean} True for success, false for failure.
67
- */
68
- WebSocket.prototype.send = function(data) {
69
- if (this.readyState == WebSocket.CONNECTING) {
70
- throw "INVALID_STATE_ERR: Web Socket connection has not been established";
71
- }
72
- // We use encodeURIComponent() here, because FABridge doesn't work if
73
- // the argument includes some characters. We don't use escape() here
74
- // because of this:
75
- // https://developer.mozilla.org/en/Core_JavaScript_1.5_Guide/Functions#escape_and_unescape_Functions
76
- // But it looks decodeURIComponent(encodeURIComponent(s)) doesn't
77
- // preserve all Unicode characters either e.g. "\uffff" in Firefox.
78
- // Note by wtritch: Hopefully this will not be necessary using ExternalInterface. Will require
79
- // additional testing.
80
- var result = WebSocket.__flash.send(this.__id, encodeURIComponent(data));
81
- if (result < 0) { // success
82
- return true;
83
- } else {
84
- this.bufferedAmount += result;
85
- return false;
86
- }
87
- };
88
-
89
- /**
90
- * Close this web socket gracefully.
91
- */
92
- WebSocket.prototype.close = function() {
93
- if (this.__createTask) {
94
- clearTimeout(this.__createTask);
95
- this.__createTask = null;
96
- this.readyState = WebSocket.CLOSED;
97
- return;
98
- }
99
- if (this.readyState == WebSocket.CLOSED || this.readyState == WebSocket.CLOSING) {
100
- return;
101
- }
102
- this.readyState = WebSocket.CLOSING;
103
- WebSocket.__flash.close(this.__id);
104
- };
105
-
106
- /**
107
- * Implementation of {@link <a href="http://www.w3.org/TR/DOM-Level-2-Events/events.html#Events-registration">DOM 2 EventTarget Interface</a>}
108
- *
109
- * @param {string} type
110
- * @param {function} listener
111
- * @param {boolean} useCapture
112
- * @return void
113
- */
114
- WebSocket.prototype.addEventListener = function(type, listener, useCapture) {
115
- if (!(type in this.__events)) {
116
- this.__events[type] = [];
117
- }
118
- this.__events[type].push(listener);
119
- };
120
-
121
- /**
122
- * Implementation of {@link <a href="http://www.w3.org/TR/DOM-Level-2-Events/events.html#Events-registration">DOM 2 EventTarget Interface</a>}
123
- *
124
- * @param {string} type
125
- * @param {function} listener
126
- * @param {boolean} useCapture
127
- * @return void
128
- */
129
- WebSocket.prototype.removeEventListener = function(type, listener, useCapture) {
130
- if (!(type in this.__events)) return;
131
- var events = this.__events[type];
132
- for (var i = events.length - 1; i >= 0; --i) {
133
- if (events[i] === listener) {
134
- events.splice(i, 1);
135
- break;
136
- }
137
- }
138
- };
139
-
140
- /**
141
- * Implementation of {@link <a href="http://www.w3.org/TR/DOM-Level-2-Events/events.html#Events-registration">DOM 2 EventTarget Interface</a>}
142
- *
143
- * @param {Event} event
144
- * @return void
145
- */
146
- WebSocket.prototype.dispatchEvent = function(event) {
147
- var events = this.__events[event.type] || [];
148
- for (var i = 0; i < events.length; ++i) {
149
- events[i](event);
150
- }
151
- var handler = this["on" + event.type];
152
- if (handler) handler.apply(this, [event]);
153
- };
154
-
155
- /**
156
- * Handles an event from Flash.
157
- * @param {Object} flashEvent
158
- */
159
- WebSocket.prototype.__handleEvent = function(flashEvent) {
160
-
161
- if ("readyState" in flashEvent) {
162
- this.readyState = flashEvent.readyState;
163
- }
164
- if ("protocol" in flashEvent) {
165
- this.protocol = flashEvent.protocol;
166
- }
167
-
168
- var jsEvent;
169
- if (flashEvent.type == "open" || flashEvent.type == "error") {
170
- jsEvent = this.__createSimpleEvent(flashEvent.type);
171
- } else if (flashEvent.type == "close") {
172
- jsEvent = this.__createSimpleEvent("close");
173
- jsEvent.wasClean = flashEvent.wasClean ? true : false;
174
- jsEvent.code = flashEvent.code;
175
- jsEvent.reason = flashEvent.reason;
176
- } else if (flashEvent.type == "message") {
177
- var data = decodeURIComponent(flashEvent.message);
178
- jsEvent = this.__createMessageEvent("message", data);
179
- } else {
180
- throw "unknown event type: " + flashEvent.type;
181
- }
182
-
183
- this.dispatchEvent(jsEvent);
184
-
185
- };
186
-
187
- WebSocket.prototype.__createSimpleEvent = function(type) {
188
- if (document.createEvent && window.Event) {
189
- var event = document.createEvent("Event");
190
- event.initEvent(type, false, false);
191
- return event;
192
- } else {
193
- return {type: type, bubbles: false, cancelable: false};
194
- }
195
- };
196
-
197
- WebSocket.prototype.__createMessageEvent = function(type, data) {
198
- if (document.createEvent && window.MessageEvent && !window.opera) {
199
- var event = document.createEvent("MessageEvent");
200
- event.initMessageEvent("message", false, false, data, null, null, window, null);
201
- return event;
202
- } else {
203
- // IE and Opera, the latter one truncates the data parameter after any 0x00 bytes.
204
- return {type: type, data: data, bubbles: false, cancelable: false};
205
- }
206
- };
207
-
208
- /**
209
- * Define the WebSocket readyState enumeration.
210
- */
211
- WebSocket.CONNECTING = 0;
212
- WebSocket.OPEN = 1;
213
- WebSocket.CLOSING = 2;
214
- WebSocket.CLOSED = 3;
215
-
216
- WebSocket.__flash = null;
217
- WebSocket.__instances = {};
218
- WebSocket.__tasks = [];
219
- WebSocket.__nextId = 0;
220
-
221
- /**
222
- * Load a new flash security policy file.
223
- * @param {string} url
224
- */
225
- WebSocket.loadFlashPolicyFile = function(url){
226
- WebSocket.__addTask(function() {
227
- WebSocket.__flash.loadManualPolicyFile(url);
228
- });
229
- };
230
-
231
- /**
232
- * Loads WebSocketMain.swf and creates WebSocketMain object in Flash.
233
- */
234
- WebSocket.__initialize = function() {
235
- if (WebSocket.__flash) return;
236
-
237
- if (WebSocket.__swfLocation) {
238
- // For backword compatibility.
239
- window.WEB_SOCKET_SWF_LOCATION = WebSocket.__swfLocation;
240
- }
241
- if (!window.WEB_SOCKET_SWF_LOCATION) {
242
- logger.error("[WebSocket] set WEB_SOCKET_SWF_LOCATION to location of WebSocketMain.swf");
243
- return;
244
- }
245
- if (!window.WEB_SOCKET_SUPPRESS_CROSS_DOMAIN_SWF_ERROR &&
246
- !WEB_SOCKET_SWF_LOCATION.match(/(^|\/)WebSocketMainInsecure\.swf(\?.*)?$/) &&
247
- WEB_SOCKET_SWF_LOCATION.match(/^\w+:\/\/([^\/]+)/)) {
248
- var swfHost = RegExp.$1;
249
- if (location.host != swfHost) {
250
- logger.error(
251
- "[WebSocket] You must host HTML and WebSocketMain.swf in the same host " +
252
- "('" + location.host + "' != '" + swfHost + "'). " +
253
- "See also 'How to host HTML file and SWF file in different domains' section " +
254
- "in README.md. If you use WebSocketMainInsecure.swf, you can suppress this message " +
255
- "by WEB_SOCKET_SUPPRESS_CROSS_DOMAIN_SWF_ERROR = true;");
256
- }
257
- }
258
- var container = document.createElement("div");
259
- container.id = "webSocketContainer";
260
- // Hides Flash box. We cannot use display: none or visibility: hidden because it prevents
261
- // Flash from loading at least in IE. So we move it out of the screen at (-100, -100).
262
- // But this even doesn't work with Flash Lite (e.g. in Droid Incredible). So with Flash
263
- // Lite, we put it at (0, 0). This shows 1x1 box visible at left-top corner but this is
264
- // the best we can do as far as we know now.
265
- container.style.position = "absolute";
266
- if (WebSocket.__isFlashLite()) {
267
- container.style.left = "0px";
268
- container.style.top = "0px";
269
- } else {
270
- container.style.left = "-100px";
271
- container.style.top = "-100px";
272
- }
273
- var holder = document.createElement("div");
274
- holder.id = "webSocketFlash";
275
- container.appendChild(holder);
276
- document.body.appendChild(container);
277
- // See this article for hasPriority:
278
- // http://help.adobe.com/en_US/as3/mobile/WS4bebcd66a74275c36cfb8137124318eebc6-7ffd.html
279
- swfobject.embedSWF(
280
- WEB_SOCKET_SWF_LOCATION,
281
- "webSocketFlash",
282
- "1" /* width */,
283
- "1" /* height */,
284
- "10.0.0" /* SWF version */,
285
- null,
286
- null,
287
- {hasPriority: true, swliveconnect : true, allowScriptAccess: "always"},
288
- null,
289
- function(e) {
290
- if (!e.success) {
291
- logger.error("[WebSocket] swfobject.embedSWF failed");
292
- }
293
- });
294
- };
295
-
296
- /**
297
- * Called by Flash to notify JS that it's fully loaded and ready
298
- * for communication.
299
- */
300
- WebSocket.__onFlashInitialized = function() {
301
- // We need to set a timeout here to avoid round-trip calls
302
- // to flash during the initialization process.
303
- setTimeout(function() {
304
- WebSocket.__flash = document.getElementById("webSocketFlash");
305
- WebSocket.__flash.setCallerUrl(location.href);
306
- WebSocket.__flash.setDebug(!!window.WEB_SOCKET_DEBUG);
307
- for (var i = 0; i < WebSocket.__tasks.length; ++i) {
308
- WebSocket.__tasks[i]();
309
- }
310
- WebSocket.__tasks = [];
311
- }, 0);
312
- };
313
-
314
- /**
315
- * Called by Flash to notify WebSockets events are fired.
316
- */
317
- WebSocket.__onFlashEvent = function() {
318
- setTimeout(function() {
319
- try {
320
- // Gets events using receiveEvents() instead of getting it from event object
321
- // of Flash event. This is to make sure to keep message order.
322
- // It seems sometimes Flash events don't arrive in the same order as they are sent.
323
- var events = WebSocket.__flash.receiveEvents();
324
- for (var i = 0; i < events.length; ++i) {
325
- WebSocket.__instances[events[i].webSocketId].__handleEvent(events[i]);
326
- }
327
- } catch (e) {
328
- logger.error(e);
329
- }
330
- }, 0);
331
- return true;
332
- };
333
-
334
- // Called by Flash.
335
- WebSocket.__log = function(message) {
336
- logger.log(decodeURIComponent(message));
337
- };
338
-
339
- // Called by Flash.
340
- WebSocket.__error = function(message) {
341
- logger.error(decodeURIComponent(message));
342
- };
343
-
344
- WebSocket.__addTask = function(task) {
345
- if (WebSocket.__flash) {
346
- task();
347
- } else {
348
- WebSocket.__tasks.push(task);
349
- }
350
- };
351
-
352
- /**
353
- * Test if the browser is running flash lite.
354
- * @return {boolean} True if flash lite is running, false otherwise.
355
- */
356
- WebSocket.__isFlashLite = function() {
357
- if (!window.navigator || !window.navigator.mimeTypes) {
358
- return false;
359
- }
360
- var mimeType = window.navigator.mimeTypes["application/x-shockwave-flash"];
361
- if (!mimeType || !mimeType.enabledPlugin || !mimeType.enabledPlugin.filename) {
362
- return false;
363
- }
364
- return mimeType.enabledPlugin.filename.match(/flashlite/i) ? true : false;
365
- };
366
-
367
- if (!window.WEB_SOCKET_DISABLE_AUTO_INITIALIZATION) {
368
- if (window.addEventListener) {
369
- window.addEventListener("load", function(){
370
- WebSocket.__initialize();
371
- }, false);
372
- } else {
373
- window.attachEvent("onload", function(){
374
- WebSocket.__initialize();
375
- });
376
- }
377
- }
378
-
379
- })();