voloko-sdoc 0.1.9 → 0.1.10

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :minor: 1
-:patch: 9
+:patch: 10
 :major: 0

data/lib/sdoc/c_parser_fix.rb

@@ -0,0 +1,31 @@
+require "rdoc/parser/c"
+
+# New RDoc somehow misses class comemnts.
+# copyied this function from "2.2.2" 
+if ['2.4.2', '2.4.3'].include? RDoc::VERSION
+
+  class RDoc::Parser::C
+    def find_class_comment(class_name, class_meth)
+      comment = nil
+      if @content =~ %r{((?>/\*.*?\*/\s+))
+                     (static\s+)?void\s+Init_#{class_name}\s*(?:_\(\s*)?\(\s*(?:void\s*)\)}xmi then
+        comment = $1
+      elsif @content =~ %r{Document-(?:class|module):\s#{class_name}\s*?(?:<\s+[:,\w]+)?\n((?>.*?\*/))}m
+        comment = $1
+      else
+        if @content =~ /rb_define_(class|module)/m then
+          class_name = class_name.split("::").last
+          comments = []
+          @content.split(/(\/\*.*?\*\/)\s*?\n/m).each_with_index do |chunk, index|
+            comments[index] = chunk
+            if chunk =~ /rb_define_(class|module).*?"(#{class_name})"/m then
+              comment = comments[index-1]
+              break
+            end
+          end
+        end
+      end
+      class_meth.comment = mangle_comment(comment) if comment
+    end
+  end
+end

data/lib/sdoc/generator/shtml.rb

@@ -1,4 +1,12 @@
 require 'rubygems'
+gem "rdoc", ">= 2.4.2"
+if Gem.available? "json" 
+  gem "json", ">= 1.1.3"
+else
+  gem "json_pure", ">= 1.1.3"
+end
+
+require 'iconv'
 require 'json'
 require 'pathname'
 require 'fileutils'
@@ -259,7 +267,20 @@ class RDoc::Generator::SHtml
     else
       content = str.gsub(/^\s*(#+)\s*/, '')
     end
+    
     content.sub(/^(.{100,}?)\s.*/m, "\\1").gsub(/\r?\n/m, ' ')
+    
+    begin
+      content.to_json
+    rescue # might fail on non-unicode string
+      begin
+        content = Iconv.conv('latin1//ignore', "UTF8", content) # remove all non-unicode chars
+        content.to_json
+      rescue
+        content = '' # something hugely wrong happend
+      end
+    end
+    content
   end
 
   ### Build search index key

data/lib/sdoc.rb

@@ -1,10 +1,14 @@
 $:.unshift File.dirname(__FILE__)
+require "rubygems"
+gem "rdoc", ">= 2.4.2"
+
 require "rdoc/rdoc"
 
 module SDoc
 end
 
 require "sdoc/generator/shtml"
+require "sdoc/c_parser_fix"
 
 class RDoc::Options
   alias_method :rdoc_initialize, :initialize

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: voloko-sdoc
 version: !ruby/object:Gem::Version 
-  version: 0.1.9
+  version: 0.1.10
 platform: ruby
 authors: 
 - Volodya Kolesnikov
@@ -47,6 +47,7 @@ files:
 - bin/sdoc
 - bin/sdoc-merge
 - lib/sdoc
+- lib/sdoc/c_parser_fix.rb
 - lib/sdoc/generator
 - lib/sdoc/generator/shtml.rb
 - lib/sdoc/generator/template