olddoc 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f02849f5be5e9ecb197b2d0cbe22fe40ef5110a
-  data.tar.gz: a7deb5ecea035aa9430419617fd8c0dcd4e0d86a
+  metadata.gz: 23c5d6ab7ac1202af4b9831610a7e49acf23e633
+  data.tar.gz: cf125761aea6c4860794a68f9c63c8039532f403
 SHA512:
-  metadata.gz: 1787df0d30deb90919492d1830f9525b5e5be9cd203e22731b60e6a852d1a1a15e8ae74ac930d247e427d1d1732f074a2a28c83a2c351aaa83c1b626f3169d1f
-  data.tar.gz: 521ea75c81d29f38b207496a18d42ead1302dcd28b5b995efafb634804705519cbb55b59c55f451564c18d03dbd5e5477037566bbf64e1e0626821d568857ad0
+  metadata.gz: 70640d38fd02f1df57e340d0535682462a71c1d409618051cf56118eb9bc5a827591d753d3793d89ce3b27b0b54b1b591ed64664c4abf0f645ce667d2ea7e9ff
+  data.tar.gz: 2db66bd166e5a4189803c09cfd72c3254b57bd42ff597010916acbcf1ef04933a9e01f1535e1f8887b1fad9165ed6cd98f562d2774030378e9ab74518ee844eb

data/GIT-VERSION-GEN

@@ -5,7 +5,7 @@
 CONSTANT = "Olddoc::VERSION"
 RVF = "lib/olddoc/version.rb"
 GVF = "GIT-VERSION-FILE"
-DEF_VER = "v1.3.0"
+DEF_VER = "v1.4.0"
 vn = DEF_VER.dup
 
 # First see if there is a version file (included in release tarballs),

data/lib/olddoc/news_atom.rb

@@ -1,11 +1,33 @@
 # Copyright (C) 2015-2016 all contributors <olddoc-public@80x24.org>
 # License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
-require 'builder'
 
 module Olddoc::NewsAtom # :nodoc:
   include Olddoc::History
   include Olddoc::Readme
 
+  def x(dst, tag, text = nil, attrs = nil)
+    if Hash === text
+      attrs = text
+      text = nil
+    end
+    if attrs
+      attrs = attrs.map { |k,v| "#{k}=#{v.encode(xml: :attr)}" }
+      attrs = "\n#{attrs.join("\n")}"
+    end
+    case text
+    when nil
+      if block_given?
+        dst << "<#{tag}#{attrs}>"
+        yield
+        dst << "</#{tag}>"
+      else
+        dst << "<#{tag}#{attrs}/>"
+      end
+    else
+      dst << "<#{tag}#{attrs}>#{text.encode(xml: :text)}</#{tag}>"
+    end
+  end
+
   # generates an Atom feed based on git tags in the document directory
   def news_atom_xml
     project_name, short_desc, _ = readme_metadata
@@ -14,34 +36,36 @@ module Olddoc::NewsAtom # :nodoc:
     atom_uri.path += "NEWS.atom.xml"
     news_uri = @rdoc_uri.dup
     news_uri.path += "NEWS.html"
-    x = Builder::XmlMarkup.new
-    x.feed(xmlns: "http://www.w3.org/2005/Atom") do
-      x.id(atom_uri.to_s)
-      x.title("#{project_name} news")
-      x.subtitle(short_desc)
-      x.link(rel: 'alternate', type: 'text/html', href: news_uri.to_s)
-      x.updated(new_tags.empty? ? '1970-01-01:00:00:00Z' : new_tags[0][:time])
+
+    dst = ''
+    x(dst, 'feed', xmlns: 'http://www.w3.org/2005/Atom') do
+      x(dst, 'id', atom_uri.to_s)
+      x(dst, 'title', "#{project_name} news")
+      x(dst, 'subtitle', short_desc)
+      x(dst, 'link', rel: 'alternate', type: 'text/html', href: news_uri.to_s)
+      x(dst, 'updated', new_tags.empty? ? '1970-01-01:00:00:00Z'
+                                        : new_tags[0][:time])
       new_tags.each do |tag|
-        x.entry do
-          x.title(tag[:subject])
-          x.updated(tag[:time])
-          x.published(tag[:time])
-          x.author do
-            x.name(tag[:tagger_name])
-            x.email(tag[:tagger_email])
+        x(dst, 'entry') do
+          x(dst, 'title', tag[:subject])
+          x(dst, 'updated', tag[:time])
+          x(dst, 'published', tag[:time])
+          x(dst, 'author') do
+            x(dst, 'name', tag[:tagger_name])
+            x(dst, 'email', tag[:tagger_email])
           end
           uri = tag_uri(tag[:tag]).to_s
-          x.link(rel: "alternate", type: 'text/html', href: uri)
-          x.id(uri)
-          x.content(type: :xhtml) do
-            x.div(xmlns: 'http://www.w3.org/1999/xhtml') do
-              x.pre(tag[:body])
-            end
-          end
+          x(dst, 'link', rel: 'alternate', type: 'text/html', href: uri)
+          x(dst, 'id', uri)
+          x(dst, 'content', type: 'xhtml') do
+            x(dst, 'div', xmlns: 'http://www.w3.org/1999/xhtml') do
+              x(dst, 'pre', tag[:body])
+            end # div
+          end # content
         end # entry
-      end # new_tags
+      end # new_tags.each
     end # feed
-    [ x.target!, new_tags ]
+    [ dst, new_tags ]
   end
 
   def news_atom(dest = "NEWS.atom.xml")

data/lib/olddoc/news_rdoc.rb

@@ -12,7 +12,6 @@ module Olddoc::NewsRdoc # :nodoc:
     fp.puts "=== #{tag[:subject]} / #{time}"
     fp.puts ""
 
-    body = tag[:body]
     fp.puts tag[:body].gsub(/^/smu, "  ").gsub(/[ \t]+$/smu, "")
     fp.puts ""
   end

data/lib/oldweb/class.rhtml

@@ -46,7 +46,7 @@ id="<%= visibility %>-<%= type %>-<%= section.aref %>-method-details">
           seq ? " #{h(seq.strip)}" : "" %><%
         end %></b> <%= method_srclink(method) %></pre><%=
           method.comment ? method.description.strip : nd %><%
-        if method.calls_super %>Calls superclass method<%=
+        if method.calls_super %>Calls superclass method <%=
            method.superclass_method ?
            method.formatter.link(method.superclass_method.full_name,
                                  method.superclass_method.full_name) : nil

data/olddoc.gemspec

@@ -18,7 +18,6 @@ Gem::Specification.new do |s|
 
   # works fine with RDoc 5.x
   s.add_dependency('rdoc', ['>= 4.2', '< 6.0'])
-  s.add_dependency('builder', '~> 3.2')
   s.required_ruby_version = '>= 1.9.3'
   s.homepage = Olddoc.config['rdoc_url']
   s.licenses = 'GPL-3.0+'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: olddoc
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - olddoc hackers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-02 00:00:00.000000000 Z
+date: 2017-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -30,20 +30,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '6.0'
-- !ruby/object:Gem::Dependency
-  name: builder
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.2'
 description: |-
   olddoc contains old-fashioned document generators for those who do not
   wish to impose bloated, new-fangled web cruft on their readers.