aeonscope-btech_rest 0.4.2 → 0.4.4

data/CHANGELOG.rdoc

@@ -23,5 +23,10 @@
 
 = v0.4.x
 
-* Cleaned up the summary and descriptions for the gem, README, and GitHub data.
-* Added partial UJS support for new/edit record actions. Nested fields are supported as well.
+* Synchronized the summary and descriptions for the gem, README, and GitHub data.
+* Added UJS support for nested new/edit actions.
+* Added UJS support for nested delete actions.
+* Changed the show_destroy_link helper so that the default link ID is suffixed with "_destroy" instead of "_link".
+* Added a build_dom_id helper.  Works the same as the dom_id found in Rails except that new records return a '_0' suffix instead of a "new_" prefix.
+* Updated the show_destroy_link helper so that when a url option is not supplied an anchor link is used instead (derived from the record ID).
+* Updated all edit and destroy resource helpers so that they accept the parent DOM ID for which to apply UJS manipulation too.

data/VERSION.yml

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

data/lib/actions.rb

@@ -125,7 +125,7 @@ module BTech
 	        add_resource controller_name, @resources
 	        @resources.reverse!
 	      end
-	      # Convenience for holding the current record and for form manipulation.
+	      # Convenience for accessing the current record.
 				instance_variable_set "@#{get_model_name}", @resources.last[:record]
 	    end
 	

data/lib/resource_helper.rb

@@ -22,6 +22,13 @@ module ResourceHelper
     end
  		content_for :breadcrumbs, content_tag(:div, :id => "breadcrumbs") {breadcrumbs.compact.join(" #{options[:separator]} ")}
   end	
+
+	# Builds a DOM ID for a given record. Works the same as the dom_id helper found in Rails except that it returns a record ID with
+	# a "_0" suffix for new records instead of a "new_" prefix.
+	def build_dom_id record
+		name = record.class.name.underscore
+		record.new_record? ? name + "_0" : name + '_' + record.id.to_s
+	end
 	
   # Builds the submit path for a new or edit form based on current controller action. This assumes
   # that the new/create and edit/update forms are always submitted to the same URL.  Accepts the following parameters:
@@ -54,25 +61,29 @@ module ResourceHelper
   # * *label* - The link label. Defaults to "Delete".
   # * *url* - The REST destroy URL. Example: /posts/1. *NOTE:* The proper HTTP POST request will be handled by the JavaScript.
   def show_destroy_link options = {}
-    options.reverse_merge! :label => "Delete", :class => "destroy"
-		options[:id] = options[:parent_id] + "_link" if options[:parent_id]
-    content_tag :a, options[:label], :href => options[:url], :id => options[:id], :class => options[:class]
+		options.reverse_merge! :id => options[:parent_id].to_s + "_destroy"
+    options.reverse_merge! :label => "Delete", :class => "destroy", :url => '#' + options[:id].to_s
+    link_to options[:label], options[:url], :id => options[:id], :class => options[:class]
   end
 
-  # Shows an unobtrusive jQuery link based on an array of resource hashes.  See the show_destroy_link above
+  # Shows an unobtrusive jQuery link based on an array of resource hashes. See the show_destroy_link above
+  # for further details. Accepts the following arguments:
+  # * *resources* - The array of resource hashes.
+	def show_destroy_resource_link resources, parent_dom_id
+		show_destroy_link :parent_id => parent_dom_id, :url => build_resource_url(resources, :destroy)
+	end
+	
+  # Shows an unobtrusive jQuery link based on an array of resource hashes. See the show_destroy_link above
   # for further details. Accepts the following arguments:
   # * *resources* - The array of resource hashes.
-	def show_destroy_resource_link resources
-		show_destroy_link :parent_id => resources.last[:parent_id], :url => build_resource_url(resources, :destroy)
+	def show_nested_destroy_resource_link resources, parent_dom_id
+		show_destroy_link(:id => parent_dom_id.to_s + "_nested-destroy", :class => "nested-destroy") unless resources.last[:record].new_record?
 	end
 
-  # Shows edit and delete links for resources. *NOTE*: Normally the record being edited is not known when
-  # resources are first assembled. Make sure to add the record to the last resource prior to calling this
-  # method for correct results.  Accepts the following parameters:
+  # Shows edit and delete links for resources. Accepts the following parameters:
   # * *resources* - The array of resource hashes.
-  def show_edit_and_destroy_resource_links resources
-    html = link_to "Edit", build_resource_url(resources, :edit)
-    html += " | "
-    html += show_destroy_resource_link resources
+  # * *parent_dom_id* - The parent ID of the dom object for which the edit and destroy links belong to for UJS manipulation.
+  def show_edit_and_destroy_resource_links resources, parent_dom_id
+		[link_to("Edit", build_resource_url(resources, :edit)), show_destroy_resource_link(resources, parent_dom_id)].join(" | ")
   end
 end

data/rails_generators/rest_setup/templates/public/javascripts/rest.js

@@ -1,3 +1,15 @@
+// Chops off the last string segment per delimiter. If no delimiter is found in the string then the original string is
+// returned instead. The following attributes are accepted:
+// string = Required. The string to chop.
+// delimiter = Optional. The delimiter used to chop up the string. Defaults to '_'.
+function chop_last(string, delimiter) {
+	var chopped = string;
+	if (delimiter == undefined) {delimiter = '_';}
+	var endIndex = string.lastIndexOf(delimiter);
+	if (endIndex > 1) {chopped = string.slice(0, endIndex);}
+	return chopped;
+}
+
 // Increments a number embedded in the text by one. If no number is found then the original text is returned.
 function increment_text(text) {
   var match = text.match(/\d+/);
@@ -35,38 +47,22 @@ function increment_input_name(input) {
   $(input).attr("name", name);
 };
 
+// Generates a hidden input field based off original input field data that instructs ActiveRecord to delete
+// a record based on the ID of the input field.
+function generate_destroy_input(input) {
+	$(input).attr("id", chop_last($(input).attr("id")) + "__delete");
+	$(input).attr("name", chop_last($(input).attr("name"), '[') + "[_delete]");
+	$(input).attr("type", "hidden");
+	$(input).attr("value", 1);
+	return input;
+}
+
 // UJS
 $(document).ready(function(){
-	// Destroy
-    $("a.destroy").click(function(){
-        var result = confirm("Are you sure you want to delete this?");
-        if (result) {
-			try {
-				var id = $(this).attr("id");
-				// Parent ID is determined from link ID. Example: post_3_link (link ID) yields post_3 (parent ID).
-				var endIndex = id.lastIndexOf('_');
-				if (endIndex > 1) {
-					var parent_id = '#' + id.slice(0, endIndex);
-					$(parent_id).animate({backgroundColor: "#FF0000"}, 500);
-					$(parent_id).fadeOut(500);
-				} else {
-					throw "Invalid ID";
-				}
-				// Finally, call the destroy action.
-	            $.post($(this).attr("href"), "_method=delete");
-			} catch (e) {
-				alert("Error: " + e + ". Check that parent ID is defined and/or the link ID includes parent ID as part of the link ID.");
-			}
-        }
-		// Ensure the default event does not fire.
-		return false;
-    });
-
-	// New
-	$("a.new").click(function(){
+	// Nested New
+	$("a.nested-new").click(function(){
 		var id = $(this).attr("id");
-		var endIndex = id.lastIndexOf('_');
-		var parent_id = '#' + id.slice(0, endIndex);
+		var parent_id = '#' + chop_last(id);
 		var clone = $(parent_id + " tr:last").clone(true);
 		var clone_id = clone.attr("id");
 		// Clone for new action.
@@ -87,5 +83,51 @@ $(document).ready(function(){
 			$(this).attr("value", '');
 			return this;
 		});
+		// Ensure default event does not fire.
+		return false;
 	});
+	
+	// Nested Destroy
+    $("a.nested-destroy").click(function(){
+		try {
+			var id = $(this).attr("id");
+			var parent_id = chop_last(id);
+			if (parent_id != id) {
+				parent_id = '#' + parent_id;
+				$(parent_id).prepend(generate_destroy_input($(parent_id + " input:first").clone()));
+				$(parent_id).animate({backgroundColor: "#FF0000"}, 500);
+				$(parent_id).fadeOut(500);
+			} else {
+				throw "Invalid ID";
+			}
+		} catch (e) {
+			alert("Error: " + e + ". Check that parent ID is defined and/or the link ID includes parent ID as part of the link ID.");
+		}
+		// Ensure default event does not fire.
+		return false;
+    });
+
+	// Destroy
+    $("a.destroy").click(function(){
+        var result = confirm("Are you sure you want to delete this?");
+        if (result) {
+			try {
+				var id = $(this).attr("id");
+				var parent_id = chop_last(id);
+				if (parent_id != id) {
+					parent_id = '#' + parent_id;
+					$(parent_id).animate({backgroundColor: "#FF0000"}, 500);
+					$(parent_id).fadeOut(500);
+				} else {
+					throw "Invalid ID";
+				}
+				// Finally, call the destroy action.
+	            $.post($(this).attr("href"), "_method=delete");
+			} catch (e) {
+				alert("Error: " + e + ". Check that parent ID is defined and/or the link ID includes parent ID as part of the link ID.");
+			}
+        }
+		// Ensure default event does not fire.
+		return false;
+    });
 });

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: aeonscope-btech_rest
 version: !ruby/object:Gem::Version 
-  version: 0.4.2
+  version: 0.4.4
 platform: ruby
 authors: 
 - Brooke Kuhlmann
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-14 00:00:00 -07:00
+date: 2009-04-15 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency