lib/hat_trick/controller_hooks.rb in hat-trick-0.0.1 vs lib/hat_trick/controller_hooks.rb in hat-trick-0.1.0

@@ -1,95 +1,47 @@
 require 'hat_trick/model_methods'
+require 'hat_trick/controller_helpers'
 
 module HatTrick
   module ControllerHooks
     extend ActiveSupport::Concern
+    include ControllerHelpers
 
     included do
       alias_method_chain :render, :hat_trick
     end
 
     def self.def_action_method_aliases(action_methods)
       action_methods.each do |meth|
-        Rails.logger.info "Aliasing #{meth}"
+        # Rails.logger.info "Aliasing #{meth}"
         module_eval <<-RUBY_EVAL
           def #{meth}_with_hat_trick(*args)
             Rails.logger.info "#{meth}_with_hat_trick called"
             #{meth}_hook(*args) if respond_to?("#{meth}_hook", :include_private)
-            common_hook(*args)
+            common_hook(*args) if respond_to?(:common_hook, :include_private)
             #{meth}_without_hat_trick(*args)
           end
           private "#{meth}_with_hat_trick"
         RUBY_EVAL
       end
       true
     end
 
     private
 
-    def params_model_name
-      params.each do |k,v|
-        return class_name(k) if v.is_a?(Hash) && is_model?(k)
-      end
-      nil
-    end
-
-    def is_model?(model_name)
-      begin
-        class_name(model_name).constantize
-      rescue NameError
-        return false
-      end
-      true
-    end
-
-    def class_name(hash_key)
-      hash_key.to_s.camelize
-    end
-
-    def model_class
-      model_name = params_model_name
-      return nil if model_name.nil?
-      begin
-        model_class = params_model_name.constantize
-      rescue NameError
-        Rails.logger.error "Could not find model class #{params_model_name.camelize}"
-        nil
-      else
-        model_class
-      end
-    end
-
-    def setup_validation_group_for(wizard_step)
-      klass = model_class
-      return if klass.nil?
-      step_name = wizard_step.name
-      validation_groups = ::ActiveRecord::Base.validation_group_classes[klass] || []
-      unless validation_groups.include?(step_name)
-        klass.validation_group(step_name, :fields => params.keys)
-      end
-      HatTrick::ModelMethods.set_current_validation_group_for(model_class, step_name)
-      unless klass.included_modules.include?(HatTrick::ModelMethods)
-        klass.send(:include, HatTrick::ModelMethods)
-      end
-    end
-
     def create_hook(*args)
       setup_validation_group_for(ht_wizard.current_step)
     end
 
     def update_hook(*args)
       setup_validation_group_for(ht_wizard.current_step)
     end
 
-    def common_hook(*args)
-      # nothing here for now
-    end
-
-    def render_with_hat_trick(*args)
-      if args.first.has_key?(:json)
-        model = args[0][:json]
+    def render_with_hat_trick(*args, &block)
+      rendered = args.first
+      if rendered && rendered.has_key?(:json)
+        model = rendered[:json]
         ht_wizard.model = model
       end
 
       if params.has_key?('_ht_meta')
         next_step = params['_ht_meta']['next_step']
@@ -100,19 +52,23 @@
         :url => ht_wizard.current_form_url,
         :method => ht_wizard.current_form_method,
         :currentStep => ht_wizard.current_step,
       }
 
-      # this sets the wizard_metadata for the initial page load
-      gon.wizard_metadata = wizard_metadata
+      include_data = ht_wizard.include_data
 
-      if ht_wizard.model && args[0].has_key?(:json)
-        # this sets the wizard metadata for subsequent AJAX requests
-        args[0][:json] = { :formModel => ht_wizard.model,
-                           :wizardMetadata => wizard_metadata }
-        args[0][:json].merge! ht_wizard.include_data
+      # this sets the gon data (JS hatTrick object) for the initial page load
+      gon.metadata = wizard_metadata
+      gon.data = include_data
+      gon.model = ht_wizard.model
+
+      # this sets the wizard metadata for subsequent AJAX requests
+      if ht_wizard.model && rendered.has_key?(:json)
+        args[0][:json] = { :model => ht_wizard.model,
+                           :metadata => wizard_metadata }
+        args[0][:json].merge!( :data => include_data )
       end
 
-      render_without_hat_trick(*args)
+      render_without_hat_trick(*args, &block)
     end
   end
 end