History

Finish Bottle scraper

Thibaut Courouble committed 10 years ago

Commit 380afc41 parent 45e68b010 files · +24 −26Browse files

Unified · Split

10 files
  1. assets/images/docs.png +0 −0
  2. assets/images/docs@2x.png +0 −0
  3. assets/javascripts/news.json +3 −0
  4. assets/javascripts/templates/pages/about_tmpl.coffee +5 −0
  5. assets/stylesheets/global/_icons.scss +1 −0
  6. lib/docs/filters/bottle/entries.rb +10 −17
  7. lib/docs/scrapers/bottle.rb +7 −13
  8. public/icons/docs/bottle/16.png +0 −0
  9. public/icons/docs/bottle/16@2x.png +0 −0
  10. public/icons/docs/bottle/SOURCE +2 −0
assets/images/docs.png+0−0

Binary file not shown.

assets/images/docs@2x.png+0−0

Binary file not shown.

assets/javascripts/news.json+3−0
@@ -1,5 +1,8 @@
1[1[
2 [2 [
3 "2016-09-05",
4 "New documentation: <a href=\"/bottle/\">Bottle</a>"
5 ], [
3 "2016-08-07",6 "2016-08-07",
4 "New documentation: <a href=\"/docker/\">Docker</a>"7 "New documentation: <a href=\"/docker/\">Docker</a>"
5 ], [8 ], [
assets/javascripts/templates/pages/about_tmpl.coffee+5−0
@@ -109,6 +109,11 @@ credits = [ · 108 unmodified lines
109 '2011-2016 Twitter, Inc.',109 '2011-2016 Twitter, Inc.',
110 'CC BY',110 'CC BY',
111 'https://creativecommons.org/licenses/by/3.0/'111 'https://creativecommons.org/licenses/by/3.0/'
112 ], [
113 'Bottle',
114 '2016 Marcel Hellkamp',
115 'MIT',
116 'https://raw.githubusercontent.com/bottlepy/bottle/master/LICENSE'
112 ], [117 ], [
113 'Bower',118 'Bower',
114 '2016 Bower contributors',119 '2016 Bower contributors',
assets/stylesheets/global/_icons.scss+1−0
@@ -116,6 +116,7 @@ · 115 unmodified lines
116._icon-socketio:before { background-position: -2rem -6rem; }116._icon-socketio:before { background-position: -2rem -6rem; }
117._icon-modernizr:before { background-position: -3rem -6rem; }117._icon-modernizr:before { background-position: -3rem -6rem; }
118._icon-bower:before { background-position: -4rem -6rem; }118._icon-bower:before { background-position: -4rem -6rem; }
119._icon-bottle:before { background-position: 0 -7rem; }
119._icon-docker:before { background-position: -1rem -7rem; }120._icon-docker:before { background-position: -1rem -7rem; }
120._icon-cakephp:before { background-position: -2rem -7rem; }121._icon-cakephp:before { background-position: -2rem -7rem; }
121._icon-lua:before { background-position: -3rem -7rem; @extend %darkIconFix !optional; }122._icon-lua:before { background-position: -3rem -7rem; @extend %darkIconFix !optional; }
lib/docs/filters/bottle/entries.rb+10−17
@@ -1,16 +1,6 @@
1module Docs1module Docs
2 class Bottle2 class Bottle
3 class EntriesFilter < Docs::EntriesFilter3 class EntriesFilter < Docs::EntriesFilter
4 TYPES = {
5 'routing' => 'Request Routing',
6 'stpl' => 'SimpleTemplate Engine',
7 'api' => 'API Reference',
8
9 'tutorial_app' => 'Tutorial',
10 'async' => 'Primer to Asynchronous Applications',
11 'faq' => 'Frequently Asked Questions'
12 }
13
14 def get_name4 def get_name
15 name = at_css('h1').content.strip5 name = at_css('h1').content.strip
16 name.remove! "\u{00B6}"6 name.remove! "\u{00B6}"
@@ -18,15 +8,18 @@ module Docs · 1 unmodified line
18 end8 end
19 9
20 def get_type10 def get_type
21 type = slug.split('/').first11 case slug
22 12 when 'api'
23 if TYPES.key?(type)13 'Reference'
24 type = TYPES[type]14 when 'configuration'
15 'Reference: Configuration'
16 when 'stpl'
17 'Reference: SimpleTemplate'
18 when 'plugindev'
19 'Reference: Plugin'
25 else20 else
26 type = type.capitalize21 'Manual'
27 end22 end
28
29 type
30 end23 end
31 24
32 def additional_entries25 def additional_entries
lib/docs/scrapers/bottle.rb+7−13
@@ -1,8 +1,7 @@
1module Docs1module Docs
2 class Bottle < FileScraper2 class Bottle < UrlScraper
3 self.type = 'sphinx'3 self.type = 'sphinx'
4 self.dir = ""4 self.root_path = 'index.html'
5 self.root_path = "index.html"
6 self.links = {5 self.links = {
7 home: 'https://bottle.org/',6 home: 'https://bottle.org/',
8 code: 'https://github.com/bottlepy/bottle'7 code: 'https://github.com/bottlepy/bottle'
@@ -12,24 +11,19 @@ module Docs · 3 unmodified lines
12 11
13 options[:container] = '.body'12 options[:container] = '.body'
14 13
15 options[:skip] = %w(14 options[:skip] = %w(changelog.html development.html _modules/bottle.html)
16 changelog.html
17 development.html
18 plugindev.html
19 _modules/bottle.html
20 )
21 15
22 options[:attribution] = <<-HTML16 options[:attribution] = <<-HTML
23 &copy; 2009&ndash;2016, Marcel Hellkamp<br>17 &copy; 2016 Marcel Hellkamp<br>
24 Licensed under the MIT License.<br>18 Licensed under the MIT License.
25 HTML19 HTML
26 20
27 version '0.12' do # http://bottlepy.org/docs/0.12/bottle-docs.zip21 version '0.12' do
28 self.release = '0.12'22 self.release = '0.12'
29 self.base_url = "http://bottlepy.org/docs/#{self.version}/"23 self.base_url = "http://bottlepy.org/docs/#{self.version}/"
30 end24 end
31 25
32 version '0.11' do # http://bottlepy.org/docs/0.11/bottle-docs.zip26 version '0.11' do
33 self.release = '0.11'27 self.release = '0.11'
34 self.base_url = "http://bottlepy.org/docs/#{self.version}/"28 self.base_url = "http://bottlepy.org/docs/#{self.version}/"
35 end29 end
public/icons/docs/bottle/16.png+0−0

Binary file not shown.

public/icons/docs/bottle/16@2x.png+0−0

Binary file not shown.

public/icons/docs/bottle/SOURCE+2−0
@@ -0,0 +1,2 @@
1https://raw.githubusercontent.com/bottlepy/bottlepy.org/master/sphinx/static/logo_icon.png
2https://github.com/bottlepy/bottle/issues/886