lolita 3.0.5 → 3.0.6

data/lib/lolita/errors.rb

@@ -8,4 +8,6 @@ module Lolita
   class ModuleNotFound < ArgumentError; end
   class NotFound < ArgumentError; end
   class TabNotFoundError < NameError; end
+  class FieldNotFoundError < NameError; end
+  class AssociationError < ArgumentError; end
 end

data/lib/lolita/mapping.rb

@@ -1,4 +1,18 @@
 module Lolita
+  # Create mapping for routes.
+  # Each mapping has name, like :posts, :files etc.
+  # Also it accepts options: 
+  # * <tt>:singular</tt> - singular form for route, by default it call #singularize on _name_.
+  # * <tt>:class_name</tt> - class that is related with route, by default it uses :singular, and classify it. It should be like "Post".
+  # * <tt>:path_prefix</tt> - path starts with path prefix, like /path_prefix/lolita/posts.
+  # * <tt>:path</tt> - path and path url methods starts with this path.
+  # =====Example
+  #     lolita_for :posts, :path=>"admin"
+  #     # add paths like this to routes
+  #     # admin_posts GET /admin/posts {:controller=>"lolita/rest", :action=>:index}
+  #     # edit_admin_posts GET /admin/post/1/edit {:controller=>"lolita/rest",:action=>:edit}
+  # * <tt>:module</tt> - change module for path, it changes :controller that is used for lolita, like, 
+  # :module=>"admin", change controller to "admin/posts". If this is used without :path then no named routes will be generated
   class Mapping
     attr_reader :class_name,:path,:singular,:plural,:path_prefix,:module,:controllers,:as
     alias :name :singular
@@ -17,14 +31,13 @@ module Lolita
         h[k]="#{mod}#{k}" 
       }
     end
-    #
-    # lolita/posts/new => lolita/crud/new :class=>Post
-    # posts/new => posts/new
-    #
+  
+    # Return class that is related with mapping.
     def to
       @ref.get
     end
     
+    # full path of current mapping
     def fullpath
       "#{@path_prefix}/#{@path}".squeeze("/")
     end

data/lib/lolita/modules/rest.rb

@@ -1,7 +1,7 @@
 module ActionDispatch::Routing
   class Mapper
     protected
-    def lolita_rest mapping, controllers
+    def lolita_rest_route mapping, controllers
       resources mapping.plural,:only=>[:index,:new,:create,:edit,:update,:destroy],
         :controller=>controllers[:rest],:module=>mapping.module
     end

data/lib/lolita/rails/routes.rb

@@ -15,24 +15,28 @@ module ActionDispatch::Routing
       #TODO refactor
       options = resources.extract_options!
 
-      if as = options.delete(:as)
-        ActiveSupport::Deprecation.warn ":as is deprecated, please use :path instead."
-        options[:path] ||= as
-      end
+      # if as = options.delete(:as)
+      #   ActiveSupport::Deprecation.warn ":as is deprecated, please use :path instead."
+      #   options[:path] ||= as
+      # end
 
-      if scope = options.delete(:scope)
-        ActiveSupport::Deprecation.warn ":scope is deprecated, please use :singular instead."
-        options[:singular] ||= scope
-      end
+      # if scope = options.delete(:scope)
+      #   ActiveSupport::Deprecation.warn ":scope is deprecated, please use :singular instead."
+      #   options[:singular] ||= scope
+      # end
 
       options[:as]          ||= @scope[:as]     if @scope[:as].present?
       options[:module]      ||= @scope[:module] if @scope[:module].present?
       options[:path_prefix] ||= @scope[:path]   if @scope[:path].present?
       resources.map!(&:to_sym)
+      all_resource_classes=[]
       resources.each{|resource|
         mapping=Lolita.add_mapping(resource,options)
-        target_class=mapping.to
+        Lolita.resources[mapping.name]=mapping
         
+        target_class=mapping.to
+        all_resource_classes<<target_class
+
         lolita_scope mapping.name do
           yield if block_given?
 
@@ -46,15 +50,20 @@ module ActionDispatch::Routing
               route=Lolita.routes[mapping.name] || Lolita.default_route
             end
             unless route
-              raise Lolita::ModuleNotFound, "Module #{mapping.name.to_s.capitalize} not found! Add Lolita.use(:#{mapping.name}) to initializers/lolita.rb"
+              raise Lolita::ModuleNotFound, "Module #{mapping.name.to_s.capitalize} not found!"
             end
-            send(:"lolita_#{route}",mapping,mapping.controllers)
+            send(:"lolita_#{route}_route",mapping,mapping.controllers)
+            
             Lolita.conditional_routes(target_class).each do |route_name|
-              send(:"lolita_#{route_name}",mapping,mapping.controllers)
+              send(:"lolita_#{route_name}_route",mapping,mapping.controllers)
             end
           end
+
         end
       }
+      Lolita.common_routes(all_resource_classes).each do |route_name|
+        send(:"lolita_#{route_name}_route")
+      end
     end
 
     protected

data/lolita.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{lolita}
-  s.version = "3.0.5"
+  s.version = "3.0.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["ITHouse", "Arturs Meisters"]
-  s.date = %q{2011-03-23}
+  s.date = %q{2011-03-29}
   s.description = %q{Great Rails CMS that allow you to start working with models right when you add this to your project.}
   s.email = %q{support@ithouse.lv}
   s.extra_rdoc_files = [
@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
   s.files = [
     ".document",
     ".project",
+    ".rspec",
     "GUIDELINE",
     "Gemfile",
     "IDEA",
@@ -29,6 +30,7 @@ Gem::Specification.new do |s|
     "app/controllers/lolita/rest_controller.rb",
     "app/helpers/components/lolita/list_component.rb",
     "app/helpers/lolita_helper.rb",
+    "app/views/components/lolita/field/_boolean.html.erb",
     "app/views/components/lolita/field/_collection.html.erb",
     "app/views/components/lolita/field/_date.html.erb",
     "app/views/components/lolita/field/_datetime.html.erb",
@@ -76,7 +78,7 @@ Gem::Specification.new do |s|
     "features/support/env.rb",
     "features/support/paths.rb",
     "lib/generators/helpers/file_helper.rb",
-    "lib/generators/lolita/copy_assets_generator.rb",
+    "lib/generators/lolita/assets_generator.rb",
     "lib/generators/lolita/install_generator.rb",
     "lib/generators/templates/lolita.rb",
     "lib/lolita.rb",
@@ -88,13 +90,22 @@ Gem::Specification.new do |s|
     "lib/lolita/configuration/base.rb",
     "lib/lolita/configuration/column.rb",
     "lib/lolita/configuration/columns.rb",
+    "lib/lolita/configuration/factory.rb",
     "lib/lolita/configuration/field.rb",
-    "lib/lolita/configuration/field_extensions/collection.rb",
+    "lib/lolita/configuration/field/boolean.rb",
+    "lib/lolita/configuration/field/collection.rb",
+    "lib/lolita/configuration/field/datetime.rb",
+    "lib/lolita/configuration/field/disabled.rb",
+    "lib/lolita/configuration/field/integer.rb",
+    "lib/lolita/configuration/field/password.rb",
+    "lib/lolita/configuration/field/string.rb",
+    "lib/lolita/configuration/field/text.rb",
     "lib/lolita/configuration/field_set.rb",
     "lib/lolita/configuration/list.rb",
     "lib/lolita/configuration/page.rb",
     "lib/lolita/configuration/tab.rb",
     "lib/lolita/configuration/tab/content.rb",
+    "lib/lolita/configuration/tab/default.rb",
     "lib/lolita/configuration/tabs.rb",
     "lib/lolita/controllers/component_helpers.rb",
     "lib/lolita/controllers/internal_helpers.rb",
@@ -116,7 +127,6 @@ Gem::Specification.new do |s|
     "lib/lolita/rails/routes.rb",
     "lib/lolita/ruby_ext/accessors.rb",
     "lib/lolita/test/matchers.rb",
-    "lib/lolita/version.rb",
     "log/development.log",
     "lolita.gemspec",
     "public/images/lolita/plus.png",

data/public/javascripts/lolita/main.js

@@ -1,6 +1,7 @@
-/* 
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-
-
+$(function(){
+  $.ajaxSetup({
+    headers:{
+      "X-CSRF-Token": $("meta[name='csrf-token']").attr("content")
+    }
+  })
+})

data/public/javascripts/lolita/tab.js

@@ -1,41 +1,41 @@
-$(function(){
-  // Send ajax request with all forms data for given tabs block.
-  function save_tab(tabs){
-    var data=""
-    tabs.find("form").each(function(){
-      data=data+$(this).serialize()
-    })
-    //alert(data)
-    $.ajax({
-      url:tabs.attr("data-tabs-url"),
-      dataType:"html",
-      type:tabs.attr("data-method"),
-      data:data,
-      success:function(data){
-        $("#content").html(data);
-        load_tinymce();
-      }
-    })
-  }
-  // Submit all forms through Ajax when Save All button clicked.
-  $("button.save-all").live('click',function(){
-    //var tab=$(this).parents("div[data-tabs-url]")
-    var tab = $("#content").children("div[data-tabs-url]")
-    save_tab(tab)
-  })
-  // All tabs are closable when clicked on tab title.
-  $(".tab .tab-title").live('click',function(){
-    var tab_title=$(this)
-    var closed=tab_title.data("closed") || (tab_title.attr("data-closed")=="false" ? false : true)
-      if(closed){
-        tab_title.parents(".tab").find(".tab-content").show("fast")
-      }else{
-        tab_title.parents(".tab").find(".tab-content").hide("fast")
-      }
-      tab_title.data("closed",!closed)
+$(function(){
+  // Send ajax request with all forms data for given tabs block.
+  function save_tab(tabs){
+    var data=""
+    tabs.find("form").each(function(){
+      data=data+"&"+$(this).serialize()
+    })
+    //alert(data)
+    $.ajax({
+      url:tabs.attr("data-tabs-url"),
+      dataType:"html",
+      type:tabs.attr("data-method"),
+      data:data,
+      success:function(data){
+        $("#content").html(data);
+        load_tinymce();
+      }
+    })
+  }
+  // Submit all forms through Ajax when Save All button clicked.
+  $("button.save-all").live('click',function(){
+    //var tab=$(this).parents("div[data-tabs-url]")
+    var tab = $("#content").children("div[data-tabs-url]")
+    save_tab(tab)
+  })
+  // All tabs are closable when clicked on tab title.
+  $(".tab .tab-title").live('click',function(){
+    var tab_title=$(this)
+    var closed=tab_title.data("closed") || (tab_title.attr("data-closed")=="false" ? false : true)
+      if(closed){
+        tab_title.parents(".tab").find(".tab-content").show("fast")
+      }else{
+        tab_title.parents(".tab").find(".tab-content").hide("fast")
+      }
+      tab_title.data("closed",!closed)
     })
     // Flash is hidden when clicked on
   $("#flash").live("click", function(){
     $(this).slideUp("fast");
-  })
+  })
 })

data/spec/configuration/field_spec.rb

@@ -81,7 +81,7 @@ describe Lolita::Configuration::Field do
   end
 
   it "should set field type when not specified" do
-    field=Lolita::Configuration::Field.new(@dbi,:title)
+    field=Lolita::Configuration::Field.add(@dbi,:title)
     field.type.should == "string"
   end
 
@@ -91,13 +91,13 @@ describe Lolita::Configuration::Field do
   end
 
   it "should allow set field that is referenced in (belongs_to) any class" do
-    field=Lolita::Configuration::Field.new(@dbi2,:post)
+    field=Lolita::Configuration::Field.add(@dbi2,:post)
     field.type.should == "collection"
     field.association_type.should == :one
   end
 
   it "should allow set field that references to (has_many or has_one) any class" do
-    field=Lolita::Configuration::Field.new(@dbi,:comments)
+    field=Lolita::Configuration::Field.add(@dbi,:comments)
     field.type.should == "collection"
     field.association_type.should == :many
   end

data/spec/configuration/tab_spec.rb

@@ -33,7 +33,7 @@ describe Lolita::Configuration::Tab do
 
   describe "add tab" do
     it "should recognize type of tab added and create it as a related class object" do
-      Lolita::Configuration::Tab.add(@dbi){ field(:email)}.class.to_s.should=="Lolita::Configuration::Tab"
+      Lolita::Configuration::Tab.add(@dbi){ field(:email)}.class.to_s.should=="Lolita::Configuration::DefaultTab"
       Lolita::Configuration::Tab.add(@dbi,:my).class.to_s.should == "Lolita::Configuration::MyTab"
       Lolita::Configuration::Tab.add(@dbi) {
         type :my
@@ -65,7 +65,7 @@ describe Lolita::Configuration::Tab do
   
   it "should raise error when no fields are given for default type tab" do
     lambda{
-      Lolita::Configuration::Tab.new(@dbi)
+      Lolita::Configuration::Tab.add(@dbi)
     }.should raise_error Lolita::NoFieldsGivenError
   end
 

data/spec/configuration/tabs_spec.rb

@@ -1,5 +1,12 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
+module Lolita
+  module Configuration
+    class ImagesTab < Lolita::Configuration::Tab
+    end
+  end
+end
+
 describe Lolita::Configuration::Tabs do
   before(:each) do
     @dbi=Lolita::DBI::Base.new(Post)

data/spec/rails_app/public/javascripts/lolita/tab.js

@@ -1,41 +1,41 @@
-$(function(){
-  // Send ajax request with all forms data for given tabs block.
-  function save_tab(tabs){
-    var data=""
-    tabs.find("form").each(function(){
-      data=data+$(this).serialize()
-    })
-    //alert(data)
-    $.ajax({
-      url:tabs.attr("data-tabs-url"),
-      dataType:"html",
-      type:tabs.attr("data-method"),
-      data:data,
-      success:function(data){
-        $("#content").html(data);
-        load_tinymce();
-      }
-    })
-  }
-  // Submit all forms through Ajax when Save All button clicked.
-  $("button.save-all").live('click',function(){
-    //var tab=$(this).parents("div[data-tabs-url]")
-    var tab = $("#content").children("div[data-tabs-url]")
-    save_tab(tab)
-  })
-  // All tabs are closable when clicked on tab title.
-  $(".tab .tab-title").live('click',function(){
-    var tab_title=$(this)
-    var closed=tab_title.data("closed") || (tab_title.attr("data-closed")=="false" ? false : true)
-      if(closed){
-        tab_title.parents(".tab").find(".tab-content").show("fast")
-      }else{
-        tab_title.parents(".tab").find(".tab-content").hide("fast")
-      }
-      tab_title.data("closed",!closed)
+$(function(){
+  // Send ajax request with all forms data for given tabs block.
+  function save_tab(tabs){
+    var data=""
+    tabs.find("form").each(function(){
+      data=data+$(this).serialize()
+    })
+    //alert(data)
+    $.ajax({
+      url:tabs.attr("data-tabs-url"),
+      dataType:"html",
+      type:tabs.attr("data-method"),
+      data:data,
+      success:function(data){
+        $("#content").html(data);
+        load_tinymce();
+      }
+    })
+  }
+  // Submit all forms through Ajax when Save All button clicked.
+  $("button.save-all").live('click',function(){
+    //var tab=$(this).parents("div[data-tabs-url]")
+    var tab = $("#content").children("div[data-tabs-url]")
+    save_tab(tab)
+  })
+  // All tabs are closable when clicked on tab title.
+  $(".tab .tab-title").live('click',function(){
+    var tab_title=$(this)
+    var closed=tab_title.data("closed") || (tab_title.attr("data-closed")=="false" ? false : true)
+      if(closed){
+        tab_title.parents(".tab").find(".tab-content").show("fast")
+      }else{
+        tab_title.parents(".tab").find(".tab-content").hide("fast")
+      }
+      tab_title.data("closed",!closed)
     })
     // Flash is hidden when clicked on
   $("#flash").live("click", function(){
     $(this).slideUp("fast");
-  })
+  })
 })

data/spec/rails_app/public/javascripts/rails.js

@@ -1,137 +1,137 @@
-/**
- * Unobtrusive scripting adapter for jQuery
- *
- * Requires jQuery 1.4.3 or later.
- * https://github.com/rails/jquery-ujs
- */
-
-(function($) {
-	// Triggers an event on an element and returns the event result
-	function fire(obj, name, data) {
-		var event = new $.Event(name);
-		obj.trigger(event, data);
-		return event.result !== false;
-	}
-
-	// Submits "remote" forms and links with ajax
-	function handleRemote(element) {
-		var method, url, data,
-			dataType = element.attr('data-type') || ($.ajaxSettings && $.ajaxSettings.dataType);
-
-		if (element.is('form')) {
-			method = element.attr('method');
-			url = element.attr('action');
-			data = element.serializeArray();
-			// memoized value from clicked submit button
-			var button = element.data('ujs:submit-button');
-			if (button) {
-				data.push(button);
-				element.data('ujs:submit-button', null);
-			}
-		} else {
-			method = element.attr('data-method');
-			url = element.attr('href');
-			data = null;
-		}
-
-		$.ajax({
-			url: url, type: method || 'GET', data: data, dataType: dataType,
-			// stopping the "ajax:beforeSend" event will cancel the ajax request
-			beforeSend: function(xhr, settings) {
-				if (settings.dataType === undefined) {
-					xhr.setRequestHeader('accept', '*/*;q=0.5, ' + settings.accepts.script);
-				}
-				return fire(element, 'ajax:beforeSend', [xhr, settings]);
-			},
-			success: function(data, status, xhr) {
-				element.trigger('ajax:success', [data, status, xhr]);
-			},
-			complete: function(xhr, status) {
-				element.trigger('ajax:complete', [xhr, status]);
-			},
-			error: function(xhr, status, error) {
-				element.trigger('ajax:error', [xhr, status, error]);
-			}
-		});
-	}
-
-	// Handles "data-method" on links such as:
-	// <a href="/users/5" data-method="delete" rel="nofollow" data-confirm="Are you sure?">Delete</a>
-	function handleMethod(link) {
-		var href = link.attr('href'),
-			method = link.attr('data-method'),
-			csrf_token = $('meta[name=csrf-token]').attr('content'),
-			csrf_param = $('meta[name=csrf-param]').attr('content'),
-			form = $('<form method="post" action="' + href + '"></form>'),
-			metadata_input = '<input name="_method" value="' + method + '" type="hidden" />';
-
-		if (csrf_param !== undefined && csrf_token !== undefined) {
-			metadata_input += '<input name="' + csrf_param + '" value="' + csrf_token + '" type="hidden" />';
-		}
-
-		form.hide().append(metadata_input).appendTo('body');
-		form.submit();
-	}
-
-	function disableFormElements(form) {
-		form.find('input[data-disable-with]').each(function() {
-			var input = $(this);
-			input.data('ujs:enable-with', input.val())
-				.val(input.attr('data-disable-with'))
-				.attr('disabled', 'disabled');
-		});
-	}
-
-	function enableFormElements(form) {
-		form.find('input[data-disable-with]').each(function() {
-			var input = $(this);
-			input.val(input.data('ujs:enable-with')).removeAttr('disabled');
-		});
-	}
-
-	function allowAction(element) {
-		var message = element.attr('data-confirm');
-		return !message || (fire(element, 'confirm') && confirm(message));
-	}
-
-	$('a[data-confirm], a[data-method], a[data-remote]').live('click.rails', function(e) {
-		var link = $(this);
-		if (!allowAction(link)) return false;
-
-		if (link.attr('data-remote')) {
-			handleRemote(link);
-			return false;
-		} else if (link.attr('data-method')) {
-			handleMethod(link);
-			return false;
-		}
-	});
-
-	$('form').live('submit.rails', function(e) {
-		var form = $(this);
-		if (!allowAction(form)) return false;
-
-		if (form.attr('data-remote')) {
-			handleRemote(form);
-			return false;
-		} else {
-			disableFormElements(form);
-		}
-	});
-
-	$('form input[type=submit], form button[type=submit], form button:not([type])').live('click.rails', function() {
-		var button = $(this);
-		if (!allowAction(button)) return false;
-		// register the pressed submit button
-		var name = button.attr('name'), data = name ? {name:name, value:button.val()} : null;
-		button.closest('form').data('ujs:submit-button', data);
-	});
-	
-	$('form').live('ajax:beforeSend.rails', function(event) {
-		if (this == event.target) disableFormElements($(this));
-	});
-
-	$('form').live('ajax:complete.rails', function(event) {
-		if (this == event.target) enableFormElements($(this));
-	});
-})( jQuery );
+/**
+ * Unobtrusive scripting adapter for jQuery
+ *
+ * Requires jQuery 1.4.3 or later.
+ * https://github.com/rails/jquery-ujs
+ */
+
+(function($) {
+	// Triggers an event on an element and returns the event result
+	function fire(obj, name, data) {
+		var event = new $.Event(name);
+		obj.trigger(event, data);
+		return event.result !== false;
+	}
+
+	// Submits "remote" forms and links with ajax
+	function handleRemote(element) {
+		var method, url, data,
+			dataType = element.attr('data-type') || ($.ajaxSettings && $.ajaxSettings.dataType);
+
+		if (element.is('form')) {
+			method = element.attr('method');
+			url = element.attr('action');
+			data = element.serializeArray();
+			// memoized value from clicked submit button
+			var button = element.data('ujs:submit-button');
+			if (button) {
+				data.push(button);
+				element.data('ujs:submit-button', null);
+			}
+		} else {
+			method = element.attr('data-method');
+			url = element.attr('href');
+			data = null;
+		}
+
+		$.ajax({
+			url: url, type: method || 'GET', data: data, dataType: dataType,
+			// stopping the "ajax:beforeSend" event will cancel the ajax request
+			beforeSend: function(xhr, settings) {
+				if (settings.dataType === undefined) {
+					xhr.setRequestHeader('accept', '*/*;q=0.5, ' + settings.accepts.script);
+				}
+				return fire(element, 'ajax:beforeSend', [xhr, settings]);
+			},
+			success: function(data, status, xhr) {
+				element.trigger('ajax:success', [data, status, xhr]);
+			},
+			complete: function(xhr, status) {
+				element.trigger('ajax:complete', [xhr, status]);
+			},
+			error: function(xhr, status, error) {
+				element.trigger('ajax:error', [xhr, status, error]);
+			}
+		});
+	}
+
+	// Handles "data-method" on links such as:
+	// <a href="/users/5" data-method="delete" rel="nofollow" data-confirm="Are you sure?">Delete</a>
+	function handleMethod(link) {
+		var href = link.attr('href'),
+			method = link.attr('data-method'),
+			csrf_token = $('meta[name=csrf-token]').attr('content'),
+			csrf_param = $('meta[name=csrf-param]').attr('content'),
+			form = $('<form method="post" action="' + href + '"></form>'),
+			metadata_input = '<input name="_method" value="' + method + '" type="hidden" />';
+
+		if (csrf_param !== undefined && csrf_token !== undefined) {
+			metadata_input += '<input name="' + csrf_param + '" value="' + csrf_token + '" type="hidden" />';
+		}
+
+		form.hide().append(metadata_input).appendTo('body');
+		form.submit();
+	}
+
+	function disableFormElements(form) {
+		form.find('input[data-disable-with]').each(function() {
+			var input = $(this);
+			input.data('ujs:enable-with', input.val())
+				.val(input.attr('data-disable-with'))
+				.attr('disabled', 'disabled');
+		});
+	}
+
+	function enableFormElements(form) {
+		form.find('input[data-disable-with]').each(function() {
+			var input = $(this);
+			input.val(input.data('ujs:enable-with')).removeAttr('disabled');
+		});
+	}
+
+	function allowAction(element) {
+		var message = element.attr('data-confirm');
+		return !message || (fire(element, 'confirm') && confirm(message));
+	}
+
+	$('a[data-confirm], a[data-method], a[data-remote]').live('click.rails', function(e) {
+		var link = $(this);
+		if (!allowAction(link)) return false;
+
+		if (link.attr('data-remote')) {
+			handleRemote(link);
+			return false;
+		} else if (link.attr('data-method')) {
+			handleMethod(link);
+			return false;
+		}
+	});
+
+	$('form').live('submit.rails', function(e) {
+		var form = $(this);
+		if (!allowAction(form)) return false;
+
+		if (form.attr('data-remote')) {
+			handleRemote(form);
+			return false;
+		} else {
+			disableFormElements(form);
+		}
+	});
+
+	$('form input[type=submit], form button[type=submit], form button:not([type])').live('click.rails', function() {
+		var button = $(this);
+		if (!allowAction(button)) return false;
+		// register the pressed submit button
+		var name = button.attr('name'), data = name ? {name:name, value:button.val()} : null;
+		button.closest('form').data('ujs:submit-button', data);
+	});
+	
+	$('form').live('ajax:beforeSend.rails', function(event) {
+		if (this == event.target) disableFormElements($(this));
+	});
+
+	$('form').live('ajax:complete.rails', function(event) {
+		if (this == event.target) enableFormElements($(this));
+	});
+})( jQuery );