Finish Fish scraper

Thibaut Courouble committed 10 years ago

Commit 575e5591 parent e25b05411 files · +29 −19Browse files

Unified · Split

11 files

Binary file not shown.

Binary file not shown.

@@ -1,7 +1,7 @@
1	1	[
2	2	[
3	3	"2016-09-05",
4		− "New documentation: <a href=\"/bottle/\">Bottle</a>"
	4	+ "New documentations: <a href=\"/fish/\">Fish</a> and <a href=\"/bottle/\">Bottle</a>"
5	5	], [
6	6	"2016-08-07",
7	7	"New documentation: <a href=\"/docker/\">Docker</a>"

@@ -219,6 +219,11 @@ credits = [ · 218 unmodified lines
219	219	'2016 StrongLoop, IBM, and other expressjs.com contributors.',
220	220	'Unknown',
221	221	'https://github.com/expressjs/expressjs.com/issues/413'
	222	+ ], [
	223	+ 'Fish',
	224	+ '2005-2009 Axel Liljencrantz',
	225	+ 'GPLv2',
	226	+ 'https://fishshell.com/docs/current/license.html'
222	227	], [
223	228	'GCC<br>GNU Fortran',
224	229	'Free Software Foundation',

@@ -116,6 +116,7 @@ · 115 unmodified lines
116	116	._icon-socketio:before { background-position: -2rem -6rem; }
117	117	._icon-modernizr:before { background-position: -3rem -6rem; }
118	118	._icon-bower:before { background-position: -4rem -6rem; }
	119	+._icon-fish:before { background-position: -5rem -6rem; @extend %darkIconFix !optional; }
119	120	._icon-bottle:before { background-position: 0 -7rem; }
120	121	._icon-docker:before { background-position: -1rem -7rem; }
121	122	._icon-cakephp:before { background-position: -2rem -7rem; }

@@ -14,12 +14,12 @@ module Docs · 13 unmodified lines
14	14	node.name = 'h2'
15	15	end
16	16
17		− css('h2 > a').each do \|node\|
	17	+ css('.anchor').each do \|node\|
18	18	node.parent['id'] = node['id']
19	19	end
20	20
21	21	css('pre').each do \|node\|
22		− node['class'] = 'fish' # Prism may support fish in the future
	22	+ node['data-language'] = 'fish' # Prism may support fish in the future
23	23	node.content = node.content
24	24	end
25	25

@@ -1,17 +1,28 @@
1	1	module Docs
2	2	class Fish
3	3	class EntriesFilter < Docs::EntriesFilter
	4	+ def get_name
	5	+ if slug == 'faq'
	6	+ 'FAQ'
	7	+ else
	8	+ slug.capitalize
	9	+ end
	10	+ end
4	11
5		− def include_default_entry?
6		− false
	12	+ def get_type
	13	+ if root_page? \|\| slug == 'faq'
	14	+ 'Manual'
	15	+ else
	16	+ name
	17	+ end
7	18	end
8	19
9	20	def additional_entries
10		− css('h2').each_with_object [] do \|node, entries\|
11		− name = node.content.split(' - ').first
12		− id = node['id']
13		− type = root_page? ? 'Reference' : (slug == 'faq' ? 'FAQ' : slug.capitalize)
14		− entries << [name, id, type]
	21	+ return [] if slug == 'faq'
	22	+ css('h2').map.with_index do \|node, i\|
	23	+ name = node.content.split(' - ').first.strip
	24	+ name.prepend "#{i + 1}. " unless slug == 'commands'
	25	+ [name, node['id'], get_type]
15	26	end
16	27	end
17	28	end

@@ -2,35 +2,29 @@ module Docs · 1 unmodified line
2	2	class Fish < UrlScraper
3	3	self.name = 'Fish'
4	4	self.type = 'fish'
	5	+ self.root_path = 'index.html'
5	6	self.links = {
6		− home: 'http://fishshell.com/',
	7	+ home: 'https://fishshell.com/',
7	8	code: 'https://github.com/fish-shell/fish-shell'
8	9	}
9	10
10	11	html_filters.push 'fish/clean_html', 'fish/entries'
11	12
12		− options[:only] = %w(
13		− index.html
14		− tutorial.html
15		− commands.html
16		− faq.html
17		− )
	13	+ options[:skip] = %w(design.html license.html)
18	14
19	15	options[:attribution] = <<-HTML
20	16	© 2005–2009 Axel Liljencrantz<br>
21		− © 2009–2016 The fish contributors<br>
22	17	Licensed under the GNU General Public License, version 2.
23	18	HTML
24	19
25	20	version '2.3' do
26	21	self.release = '2.3.1'
27		− self.base_url = "http://fishshell.com/docs/#{version}/"
28		− self.root_path = 'index.html'
	22	+ self.base_url = "https://fishshell.com/docs/#{version}/"
29	23	end
	24	+
30	25	version '2.2' do
31	26	self.release = '2.2.0'
32		− self.base_url = "http://fishshell.com/docs/#{version}/"
33		− self.root_path = 'index.html'
	27	+ self.base_url = "https://fishshell.com/docs/#{version}/"
34	28	end
35	29	end
36	30	end

Binary file not shown.

Binary file not shown.

@@ -1 +0,0 @@
1		−https://github.com/fish-shell/fish-shell/blob/master/doc_src/ascii_fish.png