History

Merge pull request #1397 from MasterEnoc/redux

Update Redux to 4.0.5

Simon Legner committed 5 years ago

Commit 296a7e02 parents 2c9185b 459db124 files · +44 −43Browse files

Unified · Split

4 files
  1. assets/javascripts/templates/pages/about_tmpl.coffee +1 −1
  2. lib/docs/filters/redux/clean_html.rb +14 −20
  3. lib/docs/filters/redux/entries.rb +15 −14
  4. lib/docs/scrapers/redux.rb +14 −8
assets/javascripts/templates/pages/about_tmpl.coffee+1−1
@@ -668,7 +668,7 @@ credits = [ · 667 unmodified lines
668668 'https://creativecommons.org/licenses/by-sa/4.0/'
669669 ], [
670670 'Redux',
671− '2015-2017 Dan Abramov',
671+ '2015-2020 Dan Abramov',
672672 'MIT',
673673 'https://raw.githubusercontent.com/reactjs/redux/master/LICENSE.md'
674674 ], [
lib/docs/filters/redux/clean_html.rb+14−20
@@ -2,36 +2,30 @@ module Docs · 1 unmodified line
22 class Redux
33 class CleanHtmlFilter < Filter
44 def call
5− @doc = at_css('.page-inner section')
65
7− css('#edit-link', 'hr').remove
8−
9− at_css('h2').name = 'h1' unless at_css('h1')
6+ css('h1, h2, h3, h4').each do |node|
7+ node.css('a').remove
8+ end
109
11− if root_page?
12− at_css('h1').content = 'Redux'
10+ css('h3').each do |node|
11+ node['id'] = node.content.gsub(/\(|\)/, '').downcase
12+ end
1313
14− at_css('a[href="https://www.npmjs.com/package/redux"]').parent.remove
14+ css('.codeBlockLines_b7E3').each do |node|
15+ node.remove_attribute('style')
16+ node.name = 'pre'
17+ node['data-language'] = 'javascript'
1518
16− css('a[target]').each do |node|
17− node.remove_attribute('target') unless node['href'].start_with?('http')
19+ node.css('div, span').each do |subnode|
20+ subnode.remove_attribute('style')
1821 end
19− end
2022
21− css('a[id]:empty').each do |node|
22− (node.next_element || node.parent.next_element)['id'] = node['id']
2323 end
2424
25− css('h1 > code').each do |node|
26− node.before(node.children).remove
27− end
28−
29− css('pre > code').each do |node|
30− node.parent['data-language'] = node['class'][/lang-(\w+)/, 1] if node['class']
31− node.parent.content = node.parent.content
32− end
25+ css('.copyButton_10dd').remove
3326
3427 doc
28+
3529 end
3630 end
3731 end
lib/docs/filters/redux/entries.rb+15−14
@@ -1,29 +1,30 @@
11 module Docs
22 class Redux
33 class EntriesFilter < Docs::EntriesFilter
4+
45 def get_name
5− name = at_css('.page-inner h1, .page-inner h2').content
6− name.sub! %r{\(.*\)}, '()'
7− name
6+ name = at_css('h1').content
7+ name.gsub(/\(.*\)/, '()')
88 end
99
1010 def get_type
11− path = slug.split('/')
12−
13− if path.length > 1
14− path[0].titleize.sub('Api', 'API').sub('Faq', 'FAQ')
15− else
16− 'Miscellaneous'
17− end
11+ slug.match?(/\Astore\Z/) ? 'Store API' : 'Top-Level Exports'
1812 end
1913
2014 def additional_entries
21− css('#store-methods + ul > li > a').map do |node|
22− id = node['href'].remove('#')
23− name = "#{self.name}##{id}()"
24− [name, id]
15+ entries = []
16+
17+ if slug.match?(/\Astore\Z/)
18+ css('h3').each do |node|
19+ entry_path = node.content.gsub(/\(|\)/, '')
20+ entry_name = node.content.gsub(/\(.*\)/, '()')
21+ entries << [entry_name, entry_path.downcase, 'Store API']
22+ end
2523 end
24+
25+ entries
2626 end
27+
2728 end
2829 end
2930 end
lib/docs/scrapers/redux.rb+14−8
@@ -1,28 +1,34 @@
11 module Docs
22 class Redux < UrlScraper
3+
34 self.type = 'simple'
4− self.release = '3.7.2'
5− self.base_url = 'http://redux.js.org/docs/'
5+ self.base_url = 'https://redux.js.org/api'
6+ self.root_path = 'index.html'
67 self.links = {
78 home: 'http://redux.js.org/',
8− code: 'https://github.com/reactjs/redux/'
9+ code: 'https://github.com/reduxjs/redux/'
910 }
1011
11− html_filters.push 'redux/entries', 'redux/clean_html'
12+ html_filters.push 'redux/clean_html', 'redux/entries'
1213
13− options[:skip] = %w(Feedback.html)
14+ options[:container] = '.markdown'
1415
1516 options[:attribution] = <<-HTML
16− &copy; 2015&ndash;2017 Dan Abramov<br>
17+ &copy; 2015&ndash;2020 Dan Abramov<br>
1718 Licensed under the MIT License.
1819 HTML
1920
20− stub '' do
21− request_one('http://redux.js.org/index.html').body
21+ version do
22+ self.release = '4.0.5'
23+ end
24+
25+ version '3' do
26+ self.release = '3.7.2'
2227 end
2328
2429 def get_latest_version(opts)
2530 get_npm_version('redux', opts)
2631 end
32+
2733 end
2834 end