Route external redirections through a different origin

Thibaut committed 11 years ago

Commit ac2cbdd1 parent e1ec0f56 files · +20 −11Browse files

Unified · Split

6 files

README.md +1 −1
assets/javascripts/news.json +1 −1
assets/javascripts/templates/notif_tmpl.coffee +4 −4
assets/javascripts/templates/pages/about_tmpl.coffee +3 −3
assets/javascripts/templates/pages/root_tmpl.coffee.erb +2 −2
lib/app.rb +9 −0

@@ -3,7 +3,7 @@ · 2 unmodified lines
3	3	DevDocs combines multiple API documentations in a fast, organized, and searchable interface.
4	4
5	5	* Created by [Thibaut Courouble](http://thibaut.me)
6		−* Supported by [JetBrains](http://devdocs.io/s/jetbrains) and [Code School](http://devdocs.io/s/code-school)
	6	+* Supported by [JetBrains](http://out.devdocs.io/s/jetbrains) and [Code School](http://out.devdocs.io/s/code-school)
7	7
8	8	Keep track of development and community news:
9	9

assets/javascripts/news.json+1−1

@@ -17,7 +17,7 @@ · 16 unmodified lines
17	17	"Added <code class=\"_label\">shift + ↓/↑</code> shortcut for scrolling (same as <code class=\"_label\">alt + ↓/↑</code>)."
18	18	], [
19	19	"2015-07-12",
20		− "New sponsors: <a href=\"http://devdocs.io/s/jetbrains\">JetBrains</a> and <a href=\"http://devdocs.io/s/code-school\">Code School</a>\nIf you like DevDocs, please take a moment to check out their products — they're awesome!"
	20	+ "New sponsors: <a href=\"http://out.devdocs.io/s/jetbrains\">JetBrains</a> and <a href=\"http://out.devdocs.io/s/code-school\">Code School</a>\nIf you like DevDocs, please take a moment to check out their products — they're awesome!"
21	21	], [
22	22	"2015-07-05",
23	23	"New documentations: <a href=\"/drupal/\">Drupal</a>, <a href=\"/vue/\">Vue.js</a>, <a href=\"/phaser/\">Phaser</a> and <a href=\"/webpack/\">webpack</a>"

assets/javascripts/templates/notif_tmpl.coffee+4−4

@@ -29,15 +29,15 @@ app.templates.notifNews = (news) -> · 28 unmodified lines
29	29	app.templates.notifShare = ->
30	30	textNotif """ Hi there! """,
31	31	""" Like DevDocs? Help us reach more developers by sharing the link with your friends, on
32		− <a href="/s/tw" target="_blank">Twitter</a>, <a href="/s/fb" target="_blank">Facebook</a>,
33		− <a href="/s/re" target="_blank">Reddit</a>, etc.<br>Thanks :) """
	32	+ <a href="http://out.devdocs.io/s/tw" target="_blank">Twitter</a>, <a href="http://out.devdocs.io/s/fb" target="_blank">Facebook</a>,
	33	+ <a href="http://out.devdocs.io/s/re" target="_blank">Reddit</a>, etc.<br>Thanks :) """
34	34
35	35	app.templates.notifThanks = ->
36	36	textNotif """ Hi there! """,
37	37	""" <p class="_notif-text">Like DevDocs? Check out these awesome companies who are making it possible:
38	38	<ul class="_notif-list">
39		− <li><a href="http://devdocs.io/s/jetbrains" target="_blank">JetBrains</a> — We make software development a more productive and enjoyable experience through smart IDEs and code editors.
40		− <li><a href="http://devdocs.io/s/code-school" target="_blank">Code School</a> — Learn new skills from the comfort of your own browser. Offering more than 45 courses covering JavaScript, HTML/CSS, Ruby, Git, and iOS for only $29/month.
	39	+ <li><a href="http://out.devdocs.io/s/jetbrains" target="_blank">JetBrains</a> — We make software development a more productive and enjoyable experience through smart IDEs and code editors.
	40	+ <li><a href="http://out.devdocs.io/s/code-school" target="_blank">Code School</a> — Learn new skills from the comfort of your own browser. Offering more than 45 courses covering JavaScript, HTML/CSS, Ruby, Git, and iOS for only $29/month.
41	41	</ul>
42	42	<p class="_notif-text">Have a great day :) """
43	43

assets/javascripts/templates/pages/about_tmpl.coffee+3−3

@@ -13,7 +13,7 @@ app.templates.aboutPage = -> """ · 12 unmodified lines
13	13	<p>DevDocs combines multiple API documentations in a fast, organized, and searchable interface.
14	14	<ul>
15	15	<li>Created and maintained by <a href="http://thibaut.me">Thibaut Courouble</a>
16		− <li>Supported by <a href="http://devdocs.io/s/jetbrains">JetBrains</a> and <a href="http://devdocs.io/s/code-school">Code School</a>
	16	+ <li>Supported by <a href="http://out.devdocs.io/s/jetbrains">JetBrains</a> and <a href="http://out.devdocs.io/s/code-school">Code School</a>
17	17	<li>Free and <a href="https://github.com/Thibaut/devdocs">open source</a>
18	18	<iframe class="_github-btn" src="https://ghbtns.com/github-btn.html?user=Thibaut&repo=devdocs&type=watch&count=true" allowtransparency="true" frameborder="0" scrolling="0" width="100" height="20"></iframe>
19	19	</ul>
@@ -30,8 +30,8 @@ app.templates.aboutPage = -> """ · 10 unmodified lines
30	30
31	31	<p><strong>Special thanks to:</strong>
32	32	<ul>
33		− <li><a href="http://devdocs.io/s/maxcdn">MaxCDN</a> and <a href="http://get.gaug.es/?utm_source=devdocs&utm_medium=referral&utm_campaign=sponsorships" title="Real Time Web Analytics">Gauges</a> for offering a free account to DevDocs
34		− <li><a href="http://devdocs.io/s/shopify">Shopify</a> for supporting DevDocs in the past
	33	+ <li><a href="http://out.devdocs.io/s/maxcdn">MaxCDN</a> and <a href="http://get.gaug.es/?utm_source=devdocs&utm_medium=referral&utm_campaign=sponsorships" title="Real Time Web Analytics">Gauges</a> for offering a free account to DevDocs
	34	+ <li><a href="http://out.devdocs.io/s/shopify">Shopify</a> for supporting DevDocs in the past
35	35	<li><a href="https://www.heroku.com">Heroku</a> and <a href="http://newrelic.com">New Relic</a> for providing awesome free service
36	36	<li>Daniel Bruce for the <a href="http://www.entypo.com">Entypo</a> pictograms
37	37	<li><a href="http://www.jeremykratz.com/">Jeremy Kratz</a> for the C/C++ logo

assets/javascripts/templates/pages/root_tmpl.coffee.erb+2−2

@@ -3,7 +3,7 @@ jetBrainsLink = (className) -> · 2 unmodified lines
3	3	path = "/#{type}" if type
4	4
5	5	"""
6		− <a href="http://devdocs.io/s/jetbrains#{path \|\| ''}" class="#{className}">
	6	+ <a href="http://out.devdocs.io/s/jetbrains#{path \|\| ''}" class="#{className}">
7	7	<span class="_logo-thx _jetbrains-logo">JetBrains</span>
8	8	<span class="_logo-info">#{JETBRAINS_INFO[type \|\| 'default']}</span>
9	9	</a>
@@ -29,7 +29,7 @@ jetBrainsType = -> · 19 unmodified lines
29	29	'web'
30	30
31	31	codeSchoolLink = (className) -> """
32		− <a href="http://devdocs.io/s/code-school" class="#{className}">
	32	+ <a href="http://out.devdocs.io/s/code-school" class="#{className}">
33	33	<span class="_logo-thx _code-school-logo">Code School</span>
34	34	<span class="_logo-info">With more than 45 courses covering JavaScript, HTML/CSS, Ruby, Git, and iOS, Code School pairs experienced instructors with engaging content. Start learning at codeschool.com.</span>
35	35	</a>

lib/app.rb+9−0

@@ -172,6 +172,15 @@ class App < Sinatra::Application · 171 unmodified lines
172	172	halt erb :unsupported if unsupported_browser?
173	173	end
174	174
	175	+ OUT_HOST = 'out.devdocs.io'.freeze
	176	+
	177	+ before do
	178	+ if request.host == OUT_HOST && !request.path.start_with?('/s/')
	179	+ query_string = "?#{request.query_string}" unless request.query_string.empty?
	180	+ redirect "http://devdocs.io#{request.path}#{query_string}", 302
	181	+ end
	182	+ end
	183	+
175	184	get '/manifest.appcache' do
176	185	content_type 'text/cache-manifest'
177	186	expires 0, :'no-cache'