swordfish 0.0.2 → 0.0.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDQyYjhkZjNiNTRjNTE3ZWRlYmFmNWMzOGI5Nzg0OTU3MjNhMWRkOQ==
+    MjlkNGYxMWRlZmZkMzVlYzI2YWYzNjA2MTA0MzU0MWIyZTY5ZDdhYQ==
   data.tar.gz: !binary |-
-    YjA5YWZmZDMyMWY4NzgxMmQ1MWVhNTU4YmQ0MDA4YmU4NDUyOTRhNg==
+    Y2E2MDA5YzFiODYzNDhkMTdkYzNkNWFlNTM4NGVhNGU0YWI5NzIwYw==
 SHA512:
   metadata.gz: !binary |-
-    OTg0NzAwNTFjMzhhNDYzNWY3MjgyMzQ3MDdkMDVhNjE1NWYzMTc0ZjFhZWJj
-    YzM1M2YzNzQ4YjEyZDg2YTQwOWY3OGJjY2JhZmE4MGUyZGQ1NmEwNzkwMDk1
-    N2FjMzQ2MjRjNDcwYWY3YmVmODhkMGNhMjEwMTc2OTRmYzFmODY=
+    NWE3MGJmZjc2N2M2MDQ4ZjMxYzNlMGZjY2ZjZGEyNTIyODZkYjQ1NTUwMWNi
+    OGZhODAyODI0NDJlZmZmM2M3NDc5YzZiZjg1YmNkNDA1ZGY3YzVkMzkyZmVl
+    YWNhMWI0YzU4MzA1NTQ3ZDQ5MTE0YWIzN2Y4ZGEyMDQzOTUxN2M=
   data.tar.gz: !binary |-
-    NzRhNWRiOWFjMzAwNGNlZjQ0OTZiZWM3MDYwM2NkYzNlMDQ0YWNjYTk0MGJk
-    Zjk3NmZhYzA0NmVhYWJjYjFkZTg0MDY0OGY1MzFmMjM5MTE3ZjgwNGU5NTVk
-    NmEwZWZiOGU3MGFkMTk3MTZjOGJmMGZlZGQ4YjMzMjBjNjkyM2M=
+    YjQ4OGY2ZjNmNWVlMTI5NzhjYjIzOTc1NzJlNWMzYWQ4NWZmNzM1Yzg1NTY1
+    OWI4ZDhmYmZmMGNjZTA1MWI1OTA1MjA1M2RhYjc2MTZjNjFiMjFjMzkyMGYx
+    MGQwMGI3YjI5ZDljMjI3MWZjZGYwYzNlN2UxMzBiNmMwMWI3YzY=

data/lib/swordfish/document.rb

@@ -1,3 +1,4 @@
+require 'cgi'
 require 'swordfish/stylesheet'
 require 'swordfish/nodes/base'
 require 'swordfish/nodes/text'

data/lib/swordfish/nodes/hyperlink.rb

@@ -7,7 +7,8 @@ module Swordfish
       attr_accessor :href
 
       def to_html
-        "<a href='#{@href}'>#{@children.map(&:to_html).join}</a>"
+        @href ||= ""
+        "<a href=\"#{CGI::escape(@href)}\">#{@children.map(&:to_html).join}</a>"
       end
 
     end

data/lib/swordfish/nodes/image.rb

@@ -11,6 +11,7 @@ module Swordfish
       attr_accessor :original_name
       # @path holds a new name for the image that must be assigned explicitly
       attr_accessor :path
+      attr_accessor :caption
 
       # Override Base append because an image node should never have children
       def append(node)
@@ -18,7 +19,8 @@ module Swordfish
       end
 
       def to_html
-        "<img src='#{@path ? @path : @original_name}'>"
+        @caption ||= ""
+        "<img src=\"#{CGI::escape(@path ? @path : @original_name)}\" alt=\"#{CGI::escapeHTML(@caption)}\" title=\"#{CGI::escapeHTML(@caption)}\" />"
       end
 
     end

data/lib/swordfish/nodes/paragraph.rb

@@ -7,6 +7,9 @@ module Swordfish
       def to_html
         if @content
           "<p>#{@content}</p>"
+        elsif @children.length == 1 && @children[0].is_a?(Swordfish::Node::Image)
+          # If the only child is an image, don't bother putting it in a P tag
+          @children.map(&:to_html).join
         else
           text = @children.map(&:to_html).join
           "<p>#{text}</p>" unless text.length.zero?

data/lib/swordfish/nodes/text.rb

@@ -10,7 +10,8 @@ module Swordfish
       end
 
       def to_html
-        html = @content
+        @content ||= ""
+        html = CGI::escapeHTML(@content)
         html = "<i>#{html}</i>" if @style.italic?
         html = "<b>#{html}</b>" if @style.bold?
         html = "<u>#{html}</u>" if @style.underline?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: swordfish
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Martin Posthumus