wpdoc 0.2.21 → 0.2.22

data/Rakefile

@@ -28,8 +28,8 @@ begin
     gem.email = "voloko@gmail.com"
     gem.homepage = "http://github.com/dxw/wpdoc"
     gem.authors = ["Volodya Kolesnikov"]
-    # rdoc may also be required if it didn't come with Ruby for you
-
+    gem.add_dependency("rdoc", "= 2.4.3")
+    
     if defined?(JRUBY_VERSION)
       gem.platform = Gem::Platform.new(['universal', 'java', nil])
       gem.add_dependency("json_pure", ">= 1.1.3")

data/VERSION.yml

@@ -1,5 +1,4 @@
 --- 
 :major: 0
 :minor: 2
-:patch: 21
-:build: 
+:patch: 22

data/lib/wpdoc.rb

@@ -8,15 +8,3 @@ end
 
 require "wpdoc/generator/shtml"
 require "wpdoc/c_parser_fix"
-
-unless defined? SDOC_FIXED_RDOC_OPTIONS
-  SDOC_FIXED_RDOC_OPTIONS = 1
-  class RDoc::Options
-    alias_method :rdoc_initialize, :initialize
-  
-    def initialize
-      rdoc_initialize
-      @generator = RDoc::Generator::SHtml
-    end
-  end
-end

data/lib/wpdoc/generator/shtml.rb

@@ -67,7 +67,7 @@ class RDoc::Generator::SHtml
     end
     @github_url_cache = {}
 
-    template = @options.template || 'direct'
+    template = 'direct'
 
     templ_dir = self.class.template_dir template
 
@@ -209,9 +209,7 @@ class RDoc::Generator::SHtml
     }.flatten.sort{ |a, b| a.name == b.name ? a.parent.full_name <=> b.parent.full_name : a.name <=> b.name }.select { |method| 
       method.document_self 
     }
-    unless @options.show_all
-      list = list.find_all {|m| m.visibility == :public || m.visibility == :protected || m.force_documentation }
-    end
+    list = list.find_all {|m| m.visibility == :public || m.visibility == :protected || m.force_documentation }
 
     list.each do |method|
       index[:searchIndex].push( search_string(method.name) + '()' )
@@ -278,6 +276,7 @@ class RDoc::Generator::SHtml
   ### Strip comments on a space after 100 chars
   def snippet(str)
     str ||= ''
+    str = str.to_s
     if str =~ /^(?>\s*)[^\#]/
       content = str
     else

data/lib/wpdoc/generator/template/direct/_context.rhtml

@@ -26,9 +26,7 @@
 
     <% 
         list = context.method_list
-        unless @options.show_all
-            list = list.find_all {|m| m.visibility == :public || m.visibility == :protected || m.force_documentation }
-        end
+        list = list.find_all {|m| m.visibility == :public || m.visibility == :protected || m.force_documentation }
     %>
     <% unless list.empty? %>
     <div class="sectiontitle">Functions</div>
@@ -118,7 +116,7 @@
         next if visibilities.empty?
         visibilities.each do |visibility, methods|
             next if methods.empty? 
-            next unless @options.show_all || visibility == :public || visibility == :protected || methods.any? {|m| m.force_documentation }
+            next unless visibility == :public || visibility == :protected || methods.any? {|m| m.force_documentation }
             %>
             <div class="sectiontitle"><%= type.capitalize %> <%= visibility.to_s.capitalize %> functions</div>
             <% methods.each do |method| %>

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: wpdoc
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 59
+  prerelease: 
   segments: 
   - 0
   - 2
-  - 21
-  version: 0.2.21
+  - 22
+  version: 0.2.22
 platform: ruby
 authors: 
 - Volodya Kolesnikov
@@ -14,24 +15,40 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-25 00:00:00 -04:00
-default_executable: 
+date: 2012-03-05 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: json
+  name: rdoc
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 2
+        - 4
+        - 3
+        version: 2.4.3
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: json
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 21
         segments: 
         - 1
         - 1
         - 3
         version: 1.1.3
   type: :runtime
-  version_requirements: *id001
+  version_requirements: *id002
 description: 
 email: voloko@gmail.com
 executables: 
@@ -77,7 +94,6 @@ files:
 - lib/wpdoc/helpers.rb
 - lib/wpdoc/merge.rb
 - lib/wpdoc/templatable.rb
-has_rdoc: true
 homepage: http://github.com/dxw/wpdoc
 licenses: []
 
@@ -91,6 +107,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -99,13 +116,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: rdoc html with javascript search index.