hat-trick 0.1.2 → 0.1.3

data/.gitignore

@@ -2,3 +2,4 @@
 .bundle
 Gemfile.lock
 pkg/*
+.tags*

data/Changelog

@@ -1,5 +1,19 @@
-* 0.1.2 - Fixes GH issue #4 - Don't run skipped steps' include_data callbacks
+* 0.1.3    - The "production" release. TurboVote.org runs on this version.
+           - Handle non-root URLs correctly in pushState (Closes GH issue #5)
+           - Don't loop past the last step when looking for the next one (Closes GH issue #6)
+           - Only run the include_data callback for the current step (Closes GH issue #8)
+           - Trigger ajaxErrors event on form element when we get errors back from an ajax call
+           - Trigger ajaxSuccess event on form element when ajax calls return successfully
+           - Don't add slashes to wizard step URLs
+           - Fix buggy radio button selection logic
+           - Use <button> elements for all buttons & improve button creation logic
+           - Allow HTML inside <button> elements; use button_to label: "[your html]"
+           - Don't focus the first input in fieldsets with the "no-focus" CSS class
+           - Allow multiple next buttons on each step so they can have different labels, names, values
+           - SO many other changes that I stopped listing them here. Oops.
 
-* 0.1.1 - Added LICENSE file to license hat-trick under the MIT license.
+* 0.1.2    - Closes GH issue #4 - Don't run skipped steps' include_data callbacks
 
-* 0.1 - Initial working release
+* 0.1.1    - Added LICENSE file to license hat-trick under the MIT license.
+
+* 0.1      - Initial working release

data/README.md

@@ -1,5 +1,7 @@
 # Hat Trick
-> Combines jQuery FormWizard, validation_group, and gon for the perfect triple-play of Rails wizarding.
+
+> Multi-step "wizard" forms in Rails using jQuery. Keeps your controller CRUD
+> methods clean with a wizard DSL.
 
 ## Install
     gem install hat-trick
@@ -10,7 +12,7 @@
 Put this in your Gemfile:
 
     gem 'hat-trick'
-    
+
 ## Setup
 In your controller:
 
@@ -20,6 +22,9 @@ In your controller:
       step :third_step
     end
 
+*** Make sure your controller's CRUD methods know how to return JSON responses
+containing the model instance you're building in the wizard. ***
+
 In your view:
 
     <%= wizard_form_for @model do |f| %>
@@ -27,9 +32,11 @@ In your view:
       <fieldset id="second_step">...</fieldset>
       <fieldset id="third_step">...</fieldset>
     <% end %>
-    
+
 The id's of the fieldsets in your form should match the step names you define in your controller.
-    
+
+Each fieldset will be displayed as a step with Next and Back buttons.
+
 ## Controlling the wizard flow
 Sometimes you need to specify different paths through a wizard based on certain conditions. The way you do that with hat-trick is in the wizard DSL in the controller. Here are some examples:
 
@@ -40,25 +47,16 @@ Jumping to a step based on logged in status:
         # after defines a callback to run after the current step is completed by the user
         after do
           # code in this block will be exec'd in the context of your controller
-          if user_signed_in?
+          if current_user?
             next_step :third_step
           end
         end
       end
-      
+
       step :second_step # wizard will go here after :first_step if user is not signed in
-      
+
       step :third_step # wizard will go here after :first_step if user is signed in
-      
-Repeating a previous step (for example, to show address sanitization results to the user):
-  
-     wizard do
-       step :enter_address
-        
-       step :confirm_santized_address do
-         repeat_step :enter_address
-       end
-       
+
 Skipping a step under certain conditions:
 
     wizard do
@@ -67,7 +65,34 @@ Skipping a step under certain conditions:
         # before defines a callback to run before the user sees this step
         before do
           # code in this block will be exec'd in the context of your controller
-          skip_this_step unless foo.present?
+          skip_this_step unless model.foo.present?
         end
       end
-    end
+    end
+
+Using the model instance in before and after callbacks:
+
+    wizard do
+      step :first_step do
+        before do |model_instance|
+          if model_instance.attr.present?
+            next_step :third_step
+          end
+        end
+      end
+    end
+
+Customizing the button labels:
+
+    wizard do
+      button_label :next, "Onward!"
+      button_label :back, "Engines reverse full"
+    end
+
+Adding a custom button to a step:
+
+    wizard do
+      step :first_step do
+        button_to :next, name: "model[button_name]", label: "Foobar"
+      end
+    end

data/app/assets/javascripts/hat-trick.js.coffee

@@ -3,58 +3,47 @@
 class HatTrickWizard
   constructor: (formElem, @wizard) ->
     @form = $(formElem)
-    this.stepShownCallback() # because we just showed the first step (or the one in the URL)
+    this.enableFormwizard()
 
-  formwizardEnabled: false
+  debug: true
 
   linkClass: "_ht_link"
 
-  buttons: {}
+  buttons: []
 
   stepsNeedUpdate: false
 
   stepShownCallback: ->
-    if not @formwizardEnabled
-      this.addStepClass()
-      # prevent submitting the step that happens to be the last fieldset
-      # TODO: Figure out a better way to do this
-      this.addFakeLastStep()
-      this.addDefaultButtons()
+    currentStepId = this.currentStepId()
+
+    @lastButtonChanged = null
+
+    if hatTrick.stepMetadata[currentStepId]?
+      hatTrick.metadata.currentStep = hatTrick.stepMetadata[currentStepId]
+    else
+      this.requestMetadataFromServer()
+      return
+
     this.updateStepFromMetadata()
-    if not @formwizardEnabled
-      this.setupButtonsForAllSteps()
-      this.enableFormwizard() # this clobbers our button customizations for the current step
-      this.setupButtonsForCurrentStep() # so we run this to reconfigure it
-      this.bindEvents()
+    currentStepId = this.currentStepId()
+    # can't go back from the first step
+    if hatTrick.metadata.currentStep.first
+      this.buttons[currentStepId] = this.buttons[currentStepId].filter (button) ->
+        not button.back?
+    this.setupButtonsForCurrentStep()
+    if @stepsNeedUpdate
+      this.updateSteps()
+      @stepsNeedUpdate = false
     else
-      this.setupButtonsForCurrentStep()
-      # this must be run here & after setupButtonsForCurrentStep() to support setContents()
-      if @stepsNeedUpdate
-        this.updateSteps()
-        @stepsNeedUpdate = false
-    this.setCurrentStepField()
-    this.clearNextStepField()
+      this.updateButtons()
+    this.removeLinkFields()
     this.setFormFields(hatTrick.model)
     this.createDummyModelField() unless this.currentStepHasModelFields()
+    @form.trigger 'step_changed', { currentStep: this.currentStepId() }
 
   addStepClass: ->
     @form.find("fieldset").addClass("step")
 
-  addDefaultButtons: ($scope = @form.find("fieldset")) ->
-    hatTrick = this
-    $scope.each (index) ->
-      id = $(this).attr('id')
-      buttons =
-        next:
-          id: "#{id}_next_button"
-          label: "Next"
-      if index > 0 or hatTrick.formwizardEnabled
-        buttons['back'] =
-          id: "#{id}_back_button"
-          label: "Back"
-  
-      hatTrick.buttons[id] = buttons
-  
   findStep: (stepId) ->
     @form.find("fieldset##{stepId}")
 
@@ -63,7 +52,6 @@ class HatTrickWizard
 
   setAction: (url, method) ->
     methodLower = method.toLowerCase()
-    # log "Setting form action to #{methodLower} #{url}"
     @form.attr("action", url)
     @form.attr("method", "post")
     @form.formwizard("option", remoteAjax: this.ajaxEvents())
@@ -73,7 +61,10 @@ class HatTrickWizard
       @form.prepend(this.createMethodField(method))
 
   currentStepId: ->
-    @form.formwizard("state").currentStep
+    stepId = @form.formwizard("state").currentStep
+    unless stepId? and stepId isnt ""
+      stepId = hatTrick.metadata.currentStep.name
+    stepId
 
   currentStep: ->
     stepId = this.currentStepId()
@@ -94,10 +85,16 @@ class HatTrickWizard
     ajax =
       url: @form.attr("action")
       dataType: "json"
+      beforeSerialize: (form, options) =>
+        if options.data._ht_step_link == this.currentStepId()
+          log "Warning: Tried to link to the current step; this is probably not what you want."
+        return true;
       # beforeSubmit: (data) =>
       #   log "Sending these data to the server: #{JSON.stringify data}"
       success: (serverData) =>
+        this.clearErrors()
         this.handleServerData serverData
+        @form.trigger 'ajaxSuccess', serverData
         # log "Successful form POST; got #{JSON.stringify(serverData)}"
       error: (event, status, errorThrown) =>
         log "Error response: #{event.status} #{status} - #{errorThrown} - #{event.responseText}"
@@ -109,8 +106,12 @@ class HatTrickWizard
               unknown: [
                 "There was an error communicating with the server. TurboVote staff have been notified."
               ]
+            status: status
+            event: event
         this.clearErrors()
-        this.addErrorItem value[0] for key, value of appErrors.model
+        this.addErrorItem value[0] for key, value of appErrors.model when key isnt "__name__"
+        this.removeLinkFields()
+        @form.trigger 'ajaxErrors', appErrors
     ajax
 
   getErrorListElement: ->
@@ -127,6 +128,9 @@ class HatTrickWizard
       $errorList.append("<li>#{message}</li>")
       $errorList.show()
 
+  updateButtons: ->
+    @form.formwizard("update_buttons")
+
   updateSteps: ->
     @form.formwizard("update_steps")
     @form.formwizard("option", remoteAjax: this.ajaxEvents())
@@ -135,50 +139,57 @@ class HatTrickWizard
     this.setLinkField(stepId)
     @form.formwizard("next")
 
-  # TODO: Try linking to the same step rather than cloning it.
-  # I'm becoming more and more convinced that that won't work, however. And this isn't as bad as it used to be.
-  repeatStep: (step) ->
-    if $("fieldset##{step.name}").length is 0
-      $sourceStep = this.findStep(step.repeatOf.fieldset)
-      $clonedStep = $sourceStep.clone(true, true)
-      $clonedStep.css("display", "none")
-      $clonedStep.attr("id", step.name)
-      $sourceStep.after($clonedStep)
-      this.updateSteps()
-    this.setLinkField step.name
-
-  removeLinkField: ->
-    this.currentStep().find("input.#{@linkClass}").remove()
+  removeLinkFields: ->
+    @form.find("input.#{@linkClass}").remove()
 
   setLinkField: (stepId) ->
     inputId = "_ht_link_to_#{stepId}"
     this.setHiddenInput "_ht_step_link", stepId, inputId, @linkClass, this.currentStep()
 
-  LinkFieldSet: ->
+  linkFieldSet: ->
     this.currentStep().find("input[name='_ht_step_link']").length > 0
 
   addFakeLastStep: ->
     @form.append """<fieldset id="_ht_fake_last_step" style="display: none;" class="step"></fieldset>"""
 
   enableFormwizard: ->
+    this.addStepClass()
+    this.saveStepMetadata()
+    this.setAction(hatTrick.metadata.url, hatTrick.metadata.method)
+    # prevent submitting the step that happens to be the last fieldset
+    # TODO: Figure out a better way to do this
+    this.addFakeLastStep()
+    this.bindEvents()
+    firstStep = if hatTrick.metadata.currentStep?.redirect
+      hatTrick.metadata.currentStep.redirectFrom
+    else
+      hatTrick.metadata.currentStep.fieldset
     @form.formwizard
       formPluginEnabled: true,
       validationEnabled: false,
       focusFirstInput: true,
-      historyEnabled: true,
       disableUIStyles: true,
-      inDuration: 0,
+      outDuration: 200,
+      inDuration: 10, # don't set this to 0 or step_shown will be triggered too early
+      next: "button:submit",
+      back: "button:reset",
       linkClass: ".#{@linkClass}",
       remoteAjax: this.ajaxEvents(),
-      firstStep: hatTrick.metadata.currentStep.name
-    this.formwizardEnabled = true
+      firstStep: firstStep
+    # see if we got a redirect & follow if so
+    currentStepId = this.currentStepId()
+    if hatTrick.metadata.currentStep?
+      currentStepData = hatTrick.metadata.currentStep
+      if currentStepData.redirect and currentStepData.redirectFrom is currentStepId
+        @form.formwizard("redirect", currentStepData.fieldset)
 
   setHiddenInput: (name, value, id, classes = "", scope = @form) ->
     $scope = $(scope)
-    $input = $scope.find("""input##{id}[name="#{name}"]""")
+    $input = $scope.find("""input[name="#{name}"]""")
     if $input.length is 0
       $input = $(this.hiddenInputHTML(name, id, classes)).prependTo $scope
     $input.val value
+    $input
 
   hiddenInputHTML: (name, id, classes = "") ->
     """<input type="hidden" id="#{id}" name="#{name}" class="#{classes}" value="" />"""
@@ -193,11 +204,6 @@ class HatTrickWizard
     stepId = this.currentStepId()
     this.setHTMeta("step", stepId)
 
-  # TODO: See if we still need this "next_step" ht_meta field.
-  clearNextStepField: ->
-    this.clearHTMeta("next_step")
-    this.removeLinkField()
-
   fieldRegex: /^([^\[]+)\[([^\]]+)\]$/
 
   setFieldValues: (model, selector, callback) ->
@@ -223,88 +229,173 @@ class HatTrickWizard
     this.setFieldValues model, "input:checkbox", ($checkbox, value) =>
       $checkbox.attr("checked", "checked") if value
 
+  # TODO: DRY this up as much as possible. Radio buttons a little different
+  #       than the other form controls since they share names and behave as a
+  #       named group.
   setRadioButtons: (model) ->
-    this.setFieldValues model, "input:radio", ($radio, value) =>
-      $radio.find("[value=\"#{value}\"]").attr("checked", "checked")
+    $currentStep = this.currentStep()
+    selector = "input:radio"
+    radioGroups = {}
+    $currentStep.find(selector).each ->
+      radioGroups[$(this).attr("name")] = true
+    for radioGroup of radioGroups
+      do (radioGroup) =>
+        if radioGroup.search(@fieldRegex) isnt -1
+          [_, modelName, fieldName] = radioGroup.match(@fieldRegex)
+          if model['__name__'] is modelName and model[fieldName]?
+            fieldValue = model[fieldName]
+            $radioGroup = $("input:radio[name=\"#{radioGroup}\"]")
+            $radioGroup.removeAttr("checked")
+            $radioGroup.filter("[value=\"#{fieldValue}\"]").attr("checked", "checked")
 
   setFormFields: (model) ->
-    # log "Setting form fields based on: #{JSON.stringify(model)}"
     this.fillTextFields(model)
     this.setSelectFields(model)
     this.setCheckboxes(model)
     this.setRadioButtons(model)
 
-  createButton: (name, button) ->
-    $button = $("""<input type="button" class="wizard_button" name="#{name}" value="#{button.label}" />""")
+  createButtonElement: (name, value, label, type="button") ->
+    $elem = $("""<button type="#{type}" class="wizard_button"></button>""")
+    $elem.attr "name", name if name?
+    $elem.html label
+    $elem.val value if value?
+    $elem
+
+  createButton: (toStep, button) ->
+    switch toStep
+      when "next"
+        if button.class is ""
+          button.class = "wizard_next"
+        else
+          button["class"] += " wizard_next"
+        type = "submit"
+      when "back"
+        if button.class is ""
+          button.class = "wizard_back"
+        else
+          button["class"] += " wizard_back"
+        button.name = "back"
+        unless button.id?
+          button.id = "#{this.currentStepId()}_back_button"
+        delete button["value"]
+        type = "reset"
+      else
+        type = "button"
+    $button = this.createButtonElement button.name, button.value, button.label, type
     if button.id?
       $button.attr("id", button.id)
-    else
-      $button.attr("id", "#{this.currentStepId()}_#{name}_#{button.label}")
-    $button.click =>
-      clickCallbackData =
-        currentStep: this.currentStepId()
-        button: $button.attr "id"
-      @form.trigger "other_button_click", clickCallbackData
+    else if button.name? and button.value?
+      $button.attr("id", "#{this.currentStepId()}_#{button.name}_#{button.value}")
+    if button["class"]?
+      $button.addClass(button["class"])
     $button
 
-  setButton: (stepId, name, button) ->
-    # log "Setting button for #{stepId} named #{name} to #{JSON.stringify(button)}"
+  setButton: (stepId, toStep, button) ->
     $buttonsDiv = $("fieldset##{stepId}").find("div.buttons")
-    switch name
-      when "next"
-        # log "Setting #{stepId} submit button val to #{button.label}"
-        $button = $buttonsDiv.find('input:submit')
-        unless $button.length > 0
-          $button = $('<input class="wizard_button wizard_next" type="submit" />').appendTo $buttonsDiv
-        $button.val(button.label)
-        $button.attr("id", button.id) if button.id?
-      when "back"
-        # log "Setting reset button val to #{button.label}"
-        $button = $buttonsDiv.find('input:reset').val(button.label)
-        unless $button.length > 0
-          $button = $('<input class="wizard_button wizard_back" type="reset" />').appendTo $buttonsDiv
-        $button.val(button.label)
-        $button.attr("id", button.id) if button.id?
+    if $buttonsDiv.find("button").length > 0
+      @lastButtonChanged ?= $buttonsDiv.find("button:first")
+    buttonSelector = """button[name="#{button.name}"][value="#{button.value}"]"""
+    $existingButtons = $buttonsDiv.find(buttonSelector)
+    if $existingButtons.length is 0
+      $newButton = $(this.createButton(toStep, button))
+      if @lastButtonChanged?
+        @lastButtonChanged.after $newButton
       else
-        buttonSelector = """input:button[name="#{name}"][value="#{button.label}"]"""
-        $existingButtons = $buttonsDiv.find(buttonSelector)
-        if $existingButtons.length is 0
-          # log "Adding new #{name}:#{button.label} button"
-          $newButton = $(this.createButton(name, button)).appendTo($buttonsDiv)
-          $newButton.click (event) =>
-            event.preventDefault()
-            this.goToStepId(name)
-
-  setupButtonsForAllSteps: ->
-    this.setupButtonsForStep $(fieldset).attr('id') for fieldset in $('fieldset')
+        $buttonsDiv.append $newButton
+      @lastButtonChanged = $newButton
+      unless toStep is "next" or toStep is "back"
+        $newButton.click (event) =>
+          event.preventDefault()
+          fieldId = "button_#{$newButton.attr("name")}_#{$newButton.val()}_field"
+          this.setHiddenInput $newButton.attr("name"), $newButton.val(), fieldId, "", $buttonsDiv
+          this.goToStepId(toStep)
 
   setupButtonsForCurrentStep: ->
-    this.setupButtonsForStep this.currentStepId()
+    $currentStep = this.currentStep()
+    $buttonsDiv = $currentStep.find("div.buttons")
+    $buttons = $buttonsDiv.find("button")
+    unless $buttonsDiv.data "buttonsAdded"
+      this.setupButtonsForStep this.currentStepId()
 
   setupButtonsForStep: (stepId) ->
     buttons = this.buttons[stepId]
     if buttons?
-      this.setButton(stepId, name, button) for name, button of buttons
+      for button in buttons
+        do (button) =>
+          this.setButton(stepId, toStep, buttonData) for toStep, buttonData of button
+    $("##{stepId} div.buttons").data "buttonsAdded", true
 
   setContents: (stepPartials) ->
     for stepName, partial of stepPartials
       do (stepName, partial) =>
         stepId = underscoreString stepName
         $partial = $(partial)
-        fieldsetContents = $partial.find('fieldset').html()
+        fieldsetContents = if $partial.filter("fieldset").length > 0
+          $partial.filter("fieldset").html()
+        else
+          $partial.find('fieldset').html()
         $step = $("fieldset##{stepId}")
         $step.html fieldsetContents
-        this.addDefaultButtons($step)
+        $step.filter("fieldset:not(.no-focus)").find(":input:not(input[type=hidden]):first").focus();
+        $step.data("contents", "loaded")
         @stepsNeedUpdate = true
 
-  handleServerData: (data) ->
-    if data.metadata?
+  saveStepMetadata: (stepId=this.currentStepId(), metadata=hatTrick.metadata.currentStep) ->
+    hatTrick.stepMetadata = {} unless hatTrick.stepMetadata?
+    hatTrick.stepMetadata[stepId] = metadata
+
+  handleServerData: (data) =>
+    if data.metadata?.externalRedirectURL?
+      externalRedirectURL = data.metadata.externalRedirectURL
+      if externalRedirectURL isnt ""
+        location.href = data.metadata.externalRedirectURL
+        # TODO: pop out of window if in iframe
+        # if (top.location == self.location)
+        #   location.href = data.metadata.externalRedirectURL
+        # else
+        #   window.open(data.metadata.externalRedirectURL)
+
+    if data.metadata?.url? and data.metadata?.method?
       this.setAction(data.metadata.url, data.metadata.method)
-    $.extend(window.hatTrick, data) # merge new data with hatTrick
+    this.saveStepMetadata(data.metadata.currentStep.name, data.metadata.currentStep)
+    $.extend(hatTrick, data) # merge new data with hatTrick
     this.updateStepFromMetadata()
 
+  metadataRequestCallback: (data) =>
+    stepId = this.currentStepId()
+    # set empty step contents if we didn't get any;
+    # this makes sure we can tell whether or not we've already requested metadata
+    emptyStepContents = { hatTrickStepContents: {} }
+    stepKey = camelizeString(stepId)
+    emptyStepContents["hatTrickStepContents"][stepKey] = ""
+    unless data.data.hatTrickStepContents? and data.data.hatTrickStepContents[stepKey]?
+      data.data = $.extend({}, data.data, emptyStepContents)
+    this.handleServerData(data)
+    this.removeLinkFields() # updateStepFromMetadata sets this to currentStep
+    this.setupButtonsForCurrentStep()
+    this.updateButtons()
+    this.setFormFields(hatTrick.model)
+    @form.trigger "step_changed", { currentStep: stepId }
+
+  requestMetadataFromServer: ->
+    metadataUrl = document.location.pathname
+    lastChar = metadataUrl.charAt(metadataUrl.length - 1)
+    metadataUrl += "/" unless lastChar is "/"
+    stepId = this.currentStepId()
+    metadataUrl += "#{stepId}/" if metadataUrl.search("#{stepId}/$") is -1
+    metadataUrl += "metadata"
+    $.ajax
+      type: "GET"
+      url: metadataUrl
+      success: this.metadataRequestCallback
+      dataType: "json"
+
   updateStepContents: ->
-    this.setContents(hatTrick.data.hatTrickStepContents)
+    stepKey = camelizeString(this.currentStepId())
+    if hatTrick.data?.hatTrickStepContents?[stepKey]?
+      this.setContents(hatTrick.data.hatTrickStepContents)
+    else
+      this.requestMetadataFromServer()
 
   setButtonMetadataForCurrentStep: ->
     if hatTrick.metadata?.currentStep?
@@ -317,22 +408,23 @@ class HatTrickWizard
     hatTrick.model['__name__']
 
   createDummyModelField: ->
-    this.setHiddenInput "#{this.modelName()}[_dummy]", "1"
+    this.setHiddenInput "#{this.modelName()}[_dummy]", "1", "", this.currentStep()
 
   currentStepHasModelFields: ->
     this.currentStep().find("input[name^='#{this.modelName()}[']").length > 0
 
   updateStepFromMetadata: ->
+    currentStepId = this.currentStepId()
+
+    if $("fieldset##{currentStepId}").data("contents") is "server"
+      this.updateStepContents()
+
     if hatTrick.metadata?.currentStep?
-      this.updateStepContents() if hatTrick.data.hatTrickStepContents?
+      currentStepData = hatTrick.metadata.currentStep
+      this.setCurrentStepField()
       this.setButtonMetadataForCurrentStep()
       this.createDummyModelField() unless this.currentStepHasModelFields()
-
-      currentStep = hatTrick.metadata.currentStep
-      if currentStep.repeatOf?
-        this.repeatStep(currentStep)
-      else
-        this.setLinkField(currentStep.fieldset) unless this.LinkFieldSet()
+      this.setLinkField(currentStepData.fieldset)
 
   bindEvents: ->
     @form.bind "step_shown", (event, data) =>
@@ -341,9 +433,8 @@ class HatTrickWizard
 $ ->
   if $("form.wizard").length > 0
     $form = $("form.wizard")
-    window.hatTrick = {} unless window.hatTrick?
+    window.hatTrick ?= {}
     unless window.hatTrick.wizard?
-      # log "Creating new HatTrickWizard instance"
       window.hatTrick.wizard = new HatTrickWizard($form, hatTrick.metadata)
 
 camelizeString = (string) ->
@@ -363,5 +454,5 @@ underscoreString = (string) ->
   result
 
 log = (msg) ->
-  if window['console']?
+  if window['console']? and hatTrick.wizard.debug
     console.log msg

data/lib/hat-trick.rb

@@ -4,5 +4,3 @@ require "active_support/core_ext/module"
 require "hat_trick/engine"
 require "hat_trick/dsl"
 require "gon"
-
-::ActionController::Base.send(:include, HatTrick::DSL)

data/lib/hat_trick/config.rb

@@ -1,17 +1,16 @@
 module HatTrick
   class Config
-    attr_reader :wizard_def
+    attr_accessor :create_url, :update_url, :back_button_label,
+                  :next_button_label, :back_button_label_i18n_key,
+                  :next_button_label_i18n_key
 
-    def initialize(wizard_def)
-      @wizard_def = wizard_def
-    end
-
-    def create_url=(url)
-      wizard_def.configured_create_url = url
-    end
-
-    def update_url=(url)
-      wizard_def.configured_update_url = url
+    def initialize(settings={})
+      settings.each do |k,v|
+        setter = "#{k}="
+        if respond_to?(setter)
+          send(setter, v)
+        end
+      end
     end
   end
 end