jeffp-wizardly 0.1.8 → 0.1.8.1

data/lib/validation_group.rb

@@ -43,7 +43,18 @@ module ValidationGroup
     end
 
     module InstanceMethods # included in every model which calls validation_group
-			
+      #needs testing
+#      def reset_validation_group(group)
+#        group_classes = self.class.validation_group_classes
+#        found = ValidationGroup::Util.current_and_ancestors(self.class).find do |klass|
+#          group_classes[klass] && group_classes[klass].include?(group)
+#        end
+#        if found
+#          group_classes[found][group].each do |field|
+#            self[field] = nil
+#          end
+#        end
+#      end
       def enable_validation_group(group)
         # Check if given validation group is defined for current class or one of
         # its ancestors

data/lib/wizardly/action_controller.rb

@@ -32,18 +32,5 @@ module Wizardly
     public
     def wizard_config; self.class.wizard_config; end
 
-    private
-    def reset_wizard_session_vars
-      session[:progression] = nil
-      init = session[:initial_referer]
-      session[:initial_referer] = nil
-      init
-    end
-
-    # better name: underscore_button_name, changes submit_tag button names like
-    # 'Next Step' ==> 'next_step', used to identify callback methods
-    def methodize_button_name(value)
-      value.to_s.strip.squeeze(' ').gsub(/ /, '_').downcase
-    end
   end
 end

data/lib/wizardly/wizard/configuration.rb

@@ -31,6 +31,7 @@ module Wizardly
         end
       end
 
+      def guard?; @guard_entry; end
       def persist_model_per_page?; @persist_model == :per_page; end
       def form_data_keep_in_session?; @form_data == :session; end
       def model; @wizard_model_sym; end

data/lib/wizardly/wizard/configuration/methods.rb

@@ -62,6 +62,8 @@ MACRO
         page = @pages[id]
         finish_button = self.button_for_function(:finish).id
         next_button = self.button_for_function(:next).id
+        model_persist_line = self.persist_model_per_page? ? 'save_wizard_model!' : ''
+
         (mb = StringIO.new) << <<-ONE
   def #{page.name}
     begin
@@ -104,8 +106,7 @@ MACRO
         redirect_to #{Utils.formatted_redirect(self.completed_redirect)} unless self.performed?
         return
       end
-      save_wizard_model! if wizard_config.persist_model_per_page?
-      # session[:progression] = [:#{id}]
+      #{model_persist_line}
       return if callback_performs_action?(:on_#{id}_form_#{next_button})
       redirect_to :action=>:#{self.next_page(id)}
         THREE
@@ -117,8 +118,7 @@ MACRO
         redirect_to #{Utils.formatted_redirect(self.completed_redirect)} unless self.performed?
         return
       end
-      save_wizard_model! if wizard_config.persist_model_per_page?
-      # session[:progression].push(:#{id})
+      #{model_persist_line}
       return if callback_performs_action?(:on_#{id}_form_#{next_button})
       redirect_to :action=>:#{self.next_page(id)}
         FOUR
@@ -126,7 +126,7 @@ MACRO
         
         mb << <<-ENSURE
     ensure
-      self.wizard_form_data = h.merge(@#{self.model}.attributes) if (@#{self.model} && !@completed)
+      self.wizard_form_data = h.merge(@#{self.model}.attributes) if (@#{self.model} && !@wizard_completed_flag)
     end
   end        
 ENSURE
@@ -142,25 +142,26 @@ ENSURE
   protected
   def _on_wizard_#{finish}
     @#{self.model}.save_without_validation!
-    @completed = true
+    @wizard_completed_flag = true
     reset_wizard_form_data
     _wizard_final_redirect_to(:completed)
   end
   def _on_wizard_#{skip}
+    session[:progression] = (session[:progression]||[]) - [@step]
     redirect_to(:action=>wizard_config.next_page(@step)) unless self.performed?
   end
-  def _on_wizard_#{back}
-    # TODO: fix progression management
-    # redirect_to(:action=>((session[:progression]||[]).pop || :#{self.page_order.first})) unless self.performed?
-    redirect_to(:action=>wizard_config.previous_page(@step)) unless self.performed?
+  def _on_wizard_#{back} 
+    redirect_to(:action=>(previous_in_progression_from(@step) || :#{self.page_order.first})) unless self.performed?
   end
   def _on_wizard_#{cancel}
     _wizard_final_redirect_to(:canceled)
   end
-  def _wizard_final_redirect_to(which_redirect) 
-    initial_referer = reset_wizard_session_vars
+  def _wizard_final_redirect_to(type) 
+    initial_referer = (type == :canceled && wizard_config.form_data_keep_in_session?) ?
+      session[:initial_referer] :
+      reset_wizard_session_vars
     unless self.performed?
-      redir = (which_redirect == :completed ? wizard_config.completed_redirect : wizard_config.canceled_redirect) || initial_referer
+      redir = (type == :canceled ? wizard_config.canceled_redirect : wizard_config.completed_redirect) || initial_referer
       return redirect_to(redir) if redir
       raise Wizardly::RedirectNotDefinedError, "No redirect was defined for completion or canceling the wizard.  Use :completed and :canceled options to define redirects.", caller
     end
@@ -173,27 +174,73 @@ ENSURE
         next_id = self.button_for_function(:next).id
         finish_id = self.button_for_function(:finish).id
         first_page = self.page_order.first
-        guard_line = @guard_entry ? '' : 'return #guard entry disabled'
-      <<-HELPERS
+        guard_line = self.guard? ? '' : 'return check_progression #guard entry disabled'
+        mb = StringIO.new
+        mb << <<-PROGRESSION
   protected
-  def guard_entry
+  def previous_in_progression_from(step)
+    po = wizard_config.page_order
+    p = session[:progression]||[]
+    p -= po[po.index(step)..-1]
+    session[:progression] = p
+    p.last
+  end
+  def check_progression
+    p = session[:progression]||[]
+    a = params[:action].to_sym
+    return if p.last == a
+    po = wizard_config.page_order
+    return unless (ai = po.index(a))
+    p -= po[ai..-1]
+    p << a
+    session[:progression] = p
+  end        
+PROGRESSION
+        if self.form_data_keep_in_session?
+          mb << <<-SESSION
+  # for :form_data=>:session
+  def guard_entry 
     if (r = request.env['HTTP_REFERER'])
       h = ::ActionController::Routing::Routes.recognize_path(URI.parse(r).path)
-      return if (h[:controller]||'') == '#{self.controller_name}'
-      session[:initial_referer] = h
-    else
-      session[:initial_referer] = nil
+      return check_progression if (h[:controller]||'') == '#{self.controller_name}'
+      session[:initial_referer] ||= h
     end
-    if wizard_config.form_data_keep_in_session?
-      return if self.wizard_form_data  # if it has an id we've started a wizard
+    # coming from outside the controller
+    #{guard_line}
+    if (params[:action] == '#{first_page}' || params[:action] == 'index')
+      return check_progression
+    elsif self.wizard_form_data
+      p = session[:progression]||[]
+      return check_progression if p.include?(params[:action].to_sym)
+      return redirect_to(:action=>(p.last||:#{first_page}))
+    end
+    redirect_to :action=>:#{first_page}
+  end
+  hide_action :guard_entry
+
+SESSION
+        else
+          mb << <<-SANDBOX
+  # for :form_data=>:sandbox            
+  def guard_entry 
+    if (r = request.env['HTTP_REFERER'])
+      h = ::ActionController::Routing::Routes.recognize_path(URI.parse(r).path)
+      return check_progression if (h[:controller]||'') == '#{self.controller_name}'
+      session[:initial_referer] = h
     else
-      reset_wizard_form_data 
+      session[:initial_referer] = nil 
     end
+    # coming from outside the controller
+    reset_wizard_form_data 
     #{guard_line}
-    redirect_to :action=>:#{first_page} unless (params[:action] || '') == '#{first_page}'
+    return redirect_to(:action=>:#{first_page}) unless (params[:action] || '') == '#{first_page}'
+    check_progression
   end
   hide_action :guard_entry
 
+SANDBOX
+        end
+        mb << <<-HELPERS
   def save_wizard_model!
     @#{self.model}.save_without_validation!
     if wizard_config.form_data_keep_in_session?
@@ -238,11 +285,24 @@ ENSURE
   def performed?; super; end
   hide_action :performed?
 
+  def underscore_button_name(value)
+    value.to_s.strip.squeeze(' ').gsub(/ /, '_').downcase
+  end
+  hide_action :underscore_button_name
+
+  def reset_wizard_session_vars
+    session[:progression] = nil
+    init = session[:initial_referer]
+    session[:initial_referer] = nil
+    init
+  end
+  hide_action :reset_wizard_session_vars
+
   def check_action_for_button
     button_id = nil
     #check if params[:commit] has returned a button from submit_tag
     unless (params[:commit] == nil)
-      button_name = methodize_button_name(params[:commit])
+      button_name = underscore_button_name(params[:commit])
       unless [:#{next_id}, :#{finish_id}].include?(button_id = button_name.to_sym)
         action_method_name = "on_" + params[:action].to_s + "_form_" + button_name
         callback_performs_action?(action_method_name)
@@ -259,11 +319,6 @@ ENSURE
   end
   hide_action :check_action_for_button
 
-  @wizard_callbacks ||= {}
-  class << self
-    attr_reader :wizard_callbacks
-  end
-  
   def callback_performs_action?(methId, arg=nil)
     return false unless self.methods.include?(methId.to_s)
     #self.__send__(methId)
@@ -273,6 +328,7 @@ ENSURE
   hide_action :callback_performs_action?
 
       HELPERS
+        mb.string
       end
     end
   end

data/rails_generators/wizardly_controller/templates/controller.rb.erb

@@ -13,19 +13,6 @@ class <%= controller_class_name %> < ApplicationController
 
   <%= callback_macro_methods %>
 
-  private
-  def methodize_button_name(value)
-    value.to_s.strip.squeeze(' ').gsub(/ /, '_').downcase
-  end
-
-  def reset_wizard_session_vars
-    session[:progression] = nil
-    init = session[:initial_referer]
-    session[:initial_referer] = nil
-    init
-  end
-  hide_action :methodize_button_name, :reset_wizard_session_vars
-
   public
   def wizard_config; self.class.wizard_config; end
   hide_action :wizard_config

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jeffp-wizardly
 version: !ruby/object:Gem::Version 
-  version: 0.1.8
+  version: 0.1.8.1
 platform: ruby
 authors: 
 - Jeff Patmon
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-12 00:00:00 -07:00
+date: 2009-08-14 00:00:00 -07:00
 default_executable: 
 dependencies: []