Wizard: Server Side Validation + Finished Step

lib/wizard/field.rb

@@ -1,6 +1,7 @@
 class Wizard
   class Field
-    attr_reader :id, :type, :required, :value
+
+    attr_reader :id, :type, :required, :value, :options
     attr_accessor :step
 
     def initialize(attrs)
@@ -10,6 +11,12 @@ class Wizard
       @type = attrs[:type]
       @required = !!attrs[:required]
       @value = attrs[:value]
+      @options = []
     end
+
+    def add_option(id)
+      @options << id
+    end
+
   end
 end

lib/wizard/step_updater.rb

@@ -1,22 +1,15 @@
 class Wizard
   class StepUpdater
-
-    attr_accessor :errors
+    include ActiveModel::Model
 
     def initialize(current_user, id)
       @current_user = current_user
       @id = id
-      @errors = []
     end
 
     def update(fields)
       updater_method = "update_#{@id.underscore}".to_sym
-
-      if respond_to?(updater_method)
-        send(updater_method, fields.symbolize_keys)
-      else
-        raise Discourse::InvalidAccess.new
-      end
+      send(updater_method, fields.symbolize_keys) if respond_to?(updater_method)
     end
 
     def update_forum_title(fields)
@@ -24,6 +17,12 @@ class Wizard
       update_setting(:site_description, fields, :site_description)
     end
 
+    def update_contact(fields)
+      update_setting(:contact_email, fields, :contact_email)
+      update_setting(:contact_url, fields, :contact_url)
+      update_setting(:site_contact_username, fields, :site_contact_username)
+    end
+
     def success?
       @errors.blank?
     end
@@ -33,9 +32,10 @@ class Wizard
       def update_setting(id, fields, field_id)
         value = fields[field_id]
         value.strip! if value.is_a?(String)
-        SiteSetting.set_and_log(id, value, @current_user)
+
+        SiteSetting.set_and_log(id, value, @current_user) if SiteSetting.send(id) != value
       rescue Discourse::InvalidParameters => e
-        @errors << {field: field_id, description: e.message }
+        errors.add(field_id, e.message)
       end
 
   end