RubyGems - creole - Versions diffs - 0.3.5 → 0.3.6 - Mend

creole 0.3.5 → 0.3.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (4) hide show

data/Manifest.txt CHANGED

@@ -3,4 +3,3 @@ README.txt
 Rakefile
 lib/creole.rb
 test/test_creole.rb
-test/testcases.rb

data/lib/creole.rb CHANGED

@@ -37,12 +37,7 @@ require 'uri'
 # methods are: make_local_link
 class Creole
-  VERSION = '0.3.5'
-  # CreoleError is raised when the Creole parser encounters
-  # something unexpected. This is generally now thrown unless there is
-  # a bug in the parser.
-  class CreoleError < Exception; end
+  VERSION = '0.3.6'
   # Convert the argument in Creole format to HTML and return the
   # result. Example:
@@ -51,32 +46,40 @@ class Creole
   #        #=> "<p><strong>Hello <em>World</em></strong></p>"
   #
   # This is an alias for calling Creole#parse:
-  #    Creole.new.parse(creole)
-  def self.creolize(creole)
-    new.parse(creole)
+  #    Creole.new(text).to_html
+  def self.creolize(text, options = {})
+    new(text, options).to_html
   end
+  # Allowed url schemes
+  # Examples: http https ftp ftps
+  attr_accessor :allowed_schemes
+  # Extensions enabled?
+  attr_writer :extensions
+  def extensions?; @extensions; end
   # Create a new CreoleParser instance.
-  def initialize
-    @base = nil
-    @allowed_schemes = [ 'http', 'https', 'ftp', 'ftps' ]
-    @uri_scheme_re = @allowed_schemes.join('|')
+  def initialize(text, options = {})
+    @allowed_schemes = options[:allowed_schemes] || %w(http https ftp ftps)
+    @extensions = options[:extensions]
+    @text = text
   end
-  # Parse and convert the argument in Creole text to HTML and return
+  # Convert CCreole text to HTML and return
   # the result. The resulting HTML does not contain <html> and
   # <body> tags.
   #
   # Example:
   #
-  #    parser = CreoleParser.new
-  #    parser.parse("**Hello //World//**")
+  #    parser = CreoleParser.new("**Hello //World//**", :extensions => true)
+  #    parser.to_html
   #       #=> "<p><strong>Hello <em>World</em></strong></p>"
-  def parse(string)
-    @out = ""
+  def to_html
+    @out = ''
     @p = false
     @stack = []
-    parse_block(string)
+    parse_block(@text)
     @out
   end
@@ -246,9 +249,7 @@ class Creole
         else
           @out << escape_html($&)
         end
-      when /\A~([^\s])/
-        @out << escape_html($1)
-      when /\A\w+/
+      when /\A([:alpha:]|[:digit:])+/
         @out << $&
       when /\A\s+/
         @out << ' ' if @out[-1,1] != ' '
@@ -258,10 +259,36 @@ class Creole
         toggle_tag 'em', $&
       when /\A\\\\/
         @out << '<br/>'
-      when /./
-        @out << escape_html($&)
       else
-        raise CreoleError, "Parse error at #{str[0,30].inspect}"
+        if @extensions
+          case str
+          when /\A__/
+            toggle_tag 'u', $&
+          when /\A\-\-/
+            toggle_tag 'del', $&
+          when /\A\+\+/
+            toggle_tag 'ins', $&
+          when /\A\^\^/
+            toggle_tag 'sup', $&
+          when /\A\~\~/
+            toggle_tag 'sub', $&
+          when /\A\(R\)/i
+            @out << '&#174;'
+          when /\A\(C\)/i
+            @out << '&#169;'
+          when /\A~([^\s])/
+            @out << escape_html($1)
+          when /./
+            @out << escape_html($&)
+          end
+        else
+          case str
+          when /\A~([^\s])/
+            @out << escape_html($1)
+          when /./
+            @out << escape_html($&)
+          end
+        end
       end
       str = $'
     end
@@ -346,7 +373,7 @@ class Creole
         start_paragraph
         parse_inline($1)
       else
-        raise CreoleError, "Parse error at #{str[0,30].inspect}"
+        raise "Parse error at #{str[0,30].inspect}"
       end
       #p [$&, $']
       str = $'
@@ -355,4 +382,4 @@ class Creole
     @out
   end
-end # class Creole
+end

data/test/test_creole.rb CHANGED

@@ -3,11 +3,15 @@ require 'creole'
 require 'cgi'
 class TestCreole < Test::Unit::TestCase
-  def tc(html, creole)
-    output = Creole.creolize(creole)
+  def tc(html, creole, options = {})
+    output = Creole.creolize(creole, options)
     assert html === output, "Parsing: #{creole.inspect}\nExpected: #{html.inspect}\n     Was: #{output.inspect}"
   end
+  def tce(html, creole)
+    tc(html, creole, :extensions => true)
+  end
   def run_file(file)
     html = File.read(file.sub('.creole', '.html'))
     output = Creole.creolize(File.read(file))
@@ -629,4 +633,29 @@ class TestCreole < Test::Unit::TestCase
     tc("<p><strong>bold and</strong></p><table><tr><td>table</td></tr></table><p>end<strong></strong></p>",
        "**bold and\n|table|\nend**")
   end
+  def test_extensions
+    tc("<p>This is not __underlined__</p>",
+       "This is not __underlined__")
+    tce("<p>This is <u>underlined</u></p>",
+        "This is __underlined__")
+    tce("<p>This is <del>deleted</del></p>",
+        "This is --deleted--")
+    tce("<p>This is <ins>inserted</ins></p>",
+        "This is ++inserted++")
+    tce("<p>This is <sup>super</sup></p>",
+        "This is ^^super^^")
+    tce("<p>This is <sub>sub</sub></p>",
+        "This is ~~sub~~")
+    tce("<p>&#174;</p>", "(R)")
+    tce("<p>&#174;</p>", "(r)")
+    tce("<p>&#169;</p>", "(C)")
+    tce("<p>&#169;</p>", "(c)")
+  end
 end

metadata CHANGED

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: creole
 version: !ruby/object:Gem::Version
-  hash: 25
+  hash: 31
   prerelease: false
   segments:
   - 0
   - 3
-  - 5
-  version: 0.3.5
+  - 6
+  version: 0.3.6
 platform: ruby
 authors:
 - Lars Christensen