diff --git a/assets/images/icons.png b/assets/images/icons.png index c772edfc..6368c152 100644 Binary files a/assets/images/icons.png and b/assets/images/icons.png differ diff --git a/assets/images/icons@2x.png b/assets/images/icons@2x.png index b390f9f1..ce424d39 100644 Binary files a/assets/images/icons@2x.png and b/assets/images/icons@2x.png differ diff --git a/assets/javascripts/news.json b/assets/javascripts/news.json index 24d1646b..00ce8cf7 100644 --- a/assets/javascripts/news.json +++ b/assets/javascripts/news.json @@ -1,5 +1,8 @@ [ [ + "2016-04-24", + "New documentation: Apache Pig" + ], [ "2016-04-17", "New documentation: Perl" ], [ diff --git a/assets/javascripts/templates/pages/about_tmpl.coffee b/assets/javascripts/templates/pages/about_tmpl.coffee index 7cd738a4..45420df6 100644 --- a/assets/javascripts/templates/pages/about_tmpl.coffee +++ b/assets/javascripts/templates/pages/about_tmpl.coffee @@ -96,8 +96,8 @@ credits = [ 'GPLv3', 'https://raw.githubusercontent.com/ansible/ansible/devel/COPYING' ], [ - 'Apache HTTP Server', - '2016 The Apache Software Foundation', + 'Apache HTTP Server
Apache Pig', + '2016 The Apache Software Foundation
Apache and the Apache feather logo are trademarks of The Apache Software Foundation.', 'Apache', 'https://www.apache.org/licenses/LICENSE-2.0' ], [ diff --git a/assets/stylesheets/global/_icons.scss b/assets/stylesheets/global/_icons.scss index 4a1816e9..8e852ed6 100644 --- a/assets/stylesheets/global/_icons.scss +++ b/assets/stylesheets/global/_icons.scss @@ -137,3 +137,4 @@ ._icon-gnu_fortran:before { background-position: -1rem -11rem; } ._icon-gcc:before { background-position: -2rem -11rem; } ._icon-perl:before { background-position: -3rem -11rem; } +._icon-apache_pig:before { background-position: -4rem -11rem; } diff --git a/assets/stylesheets/pages/_simple.scss b/assets/stylesheets/pages/_simple.scss index b5f97997..a3e5a0bf 100644 --- a/assets/stylesheets/pages/_simple.scss +++ b/assets/stylesheets/pages/_simple.scss @@ -16,6 +16,7 @@ blockquote { @extend %note; } } +._apache_pig, ._cordova, ._gnu, ._grunt, @@ -27,7 +28,6 @@ ._markdown, ._mocha, ._mongoose, -._pig, ._sinon, ._typescript, ._webpack { diff --git a/lib/docs/filters/pig/clean_html.rb b/lib/docs/filters/apache_pig/clean_html.rb similarity index 90% rename from lib/docs/filters/pig/clean_html.rb rename to lib/docs/filters/apache_pig/clean_html.rb index e3c66661..1582754c 100644 --- a/lib/docs/filters/pig/clean_html.rb +++ b/lib/docs/filters/apache_pig/clean_html.rb @@ -1,9 +1,7 @@ module Docs - class Pig + class ApachePig class CleanHtmlFilter < Filter def call - @doc = at_css('#content') - css('.pdflink').remove css('a[name]').each do |node| diff --git a/lib/docs/filters/apache_pig/entries.rb b/lib/docs/filters/apache_pig/entries.rb new file mode 100644 index 00000000..bcd004b0 --- /dev/null +++ b/lib/docs/filters/apache_pig/entries.rb @@ -0,0 +1,33 @@ +module Docs + class ApachePig + class EntriesFilter < Docs::EntriesFilter + def get_name + at_css('h1').content + end + + def get_type + at_css('h1').content + end + + def additional_entries + nodes = case slug + when 'basic', 'cmds', 'func' + css('h3') + when 'cont' + css('h2, #macros + div > h3') + when 'test' + css('h2, #diagnostic-ops + div > h3') + when 'perf' + css('h2, #optimization-rules + div > h3, #specialized-joins + div > h3') + else + css('h2') + end + + nodes.each_with_object [] do |node, entries| + name = node.content.strip + entries << [name, node['id']] unless name == 'Introduction' + end + end + end + end +end diff --git a/lib/docs/filters/pig/entries.rb b/lib/docs/filters/pig/entries.rb deleted file mode 100644 index d49bff47..00000000 --- a/lib/docs/filters/pig/entries.rb +++ /dev/null @@ -1,33 +0,0 @@ -module Docs - class Pig - class EntriesFilter < Docs::EntriesFilter - - def include_default_entry? - false - end - - def get_type - at_css('h1').content - end - - def additional_entries - case slug - when 'basic', 'cmds', 'func' - nodes = css('h3') - when 'cont' - nodes = css('h2, #macros + div > h3') - when 'test' - nodes = css('h2, #diagnostic-ops + div > h3') - when 'perf' - nodes = css('h2, #optimization-rules + div > h3, #specialized-joins + div > h3') - else - nodes = css('h2') - end - - nodes.each_with_object [] do |node, entries| - entries << [node.content, node['id'], get_type] - end - end - end - end -end diff --git a/lib/docs/scrapers/apache_pig.rb b/lib/docs/scrapers/apache_pig.rb new file mode 100644 index 00000000..b7fc0f8d --- /dev/null +++ b/lib/docs/scrapers/apache_pig.rb @@ -0,0 +1,37 @@ +module Docs + class ApachePig < UrlScraper + self.name = 'Apache Pig' + self.slug = 'apache_pig' + self.type = 'apache_pig' + self.links = { + home: 'https://pig.apache.org/' + } + + html_filters.push 'apache_pig/clean_html', 'apache_pig/entries' + + options[:container] = '#content' + options[:skip] = %w(pig-index.html) + options[:skip_patterns] = [/\Aapi/, /\Ajdiff/] + + options[:attribution] = <<-HTML + © 2007–2016 Apache Software Foundation
+ Licensed under the Apache Software License version 2.0. + HTML + + version '0.15' do + self.release = '0.15.0' + self.base_url = "https://pig.apache.org/docs/r#{release}/" + end + + version '0.14' do + self.release = '0.14.0' + self.base_url = "https://pig.apache.org/docs/r#{release}/" + end + + version '0.13' do + self.release = '0.13.0' + self.base_url = "https://pig.apache.org/docs/r#{release}/" + end + + end +end diff --git a/lib/docs/scrapers/pig.rb b/lib/docs/scrapers/pig.rb deleted file mode 100644 index bf9a13e5..00000000 --- a/lib/docs/scrapers/pig.rb +++ /dev/null @@ -1,39 +0,0 @@ -module Docs - class Pig < UrlScraper - self.name = 'Pig' - self.type = 'pig' - self.links = { - home: 'https://pig.apache.org/' - } - - html_filters.push 'pig/clean_html', 'pig/entries' - - options[:skip] = %w( pig-index.html ) - - options[:skip_patterns] = [ - /\Aapi/, - /\Ajdiff/ - ] - - options[:attribution] = <<-HTML - © 2007–2016 Apache Software Foundation
- Licensed under the Apache Software License version 2.0. - HTML - - version '0.15.0' do - self.release = '0.15.0' - self.base_url = "http://pig.apache.org/docs/r#{release}/" - end - - version '0.14.0' do - self.release = '0.14.0' - self.base_url = "http://pig.apache.org/docs/r#{release}/" - end - - version '0.13.0' do - self.release = '0.13.0' - self.base_url = "http://pig.apache.org/docs/r#{release}/" - end - - end -end diff --git a/public/icons/docs/apache_pig/16.png b/public/icons/docs/apache_pig/16.png new file mode 100644 index 00000000..11543be5 Binary files /dev/null and b/public/icons/docs/apache_pig/16.png differ diff --git a/public/icons/docs/apache_pig/16@2x.png b/public/icons/docs/apache_pig/16@2x.png new file mode 100644 index 00000000..33ef00e0 Binary files /dev/null and b/public/icons/docs/apache_pig/16@2x.png differ diff --git a/public/icons/docs/apache_pig/pig.png b/public/icons/docs/apache_pig/pig.png new file mode 100644 index 00000000..d1f25906 Binary files /dev/null and b/public/icons/docs/apache_pig/pig.png differ