serif 0.5.2 → 0.6

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: b61c8d068281185219f5f139140b82536a96f3a0
+  data.tar.gz: cef7780b4d90162f5fa472274d0430fe2036b141
+SHA512:
+  metadata.gz: 2d083eb99ab7f1bc4e3161b9402d6bffea20700c3e624fdf01287caadda0605a70fcc6ef33ccc8301e9f5f8a3bf8ab284c32a719cbc44c684e1fb7ec09caaf9b
+  data.tar.gz: 792eefd28de31b30f1a096d90fdb37f828f889d18d6938dd9f45199860647d1cd2240bcdda425002666c41df756c50971f89f5cbc0a546c8933e4184d099cfcc

data/Gemfile

@@ -1,3 +1,3 @@
 source "http://rubygems.org/"
 
-gemspec
+gemspec

data/Gemfile.lock

@@ -1,20 +1,29 @@
 PATH
   remote: .
   specs:
-    serif (0.4)
+    serif (0.5.2)
+      kramdown (~> 1.3)
       liquid (~> 2.4)
       nokogiri (~> 1.5)
       rack (~> 1.0)
-      redcarpet (~> 2.2)
       redhead (~> 0.0.8)
-      reverse_markdown (~> 0.4.3)
+      reverse_markdown
       rouge (~> 0.3.2)
+      rubypants
       sinatra (~> 1.3)
       timeout_cache
 
 GEM
   remote: http://rubygems.org/
   specs:
+    capybara (2.2.1)
+      mime-types (>= 1.16)
+      nokogiri (>= 1.3.3)
+      rack (>= 1.0.0)
+      rack-test (>= 0.5.4)
+      xpath (~> 2.0)
+    cliver (0.3.2)
+    coderay (1.1.0)
     colorize (0.5.8)
     coveralls (0.6.3)
       colorize
@@ -22,55 +31,83 @@ GEM
       rest-client
       simplecov (>= 0.7)
       thor
-    diff-lcs (1.2.2)
+    diff-lcs (1.2.5)
+    gherkin (2.12.2)
+      multi_json (~> 1.3)
     json (1.7.7)
-    liquid (2.5.0)
+    kramdown (1.3.3)
+    liquid (2.6.1)
+    method_source (0.8.2)
     mime-types (1.22)
+    mini_portile (0.5.3)
     multi_json (1.7.2)
-    nokogiri (1.5.9)
+    nokogiri (1.6.1)
+      mini_portile (~> 0.5.0)
+    poltergeist (1.5.0)
+      capybara (~> 2.1)
+      cliver (~> 0.3.1)
+      multi_json (~> 1.0)
+      websocket-driver (>= 0.2.0)
+    pry (0.9.12.6)
+      coderay (~> 1.0)
+      method_source (~> 0.8)
+      slop (~> 3.4)
     rack (1.5.2)
-    rack-protection (1.5.0)
+    rack-protection (1.5.3)
       rack
+    rack-test (0.6.2)
+      rack (>= 1.0)
     rake (0.9.6)
     rdoc (4.0.1)
       json (~> 1.4)
-    redcarpet (2.2.2)
-    redhead (0.0.8)
+    redhead (0.0.9)
     rest-client (1.6.7)
       mime-types (>= 1.16)
-    reverse_markdown (0.4.4)
+    reverse_markdown (0.5.1)
       nokogiri
-    rouge (0.3.2)
+    rouge (0.3.10)
       thor
-    rspec (2.13.0)
-      rspec-core (~> 2.13.0)
-      rspec-expectations (~> 2.13.0)
-      rspec-mocks (~> 2.13.0)
-    rspec-core (2.13.1)
-    rspec-expectations (2.13.0)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.7)
+    rspec-expectations (2.14.5)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.13.0)
+    rspec-mocks (2.14.5)
+    rubypants (0.2.0)
     simplecov (0.7.1)
       multi_json (~> 1.0)
       simplecov-html (~> 0.7.1)
     simplecov-html (0.7.1)
-    sinatra (1.4.2)
-      rack (~> 1.5, >= 1.5.2)
+    sinatra (1.4.5)
+      rack (~> 1.4)
       rack-protection (~> 1.4)
       tilt (~> 1.3, >= 1.3.4)
+    slop (3.4.7)
     thor (0.18.1)
-    tilt (1.3.6)
+    tilt (1.4.1)
     timecop (0.6.1)
     timeout_cache (0.0.2)
+    turnip (1.2.1)
+      gherkin (>= 2.5)
+      rspec (>= 2.0, < 4.0)
+    websocket-driver (0.3.2)
+    xpath (2.0.0)
+      nokogiri (~> 1.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  capybara
   coveralls
+  poltergeist
+  pry
   rake (~> 0.9)
   rdoc (~> 4.0.0)
   rspec (~> 2.5)
   serif!
   simplecov (~> 0.7)
   timecop (~> 0.6.1)
+  turnip

data/LICENSE

@@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+THE SOFTWARE.

data/README.md

@@ -56,14 +56,12 @@ Serif is sort of a blend between Jekyll, [Second Crack](https://github.com/marco
 
 Serif is released under the MIT license. See LICENSE for details.
 
-Any contributions will be assumed by default to be under the same terms.
-
 The quickest way to get changes contributed:
 
 1. Visit the [GitHub repository for Serif](https://github.com/aprescott/serif).
 2. [Fork the repository](https://help.github.com/articles/fork-a-repo).
 3. Check out a branch on the latest master for your change: `git checkout -b master new-feature` --- do not make changes on `master`! Make sure that anything added or changed has a test in the `test/` directory. Use the existing files as examples. All tests for new/changed behaviour should pass.
-4. [Send a pull request on GitHub](https://help.github.com/articles/fork-a-repo), including a description of what you've changed. (Note: your contribution will be assumed to be under the same terms of the project by default.)
+4. [Send a pull request on GitHub](https://help.github.com/articles/fork-a-repo), including a description of what you've changed.
 
 For more info on development, see the section at the bottom of this README.
 
@@ -162,7 +160,7 @@ Drafts go in `_drafts`, posts go in `_posts`. Simple enough.
 
 Posts must have filenames in the format of `YYYY-MM-DD-your-post`. Drafts do not have a date part, since they're drafts and not published.
 
-All files in these directories are assumed to be written in Markdown, with simple HTTP-style headers. The Markdown renderer is [Redcarpet](https://github.com/vmg/redcarpet) (with fenced code blocks enabled), with Smarty for punctuation tweaks, and Pygments to allow syntax highlighting (although you'll need your own CSS).
+All files in these directories are assumed to be written in Markdown, with simple HTTP-style headers. The Markdown renderer is [Kramdown](http://kramdown.gettalong.org/), with Smarty for punctuation tweaks, and Pygments to get syntax highlighting for [GitHub-flavoured fenced code blocks](https://help.github.com/articles/github-flavored-markdown#syntax-highlighting) (although you'll need your own CSS).
 
 Here's an example post:
 
@@ -427,30 +425,30 @@ These tags can be used in templates, in addition to the [standard Liquid filters
 ## List of filters
 
 * `date` with `'now'`
-  
+
   This is a standard filter, but there is a [workaround](https://github.com/Shopify/liquid/pull/117) for
   `{{ 'now' | date: "%Y" }}` to work, so you can use this in templates.
 
 * `markdown`
-  
+
   e.g., `{{ post.content | markdown }}`.
 
   This runs the given input through a Markdown + SmartyPants renderer, with fenced codeblocks enabled.
 
 * `smarty`
-  
+
   e.g., `{{ post.title | smarty }}`.
 
   This runs the given input through a SmartyPants processor, so quotes, dashes and ellipses come out better. Note that the **`markdown` filter already does SmartyPants** processing.
 
 * `strip`
-  
+
   Strips trailing and leading whitespace.
 
   e.g., `{{ " hello " | strip }}` will render as `hello`.
 
 * `xmlschema`
-  
+
   e.g., `{{ post.created | xmlschema }}`.
 
   Takes a Time value and returns an ISO8601-format string, as per Ruby's `Time#xmlschema` definition.
@@ -460,7 +458,7 @@ These tags can be used in templates, in addition to the [standard Liquid filters
   If the time value is in UTC: 2013-02-16T22:55:22Z
 
 * `encode_uri_component`
-  
+
   e.g., `example.com/foo?url=http://mysite.com{{ post.url | encode_uri_component }}`
 
   Intended to provide the functionality of JavaScript's `encode_uri_component()` function. Essentially:
@@ -469,9 +467,9 @@ These tags can be used in templates, in addition to the [standard Liquid filters
 ## List of tags
 
 * `file_digest <path> [prefix:<prefix>]`
-  
+
   (Note: For this tag to return anything, `ENV=production` must be set as an environment variable.)
-  
+
   Computes a hex digest of the contents of `<path>`, optionally prefixed with `<prefix>`. `<path>` is delimited by whitespace.
 
   Useful for URL fingerprinting for long-lived caching.
@@ -537,7 +535,7 @@ Variable       | Value
 ## Directory structure
 
 * `lib/serif/` is generally where files go.
-* `test/` contains the test files. Any new files should have `require "test_helper"` at the top of the, which pulls in `test/test_helper.rb`.
+* `spec/` contains the test files. Any new files should have `require "spec_helper"` at the top of the, which pulls in `spec/test_helper.rb`.
 
 # Changes and what's new
 

data/lib/serif.rb

@@ -1,7 +1,8 @@
 require "time"
 
 require "liquid"
-require "redcarpet"
+require "kramdown"
+require "rubypants"
 require "rouge"
 require "redhead"
 require "timeout_cache"
@@ -20,4 +21,4 @@ require "serif/site"
 require "serif/config"
 
 module Serif
-end
+end

data/lib/serif/admin_server.rb

@@ -71,7 +71,7 @@ class AdminServer
         html_content = document.to_html
 
         html_content = "<blockquote>#{html_content}</blockquote>"
-        markdown = ReverseMarkdown.parse(html_content, github_style_code_blocks: true)
+        markdown = ReverseMarkdown.convert(html_content, github_flavored: true, unknown_tags: :bypass)
 
         # markdown URLs need to have any )s escaped
         markdown = "[#{title}](#{url.gsub(")", "\\)")}):\n\n#{markdown}"
@@ -88,7 +88,7 @@ class AdminServer
       # there is actually an overall site conflict, then
       # keep on trucking so it doesn't interrupt the user.
       if site.conflicts(draft)
-        liquid :new_draft, locals: { conflicts: @conflicts, images_path: site.config.image_upload_path.gsub(/"/, '\"'), post: draft, error_message: "There is a conflict on this draft." }
+        liquid :new_draft, locals: { draft_content: draft.content, conflicts: @conflicts, images_path: site.config.image_upload_path.gsub(/"/, '\"'), post: draft, error_message: "There is a conflict on this draft." }
       else
         draft.save(markdown)
 
@@ -109,7 +109,7 @@ class AdminServer
     get "/admin/new/draft" do
       content = Draft.new(site)
       autofocus = "slug"
-      liquid :new_draft, locals: { conflicts: @conflicts, images_path: site.config.image_upload_path.gsub(/"/, '\"'), post: content, autofocus: autofocus }
+      liquid :new_draft, locals: { draft_content: content.content.to_s, conflicts: @conflicts, images_path: site.config.image_upload_path.gsub(/"/, '\"'), post: content, autofocus: autofocus }
     end
 
     post "/admin/new/draft" do
@@ -128,11 +128,11 @@ class AdminServer
         autofocus = "title" unless params[:title]
         autofocus = "slug" unless params[:slug]
 
-        liquid :new_draft, locals: { conflicts: @conflicts, images_path: site.config.image_upload_path.gsub(/"/, '\"'), error_message: error_message, post: content, autofocus: autofocus }
+        liquid :new_draft, locals: { draft_content: params[:markdown].to_s, conflicts: @conflicts, images_path: site.config.image_upload_path.gsub(/"/, '\"'), error_message: error_message, post: content, autofocus: autofocus }
       else
         if Draft.exist?(site, params[:slug])
           error_message = "Draft already eixsts with the given slug #{params[:slug]}."
-          liquid :new_draft, locals: { conflicts: @conflicts, images_path: site.config.image_upload_path.gsub(/"/, '\"'), error_message: error_message, post: content, autofocus: autofocus }
+          liquid :new_draft, locals: { draft_content: params[:markdown].to_s, conflicts: @conflicts, images_path: site.config.image_upload_path.gsub(/"/, '\"'), error_message: error_message, post: content, autofocus: autofocus }
         else
           content.save(params[:markdown])
           begin
@@ -179,10 +179,10 @@ class AdminServer
           error_message = "You must pick a URL to use"
         end
 
-        liquid :edit_draft, locals: { conflicts: @conflicts, images_path: site.config.image_upload_path.gsub(/"/, '\"'), error_message: error_message, post: content, private_url: site.private_url(content) }
+        liquid :edit_draft, locals: { draft_content: params[:markdown].to_s, conflicts: @conflicts, images_path: site.config.image_upload_path.gsub(/"/, '\"'), error_message: error_message, post: content, private_url: site.private_url(content) }
       elsif (conflicts = site.conflicts)
         error_message = "The site has a conflict and cannot be generated."
-        liquid :edit_draft, locals: { conflicts: @conflicts, images_path: site.config.image_upload_path.gsub(/"/, '\"'), error_message: error_message, post: content, private_url: site.private_url(content) }
+        liquid :edit_draft, locals: { draft_content: params[:markdown].to_s, conflicts: @conflicts, images_path: site.config.image_upload_path.gsub(/"/, '\"'), error_message: error_message, post: content, private_url: site.private_url(content) }
       else
         content.save(params[:markdown])
 
@@ -233,7 +233,7 @@ class AdminServer
       redirect to("/admin") unless params[:slug]
 
       content = Draft.from_slug(site, params[:slug])
-      liquid :edit_draft, locals: { conflicts: @conflicts, images_path: site.config.image_upload_path.gsub(/"/, '\"'), post: content, autofocus: "markdown", private_url: site.private_url(content) }
+      liquid :edit_draft, locals: { draft_content: content.content, conflicts: @conflicts, images_path: site.config.image_upload_path.gsub(/"/, '\"'), post: content, autofocus: "markdown", private_url: site.private_url(content) }
     end
 
     post "/admin/delete/?" do
@@ -247,7 +247,7 @@ class AdminServer
       content = params["content"]
 
       if request.xhr?
-        Redcarpet::Markdown.new(Serif::MarkupRenderer, fenced_code_blocks: true).render(content).strip
+        Serif::Markdown.render(content).strip
       end
     end
 
@@ -289,4 +289,4 @@ class AdminServer
     app.run!
   end
 end
-end
+end

data/lib/serif/commands.rb

@@ -44,7 +44,7 @@ class Commands
   end
 
   def generate_site(source_dir)
-    
+
     site = Serif::Site.new(source_dir)
 
     begin
@@ -148,4 +148,4 @@ class Commands
   END_HELP
   end
 end
-end
+end

data/lib/serif/config.rb

@@ -42,4 +42,4 @@ class Config
     @yaml ||= YAML.load_file(@config_file)
   end
 end
-end
+end

data/lib/serif/content_file.rb

@@ -50,7 +50,7 @@ class ContentFile
 
     @cached_headers = nil
   end
-  
+
   # Returns true if the file is in the directory for draft content, or
   # has no saved path yet.
   def draft?
@@ -68,7 +68,7 @@ class ContentFile
 
     File.dirname(path) == File.join(site.directory, Post.dirname)
   end
-  
+
   def content(include_headers = false)
     include_headers ? "#{@source.headers.to_s}\n\n#{@source.to_s}" : @source.to_s
   end
@@ -82,7 +82,7 @@ class ContentFile
     return nil if !@source
     (headers[:updated] || created).utc
   end
-  
+
   def headers
     return @cached_headers if @cached_headers
 
@@ -97,7 +97,7 @@ class ContentFile
       if key == :created || key == :updated
         value = Time.parse(value)
       end
-      
+
       converted_headers[key] = value
     end
 
@@ -106,7 +106,7 @@ class ContentFile
 
   def save(markdown = nil)
     markdown ||= content if @source
-    
+
     save_path = path || "#{self.class.dirname}/#{@slug}"
 
     # TODO: when a draft is being saved, it will call set_publish_time
@@ -115,7 +115,7 @@ class ContentFile
     # between the update time of a brand new published post and the
     # creation time.
     set_updated_time(Time.now)
-    
+
     File.open(save_path, "w") do |f|
       f.puts %Q{#{@source.headers.to_s}
 
@@ -127,11 +127,11 @@ class ContentFile
 
     true # always return true for now
   end
-    
+
   def inspect
     %Q{<#{self.class} #{headers.inspect}>}
   end
-  
+
   protected
 
   def set_publish_time(time)
@@ -160,4 +160,4 @@ class ContentFile
     @cached_headers = nil
   end
 end
-end
+end

data/lib/serif/draft.rb

@@ -111,4 +111,4 @@ class Draft < ContentFile
     new(site, path)
   end
 end
-end
+end

data/lib/serif/errors.rb

@@ -7,4 +7,4 @@ module Serif
   # This should be used whenever two posts would occupy the same
   # URL / file path.
   class PostConflictError < Error; end
-end
+end

data/lib/serif/markup_renderer.rb

@@ -1,21 +1,32 @@
-module Serif
-class MarkupRenderer < Redcarpet::Render::SmartyHTML
-  def block_code(code, language)
-    # bypass it all to avoid sticking highlighting markup on stuff with no language.
-    # 
-    # note that we add a new line after the initial ``` but not before the closing
-    # ``` because otherwise it introduces an extra \n.
-    if !language
-        simple_code = %Q{```\n#{code}```}
-        renderer = Redcarpet::Markdown.new(Redcarpet::Render::SmartyHTML, fenced_code_blocks: true)
-        return renderer.render(simple_code).strip
+module Kramdown
+  module Converter
+    class SerifCustom < Html
+      def convert_codeblock(el, indent)
+        attr = el.attr.dup
+        language = extract_code_language!(attr)
+        if language
+          out = Rouge.highlight(el.value, language, "html")
+          out.sub!(/^(<pre class=\"highlight\">)/, '\1<code>')
+          out.sub!(/<\/pre>\z/, "</code></pre>\n")
+        else
+          super
+        end
+      end
     end
+  end
+end
 
-    out = Rouge.highlight(code, language, "html")
-    out.sub!(/^(<pre class=\"highlight\">)/, '\1<code>')
-    out.sub!(/<\/pre>\z/, "</code></pre>\n")
-    
-    out
+module Serif
+class Markdown
+  def self.render(markdown)
+    options = {
+      input: "GFM",
+      auto_id_stripping: true,
+      enable_coderay: false,
+      hard_wrap: false,
+      parse_block_html: false
+    }
+    Kramdown::Document.new(markdown, options).to_serif_custom
   end
 end
-end
+end