aeonscope-btech_rest 0.5.2 → 0.5.3

data/CHANGELOG.rdoc

@@ -40,4 +40,8 @@
 = v0.5.x
 
 * Fixed a bug in the disabled_actions class method where unique actions were returning as a null object.
+* Added graceful handling of resources with no models as there are times where you can have a RESTful controller with no associated model.
+* Renamed the render_new_or_edit method to render_new_or_edit_partial (see actions.rb).
+* Added a render_action_partial method for generic rendering of action partials (see actions.rb).
+
 

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 0
 :minor: 5
-:patch: 2
+:patch: 3

data/lib/actions.rb

@@ -11,28 +11,31 @@ module BTech
 					records = parent.instance_eval("#{@resources.last[:parent_resource_method] || @resources.last[:name]}").paginate :page => params[:page], :per_page => 10
 	      else
 	        # Records for single resource.
-					records_name = get_model_name.pluralize
-					records = @resources.last[:model].all.paginate(:page => params[:page], :per_page => 10)
+					records_name = get_model_name
+					if records_name
+						records_name = records_name.pluralize
+						records = @resources.last[:model].all.paginate(:page => params[:page], :per_page => 10)
+					end
 	      end
-				instance_variable_set "@#{records_name}", records
+				instance_variable_set "@#{records_name}", records if records_name
 	    end
 
 	    # Default show action.  Feel free to override.
 	    def show
 	      build_resources
-	      render :partial => @resources.last[:show_partial], :layout => true, :locals => {get_model_symbol => get_record, :resources => @resources}
+				render_action_partial @resources.last[:show_partial]
 	    end
 
 	    # Default new action.  Feel free to override.
 	    def new
 	      build_resources
-	      render_new_or_edit
+	      render_new_or_edit_partial
 	    end
 
 	    # Default edit action.  Feel free to override.
 	    def edit
 	      build_resources
-	      render_new_or_edit
+	      render_new_or_edit_partial
 	    end
 
 	    # Default create action.  Feel free to override.
@@ -41,7 +44,7 @@ module BTech
 	      if get_record.update_attributes params[get_model_symbol]
 	        redirect_to build_resource_url(@resources)
 	      else
-	        render_new_or_edit
+	        render_new_or_edit_partial
 	      end
 	    end
 
@@ -51,7 +54,7 @@ module BTech
 	      if get_record.update_attributes params[get_model_symbol]
 	        redirect_to build_resource_url(@resources)
 	      else
-	        render_new_or_edit
+	        render_new_or_edit_partial
 	      end  
 	    end
 
@@ -65,9 +68,20 @@ module BTech
 
 	    protected
 
+	    # Convenience method for rendering the action partials.
+			def render_action_partial partial
+				symbol = get_model_symbol
+				record = get_record
+				if symbol && record
+					render :partial => partial, :layout => true, :locals => {symbol => record, :resources => @resources}
+				else
+					render :partial => partial, :layout => true, :locals => {:resources => @resources}
+				end
+			end
+
 	    # Convenience method for rendering the new or edit partial.
-	    def render_new_or_edit
-	      render :partial => @resources.last[:new_or_edit_partial], :layout => true, :locals => {get_model_symbol => get_record, :resources => @resources}
+	    def render_new_or_edit_partial
+				render_action_partial @resources.last[:new_or_edit_partial]
 	    end
 
 	    # Builds the RESTful parent URL based on an array of resources.
@@ -104,17 +118,20 @@ module BTech
 	
 			# Answers the name of the current model.
 			def get_model_name
-				@resources.last[:model].name.underscore
+				model = @resources.last[:model]
+				model ? model.name.underscore : nil
 			end
 			
 			# Answers the symbol of the current model.
 			def get_model_symbol
-				get_model_name.to_sym
+				name = get_model_name
+				name ? name.to_sym : nil
 			end
 	
 			# Answers the current record (a.k.a. the record of the last resource).
 			def get_record
-				instance_variable_get "@#{get_model_name}"
+				name = get_model_name
+				name ? instance_variable_get("@#{name}") : nil
 			end
 	
 	    # Builds all resources for the controller(s).
@@ -126,7 +143,8 @@ module BTech
 	        @resources.reverse!
 	      end
 	      # Convenience for accessing the current record.
-				instance_variable_set "@#{get_model_name}", @resources.last[:record]
+				name = get_model_name
+				instance_variable_set "@#{name}", @resources.last[:record] if name
 	    end
 	
 			# Convenience method for answering back a properly camelized controller name.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: aeonscope-btech_rest
 version: !ruby/object:Gem::Version 
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors: 
 - Brooke Kuhlmann