erector-ify entry dl

Author: ajb

lib/formbuilder.rb

@@ -1,9 +1,9 @@
 require "formbuilder/engine"
 require "formbuilder/entry"
-require "formbuilder/entry_renderer"
 require "formbuilder/entry_validator"
 require "formbuilder/views/form"
 require "formbuilder/views/form_field"
+require "formbuilder/views/entry_dl"
 
 module Formbuilder
   def self.root

lib/formbuilder/entry_renderer.rb

@@ -0,0 +1,52 @@
+module Formbuilder
+  module Views
+    class EntryDl < Erector::Widget
+
+      needs :entry, :form, show_blind: false
+
+      def content
+        dl(class: 'entry-dl') {
+          response_fields.each do |rf|
+            value = @entry.response_value(rf)
+
+            dt {
+              text rf.label
+              blind_label if rf.blind?
+              admin_only_label if rf.admin_only?
+            }
+
+            dd {
+              if (x = rf.render_entry(value, entry: @entry))
+                rawtext x
+              else
+                no_response
+              end
+            }
+          end
+        }
+      end
+
+      private
+      def blind_label
+        text ' '
+        span.label 'Blind'
+      end
+
+      def admin_only_label
+        text ' '
+        span.label 'Admin only'
+      end
+
+      def no_response
+        span 'No response', class: 'no-response'
+      end
+
+      def response_fields
+        return_array = @form.response_fields.reject { |rf| !rf.input_field }
+        return_array.reject! { |rf| rf.blind? } unless @show_blind
+        return_array
+      end
+
+    end
+  end
+end

lib/formbuilder/views/entry_dl.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Formbuilder::EntryRenderer do
+describe Formbuilder::Views::EntryDl do
 
   TEXT_FIELD_PARAMS = { label: "Text", type: "Formbuilder::ResponseFieldText", sort_order: 0 }
 
@@ -9,29 +9,29 @@
 
   it 'should display a label for blind fields' do
     form.response_fields.create TEXT_FIELD_PARAMS.merge(blind: true)
-    Formbuilder::EntryRenderer.new(entry, form, show_blind: true).to_html.should match('Blind')
+    Formbuilder::Views::EntryDl.new(entry: entry, form: form, show_blind: true).to_html.should match('Blind')
   end
 
   it 'should only display blind fields when instructed to' do
     form.response_fields.create TEXT_FIELD_PARAMS.merge(blind: true)
-    Formbuilder::EntryRenderer.new(entry, form).to_html.should_not match('Blind')
+    Formbuilder::Views::EntryDl.new(entry: entry, form: form).to_html.should_not match('Blind')
   end
 
   it 'should display a label for admin only fields' do
     form.response_fields.create TEXT_FIELD_PARAMS.merge(admin_only: true)
-    Formbuilder::EntryRenderer.new(entry, form).to_html.should match('Admin Only')
+    Formbuilder::Views::EntryDl.new(entry: entry, form: form).to_html.should match('Admin only')
   end
 
   it 'should display placeholder text if there is no response' do
     form.response_fields.create TEXT_FIELD_PARAMS
-    Formbuilder::EntryRenderer.new(entry, form).to_html.should match('No response')
+    Formbuilder::Views::EntryDl.new(entry: entry, form: form).to_html.should match('No response')
   end
 
   it 'should display the response' do
     rf = form.response_fields.create TEXT_FIELD_PARAMS
     entry.save_response('buzz', rf)
     entry.save(validate: false)
-    Formbuilder::EntryRenderer.new(entry, form).to_html.should match('buzz')
+    Formbuilder::Views::EntryDl.new(entry: entry, form: form).to_html.should match('buzz')
   end
 
 end