From d57ca2a22579df4c634d554989c0ee9e4ebb5165 Mon Sep 17 00:00:00 2001
From: Gareth Rees <gareth@mysociety.org>
Date: Mon, 17 Mar 2014 11:15:40 +0000
Subject: Add AttachmentToHTML library

Extracts the attachment processing from FoiAttachment#body_to_html

AttachmentToHTML contains adapters which convert
  - text/plain
  - application/pdf
  - application/rtf

Results are returned as an AttachmentHTML::HTML instance which contains
the raw HTML and other metadata about the conversion.
---
 lib/attachment_to_html/attachment_to_html.rb | 41 ++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 lib/attachment_to_html/attachment_to_html.rb

(limited to 'lib/attachment_to_html/attachment_to_html.rb')

diff --git a/lib/attachment_to_html/attachment_to_html.rb b/lib/attachment_to_html/attachment_to_html.rb
new file mode 100644
index 000000000..5f63661b4
--- /dev/null
+++ b/lib/attachment_to_html/attachment_to_html.rb
@@ -0,0 +1,41 @@
+require 'html'
+
+Dir[File.dirname(__FILE__) + '/adapters/*.rb'].each do |file|
+    require file
+end
+
+module AttachmentToHTML
+    extend self
+
+    def to_html(attachment, opts = {})
+        adapter = adapter_for(attachment).new(attachment, opts)
+        html = HTML.new(adapter)
+
+        if html.success?
+            html
+        else
+            fallback = fallback_adapter_for(attachment).new(attachment, opts)
+            HTML.new(fallback)
+        end
+    end
+
+    private
+
+    def adapter_for(attachment)
+        case attachment.content_type
+        when 'text/plain' then Adapters::Text
+        when 'application/pdf' then Adapters::PDF
+        when 'application/rtf' then Adapters::RTF
+        else
+            fallback_adapter_for(attachment)
+        end
+    end
+
+    def fallback_adapter_for(attachment)
+        if attachment.has_google_docs_viewer?
+            Adapters::GoogleDocsViewer
+        else
+            Adapters::CouldNotConvert
+        end
+    end
+end
-- 
cgit v1.2.3


From ea1e040780f00938331e92472780c91b7e0f43a2 Mon Sep 17 00:00:00 2001
From: Gareth Rees <gareth@mysociety.org>
Date: Wed, 2 Apr 2014 11:28:45 +0100
Subject: Add an AttachmentToHTML::View to deal with rendering

---
 lib/attachment_to_html/attachment_to_html.rb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lib/attachment_to_html/attachment_to_html.rb')

diff --git a/lib/attachment_to_html/attachment_to_html.rb b/lib/attachment_to_html/attachment_to_html.rb
index 5f63661b4..104dc13e2 100644
--- a/lib/attachment_to_html/attachment_to_html.rb
+++ b/lib/attachment_to_html/attachment_to_html.rb
@@ -1,4 +1,5 @@
 require 'html'
+require 'view'
 
 Dir[File.dirname(__FILE__) + '/adapters/*.rb'].each do |file|
     require file
-- 
cgit v1.2.3


From ce9fa9e77a60d06e3ed968ccb48c0fa30fb9f1f2 Mon Sep 17 00:00:00 2001
From: Gareth Rees <gareth@mysociety.org>
Date: Wed, 2 Apr 2014 13:38:25 +0100
Subject: Update AttachmentToHTML for new View class

---
 lib/attachment_to_html/attachment_to_html.rb | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'lib/attachment_to_html/attachment_to_html.rb')

diff --git a/lib/attachment_to_html/attachment_to_html.rb b/lib/attachment_to_html/attachment_to_html.rb
index 104dc13e2..8675329c4 100644
--- a/lib/attachment_to_html/attachment_to_html.rb
+++ b/lib/attachment_to_html/attachment_to_html.rb
@@ -10,14 +10,15 @@ module AttachmentToHTML
 
     def to_html(attachment, opts = {})
         adapter = adapter_for(attachment).new(attachment, opts)
-        html = HTML.new(adapter)
 
-        if html.success?
-            html
-        else
-            fallback = fallback_adapter_for(attachment).new(attachment, opts)
-            HTML.new(fallback)
+        unless adapter.success?
+          adapter = fallback_adapter_for(attachment).new(attachment, opts)
         end
+
+        view = View.new(adapter)
+        view.wrapper = 'wrapper_google_embed' if adapter.is_a?(Adapters::GoogleDocsViewer)
+
+        view.render
     end
 
     private
-- 
cgit v1.2.3


From cb06289e9fc04bf2ea9430828358a7cf304eae8f Mon Sep 17 00:00:00 2001
From: Gareth Rees <gareth@mysociety.org>
Date: Wed, 2 Apr 2014 13:39:36 +0100
Subject: Remove redundant AttachmentToHTML::HTML

---
 lib/attachment_to_html/attachment_to_html.rb | 1 -
 1 file changed, 1 deletion(-)

(limited to 'lib/attachment_to_html/attachment_to_html.rb')

diff --git a/lib/attachment_to_html/attachment_to_html.rb b/lib/attachment_to_html/attachment_to_html.rb
index 8675329c4..ca899221b 100644
--- a/lib/attachment_to_html/attachment_to_html.rb
+++ b/lib/attachment_to_html/attachment_to_html.rb
@@ -1,4 +1,3 @@
-require 'html'
 require 'view'
 
 Dir[File.dirname(__FILE__) + '/adapters/*.rb'].each do |file|
-- 
cgit v1.2.3


From 3954e78a4d330e3e9d82be0d239d5bf25d2f6a04 Mon Sep 17 00:00:00 2001
From: Gareth Rees <gareth@mysociety.org>
Date: Wed, 2 Apr 2014 17:15:41 +0100
Subject: Dynamically inject AttachmentToHTML::View content

---
 lib/attachment_to_html/attachment_to_html.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'lib/attachment_to_html/attachment_to_html.rb')

diff --git a/lib/attachment_to_html/attachment_to_html.rb b/lib/attachment_to_html/attachment_to_html.rb
index ca899221b..2f7c08264 100644
--- a/lib/attachment_to_html/attachment_to_html.rb
+++ b/lib/attachment_to_html/attachment_to_html.rb
@@ -17,7 +17,11 @@ module AttachmentToHTML
         view = View.new(adapter)
         view.wrapper = 'wrapper_google_embed' if adapter.is_a?(Adapters::GoogleDocsViewer)
 
-        view.render
+        view.render do
+           opts.fetch(:content_for, []).each do |k,v|
+              inject_content(k) { v }
+           end
+        end
     end
 
     private
-- 
cgit v1.2.3