Merge pull request #82 from AndorChen/511

更新到 Rails 5.1.1

Author: chloerei

CHANGELOG.md

@@ -1,3 +1,7 @@
+## Rails 5.1.0 (April 27, 2017) ##
+
+*   No changes.
+
 ## Rails 5.0.1 (December 21, 2016) ##
 
 *   No changes.

Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:2.3
+FROM ruby:2.4.1
 
 ENV LC_ALL C.UTF-8
 ENV LANG en_US.UTF-8
@@ -21,4 +21,4 @@ COPY Gemfile.lock /app
 RUN bundle install
 
 ENV GUIDES_LANGUAGE=zh-CN
-ENV RAILS_VERSION=v5.0.1
+ENV RAILS_VERSION=v5.1.1

Gemfile

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 source 'https://rubygems.org'
 
-gem 'rails', '5.0.1'
+gem 'rails', '5.1.1'
 gem 'redcarpet'
-gem 'kindlerb', '0.1.1'
+gem 'kindlerb', '1.2.0'

Gemfile.lock

@@ -1,90 +1,90 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.0.1)
-      actionpack (= 5.0.1)
-      nio4r (~> 1.2)
+    actioncable (5.1.1)
+      actionpack (= 5.1.1)
+      nio4r (~> 2.0)
       websocket-driver (~> 0.6.1)
-    actionmailer (5.0.1)
-      actionpack (= 5.0.1)
-      actionview (= 5.0.1)
-      activejob (= 5.0.1)
+    actionmailer (5.1.1)
+      actionpack (= 5.1.1)
+      actionview (= 5.1.1)
+      activejob (= 5.1.1)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.0.1)
-      actionview (= 5.0.1)
-      activesupport (= 5.0.1)
+    actionpack (5.1.1)
+      actionview (= 5.1.1)
+      activesupport (= 5.1.1)
       rack (~> 2.0)
       rack-test (~> 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.0.1)
-      activesupport (= 5.0.1)
+    actionview (5.1.1)
+      activesupport (= 5.1.1)
       builder (~> 3.1)
-      erubis (~> 2.7.0)
+      erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    activejob (5.0.1)
-      activesupport (= 5.0.1)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activejob (5.1.1)
+      activesupport (= 5.1.1)
       globalid (>= 0.3.6)
-    activemodel (5.0.1)
-      activesupport (= 5.0.1)
-    activerecord (5.0.1)
-      activemodel (= 5.0.1)
-      activesupport (= 5.0.1)
-      arel (~> 7.0)
-    activesupport (5.0.1)
+    activemodel (5.1.1)
+      activesupport (= 5.1.1)
+    activerecord (5.1.1)
+      activemodel (= 5.1.1)
+      activesupport (= 5.1.1)
+      arel (~> 8.0)
+    activesupport (5.1.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    arel (7.1.4)
+    arel (8.0.0)
     builder (3.2.3)
-    concurrent-ruby (1.0.4)
-    erubis (2.7.0)
-    globalid (0.3.7)
-      activesupport (>= 4.1.0)
+    concurrent-ruby (1.0.5)
+    erubi (1.6.0)
+    globalid (0.4.0)
+      activesupport (>= 4.2.0)
     i18n (0.8.1)
-    kindlerb (0.1.1)
+    kindlerb (1.2.0)
       mustache
       nokogiri
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
-    mail (2.6.4)
+    mail (2.6.5)
       mime-types (>= 1.16, < 4)
     method_source (0.8.2)
     mime-types (3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
     mini_portile2 (2.1.0)
-    minitest (5.10.1)
-    mustache (1.0.3)
-    nio4r (1.2.1)
-    nokogiri (1.7.0.1)
+    minitest (5.10.2)
+    mustache (1.0.5)
+    nio4r (2.0.0)
+    nokogiri (1.7.2)
       mini_portile2 (~> 2.1.0)
-    rack (2.0.1)
+    rack (2.0.3)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (5.0.1)
-      actioncable (= 5.0.1)
-      actionmailer (= 5.0.1)
-      actionpack (= 5.0.1)
-      actionview (= 5.0.1)
-      activejob (= 5.0.1)
-      activemodel (= 5.0.1)
-      activerecord (= 5.0.1)
-      activesupport (= 5.0.1)
+    rails (5.1.1)
+      actioncable (= 5.1.1)
+      actionmailer (= 5.1.1)
+      actionpack (= 5.1.1)
+      actionview (= 5.1.1)
+      activejob (= 5.1.1)
+      activemodel (= 5.1.1)
+      activerecord (= 5.1.1)
+      activesupport (= 5.1.1)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 5.0.1)
+      railties (= 5.1.1)
       sprockets-rails (>= 2.0.0)
-    rails-dom-testing (2.0.2)
-      activesupport (>= 4.2.0, < 6.0)
-      nokogiri (~> 1.6)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
-    railties (5.0.1)
-      actionpack (= 5.0.1)
-      activesupport (= 5.0.1)
+    railties (5.1.1)
+      actionpack (= 5.1.1)
+      activesupport (= 5.1.1)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
@@ -99,7 +99,7 @@ GEM
       sprockets (>= 3.0.0)
     thor (0.19.4)
     thread_safe (0.3.6)
-    tzinfo (1.2.2)
+    tzinfo (1.2.3)
       thread_safe (~> 0.1)
     websocket-driver (0.6.5)
       websocket-extensions (>= 0.1.0)
@@ -109,9 +109,9 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  kindlerb (= 0.1.1)
-  rails (= 5.0.1)
+  kindlerb (= 1.2.0)
+  rails (= 5.1.1)
   redcarpet
 
 BUNDLED WITH
-   1.14.5
+   1.14.6

rails_guides.rb

@@ -1,18 +1,20 @@
-pwd = File.dirname(__FILE__)
-$:.unshift pwd
+$:.unshift __dir__
 
-begin
-  # Guides generation in the Rails repo.
-  as_lib = File.join(pwd, "../activesupport/lib")
-  ap_lib = File.join(pwd, "../actionpack/lib")
+require "rails_guides/generator"
+require "rails_guides/cn" # PLEASE DO NOT FORGET ME
+require "active_support/core_ext/object/blank"
 
-  $:.unshift as_lib if File.directory?(as_lib)
-  $:.unshift ap_lib if File.directory?(ap_lib)
-rescue LoadError
-  # Guides generation from gems.
-  gem "actionpack", '>= 3.0'
-end
+env_value = ->(name) { ENV[name].presence }
+env_flag  = ->(name) { "1" == env_value[name] }
 
-require "rails_guides/generator"
-require "rails_guides/cn"
-RailsGuides::Generator.new.generate
+version = env_value["RAILS_VERSION"]
+edge    = `git rev-parse HEAD`.strip unless version
+
+RailsGuides::Generator.new(
+  edge:     edge,
+  version:  version,
+  all:      env_flag["ALL"],
+  only:     env_value["ONLY"],
+  kindle:   env_flag["KINDLE"],
+  language: env_value["GUIDES_LANGUAGE"]
+).generate

rails_guides/cn.rb

@@ -1,12 +1,11 @@
-# Patch for cn generator
-require 'uri'
+# Patch for zh-CN generation
 
 module RailsGuides
   class Markdown
     private
 
     def dom_id(nodes)
-      dom_id = dom_id_text(nodes.last.text)
+      dom_id = dom_id_text(nodes.last)
 
       # Fix duplicate node by prefix with its parent node
       if @node_ids[dom_id]
@@ -17,15 +16,50 @@ def dom_id(nodes)
           @node_ids[new_node_id] = duplicate_nodes
         end
 
-        dom_id = "#{nodes[-2][:id]}-#{dom_id}" if nodes.size > 1
+        dom_id = "#{nodes[-2][:id]}-#{dom_id}"
       end
 
       @node_ids[dom_id] = nodes
       dom_id
     end
 
-    def dom_id_text(text)
-      URI.escape(text, /[^\-_.!~*'()a-zA-Z\d;\/?:@&=+$,]/)
+    def dom_id_text(node)
+      if node.previous_element && node.previous_element.inner_html.include?('class="anchor"')
+        node.previous_element.children.first['id']
+      else
+        escaped_chars = Regexp.escape('\\/`*_{}[]()#+-.!:,;|&<>^~=\'"')
+
+        node.text.downcase.gsub(/\?/, "-questionmark")
+                          .gsub(/!/, "-bang")
+                          .gsub(/[#{escaped_chars}]+/, " ").strip
+                          .gsub(/\s+/, "-")
+      end
     end
+
+    def generate_index
+      if @headings_for_index.present?
+        raw_index = ""
+        @headings_for_index.each do |level, node, label|
+          if level == 1
+            raw_index += "1. [#{label}](##{node[:id]})\n"
+          elsif level == 2
+            raw_index += "    * [#{label}](##{node[:id]})\n"
+          end
+        end
+
+        @index = Nokogiri::HTML.fragment(engine.render(raw_index)).tap do |doc|
+          doc.at("ol")[:class] = "chapters"
+        end.to_html
+
+        # Only change `Chapters' to `目录'
+        @index = <<-INDEX.html_safe
+        <div id="subCol">
+          <h3 class="chapter"><img src="images/chapters_icon.gif" alt="" />目录</h3>
+          #{@index}
+        </div>
+        INDEX
+      end
+    end
+
   end
 end