swordfish 0.0.3 → 0.0.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjlkNGYxMWRlZmZkMzVlYzI2YWYzNjA2MTA0MzU0MWIyZTY5ZDdhYQ==
+    ZTEyODI1ZjU2OTMyODY3ZDM0NjM3OGY3ZjcyNTU1YTIwMjk1NDQ0ZA==
   data.tar.gz: !binary |-
-    Y2E2MDA5YzFiODYzNDhkMTdkYzNkNWFlNTM4NGVhNGU0YWI5NzIwYw==
+    YTIxMTkzNWMzNmYwNTY3YTNmOTg2YzE1MTYyZDUxYjk3YTNkZGU1MQ==
 SHA512:
   metadata.gz: !binary |-
-    NWE3MGJmZjc2N2M2MDQ4ZjMxYzNlMGZjY2ZjZGEyNTIyODZkYjQ1NTUwMWNi
-    OGZhODAyODI0NDJlZmZmM2M3NDc5YzZiZjg1YmNkNDA1ZGY3YzVkMzkyZmVl
-    YWNhMWI0YzU4MzA1NTQ3ZDQ5MTE0YWIzN2Y4ZGEyMDQzOTUxN2M=
+    ZmQ2YTk3YTcxNzFmNjNhMTg4Yjk0OGE1ZmI0ZjVmMWM5M2U1NmM1NDA3Y2Y0
+    MzUzNjI4NGQ1Y2IwOTgyNGI3MmM3M2M2OGM3OGIwMzAyY2VmZjE3NWMyNmJl
+    N2M0MjQ1OGQzZDZhMjI1M2RmN2Y4MTE0MjYyOGZjZWQ4MzJiZWY=
   data.tar.gz: !binary |-
-    YjQ4OGY2ZjNmNWVlMTI5NzhjYjIzOTc1NzJlNWMzYWQ4NWZmNzM1Yzg1NTY1
-    OWI4ZDhmYmZmMGNjZTA1MWI1OTA1MjA1M2RhYjc2MTZjNjFiMjFjMzkyMGYx
-    MGQwMGI3YjI5ZDljMjI3MWZjZGYwYzNlN2UxMzBiNmMwMWI3YzY=
+    YjY5NDlhZmQ0N2I0NGYzNjA0OGY4YzQ5MjY1YmI1MDM4OTIzODYxNDBjODIy
+    OGE3MjdjZTU4YmNkNmVmZjk1NDAxYjA2MmVkMzAzNzViY2ExYzg3MjU5ZjU0
+    ZGE1NTY5ZWQ1MTI2ZWU5MjJjMTI5Y2ZmYzM1NTI5YWU3YWJmNjM=

data/lib/swordfish/document.rb

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

data/lib/swordfish/formats/docx.rb

@@ -18,8 +18,8 @@ module Swordfish
       docx_archive = Zip::File.open(filepath)
       document = docx_archive.read 'word/document.xml'
       styles = docx_archive.read 'word/styles.xml'
-      numbering = docx_archive.read 'word/numbering.xml'
-      relationships = docx_archive.read 'word/_rels/document.xml.rels'
+      numbering = docx_archive.read('word/numbering.xml') rescue nil
+      relationships = docx_archive.read('word/_rels/document.xml.rels') rescue nil
 
       # Parse the XML files and generate the Swordfish::Document
       swordfish_docx = new docx_archive, document, styles, numbering, relationships
@@ -30,8 +30,8 @@ module Swordfish
       @docx_archive = archive
       @swordfish_doc = Swordfish::Document.new
       parse_styles styles_xml
-      parse_numbering numbering_xml
-      parse_relationships relationships_xml
+      parse_numbering(numbering_xml) if numbering_xml
+      parse_relationships(relationships_xml) if relationships_xml
       parse document_xml
     end
 
@@ -170,7 +170,7 @@ module Swordfish
               text.content = run_xml.xpath('./w:t')[0].content
               get_styles_for_node(text, run_xml.xpath('./w:rPr')[0])
               texts << text
-            elsif run_xml.xpath('.//pic:pic', :pic => @namespaces['xmlns:pic']).length > 0
+            elsif @namespaces['xmlns:pic'] && run_xml.xpath('.//pic:pic', :pic => @namespaces['xmlns:pic']).length > 0
               # An image run
               image = Swordfish::Node::Image.new
               relationship_id = run_xml.xpath('.//pic:pic/pic:blipFill/a:blip', :pic => @namespaces['xmlns:pic'], :a => @namespaces['xmlns:a'])[0]['r:embed'] rescue nil

data/lib/swordfish/nodes/hyperlink.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: swordfish
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Martin Posthumus
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-01 00:00:00.000000000 Z
+date: 2014-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler