creole 0.4.2 → 0.5.0

data/.travis.yml

@@ -0,0 +1,7 @@
+rvm:
+  - 1.8.7
+  - 1.9.3
+  - ruby-head
+  - jruby
+  - rbx-18mode
+  - rbx-19mode

data/CHANGES

@@ -0,0 +1,6 @@
+0.5.0
+
+  * Remove methods make_*_anchor
+  * Add method make_headline
+  * Parse tags inside link text
+

data/Gemfile

@@ -0,0 +1,3 @@
+source :rubygems
+gemspec
+

data/creole.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
   s.require_paths = %w(lib)
 
   s.homepage = 'http://github.com/minad/creole'
-  s.rdoc_options = %w(--main README.creole)
+  
   s.add_development_dependency('bacon')
+  s.add_development_dependency('rake')
 end

data/lib/creole/parser.rb

@@ -24,8 +24,8 @@ require 'uri'
 # hierachical local links, you must inherit Creole::CreoleParser and
 # override make_local_link.
 #
-# You can customize the created anchor/image markup by overriding
-# make_*_anchor/make_image.
+# You can customize the created image markup by overriding
+# make_image.
 
 # Main Creole parser class.  Call CreoleParser#parse to parse Creole
 # formatted text.
@@ -57,6 +57,7 @@ module Creole
     def initialize(text, options = {})
       @allowed_schemes = %w(http https ftp ftps)
       @text            = text
+      @extensions = @no_escape = nil
       options.each_pair {|k,v| send("#{k}=", v) }
     end
 
@@ -119,7 +120,7 @@ module Creole
 
     def start_paragraph
       if @p
-        @out << ' ' if @out[-1,1] != ' '
+        @out << ' ' if @out[-1] != ?\s
       else
         end_paragraph
         start_tag('p')
@@ -127,20 +128,6 @@ module Creole
       end
     end
 
-    # Create anchor markup for direct links. This
-    # method can be overridden to generate custom
-    # markup, for example to add html additional attributes.
-    def make_direct_anchor(uri, text)
-      '<a href="' << escape_html(uri) << '">' << escape_html(text) << '</a>'
-    end
-
-    # Create anchor markup for explicit links. This
-    # method can be overridden to generate custom
-    # markup, for example to add html additional attributes.
-    def make_explicit_anchor(uri, text)
-      '<a href="' << escape_html(uri) << '">' << escape_html(text) << '</a>'
-    end
-
     # Translate an explicit local link to a desired URL that is
     # properly URL-escaped. The default behaviour is to convert local
     # links directly, escaping any characters that have special
@@ -206,6 +193,10 @@ module Creole
       end
     end
 
+    def make_headline(level, text)
+      "<h#{level}>" << escape_html(text) << "</h#{level}>"
+    end
+
     def make_explicit_link(link)
       begin
         uri = URI.parse(link)
@@ -219,73 +210,90 @@ module Creole
       until str.empty?
         case str
         when /\A(\~)?((https?|ftps?):\/\/\S+?)(?=([\,.?!:;"'\)]+)?(\s|$))/
+          str = $'
           if $1
             @out << escape_html($2)
           else
             if uri = make_direct_link($2)
-              @out << make_direct_anchor(uri, $2)
+              @out << '<a href="' << escape_html(uri) << '">' << escape_html($2) << '</a>'
             else
               @out << escape_html($&)
             end
           end
         when /\A\[\[\s*([^|]*?)\s*(\|\s*(.*?))?\s*\]\]/m
-          link = $1
+          str = $'
+          link, content = $1, $3
           if uri = make_explicit_link(link)
-            @out << make_explicit_anchor(uri, $3 || link)
+            @out << '<a href="' << escape_html(uri) << '">'
+            if content
+              until content.empty?
+                content = parse_inline_tag(content)
+              end
+            else
+              @out << escape_html(link)
+            end
+            @out << '</a>'
           else
             @out << escape_html($&)
           end
-        when /\A\{\{\{(.*?\}*)\}\}\}/
-          @out << '<tt>' << escape_html($1) << '</tt>'
-        when /\A\{\{\s*(.*?)\s*(\|\s*(.*?)\s*)?\}\}/
-          if uri = make_image_link($1)
-            @out << make_image(uri, $3)
-          else
+        else
+          str = parse_inline_tag(str)
+        end
+      end
+    end
+
+    def parse_inline_tag(str)
+      case str
+      when /\A\{\{\{(.*?\}*)\}\}\}/
+        @out << '<tt>' << escape_html($1) << '</tt>'
+      when /\A\{\{\s*(.*?)\s*(\|\s*(.*?)\s*)?\}\}/
+        if uri = make_image_link($1)
+          @out << make_image(uri, $3)
+        else
+          @out << escape_html($&)
+        end
+      when /\A([:alpha:]|[:digit:])+/
+        @out << $&
+      when /\A\s+/
+        @out << ' ' if @out[-1] != ?\s
+      when /\A\*\*/
+        toggle_tag 'strong', $&
+      when /\A\/\//
+        toggle_tag 'em', $&
+      when /\A\\\\/
+        @out << '<br/>'
+      else
+        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
-        when /\A([:alpha:]|[:digit:])+/
-          @out << $&
-        when /\A\s+/
-          @out << ' ' if @out[-1,1] != ' '
-        when /\A\*\*/
-          toggle_tag 'strong', $&
-        when /\A\/\//
-          toggle_tag 'em', $&
-        when /\A\\\\/
-          @out << '<br/>'
         else
-          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
+          case str
+          when /\A~([^\s])/
+            @out << escape_html($1)
+          when /./
+            @out << escape_html($&)
           end
         end
-        str = $'
       end
+      return $'
     end
 
     def parse_table_row(str)
@@ -320,7 +328,7 @@ module Creole
         when /\A\s*(={1,6})\s*(.*?)\s*=*\s*$(\r?\n)?/
           end_paragraph
           level = $1.size
-          @out << "<h#{level}>" << escape_html($2) << "</h#{level}>"
+          @out << make_headline(level, $2)
         when /\A[ \t]*\|.*$(\r?\n)?/
           if !@stack.include?('table')
             end_paragraph

data/lib/creole/version.rb

@@ -1,3 +1,3 @@
 module Creole
-  VERSION = '0.4.2'
+  VERSION = '0.5.0'
 end

data/test/parser_test.rb

@@ -154,8 +154,9 @@ describe Creole::Parser do
     tc("<p><a href=\"http://www.wikicreole.org/\">Visit the WikiCreole website</a></p>",
        "[[http://www.wikicreole.org/|Visit the WikiCreole website]]")
 
-    # WARNING: Parsing markup within a link is optional
-    tc "<p><a href=\"Weird+Stuff\">**Weird** //Stuff//</a></p>", "[[Weird Stuff|**Weird** //Stuff//]]"
+    # WRNING: Parsing markup within a link is optional
+    tc "<p><a href=\"Weird+Stuff\"><strong>Weird</strong> <em>Stuff</em></a></p>", "[[Weird Stuff|**Weird** //Stuff//]]"
+    tc("<p><a href=\"http://example.org/\"><img src=\"image.jpg\"/></a></p>", "[[http://example.org/|{{image.jpg}}]]")
 
     # Inside bold
     tc "<p><strong><a href=\"link\">link</a></strong></p>", "**[[link]]**"

metadata

@@ -1,42 +1,52 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: creole
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.5.0
   prerelease: 
-  version: 0.4.2
 platform: ruby
-authors: 
+authors:
 - Lars Christensen
 - Daniel Mendler
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-05-03 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-10-29 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: bacon
+  requirement: &7674580 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: *7674580
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &7674100 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: *7674100
 description: Creole is a lightweight markup language (http://wikicreole.org/).
-email: 
+email:
 - larsch@belunktum.dk
 - mail@daniel-mendler.de
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.creole
-files: 
+files:
 - .gitignore
+- .travis.yml
+- CHANGES
+- Gemfile
 - README.creole
 - Rakefile
 - creole.gemspec
@@ -44,34 +54,28 @@ files:
 - lib/creole/parser.rb
 - lib/creole/version.rb
 - test/parser_test.rb
-has_rdoc: true
 homepage: http://github.com/minad/creole
 licenses: []
-
 post_install_message: 
-rdoc_options: 
-- --main
-- README.creole
-require_paths: 
+rdoc_options: []
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: creole
-rubygems_version: 1.6.2
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Lightweight markup language
 test_files: []
-