rocco-obb 0.78 → 0.79

data/lib/rocco.rb

@@ -109,7 +109,9 @@ class Rocco
         @options[:comment_chars]    = generate_comment_chars()
     end
       
-    @comment_pattern = Regexp.new("^\\s*#{@options[:comment_chars][:single]}\s?|\\s*#{@options[:comment_chars][:multi][:start]}(#{@options[:comment_chars][:multi][:middle]})#{@options[:comment_chars][:multi][:end]}")
+    if(@options[:comment_chars][:regex]) @comment_pattern = Regexp.new(@options[:comment_chars][:regex])
+    else @comment_pattern = Regexp.new("^\\s*#{@options[:comment_chars]}\s?")
+
     puts @comment_pattern.source
     @sections = highlight(split(parse(@data)))
   end
@@ -174,7 +176,7 @@ class Rocco
             "cpp"           =>  { :single => "//",  :multi => { :start => "/**", :middle => "*", :end => "*/" } },
             "java"          =>  { :single => "//",  :multi => { :start => "/**", :middle => "*", :end => "*/" } },
             "js"            =>  { :single => "//",  :multi => { :start => "/**", :middle => "*", :end => "*/" } },
-            "php"           =>  { :single => "//",  :multi => { :start => "/**", :middle => "*", :end => "*{1,2}/"} },
+            "php"           =>  { :single => "//",  :multi => { :start => "/**", :middle => "*", :end => "*/"}, :regex => "#//(.*)|(?:\*+\n)(?m:(.*?))\*+/#" },
             "lua"           =>  { :single => "--",  :multi => nil },
             "python"        =>  { :single => "#",   :multi => { :start => '"""', :middle => nil, :end => '"""' } },
             "ruby"          =>  { :single => "#",   :multi => nil },

data/rocco.gemspec

@@ -3,7 +3,7 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
 
   s.name = 'rocco-obb'
-  s.version = '0.78'
+  s.version = '0.79'
   s.date = '2010-09-10'
 
   s.description = "Docco in Ruby"

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: rocco-obb
 version: !ruby/object:Gem::Version 
-  hash: 151
+  hash: 149
   prerelease: false
   segments: 
   - 0
-  - 78
-  version: "0.78"
+  - 79
+  version: "0.79"
 platform: ruby
 authors: 
 - Ryan Tomayko