wikicloth 0.1.4 → 0.1.5

data/Rakefile

@@ -25,7 +25,7 @@ end
 
 spec = Gem::Specification.new do |s|
   s.name = "wikicloth"
-  s.version = %q{0.1.4}
+  s.version = %q{0.1.5}
   s.author = "David Ricciardi"
   s.email = "nricciar@gmail.com"
   s.homepage = "http://github.com/nricciar/wikicloth"

data/lib/wikicloth/parser.rb

@@ -0,0 +1,69 @@
+module WikiCloth
+
+  class Parser < WikiLinkHandler
+
+    def initialize(opt={})
+      opt.each { |k,v|
+        if v.instance_of?(Proc)
+          self.class.send :define_method, k.to_sym do |*args|
+            v.call(args)
+          end
+        end
+      }
+      @params = opt[:params] || {}
+      @wikicloth = WikiCloth.new(:data => opt[:data], :link_handler => self, :params => @params)
+    end
+
+    class << self
+      def url_for(&block)
+        self.send :define_method, 'url_for' do |url|
+          block.call(url)
+        end
+      end
+
+      def external_link(&block)
+	self.send :define_method, 'external_link' do |url,text|
+	  block.call(url,text)
+	end
+      end
+
+      def include_resource(&block)
+	self.send :define_method, 'include_resource' do |resource,options|
+	  options ||= []
+	  block.call(resource,options)
+	end
+      end
+
+      def link_for_resource(&block)
+	self.send :define_method, 'link_for_resource' do |prefix,resource,options|
+	  options ||= []
+	  block.call(prefix,resource,options)
+	end
+      end
+
+      def template(&block)
+        self.send :define_method, 'template' do |template|
+          block.call(template)
+        end
+      end
+
+      def link_for(&block)
+	self.send :define_method, 'link_for' do |page,text|
+	  block.call(page,text)
+	end
+      end
+
+      def link_attributes_for(&block)
+	self.send :define_method, 'link_attributes_for' do |page|
+	  block.call(page)
+	end
+      end
+    end
+
+    def to_html
+      @wikicloth.to_html
+    end
+
+  end
+
+end

data/lib/wikicloth/wiki_link_handler.rb

@@ -17,7 +17,7 @@ class WikiLinkHandler
     @params ||= {}
   end
 
-  def include_template(template)
+  def template(template)
     nil
   end
 

data/lib/wikicloth.rb

@@ -2,6 +2,7 @@ require 'jcode'
 require File.join(File.expand_path(File.dirname(__FILE__)), "wikicloth", "core_ext")
 require File.join(File.expand_path(File.dirname(__FILE__)), "wikicloth", "wiki_buffer")
 require File.join(File.expand_path(File.dirname(__FILE__)), "wikicloth", "wiki_link_handler")
+require File.join(File.expand_path(File.dirname(__FILE__)), "wikicloth", "parser")
 String.send(:include, ExtendedString)
 
 module WikiCloth
@@ -15,14 +16,14 @@ module WikiCloth
 
     def load(data,p={})
       data.gsub!(/<!--(.|\s)*?-->/,"")
-      data = data.gsub(/\{\{(.*?)\}\}/){ |match| expand_templates($1,["."]) }
+      data = data.gsub(/^[^\s]*\{\{(.*?)\}\}/){ |match| expand_templates($1,["."]) }
       self.params = p
       self.html = data
     end
 
     def expand_templates(template, stack)
       template.strip!
-      article = self.link_handler.include_template(template)
+      article = link_handler.template(template)
 
       if article.nil?
         data = "{{template}}"
@@ -32,7 +33,7 @@ module WikiCloth
         else
           data = "template loop! OHNOES!"
         end
-        data = data.gsub(/\{\{(.*?)\}\}/){ |match| expand_templates($1,stack + [template])}
+        data = data.gsub(/^[^\s]*\{\{(.*?)\}\}/){ |match| expand_templates($1,stack + [template])}
       end
 
       data

data/run_tests.rb

@@ -19,7 +19,7 @@ class CustomLinkHandler < WikiLinkHandler
   end
 end
 @wiki = WikiCloth::WikiCloth.new({ 
-  :data => "<nowiki>{{test}}</nowiki> ''Hello {{test}}!''\n",
+  :data => "\n  {{test}}\n\n<nowiki>{{test}}</nowiki> ''Hello {{test}}!''\n",
   :params => { "test" => "World" } })
 puts @wiki.to_html
 @wiki = WikiCloth::WikiCloth.new({ 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: wikicloth
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - David Ricciardi
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-05 00:00:00 -04:00
+date: 2010-08-10 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -29,31 +29,32 @@ extra_rdoc_files:
 - README
 - MIT-LICENSE
 files: 
+- lib/wikicloth.rb
+- lib/wikicloth/wiki_buffer.rb
+- lib/wikicloth/parser.rb
 - lib/wikicloth/core_ext.rb
-- lib/wikicloth/wiki_buffer/html_element.rb
-- lib/wikicloth/wiki_buffer/link.rb
 - lib/wikicloth/wiki_buffer/table.rb
+- lib/wikicloth/wiki_buffer/html_element.rb
 - lib/wikicloth/wiki_buffer/var.rb
-- lib/wikicloth/wiki_buffer.rb
+- lib/wikicloth/wiki_buffer/link.rb
 - lib/wikicloth/wiki_link_handler.rb
-- lib/wikicloth.rb
 - tasks/wikicloth_tasks.rake
-- sample_documents/air_force_one.wiki
-- sample_documents/cheatsheet.wiki
-- sample_documents/elements.wiki
 - sample_documents/george_washington.wiki
-- sample_documents/images.wiki
-- sample_documents/lists.wiki
 - sample_documents/pipe_trick.wiki
 - sample_documents/random.wiki
 - sample_documents/tv.wiki
+- sample_documents/air_force_one.wiki
+- sample_documents/lists.wiki
+- sample_documents/images.wiki
+- sample_documents/elements.wiki
 - sample_documents/wiki_tables.wiki
+- sample_documents/cheatsheet.wiki
 - init.rb
 - uninstall.rb
 - Rakefile
 - install.rb
-- test/test_helper.rb
 - test/wiki_cloth_test.rb
+- test/test_helper.rb
 - run_tests.rb
 - README
 - MIT-LICENSE
@@ -92,6 +93,6 @@ signing_key:
 specification_version: 3
 summary: An implementation of the mediawiki markup in ruby
 test_files: 
-- test/test_helper.rb
 - test/wiki_cloth_test.rb
+- test/test_helper.rb
 - run_tests.rb