markdown-rails 0.1.0 → 0.2.0

data/History.md

@@ -0,0 +1,7 @@
+# 0.2.0
+
+* Use MarkdownRails instead of Markdown::Rails to avoid conflict with RDiscount's Markdown class
+
+# 0.1.0
+
+* Initial release

data/README.md

@@ -56,7 +56,7 @@ By default markdown-rails uses the
 by calling `config.render` like so:
 
 ```ruby
-Markdown::Rails.configure do |config|
+MarkdownRails.configure do |config|
   config.render do |markdown_source|
     # Return compiled HTML here ...
   end
@@ -71,7 +71,7 @@ parser options. To do so, add the `redcarpet` gem to your Gemfile, and add the
 following into a `config/initializers/markdown.rb` file:
 
 ```ruby
-Markdown::Rails.configure do |config|
+MarkdownRails.configure do |config|
   markdown = Redcarpet::Markdown.new(Redcarpet::Render::HTML,
     :fenced_code_blocks => true,
     :autolink => true,

data/lib/markdown-rails.rb

@@ -1 +1,2 @@
-require 'markdown/rails/engine'
+require 'markdown-rails/version'
+require 'markdown-rails/engine'

data/lib/markdown-rails/engine.rb

@@ -0,0 +1,37 @@
+require 'rdiscount'
+require 'action_view'
+
+# We cannot use Markdown::Rails because it conflicts with RDiscount's Markdown class
+module MarkdownRails
+  class Handler
+    def initialize
+    end
+
+    def call(template)
+      # Return Ruby code that returns the compiled template
+      MarkdownRails.renderer.call(template.source).inspect + '.html_safe'
+    end
+  end
+
+  class <<self
+    def configure
+      yield self
+    end
+
+    attr_accessor :renderer
+
+    def render(&block)
+      self.renderer = block
+    end
+  end
+end
+
+MarkdownRails.configure do |config|
+  config.render do |markdown_source|
+    RDiscount.new(markdown_source).to_html
+  end
+end
+
+handler = MarkdownRails::Handler.new
+ActionView::Template.register_template_handler(:md, handler)
+ActionView::Template.register_template_handler(:markdown, handler)

data/lib/markdown-rails/version.rb

@@ -0,0 +1,3 @@
+module MarkdownRails
+  VERSION = "0.2.0"
+end

data/markdown-rails.gemspec

@@ -1,9 +1,9 @@
 # -*- encoding: utf-8 -*-
-require File.expand_path('../lib/markdown/rails/version', __FILE__)
+require File.expand_path('../lib/markdown-rails/version', __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "markdown-rails"
-  s.version     = Markdown::Rails::VERSION
+  s.version     = MarkdownRails::VERSION
   s.authors     = ["Jo Liss"]
   s.email       = ["joliss42@gmail.com"]
   s.homepage    = "https://github.com/joliss/markdown-rails"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: markdown-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-22 00:00:00.000000000 Z
+date: 2012-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &17430280 !ruby/object:Gem::Requirement
+  requirement: &16496040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *17430280
+  version_requirements: *16496040
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &17429740 !ruby/object:Gem::Requirement
+  requirement: &16495540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -35,7 +35,7 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *17429740
+  version_requirements: *16495540
 description: Markdown as a static templating language for Rails views and partials
 email:
 - joliss42@gmail.com
@@ -45,11 +45,12 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - Gemfile
+- History.md
 - License.txt
 - README.md
 - lib/markdown-rails.rb
-- lib/markdown/rails/engine.rb
-- lib/markdown/rails/version.rb
+- lib/markdown-rails/engine.rb
+- lib/markdown-rails/version.rb
 - markdown-rails.gemspec
 homepage: https://github.com/joliss/markdown-rails
 licenses: []

data/lib/markdown/rails/engine.rb

@@ -1,38 +0,0 @@
-require 'rdiscount'
-require 'action_view'
-
-module Markdown
-  module Rails
-    class Handler
-      def initialize
-      end
-
-      def call(template)
-        # Return Ruby code that returns the compiled template
-        Markdown::Rails.renderer.call(template.source).inspect + '.html_safe'
-      end
-    end
-
-    class <<self
-      def configure
-        yield self
-      end
-
-      attr_accessor :renderer
-
-      def render(&block)
-        self.renderer = block
-      end
-    end
-  end
-end
-
-Markdown::Rails.configure do |config|
-  config.render do |markdown_source|
-    RDiscount.new(markdown_source).to_html
-  end
-end
-
-handler = Markdown::Rails::Handler.new
-ActionView::Template.register_template_handler(:md, handler)
-ActionView::Template.register_template_handler(:markdown, handler)

data/lib/markdown/rails/version.rb

@@ -1,5 +0,0 @@
-module Markdown
-  module Rails
-    VERSION = "0.1.0"
-  end
-end