spree_core 0.50.4 → 0.60.0.RC1

data/app/controllers/admin/resource_controller.rb

@@ -0,0 +1,221 @@
+require 'spree_core/action_callbacks'
+class Admin::ResourceController < Admin::BaseController
+  helper_method :new_object_url, :edit_object_url, :object_url, :collection_url
+  before_filter :load_resource
+
+  respond_to :html
+  
+  def new
+    render :layout => !request.xhr?
+  end
+  
+  def edit
+    render :layout => !request.xhr?
+  end
+    
+  def update
+    invoke_callbacks(:update, :before)
+    if @object.update_attributes(params[object_name])
+      invoke_callbacks(:update, :after)
+      resource_desc = I18n.t(object_name)
+      resource_desc += " \"#{@object.name}\"" if @object.respond_to?(:name)
+      flash[:notice] = I18n.t(:successfully_updated, :resource => resource_desc)
+      respond_to do |format|
+        format.html { redirect_to location_after_save }
+        format.js   { render :layout => false }      
+      end
+    else
+      invoke_callbacks(:update, :fails)
+      render :edit
+    end
+  end
+
+  def create
+    invoke_callbacks(:create, :before)
+    if @object.save
+      invoke_callbacks(:create, :after)
+      resource_desc = I18n.t(object_name)
+      resource_desc += " \"#{@object.name}\"" if @object.respond_to?(:name)
+      flash[:notice] = I18n.t(:successfully_created, :resource => resource_desc)
+      respond_to do |format|
+        format.html { redirect_to location_after_save }
+        format.js   { render :layout => false }      
+      end
+    else
+      invoke_callbacks(:create, :fails)
+      render :new
+    end
+  end
+  
+  def destroy
+    invoke_callbacks(:destroy, :before)
+    if @object.destroy
+      invoke_callbacks(:destroy, :after)
+      resource_desc = I18n.t(object_name)
+      resource_desc += " \"#{@object.name}\"" if @object.respond_to?(:name)
+      flash[:notice] = I18n.t(:successfully_removed, :resource => resource_desc)
+      respond_to do |format|
+        format.html { redirect_to collection_url }
+        format.js   { render :partial => "/admin/shared/destroy" }
+      end
+    else
+      invoke_callbacks(:destroy, :fails)
+      redirect_to collection_url
+    end
+  end
+ 
+  protected
+
+  class << self
+    attr_accessor :parent_data
+    attr_accessor :callbacks
+  
+    def belongs_to(model_name, options = {})
+      @parent_data ||= {}
+      @parent_data[:model_name] = model_name
+      @parent_data[:model_class] = model_name.to_s.classify.constantize
+      @parent_data[:find_by] = options[:find_by] || :id
+    end
+    
+    def create
+      @callbacks ||= {}
+      @callbacks[:create] ||= Spree::ActionCallbacks.new
+    end
+    
+    def update
+      @callbacks ||= {}
+      @callbacks[:update] ||= Spree::ActionCallbacks.new
+    end
+    
+    def destroy
+      @callbacks ||= {}
+      @callbacks[:destroy] ||= Spree::ActionCallbacks.new
+    end
+  end
+
+  def model_class
+    controller_name.classify.constantize
+  end
+  
+  def object_name
+    controller_name.singularize
+  end
+  
+  def load_resource
+    if member_action?
+      @object ||= load_resource_instance
+      instance_variable_set("@#{object_name}", @object)
+    else
+      @collection ||= collection
+      instance_variable_set("@#{controller_name}", @collection)
+    end
+  end
+  
+  def load_resource_instance
+    if new_actions.include?(params[:action].to_sym)
+      build_resource
+    elsif params[:id]
+      find_resource
+    end
+  end
+
+  def parent_data
+    self.class.parent_data
+  end
+  
+  def parent
+    if parent_data.present?
+      @parent ||= parent_data[:model_class].where(parent_data[:find_by] => params["#{parent_data[:model_name]}_id"]).first
+      instance_variable_set("@#{parent_data[:model_name]}", @parent)
+    else
+      nil
+    end
+  end
+
+  def find_resource
+    if parent_data.present?
+      parent.send(controller_name).find(params[:id])
+    else
+      model_class.find(params[:id])
+    end
+  end
+  
+  def build_resource
+    if parent_data.present?
+      parent.send(controller_name).build(params[object_name])
+    else
+      model_class.new(params[object_name])
+    end
+  end
+  
+  def collection
+    return parent.send(controller_name) if parent_data.present?
+    
+    if model_class.respond_to?(:accessible_by) && !current_ability.has_block?(params[:action], model_class)
+      model_class.accessible_by(current_ability)
+    else
+      model_class.scoped
+    end
+  end
+  
+  def location_after_save
+    collection_url
+  end
+
+  def invoke_callbacks(action, callback_type)
+    callbacks = self.class.callbacks || {}
+    return if callbacks[action].nil?
+    case callback_type.to_sym
+      when :before then callbacks[action].before_methods.each {|method| send method }
+      when :after  then callbacks[action].after_methods.each  {|method| send method }
+      when :fails  then callbacks[action].fails_methods.each  {|method| send method }
+    end
+  end
+
+  # URL helpers
+
+  def new_object_url(options = {})
+    if parent_data.present?
+      new_polymorphic_url([:admin, parent, model_class], options)
+    else
+      new_polymorphic_url([:admin, model_class], options)
+    end
+  end
+  
+  def edit_object_url(object, options = {})
+    if parent_data.present?
+      send "edit_admin_#{parent_data[:model_name]}_#{object_name}_url", parent, object, options
+    else
+      send "edit_admin_#{object_name}_url", object, options
+    end
+  end
+  
+  def object_url(object = nil, options = {})
+    target = object ? object : @object
+    if parent_data.present?
+      send "admin_#{parent_data[:model_name]}_#{object_name}_url", parent, target, options
+    else
+      send "admin_#{object_name}_url", target, options
+    end
+  end
+  
+  def collection_url(options = {})
+    if parent_data.present?
+      polymorphic_url([:admin, parent, model_class], options)
+    else
+      polymorphic_url([:admin, model_class], options)
+    end
+  end
+  
+  def collection_actions
+    [:index]
+  end
+
+  def member_action?
+    !collection_actions.include? params[:action].to_sym
+  end
+
+  def new_actions
+    [:new, :create]
+  end
+end

data/app/controllers/admin/return_authorizations_controller.rb

@@ -1,22 +1,16 @@
-class Admin::ReturnAuthorizationsController < Admin::BaseController
-  resource_controller
-  belongs_to :order
-
-  update.wants.html { redirect_to collection_url }
-  create.wants.html { redirect_to collection_url }
-  destroy.success.wants.js { render_js_for_destroy }
+class Admin::ReturnAuthorizationsController < Admin::ResourceController
+  belongs_to :order, :find_by => :number
 
   update.after :associate_inventory_units
   create.after :associate_inventory_units
 
   def fire
-    load_object
     @return_authorization.send("#{params[:e]}!")
     flash.notice = t('return_authorization_updated')
     redirect_to :back
   end
 
-  private
+  protected
     def associate_inventory_units
       params[:return_quantity].each { |variant_id, qty| @return_authorization.add_variant(variant_id.to_i, qty.to_i) }
     end

data/app/controllers/admin/shipments_controller.rb

@@ -1,29 +1,65 @@
 class Admin::ShipmentsController < Admin::BaseController
-  before_filter :load_data, :except => [:country_changed, :index]
+  before_filter :load_order
+  before_filter :load_shipment, :only => [:destroy, :edit, :update, :fire]
+  before_filter :load_shipping_methods, :except => [:country_changed, :index]
 
-  resource_controller
-  belongs_to :order
+  respond_to :html
 
-  update.wants.html do
-    if @order.completed?
-      redirect_to edit_object_url
-    else
-      redirect_to admin_order_adjustments_url(@order)
-    end
+  def index
+    @shipments = @order.shipments
+    respond_with(@shipments)
   end
 
-  create do
-    wants.html { redirect_to edit_object_url }
+  def new
+    build_shipment
+    @shipment.address ||= @order.ship_address
+    @shipment.address ||= Address.new(:country_id => Spree::Config[:default_country_id])
+    @shipment.shipping_method = @order.shipping_method
+    respond_with(@shipment)
   end
 
-  edit.before :edit_before
+  def create
+    build_shipment
+    assign_inventory_units
+    if @shipment.save
+      flash[:notice] = I18n.t(:successfully_created, :resource => 'shipment')
+      respond_with(@object) do |format|
+        format.html { redirect_to edit_admin_order_shipment_path(@order, @shipment) }
+      end
+    else
+      render :action => 'new'
+    end
+  end
 
-  update.before :assign_inventory_units
-  update.after :update_after
+  def edit
+    @shipment.special_instructions = @order.special_instructions
+    respond_with(@shipment)
+  end
 
-  create.before :assign_inventory_units
+  def update
+    assign_inventory_units
+    if @shipment.update_attributes params[:shipment]
+      # copy back to order if instructions are enabled
+      @order.special_instructions = object_params[:special_instructions] if Spree::Config[:shipping_instructions]
+      @order.shipping_method = @order.shipment.shipping_method
+      @order.save
+      
+      flash[:notice] = I18n.t(:successfully_updated, :resource => I18n.t('shipment'))
+      return_path = @order.completed? ? edit_admin_order_shipment_path(@order, @shipment) : admin_order_adjustments_path(@order)
+      respond_with(@object) do |format|
+        format.html { redirect_to return_path }
+      end
+    else
+      render :action => 'edit'
+    end
+  end
 
-  destroy.success.wants.js { render_js_for_destroy }
+  def destroy
+    @shipment.destroy
+    respond_to do |format|
+      format.js { render_js_for_destroy }
+    end
+  end
 
   def fire
     if @shipment.send("#{params[:e]}")
@@ -35,33 +71,30 @@ class Admin::ShipmentsController < Admin::BaseController
   end
 
   private
-  def build_object
-    @object ||= end_of_association_chain.send parent? ? :build : :new
-    @object.address ||= @order.ship_address
-    @object.address ||= Address.new(:country_id => Spree::Config[:default_country_id])
-    @object.shipping_method ||= @order.shipping_method
-    @object.attributes = object_params
-    @object
-  end
 
-  def load_data
-    load_object
+  def load_shipping_methods
     @shipping_methods = ShippingMethod.all_available(@order, :back_end)
   end
 
-  def edit_before # copy into instance variable before editing
-    @shipment.special_instructions = @order.special_instructions
+  def assign_inventory_units
+    return unless params.has_key? :inventory_units
+    @shipment.inventory_unit_ids = params[:inventory_units].keys
   end
 
-  def update_after # copy back to order if instructions are enabled
-    @order.special_instructions = object_params[:special_instructions] if Spree::Config[:shipping_instructions]
-    @order.shipping_method = @order.shipment.shipping_method
-    @order.save
+  def load_order
+    @order = Order.find_by_number(params[:order_id])
   end
 
-  def assign_inventory_units
-    return unless params.has_key? :inventory_units
-    @shipment.inventory_unit_ids = params[:inventory_units].keys
+  def load_shipment
+    @shipment = Shipment.find_by_number(params[:id])
+  end
+
+  def build_shipment
+    @shipment = @order.shipments.build
+    @shipment.address ||= @order.ship_address
+    @shipment.address ||= Address.new(:country_id => Spree::Config[:default_country_id])
+    @shipment.shipping_method ||= @order.shipping_method
+    @shipment.attributes = params[:shipment]
   end
 
 end

data/app/controllers/admin/shipping_categories_controller.rb

@@ -1,16 +1,2 @@
-class Admin::ShippingCategoriesController < Admin::BaseController
-  resource_controller
-
-  layout 'admin'
-
-  update.response do |wants|
-    wants.html { redirect_to collection_url }
-  end
-
-  create.response do |wants|
-    wants.html { redirect_to collection_url }
-  end
-
-  destroy.success.wants.js { render_js_for_destroy }
-
+class Admin::ShippingCategoriesController < Admin::ResourceController
 end

data/app/controllers/admin/shipping_methods_controller.rb

@@ -1,20 +1,14 @@
-class Admin::ShippingMethodsController < Admin::BaseController
-  resource_controller
-  before_filter :load_data
-
-  update.wants.html { redirect_to edit_object_url }
-  create.wants.html { redirect_to edit_object_url }
-  destroy.success.wants.js { render_js_for_destroy }
+class Admin::ShippingMethodsController < Admin::ResourceController
+  before_filter :load_data, :except => [:index]
 
   private
-  def build_object
-    @object ||= end_of_association_chain.send((parent? ? :build : :new), object_params)
-    @object.calculator = params[:shipping_method][:calculator_type].constantize.new if params[:shipping_method]
-    @object
+  
+  def location_after_save
+    edit_admin_shipping_method_path(@shipping_method)
   end
 
   def load_data
     @available_zones = Zone.order(:name)
-    @calculators = ShippingMethod.calculators.sort_by(&:description)
+    @calculators = ShippingMethod.calculators.sort_by(&:name)
   end
 end

data/app/controllers/admin/states_controller.rb

@@ -1,30 +1,25 @@
-class Admin::StatesController < Admin::BaseController
-  resource_controller
-
+class Admin::StatesController < Admin::ResourceController
   belongs_to :country
   before_filter :load_data
 
-  index.response do |wants|
-    wants.html
-    wants.js do
-      render :partial => 'state_list.html.erb'
+  def index
+    respond_to do |format|
+      format.html
+      format.js  { render :partial => 'state_list.html.erb' }
     end
   end
 
-  new_action.response do |wants|
-    wants.html {render :layout => !request.xhr?}
-  end
-
-  create.wants.html { redirect_to admin_country_states_url(@country) }
-  update.wants.html { redirect_to admin_country_states_url(@country) }
-
-  private
+  protected
+  
+  def location_after_save
+    admin_country_states_url(@country)
+  end  
 
-    def collection
-      @collection ||= end_of_association_chain.order('name')
-    end
+  def collection
+    super.order(:name)
+  end
 
-    def load_data
-      @countries = Country.order('name')
-    end
+  def load_data
+    @countries = Country.order(:name)
+  end
 end