+ while div = at_css('h1 + div')
+ div.before(div.children)
+ div.remove
+ end
+
+ css('.api-profile-header-structure > li').each do |node|
+ node.inner_html = node.inner_html.remove('- ')
+ end
+
+ css('h1').each_with_index do |node, i|
+ next if i == 0
+ node.name = 'h2'
+ end
+
+ # Remove examples
+ css('.runnable-example').each do |node|
+ node.parent.remove
+ end
+
+ # Remove dead links (e.g. ngRepeat)
+ css('a.type-hint').each do |node|
+ node.name = 'code'
+ node.remove_attribute 'href'
+ end
+
+ css('pre > code').each do |node|
+ node['class'] ||= ''
+ lang = if node['class'].include?('lang-html') || node.content =~ /\A elements
+ css('h1 > code', 'h2 > code', 'h3 > code', 'h4 > code', 'h6 > code').each do |node|
+ node.before(node.content).remove
+ end
+
+ css('ul.methods', 'ul.properties', 'ul.events').add_class('defs').each do |node|
+ node.css('> li > h3').each do |h3|
+ next if h3.content.present?
+ h3.content = h3.next_element.content
+ h3.next_element.remove
+ end
+ end
+ end
+ end
+ end
+end
diff --git a/lib/docs/filters/angular/clean_urls.rb b/lib/docs/filters/angularjs/clean_urls.rb
similarity index 94%
rename from lib/docs/filters/angular/clean_urls.rb
rename to lib/docs/filters/angularjs/clean_urls.rb
index 09e93a85..296b21fe 100644
--- a/lib/docs/filters/angular/clean_urls.rb
+++ b/lib/docs/filters/angularjs/clean_urls.rb
@@ -1,5 +1,5 @@
module Docs
- class Angular
+ class Angularjs
class CleanUrlsFilter < Filter
def call
html.gsub! %r{angularjs\.org/([\d\.]+)/docs/partials/(\w+)/}, 'angularjs.org/\1/docs/\2/'
diff --git a/lib/docs/filters/angularjs/entries.rb b/lib/docs/filters/angularjs/entries.rb
new file mode 100644
index 00000000..ded278ad
--- /dev/null
+++ b/lib/docs/filters/angularjs/entries.rb
@@ -0,0 +1,53 @@
+module Docs
+ class Angularjs
+ class EntriesFilter < Docs::EntriesFilter
+ def get_name
+ if slug.start_with?('api')
+ name = URI.unescape(slug).split('/').last
+ name.remove! %r{\Ang\.}
+ name << " (#{subtype})" if subtype == 'directive' || subtype == 'filter'
+ name.prepend("#{type}.") unless type.starts_with?('ng ') || name == type
+ name
+ elsif slug.start_with?('guide')
+ name = URI.decode(at_css('.improve-docs')['href'][/message=docs\(guide%2F(.+?)\)/, 1])
+ name.prepend 'Guide: '
+ name
+ end
+ end
+
+ def get_type
+ if slug.start_with?('api')
+ type = slug.split('/').drop(1).first
+ type << " #{subtype}s" if type == 'ng' && subtype
+ type
+ elsif slug.start_with?('guide')
+ 'Guide'
+ end
+ end
+
+ def subtype
+ return @subtype if defined? @subtype
+ node = at_css '.api-profile-header-structure'
+ data = node.content.match %r{(\w+?) in module} if node
+ @subtype = data && data[1]
+ end
+
+ def additional_entries
+ return [] unless slug.start_with?('api')
+ entries = []
+
+ css('ul.defs').each do |list|
+ list.css('> li[id]').each do |node|
+ next unless heading = node.at_css('h3')
+ name = heading.content.strip
+ name.sub! %r{\(.*\);}, '()'
+ name.prepend "#{self.name.split.first}."
+ entries << [name, node['id']]
+ end
+ end
+
+ entries
+ end
+ end
+ end
+end
diff --git a/lib/docs/scrapers/angular.rb b/lib/docs/scrapers/angular.rb
index 5b407738..c76e83c1 100644
--- a/lib/docs/scrapers/angular.rb
+++ b/lib/docs/scrapers/angular.rb
@@ -1,68 +1,59 @@
module Docs
class Angular < UrlScraper
- self.name = 'Angular.js'
- self.slug = 'angular'
self.type = 'angular'
- self.root_path = 'api.html'
- self.initial_paths = %w(guide.html)
-
- html_filters.push 'angular/clean_html', 'angular/entries', 'title'
- text_filters.push 'angular/clean_urls'
-
- options[:title] = false
- options[:root_title] = 'Angular.js'
-
- options[:decode_and_clean_paths] = true
- options[:fix_urls_before_parse] = ->(str) do
- str.gsub!('[', '%5B')
- str.gsub!(']', '%5D')
- str
- end
-
- options[:fix_urls] = ->(url) do
- %w(api guide).each do |str|
- url.sub! "/partials/#{str}/#{str}/", "/partials/#{str}/"
- url.sub! %r{/#{str}/img/}, "/img/"
- url.sub! %r{/#{str}/(.+?)/#{str}/}, "/#{str}/"
- url.sub! %r{/partials/#{str}/(.+?)(? 'guide/testing.html',
+ 'glossary.html' => 'guide/glossary.html',
+ 'tutorial' => 'tutorial/'
+ }
+
+ options[:fix_urls] = -> (url) do
+ url.sub! %r{\A(https://angular\.io/docs/.+/)index\.html\z}, '\1'
+ url.sub! %r{\A(https://angular\.io/docs/.+/index)/\z}, '\1'
url
end
- options[:only_patterns] = [%r{\Aapi/}, %r{\Aguide/}]
- options[:skip] = %w(api/ng.html)
-
options[:attribution] = <<-HTML
© 2010–2016 Google, Inc.
Licensed under the Creative Commons Attribution License 4.0.
HTML
- stub '' do
+ stub 'api/' do
capybara = load_capybara_selenium
- capybara.app_host = 'https://code.angularjs.org'
- capybara.visit("/#{self.class.release}/docs/api")
- capybara.execute_script("return document.querySelector('.side-navigation').innerHTML")
- end
-
- version '1.5' do
- self.release = '1.5.6'
- self.base_url = "https://code.angularjs.org/#{release}/docs/partials/"
+ capybara.app_host = 'https://angular.io'
+ capybara.visit('/docs/ts/latest/api/')
+ capybara.execute_script('return document.body.innerHTML')
end
- version '1.4' do
- self.release = '1.4.11'
- self.base_url = "https://code.angularjs.org/#{release}/docs/partials/"
+ version '2.0 TypeScript' do
+ self.release = '2.0.0rc1'
+ self.base_url = "https://angular.io/docs/ts/latest/"
end
- version '1.3' do
- self.release = '1.3.20'
- self.base_url = "https://code.angularjs.org/#{release}/docs/partials/"
- end
+ private
- version '1.2' do
- self.release = '1.2.29'
- self.base_url = "https://code.angularjs.org/#{release}/docs/partials/"
+ def parse(string)
+ string.gsub! '
(str) do
+ str.gsub!('[', '%5B')
+ str.gsub!(']', '%5D')
+ str
+ end
+
+ options[:fix_urls] = ->(url) do
+ %w(api guide).each do |str|
+ url.sub! "/partials/#{str}/#{str}/", "/partials/#{str}/"
+ url.sub! %r{/#{str}/img/}, "/img/"
+ url.sub! %r{/#{str}/(.+?)/#{str}/}, "/#{str}/"
+ url.sub! %r{/partials/#{str}/(.+?)(?
+ Licensed under the Creative Commons Attribution License 4.0.
+ HTML
+
+ stub '' do
+ capybara = load_capybara_selenium
+ capybara.app_host = 'https://code.angularjs.org'
+ capybara.visit("/#{self.class.release}/docs/api")
+ capybara.execute_script("return document.querySelector('.side-navigation').innerHTML")
+ end
+
+ version '1.5' do
+ self.release = '1.5.6'
+ self.base_url = "https://code.angularjs.org/#{release}/docs/partials/"
+ end
+
+ version '1.4' do
+ self.release = '1.4.11'
+ self.base_url = "https://code.angularjs.org/#{release}/docs/partials/"
+ end
+
+ version '1.3' do
+ self.release = '1.3.20'
+ self.base_url = "https://code.angularjs.org/#{release}/docs/partials/"
+ end
+
+ version '1.2' do
+ self.release = '1.2.29'
+ self.base_url = "https://code.angularjs.org/#{release}/docs/partials/"
+ end
+ end
+end
diff --git a/public/icons/docs/angular/16.png b/public/icons/docs/angular/16.png
index 65f79fc7..c2da47dd 100644
Binary files a/public/icons/docs/angular/16.png and b/public/icons/docs/angular/16.png differ
diff --git a/public/icons/docs/angular/16@2x.png b/public/icons/docs/angular/16@2x.png
index 62518f7d..10125c54 100644
Binary files a/public/icons/docs/angular/16@2x.png and b/public/icons/docs/angular/16@2x.png differ
diff --git a/public/icons/docs/angular/SOURCE b/public/icons/docs/angular/SOURCE
index e25f07fc..0358b69e 100644
--- a/public/icons/docs/angular/SOURCE
+++ b/public/icons/docs/angular/SOURCE
@@ -1 +1 @@
-https://github.com/angular/angular.js/tree/master/images/logo/AngularJS-Shield.exports
+https://angular.io/presskit.html
diff --git a/public/icons/docs/angularjs/16.png b/public/icons/docs/angularjs/16.png
new file mode 100644
index 00000000..65f79fc7
Binary files /dev/null and b/public/icons/docs/angularjs/16.png differ
diff --git a/public/icons/docs/angularjs/16@2x.png b/public/icons/docs/angularjs/16@2x.png
new file mode 100644
index 00000000..62518f7d
Binary files /dev/null and b/public/icons/docs/angularjs/16@2x.png differ
diff --git a/public/icons/docs/angularjs/SOURCE b/public/icons/docs/angularjs/SOURCE
new file mode 100644
index 00000000..e25f07fc
--- /dev/null
+++ b/public/icons/docs/angularjs/SOURCE
@@ -0,0 +1 @@
+https://github.com/angular/angular.js/tree/master/images/logo/AngularJS-Shield.exports