rocco-obb 0.6 → 0.7

data/lib/rocco.rb

@@ -108,7 +108,11 @@ class Rocco
     elsif @options[:language] != defaults[:language]
         @options[:comment_chars]    = generate_comment_chars()
     end
-    @comment_pattern            = Regexp.new("^\\s*#{@options[:comment_chars]}\s?")
+    if !@options[:comment_chars][:single].kind_of?(String) 
+      @comment_pattern = Regexp.new("^\\s*#{@options[:comment_chars][:single]}\s?")
+    else
+       @comment_pattern = Regexp.new("#{@options[:comment_chars][:single]}|#{@options[:comment_chars][:multi]}")
+    end
 
     @sections = highlight(split(parse(@data)))
   end
@@ -173,15 +177,15 @@ class Rocco
             "cpp"           =>  { :single => "//",  :multi => { :start => "/**", :middle => "*", :end => "*/" } },
             "java"          =>  { :single => "//",  :multi => { :start => "/**", :middle => "*", :end => "*/" } },
             "js"            =>  { :single => "//",  :multi => { :start => "/**", :middle => "*", :end => "*/" } },
-            "php"           =>  { :single => "\/\*[^*]*\*+([^\/*][^*]*\*+)*\/|^\s*\/\/ ?",  :multi => { :start => "/**", :middle => "*", :end => "*/" } },
+            "php"           =>  { :single => "\s\/\/([^\n]*)",  :multi => "\/\*\*(.*?)\*{1,2}\/" },
             "lua"           =>  { :single => "--",  :multi => nil },
             "python"        =>  { :single => "#",   :multi => { :start => '"""', :middle => nil, :end => '"""' } },
             "ruby"          =>  { :single => "#",   :multi => nil },
             "scheme"        =>  { :single => ";;",  :multi => nil },
         }
-        
+
         if comment_styles[language]
-            comment_styles[language][:single]
+            comment_styles[language]
         else
             @options[:comment_chars]
         end

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.6'
+  s.version = '0.7'
   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: 7
+  hash: 5
   prerelease: false
   segments: 
   - 0
-  - 6
-  version: "0.6"
+  - 7
+  version: "0.7"
 platform: ruby
 authors: 
 - Ryan Tomayko