wikiwah 0.0.1 → 0.0.2

data/lib/wikiwah/converter.rb

@@ -0,0 +1,71 @@
+require 'wikiwah/flow'
+require 'wikiwah/subst'
+
+module WikiWah
+
+  class Converter
+
+    attr_writer :link_translator
+
+    def initialize
+      @link_translator = proc do |link| link end
+        init_transformer
+      end
+
+      # Convert WikiWah text to HTML.
+      def convert(text)
+        Flow.convert(text) do |paragraph|
+          @transformer.transform(paragraph)
+        end
+      end
+
+      private
+
+      def translate_link(link)
+        @link_translator.call(link)
+      end
+
+      def init_transformer
+        @transformer = WikiWah::Subst.new 
+        @transformer.add_transformation(/""(.+)""/) do |match|
+          # Double-double-quoted
+          CGI.escapeHTML(match[1])
+        end
+        @transformer.add_transformation(/\\(.)/) do |match|
+          # Backslash-quoted
+          match[1]
+        end
+        @transformer.add_transformation(/\<(.+?)\>/m) do |match| 
+          # In-line HTML
+          match[0] 
+        end
+        @transformer.add_transformation(/\{(.+?)\}(@(\S*[\w\/]))?/m) do |match|
+          # Distinuished link
+          label = @transformer.transform(match[1])
+          location = translate_link(match[3] || match[1])
+          if location
+            "<a href='#{location}'>#{label}</a>"
+          else
+            "{#{label}}"
+          end
+        end
+        @transformer.add_transformation(/\b[a-z]+:[\w\/]\S*[\w\/]/) do |match|
+          # URL
+          "<a href='#{match[0]}'>#{match[0]}</a>"
+        end
+        @transformer.add_transformation(%r[(^|\W)([*+_/])([*+_/]*\w.*?\w[*+_/]*)\2(?!\w)]) do |match|
+          # Bold/italic/etc.
+          tag = case match[2]
+          when '*'; 'strong'
+          when '+'; 'tt'
+          when '/'; 'em'
+          when '_'; 'u'
+          end
+          content = @transformer.transform(match[3])
+          (match[1] + '<' + tag + '>' + content + '</' + tag + '>')
+        end
+      end
+
+    end
+
+end

data/lib/wikiwah/flow.rb

@@ -2,7 +2,7 @@
 
 require 'cgi'                   # for escapeHTML
 
-class WikiWah
+module WikiWah
 
   # Flow deals with block-level formatting in WikiWah.  Input text is split
   # into paragraphs, separated by blank lines.  A list-item bullet also

data/lib/wikiwah/subst.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-class WikiWah
+module WikiWah
 
   # Subst handles text-transformation using a series of regular-expression
   # substitutions.  It encapsulates a number of "patterns", and associated

data/lib/wikiwah/tilt_integration.rb

@@ -0,0 +1,20 @@
+require "tilt"
+require "wikiwah"
+
+module WikiWah
+  
+  class Template < Tilt::Template
+
+    def prepare
+      @output = nil
+    end
+
+    def evaluate(scope, locals, &block)
+      @output ||= WikiWah.convert(data)
+    end
+
+  end
+
+end
+
+Tilt.register 'wah', WikiWah::Template

data/lib/wikiwah/version.rb

@@ -1,3 +1,3 @@
-class WikiWah
-  VERSION = "0.0.1"
+module WikiWah
+  VERSION = "0.0.2".freeze
 end

data/lib/wikiwah.rb

@@ -1,5 +1,4 @@
-require 'wikiwah/flow'
-require 'wikiwah/subst'
+require 'wikiwah/converter'
 require 'wikiwah/version'
 
 # A formatter for turning Wiki-esque text into HTML.
@@ -32,72 +31,12 @@ require 'wikiwah/version'
 # - "{LABEL}@LOCATION" creates a link to LOCATION, with the specified
 #   LABEL.
 #
-class WikiWah
+module WikiWah
 
-  attr_writer :link_translator
-
-  def initialize
-    @link_translator = proc do |link| link end
-    init_transformer
-  end
-
-  # Convert WikiWah text to HTML.
-  def to_html(text)
-    Flow.convert(text) do |paragraph|
-      @transformer.transform(paragraph)
-    end
-  end
-  
-  def self.to_html(text)
-    self.new.to_html(text)
-  end
-  
-  private
-
-  def translate_link(link)
-    @link_translator.call(link)
-  end
-  
-  def init_transformer
-    @transformer = WikiWah::Subst.new 
-    @transformer.add_transformation(/""(.+)""/) do |match|
-      # Double-double-quoted
-      CGI.escapeHTML(match[1])
-    end
-    @transformer.add_transformation(/\\(.)/) do |match|
-      # Backslash-quoted
-      match[1]
-    end
-    @transformer.add_transformation(/\<(.+?)\>/m) do |match| 
-      # In-line HTML
-      match[0] 
-    end
-    @transformer.add_transformation(/\{(.+?)\}(@(\S*[\w\/]))?/m) do |match|
-      # Distinuished link
-      label = @transformer.transform(match[1])
-      location = translate_link(match[3] || match[1])
-      if location
-        "<a href='#{location}'>#{label}</a>"
-      else
-        "{#{label}}"
-      end
-    end
-    @transformer.add_transformation(/\b[a-z]+:[\w\/]\S*[\w\/]/) do |match|
-      # URL
-      "<a href='#{match[0]}'>#{match[0]}</a>"
-    end
-    @transformer.add_transformation(%r[(^|\W)([*+_/])([*+_/]*\w.*?\w[*+_/]*)\2(?!\w)]) do |match|
-      # Bold/italic/etc.
-      tag = case match[2]
-            when '*'; 'strong'
-            when '+'; 'tt'
-            when '/'; 'em'
-            when '_'; 'u'
-            end
-      content = @transformer.transform(match[3])
-      (match[1] + '<' + tag + '>' + content + '</' + tag + '>')
-    end
+  def self.convert(text)
+    Converter.new.convert(text)
   end
 
 end
 
+Wikiwah = WikiWah

data/test/wikiwah/flow_tests.rb

@@ -401,7 +401,7 @@ after
 </p>
 END_OF_TESTS
 
-class WikiWah
+module WikiWah
   class FlowTests < Test::Unit::TestCase
 
     TESTS.split(/\n====.*\n/).each_with_index do |test, i|

data/test/wikiwah/subst_tests.rb

@@ -3,7 +3,7 @@
 require 'wikiwah/subst'
 require 'test/unit'
 
-class WikiWah
+module WikiWah
 
   class Subst_Tests < Test::Unit::TestCase
     

data/test/wikiwah_tests.rb

@@ -5,12 +5,8 @@ require 'test/unit'
 
 class WikiWahTests < Test::Unit::TestCase
 
-  def setup
-    @wikiwah = WikiWah.new
-  end
-
   def assert_wikiwah(expected, input)
-    assert_equal(expected, @wikiwah.to_html(input))
+    assert_equal(expected, Wikiwah.convert(input))
   end
 
   def test_empty

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: wikiwah
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: false
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Mike Williams
@@ -15,12 +15,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-30 00:00:00 +10:00
+date: 2010-10-28 00:00:00 +11:00
 default_executable: 
 dependencies: []
 
 description: |
-  Wikiwah is a text-to-HTML converter, along the lines of Markdown.  
+  WikiWah is a text-to-HTML converter, along the lines of Markdown.  
   
   This isn't the markup language you're looking for.  
   It offers no improvements on Markdown, Textile, etc.  
@@ -34,10 +34,12 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- lib/wikiwah/converter.rb
 - lib/wikiwah/flow.rb
 - lib/wikiwah/flow.rb~
 - lib/wikiwah/subst.rb
 - lib/wikiwah/subst.rb~
+- lib/wikiwah/tilt_integration.rb
 - lib/wikiwah/version.rb
 - lib/wikiwah/version.rb~
 - lib/wikiwah.rb