Merge branch 'master' into api

Author: benbalter

History.markdown

@@ -1,3 +1,7 @@
+## HEAD
+
+  * Allow `noscript` fallback to be disabled (#29)
+
 ## 1.3.5 / 2015-10-23
 
   * Fix encoding error for `noscript` code (#23)

README.md

@@ -49,6 +49,15 @@ This will produce the correct URL to show just the specified file in your post r
 
 **Pro-tip**: If you provide a personal access token with Gist scope, as the environmental variable `JEKYLL_GITHUB_TOKEN`, Jekyll Gist will use the Gist API to speed up site generation.
 
+## Disabling `noscript` support
+
+By default, Jekyll Gist will make an HTTP call per Gist to retrieve the raw content of the Gist. This information is used to propagate `noscript` tags for search engines and browsers without Javascript support. If you'd like to disable this feature, for example, to speed up builds locally, simply add the following to your site's `_config.yml`:
+
+```yml
+gist:
+  noscript: false
+```
+
 ## Contributing
 
 1. Fork it ( https://github.com/jekyll/jekyll-gist/fork )

lib/jekyll-gist/gist_tag.rb

@@ -11,6 +11,7 @@ class GistTag < Liquid::Tag
 
       def render(context)
         @encoding = context.registers[:site].config['encoding'] || 'utf-8'
+        @settings = context.registers[:site].config['gist']
         if tag_contents = determine_arguments(@markup.strip)
           gist_id, filename = tag_contents[0], tag_contents[1]
           if context.has_key?(gist_id)
@@ -51,6 +52,7 @@ def gist_script_tag(gist_id, filename = nil)
       end
 
       def gist_noscript_tag(gist_id, filename = nil)
+        return if @settings && @settings["noscript"] == false
         code = fetch_raw_code(gist_id, filename)
         if !code.nil?
           code = code.force_encoding(@encoding)

spec/gist_tag_spec.rb

@@ -147,6 +147,17 @@
         it "produces the noscript tag" do
           expect(output).to match(/<noscript><pre>puts &#39;hello world&#39;<\/pre><\/noscript>/)
         end
+
+    context "with noscript disabled" do
+      let(:doc) { doc_with_content(content, { "gist" => { "noscript" => false } }) }
+      let(:output) do
+        doc.content = content
+        doc.output  = Jekyll::Renderer.new(doc.site, doc).run
+      end
+      let(:gist) { "mattr-/24081a1d93d2898ecf0f" }
+
+      it "does not produce the noscript tag" do
+        expect(output).to_not match(/<noscript>/)
       end
     end
 

spec/spec_helper.rb

@@ -26,7 +26,7 @@ def dest_dir(*files)
   end
 
   def doc_with_content(content, opts = {})
-    my_site = site
+    my_site = site(opts)
     Jekyll::Document.new(source_dir('_test/doc.md'), {site: my_site, collection: collection(my_site)})
   end