metadown 1.0.1 → 1.1.0.beta

data/README.md

@@ -23,6 +23,9 @@ at the head of your file:
 Woudn't that be neat to use on other projects? I thought so too! Hence,
 metadown.
 
+Furthermore, you don't have to have just markdown. Inject any kind of
+parser you'd like!
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -60,6 +63,17 @@ back with two attributes: output and metadata.
     data.output #=> "<p>hello, world</p>\n"
     data.metadata #=> {"key" => "value"}
 
+If you don't want to use Markdown, I assume you're using a Tilt
+template of some kind:
+
+    require 'metadown'
+    require 'erb'
+    require 'tilt'
+    
+    data = Metadown.render("<h1><%= 'Hi' %></h1>", Tilt::ERBTemplate)
+    data.output #=> "<h1>Hi</h1>"
+    data.metadata #=> "{}"
+    
 ## Contributing
 
 1. Fork it

data/lib/metadown.rb

@@ -1,4 +1,5 @@
 require "metadown/renderer"
+require "metadown/metadata_parser"
 require "metadown/version"
 
 # This module namespaces everything in the gem. It's also where the factory
@@ -11,13 +12,26 @@ module Metadown
   # output.
   Data = Struct.new(:metadata, :output)
 
-  # The render method is a convenient factory. It parses some text via our
-  # Renderer class and Redcarpet's own class, and gives us a Data back.
-  def render(text)
-    renderer = Metadown::Renderer.new
+  # The render method is a convenient factory. If we give it text, it
+  # delegates to the classic markdown renderer, otherwise, we can inject
+  # one of our own.
+  def render(text, renderer=nil)
+    return redcarpet_render(text) if renderer.nil?
+
+    metadata = MetadataParser.new(text).parse
+
+    Data.new(metadata, renderer.new { text }.render)
+  end
+  module_function :render
+
+  # Classic compatiblity mode: fall back to old redcarpet renderer
+  def redcarpet_render(text)
+    renderer = Renderer.new
     markdown = Redcarpet::Markdown.new(renderer)
+
     output = markdown.render(text)
+
     Data.new(renderer.metadata, output)
   end
-  module_function :render
+  module_function :redcarpet_render
 end

data/lib/metadown/metadata_parser.rb

@@ -0,0 +1,13 @@
+module Metadown
+  class MetadataParser
+    def initialize(text)
+      @text = text
+      @metadata = {}
+    end
+
+    def parse
+      @text =~ /^(---\s*\n.*?\n?)^(---\s*$\n?)/m
+      @mtext = YAML.load($1) if $1
+    end
+  end
+end

data/lib/metadown/version.rb

@@ -1,4 +1,4 @@
 module Metadown
   # The current released version of Metadown
-  VERSION = "1.0.1"
+  VERSION = "1.1.0.beta"
 end

data/spec/metadown_spec.rb

@@ -2,18 +2,30 @@ $:.unshift("lib")
 require 'metadown'
 
 describe Metadown do
-  it "provides a factory" do
+  let(:text) do
     text = <<-MARKDOWN
 ---
 key: "value"
 ---
 hello world
 MARKDOWN
+  end
 
+  it "provides a factory" do
     Metadown.render(text).tap do |data|
       data.should be_kind_of(Metadown::Data)
       data.metadata.should eql({"key" => "value"})
       data.output.should eql("<p>hello world</p>\n")
     end
   end
+
+  it "allows you to inject a parser" do
+    parser = stub(:new => stub(:render => "wat"))
+
+    Metadown.render(text, parser).tap do |data|
+      data.should be_kind_of(Metadown::Data)
+      data.metadata.should eql({"key" => "value"})
+      data.output.should eql("wat")
+    end
+  end
 end

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: metadown
 version: !ruby/object:Gem::Version
-  version: 1.0.1
-  prerelease: 
+  version: 1.1.0.beta
+  prerelease: 6
 platform: ruby
 authors:
 - Steve Klabnik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-23 00:00:00.000000000 Z
+date: 2012-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &2152515300 !ruby/object:Gem::Requirement
+  requirement: &2156246880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152515300
+  version_requirements: *2156246880
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2152514460 !ruby/object:Gem::Requirement
+  requirement: &2156246380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152514460
+  version_requirements: *2156246380
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2152514020 !ruby/object:Gem::Requirement
+  requirement: &2156245820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152514020
+  version_requirements: *2156245820
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2152513500 !ruby/object:Gem::Requirement
+  requirement: &2156245360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152513500
+  version_requirements: *2156245360
 description: This gem gives you a custom markdown parser that allows you to prefix
   the markdown itself with YAML metadata.
 email:
@@ -72,6 +72,7 @@ files:
 - README.md
 - Rakefile
 - lib/metadown.rb
+- lib/metadown/metadata_parser.rb
 - lib/metadown/renderer.rb
 - lib/metadown/version.rb
 - metadown.gemspec
@@ -92,9 +93,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10