kramdown-rfc2629 1.0.10 → 1.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb270787712614650b42c86bb8d1064accd28f35
-  data.tar.gz: 20508ced069fa74bbfcb5886a5060c0fd26b326a
+  metadata.gz: 1b446390e8d5d464268692fd4bf5f2fad820dc87
+  data.tar.gz: 6b9539a2d30c40a91454eb5aa59d21a0f80fc1a3
 SHA512:
-  metadata.gz: 57fca0420088722e7900b288c510b6fa4825921a38969c357a703c09b3d4a3ee83540ef63d423db872d0782c5dca3ee51febd226c045c1c9815bae192b9d2c2f
-  data.tar.gz: 3ad9e572f7bfc02bf699701e7e3546265bf4c64cb26a8a3026261cd7f75628d0ee77850bc58be23a2817516f76b210510eeb23ad33d2ddf626e94b3f8483e10b
+  metadata.gz: 9bba48685f5837c4bae563de4670c47bc6128fc64ab8c2d3fb437e9be71aa17c50acad812a9ec9d1a0f38cd2bc3b1c36f5abbc1a8badcf921a7a36058f766ed0
+  data.tar.gz: 4c65264e33ae41498adf9720a5336a33f5e91db3bd203f5fe7fda897f6a6a0312cc987c29f7bb8a7534ef2b52fa004d9fd5e16cce04e6f6891046bad8df80744

data/kramdown-rfc2629.gemspec

@@ -1,6 +1,6 @@
 spec = Gem::Specification.new do |s|
   s.name = 'kramdown-rfc2629'
-  s.version = '1.0.10'
+  s.version = '1.0.11'
   s.summary = "Kramdown extension for generating RFC 2629 XML."
   s.description = %{An RFC2629 (XML2RFC) generating backend for Thomas Leitner's
 "kramdown" markdown parser.  Mostly useful for RFC writers.}

data/lib/kramdown-rfc2629.rb

@@ -69,11 +69,14 @@ module Kramdown
     # Converts a Kramdown::Document to HTML.
     class Rfc2629 < Base
 
-      # we use these to do XML stuff, too (XXX: 0.11 vs. 0.12)
-      include ::Kramdown::Utils::HTML      rescue   include ::Kramdown::Utils::Html
+      # we use these to do XML stuff, too
+      include ::Kramdown::Utils::Html
 
       def el_html_attributes(el)
-        html_attributes(el) rescue html_attributes(el.attr) # XXX 0.11 vs. 0.12
+        html_attributes(el.attr)
+      end
+      def el_html_attributes_with(el, defattr)
+        html_attributes(defattr.merge(el.attr))
       end
 
       # :stopdoc:
@@ -199,12 +202,12 @@ module Kramdown
       STYLES = {ul: 'symbols', ol: 'numbers', dl: 'hanging'}
 
       def convert_ul(el, indent, opts)
-        style = STYLES[el.type]
         opts = opts.merge(vspace: el.attr.delete('vspace'))
+        attrstring = el_html_attributes_with(el, {"style" => STYLES[el.type]})
         if opts[:unpacked]
-          "#{' '*indent}<list style='#{style}'#{el_html_attributes(el)}>\n#{inner(el, indent, opts)}#{' '*indent}</list>\n"
+          "#{' '*indent}<list#{attrstring}>\n#{inner(el, indent, opts)}#{' '*indent}</list>\n"
           else
-          "#{' '*indent}<t><list style='#{style}'#{el_html_attributes(el)}>\n#{inner(el, indent, opts)}#{' '*indent}</list></t>\n"
+          "#{' '*indent}<t><list#{attrstring}>\n#{inner(el, indent, opts)}#{' '*indent}</list></t>\n"
         end
       end
       alias :convert_ol :convert_ul
@@ -406,7 +409,8 @@ module Kramdown
       end
 
       def convert_codespan(el, indent, opts)
-        "<spanx style='verb'#{el_html_attributes(el)}>#{escape_html(el.value)}</spanx>"
+        attrstring = el_html_attributes_with(el, {"style" => 'verb'})
+        "<spanx#{attrstring}>#{escape_html(el.value)}</spanx>"
       end
 
       def convert_footnote(el, indent, opts) # XXX: This is wrong.
@@ -421,7 +425,8 @@ module Kramdown
       EMPH = { em: "emph", strong: "strong"}
 
       def convert_em(el, indent, opts)
-        "<spanx style='#{EMPH[el.type]}'#{el_html_attributes(el)}>#{inner(el, indent, opts)}</spanx>"
+        attrstring = el_html_attributes_with(el, {"style" => EMPH[el.type]})
+        "<spanx#{attrstring}>#{inner(el, indent, opts)}</spanx>"
       end
       alias :convert_strong :convert_em
 

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: kramdown-rfc2629
 version: !ruby/object:Gem::Version
-  version: 1.0.10
+  version: 1.0.11
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-11 00:00:00.000000000 Z
+date: 2014-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kramdown
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.0
 description: |-
@@ -33,11 +33,11 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/kramdown-rfc2629.rb
 - README.md
-- kramdown-rfc2629.gemspec
 - bin/kramdown-rfc2629
 - data/kramdown-rfc2629.erb
+- kramdown-rfc2629.gemspec
+- lib/kramdown-rfc2629.rb
 homepage: http://github.com/cabo/kramdown-rfc2629
 licenses:
 - MIT
@@ -48,19 +48,20 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
 - wget
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Kramdown extension for generating RFC 2629 XML.
 test_files: []
+has_rdoc: