sdoc 0.2.18 → 0.2.19

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
-:patch: 18
+:patch: 19
 :major: 0
 :build: 
 :minor: 2

data/lib/sdoc/generator/shtml.rb

@@ -1,17 +1,10 @@
-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 'sdoc/json_backend'
 require 'iconv'
-require 'json'
 require 'pathname'
 require 'fileutils'
 require 'erb'
 
+gem 'rdoc', '>= 2.4.2'
 require 'rdoc/rdoc'
 require 'rdoc/generator'
 require 'rdoc/generator/markup'
@@ -123,7 +116,7 @@ class RDoc::Generator::SHtml
     tree = generate_file_tree + generate_class_tree_level(topclasses)
     debug_msg "  writing class tree to %s" % TREE_FILE
     File.open(TREE_FILE, "w", 0644) do |f|
-      f.write('var tree = '); f.write(tree.to_json)
+      f.write('var tree = '); f.write(tree.to_json(:max_nesting => 0))
     end unless $dryrun
   end
 
@@ -162,7 +155,7 @@ class RDoc::Generator::SHtml
       :index => index
     }
     File.open(SEARCH_INDEX_FILE, "w", 0644) do |f|
-      f.write('var search_data = '); f.write(data.to_json)
+      f.write('var search_data = '); f.write(data.to_json(:max_nesting => 0))
     end unless $dryrun
   end
 
@@ -295,11 +288,11 @@ class RDoc::Generator::SHtml
     content = content.sub(/^(.{100,}?)\s.*/m, "\\1").gsub(/\r?\n/m, ' ')
 
     begin
-      content.to_json
+      content.to_json(:max_nesting => 0)
     rescue # might fail on non-unicode string
       begin
         content = Iconv.conv('latin1//ignore', "UTF8", content) # remove all non-unicode chars
-        content.to_json
+        content.to_json(:max_nesting => 0)
       rescue
         content = '' # something hugely wrong happend
       end

data/lib/sdoc/json_backend.rb

@@ -0,0 +1,15 @@
+require 'rubygems'
+
+## undefined method `to_json' for Array :(
+# if Gem.available? "yajl-ruby"
+#   gem "yajl-ruby", ">= 0.7.6"
+#   require "yajl"
+#   warn "yajl"
+# else
+  if Gem.available? "json"
+    gem "json", ">= 1.1.3"
+  else
+    gem "json_pure", ">= 1.1.3"
+  end
+  require "json"
+# end

data/lib/sdoc/merge.rb

@@ -2,9 +2,7 @@ require 'optparse'
 require 'pathname'
 require 'fileutils'
 
-gem 'json_pure', '>= 1.1.3' if defined?(::JRUBY_VERSION)
-require 'json'
-
+require 'sdoc/json_backen'
 require 'sdoc/templatable'
 
 class SDoc::Merge
@@ -69,7 +67,7 @@ class SDoc::Merge
       url = @urls.empty? ? name : @urls[i]
       filename = File.join dir, RDoc::Generator::SHtml::TREE_FILE
       data = open(filename).read.sub(/var tree =\s*/, '')
-      subtree = JSON.parse data, :max_nesting => 35
+      subtree = JSON.parse(data, :max_nesting => 0)
       item = [
         name,
         url + '/' + extract_index_path(dir),
@@ -82,7 +80,7 @@ class SDoc::Merge
     dst = File.join @op_dir, RDoc::Generator::SHtml::TREE_FILE
     FileUtils.mkdir_p File.dirname(dst)
     File.open(dst, "w", 0644) do |f|
-      f.write('var tree = '); f.write(tree.to_json(:max_nesting => 35))
+      f.write('var tree = '); f.write(tree.to_json(:max_nesting => 0))
     end
   end
   
@@ -102,7 +100,7 @@ class SDoc::Merge
       url = @urls.empty? ? name : @urls[i]
       filename = File.join dir, RDoc::Generator::SHtml::SEARCH_INDEX_FILE
       data = open(filename).read.sub(/var search_data =\s*/, '')
-      subindex = JSON.parse data, :max_nesting => 35
+      subindex = JSON.parse(data, :max_nesting => 0)
       @indexes[name] = subindex
       
       searchIndex = subindex["index"]["searchIndex"]
@@ -135,7 +133,7 @@ class SDoc::Merge
     dst = File.join @op_dir, RDoc::Generator::SHtml::SEARCH_INDEX_FILE
     FileUtils.mkdir_p File.dirname(dst)
     File.open(dst, "w", 0644) do |f|
-      f.write('var search_data = '); f.write(search_data.to_json)
+      f.write('var search_data = '); f.write(search_data.to_json(:max_nesting => 0))
     end
   end
   

data/sdoc.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sdoc}
-  s.version = "0.2.18"
+  s.version = "0.2.19"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Volodya Kolesnikov"]
-  s.date = %q{2010-06-02}
+  s.date = %q{2010-06-15}
   s.email = %q{voloko@gmail.com}
   s.executables = ["sdoc", "sdoc-merge"]
   s.extra_rdoc_files = [
@@ -64,6 +64,7 @@ Gem::Specification.new do |s|
      "lib/sdoc/generator/template/shtml/resources/panel/index.html",
      "lib/sdoc/github.rb",
      "lib/sdoc/helpers.rb",
+     "lib/sdoc/json_backend.rb",
      "lib/sdoc/merge.rb",
      "lib/sdoc/templatable.rb",
      "sdoc.gemspec"

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 18
-  version: 0.2.18
+  - 19
+  version: 0.2.19
 platform: ruby
 authors: 
 - Volodya Kolesnikov
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-02 00:00:00 +04:00
+date: 2010-06-15 00:00:00 +04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -103,6 +103,7 @@ files:
 - lib/sdoc/generator/template/shtml/resources/panel/index.html
 - lib/sdoc/github.rb
 - lib/sdoc/helpers.rb
+- lib/sdoc/json_backend.rb
 - lib/sdoc/merge.rb
 - lib/sdoc/templatable.rb
 - sdoc.gemspec